Rename additional header files to avoid conflicts with KDE4

26 files changed, 38 insertions, 38 deletions

diff --git a/kmyfirewall/core/iptable.cpp b/kmyfirewall/core/iptable.cpp
index 695981d..c611173 100644
--- a/kmyfirewall/core/iptable.cpp
+++ b/kmyfirewall/core/iptable.cpp
@@ -21,7 +21,7 @@ email                : chubinger@irrsinnig.org
 
 // kde includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // project includes
 #include "kmfcheckinput.h"
diff --git a/kmyfirewall/core/iptchain.cpp b/kmyfirewall/core/iptchain.cpp
index 8865695..fdacdac 100644
--- a/kmyfirewall/core/iptchain.cpp
+++ b/kmyfirewall/core/iptchain.cpp
@@ -19,8 +19,8 @@
 
 // kde includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 //my includes
 #include "kmfdoc.h"
 #include "iptchain.h"
diff --git a/kmyfirewall/core/iptrule.cpp b/kmyfirewall/core/iptrule.cpp
index 3fa9fd7..a671026 100644
--- a/kmyfirewall/core/iptrule.cpp
+++ b/kmyfirewall/core/iptrule.cpp
@@ -28,7 +28,7 @@ email                : chubinger@irrsinnig.org
 
 // kde includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KMF {
 
diff --git a/kmyfirewall/core/iptruleoption.cpp b/kmyfirewall/core/iptruleoption.cpp
index b356d7d..0f28cc7 100644
--- a/kmyfirewall/core/iptruleoption.cpp
+++ b/kmyfirewall/core/iptruleoption.cpp
@@ -15,7 +15,7 @@ email                : chubinger@irrsinnig.org
 #include "iptruleoption.h"
 // KDE
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 // QT
diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp
index 81fd357..f0349f6 100644
--- a/kmyfirewall/core/kmfapp.cpp
+++ b/kmyfirewall/core/kmfapp.cpp
@@ -23,7 +23,7 @@
 // KDE includes
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
 // Project includes
