From ec9606bc65aaee81a4defea64afe58594349472a Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 19 May 2009 12:19:40 +0200
Subject: compile fixes with namespaces

---
 src/gui/image/qpixmapcache_p.h | 4 ++++
 tools/kmap2qmap/main.cpp       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 66b30d2..5aa6eaf 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -58,6 +58,8 @@
 #include <private/qpixmap_raster_p.h>
 #include "qcache.h"
 
+QT_BEGIN_NAMESPACE
+
 class QPixmapCache::KeyData
 {
 public:
@@ -89,4 +91,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #endif // QPIXMAPCACHE_P_H
diff --git a/tools/kmap2qmap/main.cpp b/tools/kmap2qmap/main.cpp
index b518392..12d91c6 100644
--- a/tools/kmap2qmap/main.cpp
+++ b/tools/kmap2qmap/main.cpp
@@ -384,10 +384,12 @@ static const symbol_synonyms_t symbol_synonyms[] = {
 static const int symbol_synonyms_size = sizeof(symbol_synonyms)/sizeof(symbol_synonyms_t);
 
 // makes the generated array in --header mode a bit more human readable
+QT_BEGIN_NAMESPACE
 static bool operator<(const QWSKeyboard::Mapping &m1, const QWSKeyboard::Mapping &m2)
 {
     return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
 }
+QT_END_NAMESPACE
 
 class KeymapParser {
 public:
-- 
cgit v0.12