diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kompare/komparenavtreepart/komparenavtreepart.h | |
parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparenavtreepart/komparenavtreepart.h')
-rw-r--r-- | kompare/komparenavtreepart/komparenavtreepart.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index 4172a8ed..0f670295 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -170,8 +170,8 @@ private: }; // part stuff -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KompareNavTreePartFactory : public KParts::Factory { @@ -183,11 +183,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 |