From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:55:40 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- chalk/ui/kis_factory.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'chalk/ui/kis_factory.h') 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 -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 -- cgit v1.2.1