Remove use of KDE_IS_VERSIONHEADmaster

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

9 files changed, 0 insertions, 62 deletions

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 4ef617c1..32e07bd8 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -533,11 +533,7 @@ void CatalogManager::setupActions()
     action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQ_SLOT(slotDeleteFile()),actionCollection(), "delete");
     action->setEnabled(false);
 
-#if KDE_IS_VERSION( 3, 2, 90 )
     setupGUI();
-#else
-    createGUI();
-#endif
 }
 
 void CatalogManager::setupStatusBar()
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index bec8791a..cea0a949 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -41,7 +41,6 @@
 #include <tqguardedptr.h>
 #include <tqmap.h>
 
-#include <tdeversion.h>
 #include <tdemainwindow.h>
 #include <kdirwatch.h>
 #include <tdeprocess.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index f8de3fc5..30044bba 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -70,7 +70,6 @@
 #include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <twin.h>
-#include <tdeversion.h>
 #include <tdetempfile.h>
 
 #include <tqfileinfo.h>
@@ -438,11 +437,7 @@ void CatalogManagerView::loadMarks()
     if( url.isEmpty() ) return;
 
     TQString filename;
-#if KDE_IS_VERSION( 3, 2, 90 )
     if (!TDEIO::NetAccess::download( url, filename, this ) )
-#else
-    if( !TDEIO::NetAccess::download( url, filename ) )
-#endif
     {
 	KMessageBox::error(this,i18n(
 	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
@@ -523,12 +518,8 @@ void CatalogManagerView::saveMarks()
 	}
     }
 
-#if KDE_IS_VERSION( 3, 4, 92 )
     // Support for partially remote TDEIO slave like media:
     const KURL url ( TDEIO::NetAccess::mostLocalURL( url2, this ) );
-#else
-    const KURL url ( url2 );
-#endif
     kdDebug() << "Saving marks: " << url2.prettyURL() << " most-local: " << url.prettyURL() << endl;
     
     TQFile* file = 0;
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 471660f0..585d5a5b 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -79,11 +79,7 @@ void KBabelMailer::sendOneFile(const TQString& fileName)
 
 void KBabelMailer::sendOneFile( const KURL& url)
 {
-#if KDE_IS_VERSION( 3, 5, 0)
   const KURL localUrl( TDEIO::NetAccess::mostLocalURL( url, m_parent ) );
-#else
-  const KURL localUrl( url );
-#endif
   if ( localUrl.isLocalFile() )
   {
     sendOneFile( localUrl.path() );
@@ -182,12 +178,8 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
   // add files to this archive
   TQStringList::const_iterator it;
   for (it = fileList.constBegin(); it != fileList.constEnd(); ++it) {
-#if KDE_IS_VERSION( 3, 5, 0 )
     // Try to get a local URL instead of a remote one
     const KURL url( TDEIO::NetAccess::mostLocalURL( KURL::fromPathOrURL( *it ), m_parent ) );
-#else
-    const KURL url( KURL::fromPathOrURL( *it ) );
-#endif
     TQString poTempName;
     if ( !TDEIO::NetAccess::download( url, poTempName, m_parent ) ) {
       KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) );
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 6b1719a7..0ddfea84 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -52,7 +52,6 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kurl.h>
-#include <tdeversion.h>
 #include <tdeio/netaccess.h>
 
 #include <klibloader.h>
@@ -127,20 +126,12 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir,
     // Find the directory name of the PO file, if the PO file is local
     // ### TODO: find a way to allow remote files too
     TQString poDir;
-#if KDE_IS_VERSION( 3, 5, 0 )
     const KURL localUrl( TDEIO::NetAccess::mostLocalURL( urlPoFile, m_parent ) );
     if ( localUrl.isLocalFile() )
     {
         const TQFileInfo fi( localUrl.path() );
         poDir = fi.dirPath( true );
     }
-#else
-    if ( urlPoFile.isLocalFile() )
-    {
-        const TQFileInfo fi( urlPoFile.path() );
-        poDir = fi.dirPath( true );
-    }
-#endif
 
 #if 0
     kdDebug() << "CONTEXT VARIABLE START" << endl;
diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h
index b131fe76..1ebd9bb1 100644
--- a/kbabel/kbabel/kbabel.h
+++ b/kbabel/kbabel/kbabel.h
@@ -40,7 +40,6 @@
 #endif
 
 #include <tdeapplication.h>
-#include <tdeversion.h>
 #include <kdockwidget.h>
 #include <tqstringlist.h>
 #include <tqptrlist.h>
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index adb07ac7..8b5a1469 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -56,7 +56,6 @@
 #include <tqvbox.h>
 
 #include <dcopclient.h>
-#include <tdeversion.h>
 #include <kcharsets.h>
 #include <kcmenumngr.h>
 #include <tdeconfigdialog.h>
@@ -1105,11 +1104,7 @@ void KBabelView::open()
 
 void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfModified, bool newView)
 {
-#if KDE_IS_VERSION( 3, 5, 0)
    KURL url = TDEIO::NetAccess::mostLocalURL(_url,this);
-#else
-   KURL url = _url;
-#endif
    url.cleanPath();
 
    KURL cu = currentURL();
@@ -1675,19 +1670,11 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
           }
           else
           {
-#if KDE_IS_VERSION ( 3, 4, 0 )
               msg += "\n";
               msg += i18n("Please edit the file again.");
               msg += "\n\n";
               msg += i18n("Output of \"msgfmt --statistics\":\n");
               KMessageBox::errorList( this, msg, outputLines );
-#else
-              msg += i18n("Output of \"msgfmt --statistics\":\n");
-              msg += output;
-              msg += "\n\n";
-              msg += i18n("Please edit the file again.");
-              KMessageBox::error( this, msg );
-#endif
               returnCode=false;
           }
           break;
@@ -1713,16 +1700,9 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
             }
             else
             {
-#if KDE_IS_VERSION ( 3, 4, 0 )
                  msg += "\n";
                  msg += i18n("Please edit the file again.");
                  KMessageBox::errorList( this, msg, outputLines );
-#else
-                 msg += output;
-                 msg += "\n\n";
-                 msg += i18n("Please edit the file again.");
-                 KMessageBox::error( this, msg );
-#endif
                  returnCode=false;
             }
 
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 37132825..49276760 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -119,11 +119,7 @@ int KBabelApp::newInstance()
     }
 
     // see if we are starting with session management
-#if KDE_IS_VERSION(3,3,0)
     if (!restoringSession())
-#else
-    if (!isRestored() || !first)
-#endif
     {
 	kdDebug () << "Suspending DCOP" << endl;
 	tdeApp->dcopClient()->suspend();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 9fee3217..5c5b9f53 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -32,7 +32,6 @@
 #include <tqprogressdialog.h>
 
 #include <tqinputdialog.h>
-#include <tdeversion.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
@@ -1110,14 +1109,9 @@ KDBSearchEngine::saveSettings (TDEConfigBase * config)
 {
 // updateSettings();  //maybe with autoupdate
     TDEConfigGroupSaver cgs (config, "KDBSearchEngine");
-#if KDE_IS_VERSION(3,1,3)
     config->writePathEntry ("Filename", dbname);
-#else
-    config->writeEntry ("Filename", dbname);
-#endif
     config->writeEntry ("Language", lang);
 
-
     config->writeEntry ("CaseSensitive", sens);
     config->writeEntry ("Normalize", norm);
     config->writeEntry ("RemoveContext", comm);