Remove use of TDE_VERSIONHEADmaster

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

37 files changed, 1 insertions, 54 deletions

diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 1b350469..e38b1bf4 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -50,10 +50,7 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include <tdeversion.h>
 #include <kinputdialog.h>
-#include <kinputdialog.h>
-
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdelistview.h>
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 6e7e76c2..4fbefee4 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -49,7 +49,6 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <tdelocale.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h
index c1227e78..d249b295 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/kopete/chatwindow/kopetechatwindow.h
@@ -22,7 +22,6 @@
 #include <tdeparts/mainwindow.h>
 #include <tqmovie.h>
 #include "kopetecontact.h"
-#include "tdeversion.h"
 
 class TDEAction;
 class TDEToggleAction;
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 0fda236e..5f0cb167 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -37,7 +37,6 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kedittoolbar.h>
 #include <tdefontdialog.h>
 #include <tdeglobalsettings.h>
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index d9abd633..9b9bb18d 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -5,7 +5,6 @@
 #include <tdefontdialog.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <tdeversion.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqevent.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 31b4b7bb..e5e3d324 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -37,9 +37,7 @@
 #include <tqslider.h>
 #include <tqlabel.h>
 
-#include <tdeversion.h>
 #include <kinputdialog.h>
-
 #include <tdeapplication.h>
 #include <kcolorcombo.h>
 #include <kcolorbutton.h>
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index 15510407..3ee92f3b 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -45,8 +45,6 @@
 #include <tdemultipledrag.h>
 #include <tdeabc/stdaddressbook.h>
 #include <tdeabc/vcardconverter.h>
-
-#include <tdeversion.h>
 #include <kinputdialog.h>
 
 #include "addcontactwizard.h"
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 05dac993..0a1bf376 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -36,13 +36,11 @@
 #include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
+#include <kinputdialog.h>
 
 #include <tdeabc/addressbook.h>
 #include <tdeabc/addressee.h>
 
-#include <tdeversion.h>
-#include <kinputdialog.h>
-
 
 #include "addcontactpage.h"
 #include "kopeteaccount.h"
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index 6ceea109..c1fe5c23 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -24,9 +24,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <tdeversion.h>
 #include <tdeglobalsettings.h>
-
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <tdelocale.h>
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index a244feb8..cbc92f30 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -46,7 +46,6 @@
 #include <kstatusbar.h>
 #include <tdeglobalaccel.h>
 #include <twin.h>
-#include <tdeversion.h>
 #include <kinputdialog.h>
 #include <kplugininfo.h>
 #include <ksqueezedtextlabel.h>
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 692fcecb..4e677118 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -25,7 +25,6 @@
 #include <tqobjectlist.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <tdeversion.h>
 
 /**
  * Macro function to warn developers when they are making calls
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 4eb70efe..d096a5a2 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -21,7 +21,6 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kdialogbase.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp
index 038a43dd..1248e137 100644
--- a/kopete/libkopete/kopeteawayaction.cpp
+++ b/kopete/libkopete/kopeteawayaction.cpp
@@ -16,7 +16,6 @@
 */
 
 #include <tdelocale.h>
-#include <tdeversion.h>
 #include <kinputdialog.h>
 #include <kstringhandler.h>
 
diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h
index 8d234464..4ea579fa 100644
--- a/kopete/libkopete/kopeteawayaction.h
+++ b/kopete/libkopete/kopeteawayaction.h
@@ -18,7 +18,6 @@
 #ifndef KOPETEAWAYACTION_H
 #define KOPETEAWAYACTION_H
 
-#include <tdeversion.h>
 #include <tdeactionclasses.h>
 #include <tdeaction.h>
 
diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp
index 089a2b65..c3a65e7f 100644
--- a/kopete/libkopete/kopetechatsession.cpp
+++ b/kopete/libkopete/kopetechatsession.cpp
@@ -26,7 +26,6 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index afcdfc6c..8f61a01e 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -19,7 +19,6 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdeprocess.h>
-#include <tdeversion.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 #include <tqdom.h>
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index 8606daa0..3b163456 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -22,10 +22,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-
-#include <tdeversion.h>
 #include <kinputdialog.h>
-
 #include <tdeabcpersistence.h>
 #include <kdialogbase.h>
 #include <tdelocale.h>
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index d77c79eb..ab1cb1d3 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -28,7 +28,6 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <tdeversion.h>
 
 #include "tdeabcpersistence.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h
index 5e2ffd92..3975f638 100644
--- a/kopete/libkopete/kopeteprefs.h
+++ b/kopete/libkopete/kopeteprefs.h
@@ -18,7 +18,6 @@
 #define __KOPETEPREFS_H__
 
 #include <tqobject.h>
