Remove use of KDE_IS_VERSIONHEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 0 insertions, 79 deletions

diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 6de00068..f976a3fd 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -28,7 +28,6 @@
 
 // kde includes
 #include <tdeconfig.h>
-#include <tdeversion.h>
 #include <kdebug.h>
 #include <tdestandarddirs.h>
 
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index 79be6dac..c7129003 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -73,15 +73,7 @@ TDEIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
       destDir, false);
   if (!errors.empty())
   {
-#if KDE_IS_VERSION(3,4,0)
     KMessageBox::errorList(app, i18n("Some errors happened when exporting the images:"), errors);
-#else
-    TQString errorsCaption;
-    for (TQStringList::Iterator it = errors.begin(); it != errors.end(); ++it) {
-        errorsCaption += "\n" + *it;
-    }
-    KMessageBox::error(app, i18n("Some errors happened when exporting the images:") + errorsCaption);
-#endif
     return 0;
   }
 
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index ae015af5..149b221e 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -151,14 +151,9 @@ TDEStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI) {
     cfg->setGroup( "General Options" );
     bool showLogo = cfg->readBoolEntry( "logo", true );
     if (showGUI && showLogo) {
-#if KDE_IS_VERSION(3,3,90)
         startLogo = new TDEStartupLogo(0);
         startLogo->setHideEnabled(true);
         KWin::setMainWindow(startLogo, UMLApp::app()->winId());
-#else
-        startLogo = new TDEStartupLogo(UMLApp::app());
-        startLogo->setHideEnabled(true);
-#endif
         KWin::setState(startLogo->winId(), NET::KeepAbove);
         startLogo->show();
         TQApplication::flushX();
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 46c874c2..48a46f7a 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -318,11 +318,7 @@ void UMLApp::initActions() {
     initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI()
 
     // use the absolute path to your umbrelloui.rc file for testing purpose in setupGUI();
-#if KDE_IS_VERSION(3,2,90)
     setupGUI();
-#else
-    createGUI();
-#endif
     TQPopupMenu* menu = findMenu( menuBar(), TQString("settings") );
     menu->insertItem(i18n("&Windows"), dockHideShowMenu(), -1, 0);
 }
@@ -406,10 +402,7 @@ void UMLApp::initView() {
     if (optionState.generalState.tabdiagrams) {
         m_viewStack = NULL;
         m_tabWidget = new KTabWidget(m_mainDock, "tab_widget");
-
-#if KDE_IS_VERSION(3,3,89)
         m_tabWidget->setAutomaticResizeTabs( true );
-#endif
 
         m_newSessionButton = new TDEToolBarButton("tab_new", 0, m_tabWidget);
         m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) );
@@ -856,39 +849,6 @@ void UMLApp::slotEditPaste() {
     m_doc -> setModified( true );
 }
 
-//Remove these once we stop supporting KDE 3.1
-// #if !KDE_IS_VERSION(3,1,90)
-
-void UMLApp::slotViewToolBar() {
-    slotStatusMsg(i18n("Toggling toolbar..."));
-
-    ///////////////////////////////////////////////////////////////////
-    // turn Toolbar on or off
-
-    if(!viewToolBar->isChecked()) {
-        toolBar("mainToolBar")->hide();
-    } else {
-        toolBar("mainToolBar")->show();
-    }
-
-    slotStatusMsg(i18n("Ready."));
-}
-
-void UMLApp::slotViewStatusBar() {
-    slotStatusMsg(i18n("Toggle the statusbar..."));
-    ///////////////////////////////////////////////////////////////////
-    //turn Statusbar on or off
-    if(!viewStatusBar->isChecked()) {
-        statusBar()->hide();
-    } else {
-        statusBar()->show();
-    }
-
-    slotStatusMsg(i18n("Ready."));
-}
-// #endif
-
-
 void UMLApp::slotStatusMsg(const TQString &text) {
     ///////////////////////////////////////////////////////////////////
     // change status message permanently
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 23051ab2..fe947ab3 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -22,7 +22,6 @@
 #include <tqdict.h>
 
 #include <kdockwidget.h>
-#include <tdeversion.h>
 #include <kurl.h>
 
 // forward declaration of the UML classes
@@ -521,18 +520,6 @@ public slots:
     void slotEditPaste();
 
     /**
-     * Toggles the toolbar.
-     * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1
-     */
-    void slotViewToolBar();
-
-    /**
-     * Toggles the statusbar.
-     * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1
-     */
-    void slotViewStatusBar();
-
-    /**
      * Autolayouts the current class diagram
      */
     void slotAutolayout();
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index fec8cc85..570e5c71 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -23,7 +23,6 @@
 
 // kde includes
 #include <tdeapplication.h>
-#include <tdeversion.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
@@ -578,14 +577,11 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         }
         archive->addLocalFile(tmp_xmi_file.name(), tmpTQString);
         archive->close();
-
-#if KDE_IS_VERSION(3,4,89)
         if (!archive->closeSucceeded())
         {
             KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
-#endif
         // now the xmi file was added to the archive, so we can delete it
         tmp_xmi_file.close();
         tmp_xmi_file.unlink();
diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp
index aeb53301..dded1875 100644
--- a/umbrello/umbrello/umlviewimageexporterall.cpp
+++ b/umbrello/umbrello/umlviewimageexporterall.cpp
@@ -60,15 +60,7 @@ void UMLViewImageExporterAll::exportAllViews() {
                                 UMLViewImageExporterModel::mimeTypeToImageType(m_dialog->m_imageType->currentFilter()),
                                 KURL(m_dialog->m_kURL->url()), m_dialog->m_useFolders->isChecked());
     if (!errors.empty()) {
-#if KDE_IS_VERSION(3,4,0)
         KMessageBox::errorList(app, i18n("Some errors happened when exporting the images:"), errors);
-#else
-        TQString errorsCaption;
-        for (TQStringList::Iterator it = errors.begin(); it != errors.end(); ++it) {
-            errorsCaption += "\n" + *it;
-        }
-        KMessageBox::error(app, i18n("Some errors happened when exporting the images:") + errorsCaption);
-#endif
     }
     umlDoc->writeToStatusBar(i18n("Ready."));
 }