From 886eb24647891d58d7b5ed0b4f303b673e7830bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Tue, 5 Feb 2008 00:13:37 +0000
Subject: [PATCH] Ooops. Didn't mean to sneak this in.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=771018
---
 widgets/widget.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/widgets/widget.cpp b/widgets/widget.cpp
index a7c22d305..33d5f3cd5 100644
--- a/widgets/widget.cpp
+++ b/widgets/widget.cpp
@@ -36,7 +36,6 @@
 #include <QDesktopWidget>
 
 #include <KDebug>
-#include <KGlobalSettings>
 
 #include "layouts/freelayout.h"
 #include "plasma/plasma.h"
@@ -313,13 +312,7 @@ QSizeF Widget::size() const
 
 QFont Widget::font() const
 {
-    if (managingLayout()) {
-        kDebug() << "layout, return taskbarFont()";
-        return KGlobalSettings::taskbarFont();
-    } else {
-        kDebug() << "nolayout, return desktopFont()";
-        return KGlobalSettings::desktopFont();
-    }
+    return QApplication::font();
 }
 
 /*