Rename additional header files to avoid conflicts with KDE4

17 files changed, 24 insertions, 24 deletions

diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index 5a11848d..22628b17 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "ActiveMonitorItem.h"
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index e2a3e782..7695de80 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ActiveMonitor.h"
 #include "ActiveMonitorWindow.h"
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 9529809d..d6c55f0e 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -32,12 +32,12 @@
 
 #include <dcopclient.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kurldrag.h>
 
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index 3cbd9080..552bfdc8 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -28,7 +28,7 @@
 #include <tqcursor.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 #include <tdeapplication.h>
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index bbc56747..641c53f1 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index c0191441..f834a1d5 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <tdefiledialog.h>
 
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index c0b0a503..cac9781c 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -29,8 +29,8 @@
 #include <tqstylesheet.h>
 #include <tqpalette.h>
 #include <tqtextstream.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 20367f30..d07c660d 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -30,7 +30,7 @@
 
 #include <kurlrequester.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "Defines.h"
diff --git a/kpf/src/Help.cpp b/kpf/src/Help.cpp
index 0973cb6b..9e789751 100644
--- a/kpf/src/Help.cpp
+++ b/kpf/src/Help.cpp
@@ -22,7 +22,7 @@
 */
 
 #include "Help.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <dnssd/servicebrowser.h>
 
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 7c39d541..26bbf429 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -34,13 +34,13 @@
 #include <tqlineedit.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <dcopclient.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kgenericfactory.h>
 
diff --git a/kpf/src/Resource.cpp b/kpf/src/Resource.cpp
index e9f521a5..c6c88b3e 100644
--- a/kpf/src/Resource.cpp
+++ b/kpf/src/Resource.cpp
@@ -26,7 +26,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <kmimetype.h>
 
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 4b200b3f..7c56e323 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <klineedit.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 
diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp
index c39f944b..e280a327 100644
--- a/kpf/src/SingleServerConfigDialog.cpp
+++ b/kpf/src/SingleServerConfigDialog.cpp
@@ -21,7 +21,7 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "WebServer.h"
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 7832ecd9..8fb185bf 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -28,7 +28,7 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "StartingKPFDialog.h"
diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp
index 631059a7..b66ef87b 100644
--- a/kpf/src/Utils.cpp
+++ b/kpf/src/Utils.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "Defines.h"
 #include "Utils.h"
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index e114dd0e..0c97252a 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -34,9 +34,9 @@
 // KDE includes
 #include "config.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <dnssd/publicservice.h>
 
 // Local includes
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index c70f9111..fd135405 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -23,7 +23,7 @@
 
 // KDE includes
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 // Local includes