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.cpp | |
| 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.cpp')
| -rw-r--r-- | tdecore/kshortcutlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/kshortcutlist.cpp b/tdecore/kshortcutlist.cpp index 865bdc257..7c3fc67da 100644 --- a/tdecore/kshortcutlist.cpp +++ b/tdecore/kshortcutlist.cpp @@ -53,7 +53,7 @@ int KShortcutList::index( const KKeySequence& seq ) const return -1; } -const KInstance* KShortcutList::instance() const +const TDEInstance* KShortcutList::instance() const { return 0; } |