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/kshortcutlist.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/kshortcutlist.h')
-rw-r--r-- | tdecore/kshortcutlist.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 { }; |