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 /kchart | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kchart')
| -rw-r--r-- | kchart/kchart_aboutdata.h | 6 | ||||
| -rw-r--r-- | kchart/kchart_factory.cc | 10 | ||||
| -rw-r--r-- | kchart/kchart_factory.h | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h index 4e413a00..0cdefae8 100644 --- a/kchart/kchart_aboutdata.h +++ b/kchart/kchart_aboutdata.h @@ -31,10 +31,10 @@ static const char* description=I18N_NOOP("KOffice Chart Generator"); static const char* version=VERSION; -KAboutData * newKChartAboutData() +TDEAboutData * newKChartAboutData() { - KAboutData * aboutData= new KAboutData("kchart", I18N_NOOP("KChart"), - version, description, KAboutData::License_GPL, + TDEAboutData * aboutData= new TDEAboutData("kchart", I18N_NOOP("KChart"), + version, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2006, Kalle Dalheimer and Klarälvdalens Datakonsult AB"), I18N_NOOP("The drawing engine which forms the base of KChart\nis also available as a commercial product\nfrom Klarälvdalens Datakonsult AB.\nContact info@klaralvdalens-datakonsult.se\nfor more information."), "http://www.koffice.org/kchart/"); diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc index 7c3fb0e7..4c3f7864 100644 --- a/kchart/kchart_factory.cc +++ b/kchart/kchart_factory.cc @@ -17,8 +17,8 @@ namespace KChart { -KInstance *KChartFactory::s_global = 0; -KAboutData *KChartFactory::s_aboutData = 0; +TDEInstance *KChartFactory::s_global = 0; +TDEAboutData *KChartFactory::s_aboutData = 0; KChartFactory::KChartFactory( TQObject* parent, const char* name ) @@ -56,7 +56,7 @@ KParts::Part* KChartFactory::createPartObject( TQWidget *parentWidget, } -KAboutData* KChartFactory::aboutData() +TDEAboutData* KChartFactory::aboutData() { if( !s_aboutData ) s_aboutData = newKChartAboutData(); @@ -64,11 +64,11 @@ KAboutData* KChartFactory::aboutData() } -KInstance* KChartFactory::global() +TDEInstance* KChartFactory::global() { if ( !s_global ) { - s_global = new KInstance(aboutData()); + s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "kchart_template", KStandardDirs::kde_default("data") + "kchart/templates/"); // Tell the iconloader about share/apps/koffice/icons diff --git a/kchart/kchart_factory.h b/kchart/kchart_factory.h index a40c39e8..4e64c583 100644 --- a/kchart/kchart_factory.h +++ b/kchart/kchart_factory.h @@ -11,8 +11,8 @@ #include <KoFactory.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; namespace KChart { @@ -32,14 +32,14 @@ public: 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; }; } //namespace KChart |