summaryrefslogtreecommitdiffstats
path: root/ksvg/plugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:18:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:18:35 -0600
commitf71394031a5e1c3b315081a98000f242b461ca8c (patch)
tree54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /ksvg/plugin
parente5ce3b4175f2e72788b49b9ed46c722784218dad (diff)
downloadtdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz
tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ksvg/plugin')
-rw-r--r--ksvg/plugin/ksvg_factory.cpp10
-rw-r--r--ksvg/plugin/ksvg_factory.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp
index d5e5e1dc..a273e5bf 100644
--- a/ksvg/plugin/ksvg_factory.cpp
+++ b/ksvg/plugin/ksvg_factory.cpp
@@ -40,8 +40,8 @@ extern "C"
}
}
-KInstance *KSVGPluginFactory::s_instance = 0;
-KAboutData *KSVGPluginFactory::s_about = 0;
+TDEInstance *KSVGPluginFactory::s_instance = 0;
+TDEAboutData *KSVGPluginFactory::s_about = 0;
KSVGPluginFactory::KSVGPluginFactory(TQObject *parent, const char *name) : KParts::Factory(parent, name)
{
@@ -75,16 +75,16 @@ KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const
return new KSVGPlugin(parentWidget, wname, parent, name, width, height);
}
-KInstance *KSVGPluginFactory::instance()
+TDEInstance *KSVGPluginFactory::instance()
{
if(!s_instance)
{
- s_about = new KAboutData("ksvg", I18N_NOOP("KSVG"), "0.1", "KSVG\nFreedom for veKtors",KAboutData::License_GPL_V2,"(c) 2001-2003, The KSVG Team",0,"http://svg.kde.org");
+ s_about = new TDEAboutData("ksvg", I18N_NOOP("KSVG"), "0.1", "KSVG\nFreedom for veKtors",TDEAboutData::License_GPL_V2,"(c) 2001-2003, The KSVG Team",0,"http://svg.kde.org");
s_about->addAuthor("Rob Buis", 0, "buis@kde.org");
s_about->addAuthor("Nikolas Zimmermann", 0, "wildfox@kde.org");
s_about->addCredit("Adrian Page", 0);
s_about->addCredit("Andreas Streichardt", 0, "mop@spaceregents.de");
- s_instance = new KInstance(s_about);
+ s_instance = new TDEInstance(s_about);
}
return s_instance;
diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h
index b163efee..677bab38 100644
--- a/ksvg/plugin/ksvg_factory.h
+++ b/ksvg/plugin/ksvg_factory.h
@@ -24,8 +24,8 @@
#include <kparts/factory.h>
#include <kparts/browserextension.h>
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
class KSVGPluginFactory : public KParts::Factory
{
@@ -37,11 +37,11 @@ public:
virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_about;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_about;
};
class KSVGPluginBrowserExtension : public KParts::BrowserExtension