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 /kword/KWFactory.cpp | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kword/KWFactory.cpp')
| -rw-r--r-- | kword/KWFactory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp index 50648519a..4c2009f18 100644 --- a/kword/KWFactory.cpp +++ b/kword/KWFactory.cpp @@ -25,8 +25,8 @@ #include <kiconloader.h> -KInstance* KWFactory::s_instance = 0; -KAboutData* KWFactory::s_aboutData = 0; +TDEInstance* KWFactory::s_instance = 0; +TDEAboutData* KWFactory::s_aboutData = 0; KWFactory::KWFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -56,7 +56,7 @@ KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *w return doc; } -KAboutData* KWFactory::aboutData() +TDEAboutData* KWFactory::aboutData() { if(!s_aboutData) { s_aboutData = newKWordAboutData(); @@ -64,11 +64,11 @@ KAboutData* KWFactory::aboutData() return s_aboutData; } -KInstance* KWFactory::instance() +TDEInstance* KWFactory::instance() { if ( !s_instance ) { - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); s_instance->dirs()->addResourceType( "kword_template", KStandardDirs::kde_default("data") + "kword/templates/"); |