diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /kget | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kget')
| -rw-r--r-- | kget/kget_plug_in/kget_plug_in.cpp | 4 | ||||
| -rw-r--r-- | kget/kget_plug_in/kget_plug_in.h | 4 | ||||
| -rw-r--r-- | kget/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index c73406a2..65ca3c99 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -160,7 +160,7 @@ void KGet_plug_in::slotShowLinks() KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_instance = new KInstance("KPluginFactory"); + s_instance = new TDEInstance("KPluginFactory"); } TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) @@ -184,6 +184,6 @@ extern "C" } -KInstance* KPluginFactory::s_instance = 0L; +TDEInstance* KPluginFactory::s_instance = 0L; #include "kget_plug_in.moc" diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index c1c2ca71..b0366d5c 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -22,7 +22,7 @@ #include <dcopclient.h> #include <kurl.h> -class KInstance; +class TDEInstance; class KGet_plug_in : public KParts::Plugin { @@ -54,7 +54,7 @@ public: const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; #endif diff --git a/kget/main.cpp b/kget/main.cpp index ffa891f1..ffefb2ce 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -197,7 +197,7 @@ public: int main(int argc, char *argv[]) { - KAboutData aboutData("kget", I18N_NOOP("KGet"), version, description, KAboutData::License_GPL, "(C) 2001 - 2002, Patrick Charbonnier \n(C) 2002, Carsten Pfeiffer\n(C) 1998 - 2000, Matej Koss", "[email protected]", 0); + TDEAboutData aboutData("kget", I18N_NOOP("KGet"), version, description, TDEAboutData::License_GPL, "(C) 2001 - 2002, Patrick Charbonnier \n(C) 2002, Carsten Pfeiffer\n(C) 1998 - 2000, Matej Koss", "[email protected]", 0); aboutData.addAuthor("Patrick Charbonnier", 0, "[email protected]"); aboutData.addAuthor("Carsten Pfeiffer", 0, "[email protected]"); |