Remove use of TDE_VERSIONHEADmaster

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

9 files changed, 15 insertions, 150 deletions

diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h
index d9b564a6..8c929310 100644
--- a/kimagemapeditor/drawzone.h
+++ b/kimagemapeditor/drawzone.h
@@ -24,8 +24,6 @@
 #include <tqrect.h>
 #include <tqcursor.h>
 
-#include "tdeversion.h"
-
 class KImageMapEditor;
 class Area;
 
diff --git a/kimagemapeditor/imagemap.h b/kimagemapeditor/imagemap.h
index a403afd5..417fe230 100644
--- a/kimagemapeditor/imagemap.h
+++ b/kimagemapeditor/imagemap.h
@@ -23,8 +23,6 @@
 #include <tqpoint.h>
 #include <tqrect.h>
 
-#include "tdeversion.h"
-
 /**
   *@author Jan Schäfer
   */
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 20bb4bb7..79febb57 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -197,11 +197,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
 KImageMapEditor::~KImageMapEditor() {
   writeConfig();
 
-  #if TDE_VERSION < 300
-    delete accel;
-  #endif
   delete areas;
-
   delete currentSelected;
   delete copyArea;
   delete defaultArea;
@@ -622,10 +618,7 @@ void KImageMapEditor::setupActions()
                           "Click this to remove points from a polygon."));
   removePointAction->setExclusiveGroup("drawing");
 
-#if TDE_VERSION < 300
-    TDEAction *cancelAction =
-#endif
-      new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQ_SLOT( slotCancelDrawing() ),
+  new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQ_SLOT( slotCancelDrawing() ),
                               actionCollection(), "canceldrawing" );
 
   moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQ_SLOT( slotMoveLeft() ),
@@ -651,18 +644,6 @@ void KImageMapEditor::setupActions()
 
   decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQ_SLOT( slotDecreaseHeight() ),
                               actionCollection() , "decreaseheight" );
-#if TDE_VERSION < 300
-    accel = new TDEAccel(widget());
-    cancelAction->plugAccel(accel, true);
-    moveLeftAction->plugAccel(accel, true);
-    moveRightAction->plugAccel(accel, true);
-    moveUpAction->plugAccel(accel, true);
-    moveDownAction->plugAccel(accel, true);
-    increaseWidthAction->plugAccel(accel, true);
-    decreaseWidthAction->plugAccel(accel, true);
-    increaseHeightAction->plugAccel(accel, true);
-    decreaseHeightAction->plugAccel(accel, true);
-#endif
 
   toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQ_SLOT( slotToFront() ),
                               actionCollection() , "tofront" );
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index 615f0498..7f450043 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -27,8 +27,6 @@
 #include <tdeparts/browserextension.h>
 #include <tdeparts/factory.h>
 
