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 /kounavail/kounavail.h | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kounavail/kounavail.h')
| -rw-r--r-- | kounavail/kounavail.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kounavail/kounavail.h b/kounavail/kounavail.h index 1a0e1c0e..91bdd034 100644 --- a/kounavail/kounavail.h +++ b/kounavail/kounavail.h @@ -85,8 +85,8 @@ protected: #include <KoFactory.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KoUnavailFactory : public KoFactory { @@ -98,14 +98,14 @@ public: virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); - // _Creates_ a KAboutData but doesn't keep ownership - static KAboutData* aboutData(); + // _Creates_ a TDEAboutData but doesn't keep ownership + static TDEAboutData* aboutData(); private: - static KInstance* s_global; - static KAboutData* s_aboutData; + static TDEInstance* s_global; + static TDEAboutData* s_aboutData; }; #endif |