summaryrefslogtreecommitdiffstats
path: root/conduits/malconduit/mal-factory.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:56:54 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:56:54 -0600
commit28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 (patch)
treef78e2df40f61288477bbd160d7c795918ad298d5 /conduits/malconduit/mal-factory.h
parent8ebd99fc2d3e2429a1030d60ce693b74b8832a40 (diff)
downloadkpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.tar.gz
kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'conduits/malconduit/mal-factory.h')
-rw-r--r--conduits/malconduit/mal-factory.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h
index 8c4f235..4e0de33 100644
--- a/conduits/malconduit/mal-factory.h
+++ b/conduits/malconduit/mal-factory.h
@@ -34,8 +34,8 @@
#include <klibloader.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class MALConduitFactory : public KLibFactory
{
@@ -46,7 +46,7 @@ public:
MALConduitFactory(TQObject * = 0L,const char * = 0L);
virtual ~MALConduitFactory();
- static KAboutData *about() { return fAbout; } ;
+ static TDEAboutData *about() { return fAbout; } ;
protected:
virtual TQObject* createObject( TQObject* parent = 0,
@@ -54,8 +54,8 @@ protected:
const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() );
private:
- KInstance *fInstance;
- static KAboutData *fAbout;
+ TDEInstance *fInstance;
+ static TDEAboutData *fAbout;
} ;
extern "C"