summaryrefslogtreecommitdiffstats
path: root/nsplugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /nsplugins
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'nsplugins')
-rw-r--r--nsplugins/plugin_part.cpp10
-rw-r--r--nsplugins/plugin_part.h10
-rw-r--r--nsplugins/pluginscan.cpp4
3 files changed, 12 insertions, 12 deletions
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 350da109..9dab88c3 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;
}
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index 3e54af41..e29d91ee 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -31,8 +31,8 @@
#include <tqwidget.h>
#include <tqguardedptr.h>
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
class PluginBrowserExtension;
class PluginLiveConnectExtension;
class TQLabel;
@@ -72,12 +72,12 @@ public:
const char *classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
- static KAboutData *aboutData();
+ static TDEInstance *instance();
+ static TDEAboutData *aboutData();
private:
- static KInstance *s_instance;
+ static TDEInstance *s_instance;
class NSPluginLoader *_loader;
};
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index e6891ba9..116308a7 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -525,8 +525,8 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv )
{
- KAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"),
- "0.3", "nspluginscan", KAboutData::License_GPL,
+ TDEAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"),
+ "0.3", "nspluginscan", TDEAboutData::License_GPL,
"(c) 2000,2001 by Stefan Schimanski" );
KLocale::setMainCatalogue("nsplugin");