summaryrefslogtreecommitdiffstats
path: root/kate/tabbarextension/plugin_katetabbarextension.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:13:30 -0600
commit609724b5d29f25236bee59d0cb794602d391a96b (patch)
tree6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /kate/tabbarextension/plugin_katetabbarextension.cpp
parentda2af448849a961235925b69430584d0bfe94b1f (diff)
downloadtdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz
tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kate/tabbarextension/plugin_katetabbarextension.cpp')
-rw-r--r--kate/tabbarextension/plugin_katetabbarextension.cpp6
1 files changed, 3 insertions, 3 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;