AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use QT_{BEGIN,END}_INCLUDE_NAMESPACE needlessly

Browse Source 
these macros behave counter-intuitively, so don't use them unless the code
structure really suggests their use.

Change-Id: I58213b39f8a98e4368901217fac14ca49c28b8cf
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Oswald Buddenhagen 2012-09-03 16:56:48 +02:00 committed by Qt by Nokia
parent 6a3a234742
commit 7ed5f3b867
8 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qtimer.cpp
View File

@ -292,10 +292,6 @@ void QSingleShotTimer::timerEvent(QTimerEvent *)
qDeleteInEventHandler(this);
}
QT_BEGIN_INCLUDE_NAMESPACE
#include "qtimer.moc"
QT_END_INCLUDE_NAMESPACE
/*!
\reentrant
This static function calls a slot after a given time interval.
@ -416,3 +412,5 @@ int QTimer::remainingTime() const
*/
QT_END_NAMESPACE
#include "qtimer.moc"

6
src/gui/opengl/qopenglframebufferobject_p.h
View File

@ -53,15 +53,11 @@
// We mean it.
//
QT_BEGIN_NAMESPACE
QT_BEGIN_INCLUDE_NAMESPACE
#include <qopenglframebufferobject.h>
#include <private/qopenglcontext_p.h>
#include <private/qopenglextensions_p.h>
QT_END_INCLUDE_NAMESPACE
QT_BEGIN_NAMESPACE
#ifndef QT_OPENGL_ES
#define DEFAULT_FORMAT GL_RGBA8

5
src/opengl/qgl_p.h
View File

@ -66,6 +66,7 @@
#include "qglpaintdevice_p.h"
#include <QtGui/QOpenGLContext>
#include <QtOpenGL/private/qglextensions_p.h>
QT_BEGIN_NAMESPACE
@ -73,10 +74,6 @@ class QGLContext;
class QGLOverlayWidget;
class QPixmap;
QT_BEGIN_INCLUDE_NAMESPACE
#include <QtOpenGL/private/qglextensions_p.h>
QT_END_INCLUDE_NAMESPACE
class QGLFormatPrivate
{
public:

6
src/opengl/qglframebufferobject_p.h
View File

@ -53,15 +53,11 @@
// We mean it.
//
QT_BEGIN_NAMESPACE
QT_BEGIN_INCLUDE_NAMESPACE
#include <qglframebufferobject.h>
#include <private/qglpaintdevice_p.h>
#include <private/qgl_p.h>
QT_END_INCLUDE_NAMESPACE
QT_BEGIN_NAMESPACE
#ifndef QT_OPENGL_ES
#define DEFAULT_FORMAT GL_RGBA8

6
src/opengl/qglpixelbuffer_p.h
View File

@ -53,13 +53,11 @@
// We mean it.
//
QT_BEGIN_NAMESPACE
QT_BEGIN_INCLUDE_NAMESPACE
#include "QtOpenGL/qglpixelbuffer.h"
#include <private/qgl_p.h>
#include <private/qglpaintdevice_p.h>
QT_END_INCLUDE_NAMESPACE
QT_BEGIN_NAMESPACE
class QEglContext;

5
src/widgets/dialogs/qinputdialog.cpp
View File

@ -158,10 +158,6 @@ private:
}
};
QT_BEGIN_INCLUDE_NAMESPACE
#include "qinputdialog.moc"
QT_END_INCLUDE_NAMESPACE
class QInputDialogPrivate : public QDialogPrivate
{
Q_DECLARE_PUBLIC(QInputDialog)
@ -1395,6 +1391,7 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri
QT_END_NAMESPACE
#include "qinputdialog.moc"
#include "moc_qinputdialog.cpp"
#endif // QT_NO_INPUTDIALOG

5
src/widgets/kernel/qlayout.h
View File

@ -165,14 +165,11 @@ private:
};
QT_END_NAMESPACE
//### support old includes
QT_BEGIN_INCLUDE_NAMESPACE
#include <QtWidgets/qboxlayout.h>
#include <QtWidgets/qgridlayout.h>
QT_END_INCLUDE_NAMESPACE
QT_END_NAMESPACE
QT_END_HEADER

6
src/widgets/styles/qstylefactory.cpp
View File

@ -70,14 +70,12 @@
#include "qwindowsmobilestyle.h"
#endif
QT_BEGIN_NAMESPACE
#if !defined(QT_NO_STYLE_MAC) && defined(Q_OS_MAC)
QT_BEGIN_INCLUDE_NAMESPACE
# include "qmacstyle_mac.h"
QT_END_INCLUDE_NAMESPACE
#endif
QT_BEGIN_NAMESPACE
#ifndef QT_NO_LIBRARY
Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
(QStyleFactoryInterface_iid, QLatin1String("/styles"), Qt::CaseInsensitive))