Remove use of TDE_VERSION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit b03d55e861)
1 week ago · 07bb506b13
parent da7dbe70fb
commit 07bb506b13
37 changed files with 1 additions and 54 deletions
--- 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>
--- 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>
--- 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;
--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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>
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@ -46,7 +46,6 @@
 #include <kstatusbar.h>
 #include <kglobalaccel.h>
 #include <twin.h>
-#include <tdeversion.h>
 #include <kinputdialog.h>
 #include <kplugininfo.h>
 #include <ksqueezedtextlabel.h>
--- 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
--- 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>
--- 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>

--- 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>

--- 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>
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@ -19,7 +19,6 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <kprocess.h>
-#include <tdeversion.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 #include <tqdom.h>
--- 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>
--- 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"
--- 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>

--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@ -30,7 +30,6 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <tdeversion.h>

 #include <set>
 #include <algorithm>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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 <kprocess.h>
 #include <kprocio.h>
--- 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"
--- 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"
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@ -24,7 +24,6 @@
 #include <kdebug.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <tdeversion.h>

 #include "statisticsdb.h"

--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@ -23,7 +23,6 @@
 #include <tdeaction.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <tdeversion.h>

 #include "kopetechatsessionmanager.h"
 #include "kopetemetacontact.h"
--- 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"
--- 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"
--- 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>
--- 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>

--- 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>
--- 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"
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@ -26,7 +26,6 @@
 #include <tdemessagebox.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
-#include <tdeversion.h>

 #include "KSPrefs/ksprefs.h"

--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@ -81,7 +81,6 @@
 #include <tqpopupmenu.h>

 #include <kdebug.h>
-#include <tdeversion.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>