Remove use of KDE_IS_VERSIONHEADmaster

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

9 files changed, 6 insertions, 64 deletions

diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index feab944f1..56caa68ae 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -90,9 +90,7 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
   m_previewLabel->installEventFilter(this);
   m_documentList->installEventFilter(this);
   setFocusProxy(m_documentList);
-#if KDE_IS_VERSION(3,4,0)
   m_documentList->setShadeSortColumn(false);
-#endif
 
   KGuiItem openGItem(i18n("Use This Template"));
   m_openButton->setGuiItem(openGItem);
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 97775dd2e..7a9f5f0d5 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -102,9 +102,7 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString&
 
   m_sectionList->header()->hide();
   m_sectionList->setSorting(0);
-#if KDE_IS_VERSION(3,4,0)
   m_sectionList->setShadeSortColumn(false);
-#endif
   connect(m_sectionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
           this, TQ_SLOT(selectionChanged(TQListViewItem*)));
   connect(m_sectionList, TQ_SIGNAL(pressed(TQListViewItem*)),
diff --git a/lib/kofficecore/KoPictureClipart.cpp b/lib/kofficecore/KoPictureClipart.cpp
index 12a867110..dbb925110 100644
--- a/lib/kofficecore/KoPictureClipart.cpp
+++ b/lib/kofficecore/KoPictureClipart.cpp
@@ -26,9 +26,6 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#if ! KDE_IS_VERSION( 3,1,90 )
-#include <kdebugclasses.h>
-#endif
 
 #include "KoPictureKey.h"
 #include "KoPictureBase.h"
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index e2bc567c3..4e501b2c2 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -35,9 +35,6 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#if ! KDE_IS_VERSION( 3,1,90 )
-#include <kdebugclasses.h>
-#endif
 #include <tdetempfile.h>
 #include <tdeprocess.h>
 
diff --git a/lib/kofficecore/KoPictureWmf.cpp b/lib/kofficecore/KoPictureWmf.cpp
index 3f2d0a7e0..ec751865f 100644
--- a/lib/kofficecore/KoPictureWmf.cpp
+++ b/lib/kofficecore/KoPictureWmf.cpp
@@ -26,9 +26,6 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#if ! KDE_IS_VERSION( 3,1,90 )
-#include <kdebugclasses.h>
-#endif
 
 #include <kowmfpaint.h>
 #include "KoPictureKey.h"
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 5c7d09e8c..26a37b030 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -611,10 +611,7 @@ void KoView::slotAutoScroll(  )
 
     if ( actuallyDoScroll )
     {
-        int state=0;
-#if KDE_IS_VERSION(3,4,0)
-        state = tdeApp->keyboardMouseState();
-#endif
+        int state = tdeApp->keyboardMouseState();
 
         pos = canvas()->mapFrom(this, pos);
         TQMouseEvent * event = new TQMouseEvent(TQEvent::MouseMove, pos, 0, state);
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 1e63f54fc..eb1cfb04f 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -152,9 +152,7 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name)
 	setColumnWidthMode(0, TQListView::Maximum);
 	setFullWidth(true);
 	setShowSortIndicator(false);
-#if KDE_IS_VERSION(3,3,9)
 	setShadeSortColumn(false);
-#endif
 	setTooltipColumn(0);
 	setSorting(0);
 	setItemMargin(KPROPEDITOR_ITEM_MARGIN);
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 7abb6efb8..eb698c65c 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -35,25 +35,16 @@
 #include <tdestandarddirs.h>
 #include <tdetoolbar.h>
 
-#if KDE_IS_VERSION(3, 4, 0)
-  // The TDENewStuffSecure we use internaly for the GetHotNewStuff-functionality
-  // was introduced with KDE 3.4.
-  #define KROSS_SUPPORT_NEWSTUFF
-#endif
-
-#ifdef KROSS_SUPPORT_NEWSTUFF
-  #include <tdenewstuff/provider.h>
-  #include <tdenewstuff/engine.h>
-  #include <tdenewstuff/downloaddialog.h>
-  #include <tdenewstuff/knewstuffsecure.h>
-#endif
+#include <tdenewstuff/provider.h>
+#include <tdenewstuff/engine.h>
+#include <tdenewstuff/downloaddialog.h>
+#include <tdenewstuff/knewstuffsecure.h>
 
 #include "scriptguiclient.h"
 #include "scriptaction.h"
 
 namespace Kross { namespace Api {
 
-#ifdef KROSS_SUPPORT_NEWSTUFF
 class ScriptNewStuff : public TDENewStuffSecure
 {
     public:
@@ -65,7 +56,6 @@ class ScriptNewStuff : public TDENewStuffSecure
         ScriptGUIClient* m_scripguiclient;
         virtual void installResource() { m_scripguiclient->installScriptPackage( m_tarName ); }
 };
-#endif
 
 class ListItem : public TQListViewItem
 {
@@ -108,9 +98,7 @@ class WdgScriptsManagerPrivate
     friend class WdgScriptsManager;
     ScriptGUIClient* m_scripguiclient;
     ToolTip* m_tooltip;
-#ifdef KROSS_SUPPORT_NEWSTUFF
     ScriptNewStuff* newstuff;
-#endif
     //enum { LoadBtn = 0, UnloadBtn, InstallBtn, UninstallBtn, ExecBtn, NewStuffBtn };
 };
 
@@ -120,9 +108,7 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
 {
     d->m_scripguiclient = scr;
     d->m_tooltip = new ToolTip(scriptsList);
-#ifdef KROSS_SUPPORT_NEWSTUFF
     d->newstuff = 0;
-#endif
 
     scriptsList->header()->hide();
     //scriptsList->header()->setClickEnabled(false);
@@ -147,10 +133,8 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 ));
     connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
-#ifdef KROSS_SUPPORT_NEWSTUFF
     btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));
     connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