-#include <tdeversion.h>
-
 #include "kimearea.h"
 
 /**
@@ -111,9 +109,6 @@ class TDESelectAction;
 class TDERadioAction;
 class TDERecentFilesAction;
 class TDEAction;
-#if TDE_VERSION < 300
-  class TDEAccel;
-#endif
 ///class TQListViewItem;
 class KCommandHistory;
 class TDEApplication;
@@ -309,10 +304,6 @@ private:
 
   	TDERecentFilesAction* recentFilesAction;
 
-    #if TDE_VERSION < 300
-      TDEAccel *accel;
-    #endif
-
     KDockMainWindow *mainDock;
     KDockWidget* areaDock;
     KDockWidget* mapsDock;
diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h
index 7826aba6..db5e4eba 100644
--- a/kimagemapeditor/kimearea.h
+++ b/kimagemapeditor/kimearea.h
@@ -24,8 +24,6 @@
 #include <tdelocale.h>
 #include <tqmap.h>
 
-#include "tdeversion.h"
-
 class TQPainter;
 class TQPointArray;
 class TQListViewItem;
diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp
index 20d88303..5815960f 100644
--- a/kimagemapeditor/kimecommands.cpp
+++ b/kimagemapeditor/kimecommands.cpp
@@ -23,14 +23,7 @@
 #include "drawzone.h"
 
 CutCommand::CutCommand(KImageMapEditor * document, const AreaSelection & a)
-  :
-
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
- (i18n( "Cut %1" ).arg( a.typeString() ))
+  : KNamedCommand (i18n( "Cut %1" ).arg( a.typeString() ))
 {
 	_document=document;
 	_cutAreaSelection=new AreaSelection();
@@ -78,13 +71,7 @@ DeleteCommand::DeleteCommand(KImageMapEditor * document, const AreaSelection & a
 }
 
 PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a)
-	:
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
- (i18n( "Paste %1" ).arg( a.typeString() ))
+	: KNamedCommand(i18n( "Paste %1" ).arg( a.typeString() ))
 {
 	_document=document;
 	_pasteAreaSelection=new AreaSelection();
@@ -123,13 +110,7 @@ void PasteCommand::unexecute()
 
 
 MoveCommand::MoveCommand (KImageMapEditor *document, AreaSelection * a, const TQPoint & oldPoint)
-	:
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
-(i18n( "Move %1" ).arg( a->typeString() ))
+	: KNamedCommand(i18n( "Move %1" ).arg( a->typeString() ))
 {
 	_document=document;
 	_areaSelection=new AreaSelection();
@@ -185,13 +166,7 @@ void MoveCommand::unexecute()
 
 
 ResizeCommand::ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea)
-	:
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
-(i18n( "Resize %1" ).arg( a->typeString() ))
+	: KNamedCommand(i18n( "Resize %1" ).arg( a->typeString() ))
 {
 	_areaSelection=new AreaSelection();
 	_areaSelection->setAreaList( a->getAreaList() );
@@ -232,13 +207,7 @@ void ResizeCommand::unexecute()
 
 
 AddPointCommand::AddPointCommand (KImageMapEditor *document, AreaSelection *a, const TQPoint & p)
-	:
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
-(i18n( "Add point to %1" ).arg( a->typeString() ))
+	: KNamedCommand(i18n( "Add point to %1" ).arg( a->typeString() ))
 {
   if (a->type()!=Area::Polygon)
   {
@@ -281,13 +250,7 @@ void AddPointCommand::unexecute()
 }
 
 RemovePointCommand::RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea)
-	:
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
-(i18n( "Remove point from %1" ).arg( a->typeString() ))
+	: KNamedCommand(i18n( "Remove point from %1" ).arg( a->typeString() ))
 {
   if (a->type()!=Area::Polygon)
   {
@@ -334,13 +297,7 @@ void RemovePointCommand::unexecute()
 
 
 CreateCommand::CreateCommand (KImageMapEditor *document, Area *area)
-	:
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
-(i18n( "Create %1" ).arg( area->typeString() ))
+	: KNamedCommand(i18n( "Create %1" ).arg( area->typeString() ))
 {
 	_document=document;
 	_area=area;
diff --git a/kimagemapeditor/kimecommands.h b/kimagemapeditor/kimecommands.h
index cc341bb4..3a0619f8 100644
--- a/kimagemapeditor/kimecommands.h
+++ b/kimagemapeditor/kimecommands.h
@@ -21,21 +21,11 @@
 
 #include <kcommand.h>
 
-#include <tdeversion.h>
-
 class KImageMapEditor;
 class AreaSelection;
 
 
-
-class CutCommand : public
-
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
-
+class CutCommand : public KNamedCommand
 {
 	public:
   	CutCommand (KImageMapEditor * document, const AreaSelection & selection);
@@ -60,12 +50,7 @@ class DeleteCommand : public CutCommand
  	 DeleteCommand (KImageMapEditor * document, const AreaSelection & selection);
 };
 
-class PasteCommand : public
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
+class PasteCommand : public KNamedCommand
 {
 	public:
   	PasteCommand (KImageMapEditor * document, const AreaSelection & selection);
@@ -82,12 +67,7 @@ KNamedCommand
 
 };
 
-class MoveCommand : public
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
+class MoveCommand : public KNamedCommand
 {
 	public:
   	MoveCommand (KImageMapEditor *document, AreaSelection *a,const TQPoint & oldPoint);
@@ -105,12 +85,7 @@ KNamedCommand
 //-		Area *_oldArea;
 };
 
-class ResizeCommand : public
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
+class ResizeCommand : public KNamedCommand
 {
 	public:
   	ResizeCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea);
@@ -127,12 +102,7 @@ KNamedCommand
 		Area *_newArea;
 };
 
-class AddPointCommand : public
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
+class AddPointCommand : public KNamedCommand
 {
 	public:
   	AddPointCommand (KImageMapEditor *document, AreaSelection *a, const TQPoint & p);
@@ -149,12 +119,7 @@ KNamedCommand
     int _coordpos;
 };
 
-class RemovePointCommand : public
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
+class RemovePointCommand : public KNamedCommand
 {
 	public:
   	RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea);
@@ -172,12 +137,7 @@ KNamedCommand
 };
 
 
-class CreateCommand : public
-#if TDE_VERSION < 300
-KCommand
-#else
-KNamedCommand
-#endif
+class CreateCommand : public KNamedCommand
 {
 	public:
   	CreateCommand (KImageMapEditor *document, Area *area);
diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h
index 03bccbf0..a9a76535 100644
--- a/kimagemapeditor/kimedialogs.h
+++ b/kimagemapeditor/kimedialogs.h
@@ -24,8 +24,6 @@
 #include <kurl.h>
 #include "kimagemapeditor.h"
 
-#include "tdeversion.h"
-
 class TQLineEdit;
 class TQMultiLineEdit;
 class TQSpinBox;
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index a3995087..d749a723 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -246,15 +246,7 @@ void KimeShell::optionsConfigureKeys() {
 
 void KimeShell::optionsConfigureToolbars()
 { 
-#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
 
     // use the standard toolbar editor
     KEditToolbar dlg(factory());
@@ -265,15 +257,7 @@ void KimeShell::optionsConfigureToolbars()
 
 void KimeShell::applyNewToolbarConfig()
 { 
-#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
 }