diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kplato | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kplato')
| -rw-r--r-- | kplato/kptaboutdata.h | 6 | ||||
| -rw-r--r-- | kplato/kptfactory.cc | 10 | ||||
| -rw-r--r-- | kplato/kptfactory.h | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h index a91c52c84..28bacafd7 100644 --- a/kplato/kptaboutdata.h +++ b/kplato/kptaboutdata.h @@ -30,10 +30,10 @@ namespace KPlato static const char* KPLATO_DESCRIPTION=I18N_NOOP("KPlato - TDE Planning Tool"); static const char* KPLATO_VERSION="0.6.3"; -KAboutData * newAboutData() +TDEAboutData * newAboutData() { - KAboutData * aboutData=new KAboutData( "kplato", I18N_NOOP("KPlato"), - KPLATO_VERSION, KPLATO_DESCRIPTION, KAboutData::License_GPL, + TDEAboutData * aboutData=new TDEAboutData( "kplato", I18N_NOOP("KPlato"), + KPLATO_VERSION, KPLATO_DESCRIPTION, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2006, The KPlato Team"), 0, "http://www.koffice.org/kplato/" ); aboutData->addAuthor("Thomas Zander", 0, 0 ); // please don't re-add, I don't like getting personal emails :) diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc index e342da3e5..7e5c5405d 100644 --- a/kplato/kptfactory.cc +++ b/kplato/kptfactory.cc @@ -31,8 +31,8 @@ namespace KPlato K_EXPORT_COMPONENT_FACTORY( libkplatopart, Factory ) -KInstance* Factory::s_global = 0L; -KAboutData* Factory::s_aboutData = 0L; +TDEInstance* Factory::s_global = 0L; +TDEAboutData* Factory::s_aboutData = 0L; Factory::Factory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -70,18 +70,18 @@ KParts::Part *Factory::createPartObject(TQWidget *parentWidget, return part; } -KAboutData* Factory::aboutData() +TDEAboutData* Factory::aboutData() { if ( !s_aboutData ) s_aboutData = newAboutData(); return s_aboutData; } -KInstance* Factory::global() +TDEInstance* Factory::global() { if ( !s_global ) { - s_global = new KInstance( aboutData() ); + s_global = new TDEInstance( aboutData() ); // Add any application-specific resource directories here s_global->dirs()->addResourceType("kplato_template", diff --git a/kplato/kptfactory.h b/kplato/kptfactory.h index 62f052678..61f271c11 100644 --- a/kplato/kptfactory.h +++ b/kplato/kptfactory.h @@ -22,7 +22,7 @@ #include <KoFactory.h> -class KAboutData; +class TDEAboutData; namespace KPlato { @@ -37,14 +37,14 @@ public: virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); - // _Creates_ a KAboutData but doesn't keep ownership - static KAboutData* aboutData(); + // _Creates_ a TDEAboutData but doesn't keep ownership + static TDEAboutData* aboutData(); private: - static KInstance* s_global; - static KAboutData* s_aboutData; + static TDEInstance* s_global; + static TDEAboutData* s_aboutData; }; } // KPlato namespace |