Rename many classes and header files to avoid conflicts with KDE4

12 years ago · 82b9687c00
parent 20813edce9
commit 82b9687c00
29 changed files with 49 additions and 49 deletions
--- 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>

--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>