yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Pass QString::null for help string of KAccelAction where necessary

Browse source 
- Remove references to KAccelBase

svn path=/trunk/kdebase/klipper/; revision=126545
This commit is contained in:
Ellis Whitehead 2001-12-11 04:47:07 +00:00
parent 6f7dcd107b
commit 72b0d20ccc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
workspace.cpp
View file

@ -1569,9 +1569,9 @@ QPopupMenu* Workspace::clientPopup( Client* c )
popup->insertSeparator(); popup->insertSeparator();
QString k; QString k;
KAccelAction* pAction = keys->basePtr()->actionPtr( "Window Close" ); KAccelAction* pAction = keys->actions().actionPtr( "Window Close" );
if( pAction ) if( pAction )
k = pAction->m_rgShortcuts.toString(); k = pAction->m_rgShortcuts.toString();
popup->insertItem( SmallIconSet( "remove" ), i18n("&Close")+'\t'+k, Options::CloseOp ); popup->insertItem( SmallIconSet( "remove" ), i18n("&Close")+'\t'+k, Options::CloseOp );
} }
return popup; return popup;
@ -1988,7 +1988,7 @@ void Workspace::reconfigure()
// uint's for keycodes. // uint's for keycodes.
inline int currentKey( KGlobalAccel* keys, const char* psAction ) inline int currentKey( KGlobalAccel* keys, const char* psAction )
{ {
KAccelAction* pAction = keys->basePtr()->actionPtr( psAction ); KAccelAction* pAction = keys->actions().actionPtr( psAction );
if( pAction ) if( pAction )
return pAction->getShortcut(0).getSequence(0).getKey(0).keyQt(); return pAction->getShortcut(0).getSequence(0).getKey(0).keyQt();
else else