diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /chalk/ui/kis_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 'chalk/ui/kis_factory.h')
| -rw-r--r-- | chalk/ui/kis_factory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index 5426b4fa..cddf4c08 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -29,8 +29,8 @@ #include <koffice_export.h> -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KRITACORE_EXPORT KisFactory : public KoFactory { @@ -48,12 +48,12 @@ public: const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KAboutData *aboutData(); - static KInstance *instance(); + static TDEAboutData *aboutData(); + static TDEInstance *instance(); private: - static KInstance *s_instance; - static KAboutData *s_aboutData; + static TDEInstance *s_instance; + static TDEAboutData *s_aboutData; }; #endif |