From 82b9687c005a576e31539c9bc00e45d8c6481c34 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:11:41 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- KMFSysTray/kmfsystray.cpp | 2 +- kmyfirewall/genericinterface/kmfgenericinterface_part.cpp | 2 +- kmyfirewall/genericinterface/kmfgenericinterfacehost.cpp | 4 ++-- kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp | 2 +- .../genericinterface/kmfgenericinterfaceprotocol.cpp | 4 ++-- .../kmyfirewallgenericinterfacehostwidget.ui | 2 +- .../kmyfirewallgenericinterfaceprotocolwidget.ui | 2 +- kmyfirewall/installer/kmfinstallerplugin.cpp | 2 +- kmyfirewall/ipteditor/kmfipteditorpart.cpp | 4 ++-- kmyfirewall/ipteditor/kmfruleedit.cpp | 6 +++--- kmyfirewall/kmfconfigdialog.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfipv4addresswidget.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmflistview.h | 2 +- kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp | 2 +- kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfprotocollistview.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfprotocolpropertieswidget.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmftransactionlog.cpp | 4 ++-- .../kmyfirewallgenericinterfaceeditprotocolwidget.ui | 6 +++--- kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui | 2 +- kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui | 2 +- kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui | 2 +- kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui | 4 ++-- kmyfirewall/kmyfirewall.cpp | 6 +++--- kmyfirewall/kmyfirewall.h | 2 +- 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 #include #include -#include +#include #include #include 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 , (C) 2001 // KDE includes #include -#include +#include #include #include #include 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 #include -#include -#include +#include +#include #include #include #include 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 #include #include -#include +#include // 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 #include -#include +#include #include -#include +#include #include #include #include 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 @@ knuminput.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h 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 @@ - klistview.h + tdelistview.h 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 , (C) 2001 // KDE includes #include -#include +#include #include #include #include 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 , (C) 2001 // KDE includes #include -#include +#include #include -#include +#include #include #include #include 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 #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include 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 , (C) 2001-2004 #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include 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 #include #include -#include -#include +#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include #include -#include +#include // 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 #include -#include +#include #include -#include +#include #include #include #include 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 , (C) 2001-2004 #ifndef KMFLISTVIEW_H #define KMFLISTVIEW_H -#include +#include // 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 #include #include -#include +#include #include // 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 #include -#include +#include #include -#include +#include #include #include #include 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 #include -#include +#include #include -#include +#include #include #include #include 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 #include -#include +#include #include -#include +#include #include #include #include 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 #include #include -#include -#include +#include +#include #include #include #include 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 #include #include -#include +#include #include #include #include #include -#include +#include // 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 // KDE includes -#include +#include #include #include #include -#include +#include #include #include 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 - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h - klistbox.h - klistbox.h + tdelistbox.h + tdelistbox.h kpushbutton.h kpushbutton.h 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 @@ - klistview.h + tdelistview.h ktabwidget.h ktabwidget.h 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 @@ - klistview.h + tdelistview.h 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 @@ kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h 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 @@ - klistview.h - klistview.h + tdelistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h 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 , (C) 2001-2004 // KDE includes #include -#include -#include +#include +#include #include #include #include @@ -35,7 +35,7 @@ Author: Christian Hubinger , (C) 2001-2004 #include #include #include -#include +#include #include #include #include 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 , (C) 2001-2004 // KDE includes #include -#include +#include #include #include #include