Rename additional header files to avoid conflicts with KDE4

34 files changed, 47 insertions, 47 deletions

diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index 47e52a25..03288515 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 8062cf57..03170168 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 
 TQPtrList<Server> Groups;
diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp
index d0c57537..6de1e845 100644
--- a/ksirc/KSPrefs/ksprefs.cpp
+++ b/ksirc/KSPrefs/ksprefs.cpp
@@ -9,7 +9,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <kdebug.h>
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index bb2d165f..8ce6311d 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -11,7 +11,7 @@
 
 
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp
index 6bf8d476..3cd9e2ff 100644
--- a/ksirc/KSPrefs/page_general.cpp
+++ b/ksirc/KSPrefs/page_general.cpp
@@ -10,7 +10,7 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include "page_general.h"
 #include "../servercontroller.h"
diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp
index ab098df9..5aacdb59 100644
--- a/ksirc/KSProgress/ksprogressdata.cpp
+++ b/ksirc/KSProgress/ksprogressdata.cpp
@@ -18,7 +18,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ksprogressData::ksprogressData
 (
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index d6488c45..f6afc2a1 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -8,7 +8,7 @@
 
 #include <tdeapplication.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ksticker.h"
 #include "speeddialog.h"
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index 342fae32..f11be8da 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -5,7 +5,7 @@
 #include <tqregexp.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <unistd.h>
 
diff --git a/ksirc/KSTicker/speeddialog.cpp b/ksirc/KSTicker/speeddialog.cpp
index 1abc8059..8bc3ca0d 100644
--- a/ksirc/KSTicker/speeddialog.cpp
+++ b/ksirc/KSTicker/speeddialog.cpp
@@ -7,7 +7,7 @@
 
  *********************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "speeddialog.h"
 
diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp
index f0a6a931..64f210ea 100644
--- a/ksirc/KSTicker/speeddialogData.cpp
+++ b/ksirc/KSTicker/speeddialogData.cpp
@@ -13,7 +13,7 @@
 #include "speeddialogData.h"
 
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tqlayout.h>
diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp
index d6462405..f7cf4f69 100644
--- a/ksirc/NewWindowDialog.cpp
+++ b/ksirc/NewWindowDialog.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp
index cf7a4581..7cb71022 100644
--- a/ksirc/alistbox.cpp
+++ b/ksirc/alistbox.cpp
@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurldrag.h>
 
 aListBox::aListBox(TQWidget *parent, const char *name )
diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index 7f841450..b7a4f307 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -3,7 +3,7 @@
 #include "chanButtons.h"
 #include "chanButtons.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kstdguiitem.h>
diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp
index d5215485..04dfc6a4 100644
--- a/ksirc/chanparser.cpp
+++ b/ksirc/chanparser.cpp
@@ -15,8 +15,8 @@
 
 #include <tqregexp.h>
 #include <tqapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tqptrlist.h>
 
diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp
index 30364565..32f4be55 100644
--- a/ksirc/charSelector.cpp
+++ b/ksirc/charSelector.cpp
@@ -6,7 +6,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 charSelector::charSelector(TQWidget *parent, const char* name)
            : KDialog(parent, name, false)
diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp
index abac9198..781feb6e 100644
--- a/ksirc/colorpicker.cpp
+++ b/ksirc/colorpicker.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ColorPicker::ColorPicker( TQWidget *parent, const char *name )
     : KDialogBase( parent, name, true /*modal*/, i18n( "Pick Color" ),
diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp
index cc741d25..a7576c7f 100644
--- a/ksirc/dccManager.cpp
+++ b/ksirc/dccManager.cpp
@@ -12,7 +12,7 @@
 #include <tqsignal.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #define COL_FILE 1
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index aa03a0b6..b0e065c5 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -15,10 +15,10 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp
index d03543c0..d251c3cf 100644
--- a/ksirc/dccToplevel.cpp
+++ b/ksirc/dccToplevel.cpp
@@ -4,8 +4,8 @@
 
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 
 #include "dccManager.h"
 #include "dccToplevel.h"
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index 8f33b2ce..d6c4f923 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -9,10 +9,10 @@
 #include <tdeaccel.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 DisplayMgrMDI::DisplayMgrMDI()
 {
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index bc7ddc75..df1e8553 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -17,13 +17,13 @@
 #include <tqcursor.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <twin.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kpassivepopup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <tdeversion.h>
diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp
index f994cfa7..be0cdbb6 100644
--- a/ksirc/ioDCC.cpp
+++ b/ksirc/ioDCC.cpp
@@ -14,7 +14,7 @@
 #include "control_message.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassivepopup.h>
 
 #include <tqregexp.h>
diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp
index db0615a4..b197cbda 100644
--- a/ksirc/iocontroller.cpp
+++ b/ksirc/iocontroller.cpp
@@ -77,7 +77,7 @@
 #include <tqlistbox.h>
 #include <tqtextcodec.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index 50ed150a..6fdca807 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -20,7 +20,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp
index 947277c1..9e0049f9 100644
--- a/ksirc/ksircprocess.cpp
+++ b/ksirc/ksircprocess.cpp
@@ -109,8 +109,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 377ee2c8..b2ffb205 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp
index bce3ca9f..4e67b5d0 100644
--- a/ksirc/mditoplevel.cpp
+++ b/ksirc/mditoplevel.cpp
@@ -8,7 +8,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "mditoplevel.h"
diff --git a/ksirc/messageReceiver.cpp b/ksirc/messageReceiver.cpp
index becfa79a..3196bb49 100644
--- a/ksirc/messageReceiver.cpp
+++ b/ksirc/messageReceiver.cpp
@@ -2,7 +2,7 @@
 
 #include <tqtextcodec.h>
 #include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index fac84e6b..d47791e6 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -81,7 +81,7 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeconfig.h>
 #include <tdefontdialog.h>
 #include <kiconloader.h>
@@ -108,7 +108,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 
diff --git a/ksirc/servercontroller.dlg b/ksirc/servercontroller.dlg
index 7e515bdc..3aff0980 100644
--- a/ksirc/servercontroller.dlg
+++ b/ksirc/servercontroller.dlg
@@ -20,7 +20,7 @@ MaxSize {32767 32767}
 Grid {10}
 
 User {
-		UserClassHeader {kmenubar.h}
+		UserClassHeader {tdemenubar.h}
 		UserClassName {KMenuBar}
 		Rect {0 0 410 30}
 		Name {User_2}
diff --git a/ksirc/ssfeprompt.cpp b/ksirc/ssfeprompt.cpp
index bdf1aa6c..14d759fb 100644
--- a/ksirc/ssfeprompt.cpp
+++ b/ksirc/ssfeprompt.cpp
@@ -8,7 +8,7 @@
  *********************************************************************/
 
 #include "ssfeprompt.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #undef Inherited
 #define Inherited ssfepromptdata
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 47a16e58..76f24488 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -17,7 +17,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 5ad00a69..f3a83a4b 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -59,22 +59,22 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <knotifyclient.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kcharsets.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstdguiitem.h>
 
 extern DisplayMgr *displayMgr;
diff --git a/ksirc/usercontrolmenu.cpp b/ksirc/usercontrolmenu.cpp
index fd05b49a..1387932d 100644
--- a/ksirc/usercontrolmenu.cpp
+++ b/ksirc/usercontrolmenu.cpp
@@ -2,7 +2,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQPtrList<UserControlMenu> UserControlMenu::UserMenu;