diff options
Diffstat (limited to 'atlantik/client')
| -rw-r--r-- | atlantik/client/atlantik.cpp | 13 | ||||
| -rw-r--r-- | atlantik/client/configdlg.cpp | 19 |
2 files changed, 0 insertions, 32 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(); |