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 /kchart/kchart_factory.h | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kchart/kchart_factory.h')
| -rw-r--r-- | kchart/kchart_factory.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kchart/kchart_factory.h b/kchart/kchart_factory.h index a40c39e8..4e64c583 100644 --- a/kchart/kchart_factory.h +++ b/kchart/kchart_factory.h @@ -11,8 +11,8 @@ #include <KoFactory.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; namespace KChart { @@ -32,14 +32,14 @@ public: 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; }; } //namespace KChart |