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

---
 languages/cpp/app_templates/kateplugin2/plugin_app.cpp | 6 +++---
 languages/cpp/app_templates/kateplugin2/plugin_app.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'languages/cpp/app_templates/kateplugin2')

diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 18595d10..43084511 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -29,7 +29,7 @@ extern "C"
 
 KatePluginFactory::KatePluginFactory()
 {
-    s_instance = new KInstance( "kate" );
+    s_instance = new TDEInstance( "kate" );
 }
 
 KatePluginFactory::~KatePluginFactory()
@@ -42,7 +42,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 )
@@ -62,7 +62,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/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 0033bd76..86776a53 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -30,7 +30,7 @@ public:
     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, Kate::PluginConfigInterfaceExtension
-- 
cgit v1.2.3