plasma: remove redundant plasma-desktop shell config

the default Plasma::Theme font is already set to QApplication::font() by
Plasma::Theme itself, it has configuration option for it too which is to
read the font setting from the application "General" config group. for
reference:
kdelibs/plasma/theme.cpp

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/plasma/shells/plasma-desktop/CMakeLists.txt b/plasma/shells/plasma-desktop/CMakeLists.txt
index eb189b3..c8bf60b 100644 (file)
--- a/plasma/shells/plasma-desktop/CMakeLists.txt
+++ b/plasma/shells/plasma-desktop/CMakeLists.txt
@@ -23,8 +23,6 @@ set(plasma_SRCS
     klistconfirmationdialog.cpp
 )
 
-kde4_add_kcfg_files(plasma_SRCS data/plasma-shell-desktop.kcfgc)
-
 set(plasmaapp_dbusXML dbus/org.kde.plasma.App.xml)
 qt4_add_dbus_adaptor(plasma_SRCS ${plasmaapp_dbusXML} plasmaapp.h PlasmaApp)
 

diff --git a/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfg b/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfg
deleted file mode 100644 (file)
index cfe1f16..0000000
--- a/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile />
-  <include>QApplication</include>
-    <group name="General">
-        <entry key="desktopFont" type="Font">
-            <label>The font to use on the desktop</label>
-            <default code="true">qApp->font()</default>
-        </entry>
-    </group>
-</kcfg>

diff --git a/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc b/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc
deleted file mode 100644 (file)
index 0de963b..0000000
--- a/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=plasma-shell-desktop.kcfg
-ClassName=AppSettings
-Singleton=true
-Mutators=true

diff --git a/plasma/shells/plasma-desktop/plasmaapp.cpp b/plasma/shells/plasma-desktop/plasmaapp.cpp
index 74975f5..bbea768 100644 (file)
--- a/plasma/shells/plasma-desktop/plasmaapp.cpp
+++ b/plasma/shells/plasma-desktop/plasmaapp.cpp
@@ -46,7 +46,6 @@
 #include <Plasma/AbstractToolBox>
 #include <Plasma/Containment>
 #include <Plasma/Dialog>
-#include <Plasma/Theme>
 #include <Plasma/Wallpaper>
 #include <Plasma/WindowEffects>
 #include <Plasma/Package>
@@ -61,7 +60,6 @@
 #include "interactiveconsole.h"
 #include "panelshadows.h"
 #include "panelview.h"
-#include "plasma-shell-desktop.h"
 #include "toolbutton.h"
 #include "klistconfirmationdialog.h"
 
@@ -200,9 +198,6 @@ void PlasmaApp::setupDesktop()
     m_XdndVersionAtom = (Atom)xdndversion;
 #endif
 
-    // intialize the default theme and set the font
-    Plasma::Theme *theme = Plasma::Theme::defaultTheme();
-    theme->setFont(AppSettings::desktopFont());
     m_panelShadows = new PanelShadows();
 
     // this line initializes the corona.