diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:38 -0600 |
| commit | f27c6b92859f7d7c845aae72472a63e4cc61be63 (patch) | |
| tree | 3469eafe2f7ebc5e24d0f5f0273a8e67f136973d /knetworkconf | |
| parent | 7b8d362cad90c47665dc2f749dd430d9cb9eccb4 (diff) | |
| download | tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.tar.gz tdeadmin-f27c6b92859f7d7c845aae72472a63e4cc61be63.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'knetworkconf')
| -rw-r--r-- | knetworkconf/knetworkconf/knetworkconfmodule.cpp | 10 | ||||
| -rw-r--r-- | knetworkconf/knetworkconf/knetworkconfmodule.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 3f67b0c..6fe99f9 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -79,10 +79,10 @@ TQString KNetworkConfModule::rootOnlyMsg() const return "Changing the network configuration requires root access"; } -KAboutData* KNetworkConfModule::aboutData() const +TDEAboutData* KNetworkConfModule::aboutData() const { - /*KAboutData* data = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"), - VERSION, description, KAboutData::License_GPL, + /*TDEAboutData* data = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2003, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "jbaptiste@merlinux.org"); data->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"), "jbaptiste@merlinux.org"); @@ -91,8 +91,8 @@ KAboutData* KNetworkConfModule::aboutData() const return data; // Memory leak, oh well...*/ -KAboutData *aboutData = new KAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"), - VERSION, description, KAboutData::License_GPL, +TDEAboutData *aboutData = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "juan.baptiste@kdemail.net"); aboutData->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"), "juan.baptiste@kdemail.net"); diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h index 458abf8..c1f9e49 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.h +++ b/knetworkconf/knetworkconf/knetworkconfmodule.h @@ -37,7 +37,7 @@ public: bool useRootOnlyMsg() const; TQString rootOnlyMsg() const; - KAboutData* aboutData() const; + TDEAboutData* aboutData() const; TQString quickHelp() const; private slots: |