summaryrefslogtreecommitdiffstats
path: root/kivio/plugins/kivioconnectortool/plugin.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kivio/plugins/kivioconnectortool/plugin.cpp
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kivio/plugins/kivioconnectortool/plugin.cpp')
-rw-r--r--kivio/plugins/kivioconnectortool/plugin.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp
index 8a61df93..e55d4f9e 100644
--- a/kivio/plugins/kivioconnectortool/plugin.cpp
+++ b/kivio/plugins/kivioconnectortool/plugin.cpp
@@ -29,12 +29,12 @@
***************************************************/
K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory )
-KInstance* ConnectorToolFactory::s_global = 0;
+TDEInstance* ConnectorToolFactory::s_global = 0;
ConnectorToolFactory::ConnectorToolFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name )
{
- s_global = new KInstance("kivio");
+ s_global = new TDEInstance("kivio");
}
ConnectorToolFactory::~ConnectorToolFactory()
@@ -51,7 +51,7 @@ TQObject* ConnectorToolFactory::createObject( TQObject* parent, const char*, con
return obj;
}
-KInstance* ConnectorToolFactory::global()
+TDEInstance* ConnectorToolFactory::global()
{
return s_global;
}