diff options
| author | hjk <qtc-committer@nokia.com> | 2009-05-19 10:19:40 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-05-19 10:19:40 (GMT) |
| commit | ec9606bc65aaee81a4defea64afe58594349472a (patch) | |
| tree | 6315f0f07b99f3e99b2f39efbd52cd634441bd65 | |
| parent | 9f9ede616079998f8ba7bf6fd446f39ce74b0400 (diff) | |
| download | Qt-ec9606bc65aaee81a4defea64afe58594349472a.zip Qt-ec9606bc65aaee81a4defea64afe58594349472a.tar.gz Qt-ec9606bc65aaee81a4defea64afe58594349472a.tar.bz2 | |
compile fixes with namespaces
| -rw-r--r-- | src/gui/image/qpixmapcache_p.h | 4 | ||||
| -rw-r--r-- | tools/kmap2qmap/main.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
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: |