From 72b0d20ccc9e70c63db856d3d7267f9edce34d4a Mon Sep 17 00:00:00 2001 From: Ellis Whitehead Date: Tue, 11 Dec 2001 04:47:07 +0000 Subject: [PATCH] - Pass QString::null for help string of KAccelAction where necessary - Remove references to KAccelBase svn path=/trunk/kdebase/klipper/; revision=126545 --- workspace.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workspace.cpp b/workspace.cpp index ede8f86eb8..801e39f882 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -1569,9 +1569,9 @@ QPopupMenu* Workspace::clientPopup( Client* c ) popup->insertSeparator(); QString k; - KAccelAction* pAction = keys->basePtr()->actionPtr( "Window Close" ); - if( pAction ) - k = pAction->m_rgShortcuts.toString(); + KAccelAction* pAction = keys->actions().actionPtr( "Window Close" ); + if( pAction ) + k = pAction->m_rgShortcuts.toString(); popup->insertItem( SmallIconSet( "remove" ), i18n("&Close")+'\t'+k, Options::CloseOp ); } return popup; @@ -1988,7 +1988,7 @@ void Workspace::reconfigure() // uint's for keycodes. inline int currentKey( KGlobalAccel* keys, const char* psAction ) { - KAccelAction* pAction = keys->basePtr()->actionPtr( psAction ); + KAccelAction* pAction = keys->actions().actionPtr( psAction ); if( pAction ) return pAction->getShortcut(0).getSequence(0).getKey(0).keyQt(); else