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 /kpresenter | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kpresenter')
| -rw-r--r-- | kpresenter/KPrAboutData.h | 6 | ||||
| -rw-r--r-- | kpresenter/KPrFactory.cpp | 10 | ||||
| -rw-r--r-- | kpresenter/KPrFactory.h | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h index c576b9d5..c5bb8a9a 100644 --- a/kpresenter/KPrAboutData.h +++ b/kpresenter/KPrAboutData.h @@ -27,10 +27,10 @@ static const char* description=I18N_NOOP("KOffice Presentation Tool"); static const char* version=KOFFICE_VERSION_STRING; -KAboutData * newKPresenterAboutData() +TDEAboutData * newKPresenterAboutData() { - KAboutData * aboutData=new KAboutData( "kpresenter", I18N_NOOP("KPresenter"), - version, description, KAboutData::License_LGPL, + TDEAboutData * aboutData=new TDEAboutData( "kpresenter", I18N_NOOP("KPresenter"), + version, description, TDEAboutData::License_LGPL, I18N_NOOP("(c) 1998-2006, The KPresenter Team"), 0, "http://www.koffice.org/kpresenter/"); aboutData->addAuthor("Laurent Montel", I18N_NOOP("current maintainer"), "montel@kde.org"); diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp index f9419cbe..5a1a6be0 100644 --- a/kpresenter/KPrFactory.cpp +++ b/kpresenter/KPrFactory.cpp @@ -26,8 +26,8 @@ #include <kinstance.h> -KInstance* KPrFactory::s_global = 0; -KAboutData* KPrFactory::s_aboutData = 0; +TDEInstance* KPrFactory::s_global = 0; +TDEAboutData* KPrFactory::s_aboutData = 0; KPrFactory::KPrFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -56,18 +56,18 @@ KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char * return doc; } -KAboutData* KPrFactory::aboutData() +TDEAboutData* KPrFactory::aboutData() { if( !s_aboutData ) s_aboutData=newKPresenterAboutData(); return s_aboutData; } -KInstance* KPrFactory::global() +TDEInstance* KPrFactory::global() { if ( !s_global ) { - s_global = new KInstance(aboutData()); + s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType("kpresenter_template", KStandardDirs::kde_default("data") + "kpresenter/templates/"); diff --git a/kpresenter/KPrFactory.h b/kpresenter/KPrFactory.h index 7e37bf6d..80763049 100644 --- a/kpresenter/KPrFactory.h +++ b/kpresenter/KPrFactory.h @@ -22,7 +22,7 @@ #define KPRESENTER_FACTORY_H #include <KoFactory.h> -class KAboutData; +class TDEAboutData; class KPrFactory : public KoFactory { @@ -36,14 +36,14 @@ public: 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; }; #endif |