[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Laurent Montel]

SVN commit 876814 by mlaurent:

Fix action warning


 M  +4 -4      uml.cpp  
 M  +3 -2      uml.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #876813:876814
@@ -468,14 +468,14 @@
 
     QString moveTabLeftString = i18n("&Move Tab Left");
     QString moveTabRightString = i18n("&Move Tab Right");
-    QAction* moveTabLeft = actionCollection()->addAction("move_tab_left");
+    KAction* moveTabLeft = actionCollection()->addAction("move_tab_left");
     moveTabLeft->setIcon(Icon_Utils::SmallIcon(QApplication::layoutDirection() ? Icon_Utils::it_Go_Next : Icon_Utils::it_Go_Previous));
     moveTabLeft->setText(QApplication::layoutDirection() ? moveTabRightString : moveTabLeftString);
     moveTabLeft->setShortcut(QApplication::layoutDirection() ?
                  QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_Right) : QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_Left));
     connect(moveTabLeft, SIGNAL( triggered( bool ) ), this, SLOT( slotMoveTabLeft() ));
 
-    QAction* moveTabRight = actionCollection()->addAction("move_tab_right");
+    KAction* moveTabRight = actionCollection()->addAction("move_tab_right");
     moveTabRight->setIcon(Icon_Utils::SmallIcon(QApplication::layoutDirection() ? Icon_Utils::it_Go_Previous : Icon_Utils::it_Go_Next));
     moveTabRight->setText(QApplication::layoutDirection() ? moveTabLeftString : moveTabRightString);
     moveTabRight->setShortcut(QApplication::layoutDirection() ?
@@ -484,13 +484,13 @@
 
     QString selectTabLeftString = i18n("Select Diagram on Left");
     QString selectTabRightString = i18n("Select Diagram on Right");
-    QAction* changeTabLeft = actionCollection()->addAction("previous_tab");
+    KAction* changeTabLeft = actionCollection()->addAction("previous_tab");
     changeTabLeft->setText(QApplication::layoutDirection() ? selectTabRightString : selectTabLeftString);
     changeTabLeft->setShortcut(QApplication::layoutDirection() ?
                    QKeySequence(Qt::SHIFT+Qt::Key_Right) : QKeySequence(Qt::SHIFT+Qt::Key_Left));
     connect(changeTabLeft, SIGNAL( triggered( bool ) ), this, SLOT( slotChangeTabLeft() ));
 
-    QAction* changeTabRight = actionCollection()->addAction("next_tab");
+    KAction* changeTabRight = actionCollection()->addAction("next_tab");
     changeTabRight->setText(QApplication::layoutDirection() ? selectTabLeftString : selectTabRightString);
     changeTabRight->setShortcut(QApplication::layoutDirection() ?
                     QKeySequence(Qt::SHIFT+Qt::Key_Left) : QKeySequence(Qt::SHIFT+Qt::Key_Right));
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #876813:876814
@@ -43,6 +43,7 @@
 class KMenu;
 class KMenuBar;
 class KUndoStack;
+class KAction;
 
 // Qt forward declarations
 class QStackedWidget;
@@ -1062,8 +1063,8 @@
     KPlayerPopupSliderAction* zoomAction;
 
     QAction* m_langAct[Uml::pl_Reserved];
-    QAction* deleteSelectedWidget;
-    QAction* deleteDiagram;
+    KAction* deleteSelectedWidget;
+    KAction* deleteDiagram;
 
     QToolButton* m_newSessionButton;
     KMenu* m_diagramMenu;