From aa34dbd059e71f1c883aa628a48f2eea2bfc1dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 12 Oct 2012 08:25:22 +0200 Subject: [PATCH] Remove the fallback to Platik in case defaultDepth is < 8 Plastik has been removed and the new Aurorae has the same requirement as Oxygen. This fallback was anyway useless given that KWin nowadays uses raster paint engine by default and hardly anything would work with such a small QPixmap::defaultDepth(). REVIEW: 106613 --- kcmkwin/kwindecoration/kwindecoration.cpp | 5 ++--- plugins.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index 5876288a8d..8be5c3898e 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -176,12 +176,11 @@ void KWinDecorationModule::readConfig(const KConfigGroup & conf) // Find the corresponding decoration name to that of // the current plugin library name - QString libraryName = conf.readEntry("PluginLib", - ((QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik")); + QString libraryName = conf.readEntry("PluginLib", "kwin3_oxygen"); if (libraryName.isEmpty()) { // Selected decoration doesn't exist, use the default - libraryName = ((QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik"); + libraryName = "kwin3_oxygen"; } const int bsize = conf.readEntry("BorderSize", (int)BorderNormal); diff --git a/plugins.cpp b/plugins.cpp index 3e745afd1c..ea5fe1c912 100644 --- a/plugins.cpp +++ b/plugins.cpp @@ -34,10 +34,9 @@ PluginMgr::PluginMgr() : KDecorationPlugins(KGlobal::config()) , m_noDecoration(false) { - defaultPlugin = (QPixmap::defaultDepth() > 8) ? - "kwin3_oxygen" : "kwin3_plastik"; + defaultPlugin = "kwin3_oxygen"; #ifndef KWIN_BUILD_OXYGEN - defaultPlugin = "kwin3_plastik"; + defaultPlugin = "kwin3_aurorae"; #endif #ifdef KWIN_BUILD_DECORATIONS loadPlugin(""); // load the plugin specified in cfg file