Remove use of TDE_VERSIONHEADmaster

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

4 files changed, 2 insertions, 62 deletions

diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 2d0231a7..714ad381 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -239,9 +239,7 @@ void KompareShell::setupActions()
 	              actionCollection(), "file_blend_url" );
 	KStdAction::quit( this, TQ_SLOT( slotFileClose() ), actionCollection() );
 
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
 	createStandardStatusBarAction();
-#endif
 	setStandardToolBarMenuEnabled(true);
 	m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQ_SLOT(slotShowTextView()),
 	                                  actionCollection(), "options_show_text_view" );
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index fc362e0f..7529017d 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -119,10 +119,7 @@ TopLevel::TopLevel(const char *name)
 
   setupPartSelection(_partSelection);
 
-  // KCachegrind for KDE 3.0.x does not allow to hide toolbars...
-#if TDE_VERSION >= 308 // KDE 3.1
   setStandardToolBarMenuEnabled(true);
-#endif
 
   // QT dock windows are created before (using QT position restoring)
   createGUI();
@@ -507,12 +504,7 @@ void TopLevel::createMiscActions()
   action->setWhatsThis( hint );
 
   action = new TDEAction( i18n( "&Reload" ), "reload",
-#if TDE_VERSION > 0x030190
-  // for KDE 3.2: TDEStdAccel::key is deprecated
-			TDEStdAccel::shortcut(TDEStdAccel::Reload),
-#else
-                        TDEStdAccel::key(TDEStdAccel::Reload),
-#endif
+                        TDEStdAccel::shortcut(TDEStdAccel::Reload),
                         this, TQ_SLOT( reload() ), actionCollection(), "reload" );
   hint = i18n("<b>Reload Profile Data</b>"
               "<p>This loads any new created parts, too.</p>");
@@ -529,12 +521,7 @@ void TopLevel::createMiscActions()
 
 
   _taDump = new TDEToggleAction( i18n( "&Force Dump" ), "edit-redo",
-#if TDE_VERSION > 0x030190
-  // for KDE 3.2: TDEStdAccel::key is deprecated
-			       TDEStdAccel::shortcut(TDEStdAccel::Redo),
-#else
-                               TDEStdAccel::key(TDEStdAccel::Redo),
-#endif
+                               TDEStdAccel::shortcut(TDEStdAccel::Redo),
                                this, TQ_SLOT( forceTrace() ),
                                actionCollection(), "dump" );
   hint = i18n("<b>Force Dump</b>"
@@ -616,10 +603,7 @@ void TopLevel::createMiscActions()
 				    this, TQ_SLOT(togglePercentage()),
 				    actionCollection(),
 				    "view_percentage");
-#if TDE_VERSION >= 0x030290
-  // for KDE 3.3: show another text instead of a checkmark
   _taPercentage->setCheckedState(i18n("Show Absolute Costs"));
-#endif
 
   hint = i18n("Show relative instead of absolute costs");
   _taPercentage->setToolTip( hint );
@@ -654,10 +638,7 @@ void TopLevel::createMiscActions()
 				 TDEShortcut(),
 				 this, TQ_SLOT( toggleCycles() ), actionCollection(),
 				 "view_cycles" );
-#if TDE_VERSION >= 0x030290
-  // for KDE 3.3: show another text instead of a checkmark
   _taCycles->setCheckedState(i18n("Skip Cycle Detection"));
-#endif
 
   hint = i18n("<b>Detect recursive cycles</b>"
               "<p>If this is switched off, the treemap drawing will show "
@@ -796,15 +777,7 @@ void TopLevel::createMiscActions()
   _taSplitDir->setToolTip( hint );
   _taSplitDir->setWhatsThis( hint );
 
-  // copied from KMail...
-#if TDE_VERSION >= 308 // KDE 3.1
   KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() );
-#else
-  (void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
-                                i18n("Show \"Tip of the Day\"") ),
-                      0, this, TQ_SLOT(slotShowTip()),
-                      actionCollection(), "help_show_tip" );
-#endif
 }
 
 void TopLevel::createActions()
@@ -969,12 +942,7 @@ void TopLevel::querySlot()
 
 void TopLevel::configureKeys()
 {
-#if TDE_VERSION > 0x030190
-  // for KDE 3.2: KKeyDialog::configureKeys is deprecated
   KKeyDialog::configure(actionCollection(), this, true);
-#else
-  KKeyDialog::configureKeys(actionCollection(), xmlFile(), true, this);
-#endif
 }
 
 
@@ -1016,12 +984,7 @@ void TopLevel::loadTrace(const KURL& url)
 
   // network transparancy
   TQString tmpFile;
-#if TDE_VERSION > 0x030190
-  // for KDE 3.2: TDEIO::NetAccess::download with 2 args is deprecated
   if(TDEIO::NetAccess::download( url, tmpFile, this )) {
-#else
-  if(TDEIO::NetAccess::download( url, tmpFile )) {
-#endif
     _openRecent->addURL(url);
     _openRecent->saveEntries( TDEGlobal::config() );
 
@@ -1065,12 +1028,7 @@ void TopLevel::addTrace(const KURL& url)
 
   // network transparancy
   TQString tmpFile;
-#if TDE_VERSION > 0x030190
-  // for KDE 3.2: TDEIO::NetAccess::download with 2 args is deprecated
   if(TDEIO::NetAccess::download( url, tmpFile, this )) {
-#else
-  if(TDEIO::NetAccess::download( url, tmpFile )) {
-#endif
     _openRecent->addURL(url);
     _openRecent->saveEntries( TDEGlobal::config() );
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index a9ce6789..d63fb635 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -30,11 +30,6 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <tdeversion.h>
-#if (TDE_VERSION_MINOR==0) && (TDE_VERSION_MAJOR==3)
-#include <kdevkurl.h>
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // Namespace URLUtil
 ///////////////////////////////////////////////////////////////////////////////
@@ -129,11 +124,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
 
 TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL &url )
 {
-#if (TDE_VERSION_MINOR!=0) || (TDE_VERSION_MAJOR!=3)
   KURL baseDirUrl = KURL::fromPathOrURL( basePath );
-#else
-  KURL baseDirUrl = KdevKURL::fromPathOrURL( basePath );
-#endif
   return extractPathNameRelative( baseDirUrl, url );
 }
 
@@ -141,13 +132,8 @@ TQString URLUtil::extractPathNameRelative(const TQString &basePath, const KURL &
 
 TQString URLUtil::extractPathNameRelative(const TQString &basePath, const TQString &absFilePath )
 {
-#if (TDE_VERSION_MINOR!=0) || (TDE_VERSION_MAJOR!=3)
   KURL baseDirUrl = KURL::fromPathOrURL( basePath ),
        fileUrl = KURL::fromPathOrURL( absFilePath );
-#else
-  KURL baseDirUrl = KdevKURL::fromPathOrURL( basePath ),
-       fileUrl = KdevKURL::fromPathOrURL( absFilePath );
-#endif
   return extractPathNameRelative( baseDirUrl, fileUrl );
 }
 
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 48a46f7a..25e9e821 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -261,9 +261,7 @@ void UMLApp::initActions() {
                                        this, TQ_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
     viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0,
                                      this, TQ_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
-#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
     viewShowGrid->setCheckedState(i18n("&Hide Grid"));
-#endif
     deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0,
                                 this, TQ_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
     viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image-x-generic"), 0,