summaryrefslogtreecommitdiffstats
path: root/kivio/plugins/kivioconnectortool/plugin.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:55:40 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kivio/plugins/kivioconnectortool/plugin.h
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.h')
-rw-r--r--kivio/plugins/kivioconnectortool/plugin.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h
index d8070335..7afc83ce 100644
--- a/kivio/plugins/kivioconnectortool/plugin.h
+++ b/kivio/plugins/kivioconnectortool/plugin.h
@@ -24,7 +24,7 @@
#include <klibloader.h>
-class KInstance;
+class TDEInstance;
class ConnectorToolFactory : public KLibFactory
{ Q_OBJECT
@@ -36,10 +36,10 @@ public:
virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
- static KInstance* global();
+ static TDEInstance* global();
private:
- static KInstance* s_global;
+ static TDEInstance* s_global;
};
#endif