[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs

[Oliver Kellogg]

SVN commit 625646 by okellogg:

sync with trunk (r625600)

 M  +2 -2      activitydialog.h  
 M  +0 -3      settingsdlg.h  
 M  +2 -2      statedialog.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/activitydialog.h #625645:625646
@@ -52,7 +52,7 @@
         return m_bChangesMade;
     }
 
-protected:
+protected slots:
 
     enum Page
     {
@@ -70,7 +70,7 @@
     *   Entered when Apply button pressed.
     */
     void slotApply();
-
+protected:
     /**
     *   Sets up the pages of the dialog.
     */
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/settingsdlg.h #625645:625646
@@ -165,9 +165,6 @@
     KConfig * m_pCfg;
     bool m_bChangesApplied;
 
-    //signals
-signals:
-    //slots
 private slots:
     void slotApply();
     void slotOk();
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/statedialog.h #625645:625646
@@ -51,7 +51,7 @@
         return m_bChangesMade;
     }
 
-protected:
+protected slots:
 
     enum Page
     {
@@ -70,7 +70,7 @@
     *   Entered when Apply button pressed.
     */
     void slotApply();
-
+protected:
     /**
     *   Sets up the pages of the dialog.
     */