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 /kivio/plugins/kivioselecttool/plugin.cpp | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kivio/plugins/kivioselecttool/plugin.cpp')
| -rw-r--r-- | kivio/plugins/kivioselecttool/plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kivio/plugins/kivioselecttool/plugin.cpp b/kivio/plugins/kivioselecttool/plugin.cpp index fba217c6..9107adac 100644 --- a/kivio/plugins/kivioselecttool/plugin.cpp +++ b/kivio/plugins/kivioselecttool/plugin.cpp @@ -29,12 +29,12 @@ ***************************************************/ K_EXPORT_COMPONENT_FACTORY( libkivioselecttool, SelectToolFactory ) -KInstance* SelectToolFactory::s_global = 0; +TDEInstance* SelectToolFactory::s_global = 0; SelectToolFactory::SelectToolFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } SelectToolFactory::~SelectToolFactory() @@ -51,7 +51,7 @@ TQObject* SelectToolFactory::createObject( TQObject* parent, const char*, const return obj; } -KInstance* SelectToolFactory::global() +TDEInstance* SelectToolFactory::global() { return s_global; } |