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/kget_plug_in | |
parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kget/kget_plug_in')
-rw-r--r-- | kget/kget_plug_in/kget_plug_in.cpp | 4 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_plug_in.h | 4 |
2 files changed, 4 insertions, 4 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 |