summaryrefslogtreecommitdiffstats
path: root/nsplugins/plugin_part.h
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/plugin_part.h
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'nsplugins/plugin_part.h')
-rw-r--r--nsplugins/plugin_part.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index 3e54af412..e29d91ee7 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;
};