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

KGlobal <-> KGlobalSettings <-> KApplication cleanup

Browse source 
svn path=/trunk/kdebase/kcontrol/; revision=51720
This commit is contained in:
Bernd Gehrmann 2000-06-03 01:19:08 +00:00
parent 9dab9d5217
commit 45e0fc465a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
workspace.cpp
View file

@ -5,6 +5,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
******************************************************************/ ******************************************************************/
#include <kconfig.h> #include <kconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kglobalsettings.h>
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <klocale.h> #include <klocale.h>
#include <stdlib.h> #include <stdlib.h>
@ -998,16 +999,16 @@ QPopupMenu* Workspace::clientPopup( Client* c )
if ( !popup ) { if ( !popup ) {
popup = new QPopupMenu; popup = new QPopupMenu;
popup->setCheckable( TRUE ); popup->setCheckable( TRUE );
popup->setFont(KGlobal::menuFont()); popup->setFont(KGlobalSettings::menuFont());
connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) ); connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) );
connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) ); connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
PluginMenu *deco = new PluginMenu(&mgr, popup); PluginMenu *deco = new PluginMenu(&mgr, popup);
deco->setFont(KGlobal::menuFont()); deco->setFont(KGlobalSettings::menuFont());
desk_popup = new QPopupMenu( popup ); desk_popup = new QPopupMenu( popup );
desk_popup->setCheckable( TRUE ); 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( activated(int) ), this, SLOT( sendToDesktop(int) ) );
connect( desk_popup, SIGNAL( aboutToShow() ), this, SLOT( desktopPopupAboutToShow() ) ); connect( desk_popup, SIGNAL( aboutToShow() ), this, SLOT( desktopPopupAboutToShow() ) );