diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:13:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:13:30 -0600 |
| commit | 609724b5d29f25236bee59d0cb794602d391a96b (patch) | |
| tree | 6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /kate/tabbarextension | |
| parent | da2af448849a961235925b69430584d0bfe94b1f (diff) | |
| download | tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kate/tabbarextension')
| -rw-r--r-- | kate/tabbarextension/plugin_katetabbarextension.cpp | 6 | ||||
| -rw-r--r-- | kate/tabbarextension/plugin_katetabbarextension.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index 2fd9378..66c43c1 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -64,7 +64,7 @@ extern "C" KatePluginFactory::KatePluginFactory() { - s_instance = new KInstance( "kate" ); + s_instance = new TDEInstance( "kate" ); } KatePluginFactory::~KatePluginFactory() @@ -78,7 +78,7 @@ TQObject* KatePluginFactory::createObject( return new KatePluginTabBarExtension( parent, name ); } -KInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = 0L; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension( @@ -112,7 +112,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win) new KWidgetAction(view->tabbar, "tab_bar_widget", KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget"); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/katetabbarextension/ui.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index 1f68ee7..0894828 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -71,7 +71,7 @@ class KatePluginFactory : public KLibFactory const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; /** |