[Uml-devel] KDE_3_2_BRANCH: kdesdk/umbrello/umbrello

[Stephan Kulow]

CVS commit by coolo: 

I'm afraid you can't #ifdef in Q_OBJECT headers like that - fixing build ;(


  M +0 -9      uml.cpp   1.85.2.1
  M +0 -16     uml.h   1.30.2.1


--- kdesdk/umbrello/umbrello/uml.cpp  #1.85:1.85.2.1
@@ -151,11 +151,6 @@ void UMLApp::initActions() {
         editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection());
         editPaste = KStdAction::paste(this, SLOT(slotEditPaste()), actionCollection());
-#if KDE_VERSION >= 0x030190
         createStandardStatusBarAction();
         setStandardToolBarMenuEnabled(true);
-#else
-        viewToolBar = KStdAction::showToolbar(this, SLOT(slotViewToolBar()), actionCollection());
-        viewStatusBar = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()), actionCollection());
-#endif
         selectAll = KStdAction::selectAll(this,  SLOT( slotSelectAll() ), actionCollection());
 
@@ -186,8 +181,4 @@ 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
-        viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
-        viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
-#endif
         preferences->setStatusText( i18n( "Set the default program preferences") );
 

--- kdesdk/umbrello/umbrello/uml.h  #1.30:1.30.2.1
@@ -446,16 +446,4 @@ public slots:
         void slotEditPaste();
 
-#if KDE_VERSION < 0x030190
-        /**
-         * Toggles the toolbar.
-         */
-        void slotViewToolBar();
-
-        /**
-         * Toggles the statusbar.
-         */
-        void slotViewStatusBar();
-#endif
-
         /**
          * Changes the statusbar contents for the standard label
@@ -803,8 +791,4 @@ private:
         KAction* deleteSelectedWidget;
         KAction* deleteDiagram;
-#if KDE_VERSION < 0x030190
-        KToggleAction* viewToolBar;
-        KToggleAction* viewStatusBar;
-#endif
         WorkToolBar* toolsbar;
         QTimer* m_clipTimer;