From f71394031a5e1c3b315081a98000f242b461ca8c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:18:35 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kghostview/kgvfactory.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kghostview/kgvfactory.cpp') 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(); -- cgit v1.2.1