diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:23:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:23:50 -0600 |
| commit | 3a044decb0a5d7be822c888b2d5374573d7df96e (patch) | |
| tree | ddf4681e0233c25203fc927596aa7b3bdb5f2efa /languages/cpp/app_templates/kateplugin | |
| parent | 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff) | |
| download | tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/kateplugin')
| -rw-r--r-- | languages/cpp/app_templates/kateplugin/plugin_app.cpp | 6 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kateplugin/plugin_app.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 1a40df32..d7d8080c 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -25,7 +25,7 @@ extern "C" KatePluginFactory::KatePluginFactory() { - s_instance = new KInstance( "kate" ); + s_instance = new TDEInstance( "kate" ); } KatePluginFactory::~KatePluginFactory() @@ -38,7 +38,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c return new KatePlugin%{APPNAME}( parent, name ); } -KInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = 0L; KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) @@ -58,7 +58,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/%{APPNAMELC}/plugin_%{APPNAMELC}.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 4e5a259a..2e715e4e 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -26,7 +26,7 @@ class KatePluginFactory : public KLibFactory virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface |