>From 0685de8c3cc4859881f3e7a9826d6e3a740af799 Mon Sep 17 00:00:00 2001
From: Andreas Stricker <astricker@futurelab.ch>
Date: Wed, 27 May 2009 18:00:31 +0200
Subject: [PATCH 06/14] Exclude parts of kmenuedit dependent of KHotKeys

 * KHotKeys is only available with X11, so exclude those bits on OSX
---
 workspace/kmenuedit/CMakeLists.txt |   12 ++++++------
 workspace/kmenuedit/basictab.cpp   |    6 +++---
 workspace/kmenuedit/main.cpp       |    4 ++--
 workspace/kmenuedit/menuinfo.cpp   |    8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/workspace/kmenuedit/CMakeLists.txt b/workspace/kmenuedit/CMakeLists.txt
index 077f901..53834bc 100644
--- a/workspace/kmenuedit/CMakeLists.txt
+++ b/workspace/kmenuedit/CMakeLists.txt
@@ -3,19 +3,19 @@ add_subdirectory( pixmaps )
 add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 
 set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab.cpp treeview.cpp kmenuedit.cpp menufile.cpp menuinfo.cpp )
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
 set(kmenueditcommon_STAT_SRCS ${kmenueditcommon_STAT_SRCS} khotkeys.cpp)
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT APPLE)
 ########### next target ###############
 
 qt4_add_dbus_adaptor( kmenueditcommon_STAT_SRCS org.kde.kmenuedit.xml kmenuedit.h KMenuEdit)
 
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
 qt4_add_dbus_interface(
     kmenueditcommon_STAT_SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml
     khotkeys_interface)
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT APPLE)
 
 set(kmenuedit_KDEINIT_SRCS main.cpp ${kmenueditcommon_STAT_SRCS})
 
@@ -34,9 +34,9 @@ install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS})
 install( FILES kmenuedit.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 install( FILES kmenueditui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kmenuedit )
 
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
 add_dependencies(kdeinit_kmenuedit kded_khotkeys)
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT APPLE)
 
 kde4_install_icons( ${ICON_INSTALL_DIR}  )
 
diff --git a/workspace/kmenuedit/basictab.cpp b/workspace/kmenuedit/basictab.cpp
index 4612c2a..0551389 100644
--- a/workspace/kmenuedit/basictab.cpp
+++ b/workspace/kmenuedit/basictab.cpp
@@ -243,7 +243,7 @@ BasicTab::BasicTab( QWidget *parent )
     advancedLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding));
     
     addTab(advanced, i18n("Advanced"));
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
     if (!KHotKeys::present())
         general_group_keybind->hide();
 #endif
@@ -376,7 +376,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
     _iconButton->setIcon(df->readIcon());
 
     // key binding part
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
     if( KHotKeys::present())
     {
         if ( !entryInfo->shortcut().isEmpty() )
@@ -527,7 +527,7 @@ void BasicTab::slotCapturedKeySequence(const QKeySequence& seq)
     if (signalsBlocked())
        return;
     KShortcut cut(seq, QKeySequence());
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
     if (_menuEntryInfo->isShortcutAvailable( cut ) && KHotKeys::present() )
     {
        _menuEntryInfo->setShortcut( cut );
diff --git a/workspace/kmenuedit/main.cpp b/workspace/kmenuedit/main.cpp
index 13137f1..141855c 100644
--- a/workspace/kmenuedit/main.cpp
+++ b/workspace/kmenuedit/main.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 
 #include "kmenuedit.h"
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
 #include "khotkeys.h"
 #endif
 
@@ -40,7 +40,7 @@ class KMenuApplication : public KUniqueApplication
 {
 public:
    KMenuApplication() { }
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
    virtual ~KMenuApplication() { KHotKeys::cleanup(); }
 #endif
    virtual int newInstance()
diff --git a/workspace/kmenuedit/menuinfo.cpp b/workspace/kmenuedit/menuinfo.cpp
index 9af7b0d..ad4195b 100644
--- a/workspace/kmenuedit/menuinfo.cpp
+++ b/workspace/kmenuedit/menuinfo.cpp
@@ -23,7 +23,7 @@
 #include <QRegExp>
 
 #include <kdesktopfile.h>
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
 #include <khotkeys.h>
 #endif
 #include <kstandarddirs.h>
@@ -181,7 +181,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
 {
    if (s_deletedApps)
    {
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
       // Remove hotkeys for applications that have been deleted
       for(QStringList::ConstIterator it = s_deletedApps->constBegin();
           it != s_deletedApps->constEnd(); ++it)
@@ -347,7 +347,7 @@ void MenuEntryInfo::save()
       m_desktopFile->sync();
       dirty = false;
    }
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
    if (shortcutDirty)
    {
       if( KHotKeys::present())
@@ -389,7 +389,7 @@ void MenuEntryInfo::setIcon(const QString &_icon)
 
 KShortcut MenuEntryInfo::shortcut()
 {
-#ifndef Q_WS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
    if (!shortcutLoaded)
    {
       shortcutLoaded = true;
-- 
1.6.3.1