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 /example/example_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 'example/example_factory.cc')
-rw-r--r-- | example/example_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/example/example_factory.cc b/example/example_factory.cc index 261d75cd..307b7e93 100644 --- a/example/example_factory.cc +++ b/example/example_factory.cc @@ -27,8 +27,8 @@ K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory ) -KInstance* ExampleFactory::s_global = 0L; -KAboutData* ExampleFactory::s_aboutData = 0L; +TDEInstance* ExampleFactory::s_global = 0L; +TDEAboutData* ExampleFactory::s_aboutData = 0L; ExampleFactory::ExampleFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -59,18 +59,18 @@ KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const ch return part; } -KAboutData* ExampleFactory::aboutData() +TDEAboutData* ExampleFactory::aboutData() { if ( !s_aboutData ) s_aboutData = newExampleAboutData(); return s_aboutData; } -KInstance* ExampleFactory::global() +TDEInstance* ExampleFactory::global() { if ( !s_global ) { - s_global = new KInstance( aboutData() ); + s_global = new TDEInstance( aboutData() ); // Add any application-specific resource directories here // Tell the iconloader about share/apps/koffice/icons |