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/kernel/qapplication_qws.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/kernel/qapplication_qws.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_qws.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp index f7a7ab0..5340ae9 100644 --- a/src/gui/kernel/qapplication_qws.cpp +++ b/src/gui/kernel/qapplication_qws.cpp @@ -72,6 +72,7 @@ //#include "qwsregionmanager_qws.h" #include "qwindowsystem_qws.h" #include "private/qwindowsystem_p.h" +#include "qdecorationfactory_qws.h" #include "qwsdisplay_qws.h" #include "private/qwsdisplay_qws_p.h" @@ -122,6 +123,8 @@ #endif #endif +QT_BEGIN_NAMESPACE + #ifndef QT_NO_DIRECTPAINTER class QDirectPainter; extern void qt_directpainter_region(QDirectPainter *dp, const QRegion &alloc, int type); @@ -161,13 +164,9 @@ int qt_servershmid = -1; bool qws_overrideCursor = false; #ifndef QT_NO_QWS_MANAGER -#include "qdecorationfactory_qws.h" extern Q_GUI_EXPORT QWSServer *qwsServer; -QT_BEGIN_NAMESPACE - -QT_USE_NAMESPACE static QDecoration *qws_decoration = 0; #endif @@ -2371,7 +2370,7 @@ void qt_cleanup() QString QApplicationPrivate::appName() const // get application name { - return ::appName; + return QT_PREPEND_NAMESPACE(appName); } /***************************************************************************** |