summaryrefslogtreecommitdiffstats
path: root/khexedit/parts/kpart/khepartfactory.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
commit8856e75c203aa69be210b2fee1095ab9761aca7e (patch)
treed59810016bc093e8dd7f2f886f07c45fa25447a5 /khexedit/parts/kpart/khepartfactory.h
parented70cd1b539ac2e02319b55183a5be7a28f2d116 (diff)
downloadtdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz
tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/parts/kpart/khepartfactory.h')
-rw-r--r--khexedit/parts/kpart/khepartfactory.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index 0883caa..a411acb 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -20,8 +20,8 @@
#include <kparts/factory.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class KHexEditPartFactory : public KParts::Factory
@@ -37,12 +37,12 @@ class KHexEditPartFactory : public KParts::Factory
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
- static KInstance* instance();
+ static TDEInstance* instance();
private:
- static KInstance* s_instance;
- static KAboutData* s_about;
+ static TDEInstance* s_instance;
+ static TDEAboutData* s_about;
};
#endif