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 /tdeui/kactionshortcutlist.h | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kactionshortcutlist.h')
| -rw-r--r-- | tdeui/kactionshortcutlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdeui/kactionshortcutlist.h b/tdeui/kactionshortcutlist.h index c61a7e2a8..7c5f5b0dd 100644 --- a/tdeui/kactionshortcutlist.h +++ b/tdeui/kactionshortcutlist.h @@ -24,7 +24,7 @@ class TDEUI_EXPORT KActionShortcutList : public KShortcutList virtual bool isConfigurable( uint index ) const; virtual bool setShortcut( uint index, const KShortcut& shortcut ); - virtual const KInstance* instance() const; + virtual const TDEInstance* instance() const; virtual TQVariant getOther( Other, uint index ) const; virtual bool setOther( Other, uint index, TQVariant ); |