diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-08-26 08:25:19 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-08-26 08:47:37 (GMT) |
| commit | 1e87709059dcf10e41c0781d4b97ce143543e4a4 (patch) | |
| tree | 140d51e62112a67ff0b285b33db6a2d0f994bac9 /src/gui/embedded/qlock.cpp | |
| parent | e692a4044e161c46e6b145d2f3874a0b7b929b4d (diff) | |
| download | Qt-1e87709059dcf10e41c0781d4b97ce143543e4a4.zip Qt-1e87709059dcf10e41c0781d4b97ce143543e4a4.tar.gz Qt-1e87709059dcf10e41c0781d4b97ce143543e4a4.tar.bz2 | |
Make QWS compile with namespaces
Reviewed-by: hjk
Diffstat (limited to 'src/gui/embedded/qlock.cpp')
| -rw-r--r-- | src/gui/embedded/qlock.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/embedded/qlock.cpp b/src/gui/embedded/qlock.cpp index c32e9b5..9f2d3b8 100644 --- a/src/gui/embedded/qlock.cpp +++ b/src/gui/embedded/qlock.cpp @@ -41,10 +41,11 @@ #include "qlock_p.h" -QT_BEGIN_NAMESPACE #ifdef QT_NO_QWS_MULTIPROCESS +QT_BEGIN_NAMESPACE + /* no multiprocess - use a dummy */ QLock::QLock(const QString & /*filename*/, char /*id*/, bool /*create*/) @@ -77,6 +78,8 @@ bool QLock::locked() const return data; } +QT_END_NAMESPACE + #else // QT_NO_QWS_MULTIPROCESS #include "qwssignalhandler_p.h" @@ -110,6 +113,9 @@ union semun { #include <private/qcore_unix_p.h> // overrides QT_OPEN + +QT_BEGIN_NAMESPACE + #define MAX_LOCKS 200 // maximum simultaneous read locks class QLockData @@ -324,6 +330,7 @@ bool QLock::locked() const return (data->count > 0); } +QT_END_NAMESPACE + #endif // QT_NO_QWS_MULTIPROCESS -QT_END_NAMESPACE |