From 45e0fc465a708314e0357b11e18ae6bc78708a4b Mon Sep 17 00:00:00 2001
From: Bernd Gehrmann <bernd@mail.berlios.de>
Date: Sat, 3 Jun 2000 01:19:08 +0000
Subject: [PATCH] KGlobal <-> KGlobalSettings <-> KApplication cleanup

svn path=/trunk/kdebase/kcontrol/; revision=51720
---
 workspace.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index 3d8fa34dfe..8b3b3c8e9b 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -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() ) );