From 614bb9c0851eb1fe21ff7a998191d551ceed6a22 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 27 Nov 2011 20:55:10 +0100 Subject: [PATCH] directfb: Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE around the code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iabf32130dcfe4f5a383e9c99f661ded176432817 Reviewed-by: Jørgen Lind --- src/plugins/platforms/directfb/qdirectfbblitter.cpp | 3 +++ src/plugins/platforms/directfb/qdirectfbblitter.h | 4 ++++ src/plugins/platforms/directfb/qdirectfbconvenience.cpp | 4 ++++ src/plugins/platforms/directfb/qdirectfbconvenience.h | 3 +++ src/plugins/platforms/directfb/qdirectfbcursor.cpp | 3 +++ src/plugins/platforms/directfb/qdirectfbcursor.h | 4 ++++ src/plugins/platforms/directfb/qdirectfbglcontext.cpp | 4 ++++ src/plugins/platforms/directfb/qdirectfbinput.cpp | 3 +++ src/plugins/platforms/directfb/qdirectfbwindow.cpp | 4 ++++ 9 files changed, 32 insertions(+) diff --git a/src/plugins/platforms/directfb/qdirectfbblitter.cpp b/src/plugins/platforms/directfb/qdirectfbblitter.cpp index 0d2fc84bb3..63b98a3fcb 100644 --- a/src/plugins/platforms/directfb/qdirectfbblitter.cpp +++ b/src/plugins/platforms/directfb/qdirectfbblitter.cpp @@ -49,6 +49,7 @@ #include +QT_BEGIN_NAMESPACE static QBlittable::Capabilities dfb_blitter_capabilities() { @@ -271,3 +272,5 @@ void QDirectFbBlitter::doUnlock() { m_surface->Unlock(m_surface.data()); } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbblitter.h b/src/plugins/platforms/directfb/qdirectfbblitter.h index 9a7362be65..d1c6a0d6ee 100644 --- a/src/plugins/platforms/directfb/qdirectfbblitter.h +++ b/src/plugins/platforms/directfb/qdirectfbblitter.h @@ -48,6 +48,8 @@ #include +QT_BEGIN_NAMESPACE + class QDirectFbBlitter : public QBlittable { public: @@ -103,4 +105,6 @@ inline IDirectFBSurface *QDirectFbBlitter::dfbSurface() const return m_surface.data(); } +QT_END_NAMESPACE + #endif // QDIRECTFBBLITTER_H diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp index 5f580b0473..a448cc7f6f 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp @@ -48,6 +48,8 @@ #include #include +QT_BEGIN_NAMESPACE + IDirectFB *QDirectFbConvenience::dfbInterface() { static IDirectFB *dfb = 0; @@ -391,3 +393,5 @@ IDirectFBDisplayLayer *toDfbLayer(QPlatformScreen *screen) { return static_cast(screen)->dfbLayer(); } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.h b/src/plugins/platforms/directfb/qdirectfbconvenience.h index f6a913e42b..3a6176a216 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.h +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.h @@ -49,6 +49,7 @@ #include +QT_BEGIN_NAMESPACE class QDirectFbScreen; class QPlatformScreen; @@ -119,5 +120,7 @@ IDirectFBDisplayLayer *toDfbLayer(QPlatformScreen *screen); #define QDFB_PRETTY \ (__FILE__ ":" QDFB_TOSTRING(__LINE__)) +QT_END_NAMESPACE + #endif // QDIRECTFBCONVENIENCE_H diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.cpp b/src/plugins/platforms/directfb/qdirectfbcursor.cpp index 8698f9ccf9..1d3b2b37a3 100644 --- a/src/plugins/platforms/directfb/qdirectfbcursor.cpp +++ b/src/plugins/platforms/directfb/qdirectfbcursor.cpp @@ -42,6 +42,7 @@ #include "qdirectfbcursor.h" #include "qdirectfbconvenience.h" +QT_BEGIN_NAMESPACE QDirectFBCursor::QDirectFBCursor(QPlatformScreen *screen) : QPlatformCursor(screen) @@ -81,3 +82,5 @@ void QDirectFBCursor::changeCursor(QCursor *cursor, QWindow *) layer->SetCursorShape(layer, surface, xSpot, ySpot); layer->SetCooperativeLevel(layer, DLSCL_SHARED); } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h index 1a038cf456..ec0c7446fa 100644 --- a/src/plugins/platforms/directfb/qdirectfbcursor.h +++ b/src/plugins/platforms/directfb/qdirectfbcursor.h @@ -47,6 +47,8 @@ #include "qdirectfbconvenience.h" +QT_BEGIN_NAMESPACE + class QDirectFbScreen; class QDirectFbBlitter; @@ -60,4 +62,6 @@ private: QScopedPointer m_image; }; +QT_END_NAMESPACE + #endif // QDIRECTFBCURSOR_H diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp index 1121a42944..7c888ddcac 100644 --- a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp +++ b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp @@ -45,6 +45,8 @@ #include +QT_BEGIN_NAMESPACE + QDirectFbGLContext::QDirectFbGLContext(IDirectFBGL *glContext) : m_dfbGlContext(glContext) { @@ -99,3 +101,5 @@ QPlatformWindowFormat QDirectFbGLContext::platformWindowFormat() const { return m_windowFormat; } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbinput.cpp b/src/plugins/platforms/directfb/qdirectfbinput.cpp index a844ef8969..3b803537ba 100644 --- a/src/plugins/platforms/directfb/qdirectfbinput.cpp +++ b/src/plugins/platforms/directfb/qdirectfbinput.cpp @@ -50,6 +50,8 @@ #include +QT_BEGIN_NAMESPACE + QDirectFbInput::QDirectFbInput(IDirectFB *dfb, IDirectFBDisplayLayer *dfbLayer) : m_dfbInterface(dfb) , m_dfbDisplayLayer(dfbLayer) @@ -205,3 +207,4 @@ inline QPoint QDirectFbInput::globalPoint(const DFBEvent &event) const return QPoint(event.window.cx +x, event.window.cy + y); } +QT_END_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp index ac9a474cf8..55fce90252 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.cpp +++ b/src/plugins/platforms/directfb/qdirectfbwindow.cpp @@ -47,6 +47,8 @@ #include +QT_BEGIN_NAMESPACE + QDirectFbWindow::QDirectFbWindow(QWindow *tlw, QDirectFbInput *inputhandler) : QPlatformWindow(tlw), m_inputHandler(inputhandler) { @@ -199,3 +201,5 @@ IDirectFBWindow *QDirectFbWindow::dfbWindow() const { return m_dfbWindow.data(); } + +QT_END_NAMESPACE