From f15d5c7205f10dbb12eca00ba3922541d1d2e1ca Mon Sep 17 00:00:00 2001
From: Ellis Whitehead <kde@ellisw.net>
Date: Sat, 19 Jan 2002 04:53:13 +0000
Subject: [PATCH] Clean-up wrt KKeyNative.

svn path=/trunk/kdebase/kwin/; revision=132461
---
 client.cpp  | 1 +
 options.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client.cpp b/client.cpp
index 96c6542102..ee7e60c1b0 100644
--- a/client.cpp
+++ b/client.cpp
@@ -7,6 +7,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kdebug.h>
+#include <kkeynative.h>
 #include <kshortcut.h>
 #include <dcopclient.h>
 #include <qapplication.h>
diff --git a/options.cpp b/options.cpp
index ebbbc2b149..be40bfbd5d 100644
--- a/options.cpp
+++ b/options.cpp
@@ -10,7 +10,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kshortcut.h> // for KKeySequence::keyboardHasMetaKey()
+#include <kkeynative.h> // for KKeyNative::keyboardHasWinKey()
 
 using namespace KWinInternal;
 
@@ -239,7 +239,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::keyboardHasMetaKey() ? "Meta" : "Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt;
+    CmdAllModKey = (config->readEntry("CommandAllKey", KKeyNative::keyboardHasWinKey() ? "Meta" : "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"));