-#include <tdeversion.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 84d23ccc..bc72f1d5 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -30,7 +30,6 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdestandarddirs.h>
-#include <tdeversion.h>
 
 #include <set>
 #include <algorithm>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index bb46107b..be0cb683 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -30,8 +30,6 @@
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-
-#include <tdeversion.h>
 #include <kinputdialog.h>
 
 #include <kpushbutton.h>
diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp
index 466a1c60..6cf80f9b 100644
--- a/kopete/libkopete/ui/kopetestdaction.cpp
+++ b/kopete/libkopete/ui/kopetestdaction.cpp
@@ -21,7 +21,6 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kguiitem.h>
 #include <tdelocale.h>
 #include <ksettings/dialog.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 8e7fc61a..548891cd 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -31,7 +31,6 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include <tdeversion.h>
 #include <kinputdialog.h>
 #include <kpushbutton.h>
 #include <kactivelabel.h>
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index cd2a6b4f..8c4f75be 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -23,7 +23,6 @@
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
-#include <tdeversion.h>
 #include <tdeaboutdata.h>
 
 #include "kopetemetacontact.h"
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 7fcf1b84..f7ea372a 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -31,7 +31,6 @@
 #include <tqapplication.h>
 #include <tqlabel.h>
 
-#include <tdeversion.h>
 #include <tdelistview.h>
 #include <tdeprocess.h>
 #include <tdeprocio.h>
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index 8404d38d..9b6513e9 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -19,9 +19,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tdemessagebox.h>
-//#include <tdeconfig.h>
 #include <kplugininfo.h>
-#include <tdeversion.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 6e89b8aa..4908d94a 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -18,7 +18,6 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <tdeaction.h>
-#include <tdeversion.h>
 #include <tdeaboutdata.h>
 
 #include "kopetepluginmanager.h"
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 0cf18047..9589ad82 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -24,7 +24,6 @@
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <tdestandarddirs.h>
-#include <tdeversion.h>
 
 #include "statisticsdb.h"
 
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 96e2046d..cbd8d26b 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -23,7 +23,6 @@
 #include <tdeaction.h>
 #include <tdemessagebox.h>
 #include <tdestandarddirs.h>
-#include <tdeversion.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopetemetacontact.h"
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index 4560dd39..935e900a 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -26,8 +26,6 @@
 #include <kautoconfig.h>
 #include <kdebug.h>
 
-#include <tdeversion.h>
-
 #include "texteffectprefs.h"
 #include "texteffectpreferences.h"
 #include "texteffectconfig.h"
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 3e640ebc..39b21eac 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -30,7 +30,6 @@
 #include <kgenericfactory.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <tdeversion.h>
 #include <tdeaboutdata.h>
 
 #include "kopetemetacontact.h"
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index 60730ac5..10d3f8e8 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -25,13 +25,8 @@
 #include "kircmessageredirector.h"
 #include "kirctransfer.h"
 
-#include <tdeversion.h>
-
 // FIXME: Move the following kdedebug class to the *.cpp.
 #include <kdebug.h>
-#if TDE_VERSION < TDE_MAKE_VERSION( 3, 1, 90 )
-#include <kdebugclasses.h>
-#endif
 
 #include <tqdatetime.h>
 #include <tqdict.h>
diff --git a/kopete/protocols/irc/libkirc/kircentity.h b/kopete/protocols/irc/libkirc/kircentity.h
index 70404d1b..08aea8ac 100644
--- a/kopete/protocols/irc/libkirc/kircentity.h
+++ b/kopete/protocols/irc/libkirc/kircentity.h
@@ -18,7 +18,6 @@
 #ifndef KIRCENTITY_H
 #define KIRCENTITY_H
 
-#include <tdeversion.h>
 #include <kresolver.h>
 #include <ksharedptr.h>
 
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 7c75feb1..4b48f972 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -33,7 +33,6 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <tdelocale.h>
 #include <kmdcodec.h>
 #include <tdemessagebox.h>
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index 45874477..01d7507d 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -26,8 +26,6 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 
-#include <tdeversion.h>
-
 #include "kopeteaccount.h"
 #include "kopetechatsessionmanager.h"
 #include "kopetemetacontact.h"
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index 83b0f8e3..11d7324d 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -26,7 +26,6 @@
 #include <tdemessagebox.h>
 #include <tdeglobalaccel.h>
 #include <kkeydialog.h>
-#include <tdeversion.h>
 
 #include "KSPrefs/ksprefs.h"
 
diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp
index c2c48ff6..5e07986f 100644
--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@@ -81,7 +81,6 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <tdeversion.h>
 #include <tdeprocess.h>
 #include <tdestandarddirs.h>
 #include <tdefiledialog.h>