Rename many classes and header files to avoid conflicts with KDE4

33 files changed, 41 insertions, 41 deletions

diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui
index 6e52c0ce..47e7e9b6 100644
--- a/kopete/plugins/alias/aliasdialog.ui
+++ b/kopete/plugins/alias/aliasdialog.ui
@@ -188,6 +188,6 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui
index 2bdc2e77..0297c6ff 100644
--- a/kopete/plugins/alias/aliasdialogbase.ui
+++ b/kopete/plugins/alias/aliasdialogbase.ui
@@ -99,7 +99,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index f81da475..6b91418d 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kglobal.h>
diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp
index 6acdf153..2408c6d3 100644
--- a/kopete/plugins/alias/editaliasdialog.cpp
+++ b/kopete/plugins/alias/editaliasdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name )
diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp
index db3d1302..51977e4e 100644
--- a/kopete/plugins/contactnotes/contactnotesplugin.cpp
+++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index df66c608..d8cafd85 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -20,7 +20,7 @@
 #include "kopetecontact.h"
 #include "kopetechatsession.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 1085da9c..e402567c 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeversion.h>
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 63d26510..e0a03cf8 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <tqcheckbox.h>
 #include <kprocess.h>
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 7764d3b3..76151f57 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -32,14 +32,14 @@
 #include <tqlabel.h>
 
 #include <tdeversion.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kprocess.h>
 #include <kprocio.h>
 #include <klocale.h>
-#include <kaccel.h>
-#include <klistviewsearchline.h>
+#include <tdeaccel.h>
+#include <tdelistviewsearchline.h>
 #include <kactivelabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
@@ -52,7 +52,7 @@
 //#include "kgpg.h"
 #include "kgpginterface.h"
 
-/////////////////   klistviewitem special
+/////////////////   tdelistviewitem special
 
 class UpdateViewItem2 : public TDEListViewItem
 {
diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h
index 83ac5102..547f8483 100644
--- a/kopete/plugins/cryptography/popuppublic.h
+++ b/kopete/plugins/cryptography/popuppublic.h
@@ -22,7 +22,7 @@
 #include <kdialogbase.h>
 
 //#include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 
 class TQPushButton;
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index 875a0dee..34a7a1cc 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kgenericfactory.h>
 #include <kcolorbutton.h>
 #include <kinputdialog.h>
diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index b820151d..fa7cc9e1 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -454,7 +454,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 992d586f..b5b65b80 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -48,14 +48,14 @@
 #include <klocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <klistview.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdelistviewsearchline.h>
 #include <kprogress.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class TDEListViewDateItem : public TDEListViewItem
 {
diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h
index daa45362..7efea5fa 100644
--- a/kopete/plugins/history/historydialog.h
+++ b/kopete/plugins/history/historydialog.h
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "kopetemessage.h"
 
diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp
index 21bde3b5..eeda505c 100644
--- a/kopete/plugins/history/historyguiclient.cpp
+++ b/kopete/plugins/history/historyguiclient.cpp
@@ -21,7 +21,7 @@
 #include "kopetecontact.h"
 #include "kopeteview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index d4791952..83405ee2 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -17,7 +17,7 @@
 
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 //#include <tdeconfig.h>
 #include <kplugininfo.h>
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index 6711dd31..be64272d 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -340,8 +340,8 @@
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>klistviewsearchline.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistviewsearchline.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcombobox.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp
index 7b67f119..d62be944 100644
--- a/kopete/plugins/latex/latexguiclient.cpp
+++ b/kopete/plugins/latex/latexguiclient.cpp
@@ -19,7 +19,7 @@
 
 #include <tqvariant.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqimage.h>
diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
index d01d0df0..e47386a2 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
@@ -20,7 +20,7 @@
 #include <tqvariant.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 2f76b09a..eaf777dd 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
 
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 3c63bc7e..207fd6cd 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kgenericfactory.h>
 #include <kcolorbutton.h>
 #include <kinputdialog.h>
diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
index 29f03175..702bdeca 100644
--- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
@@ -25,7 +25,7 @@
 #include "kopeteview.h"
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 1f1fed51..3ab8539b 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -27,7 +27,7 @@
 #include <kgenericfactory.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "config.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index d7117852..47eb51b4 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqradiobutton.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index ff3307e9..3fb6a340 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -371,6 +371,6 @@ in place of your status message.</string>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
index 1815fe9e..e91a6cc4 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 #include <tqradiobutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index 747398d4..3aa91695 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -279,6 +279,6 @@
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>smpppdlocationwidget.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 0862d22b..6082158c 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -20,7 +20,7 @@
 
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index 27c8b565..fb7ac6d8 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -25,7 +25,7 @@
 
 #include "kdialogbase.h"
 #include "klocale.h"
-#include "klistview.h"
+#include "tdelistview.h"
 #include "tdehtml_part.h"
 #include "kstandarddirs.h"
 #include "kdatepicker.h"
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 14490e30..c5da24bb 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -20,7 +20,7 @@
 
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui
index 2278c2a5..e93ae0fd 100644
--- a/kopete/plugins/texteffect/texteffectprefs.ui
+++ b/kopete/plugins/texteffect/texteffectprefs.ui
@@ -226,6 +226,6 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp
index 1d1eaec8..0a2e8ed2 100644
--- a/kopete/plugins/translator/translatorguiclient.cpp
+++ b/kopete/plugins/translator/translatorguiclient.cpp
@@ -20,7 +20,7 @@
 #include <tqvariant.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include "kopetechatsession.h"
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 5113e358..6b8cb61d 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <tdeconfig.h>