Remove use of TDE_VERSIONr14.1.x

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7687f0bf43991d63a9dae43d9d53f97c550d8e9c)

4 files changed, 1 insertions, 49 deletions

diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 9f442da7..c4ebbc0e 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -35,15 +35,6 @@
 #include <kstdgameaction.h>
 #include <kstdaction.h>
 #include <tdetoolbar.h>
-
-#include <tdeversion.h>
-#undef KDE_3_2_FEATURES
-#if defined(TDE_MAKE_VERSION)
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
-	#define KDE_3_2_FEATURES
-#endif
-#endif
-
 #include <kdebug.h>
 
 #include <atlantic_core.h>
@@ -66,11 +57,7 @@
 
 LogTextEdit::LogTextEdit( TQWidget *parent, const char *name ) : TQTextEdit( parent, name )
 {
-#ifdef KDE_3_2_FEATURES
 	m_clear = KStdAction::clear( this, TQ_SLOT( clear() ), 0 );
-#else
-	m_clear = new TDEAction( i18n("Clear"), "clear", NULL, this, TQ_SLOT( clear() ), static_cast<TDEActionCollection *>(0), "clear" );
-#endif
 	m_selectAll = KStdAction::selectAll( this, TQ_SLOT( selectAll() ), 0 );
 	m_copy = KStdAction::copy( this, TQ_SLOT( copy() ), 0 );
 }
diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp
index a954cc7b..b8c39ece 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -19,18 +19,6 @@
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
 
-#include <tdeversion.h>
-#undef KDE_3_1_FEATURES
-#undef KDE_3_3_FEATURES
-#if defined(TDE_MAKE_VERSION)
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
-#define KDE_3_1_FEATURES
-#endif
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,90)
-#define KDE_3_3_FEATURES
-#endif
-#endif
-
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
@@ -147,15 +135,8 @@ TQString ConfigPlayer::playerImage()
 void ConfigPlayer::chooseImage()
 {
 	TDEIconDialog iconDialog( this, "iconDialog" );
-#ifdef KDE_3_1_FEATURES
 	iconDialog.setCustomLocation( locate("appdata", "themes/default/tokens/") );
-#endif
-		
-#ifdef KDE_3_3_FEATURES
 	iconDialog.setup( TDEIcon::Desktop, TDEIcon::Application, false, 0, true, true, true ); // begin with user icons, lock editing
-#else
-	iconDialog.setup( TDEIcon::Desktop, TDEIcon::Application, false, 0, true ); // begin with user icons
-#endif
 
 	TQString image = iconDialog.openDialog();
 
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 4d7ba21e..a8ba71ed 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -21,7 +21,6 @@
 #include <tqcursor.h>
 
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kdialogbase.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
@@ -404,14 +403,10 @@ void EstateView::paintEvent(TQPaintEvent *)
 		TQFont font = TQFont( TDEGlobalSettings::generalFont().family(), TDEGlobalSettings::generalFont().pointSize(), TQFont::Normal );
 		painter.setFont(font);
 		TQString estateName = m_estate->name();
-#if defined(TDE_MAKE_VERSION)
-#if TDE_VERSION >= TDE_MAKE_VERSION(3,2,0)
-                if ( m_estate->color().isValid() && ( m_orientation == West || m_orientation == East ) )
+		if ( m_estate->color().isValid() && ( m_orientation == West || m_orientation == East ) )
 			estateName = KStringHandler::rPixelSqueeze( m_estate->name(), TQFontMetrics( font ), 3*width()/4 );
 		else
 			estateName = KStringHandler::rPixelSqueeze( m_estate->name(), TQFontMetrics( font ), width() );
-#endif
-#endif
 		if (m_estate->color().isValid() && m_orientation == West)
                         painter.drawText( width()/4 + 2, height()/2, estateName );
 		else
diff --git a/atlantik/tdeio_atlantik/tdeio_atlantik.cpp b/atlantik/tdeio_atlantik/tdeio_atlantik.cpp
index a2860c5b..5a5aff42 100644
--- a/atlantik/tdeio_atlantik/tdeio_atlantik.cpp
+++ b/atlantik/tdeio_atlantik/tdeio_atlantik.cpp
@@ -18,13 +18,6 @@
 
 #include <tqtextstream.h>
 
-#include <tdeversion.h>
-#undef KDE_3_1_FEATURES
-#ifdef TDE_MAKE_VERSION
-#if TDE_VERSION > TDE_MAKE_VERSION (3, 1, 0)
-#define KDE_3_1_FEATURES
-#endif
-#endif
 #include <tdeio/slavebase.h>
 #include <tdeinstance.h>
 #include <kprocess.h>
@@ -48,11 +41,7 @@ void AtlantikProtocol::get( const KURL& url )
 	TDEProcess *proc = new TDEProcess;
 	*proc << "atlantik";
 
-#ifdef KDE_3_1_FEATURES
 	TQString host = url.hasHost() ? url.host() : TDEProcess::quote( url.queryItem("host") );
-#else
-	TQString host = url.hasHost() ? url.host() : url.queryItem("host");
-#endif
 	TQString port = TQString::number( url.port() ? url.port() : 1234 );
 	int game = url.queryItem("game").toInt();
 	TQString gameString = game ? TQString::number( game ) : TQString();