[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

remove #ifdefs from uml.h because moc can't handle them, tidy up other but keep them in for compatibility with KDE 3.1.


  M +5 -4      uml.cpp   1.86
  M +7 -4      uml.h   1.31


--- kdesdk/umbrello/umbrello/uml.cpp  #1.85:1.86
@@ -151,5 +151,5 @@ void UMLApp::initActions() {
         editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection());
         editPaste = KStdAction::paste(this, SLOT(slotEditPaste()), actionCollection());
-#if KDE_VERSION >= 0x030190
+#if KDE_IS_VERSION(3,1,90)
         createStandardStatusBarAction();
         setStandardToolBarMenuEnabled(true);
@@ -186,5 +186,5 @@ void UMLApp::initActions() {
         editCopy->setStatusText(i18n("Copies the selected section to the clipboard"));
         editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position"));
-#if KDE_VERSION < 0x030190
+#if !KDE_IS_VERSION(3,1,90)
         viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
         viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
@@ -770,5 +770,6 @@ void UMLApp::slotEditPaste() {
 }
 
-#if KDE_VERSION < 0x030190
+//Remove these once we stop supporting KDE 3.1
+// #if !KDE_IS_VERSION(3,1,90)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void UMLApp::slotViewToolBar() {
@@ -799,5 +800,5 @@ void UMLApp::slotViewStatusBar() {
         slotStatusMsg(i18n("Ready."));
 }
-#endif
+// #endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

--- kdesdk/umbrello/umbrello/uml.h  #1.30:1.31
@@ -446,7 +446,8 @@ public slots:
         void slotEditPaste();
 
-#if KDE_VERSION < 0x030190
+// #if !KDE_IS_VERSION(3,1,90)
         /**
          * Toggles the toolbar.
+         * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1
          */
         void slotViewToolBar();
@@ -454,7 +455,8 @@ public slots:
         /**
          * Toggles the statusbar.
+         * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1
          */
         void slotViewStatusBar();
-#endif
+// #endif
 
         /**
@@ -803,8 +805,9 @@ private:
         KAction* deleteSelectedWidget;
         KAction* deleteDiagram;
-#if KDE_VERSION < 0x030190
+//Remove these once we stop supporting KDE 3.1
+// #if !KDE_IS_VERSION(3,1,90)
         KToggleAction* viewToolBar;
         KToggleAction* viewStatusBar;
-#endif
+// #endif
         WorkToolBar* toolsbar;
         QTimer* m_clipTimer;