diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /nsplugins/plugin_part.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'nsplugins/plugin_part.cpp')
| -rw-r--r-- | nsplugins/plugin_part.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |