From dea76f3496ee077e271b334c7e8101fed5119481 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 23 Sep 2011 15:01:04 +0200 Subject: Make qtbase build with Qt-in-namespace again Change-Id: I5faa8690a05d6ec352fc69c0b69848539f2ed216 Reviewed-on: http://codereview.qt-project.org/5460 Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/gui/image/qpixmap_qpa.cpp | 4 ++++ src/gui/kernel/qinputpanel.cpp | 4 ++++ src/gui/kernel/qopenglcontext.cpp | 3 +++ src/gui/kernel/qplatformopenglcontext_qpa.cpp | 4 ++++ src/gui/kernel/qplatformscreen_qpa.cpp | 4 ++++ src/gui/kernel/qplatformwindow_qpa.cpp | 4 ++++ src/gui/kernel/qstylehints.cpp | 4 ++++ src/gui/kernel/qsurface.cpp | 2 +- src/gui/kernel/qsurfaceformat.cpp | 4 ++++ src/gui/painting/qpagedpaintdevice.cpp | 4 ++++ src/gui/painting/qpdfwriter.cpp | 3 +++ src/gui/text/qcssparser_p.h | 2 ++ .../qgenericunixeventdispatcher.cpp | 5 ++++- .../qgenericunixeventdispatcher_p.h | 22 ++++++++++++++++++++++ .../ibus/qibusplatforminputcontext.cpp | 4 ++++ .../ibus/qibusplatforminputcontext.h | 4 ++++ .../platforminputcontexts/ibus/qibustypes.cpp | 3 +++ .../platforminputcontexts/ibus/qibustypes.h | 4 ++++ src/plugins/platforms/xcb/qxcbclipboard.cpp | 4 ++++ src/plugins/platforms/xcb/qxcbclipboard.h | 4 ++++ src/plugins/platforms/xcb/qxcbconnection.cpp | 4 ++++ src/plugins/platforms/xcb/qxcbconnection.h | 4 ++++ src/plugins/platforms/xcb/qxcbkeyboard.h | 4 ++++ src/plugins/platforms/xcb/qxcbmime.cpp | 4 ++++ src/plugins/platforms/xcb/qxcbmime.h | 4 ++++ src/plugins/platforms/xcb/qxcbnativeinterface.cpp | 4 ++++ src/plugins/platforms/xcb/qxcbnativeinterface.h | 4 ++++ src/plugins/platforms/xcb/qxcbscreen.h | 4 ++++ src/plugins/platforms/xcb/qxcbwindow.cpp | 4 ++++ src/plugins/platforms/xcb/qxcbwindow.h | 4 ++++ src/plugins/platforms/xcb/qxcbwmsupport.cpp | 3 +++ src/plugins/platforms/xcb/qxcbwmsupport.h | 3 +++ src/widgets/kernel/qdesktopwidget_qpa_p.h | 4 ++++ src/widgets/kernel/qplatformmenu_qpa.cpp | 3 +++ .../corelib/io/qdatastream/tst_qdatastream.cpp | 6 +++--- 35 files changed, 146 insertions(+), 5 deletions(-) diff --git a/src/gui/image/qpixmap_qpa.cpp b/src/gui/image/qpixmap_qpa.cpp index 9c69ddef7e..4fe162efd8 100644 --- a/src/gui/image/qpixmap_qpa.cpp +++ b/src/gui/image/qpixmap_qpa.cpp @@ -43,7 +43,11 @@ #include #include +QT_BEGIN_NAMESPACE + QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h) { return QGuiApplication::primaryScreen()->handle()->grabWindow(window, x, y, w, h); } + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp index 19c0d4a9ce..a024a823f3 100644 --- a/src/gui/kernel/qinputpanel.cpp +++ b/src/gui/kernel/qinputpanel.cpp @@ -42,6 +42,8 @@ #include #include +QT_BEGIN_NAMESPACE + QInputPanel::QInputPanel() : QObject(*new QInputPanelPrivate) { @@ -190,4 +192,6 @@ void QInputPanel::invokeAction(Action a, int cursorPosition) ic->invokeAction(a, cursorPosition); } +QT_END_NAMESPACE + #include "moc_qinputpanel.cpp" diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 5f68d2a711..2d7a62996c 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -54,6 +54,8 @@ #include +QT_BEGIN_NAMESPACE + class QGuiGLThreadContext { public: @@ -603,3 +605,4 @@ void QOpenGLMultiGroupSharedResource::cleanup(QOpenGLContext *ctx, QOpenGLShared m_groups.removeOne(group); } +QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext_qpa.cpp index 2957b4db4b..26920cc574 100644 --- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformopenglcontext_qpa.cpp @@ -41,6 +41,8 @@ #include "qplatformopenglcontext_qpa.h" +QT_BEGIN_NAMESPACE + /*! \class QPlatformOpenGLContext \since 4.8 @@ -109,3 +111,5 @@ void QPlatformOpenGLContext::setContext(QOpenGLContext *context) Q_D(QPlatformOpenGLContext); d->context = context; } + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp index e25e3f33d3..1a8e6d8f7c 100644 --- a/src/gui/kernel/qplatformscreen_qpa.cpp +++ b/src/gui/kernel/qplatformscreen_qpa.cpp @@ -46,6 +46,8 @@ #include #include +QT_BEGIN_NAMESPACE + class QPlatformScreenPrivate { public: @@ -219,3 +221,5 @@ QPlatformScreenPageFlipper *QPlatformScreen::pageFlipper() const { return 0; } + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index 0734fb7a26..f736f1d923 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow_qpa.cpp @@ -45,6 +45,8 @@ #include #include +QT_BEGIN_NAMESPACE + class QPlatformWindowPrivate { QWindow *window; @@ -273,3 +275,5 @@ bool QPlatformWindow::setMouseGrabEnabled(bool grab) \sa QWindowSurface, QWindow */ + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp index c917049a22..7585d23558 100644 --- a/src/gui/kernel/qstylehints.cpp +++ b/src/gui/kernel/qstylehints.cpp @@ -43,6 +43,8 @@ #include #include +QT_BEGIN_NAMESPACE + static inline QVariant hint(QPlatformIntegration::StyleHint h) { return QGuiApplicationPrivate::platformIntegration()->styleHint(h); @@ -78,3 +80,5 @@ int QStyleHints::cursorFlashTime() const { return hint(QPlatformIntegration::CursorFlashTime).toInt(); } + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp index 72d74a2307..871b765bfd 100644 --- a/src/gui/kernel/qsurface.cpp +++ b/src/gui/kernel/qsurface.cpp @@ -53,5 +53,5 @@ QSurface::SurfaceType QSurface::surfaceType() const return m_type; } -QT_BEGIN_NAMESPACE +QT_END_NAMESPACE diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index b3167fc126..1919e2d282 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -52,6 +52,8 @@ #undef minor #endif +QT_BEGIN_NAMESPACE + class QSurfaceFormatPrivate { public: @@ -464,3 +466,5 @@ QDebug operator<<(QDebug dbg, const QSurfaceFormat &f) return dbg.space(); } #endif + +QT_END_NAMESPACE diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp index e5b2c0716e..b17413b743 100644 --- a/src/gui/painting/qpagedpaintdevice.cpp +++ b/src/gui/painting/qpagedpaintdevice.cpp @@ -41,6 +41,8 @@ #include +QT_BEGIN_NAMESPACE + class QPagedPaintDevicePrivate { public: @@ -225,3 +227,5 @@ QPagedPaintDevice::Margins QPagedPaintDevice::margins() const { return d->margins; } + +QT_END_NAMESPACE diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index 9da5491d19..a0f8df2061 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -44,6 +44,7 @@ #include "private/qpdf_p.h" #include +QT_BEGIN_NAMESPACE class QPdfWriterPrivate : public QObjectPrivate { @@ -210,3 +211,5 @@ void QPdfWriter::setMargins(const Margins &m) d->engine->d_func()->topMargin = m.top*multiplier; d->engine->d_func()->bottomMargin = m.bottom*multiplier; } + +QT_END_NAMESPACE diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 4fa8bb0540..171085b800 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -63,7 +63,9 @@ #include #include +QT_BEGIN_NAMESPACE class QIcon; +QT_END_NAMESPACE #ifndef QT_NO_CSSPARSER diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp index 12981c5721..ba783c547a 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp @@ -42,7 +42,8 @@ #include "qgenericunixeventdispatcher_p.h" #include "qeventdispatcher_qpa_p.h" #include "qeventdispatcher_glib_p.h" -#include + +QT_BEGIN_NAMESPACE class QAbstractEventDispatcher *createUnixEventDispatcher() { @@ -53,3 +54,5 @@ class QAbstractEventDispatcher *createUnixEventDispatcher() #endif return new QEventDispatcherQPA(); } + +QT_END_NAMESPACE diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h index 0d9f5b7db0..e50f57d9a8 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h @@ -39,5 +39,27 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#ifndef QGENERICUNIXEVENTDISPATCHER_P_H +#define QGENERICUNIXEVENTDISPATCHER_P_H + +#include + +QT_BEGIN_NAMESPACE + class QAbstractEventDispatcher; QAbstractEventDispatcher* createUnixEventDispatcher(); + +QT_END_NAMESPACE + +#endif // QGENERICUNIXEVENTDISPATCHER_P_H diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index af8fd5a1f1..0d0e240b37 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -55,6 +55,8 @@ #include +QT_BEGIN_NAMESPACE + enum { debug = 0 }; class QIBusPlatformInputContextPrivate @@ -327,3 +329,5 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection() return new QDBusConnection(QDBusConnection::connectToBus(QString::fromLatin1(address), QLatin1String("QIBusProxy"))); } + +QT_END_NAMESPACE diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h index 84b578db16..6008fc31aa 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h @@ -43,6 +43,8 @@ #include +QT_BEGIN_NAMESPACE + class QIBusPlatformInputContextPrivate; class QDBusVariant; @@ -71,4 +73,6 @@ private: QIBusPlatformInputContextPrivate *d; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp index 8d8c61afb7..c6dcfb10b9 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp @@ -43,6 +43,8 @@ #include #include +QT_BEGIN_NAMESPACE + QIBusSerializable::QIBusSerializable() { } @@ -207,3 +209,4 @@ void QIBusText::fromDBusArgument(const QDBusArgument &arg) arg.endStructure(); } +QT_END_NAMESPACE diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h index c426ff7eda..6848149c8b 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.h +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h @@ -44,6 +44,8 @@ #include #include +QT_BEGIN_NAMESPACE + class QDBusArgument; class QIBusSerializable @@ -113,4 +115,6 @@ public: QIBusAttributeList attributes; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index fdf89cbda1..03ee054f59 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -54,6 +54,8 @@ #include #undef class +QT_BEGIN_NAMESPACE + class QXcbClipboardMime : public QXcbMime { Q_OBJECT @@ -847,4 +849,6 @@ QByteArray QXcbClipboard::getSelection(xcb_atom_t selection, xcb_atom_t target, return buf; } +QT_END_NAMESPACE + #include "qxcbclipboard.moc" diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index c3c4af66e8..3fd59964c1 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -47,6 +47,8 @@ #include #include +QT_BEGIN_NAMESPACE + class QXcbConnection; class QXcbScreen; class QXcbClipboardMime; @@ -105,4 +107,6 @@ private: }; +QT_END_NAMESPACE + #endif // QXCBCLIPBOARD_H diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 32919eed20..363a5625da 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -83,6 +83,8 @@ extern "C" { #include #endif +QT_BEGIN_NAMESPACE + QXcbConnection::QXcbConnection(const char *displayName) : m_displayName(displayName ? QByteArray(displayName) : qgetenv("DISPLAY")) #ifdef XCB_USE_DRI2 @@ -1070,3 +1072,5 @@ bool QXcbConnection::hasSupportForDri2() const return m_has_support_for_dri2; } #endif //XCB_USE_DRI2 + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 6d93093072..eb95326535 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -53,6 +53,8 @@ #define Q_XCB_DEBUG +QT_BEGIN_NAMESPACE + class QXcbScreen; class QXcbWindow; class QXcbDrag; @@ -429,4 +431,6 @@ cookie_t q_xcb_call_template(const cookie_t &cookie, QXcbConnection *connection, #define EGL_DISPLAY_FROM_XCB(object) ((EGLDisplay)(object->connection()->egl_display())) #endif //endifXCB_USE_DRI2 +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h index ea5f84e8c2..a4b6a28886 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -48,6 +48,8 @@ #include +QT_BEGIN_NAMESPACE + class QWindow; class QXcbKeyboard : public QXcbObject @@ -86,4 +88,6 @@ private: xcb_key_symbols_t *m_key_symbols; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforms/xcb/qxcbmime.cpp b/src/plugins/platforms/xcb/qxcbmime.cpp index 53b7d516a2..271d41ae75 100644 --- a/src/plugins/platforms/xcb/qxcbmime.cpp +++ b/src/plugins/platforms/xcb/qxcbmime.cpp @@ -52,6 +52,8 @@ #undef XCB_ATOM_PIXMAP #undef XCB_ATOM_BITMAP +QT_BEGIN_NAMESPACE + QXcbMime::QXcbMime() : QInternalMimeData() { } @@ -286,3 +288,5 @@ xcb_atom_t QXcbMime::mimeAtomForFormat(QXcbConnection *connection, const QString return 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbmime.h b/src/plugins/platforms/xcb/qxcbmime.h index 014222c2c4..ac032db442 100644 --- a/src/plugins/platforms/xcb/qxcbmime.h +++ b/src/plugins/platforms/xcb/qxcbmime.h @@ -49,6 +49,8 @@ #include "qxcbintegration.h" #include "qxcbconnection.h" +QT_BEGIN_NAMESPACE + class QXcbMime : public QInternalMimeData { Q_OBJECT public: @@ -65,4 +67,6 @@ public: const QList &atoms, QByteArray *requestedEncoding); }; +QT_END_NAMESPACE + #endif // QXCBMIME_H diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp index 3c9cdfd257..5e0af8d24d 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp @@ -57,6 +57,8 @@ #include "qdri2context.h" #endif +QT_BEGIN_NAMESPACE + class QXcbResourceMap : public QMap { public: @@ -202,3 +204,5 @@ void * QXcbNativeInterface::eglContextForContext(QOpenGLContext *context) return 0; #endif } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h index 8dec83267a..0902af03eb 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.h +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h @@ -44,6 +44,8 @@ #include +QT_BEGIN_NAMESPACE + class QWidget; class QXcbScreen; @@ -74,4 +76,6 @@ private: static QXcbScreen *qPlatformScreenForWindow(QWindow *window); }; +QT_END_NAMESPACE + #endif // QXCBNATIVEINTERFACE_H diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index 07d855b398..3c9bf0513c 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -49,6 +49,8 @@ #include "qxcbobject.h" +QT_BEGIN_NAMESPACE + class QXcbConnection; class QXcbCursor; @@ -91,4 +93,6 @@ private: QXcbCursor *m_cursor; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 4169ba5e4f..c5aee5c81d 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -104,6 +104,8 @@ //#ifdef NET_WM_STATE_DEBUG +QT_BEGIN_NAMESPACE + // Returns true if we should set WM_TRANSIENT_FOR on \a w static inline bool isTransient(const QWindow *w) { @@ -1393,3 +1395,5 @@ void QXcbWindow::setCursor(xcb_cursor_t cursor) xcb_change_window_attributes(xcb_connection(), m_window, XCB_CW_CURSOR, &cursor); xcb_flush(xcb_connection()); } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index e70686cba0..8bed8a2559 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -51,6 +51,8 @@ #include "qxcbobject.h" +QT_BEGIN_NAMESPACE + class QXcbScreen; class QXcbEGLSurface; @@ -160,4 +162,6 @@ private: QRegion m_exposeRegion; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.cpp b/src/plugins/platforms/xcb/qxcbwmsupport.cpp index 5fb67b6377..15e423e95b 100644 --- a/src/plugins/platforms/xcb/qxcbwmsupport.cpp +++ b/src/plugins/platforms/xcb/qxcbwmsupport.cpp @@ -44,6 +44,8 @@ #include +QT_BEGIN_NAMESPACE + QXcbWMSupport::QXcbWMSupport(QXcbConnection *c) : QXcbObject(c) { @@ -134,3 +136,4 @@ void QXcbWMSupport::updateVirtualRoots() qDebug() << "======== updateVirtualRoots"; } +QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.h b/src/plugins/platforms/xcb/qxcbwmsupport.h index 3b02ef3e7e..7b0a21f035 100644 --- a/src/plugins/platforms/xcb/qxcbwmsupport.h +++ b/src/plugins/platforms/xcb/qxcbwmsupport.h @@ -45,6 +45,8 @@ #include "qxcbconnection.h" #include +QT_BEGIN_NAMESPACE + class QXcbWMSupport : public QXcbObject { public: @@ -63,5 +65,6 @@ private: QVector net_virtual_roots; }; +QT_END_NAMESPACE #endif diff --git a/src/widgets/kernel/qdesktopwidget_qpa_p.h b/src/widgets/kernel/qdesktopwidget_qpa_p.h index ddae7f3853..01ba44875d 100644 --- a/src/widgets/kernel/qdesktopwidget_qpa_p.h +++ b/src/widgets/kernel/qdesktopwidget_qpa_p.h @@ -56,6 +56,8 @@ #include "QDesktopWidget" #include "private/qwidget_p.h" +QT_BEGIN_NAMESPACE + class QDesktopScreenWidget : public QWidget { Q_OBJECT public: @@ -78,4 +80,6 @@ public: QList screens; }; +QT_END_NAMESPACE + #endif // QDESKTOPWIDGET_QPA_P_H diff --git a/src/widgets/kernel/qplatformmenu_qpa.cpp b/src/widgets/kernel/qplatformmenu_qpa.cpp index 4921f91006..fd5cc78bf0 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.cpp +++ b/src/widgets/kernel/qplatformmenu_qpa.cpp @@ -41,6 +41,8 @@ #include "qplatformmenu_qpa.h" +QT_BEGIN_NAMESPACE + // // QPlatformMenuAction // @@ -90,3 +92,4 @@ void QPlatformMenuBar::handleReparent(QWidget *newParent) Q_UNUSED(newParent); } +QT_END_NAMESPACE diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index e5a80d9bf3..d34887f6e6 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -420,7 +420,7 @@ static const char* open_xpm[]={ // ************************************ -static QString QStringData(int index) +static QString stringData(int index) { switch (index) { case 0: return QString(); @@ -447,7 +447,7 @@ void tst_QDataStream::stream_QString() void tst_QDataStream::writeQString(QDataStream* s) { - QString test(QStringData(dataIndex(QTest::currentDataTag()))); + QString test(stringData(dataIndex(QTest::currentDataTag()))); *s << test; *s << QString("Her er det noe tekst"); *s << test; @@ -462,7 +462,7 @@ void tst_QDataStream::writeQString(QDataStream* s) void tst_QDataStream::readQString(QDataStream *s) { QString S; - QString test(QStringData(dataIndex(QTest::currentDataTag()))); + QString test(stringData(dataIndex(QTest::currentDataTag()))); *s >> S; QCOMPARE(S, test); -- cgit v1.2.3