summaryrefslogtreecommitdiffstats
path: root/kghostview/kgvfactory.cpp
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 /kghostview/kgvfactory.cpp
parente5ce3b4175f2e72788b49b9ed46c722784218dad (diff)
downloadtdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz
tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kghostview/kgvfactory.cpp')
-rw-r--r--kghostview/kgvfactory.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index c7024c59..dfeea82a 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -42,15 +42,15 @@ KGVFactory::~KGVFactory()
s_self = 0;
}
-KInstance *KGVFactory::createInstance()
+TDEInstance *KGVFactory::createInstance()
{
- KInstance* res = new KInstance( aboutData() );
+ TDEInstance* res = new TDEInstance( aboutData() );
return res;
}
KGVFactory *KGVFactory::s_self;
-KInstance *KGVFactory::s_instance;
-KAboutData *KGVFactory::s_aboutData;
+TDEInstance *KGVFactory::s_instance;
+TDEAboutData *KGVFactory::s_aboutData;
KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
@@ -84,19 +84,19 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
return part;
}
-KInstance *KGVFactory::instance()
+TDEInstance *KGVFactory::instance()
{
if ( !s_instance )
{
if ( s_self )
s_instance = s_self->createInstance();
else
- s_instance = new KInstance( aboutData() );
+ s_instance = new TDEInstance( aboutData() );
}
return s_instance;
}
-KAboutData *KGVFactory::aboutData()
+TDEAboutData *KGVFactory::aboutData()
{
if ( !s_aboutData )
s_aboutData = KGVPart::createAboutData();