diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /karm/karm_part.h | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'karm/karm_part.h')
| -rw-r--r-- | karm/karm_part.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/karm/karm_part.h b/karm/karm_part.h index 797ae47fb..f04d48ff5 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -116,8 +116,8 @@ protected slots: void startNewSession(); }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class karmPartFactory : public KParts::Factory { @@ -129,11 +129,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 // _KARMPART_H_ |