From cf196a2565235f649b88fac55b53270bea23458d Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Wed, 4 Mar 2015 21:16:50 +0100 Subject: [PATCH] Fix kmap2qmap build on OS X Currently kmap2qmap fails to build on OS X (clang) This patch aims to fix this. Change-Id: I61c985dc7ad1f2486368c39aa976599d274942ab Reviewed-by: Friedemann Kleint --- src/kmap2qmap/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp index a3f7a39..9817f14 100644 --- a/src/kmap2qmap/main.cpp +++ b/src/kmap2qmap/main.cpp @@ -395,9 +395,11 @@ static const int symbol_synonyms_size = sizeof(symbol_synonyms)/sizeof(symbol_sy // makes the generated array in --header mode a bit more human readable QT_BEGIN_NAMESPACE -static bool operator<(const QEvdevKeyboardMap::Mapping &m1, const QEvdevKeyboardMap::Mapping &m2) -{ - return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers; +namespace QEvdevKeyboardMap { + static bool operator<(const Mapping &m1, const Mapping &m2) + { + return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers; + } } QT_END_NAMESPACE -- 2.7.4