From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdecore/kapplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/kapplication.h') diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index 89aaab2e2..49abf1202 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -93,7 +93,7 @@ class TDEApplicationPrivate; * @short Controls and provides information to all KDE applications. * @author Matthias Kalle Dalheimer */ -class TDECORE_EXPORT TDEApplication : public TQApplication, public KInstance +class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance { Q_OBJECT @@ -1232,14 +1232,14 @@ protected: /** * @internal Used by KUniqueApplication */ - TDEApplication( bool allowStyles, bool GUIenabled, KInstance* _instance ); + TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance ); #ifdef Q_WS_X11 /** * @internal Used by KUniqueApplication */ TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap, - bool allowStyles, KInstance* _instance ); + bool allowStyles, TDEInstance* _instance ); /** * Used to catch X11 events -- cgit v1.2.1