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/kshortcutlist.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdecore/kshortcutlist.h') diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h index 7a1890c1c..ce8f408a1 100644 --- a/tdecore/kshortcutlist.h +++ b/tdecore/kshortcutlist.h @@ -26,7 +26,7 @@ class TQVariant; class KConfigBase; -class KInstance; +class TDEInstance; class KKeySequence; class KShortcut; @@ -137,10 +137,10 @@ class TDECORE_EXPORT KShortcutList virtual int index( const KKeySequence& keySeq ) const; /** - * The KInstance. - * @return the KInstance of the list, can be 0 if not available + * The TDEInstance. + * @return the TDEInstance of the list, can be 0 if not available */ - virtual const KInstance* instance() const; + virtual const TDEInstance* instance() const; // These are here in order to handle expansion. enum Other { }; -- cgit v1.2.1