directfb: Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE around the code

Change-Id: Iabf32130dcfe4f5a383e9c99f661ded176432817
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
This commit is contained in:
Holger Hans Peter Freyther 2011-11-27 20:55:10 +01:00 committed by Qt by Nokia
parent 3d07ef1d0c
commit 614bb9c085
9 changed files with 32 additions and 0 deletions

View File

@ -49,6 +49,7 @@
#include <directfb.h> #include <directfb.h>
QT_BEGIN_NAMESPACE
static QBlittable::Capabilities dfb_blitter_capabilities() static QBlittable::Capabilities dfb_blitter_capabilities()
{ {
@ -271,3 +272,5 @@ void QDirectFbBlitter::doUnlock()
{ {
m_surface->Unlock(m_surface.data()); m_surface->Unlock(m_surface.data());
} }
QT_END_NAMESPACE

View File

@ -48,6 +48,8 @@
#include <directfb.h> #include <directfb.h>
QT_BEGIN_NAMESPACE
class QDirectFbBlitter : public QBlittable class QDirectFbBlitter : public QBlittable
{ {
public: public:
@ -103,4 +105,6 @@ inline IDirectFBSurface *QDirectFbBlitter::dfbSurface() const
return m_surface.data(); return m_surface.data();
} }
QT_END_NAMESPACE
#endif // QDIRECTFBBLITTER_H #endif // QDIRECTFBBLITTER_H

View File

@ -48,6 +48,8 @@
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtGui/QScreen> #include <QtGui/QScreen>
QT_BEGIN_NAMESPACE
IDirectFB *QDirectFbConvenience::dfbInterface() IDirectFB *QDirectFbConvenience::dfbInterface()
{ {
static IDirectFB *dfb = 0; static IDirectFB *dfb = 0;
@ -391,3 +393,5 @@ IDirectFBDisplayLayer *toDfbLayer(QPlatformScreen *screen)
{ {
return static_cast<QDirectFbScreen*>(screen)->dfbLayer(); return static_cast<QDirectFbScreen*>(screen)->dfbLayer();
} }
QT_END_NAMESPACE

View File

@ -49,6 +49,7 @@
#include <directfb.h> #include <directfb.h>
QT_BEGIN_NAMESPACE
class QDirectFbScreen; class QDirectFbScreen;
class QPlatformScreen; class QPlatformScreen;
@ -119,5 +120,7 @@ IDirectFBDisplayLayer *toDfbLayer(QPlatformScreen *screen);
#define QDFB_PRETTY \ #define QDFB_PRETTY \
(__FILE__ ":" QDFB_TOSTRING(__LINE__)) (__FILE__ ":" QDFB_TOSTRING(__LINE__))
QT_END_NAMESPACE
#endif // QDIRECTFBCONVENIENCE_H #endif // QDIRECTFBCONVENIENCE_H

View File

@ -42,6 +42,7 @@
#include "qdirectfbcursor.h" #include "qdirectfbcursor.h"
#include "qdirectfbconvenience.h" #include "qdirectfbconvenience.h"
QT_BEGIN_NAMESPACE
QDirectFBCursor::QDirectFBCursor(QPlatformScreen *screen) QDirectFBCursor::QDirectFBCursor(QPlatformScreen *screen)
: QPlatformCursor(screen) : QPlatformCursor(screen)
@ -81,3 +82,5 @@ void QDirectFBCursor::changeCursor(QCursor *cursor, QWindow *)
layer->SetCursorShape(layer, surface, xSpot, ySpot); layer->SetCursorShape(layer, surface, xSpot, ySpot);
layer->SetCooperativeLevel(layer, DLSCL_SHARED); layer->SetCooperativeLevel(layer, DLSCL_SHARED);
} }
QT_END_NAMESPACE

View File

@ -47,6 +47,8 @@
#include "qdirectfbconvenience.h" #include "qdirectfbconvenience.h"
QT_BEGIN_NAMESPACE
class QDirectFbScreen; class QDirectFbScreen;
class QDirectFbBlitter; class QDirectFbBlitter;
@ -60,4 +62,6 @@ private:
QScopedPointer<QPlatformCursorImage> m_image; QScopedPointer<QPlatformCursorImage> m_image;
}; };
QT_END_NAMESPACE
#endif // QDIRECTFBCURSOR_H #endif // QDIRECTFBCURSOR_H

View File

@ -45,6 +45,8 @@
#include <QDebug> #include <QDebug>
QT_BEGIN_NAMESPACE
QDirectFbGLContext::QDirectFbGLContext(IDirectFBGL *glContext) QDirectFbGLContext::QDirectFbGLContext(IDirectFBGL *glContext)
: m_dfbGlContext(glContext) : m_dfbGlContext(glContext)
{ {
@ -99,3 +101,5 @@ QPlatformWindowFormat QDirectFbGLContext::platformWindowFormat() const
{ {
return m_windowFormat; return m_windowFormat;
} }
QT_END_NAMESPACE

View File

@ -50,6 +50,8 @@
#include <directfb.h> #include <directfb.h>
QT_BEGIN_NAMESPACE
QDirectFbInput::QDirectFbInput(IDirectFB *dfb, IDirectFBDisplayLayer *dfbLayer) QDirectFbInput::QDirectFbInput(IDirectFB *dfb, IDirectFBDisplayLayer *dfbLayer)
: m_dfbInterface(dfb) : m_dfbInterface(dfb)
, m_dfbDisplayLayer(dfbLayer) , 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); return QPoint(event.window.cx +x, event.window.cy + y);
} }
QT_END_NAMESPACE

View File

@ -47,6 +47,8 @@
#include <directfb.h> #include <directfb.h>
QT_BEGIN_NAMESPACE
QDirectFbWindow::QDirectFbWindow(QWindow *tlw, QDirectFbInput *inputhandler) QDirectFbWindow::QDirectFbWindow(QWindow *tlw, QDirectFbInput *inputhandler)
: QPlatformWindow(tlw), m_inputHandler(inputhandler) : QPlatformWindow(tlw), m_inputHandler(inputhandler)
{ {
@ -199,3 +201,5 @@ IDirectFBWindow *QDirectFbWindow::dfbWindow() const
{ {
return m_dfbWindow.data(); return m_dfbWindow.data();
} }
QT_END_NAMESPACE