From 8cd2c9398a5402112d19aae3b24f75b6772f5e26 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:53:21 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- KMFIPTInterface/main.cpp | 4 ++-- KMFSysTray/kmfsystray.cpp | 4 ++-- KMFSysTray/kmfsystray.h | 4 ++-- KMFSysTray/main.cpp | 4 ++-- doc/kmyfirewall/index.docbook | 8 ++++---- .../compilers/iptables/kmfiptablescompiler.cpp | 12 ++++++------ kmyfirewall/compilers/iptables/kmfiptablescompiler.h | 6 +++--- kmyfirewall/compilers/pf/kmfpfcompiler.cpp | 10 +++++----- kmyfirewall/compilers/pf/kmfpfcompiler.h | 6 +++--- .../genericinterface/kmfgenericinterface_part.cpp | 12 ++++++------ .../genericinterface/kmfgenericinterface_part.h | 12 ++++++------ kmyfirewall/installer/kmfinstallerplugin.cpp | 6 +++--- kmyfirewall/installer/kmfinstallerplugin.h | 4 ++-- kmyfirewall/installer/linux/kmfiptinstaller.cpp | 12 ++++++------ kmyfirewall/installer/linux/kmfiptinstaller.h | 2 +- kmyfirewall/installer/openbsd/kmfpfinstaller.cpp | 12 ++++++------ kmyfirewall/installer/openbsd/kmfpfinstaller.h | 2 +- kmyfirewall/ipteditor/kmfipteditorpart.cpp | 12 ++++++------ kmyfirewall/ipteditor/kmfipteditorpart.h | 10 +++++----- kmyfirewall/main.cpp | 4 ++-- .../custom_option/kmfruleoptioneditcustom.cpp | 12 ++++++------ .../custom_option/kmfruleoptioneditcustom.h | 8 ++++---- .../interface_option/kmfruleoptioneditinterface.cpp | 12 ++++++------ .../interface_option/kmfruleoptioneditinterface.h | 6 +++--- .../ip_option/kmfruleoptioneditip.cpp | 12 ++++++------ .../ip_option/kmfruleoptioneditip.h | 6 +++--- .../limit_option/kmfruleoptioneditlimit.cpp | 12 ++++++------ .../limit_option/kmfruleoptioneditlimit.h | 6 +++--- .../log_target_option/kmfruletargetoptioneditlog.cpp | 12 ++++++------ .../log_target_option/kmfruletargetoptioneditlog.h | 6 +++--- .../mac_option/kmfruleoptioneditmac.cpp | 8 ++++---- .../mac_option/kmfruleoptioneditmac.h | 6 +++--- .../kmfruletargetoptioneditmark.cpp | 12 ++++++------ .../mark_target_option/kmfruletargetoptioneditmark.h | 6 +++--- .../nat_target_option/kmfruletargetoptioneditnat.cpp | 12 ++++++------ .../nat_target_option/kmfruletargetoptioneditnat.h | 6 +++--- .../protocol_option/kmfruleoptioneditprotocol.cpp | 12 ++++++------ .../protocol_option/kmfruleoptioneditprotocol.h | 6 +++--- .../state_option/kmfruleoptioneditstate.cpp | 12 ++++++------ .../state_option/kmfruleoptioneditstate.h | 6 +++--- .../tos_option/kmfruleoptionedittos.cpp | 12 ++++++------ .../tos_option/kmfruleoptionedittos.h | 6 +++--- .../tos_target_option/kmfruletargetoptionedittos.cpp | 12 ++++++------ .../tos_target_option/kmfruletargetoptionedittos.h | 6 +++--- 44 files changed, 180 insertions(+), 180 deletions(-) diff --git a/KMFIPTInterface/main.cpp b/KMFIPTInterface/main.cpp index 305f29c..22f55d1 100644 --- a/KMFIPTInterface/main.cpp +++ b/KMFIPTInterface/main.cpp @@ -39,9 +39,9 @@ static KCmdLineOptions options[] = int main ( int argc, char *argv[] ) { KLocale::setMainCatalogue( "tdelibs" ); - KAboutData aboutdata( "kmfiptinterface", I18N_NOOP( "TDE" ), + TDEAboutData aboutdata( "kmfiptinterface", I18N_NOOP( "TDE" ), version, description, - KAboutData::License_GPL, "(C) 2001, Christian Hubinger" ); + TDEAboutData::License_GPL, "(C) 2001, Christian Hubinger" ); aboutdata.addAuthor( "Christian Hubinger", I18N_NOOP( "Developer" ), "e9806056@student.tuwien.ac.at" ); TDECmdLineArgs::init( argc, argv, &aboutdata ); diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index c8f214b..416bcf5 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -122,10 +122,10 @@ void KMFSysTray::slotDetailsClosed() { void KMFSysTray::about() { /* if(!_aboutData) { - _aboutData = new KAboutData("KMFSysTray", I18N_NOOP("KMFSysTray"), + _aboutData = new TDEAboutData("KMFSysTray", I18N_NOOP("KMFSysTray"), "1.0", I18N_NOOP("KMyFirewall Pannel Applet.\n\n" "Some basic informaddAuthor("Christian Hubinger", 0, "e9806056@student.tuwien.ac.at"); } diff --git a/KMFSysTray/kmfsystray.h b/KMFSysTray/kmfsystray.h index c0b4e63..e292f08 100644 --- a/KMFSysTray/kmfsystray.h +++ b/KMFSysTray/kmfsystray.h @@ -36,7 +36,7 @@ #include #include -class KAboutData; +class TDEAboutData; class KMFIPTDoc; class KMFSysTray : public KSystemTray, public DCOPObject @@ -67,7 +67,7 @@ private: // Methods void initMenu(); private: - KAboutData *_aboutData; + TDEAboutData *_aboutData; KConfig *ksConfig; TQWidget *mainView; TQPixmap baseIcon; diff --git a/KMFSysTray/main.cpp b/KMFSysTray/main.cpp index fc4323f..2fb03f3 100644 --- a/KMFSysTray/main.cpp +++ b/KMFSysTray/main.cpp @@ -40,8 +40,8 @@ static KCmdLineOptions options[] = { }; int main( int argc, char *argv[] ) { - KAboutData aboutData( "kmfsystray", I18N_NOOP( "KMFSysTray" ), - KMYFIREWALL_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kmfsystray", I18N_NOOP( "KMFSysTray" ), + KMYFIREWALL_VERSION, description, TDEAboutData::License_GPL, COPYRIGHT_STRING, 0, 0, "e9806056@student.tuwien.ac.at" ); aboutData.addAuthor( "Christian Hubinger", 0, "e9806056@student.tuwien.ac.at" ); aboutData.setHomepage( "http://kmyfirewall.sourceforge.net" ); diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook index 1c8df51..bd50735 100644 --- a/doc/kmyfirewall/index.docbook +++ b/doc/kmyfirewall/index.docbook @@ -1022,7 +1022,7 @@ private: }; -class KInstance; +class TDEInstance; class KMFRuleOptionEditMACFactory : public KLibFactory { Q_OBJECT @@ -1138,12 +1138,12 @@ QWidget* KMFRuleOptionEditMAC::editWidget() { } // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include <kaboutdata.h> #include <klocale.h> -// KInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( QObject* parent, const char* name ) : KLibFactory( parent, name ) { diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp index 2963d60..6905513 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp @@ -218,16 +218,16 @@ void KMFIPTablesCompiler::slotConvertToIPTDoc() { } // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFIPTablesCompilerFactory::s_instance = 0L; -// KAboutData* KMFIPTablesCompilerFactory::s_about = 0L; +// TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L; +// TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L; KMFIPTablesCompilerFactory::KMFIPTablesCompilerFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - // s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); + // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" ); } TQObject* KMFIPTablesCompilerFactory::createObject( TQObject* parent, const char* name, @@ -238,9 +238,9 @@ TQObject* KMFIPTablesCompilerFactory::createObject( TQObject* parent, const char } -// KInstance* KMFIPTablesCompilerFactory::instance() { +// TDEInstance* KMFIPTablesCompilerFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); +// s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.h b/kmyfirewall/compilers/iptables/kmfiptablescompiler.h index 0f8a4bd..5e2f99c 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.h +++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.h @@ -33,7 +33,7 @@ #include "../../core/kmfcompilerinterface.h" class TQTabWidget; -class KInstance; +class TDEInstance; namespace KMF { class KMFListView; @@ -85,10 +85,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp index 48c4e0d..1b2c251 100644 --- a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp +++ b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp @@ -430,12 +430,12 @@ void KMFPFCompiler::setupNatRules( KMFGenericDoc* doc ) { } -// KInstance* KMFPFCompilerFactory::s_instance = 0L; -// KAboutData* KMFPFCompilerFactory::s_about = 0L; +// TDEInstance* KMFPFCompilerFactory::s_instance = 0L; +// TDEAboutData* KMFPFCompilerFactory::s_about = 0L; KMFPFCompilerFactory::KMFPFCompilerFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFPFCompilerFactory" ); +// s_instance = new TDEInstance( "KMFPFCompilerFactory" ); } TQObject* KMFPFCompilerFactory::createObject( TQObject* parent, const char* name, @@ -446,9 +446,9 @@ TQObject* KMFPFCompilerFactory::createObject( TQObject* parent, const char* name } -// KInstance* KMFPFCompilerFactory::instance() { +// TDEInstance* KMFPFCompilerFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFPFCompilerFactory" ); +// s_instance = new TDEInstance( "KMFPFCompilerFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.h b/kmyfirewall/compilers/pf/kmfpfcompiler.h index 9df8fb2..5131236 100644 --- a/kmyfirewall/compilers/pf/kmfpfcompiler.h +++ b/kmyfirewall/compilers/pf/kmfpfcompiler.h @@ -34,7 +34,7 @@ #include "../../core/kmfcompilerinterface.h" -class KInstance; +class TDEInstance; namespace KMF { class KMFGenericDoc; class KMFIPTDoc; @@ -124,10 +124,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp index 2c19c77..9fad3c1 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp @@ -208,12 +208,12 @@ void KMFGenericInterfacePart::slotEnableActions( bool ) { // } // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -KInstance* KMFGenericInterfacePartFactory::s_instance = 0L; -KAboutData* KMFGenericInterfacePartFactory::s_about = 0L; +TDEInstance* KMFGenericInterfacePartFactory::s_instance = 0L; +TDEAboutData* KMFGenericInterfacePartFactory::s_about = 0L; KMFGenericInterfacePartFactory::KMFGenericInterfacePartFactory() : KParts::Factory() {} @@ -238,11 +238,11 @@ KParts::Part* KMFGenericInterfacePartFactory::createPartObject( TQWidget *parent return obj; } -KInstance* KMFGenericInterfacePartFactory::instance() { +TDEInstance* KMFGenericInterfacePartFactory::instance() { if ( !s_instance ) { - s_about = new KAboutData( "kmfgenericinterfacepart", I18N_NOOP( "kmfgenericinterfacepartPart" ), "0.1" ); + s_about = new TDEAboutData( "kmfgenericinterfacepart", I18N_NOOP( "kmfgenericinterfacepartPart" ), "0.1" ); s_about->addAuthor( "Christian Hubinger", 0, "chubinger@irrsinnig.org" ); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.h b/kmyfirewall/genericinterface/kmfgenericinterface_part.h index e72be94..4c3ac8a 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface_part.h +++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.h @@ -18,8 +18,8 @@ Author: Christian Hubinger , (C) 2001 #include #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class TQLabel; class KAction; class KActionMenu; @@ -36,7 +36,7 @@ public: char *nameOb, const TQStringList & /*args*/ ); virtual ~KMFGenericInterfacePart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); /** * This is a virtual function inherited from KParts::ReadWritePart. @@ -101,11 +101,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; } #endif diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp index 5efb516..203edf3 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.cpp +++ b/kmyfirewall/installer/kmfinstallerplugin.cpp @@ -422,15 +422,15 @@ void KMFInstallerPlugin::slotEnableActions( bool ) { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -KInstance* KMFInstallerPluginFactory::s_instance = 0L; +TDEInstance* KMFInstallerPluginFactory::s_instance = 0L; KMFInstallerPluginFactory::KMFInstallerPluginFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_instance = new KInstance( "KMFInstallerPluginFactory" ); + s_instance = new TDEInstance( "KMFInstallerPluginFactory" ); } diff --git a/kmyfirewall/installer/kmfinstallerplugin.h b/kmyfirewall/installer/kmfinstallerplugin.h index 22c3cd5..e1c8ad9 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.h +++ b/kmyfirewall/installer/kmfinstallerplugin.h @@ -28,7 +28,7 @@ class TQPainter; class KURL; class KAction; class KActionMenu; -class KInstance; +class TDEInstance; namespace KMF { @@ -113,7 +113,7 @@ public: const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; } #endif // _KMFINSATLLERPART_H_ diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp index d7b8295..6e153ea 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp +++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp @@ -1133,16 +1133,16 @@ void KMFIPTInstaller::loadIcons() { } // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFIPTablesCompilerFactory::s_instance = 0L; -// KAboutData* KMFIPTablesCompilerFactory::s_about = 0L; +// TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L; +// TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L; KMFIPTInstallerFactory::KMFIPTInstallerFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); +// s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" ); } TQObject* KMFIPTInstallerFactory::createObject( TQObject* parent, const char* name, @@ -1153,9 +1153,9 @@ TQObject* KMFIPTInstallerFactory::createObject( TQObject* parent, const char* na } -// KInstance* KMFIPTablesCompilerFactory::instance() { +// TDEInstance* KMFIPTablesCompilerFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); +// s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.h b/kmyfirewall/installer/linux/kmfiptinstaller.h index ac54292..051431e 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.h +++ b/kmyfirewall/installer/linux/kmfiptinstaller.h @@ -35,7 +35,7 @@ class TQLabel; class TQPushButton; class TQGridLayout; class KTempFile; -class KInstance; +class TDEInstance; namespace KMF { diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp index f4acbcb..f620abc 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp @@ -1093,16 +1093,16 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa // } // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFIPTablesCompilerFactory::s_instance = 0L; -// KAboutData* KMFIPTablesCompilerFactory::s_about = 0L; +// TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L; +// TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L; KMFPFInstallerFactory::KMFPFInstallerFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); +// s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" ); } TQObject* KMFPFInstallerFactory::createObject( TQObject* parent, const char* name, @@ -1113,9 +1113,9 @@ TQObject* KMFPFInstallerFactory::createObject( TQObject* parent, const char* nam } -// KInstance* KMFIPTablesCompilerFactory::instance() { +// TDEInstance* KMFIPTablesCompilerFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); +// s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.h b/kmyfirewall/installer/openbsd/kmfpfinstaller.h index 4af982d..e36485a 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.h +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.h @@ -35,7 +35,7 @@ class TQLabel; class TQPushButton; class TQGridLayout; class KTempFile; -class KInstance; +class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.cpp b/kmyfirewall/ipteditor/kmfipteditorpart.cpp index 2fb2366..9324902 100644 --- a/kmyfirewall/ipteditor/kmfipteditorpart.cpp +++ b/kmyfirewall/ipteditor/kmfipteditorpart.cpp @@ -260,10 +260,10 @@ void KMFIPTEditorPart::slotEnableActions( bool on ) { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data -KInstance* KMFIPTEditorPartFactory::s_instance = 0L; -KAboutData* KMFIPTEditorPartFactory::s_about = 0L; +TDEInstance* KMFIPTEditorPartFactory::s_instance = 0L; +TDEAboutData* KMFIPTEditorPartFactory::s_about = 0L; KMFIPTEditorPartFactory::KMFIPTEditorPartFactory() : KParts::Factory() {} @@ -288,11 +288,11 @@ KParts::Part* KMFIPTEditorPartFactory::createPartObject( TQWidget *parentWidget, return obj; } -KInstance* KMFIPTEditorPartFactory::instance() { +TDEInstance* KMFIPTEditorPartFactory::instance() { if ( !s_instance ) { - s_about = new KAboutData( "kmfipteditorpart", I18N_NOOP( "kmfipteditorpartPart" ), "0.1" ); + s_about = new TDEAboutData( "kmfipteditorpart", I18N_NOOP( "kmfipteditorpartPart" ), "0.1" ); s_about->addAuthor( "Christian Hubinger", 0, "chubinger@irrsinnig.org" ); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.h b/kmyfirewall/ipteditor/kmfipteditorpart.h index 7268d1b..5084cfc 100644 --- a/kmyfirewall/ipteditor/kmfipteditorpart.h +++ b/kmyfirewall/ipteditor/kmfipteditorpart.h @@ -21,8 +21,8 @@ class TQPainter; class KURL; class KAction; class KActionMenu; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; namespace KMF { class KMFRuleEdit; @@ -115,11 +115,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; }; } diff --git a/kmyfirewall/main.cpp b/kmyfirewall/main.cpp index 0eec9c2..241fe5c 100644 --- a/kmyfirewall/main.cpp +++ b/kmyfirewall/main.cpp @@ -43,8 +43,8 @@ static KCmdLineOptions options[] = }; int main( int argc, char *argv[] ) { - KAboutData aboutData( "kmyfirewall", I18N_NOOP( "KMyFirewall" ), - KMYFIREWALL_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kmyfirewall", I18N_NOOP( "KMyFirewall" ), + KMYFIREWALL_VERSION, description, TDEAboutData::License_GPL, COPYRIGHT_STRING, 0, 0, "chubinger@irrsinnig.org" ); aboutData.addAuthor( "Christian Hubinger", 0, "chubinger@irrsinnig.org" ); aboutData.addCredit( "Benjamin Meyer", I18N_NOOP("A handful of fixes and code cleanup."),"ben+kmyfirewall@meyerhome.net"); diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp index 7a59e75..e4d8d75 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp @@ -91,16 +91,16 @@ TQWidget* KMFRuleOptionEditCustom::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// // KInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L; -// // KAboutData* KMFRuleOptionEditCustomFactory::s_about = 0L; +// // TDEInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L; +// // TDEAboutData* KMFRuleOptionEditCustomFactory::s_about = 0L; KMFRuleOptionEditCustomFactory::KMFRuleOptionEditCustomFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// // s_instance = new KInstance( "KMFRuleOptionEditCustomFactory" ); +// // s_instance = new TDEInstance( "KMFRuleOptionEditCustomFactory" ); } TQObject* KMFRuleOptionEditCustomFactory::createObject( TQObject* parent, const char* name, @@ -111,9 +111,9 @@ TQObject* KMFRuleOptionEditCustomFactory::createObject( TQObject* parent, const } -// // KInstance* KMFRuleOptionEditCustomFactory::instance() { +// // TDEInstance* KMFRuleOptionEditCustomFactory::instance() { // // if ( !s_instance ) { -// // s_instance = new KInstance( "KMFRuleOptionEditCustomFactory" ); +// // s_instance = new TDEInstance( "KMFRuleOptionEditCustomFactory" ); // // } // // return s_instance; // // } diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h index ab96c56..26f0ef4 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h @@ -36,7 +36,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; @@ -55,7 +55,7 @@ public: TQWidget* editWidget(); const TQString& optionEditName() const; const TQString& description() const; - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); private slots: void slotShowOverview(); @@ -78,10 +78,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp index a2bcb7a..01527bf 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp @@ -81,16 +81,16 @@ TQWidget* KMFRuleOptionEditorInterface::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditorInterfaceFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditorInterfaceFactory::s_about = 0L; KMFRuleOptionEditorInterfaceFactory::KMFRuleOptionEditorInterfaceFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditorInterfaceFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditorInterfaceFactory" ); } TQObject* KMFRuleOptionEditorInterfaceFactory::createObject( TQObject* parent, const char* name, @@ -101,9 +101,9 @@ TQObject* KMFRuleOptionEditorInterfaceFactory::createObject( TQObject* parent, c } -// KInstance* KMFRuleOptionEditorInterfaceFactory::instance() { +// TDEInstance* KMFRuleOptionEditorInterfaceFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleOptionEditorInterfaceFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditorInterfaceFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h index 5cb12b2..61584ce 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h @@ -20,7 +20,7 @@ #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; @@ -62,10 +62,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp index 4672c98..33efe0e 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp @@ -89,16 +89,16 @@ TQWidget* KMFRuleOptionEditIP::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditIPFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditIPFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditIPFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditIPFactory::s_about = 0L; KMFRuleOptionEditIPFactory::KMFRuleOptionEditIPFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditIPFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditIPFactory" ); } TQObject* KMFRuleOptionEditIPFactory::createObject( TQObject* parent, const char* name, @@ -109,9 +109,9 @@ TQObject* KMFRuleOptionEditIPFactory::createObject( TQObject* parent, const char } -// KInstance* KMFRuleOptionEditIPFactory::instance() { +// TDEInstance* KMFRuleOptionEditIPFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleOptionEditIPFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditIPFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h index 39138df..c81e8de 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h @@ -31,7 +31,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditIP; @@ -72,10 +72,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp index e0e1a71..d0fb653 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp @@ -91,16 +91,16 @@ TQWidget* KMFRuleOptionEditLimit::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditLimitFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditLimitFactory::s_about = 0L; KMFRuleOptionEditLimitFactory::KMFRuleOptionEditLimitFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditLimitFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditLimitFactory" ); } TQObject* KMFRuleOptionEditLimitFactory::createObject( TQObject* parent, const char* name, @@ -111,9 +111,9 @@ TQObject* KMFRuleOptionEditLimitFactory::createObject( TQObject* parent, const c } -// KInstance* KMFRuleOptionEditLimitFactory::instance() { +// TDEInstance* KMFRuleOptionEditLimitFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleOptionEditLimitFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditLimitFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h index eced67a..62e0cdf 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h @@ -31,7 +31,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditorLimit; @@ -72,10 +72,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp index ce632c6..e7a3b36 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp @@ -87,16 +87,16 @@ bool KMFRuleTargetOptionEditLog::setTarget( const TQString& target ){ // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L; -// KAboutData* KMFRuleTargetOptionEditLogFactory::s_about = 0L; +// TDEInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L; +// TDEAboutData* KMFRuleTargetOptionEditLogFactory::s_about = 0L; KMFRuleTargetOptionEditLogFactory::KMFRuleTargetOptionEditLogFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditLogFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditLogFactory" ); } TQObject* KMFRuleTargetOptionEditLogFactory::createObject( TQObject* parent, const char* name, @@ -107,9 +107,9 @@ TQObject* KMFRuleTargetOptionEditLogFactory::createObject( TQObject* parent, con } -// KInstance* KMFRuleTargetOptionEditLogFactory::instance() { +// TDEInstance* KMFRuleTargetOptionEditLogFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditLogFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditLogFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h index 89489e5..f916905 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h @@ -19,7 +19,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditTargetLog; @@ -61,10 +61,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp index c62ecf9..96060b9 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp @@ -79,16 +79,16 @@ TQWidget* KMFRuleOptionEditMAC::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditMACFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditMACFactory" ); } TQObject* KMFRuleOptionEditMACFactory::createObject( TQObject* parent, const char* name, diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h index b807360..3f0683c 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h @@ -34,7 +34,7 @@ #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; @@ -76,10 +76,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp index a3909a8..7da315a 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp @@ -92,16 +92,16 @@ bool KMFRuleTargetOptionEditMark::setTarget( const TQString& target ){ // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L; -// KAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L; +// TDEInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L; +// TDEAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L; KMFRuleTargetOptionEditMarkFactory::KMFRuleTargetOptionEditMarkFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditMarkFactory" ); } TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* parent, const char* name, @@ -112,9 +112,9 @@ TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* parent, co } -// KInstance* KMFRuleTargetOptionEditMarkFactory::instance() { +// TDEInstance* KMFRuleTargetOptionEditMarkFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditMarkFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h index 6a71bc9..9180cf8 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h @@ -19,7 +19,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { @@ -64,10 +64,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp index 717030b..2c9c2d1 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp @@ -104,16 +104,16 @@ bool KMFRuleTargetOptionEditNat::setTarget( const TQString& target ){ // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L; -// KAboutData* KMFRuleTargetOptionEditNatFactory::s_about = 0L; +// TDEInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L; +// TDEAboutData* KMFRuleTargetOptionEditNatFactory::s_about = 0L; KMFRuleTargetOptionEditNatFactory::KMFRuleTargetOptionEditNatFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditNatFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditNatFactory" ); } TQObject* KMFRuleTargetOptionEditNatFactory::createObject( TQObject* parent, const char* name, @@ -124,9 +124,9 @@ TQObject* KMFRuleTargetOptionEditNatFactory::createObject( TQObject* parent, con } -// KInstance* KMFRuleTargetOptionEditNatFactory::instance() { +// TDEInstance* KMFRuleTargetOptionEditNatFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditNatFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditNatFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h index f55ebbc..17518c4 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h @@ -31,7 +31,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditorTargetNat; @@ -73,10 +73,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp index 982c22b..113fb14 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp @@ -94,16 +94,16 @@ TQWidget* KMFRuleOptionEditProtocol::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditProtocolFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditProtocolFactory::s_about = 0L; KMFRuleOptionEditProtocolFactory::KMFRuleOptionEditProtocolFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditProtocolFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditProtocolFactory" ); } TQObject* KMFRuleOptionEditProtocolFactory::createObject( TQObject* parent, const char* name, @@ -114,9 +114,9 @@ TQObject* KMFRuleOptionEditProtocolFactory::createObject( TQObject* parent, cons } -// KInstance* KMFRuleOptionEditProtocolFactory::instance() { +// TDEInstance* KMFRuleOptionEditProtocolFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleOptionEditProtocolFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditProtocolFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h index 2055694..36834f8 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h @@ -32,7 +32,7 @@ #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; @@ -74,10 +74,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp index dd9409d..1bbacad 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp @@ -87,16 +87,16 @@ TQWidget* KMFRuleOptionEditState::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditStateFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditStateFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditStateFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditStateFactory::s_about = 0L; KMFRuleOptionEditStateFactory::KMFRuleOptionEditStateFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditStateFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditStateFactory" ); } TQObject* KMFRuleOptionEditStateFactory::createObject( TQObject* parent, const char* name, @@ -107,9 +107,9 @@ TQObject* KMFRuleOptionEditStateFactory::createObject( TQObject* parent, const c } -// KInstance* KMFRuleOptionEditStateFactory::instance() { +// TDEInstance* KMFRuleOptionEditStateFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleOptionEditStateFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditStateFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h index f246bbb..3a34da9 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h @@ -31,7 +31,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditorState; @@ -72,10 +72,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp index 681957a..b2bc785 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp @@ -92,16 +92,16 @@ TQWidget* KMFRuleOptionEditTos::editWidget() { // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleOptionEditTosFactory::s_instance = 0L; -// KAboutData* KMFRuleOptionEditTosFactory::s_about = 0L; +// TDEInstance* KMFRuleOptionEditTosFactory::s_instance = 0L; +// TDEAboutData* KMFRuleOptionEditTosFactory::s_about = 0L; KMFRuleOptionEditTosFactory::KMFRuleOptionEditTosFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleOptionEditTosFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditTosFactory" ); } TQObject* KMFRuleOptionEditTosFactory::createObject( TQObject* parent, const char* name, @@ -112,9 +112,9 @@ TQObject* KMFRuleOptionEditTosFactory::createObject( TQObject* parent, const cha } -// KInstance* KMFRuleOptionEditTosFactory::instance() { +// TDEInstance* KMFRuleOptionEditTosFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleOptionEditTosFactory" ); +// s_instance = new TDEInstance( "KMFRuleOptionEditTosFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h index 87499d1..d852719 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h @@ -31,7 +31,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditorTos; @@ -72,10 +72,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; } diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp index f8470a6..486f9b7 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp @@ -91,16 +91,16 @@ bool KMFRuleTargetOptionEditTos::setTarget( const TQString& target ){ // It's usually safe to leave the factory code alone.. with the -// notable exception of the KAboutData data +// notable exception of the TDEAboutData data #include #include -// KInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L; -// KAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L; +// TDEInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L; +// TDEAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L; KMFRuleTargetOptionEditTosFactory::KMFRuleTargetOptionEditTosFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditTosFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditTosFactory" ); } TQObject* KMFRuleTargetOptionEditTosFactory::createObject( TQObject* parent, const char* name, @@ -111,9 +111,9 @@ TQObject* KMFRuleTargetOptionEditTosFactory::createObject( TQObject* parent, con } -// KInstance* KMFRuleTargetOptionEditTosFactory::instance() { +// TDEInstance* KMFRuleTargetOptionEditTosFactory::instance() { // if ( !s_instance ) { -// s_instance = new KInstance( "KMFRuleTargetOptionEditTosFactory" ); +// s_instance = new TDEInstance( "KMFRuleTargetOptionEditTosFactory" ); // } // return s_instance; // } diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h index 1bf64cd..1fb76fc 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h @@ -19,7 +19,7 @@ #include #include #include -class KInstance; +class TDEInstance; namespace KMF { class IPTRule; class KMFRuleEditorTos; @@ -61,10 +61,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - /* static KInstance* instance(); */ + /* static TDEInstance* instance(); */ /*private: - static KInstance* s_instance;*/ + static TDEInstance* s_instance;*/ }; }