Remove use of KDE_IS_VERSION

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

4 files changed, 4 insertions, 35 deletions

diff --git a/konversation/src/emoticon.cpp b/konversation/src/emoticon.cpp
index 0d57bfb..1b26b9a 100644
--- a/konversation/src/emoticon.cpp
+++ b/konversation/src/emoticon.cpp
@@ -64,21 +64,8 @@ namespace Konversation
             return;
         }
 
-        #if KDE_IS_VERSION(3,3,91)
         TQString filename = TDEGlobal::dirs()->findResource("emoticons",  themeName + "/emoticons.xml");
         self()->m_themeName = themeName;
-        #else
-        TQString app = "konversation";
-        TQString filename = TDEGlobal::dirs()->findResource("data", app + "/pics/emoticons/" + themeName + "/emoticons.xml");
-
-        if(filename.isEmpty())
-        {
-            app = "kopete";
-            filename = TDEGlobal::dirs()->findResource("data", app + "/pics/emoticons/" + themeName + "/emoticons.xml");
-        }
-        self()->m_themeName = app + '/' + themeName;
-        #endif
-
         if(filename.isEmpty())
         {
             return;
@@ -174,20 +161,11 @@ namespace Konversation
         //  Copyright (c) 2002      by Olivier Goffart        <ogoffart@tiscalinet.be>
         //
         TDEStandardDirs *dirs = TDEGlobal::dirs();
-        TQString pic;
-
-        #if KDE_IS_VERSION(3,3,91)
         TQString file = self()->m_themeName + '/' + filename;
         const char* resource = "emoticons";
-        #else
-        TQString app = self()->m_themeName.section('/', 0, 0);
-        TQString dir = self()->m_themeName.section('/', 1);
-        TQString file = app + "/pics/emoticons/" + dir + '/' + filename;
-        const char* resource = "data";
-        #endif
 
         //maybe an extension was given, so try to find the exact file
-        pic = dirs->findResource(resource, file);
+        TQString pic = dirs->findResource(resource, file);
 
         if(pic.isEmpty())
         {
diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp
index a363066..e7028a7 100644
--- a/konversation/src/nicklistview.cpp
+++ b/konversation/src/nicklistview.cpp
@@ -115,9 +115,7 @@ TDEListView(parent)
         kdWarning() << "NickListView::NickListView(): Could not create popup!" << endl;
     }
 
-    #if KDE_IS_VERSION(3,3,90)
     setShadeSortColumn(false);
-    #endif
 
     // We have our own tooltips, don't use the default TQListView ones
     setShowToolTips(false);
diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
index 13b5984..c280aaf 100644
--- a/konversation/src/outputfilter.cpp
+++ b/konversation/src/outputfilter.cpp
@@ -1691,10 +1691,9 @@ namespace Konversation
             // Parameter is an IP address
             if (address.isIPv4Addr() || address.isIPv6Addr())
             {
-            // Disable the reverse resolve codepath on older KDE versions due to many
-            // distributions shipping visibility-enabled KDE 3.4 and KNetwork not 
-            // coping with it.
-#if KDE_IS_VERSION(3,5,1)
+                // Disable the reverse resolve codepath on older KDE versions due to many
+                // distributions shipping visibility-enabled KDE 3.4 and KNetwork not 
+                // coping with it.
                 KNetwork:: KInetSocketAddress socketAddress(address,0);
                 TQString resolvedTarget;
                 TQString serv; // We don't need this, but KReverseResolver::resolve does.
@@ -1709,9 +1708,6 @@ namespace Konversation
                 {
                     result = error(i18n("Unable to resolve %1").arg(target));
                 }
-#else
-                result = error(i18n("Reverse-resolving requires KDE version 3.5.1 or higher."));
-#endif
             }
             // Parameter is presumed to be a host due to containing a dot. Yeah, it's dumb.
             // FIXME: The reason we detect the host by occurrence of a dot is the large penalty
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index cf839af..959a203 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -389,10 +389,7 @@ void ViewContainer::updateTabWidgetAppearance()
         m_tabWidget->cornerWidget()->hide();
 
     m_tabWidget->setHoverCloseButton(Preferences::closeButtons());
-
-    #if KDE_IS_VERSION(3,4,0)
     m_tabWidget->setAutomaticResizeTabs(Preferences::useMaxSizedTabs());
-    #endif
 }
 
 void ViewContainer::updateViewActions(int index)