Rename many classes and header files to avoid conflicts with KDE4

29 files changed, 49 insertions, 49 deletions

diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index 596e5c6..512e517 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kprocess.h>
 
diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
index f07df10..25cb007 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
@@ -19,7 +19,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
 
 // KDE includes
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <klocale.h>
 #include <kaboutdata.h>
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
index 9730f05..75d6778 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp
@@ -32,8 +32,8 @@
 // KDE includes
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <knuminput.h>
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
index 65ad3a4..fa73097 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp
@@ -34,7 +34,7 @@
 #include <klocale.h>
 #include <kcombobox.h>
 #include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Project includes
 #include "../core/kmfnetwork.h"
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
index 9bfe36c..d0b5fea 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
@@ -38,9 +38,9 @@
 // KDE includes
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <knuminput.h>
diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
index 71012f8..b935178 100644
--- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
+++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
@@ -301,6 +301,6 @@
     <includehint>knuminput.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui
index 660ab93..e181965 100644
--- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui
+++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui
@@ -210,6 +210,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp
index 9d482b1..c87e6f6 100644
--- a/kmyfirewall/installer/kmfinstallerplugin.cpp
+++ b/kmyfirewall/installer/kmfinstallerplugin.cpp
@@ -23,7 +23,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
 
 // KDE includes
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
index 967c9e1..f0b35cf 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp
@@ -21,9 +21,9 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
 
 // KDE includes
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp
index fb40c57..4c2fbe9 100644
--- a/kmyfirewall/ipteditor/kmfruleedit.cpp
+++ b/kmyfirewall/ipteditor/kmfruleedit.cpp
@@ -18,11 +18,11 @@ email                : chubinger@irrsinnig.org
 #include <kled.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <ktrader.h>
diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp
index 89973e6..4ad3bb0 100644
--- a/kmyfirewall/kmfconfigdialog.cpp
+++ b/kmyfirewall/kmfconfigdialog.cpp
@@ -32,12 +32,12 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kguiitem.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktrader.h>
 #include <tdeparts/part.h>
 #include <tdeparts/plugin.h>
diff --git a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
index 6555d4b..39f252b 100644
--- a/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
+++ b/kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
@@ -49,8 +49,8 @@
 #include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <klistview.h>
-#include <klistbox.h>
+#include <tdelistview.h>
+#include <tdelistbox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
index 72ee3a5..3807902 100644
--- a/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp
@@ -26,12 +26,12 @@
 #include <kguiitem.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Prokject includes
 #include "../core/kmftarget.h"
diff --git a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
index cdfcb96..4dea59e 100644
--- a/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp
@@ -29,9 +29,9 @@
 // KDE includes
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <knuminput.h>
diff --git a/kmyfirewall/kmfwidgets/kmflistview.h b/kmyfirewall/kmfwidgets/kmflistview.h
index 5734b34..badd9db 100644
--- a/kmyfirewall/kmfwidgets/kmflistview.h
+++ b/kmyfirewall/kmfwidgets/kmflistview.h
@@ -14,7 +14,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #ifndef KMFLISTVIEW_H
 #define KMFLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 // QT includes
diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index 31b1234..7dfb723 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -29,7 +29,7 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 
 // Project includes
diff --git a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
index d46be4b..b223fa9 100644
--- a/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
@@ -28,9 +28,9 @@
 // KDE includes
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <knuminput.h>
diff --git a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
index 48e14d1..bd0ea6b 100644
--- a/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
@@ -29,9 +29,9 @@
 // KDE includes
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <knuminput.h>
diff --git a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
index d7468b0..52ebbce 100644
--- a/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp
@@ -28,9 +28,9 @@
 // KDE includes
 #include <kdebug.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <knuminput.h>
diff --git a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
index 83375ba..24fb4e1 100644
--- a/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
@@ -40,8 +40,8 @@
 #include <tdeio/job.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <klistview.h>
-#include <klistbox.h>
+#include <tdelistview.h>
+#include <tdelistbox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
index 5165e38..83fee58 100644
--- a/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
+++ b/kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp
@@ -27,12 +27,12 @@
 #include <kguiitem.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Prokject includes
 #include "../core/kmftarget.h"
diff --git a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
index 558c29e..a4fcb9a 100644
--- a/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
+++ b/kmyfirewall/kmfwidgets/kmftransactionlog.cpp
@@ -24,11 +24,11 @@
 #include <tqtextbrowser.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <ktempfile.h>
 
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
index 0895c15..e592679 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
@@ -340,11 +340,11 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui
index 742df3f..7cb8dc7 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui
@@ -185,7 +185,7 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktabwidget.h</includehint>
     <includehint>ktabwidget.h</includehint>
 </includehints>
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
index 58b4110..fb0a2f9 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
@@ -65,6 +65,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
index 3d27db8..381ce51 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
@@ -176,6 +176,6 @@
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
index d1f3576..23b19bc 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
@@ -335,8 +335,8 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index 58b34ea..a5fdab8 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -24,8 +24,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 
 // KDE includes
 #include <kapplication.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
@@ -35,7 +35,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstdguiitem.h>
diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h
index 64eb0a3..c853d6f 100644
--- a/kmyfirewall/kmyfirewall.h
+++ b/kmyfirewall/kmyfirewall.h
@@ -25,7 +25,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 
 // KDE includes
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <kurl.h>