KGlobal <-> KGlobalSettings <-> KApplication cleanup
svn path=/trunk/kdebase/kcontrol/; revision=51720
This commit is contained in:
parent
9dab9d5217
commit
45e0fc465a
1 changed files with 4 additions and 3 deletions
|
@ -5,6 +5,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
|||
******************************************************************/
|
||||
#include <kconfig.h>
|
||||
#include <kglobal.h>
|
||||
#include <kglobalsettings.h>
|
||||
#include <kglobalaccel.h>
|
||||
#include <klocale.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -998,16 +999,16 @@ QPopupMenu* Workspace::clientPopup( Client* c )
|
|||
if ( !popup ) {
|
||||
popup = new QPopupMenu;
|
||||
popup->setCheckable( TRUE );
|
||||
popup->setFont(KGlobal::menuFont());
|
||||
popup->setFont(KGlobalSettings::menuFont());
|
||||
connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) );
|
||||
connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
|
||||
|
||||
PluginMenu *deco = new PluginMenu(&mgr, popup);
|
||||
deco->setFont(KGlobal::menuFont());
|
||||
deco->setFont(KGlobalSettings::menuFont());
|
||||
|
||||
desk_popup = new QPopupMenu( popup );
|
||||
desk_popup->setCheckable( TRUE );
|
||||
desk_popup->setFont(KGlobal::menuFont());
|
||||
desk_popup->setFont(KGlobalSettings::menuFont());
|
||||
connect( desk_popup, SIGNAL( activated(int) ), this, SLOT( sendToDesktop(int) ) );
|
||||
connect( desk_popup, SIGNAL( aboutToShow() ), this, SLOT( desktopPopupAboutToShow() ) );
|
||||
|
||||
|
|
Loading…
Reference in a new issue