Fix QT_BEGIN/END_NAMESPACE in DirectFB

Reviewed-by: Donald Carr <donald.carr@nokia.com>

14 files changed, 65 insertions, 2 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
index fe77fd1..44ce72b3 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
@@ -53,6 +53,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+QT_BEGIN_NAMESPACE
+
 class KeyMap : public QHash<DFBInputDeviceKeySymbol, Qt::Key>
 {
 public:
@@ -429,6 +431,8 @@ KeyMap::KeyMap()
     insert(DIKS_TILDE                 , Qt::Key_AsciiTilde);
 }
 
+QT_END_NAMESPACE
+
 #include "qdirectfbkeyboard.moc"
 
 #endif // QT_NO_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
index 756892f..14618bb 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
@@ -46,6 +46,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 #ifndef QT_NO_DIRECTFB
@@ -62,6 +64,8 @@ private:
     QDirectFBKeyboardHandlerPrivate *d;
 };
 
+QT_END_NAMESPACE
+
 #endif // QT_NO_DIRECTFB
 
 QT_END_HEADER
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
index 1f2b363..8d30f93 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
@@ -49,6 +49,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
+QT_BEGIN_NAMESPACE
+
 class QDirectFBMouseHandlerPrivate : public QObject
 {
     Q_OBJECT
@@ -269,5 +271,8 @@ void QDirectFBMouseHandler::resume()
     d->setEnabled(true);
 }
 
+QT_END_NAMESPACE
+
 #include "qdirectfbmouse.moc"
 
+
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
index 14026ee..37d0845 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
@@ -46,6 +46,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 #ifndef QT_NO_DIRECTFB
@@ -67,6 +69,8 @@ protected:
 
 #endif // QT_NO_DIRECTFB
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // QDIRECTFBMOUSE_H
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
index dec4bdd..e839b47 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
@@ -45,6 +45,8 @@
 #include "qdirectfbpaintdevice.h"
 #include "qdirectfbpaintengine.h"
 
+QT_BEGIN_NAMESPACE
+
 QDirectFBPaintDevice::QDirectFBPaintDevice(QDirectFBScreen *scr)
     : QCustomRasterPaintDevice(0), dfbSurface(0), lockedImage(0), screen(scr),
       bpl(-1), lockFlgs(DFBSurfaceLockFlags(0)), mem(0), engine(0),
@@ -169,5 +171,7 @@ QPaintEngine *QDirectFBPaintDevice::paintEngine() const
     return engine;
 }
 
+QT_END_NAMESPACE
+
 #endif
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
index ca958c8..5befeab 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 // Inherited by both window surface and pixmap
@@ -94,6 +96,8 @@ private:
     Q_DISABLE_COPY(QDirectFBPaintDevice);
 };
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif //QDIRECTFBPAINTDEVICE_H
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 337e75a..384a76a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -55,6 +55,8 @@
 #include <private/qpixmap_raster_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 
+QT_BEGIN_NAMESPACE
+
 class SurfaceCache;
 class QDirectFBPaintEnginePrivate : public QRasterPaintEnginePrivate
 {
@@ -145,7 +147,9 @@ private:
 
 
 #ifdef QT_DIRECTFB_IMAGECACHE
+QT_BEGIN_INCLUDE_NAMESPACE
 #include <private/qimage_p.h>
+QT_END_INCLUDE_NAMESPACE
 struct CachedImage
 {
     IDirectFBSurface *surface;
@@ -1246,4 +1250,7 @@ static void rasterFallbackWarn(const char *msg, const char *func, const device *
 }
 
 #endif // QT_DIRECTFB_WARN_ON_RASTERFALLBACKS
+
+QT_END_NAMESPACE
+
 #endif // QT_NO_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
index 51468ad..ff67d14 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 class QDirectFBPaintEnginePrivate;
@@ -107,6 +109,8 @@ public:
     static void initImageCache(int size);
 };
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // QPAINTENGINE_DIRECTFB_P_H
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 2e3d32d..e921d24 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -48,6 +48,8 @@
 #include <QtCore/qfile.h>
 #include <directfb.h>
 
+QT_BEGIN_NAMESPACE
+
 static int global_ser_no = 0;
 
 QDirectFBPixmapData::QDirectFBPixmapData(QDirectFBScreen *screen, PixelType pixelType)
@@ -574,3 +576,6 @@ void QDirectFBPixmapData::invalidate()
     imageFormat = QImage::Format_Invalid;
 }
 
+QT_END_NAMESPACE
+
+
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index 8bf1e73..fd59a93 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 class QDirectFBPaintEngine;
@@ -91,6 +93,8 @@ private:
     bool alpha;
 };
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // QDIRECTFBPIXMAP_H
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index fab18e4..069ec5a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -54,6 +54,8 @@
 #include <QtCore/qvector.h>
 #include <QtCore/qrect.h>
 
+QT_BEGIN_NAMESPACE
+
 class QDirectFBScreenPrivate : public QObject, public QWSGraphicsSystem
 {
     Q_OBJECT
@@ -94,8 +96,6 @@ public:
     QDirectFBScreen *q;
 };
 
-#include "qdirectfbscreen.moc"
-
 QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *qptr)
     : QWSGraphicsSystem(qptr), dfb(0), flipFlags(DSFLIP_NONE),
       directFBFlags(QDirectFBScreen::NoFlags), alphaPixmapFormat(QImage::Format_Invalid),
@@ -1562,3 +1562,8 @@ IDirectFBSurface *QDirectFBScreen::subSurfaceForWidget(const QWidget *widget, co
     return subSurface;
 }
 
+QT_END_NAMESPACE
+
+#include "qdirectfbscreen.moc"
+
+
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index df0eea4..3e27ed1 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 #if !defined QT_NO_DIRECTFB_LAYER && !defined QT_DIRECTFB_LAYER
@@ -269,6 +271,8 @@ inline bool QDirectFBScreen::hasAlphaChannel(IDirectFBSurface *surface)
     return QDirectFBScreen::hasAlphaChannel(format);
 }
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // QDIRECTFBSCREEN_H
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index a05ad21..421fbc2 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -48,6 +48,8 @@
 #include <qpaintdevice.h>
 #include <qvarlengtharray.h>
 
+QT_BEGIN_NAMESPACE
+
 QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen *scr)
     : QDirectFBPaintDevice(scr)
 #ifndef QT_NO_DIRECTFB_WM
@@ -449,3 +451,6 @@ void QDirectFBWindowSurface::updateFormat()
 {
     imageFormat = dfbSurface ? QDirectFBScreen::getImageFormat(dfbSurface) : QImage::Format_Invalid;
 }
+
+QT_END_NAMESPACE
+
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index a2861e5..771b7b5 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -56,6 +56,8 @@
 
 QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
+
 QT_MODULE(Gui)
 
 class QDirectFBWindowSurface : public QWSWindowSurface, public QDirectFBPaintDevice
@@ -110,6 +112,8 @@ private:
 #endif
 };
 
+QT_END_NAMESPACE
+
 QT_END_HEADER
 
 #endif // QDIRECFBWINDOWSURFACE_H