diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-17 02:26:08 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-17 02:26:08 +0000 |
| commit | 54241a1f0a21c7433f8dd2fa0410b93d38cce520 (patch) | |
| tree | e509d81c855874912b63381f3f760f0ccbadbe57 /kdecore/kglobalaccel.cpp | |
| parent | a52572740657a539cdc032c89ec744673071698b (diff) | |
| download | tdelibs-54241a1f0a21c7433f8dd2fa0410b93d38cce520.tar.gz tdelibs-54241a1f0a21c7433f8dd2fa0410b93d38cce520.zip | |
Typelocking
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1164527 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kglobalaccel.cpp')
| -rw-r--r-- | kdecore/kglobalaccel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kdecore/kglobalaccel.cpp b/kdecore/kglobalaccel.cpp index a3c4ecf33..689b08616 100644 --- a/kdecore/kglobalaccel.cpp +++ b/kdecore/kglobalaccel.cpp @@ -54,10 +54,10 @@ void KGlobalAccel::clear() { d->clearActions(); } */ KAccelActions& KGlobalAccel::actions() - { return d->actions(); } + { return d->KAccelBase::actions(); } const KAccelActions& KGlobalAccel::actions() const - { return d->actions(); } + { return d->KAccelBase::actions(); } bool KGlobalAccel::isEnabled() { return ((KAccelBase*)d)->isEnabled(); } @@ -95,7 +95,7 @@ bool KGlobalAccel::remove( const TQString& sAction ) const KShortcut& KGlobalAccel::shortcut( const TQString& sAction ) const { - const KAccelAction* pAction = d->actions().actionPtr( sAction ); + const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->shortcut() : KShortcut::null(); } @@ -105,7 +105,7 @@ bool KGlobalAccel::setSlot( const TQString& sAction, const TQObject* pObjSlot, c { return d->setActionSlot( sAction, pObjSlot, psMethodSlot ); } TQString KGlobalAccel::label( const TQString& sAction ) const { - const KAccelAction* pAction = d->actions().actionPtr( sAction ); + const KAccelAction* pAction = d->KAccelBase::actions().actionPtr( sAction ); return (pAction) ? pAction->label() : TQString(); } bool KGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable ) |