diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/kapplication.h | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kapplication.h')
| -rw-r--r-- | tdecore/kapplication.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <kalle@kde.org> */ -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 |