Rename additional header files to avoid conflicts with KDE4

configdialog/kbfxconfigapp.h

@@ -52,14 +52,14 @@
 #include <kicondialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktextedit.h>
 #include <kurl.h>
 #include <kurlrequester.h>

configdialog/kbfxconfigdlgbutton.ui

@@ -1229,7 +1229,7 @@
     <tabstop>KbfxResizeKicker</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">kbfxpushbutton.h</include>
     <include location="global" impldecl="in declaration">tqstring.h</include>
     <include location="global" impldecl="in declaration">tqpainter.h</include>

configdialog/kbfxconfigdlgfonts-old.ui

@@ -1136,7 +1136,7 @@
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdeconfig.h</include>
     <include location="global" impldecl="in declaration">kbfxfontchooser.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgfonts-old.ui.h</include>

configdialog/kbfxconfigdlglayout.ui

@@ -1052,7 +1052,7 @@
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlglayout.ui.h</include>
 </includes>

configdialog/kbfxconfigdlgmain.ui

@@ -644,7 +644,7 @@
     <include location="global" impldecl="in declaration">tqpainter.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgmain.ui.h</include>
 </includes>
 <variables>

configdialog/kbfxconfigdlgplugins.ui

@@ -361,7 +361,7 @@
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tqlistbox.h</include>
     <include location="global" impldecl="in declaration">kbfxplasmapluginloader.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgplugins.ui.h</include>

configdialog/kbfxconfigdlgthemes.ui

@@ -982,7 +982,7 @@
     <include location="global" impldecl="in declaration">kbfxconfig.h</include>
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="global" impldecl="in declaration">ktar.h</include>

configdialog/main.cpp

@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kuniqueapplication.h>
 
 #include "kbfxconfigapp.h"

kbfxlib/common/kbfxconfig.h

@@ -35,9 +35,9 @@
 #include <tdeconfig.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
 

kbfxlib/common/kbfxfontchooser.h

@@ -22,7 +22,7 @@
 
 #include <kdialog.h>
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqwidget.h>
 #include <tqlabel.h>

kbfxlib/common/kbfxkiodownload.h

@@ -23,7 +23,7 @@
 #define KBFX_KIO_DOWNLOAD_H
 
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 /**

plugins/applications/kbfxplasmadataplugin.cpp

@@ -22,8 +22,8 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kservice.h>
 #include <kservicegroup.h>

plugins/settings/kbfxplasmadatapluginsettings.cpp

@@ -22,8 +22,8 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kservice.h>
 #include <kservicegroup.h>

src/kbfxbutton.h

@@ -33,8 +33,8 @@
 #include <dcopref.h>
 #include <kdebug.h>
 #include <kimageeffect.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 

src/kbfxspinx.h

@@ -41,9 +41,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpanelapplet.h>
 #include <tdepopupmenu.h>
 #include <krun.h>

src/kbfxspinxmenu.h

@@ -37,7 +37,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#include <kbfxdatasource.h>
 #include <kbfxconfig.h>