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 /karbon/karbon_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 'karbon/karbon_factory.cc')
| -rw-r--r-- | karbon/karbon_factory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 90c8c29a..6206926a 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -38,8 +38,8 @@ KarbonResourceServer* KarbonFactory::s_rserver = 0; -KInstance* KarbonFactory::s_instance = 0L; -KAboutData* KarbonFactory::s_aboutData = 0L; +TDEInstance* KarbonFactory::s_instance = 0L; +TDEAboutData* KarbonFactory::s_aboutData = 0L; KarbonFactory::KarbonFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -95,7 +95,7 @@ KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName, return part; } -KAboutData* +TDEAboutData* KarbonFactory::aboutData() { if( !s_aboutData ) @@ -103,12 +103,12 @@ KarbonFactory::aboutData() return s_aboutData; } -KInstance* +TDEInstance* KarbonFactory::instance() { if( !s_instance ) { - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); // Add any application-specific resource directories here s_instance->dirs()->addResourceType( "kis_brushes", |