diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:27 -0600 |
| commit | fd7791939e48e06e7f0b9cc9d32738757783e180 (patch) | |
| tree | 64efdead645c6d058b560dbf9952e2dd73a99f83 /src/kdiff3_part.h | |
| parent | 046d6d18d5e6e3ca95711968793d8c46f56de6e8 (diff) | |
| download | kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.tar.gz kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3_part.h')
| -rw-r--r-- | src/kdiff3_part.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kdiff3_part.h b/src/kdiff3_part.h index a200fe3..3d7e0ff 100644 --- a/src/kdiff3_part.h +++ b/src/kdiff3_part.h @@ -79,8 +79,8 @@ private: bool m_bIsShell; }; -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KDiff3PartFactory : public KParts::Factory { @@ -92,11 +92,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 // _KDIFF3PART_H_ |