diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:30 -0600 |
| commit | 609724b5d29f25236bee59d0cb794602d391a96b (patch) | |
| tree | 6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /kate/filetemplates/plugin/filetemplates.cpp | |
| parent | da2af448849a961235925b69430584d0bfe94b1f (diff) | |
| download | tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kate/filetemplates/plugin/filetemplates.cpp')
| -rw-r--r-- | kate/filetemplates/plugin/filetemplates.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; |