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

Remove left-overs of QT_{BEGIN,END}_HEADERS

Browse Source 
This macro is useless from Qt 5.1 on, so:

 - Remove comment about using QT_BEGIN_NAMESPACE after QT_BEGIN_HEADER
 - There is no need to blacklist these in qt-cpp-ignore.qdocconf

Change-Id: I2c3ceb3d77d294a606b87f7486071a2350b3d42f
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sergio Ahumada 2013-01-30 20:06:45 +01:00 committed by The Qt Project
parent 3260aec38e
commit 1e33f30f75
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/global/qt-cpp-ignore.qdocconf
View File

@ -75,12 +75,10 @@ Cpp.ignoretokens += \
QM_EXPORT_XML \ QM_EXPORT_XML \
QT_ASCII_CAST_WARN \ QT_ASCII_CAST_WARN \
QT_ASCII_CAST_WARN_CONSTRUCTOR \ QT_ASCII_CAST_WARN_CONSTRUCTOR \
QT_BEGIN_HEADER \
QT_BEGIN_INCLUDE_NAMESPACE \ QT_BEGIN_INCLUDE_NAMESPACE \
QT_BEGIN_NAMESPACE \ QT_BEGIN_NAMESPACE \
QT_BOOTSTRAPPED \ QT_BOOTSTRAPPED \
QT_DESIGNER_STATIC \ QT_DESIGNER_STATIC \
QT_END_HEADER \
QT_END_INCLUDE_NAMESPACE \ QT_END_INCLUDE_NAMESPACE \
QT_END_NAMESPACE \ QT_END_NAMESPACE \
QT_FASTCALL \ QT_FASTCALL \

3
src/corelib/global/qglobal.cpp
View File

@ -2792,8 +2792,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
As a rule of thumb, \c QT_BEGIN_NAMESPACE should appear in all Qt header As a rule of thumb, \c QT_BEGIN_NAMESPACE should appear in all Qt header
and Qt source files after the last \c{#include} line and before the first and Qt source files after the last \c{#include} line and before the first
declaration. In Qt headers using \c QT_BEGIN_HEADER, \c QT_BEGIN_NAMESPACE declaration.
follows \c QT_BEGIN_HEADER immediately.
If that rule can't be followed because, e.g., \c{#include} lines and If that rule can't be followed because, e.g., \c{#include} lines and
declarations are wildly mixed, place \c QT_BEGIN_NAMESPACE before declarations are wildly mixed, place \c QT_BEGIN_NAMESPACE before

2
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
View File

@ -19,9 +19,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \
QM_EXPORT_XML \ QM_EXPORT_XML \
QT_ASCII_CAST_WARN \ QT_ASCII_CAST_WARN \
QT_ASCII_CAST_WARN_CONSTRUCTOR \ QT_ASCII_CAST_WARN_CONSTRUCTOR \
QT_BEGIN_HEADER \
QT_DESIGNER_STATIC \ QT_DESIGNER_STATIC \
QT_END_HEADER \
QT_FASTCALL \ QT_FASTCALL \
QT_WIDGET_PLUGIN_EXPORT \ QT_WIDGET_PLUGIN_EXPORT \
Q_COMPAT_EXPORT \ Q_COMPAT_EXPORT \