Drop recommendCompositing from CompositingPrefs

It's always true which means it's no longer needed.
remotes/origin/Plasma/5.0
Martin Gräßlin 14 years ago
parent d6540c8392
commit bcbbf3c5a8
  1. 11
      compositingprefs.cpp
  2. 2
      compositingprefs.h
  3. 6
      kcmkwin/kwincompositing/main.cpp

@ -38,8 +38,7 @@ namespace KWin
{
CompositingPrefs::CompositingPrefs()
: mRecommendCompositing(false)
, mEnableVSync(true)
: mEnableVSync(true)
, mEnableDirectRendering(true)
{
}
@ -48,11 +47,6 @@ CompositingPrefs::~CompositingPrefs()
{
}
bool CompositingPrefs::recommendCompositing() const
{
return mRecommendCompositing;
}
bool CompositingPrefs::openGlIsBroken()
{
KSharedConfigPtr config = KSharedConfig::openConfig("kwinrc");
@ -384,9 +378,6 @@ void CompositingPrefs::detectDriverAndVersion()
// See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work.
void CompositingPrefs::applyDriverSpecificOptions()
{
// Always recommend
mRecommendCompositing = true;
GLPlatform *gl = GLPlatform::instance();
if (gl->driver() == Driver_Intel)
mEnableVSync = false;

@ -50,7 +50,6 @@ public:
* @returns @c true if GLX is available, @c false otherwise and if not build with OpenGL support.
**/
static bool hasGlx();
bool recommendCompositing() const;
bool enableVSync() const {
return mEnableVSync;
}
@ -72,7 +71,6 @@ protected:
private:
bool mRecommendCompositing;
bool mEnableVSync;
bool mEnableDirectRendering;

@ -259,7 +259,7 @@ void KWinCompositingConfig::currentTabChanged(int tab)
void KWinCompositingConfig::loadGeneralTab()
{
KConfigGroup config(mKWinConfig, "Compositing");
bool enabled = config.readEntry("Enabled", mDefaultPrefs.recommendCompositing());
bool enabled = config.readEntry("Enabled", true);
ui.useCompositing->setChecked(enabled);
// this works by global shortcut magics - it will pick the current sc
@ -582,7 +582,7 @@ void KWinCompositingConfig::checkLoadedEffects()
QDBusMessage message = QDBusMessage::createMethodCall("org.kde.kwin", "/KWin", "org.kde.KWin", "loadedEffects");
QDBusMessage reply = QDBusConnection::sessionBus().call(message);
KConfigGroup effectConfig = KConfigGroup(mKWinConfig, "Compositing");
bool enabledAfter = effectConfig.readEntry("Enabled", mDefaultPrefs.recommendCompositing());
bool enabledAfter = effectConfig.readEntry("Enabled", true);
if (reply.type() == QDBusMessage::ReplyMessage && enabledAfter && !getenv("KDE_FAILSAFE")) {
effectConfig = KConfigGroup(mKWinConfig, "Plugins");
@ -642,7 +642,7 @@ void KWinCompositingConfig::defaults()
{
ui.tabWidget->setCurrentIndex(0);
ui.useCompositing->setChecked(mDefaultPrefs.recommendCompositing());
ui.useCompositing->setChecked(true);
ui.effectWinManagement->setChecked(true);
ui.effectAnimations->setChecked(true);

Loading…
Cancel
Save