From 609724b5d29f25236bee59d0cb794602d391a96b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:13:30 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kate/cppsymbolviewer/plugin_katesymbolviewer.cpp | 2 +- kate/filelistloader/katefll_plugin.cpp | 2 +- kate/filetemplates/plugin/filetemplates.cpp | 8 ++++---- kate/filetemplates/plugin/filetemplates.h | 2 +- kate/helloworld/plugin_katehelloworld.cpp | 2 +- kate/htmltools/plugin_katehtmltools.cpp | 2 +- kate/insertcommand/plugin_kateinsertcommand.cpp | 2 +- kate/kjswrapper/plugin_katekjswrapper.cpp | 2 +- kate/kpybrowser/pybrowse_part.cpp | 2 +- kate/make/plugin_katemake.cpp | 2 +- kate/modeline/ModelinePlugin.cpp | 2 +- kate/openheader/plugin_kateopenheader.cpp | 2 +- kate/snippets/plugin_katesnippets.cpp | 2 +- kate/tabbarextension/plugin_katetabbarextension.cpp | 6 +++--- kate/tabbarextension/plugin_katetabbarextension.h | 2 +- kate/textfilter/plugin_katetextfilter.cpp | 2 +- kate/xmlcheck/plugin_katexmlcheck.cpp | 4 ++-- kate/xmltools/plugin_katexmltools.cpp | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kate') diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 9165878..e0f37b8 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -58,7 +58,7 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); act->setCheckedState(i18n("Show Symbols")); - setInstance (new KInstance("kate")); + setInstance (new TDEInstance("kate")); setXMLFile("plugins/katecppsymbolviewer/ui.rc"); w->guiFactory()->addClient (this); win = w; diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index f40ed9f..e0a20f1 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -91,7 +91,7 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win) this, TQT_SLOT( slotSaveListAs() ), view->actionCollection(), "file_kfllsaveas" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/katefll/ui.rc" ); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index affdb19..b065113 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -90,7 +90,7 @@ extern "C" KatePluginFactory::KatePluginFactory() { - s_instance = new KInstance( "kate" ); + s_instance = new TDEInstance( "kate" ); } KatePluginFactory::~KatePluginFactory() @@ -103,7 +103,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c return new KateFileTemplates( parent, name ); } -KInstance* KatePluginFactory::s_instance = 0L; +TDEInstance* KatePluginFactory::s_instance = 0L; //END //BEGIN TemplateInfo @@ -127,7 +127,7 @@ class TemplateInfo //BEGIN KateFileTemplates KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ), - m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) + m_actionCollection( new KActionCollection( this, "template_actions", new TDEInstance("kate") ) ) { // create actions, so that they are shared. // We plug them into each view's menus, and update them centrally, so that @@ -256,7 +256,7 @@ void KateFileTemplates::addView(Kate::MainWindow *win) view->actionCollection(), "file_new_fromtemplate" ); refreshMenu( view ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/katefiletemplates/ui.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index eb150e4..a9d53f2 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -48,7 +48,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; }; /** diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 3031f51..16a0074 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -34,7 +34,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win) TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_helloworld" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/katehelloworld/ui.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index edf2ef1..155fb16 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -53,7 +53,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win) (void) new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/katehtmltools/ui.rc" ); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index c94c24f..bc0a6a4 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -87,7 +87,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win) TQT_SLOT( slotInsertCommand() ), view->actionCollection(), "edit_insert_command" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile("plugins/kateinsertcommand/ui.rc"); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index ac7a9a3..ff87170 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -342,7 +342,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win) if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname)); win->guiFactory()->addClient (view); } diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 4b8490c..90e4aca 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -38,7 +38,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) "python_update_pybrowse" ); //set up the menus - setInstance(new KInstance("kate")); + setInstance(new TDEInstance("kate")); setXMLFile( "plugins/katepybrowse/ui.rc" ); win->guiFactory()->addClient(this); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index b71422a..7a3f014 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -349,7 +349,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), actionCollection(), "make_settings" ); - setInstance(new KInstance("kate")); + setInstance(new TDEInstance("kate")); setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index 9184f6a..e724ae3 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -59,7 +59,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win) this, TQT_SLOT(applyModeline()), view->actionCollection(), "edit_apply_modeline" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/katemodeline/ui.rc" ); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index 61cd592..7694d4f 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -54,7 +54,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win) this, TQT_SLOT( slotOpenHeader() ), view->actionCollection(), "file_openheader" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/kateopenheader/ui.rc" ); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 8212f47..cae9598 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY(katesnippetsplugin, KGenericFactoryguiFactory()->addClient (this); 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; }; /** diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 97d28c2..996353b 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -66,7 +66,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win) (void) new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); - view->setInstance (new KInstance("kate")); + view->setInstance (new TDEInstance("kate")); view->setXMLFile( "plugins/katetextfilter/ui.rc" ); win->guiFactory()->addClient (view); view->win = win; diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 94ffe2c..6e4f0ad 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -105,7 +105,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow //(void) new KAction ( i18n("Indent XML"), 0, this, // TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); - setInstance(new KInstance("kate")); + setInstance(new TDEInstance("kate")); setXMLFile("plugins/katexmlcheck/ui.rc"); @@ -299,7 +299,7 @@ bool PluginKateXMLCheckView::slotValidate() // use catalogs for KDE docbook: if( ! getenv("SGML_CATALOG_FILES") ) { - KInstance ins("katexmlcheckplugin"); + TDEInstance ins("katexmlcheckplugin"); TQString catalogs; catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); catalogs += ":"; diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index e362569..20be13e 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -156,7 +156,7 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win ) ( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this, TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); - view->setInstance( new KInstance("kate") ); + view->setInstance( new TDEInstance("kate") ); view->setXMLFile( "plugins/katexmltools/ui.rc" ); win->guiFactory()->addClient( view ); -- cgit v1.2.1