diff --git a/kmyfirewall/core/kmfcheckinput.cpp b/kmyfirewall/core/kmfcheckinput.cpp
index 5a9d3c7..831c158 100644
--- a/kmyfirewall/core/kmfcheckinput.cpp
+++ b/kmyfirewall/core/kmfcheckinput.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KMF {
 
diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp
index 5fb8bb2..6f699f3 100644
--- a/kmyfirewall/core/kmfdoc.cpp
+++ b/kmyfirewall/core/kmfdoc.cpp
@@ -40,12 +40,12 @@
 #include <tqfiledialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 // My includes
 #include "../version.h"
diff --git a/kmyfirewall/core/kmferror.cpp b/kmyfirewall/core/kmferror.cpp
index f520236..80a9887 100644
--- a/kmyfirewall/core/kmferror.cpp
+++ b/kmyfirewall/core/kmferror.cpp
@@ -20,7 +20,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 
diff --git a/kmyfirewall/core/kmferrorhandler.cpp b/kmyfirewall/core/kmferrorhandler.cpp
index ebe51be..d5b3140 100644
--- a/kmyfirewall/core/kmferrorhandler.cpp
+++ b/kmyfirewall/core/kmferrorhandler.cpp
@@ -16,12 +16,12 @@
 #include "kmferrorhandler.h"
 
 // QT includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqstring.h>
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h> 
+#include <tdelocale.h> 
 // my includes
 #include "kmferror.h"
 
diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp
index 35fdb82..0683992 100644
--- a/kmyfirewall/core/kmfgenericdoc.cpp
+++ b/kmyfirewall/core/kmfgenericdoc.cpp
@@ -33,7 +33,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <ktrader.h>
diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp
index 3843048..40ed400 100644
--- a/kmyfirewall/core/kmfiptdoc.cpp
+++ b/kmyfirewall/core/kmfiptdoc.cpp
@@ -49,12 +49,12 @@
 #include <tqfiledialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <klibloader.h>
 
diff --git a/kmyfirewall/core/kmfnethost.cpp b/kmyfirewall/core/kmfnethost.cpp
index d925db6..2c4580c 100644
--- a/kmyfirewall/core/kmfnethost.cpp
+++ b/kmyfirewall/core/kmfnethost.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Project includes
 #include "kmfundoengine.h"
diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp
index 4ea3d5b..b1e1d11 100644
--- a/kmyfirewall/core/kmfnetwork.cpp
+++ b/kmyfirewall/core/kmfnetwork.cpp
@@ -32,7 +32,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <ktrader.h>
diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp
index f6467ac..5a377d2 100644
--- a/kmyfirewall/core/kmfnetzone.cpp
+++ b/kmyfirewall/core/kmfnetzone.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Project includes
 #include "kmfcheckinput.h"
diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp
index 9eba609..0e43509 100644
--- a/kmyfirewall/core/kmfpluginfactory.cpp
+++ b/kmyfirewall/core/kmfpluginfactory.cpp
@@ -20,11 +20,11 @@
 #include <tdeparts/part.h>
 #include <tdeparts/plugin.h>
 #include <tdeparts/factory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 // project includes
 #include "kmfcompilerinterface.h"
diff --git a/kmyfirewall/core/kmfprotocol.cpp b/kmyfirewall/core/kmfprotocol.cpp
index 51902f5..8eaec7a 100644
--- a/kmyfirewall/core/kmfprotocol.cpp
+++ b/kmyfirewall/core/kmfprotocol.cpp
@@ -32,12 +32,12 @@
 // KDE includes
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefileitem.h>
 
 // project includes
diff --git a/kmyfirewall/core/kmfprotocolcategory.cpp b/kmyfirewall/core/kmfprotocolcategory.cpp
index d5d7562..ca21e07 100644
--- a/kmyfirewall/core/kmfprotocolcategory.cpp
+++ b/kmyfirewall/core/kmfprotocolcategory.cpp
@@ -16,7 +16,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Project includes
 #include "kmfundoengine.h"
diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp
index faf0e5e..29fa3a5 100644
--- a/kmyfirewall/core/kmfprotocollibrary.cpp
+++ b/kmyfirewall/core/kmfprotocollibrary.cpp
@@ -23,12 +23,12 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefileitem.h>
 
 // project includes
diff --git a/kmyfirewall/core/kmfprotocolusage.cpp b/kmyfirewall/core/kmfprotocolusage.cpp
index 1de2303..647a213 100644
--- a/kmyfirewall/core/kmfprotocolusage.cpp
+++ b/kmyfirewall/core/kmfprotocolusage.cpp
@@ -22,12 +22,12 @@
 // KDE includes
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefileitem.h>
 
 // project includes
diff --git a/kmyfirewall/core/kmfrulesetdoc.cpp b/kmyfirewall/core/kmfrulesetdoc.cpp
index e0cec49..e506987 100644
--- a/kmyfirewall/core/kmfrulesetdoc.cpp
+++ b/kmyfirewall/core/kmfrulesetdoc.cpp
@@ -18,7 +18,7 @@
 
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // Project Inclueds
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index a373190..b56eb41 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -18,12 +18,12 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // Project Inclueds
 #include "ipaddress.h"
diff --git a/kmyfirewall/core/kmftargetconfig.cpp b/kmyfirewall/core/kmftargetconfig.cpp
index c72e0c0..573772b 100644
--- a/kmyfirewall/core/kmftargetconfig.cpp
+++ b/kmyfirewall/core/kmftargetconfig.cpp
@@ -17,7 +17,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Project includes
 #include "kmftarget.h"
diff --git a/kmyfirewall/core/kmftransaction.cpp b/kmyfirewall/core/kmftransaction.cpp
index e8d8c6d..8fe7993 100644
--- a/kmyfirewall/core/kmftransaction.cpp
+++ b/kmyfirewall/core/kmftransaction.cpp
@@ -13,7 +13,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Project includes
 #include "netfilterobject.h"
diff --git a/kmyfirewall/core/kmfundoengine.cpp b/kmyfirewall/core/kmfundoengine.cpp
index 584f0e2..8f286d7 100644
--- a/kmyfirewall/core/kmfundoengine.cpp
+++ b/kmyfirewall/core/kmfundoengine.cpp
@@ -14,7 +14,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Project includes
 
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 466d384..fc9fddc 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -20,10 +20,10 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 // Project includes
diff --git a/kmyfirewall/core/netfilterobject.cpp b/kmyfirewall/core/netfilterobject.cpp
index b7b4310..dc7673d 100644
--- a/kmyfirewall/core/netfilterobject.cpp
+++ b/kmyfirewall/core/netfilterobject.cpp
@@ -16,7 +16,7 @@
 #include "netfilterobject.h"
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // project includes