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 /kformula/kformula_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 'kformula/kformula_factory.cc')
| -rw-r--r-- | kformula/kformula_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index e8d3a918..8842aaea 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -14,10 +14,10 @@ K_EXPORT_COMPONENT_FACTORY( libkformulapart, KFormulaFactory ) -KInstance* KFormulaFactory::s_global = 0; -KAboutData* KFormulaFactory::s_aboutData = 0; +TDEInstance* KFormulaFactory::s_global = 0; +TDEAboutData* KFormulaFactory::s_aboutData = 0; -KAboutData* KFormulaFactory::aboutData() +TDEAboutData* KFormulaFactory::aboutData() { if( !s_aboutData ) s_aboutData=newKFormulaAboutData(); @@ -53,11 +53,11 @@ KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const c return doc; } -KInstance* KFormulaFactory::global() +TDEInstance* KFormulaFactory::global() { if ( !s_global ) { - s_global = new KInstance(aboutData()); + s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "toolbar", KStandardDirs::kde_default("data") + "koffice/toolbar/"); // Tell the iconloader about share/apps/koffice/icons*/ |