-#endif
 /*
     toolBar->setIconText( TDEToolBar::IconTextRight );
 
@@ -166,11 +150,9 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall"));
     toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
-#ifdef KROSS_SUPPORT_NEWSTUFF
     toolBar->insertLineSeparator();
     toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));
     toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
-#endif
 */
     connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ),
             this, TQ_SLOT( slotFillScriptsList() ));
@@ -319,7 +301,6 @@ void WdgScriptsManager::slotUnloadScript()
 
 void WdgScriptsManager::slotGetNewScript()
 {
-#ifdef KROSS_SUPPORT_NEWSTUFF
     const TQString appname = tdeApp->name();
     const TQString type = TQString("%1 1.x script").arg(appname);
 
@@ -338,7 +319,6 @@ void WdgScriptsManager::slotGetNewScript()
 
     p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml");
     d->exec();
-#endif
 }
 
 void WdgScriptsManager::slotResourceInstalled()
diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp
index b58829c09..734f9135b 100644
--- a/lib/store/KoZipStore.cpp
+++ b/lib/store/KoZipStore.cpp
@@ -26,10 +26,6 @@
 #include <tdeversion.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
-#if ! KDE_IS_VERSION( 3, 4, 1 )
-#include <tqdir.h>
-#include <tqfileinfo.h>
-#endif
 
 KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification )
 {
@@ -38,23 +34,7 @@ KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString
                     << " mimetype = " << appIdentification << endl;
 
     m_pZip = new KZip( _filename );
-
-#if ! KDE_IS_VERSION( 3, 4, 1 )
-    // Workaround for KZip KSaveFile double deletion in tdelibs-3.4,
-    // when trying to write to a non-writable directory.
-    TQDir dir( TQFileInfo( _filename ).dir() );
-    if (_mode == Write && !TQFileInfo( dir.path() ).isWritable()  )
-    {
-        kdWarning(s_area) << dir.path() << " isn't writable" << endl;
-        m_bGood = false;
-        m_currentDir = 0;
-        KoStore::init( _mode );
-    }
-    else
-#endif
-    {
-        m_bGood = init( _mode, appIdentification ); // open the zip file and init some vars
-    }
+    m_bGood = init( _mode, appIdentification ); // open the zip file and init some vars
 }
 
 KoZipStore::KoZipStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification )