diff options
Diffstat (limited to 'src/tork.cpp')
| -rw-r--r-- | src/tork.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/tork.cpp b/src/tork.cpp index d848ae9..df3c041 100644 --- a/src/tork.cpp +++ b/src/tork.cpp @@ -40,7 +40,6 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kiconloader.h> -#include <tdeversion.h> #include <tdemenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> @@ -1692,15 +1691,7 @@ void tork::optionsConfigureKeys() void tork::optionsConfigureToolbars() { // use the standard toolbar editor - #if defined(TDE_MAKE_VERSION) - # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); - # else - saveMainWindowSettings(TDEGlobal::config()); - # endif - #else - saveMainWindowSettings(TDEGlobal::config()); - #endif + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig())); dlg.exec(); @@ -1712,16 +1703,7 @@ void tork::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - #if defined(TDE_MAKE_VERSION) - # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); - # else - applyMainWindowSettings(TDEGlobal::config()); - # endif - #else - applyMainWindowSettings(TDEGlobal::config()); - #endif - + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void tork::copyOldConfig() |