Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 3b22097ebe
commit 8cd2c9398a

@ -39,9 +39,9 @@ static KCmdLineOptions options[] =
int main ( int argc, char *argv[] ) { int main ( int argc, char *argv[] ) {
KLocale::setMainCatalogue( "tdelibs" ); KLocale::setMainCatalogue( "tdelibs" );
KAboutData aboutdata( "kmfiptinterface", I18N_NOOP( "TDE" ), TDEAboutData aboutdata( "kmfiptinterface", I18N_NOOP( "TDE" ),
version, description, 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" ); aboutdata.addAuthor( "Christian Hubinger", I18N_NOOP( "Developer" ), "e9806056@student.tuwien.ac.at" );
TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::init( argc, argv, &aboutdata );

@ -122,10 +122,10 @@ void KMFSysTray::slotDetailsClosed() {
void KMFSysTray::about() { void KMFSysTray::about() {
/* if(!_aboutData) { /* 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" "1.0", I18N_NOOP("KMyFirewall Pannel Applet.\n\n"
"Some basic inform<tion about your running iptables rules"), "Some basic inform<tion about your running iptables rules"),
KAboutData::License_GPL_V2, "(c) 2005, Christian Hubinger"); TDEAboutData::License_GPL_V2, "(c) 2005, Christian Hubinger");
_aboutData->addAuthor("Christian Hubinger", 0, "e9806056@student.tuwien.ac.at"); _aboutData->addAuthor("Christian Hubinger", 0, "e9806056@student.tuwien.ac.at");
} }

@ -36,7 +36,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <dcopobject.h> #include <dcopobject.h>
class KAboutData; class TDEAboutData;
class KMFIPTDoc; class KMFIPTDoc;
class KMFSysTray : public KSystemTray, public DCOPObject class KMFSysTray : public KSystemTray, public DCOPObject
@ -67,7 +67,7 @@ private: // Methods
void initMenu(); void initMenu();
private: private:
KAboutData *_aboutData; TDEAboutData *_aboutData;
KConfig *ksConfig; KConfig *ksConfig;
TQWidget *mainView; TQWidget *mainView;
TQPixmap baseIcon; TQPixmap baseIcon;

@ -40,8 +40,8 @@ static KCmdLineOptions options[] = {
}; };
int main( int argc, char *argv[] ) { int main( int argc, char *argv[] ) {
KAboutData aboutData( "kmfsystray", I18N_NOOP( "KMFSysTray" ), TDEAboutData aboutData( "kmfsystray", I18N_NOOP( "KMFSysTray" ),
KMYFIREWALL_VERSION, description, KAboutData::License_GPL, KMYFIREWALL_VERSION, description, TDEAboutData::License_GPL,
COPYRIGHT_STRING, 0, 0, "e9806056@student.tuwien.ac.at" ); COPYRIGHT_STRING, 0, 0, "e9806056@student.tuwien.ac.at" );
aboutData.addAuthor( "Christian Hubinger", 0, "e9806056@student.tuwien.ac.at" ); aboutData.addAuthor( "Christian Hubinger", 0, "e9806056@student.tuwien.ac.at" );
aboutData.setHomepage( "http://kmyfirewall.sourceforge.net" ); aboutData.setHomepage( "http://kmyfirewall.sourceforge.net" );

@ -1022,7 +1022,7 @@ private:
}; };
class KInstance; class TDEInstance;
class KMFRuleOptionEditMACFactory : public KLibFactory { class KMFRuleOptionEditMACFactory : public KLibFactory {
Q_OBJECT Q_OBJECT
@ -1138,12 +1138,12 @@ QWidget* KMFRuleOptionEditMAC::editWidget() {
} }
// It's usually safe to leave the factory code alone.. with the // 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 &lt;kaboutdata.h&gt; #include &lt;kaboutdata.h&gt;
#include &lt;klocale.h&gt; #include &lt;klocale.h&gt;
// KInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L;
KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( QObject* parent, const char* name ) KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( QObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {

@ -218,16 +218,16 @@ void KMFIPTablesCompiler::slotConvertToIPTDoc() {
} }
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFIPTablesCompilerFactory::s_instance = 0L; // TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L;
// KAboutData* KMFIPTablesCompilerFactory::s_about = 0L; // TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L;
KMFIPTablesCompilerFactory::KMFIPTablesCompilerFactory( TQObject* parent, const char* name ) KMFIPTablesCompilerFactory::KMFIPTablesCompilerFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" );
} }
TQObject* KMFIPTablesCompilerFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -33,7 +33,7 @@
#include "../../core/kmfcompilerinterface.h" #include "../../core/kmfcompilerinterface.h"
class TQTabWidget; class TQTabWidget;
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class KMFListView; class KMFListView;
@ -85,10 +85,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -430,12 +430,12 @@ void KMFPFCompiler::setupNatRules( KMFGenericDoc* doc ) {
} }
// KInstance* KMFPFCompilerFactory::s_instance = 0L; // TDEInstance* KMFPFCompilerFactory::s_instance = 0L;
// KAboutData* KMFPFCompilerFactory::s_about = 0L; // TDEAboutData* KMFPFCompilerFactory::s_about = 0L;
KMFPFCompilerFactory::KMFPFCompilerFactory( TQObject* parent, const char* name ) KMFPFCompilerFactory::KMFPFCompilerFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFPFCompilerFactory" ); // s_instance = new TDEInstance( "KMFPFCompilerFactory" );
} }
TQObject* KMFPFCompilerFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFPFCompilerFactory" ); // s_instance = new TDEInstance( "KMFPFCompilerFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -34,7 +34,7 @@
#include "../../core/kmfcompilerinterface.h" #include "../../core/kmfcompilerinterface.h"
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class KMFGenericDoc; class KMFGenericDoc;
class KMFIPTDoc; class KMFIPTDoc;
@ -124,10 +124,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -208,12 +208,12 @@ void KMFGenericInterfacePart::slotEnableActions( bool ) {
// } // }
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
KInstance* KMFGenericInterfacePartFactory::s_instance = 0L; TDEInstance* KMFGenericInterfacePartFactory::s_instance = 0L;
KAboutData* KMFGenericInterfacePartFactory::s_about = 0L; TDEAboutData* KMFGenericInterfacePartFactory::s_about = 0L;
KMFGenericInterfacePartFactory::KMFGenericInterfacePartFactory() KMFGenericInterfacePartFactory::KMFGenericInterfacePartFactory()
: KParts::Factory() {} : KParts::Factory() {}
@ -238,11 +238,11 @@ KParts::Part* KMFGenericInterfacePartFactory::createPartObject( TQWidget *parent
return obj; return obj;
} }
KInstance* KMFGenericInterfacePartFactory::instance() { TDEInstance* KMFGenericInterfacePartFactory::instance() {
if ( !s_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_about->addAuthor( "Christian Hubinger", 0, "chubinger@irrsinnig.org" );
s_instance = new KInstance( s_about ); s_instance = new TDEInstance( s_about );
} }
return s_instance; return s_instance;
} }

@ -18,8 +18,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <kparts/part.h> #include <kparts/part.h>
#include <kparts/factory.h> #include <kparts/factory.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class TQLabel; class TQLabel;
class KAction; class KAction;
class KActionMenu; class KActionMenu;
@ -36,7 +36,7 @@ public:
char *nameOb, char *nameOb,
const TQStringList & /*args*/ ); const TQStringList & /*args*/ );
virtual ~KMFGenericInterfacePart(); virtual ~KMFGenericInterfacePart();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
/** /**
* This is a virtual function inherited from KParts::ReadWritePart. * This is a virtual function inherited from KParts::ReadWritePart.
@ -101,11 +101,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
} }
#endif #endif

@ -422,15 +422,15 @@ void KMFInstallerPlugin::slotEnableActions( bool ) {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
KInstance* KMFInstallerPluginFactory::s_instance = 0L; TDEInstance* KMFInstallerPluginFactory::s_instance = 0L;
KMFInstallerPluginFactory::KMFInstallerPluginFactory( TQObject* parent, const char* name ) KMFInstallerPluginFactory::KMFInstallerPluginFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
s_instance = new KInstance( "KMFInstallerPluginFactory" ); s_instance = new TDEInstance( "KMFInstallerPluginFactory" );
} }

@ -28,7 +28,7 @@ class TQPainter;
class KURL; class KURL;
class KAction; class KAction;
class KActionMenu; class KActionMenu;
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
@ -113,7 +113,7 @@ public:
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
} }
#endif // _KMFINSATLLERPART_H_ #endif // _KMFINSATLLERPART_H_

@ -1133,16 +1133,16 @@ void KMFIPTInstaller::loadIcons() {
} }
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFIPTablesCompilerFactory::s_instance = 0L; // TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L;
// KAboutData* KMFIPTablesCompilerFactory::s_about = 0L; // TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L;
KMFIPTInstallerFactory::KMFIPTInstallerFactory( TQObject* parent, const char* name ) KMFIPTInstallerFactory::KMFIPTInstallerFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" );
} }
TQObject* KMFIPTInstallerFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -35,7 +35,7 @@ class TQLabel;
class TQPushButton; class TQPushButton;
class TQGridLayout; class TQGridLayout;
class KTempFile; class KTempFile;
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {

@ -1093,16 +1093,16 @@ void KMFPFInstaller::generateInstallerPackage( KMFTarget* target, const KURL& pa
// } // }
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFIPTablesCompilerFactory::s_instance = 0L; // TDEInstance* KMFIPTablesCompilerFactory::s_instance = 0L;
// KAboutData* KMFIPTablesCompilerFactory::s_about = 0L; // TDEAboutData* KMFIPTablesCompilerFactory::s_about = 0L;
KMFPFInstallerFactory::KMFPFInstallerFactory( TQObject* parent, const char* name ) KMFPFInstallerFactory::KMFPFInstallerFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" );
} }
TQObject* KMFPFInstallerFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFIPTablesCompilerFactory" ); // s_instance = new TDEInstance( "KMFIPTablesCompilerFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -35,7 +35,7 @@ class TQLabel;
class TQPushButton; class TQPushButton;
class TQGridLayout; class TQGridLayout;
class KTempFile; class KTempFile;
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {

@ -260,10 +260,10 @@ void KMFIPTEditorPart::slotEnableActions( bool on ) {
// It's usually safe to leave the factory code alone.. with the // 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; TDEInstance* KMFIPTEditorPartFactory::s_instance = 0L;
KAboutData* KMFIPTEditorPartFactory::s_about = 0L; TDEAboutData* KMFIPTEditorPartFactory::s_about = 0L;
KMFIPTEditorPartFactory::KMFIPTEditorPartFactory() KMFIPTEditorPartFactory::KMFIPTEditorPartFactory()
: KParts::Factory() {} : KParts::Factory() {}
@ -288,11 +288,11 @@ KParts::Part* KMFIPTEditorPartFactory::createPartObject( TQWidget *parentWidget,
return obj; return obj;
} }
KInstance* KMFIPTEditorPartFactory::instance() { TDEInstance* KMFIPTEditorPartFactory::instance() {
if ( !s_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_about->addAuthor( "Christian Hubinger", 0, "chubinger@irrsinnig.org" );
s_instance = new KInstance( s_about ); s_instance = new TDEInstance( s_about );
} }
return s_instance; return s_instance;
} }

@ -21,8 +21,8 @@ class TQPainter;
class KURL; class KURL;
class KAction; class KAction;
class KActionMenu; class KActionMenu;
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
namespace KMF { namespace KMF {
class KMFRuleEdit; class KMFRuleEdit;
@ -115,11 +115,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
} }

@ -43,8 +43,8 @@ static KCmdLineOptions options[] =
}; };
int main( int argc, char *argv[] ) { int main( int argc, char *argv[] ) {
KAboutData aboutData( "kmyfirewall", I18N_NOOP( "KMyFirewall" ), TDEAboutData aboutData( "kmyfirewall", I18N_NOOP( "KMyFirewall" ),
KMYFIREWALL_VERSION, description, KAboutData::License_GPL, KMYFIREWALL_VERSION, description, TDEAboutData::License_GPL,
COPYRIGHT_STRING, 0, 0, "chubinger@irrsinnig.org" ); COPYRIGHT_STRING, 0, 0, "chubinger@irrsinnig.org" );
aboutData.addAuthor( "Christian Hubinger", 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"); aboutData.addCredit( "Benjamin Meyer", I18N_NOOP("A handful of fixes and code cleanup."),"ben+kmyfirewall@meyerhome.net");

@ -91,16 +91,16 @@ TQWidget* KMFRuleOptionEditCustom::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// // KInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L; // // TDEInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L;
// // KAboutData* KMFRuleOptionEditCustomFactory::s_about = 0L; // // TDEAboutData* KMFRuleOptionEditCustomFactory::s_about = 0L;
KMFRuleOptionEditCustomFactory::KMFRuleOptionEditCustomFactory( TQObject* parent, const char* name ) KMFRuleOptionEditCustomFactory::KMFRuleOptionEditCustomFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// // s_instance = new KInstance( "KMFRuleOptionEditCustomFactory" ); // // s_instance = new TDEInstance( "KMFRuleOptionEditCustomFactory" );
} }
TQObject* KMFRuleOptionEditCustomFactory::createObject( TQObject* parent, const char* name, 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 ) { // // if ( !s_instance ) {
// // s_instance = new KInstance( "KMFRuleOptionEditCustomFactory" ); // // s_instance = new TDEInstance( "KMFRuleOptionEditCustomFactory" );
// // } // // }
// // return s_instance; // // return s_instance;
// // } // // }

@ -36,7 +36,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
@ -55,7 +55,7 @@ public:
TQWidget* editWidget(); TQWidget* editWidget();
const TQString& optionEditName() const; const TQString& optionEditName() const;
const TQString& description() const; const TQString& description() const;
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
private slots: private slots:
void slotShowOverview(); void slotShowOverview();
@ -78,10 +78,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -81,16 +81,16 @@ TQWidget* KMFRuleOptionEditorInterface::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditorInterfaceFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditorInterfaceFactory::s_about = 0L;
KMFRuleOptionEditorInterfaceFactory::KMFRuleOptionEditorInterfaceFactory( TQObject* parent, const char* name ) KMFRuleOptionEditorInterfaceFactory::KMFRuleOptionEditorInterfaceFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditorInterfaceFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditorInterfaceFactory" );
} }
TQObject* KMFRuleOptionEditorInterfaceFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleOptionEditorInterfaceFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditorInterfaceFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -20,7 +20,7 @@
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
@ -62,10 +62,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -89,16 +89,16 @@ TQWidget* KMFRuleOptionEditIP::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditIPFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditIPFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditIPFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditIPFactory::s_about = 0L;
KMFRuleOptionEditIPFactory::KMFRuleOptionEditIPFactory( TQObject* parent, const char* name ) KMFRuleOptionEditIPFactory::KMFRuleOptionEditIPFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditIPFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditIPFactory" );
} }
TQObject* KMFRuleOptionEditIPFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleOptionEditIPFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditIPFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -31,7 +31,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditIP; class KMFRuleEditIP;
@ -72,10 +72,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -91,16 +91,16 @@ TQWidget* KMFRuleOptionEditLimit::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditLimitFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditLimitFactory::s_about = 0L;
KMFRuleOptionEditLimitFactory::KMFRuleOptionEditLimitFactory( TQObject* parent, const char* name ) KMFRuleOptionEditLimitFactory::KMFRuleOptionEditLimitFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditLimitFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditLimitFactory" );
} }
TQObject* KMFRuleOptionEditLimitFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleOptionEditLimitFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditLimitFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -31,7 +31,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditorLimit; class KMFRuleEditorLimit;
@ -72,10 +72,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -87,16 +87,16 @@ bool KMFRuleTargetOptionEditLog::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L; // TDEInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L;
// KAboutData* KMFRuleTargetOptionEditLogFactory::s_about = 0L; // TDEAboutData* KMFRuleTargetOptionEditLogFactory::s_about = 0L;
KMFRuleTargetOptionEditLogFactory::KMFRuleTargetOptionEditLogFactory( TQObject* parent, const char* name ) KMFRuleTargetOptionEditLogFactory::KMFRuleTargetOptionEditLogFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditLogFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditLogFactory" );
} }
TQObject* KMFRuleTargetOptionEditLogFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditLogFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditLogFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -19,7 +19,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditTargetLog; class KMFRuleEditTargetLog;
@ -61,10 +61,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -79,16 +79,16 @@ TQWidget* KMFRuleOptionEditMAC::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditMACFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditMACFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L;
KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( TQObject* parent, const char* name ) KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditMACFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditMACFactory" );
} }
TQObject* KMFRuleOptionEditMACFactory::createObject( TQObject* parent, const char* name, TQObject* KMFRuleOptionEditMACFactory::createObject( TQObject* parent, const char* name,

@ -34,7 +34,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqptrlist.h> #include <tqptrlist.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
@ -76,10 +76,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -92,16 +92,16 @@ bool KMFRuleTargetOptionEditMark::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L; // TDEInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L;
// KAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L; // TDEAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L;
KMFRuleTargetOptionEditMarkFactory::KMFRuleTargetOptionEditMarkFactory( TQObject* parent, const char* name ) KMFRuleTargetOptionEditMarkFactory::KMFRuleTargetOptionEditMarkFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditMarkFactory" );
} }
TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditMarkFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -19,7 +19,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
@ -64,10 +64,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -104,16 +104,16 @@ bool KMFRuleTargetOptionEditNat::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L; // TDEInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L;
// KAboutData* KMFRuleTargetOptionEditNatFactory::s_about = 0L; // TDEAboutData* KMFRuleTargetOptionEditNatFactory::s_about = 0L;
KMFRuleTargetOptionEditNatFactory::KMFRuleTargetOptionEditNatFactory( TQObject* parent, const char* name ) KMFRuleTargetOptionEditNatFactory::KMFRuleTargetOptionEditNatFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditNatFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditNatFactory" );
} }
TQObject* KMFRuleTargetOptionEditNatFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditNatFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditNatFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -31,7 +31,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditorTargetNat; class KMFRuleEditorTargetNat;
@ -73,10 +73,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -94,16 +94,16 @@ TQWidget* KMFRuleOptionEditProtocol::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditProtocolFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditProtocolFactory::s_about = 0L;
KMFRuleOptionEditProtocolFactory::KMFRuleOptionEditProtocolFactory( TQObject* parent, const char* name ) KMFRuleOptionEditProtocolFactory::KMFRuleOptionEditProtocolFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditProtocolFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditProtocolFactory" );
} }
TQObject* KMFRuleOptionEditProtocolFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleOptionEditProtocolFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditProtocolFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -32,7 +32,7 @@
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
@ -74,10 +74,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -87,16 +87,16 @@ TQWidget* KMFRuleOptionEditState::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditStateFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditStateFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditStateFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditStateFactory::s_about = 0L;
KMFRuleOptionEditStateFactory::KMFRuleOptionEditStateFactory( TQObject* parent, const char* name ) KMFRuleOptionEditStateFactory::KMFRuleOptionEditStateFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditStateFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditStateFactory" );
} }
TQObject* KMFRuleOptionEditStateFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleOptionEditStateFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditStateFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -31,7 +31,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditorState; class KMFRuleEditorState;
@ -72,10 +72,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -92,16 +92,16 @@ TQWidget* KMFRuleOptionEditTos::editWidget() {
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleOptionEditTosFactory::s_instance = 0L; // TDEInstance* KMFRuleOptionEditTosFactory::s_instance = 0L;
// KAboutData* KMFRuleOptionEditTosFactory::s_about = 0L; // TDEAboutData* KMFRuleOptionEditTosFactory::s_about = 0L;
KMFRuleOptionEditTosFactory::KMFRuleOptionEditTosFactory( TQObject* parent, const char* name ) KMFRuleOptionEditTosFactory::KMFRuleOptionEditTosFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleOptionEditTosFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditTosFactory" );
} }
TQObject* KMFRuleOptionEditTosFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleOptionEditTosFactory" ); // s_instance = new TDEInstance( "KMFRuleOptionEditTosFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -31,7 +31,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditorTos; class KMFRuleEditorTos;
@ -72,10 +72,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

@ -91,16 +91,16 @@ bool KMFRuleTargetOptionEditTos::setTarget( const TQString& target ){
// It's usually safe to leave the factory code alone.. with the // 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 <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
// KInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L; // TDEInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L;
// KAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L; // TDEAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L;
KMFRuleTargetOptionEditTosFactory::KMFRuleTargetOptionEditTosFactory( TQObject* parent, const char* name ) KMFRuleTargetOptionEditTosFactory::KMFRuleTargetOptionEditTosFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) { : KLibFactory( parent, name ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditTosFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditTosFactory" );
} }
TQObject* KMFRuleTargetOptionEditTosFactory::createObject( TQObject* parent, const char* name, 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 ) { // if ( !s_instance ) {
// s_instance = new KInstance( "KMFRuleTargetOptionEditTosFactory" ); // s_instance = new TDEInstance( "KMFRuleTargetOptionEditTosFactory" );
// } // }
// return s_instance; // return s_instance;
// } // }

@ -19,7 +19,7 @@
#include <kparts/plugin.h> #include <kparts/plugin.h>
#include <kparts/factory.h> #include <kparts/factory.h>
#include <kxmlgui.h> #include <kxmlgui.h>
class KInstance; class TDEInstance;
namespace KMF { namespace KMF {
class IPTRule; class IPTRule;
class KMFRuleEditorTos; class KMFRuleEditorTos;
@ -61,10 +61,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
const char* name = TQOBJECT_OBJECT_NAME_STRING, const char* name = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
/* static KInstance* instance(); */ /* static TDEInstance* instance(); */
/*private: /*private:
static KInstance* s_instance;*/ static TDEInstance* s_instance;*/
}; };
} }

Loading…
Cancel
Save