diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp index bffd50e163..8f54caaf9c 100644 --- a/kcmkwin/kwinoptions/mouse.cpp +++ b/kcmkwin/kwinoptions/mouse.cpp @@ -31,7 +31,6 @@ #include #include #include -#include // For KKeyNative::keyboardHasWinKey() #include #include @@ -455,7 +454,7 @@ void KActionsConfig::load() setComboText(coWin1,config->readEntry("CommandWindow1","Activate, raise and pass click").ascii()); setComboText(coWin2,config->readEntry("CommandWindow2","Activate and pass click").ascii()); setComboText(coWin3,config->readEntry("CommandWindow3","Activate and pass click").ascii()); - setComboText(coAllKey,config->readEntry("CommandAllKey",KKeyNative::keyboardHasWinKey() ? "Meta" : "Alt").ascii()); + setComboText(coAllKey,config->readEntry("CommandAllKey","Alt").ascii()); setComboText(coAll1,config->readEntry("CommandAll1","Move").ascii()); setComboText(coAll2,config->readEntry("CommandAll2","Toggle raise and lower").ascii()); setComboText(coAll3,config->readEntry("CommandAll3","Resize").ascii()); @@ -499,7 +498,7 @@ void KActionsConfig::defaults() setComboText(coWin1,"Activate, raise and pass click"); setComboText(coWin2,"Activate and pass click"); setComboText(coWin3,"Activate and pass click"); - setComboText(coAllKey, KKeyNative::keyboardHasWinKey() ? "Meta" : "Alt"); + setComboText(coAllKey,"Alt"); setComboText (coAll1,"Move"); setComboText(coAll2,"Toggle raise and lower"); setComboText(coAll3,"Resize"); diff --git a/options.cpp b/options.cpp index f1d1f6bd47..ab5b69666d 100644 --- a/options.cpp +++ b/options.cpp @@ -10,7 +10,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich #include #include #include -#include // for KKeyNative::keyboardHasWinKey() using namespace KWinInternal; @@ -243,7 +242,7 @@ void Options::reload() CmdWindow1 = mouseCommand(config->readEntry("CommandWindow1","Activate, raise and pass click")); CmdWindow2 = mouseCommand(config->readEntry("CommandWindow2","Activate and pass click")); CmdWindow3 = mouseCommand(config->readEntry("CommandWindow3","Activate and pass click")); - CmdAllModKey = (config->readEntry("CommandAllKey", KKeyNative::keyboardHasWinKey() ? "Meta" : "Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt; + CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt; CmdAll1 = mouseCommand(config->readEntry("CommandAll1","Move")); CmdAll2 = mouseCommand(config->readEntry("CommandAll2","Toggle raise and lower")); CmdAll3 = mouseCommand(config->readEntry("CommandAll3","Resize"));