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 /kplato/kptfactory.cc | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kplato/kptfactory.cc')
| -rw-r--r-- | kplato/kptfactory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc index e342da3e..7e5c5405 100644 --- a/kplato/kptfactory.cc +++ b/kplato/kptfactory.cc @@ -31,8 +31,8 @@ namespace KPlato K_EXPORT_COMPONENT_FACTORY( libkplatopart, Factory ) -KInstance* Factory::s_global = 0L; -KAboutData* Factory::s_aboutData = 0L; +TDEInstance* Factory::s_global = 0L; +TDEAboutData* Factory::s_aboutData = 0L; Factory::Factory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -70,18 +70,18 @@ KParts::Part *Factory::createPartObject(TQWidget *parentWidget, return part; } -KAboutData* Factory::aboutData() +TDEAboutData* Factory::aboutData() { if ( !s_aboutData ) s_aboutData = newAboutData(); return s_aboutData; } -KInstance* Factory::global() +TDEInstance* Factory::global() { if ( !s_global ) { - s_global = new KInstance( aboutData() ); + s_global = new TDEInstance( aboutData() ); // Add any application-specific resource directories here s_global->dirs()->addResourceType("kplato_template", |