From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- nsplugins/plugin_part.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nsplugins/plugin_part.cpp') diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 350da1098..9dab88c36 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -145,7 +145,7 @@ void NSPluginCallback::evalJavaScript( int id, TQString script ) * We need one static instance of the factory for our C 'main' * function */ -KInstance *PluginFactory::s_instance = 0L; +TDEInstance *PluginFactory::s_instance = 0L; PluginFactory::PluginFactory() @@ -182,18 +182,18 @@ KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const cha } -KInstance *PluginFactory::instance() +TDEInstance *PluginFactory::instance() { kdDebug(1432) << "PluginFactory::instance" << endl; if ( !s_instance ) - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); return s_instance; } -KAboutData *PluginFactory::aboutData() +TDEAboutData *PluginFactory::aboutData() { - KAboutData *about = new KAboutData("plugin", I18N_NOOP("plugin"), "1.99"); + TDEAboutData *about = new TDEAboutData("plugin", I18N_NOOP("plugin"), "1.99"); return about; } -- cgit v1.2.1