From 609724b5d29f25236bee59d0cb794602d391a96b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:13:30 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kate/tabbarextension/plugin_katetabbarextension.cpp | 6 +++---
 kate/tabbarextension/plugin_katetabbarextension.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kate/tabbarextension')

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;
 };
 
 /**
-- 
cgit v1.2.1