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 | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kformula')
| -rw-r--r-- | kformula/kformula_aboutdata.h | 6 | ||||
| -rw-r--r-- | kformula/kformula_factory.cc | 10 | ||||
| -rw-r--r-- | kformula/kformula_factory.h | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h index 5cddaa11..b7e98cd8 100644 --- a/kformula/kformula_aboutdata.h +++ b/kformula/kformula_aboutdata.h @@ -29,10 +29,10 @@ static const char* description=I18N_NOOP("KOffice Formula Editor"); static const char* version=VERSION; -KAboutData * newKFormulaAboutData() +TDEAboutData * newKFormulaAboutData() { - KAboutData * aboutData = new KAboutData( "kformula", I18N_NOOP( "KFormula" ), - version, description, KAboutData::License_GPL, + TDEAboutData * aboutData = new TDEAboutData( "kformula", I18N_NOOP( "KFormula" ), + version, description, TDEAboutData::License_GPL, "(c) 1998-2006, The KFormula Team", 0, "http://www.koffice.org/kformula/" ); aboutData->addAuthor( "Alfredo Beaumont", 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*/ diff --git a/kformula/kformula_factory.h b/kformula/kformula_factory.h index 785e92ce..dc277207 100644 --- a/kformula/kformula_factory.h +++ b/kformula/kformula_factory.h @@ -4,9 +4,9 @@ #include <KoFactory.h> //#include <kaboutdata.h> -class KInstance; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEInstance; +class TDEAboutData; class KFormulaFactory : public KoFactory { @@ -18,13 +18,13 @@ 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(); - static KAboutData* aboutData(); + static TDEAboutData* aboutData(); private: - static KInstance* s_global; - static KAboutData* s_aboutData; + static TDEInstance* s_global; + static TDEAboutData* s_aboutData; }; #endif |