diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h')
| -rw-r--r-- | kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h index 57f75c12..f9899043 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h @@ -28,8 +28,8 @@ #include "form.h" -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class TQWorkspace; class TQCloseEvent; @@ -48,11 +48,11 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0, const char *classname="KParts::Part", const TQStringList &args=TQStringList()); - static KInstance *instance(); - static KAboutData *aboutData(); + static TDEInstance *instance(); + static TDEAboutData *aboutData(); private: - static KInstance *m_instance; + static TDEInstance *m_instance; }; class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer |