summaryrefslogtreecommitdiffstats
path: root/kdevdesigner/designer/kdevdesigner_part.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
commit3a044decb0a5d7be822c888b2d5374573d7df96e (patch)
treeddf4681e0233c25203fc927596aa7b3bdb5f2efa /kdevdesigner/designer/kdevdesigner_part.h
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdevdesigner/designer/kdevdesigner_part.h')
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 3754dfd0..32537653 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -125,8 +125,8 @@ private:
KRadioAction* pointerAction;
};
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class KDevDesignerPartFactory : public KParts::Factory
{
@@ -138,11 +138,11 @@ public:
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 // _KDEVDESIGNERPART_H_