diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kchart/kchart_factory.cc | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kchart/kchart_factory.cc')
| -rw-r--r-- | kchart/kchart_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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 |