From d93b2ef968f70fe2dd66f0879cc13ad4170e8553 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 22 Dec 2012 13:10:53 -0800 Subject: Mark all qtbase headers that aren't clean QtCore has a few headers that, though public, aren't meant to be included directly. Those are the atomic headers, the three _impl.h headers and qt_windows.h. QtGui includes two OpenGL headers that don't compile on their own. Other libraries should not have headers like that (but they do, something we need to fix eventually). Change-Id: I55e4eb057748f47df927ee618f9409acbc189cc1 Reviewed-by: Sean Harmer Reviewed-by: Gunnar Sletta Reviewed-by: Thiago Macieira --- src/corelib/arch/qatomic_alpha.h | 9 +++++++++ src/corelib/arch/qatomic_armv5.h | 1 + src/corelib/arch/qatomic_armv6.h | 1 + src/corelib/arch/qatomic_armv7.h | 3 +++ src/corelib/arch/qatomic_bfin.h | 9 +++++++++ src/corelib/arch/qatomic_bootstrap.h | 1 + src/corelib/arch/qatomic_cxx11.h | 1 + src/corelib/arch/qatomic_gcc.h | 1 + src/corelib/arch/qatomic_ia64.h | 1 + src/corelib/arch/qatomic_integrity.h | 9 +++++++++ src/corelib/arch/qatomic_mips.h | 1 + src/corelib/arch/qatomic_msvc.h | 1 + src/corelib/arch/qatomic_power.h | 9 +++++++++ src/corelib/arch/qatomic_s390.h | 9 +++++++++ src/corelib/arch/qatomic_sh4a.h | 5 +++++ src/corelib/arch/qatomic_sparc.h | 9 +++++++++ src/corelib/arch/qatomic_unix.h | 1 + src/corelib/arch/qatomic_vxworks.h | 9 +++++++++ src/corelib/arch/qatomic_x86.h | 1 + src/corelib/global/qt_windows.h | 5 +++++ src/corelib/kernel/qobject_impl.h | 5 +++++ src/corelib/kernel/qobjectdefs_impl.h | 5 +++++ src/corelib/thread/qgenericatomic.h | 1 + src/corelib/thread/qoldbasicatomic.h | 1 + src/corelib/tools/qsharedpointer_impl.h | 5 +++++ src/gui/opengl/qopengles2ext.h | 1 + src/gui/opengl/qopenglext.h | 1 + 27 files changed, 105 insertions(+) diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h index c5657de9a8..71cb112d47 100644 --- a/src/corelib/arch/qatomic_alpha.h +++ b/src/corelib/arch/qatomic_alpha.h @@ -46,6 +46,15 @@ QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index 92e2b02e5b..e0a50b3c24 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 877d32af8b..7f5939e391 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h index 70dc24f807..1929ae0ab3 100644 --- a/src/corelib/arch/qatomic_armv7.h +++ b/src/corelib/arch/qatomic_armv7.h @@ -57,6 +57,9 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing #endif #endif // QATOMIC_ARMV7_H diff --git a/src/corelib/arch/qatomic_bfin.h b/src/corelib/arch/qatomic_bfin.h index 9791d80818..79519308a4 100644 --- a/src/corelib/arch/qatomic_bfin.h +++ b/src/corelib/arch/qatomic_bfin.h @@ -46,6 +46,15 @@ QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/arch/qatomic_bootstrap.h index 810d9de722..160e0abdf3 100644 --- a/src/corelib/arch/qatomic_bootstrap.h +++ b/src/corelib/arch/qatomic_bootstrap.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h index d56e5823c8..3119edaf45 100644 --- a/src/corelib/arch/qatomic_cxx11.h +++ b/src/corelib/arch/qatomic_cxx11.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_gcc.h b/src/corelib/arch/qatomic_gcc.h index 38fd73ff15..bd296053e5 100644 --- a/src/corelib/arch/qatomic_gcc.h +++ b/src/corelib/arch/qatomic_gcc.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index f57b44bcfd..d4b187ffea 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_integrity.h b/src/corelib/arch/qatomic_integrity.h index 307d9d51a7..f8cfc8ce5b 100644 --- a/src/corelib/arch/qatomic_integrity.h +++ b/src/corelib/arch/qatomic_integrity.h @@ -47,6 +47,15 @@ QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define qt_i2addr(a) reinterpret_cast
(const_cast(a)) #define qt_p2addr(a) reinterpret_cast
(const_cast(a)) #define qt_addr(a) reinterpret_cast
(a) diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index 51e33bee35..7716750332 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index 3d55471cb7..4f91e3d9da 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -219,6 +219,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_power.h b/src/corelib/arch/qatomic_power.h index 1be2b770a8..ad1c619d56 100644 --- a/src/corelib/arch/qatomic_power.h +++ b/src/corelib/arch/qatomic_power.h @@ -46,6 +46,15 @@ QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() diff --git a/src/corelib/arch/qatomic_s390.h b/src/corelib/arch/qatomic_s390.h index 3e82110794..0469f44e5f 100644 --- a/src/corelib/arch/qatomic_s390.h +++ b/src/corelib/arch/qatomic_s390.h @@ -46,6 +46,15 @@ QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() diff --git a/src/corelib/arch/qatomic_sh4a.h b/src/corelib/arch/qatomic_sh4a.h index 75b9bed40b..08f75e44f2 100644 --- a/src/corelib/arch/qatomic_sh4a.h +++ b/src/corelib/arch/qatomic_sh4a.h @@ -49,6 +49,11 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() diff --git a/src/corelib/arch/qatomic_sparc.h b/src/corelib/arch/qatomic_sparc.h index 8508638d02..8aea33ce85 100644 --- a/src/corelib/arch/qatomic_sparc.h +++ b/src/corelib/arch/qatomic_sparc.h @@ -46,6 +46,15 @@ QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #if defined(_LP64) #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE diff --git a/src/corelib/arch/qatomic_unix.h b/src/corelib/arch/qatomic_unix.h index 3bf8fa82f1..03c7d2eee8 100644 --- a/src/corelib/arch/qatomic_unix.h +++ b/src/corelib/arch/qatomic_unix.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h index def5e24ff5..57e3b6a32b 100644 --- a/src/corelib/arch/qatomic_vxworks.h +++ b/src/corelib/arch/qatomic_vxworks.h @@ -67,6 +67,15 @@ inline int taskUnlock() { return 0; } QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() diff --git a/src/corelib/arch/qatomic_x86.h b/src/corelib/arch/qatomic_x86.h index 543b2e056c..f8180ad9d6 100644 --- a/src/corelib/arch/qatomic_x86.h +++ b/src/corelib/arch/qatomic_x86.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 26b55336ed..c3266c5487 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -42,6 +42,11 @@ #ifndef QT_WINDOWS_H #define QT_WINDOWS_H +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #if defined(Q_CC_BOR) // Borland's windows.h does not set these correctly, resulting in // unusable WinSDK standard dialogs diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index e6f924814d..0b5631f2a6 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -45,6 +45,11 @@ #error Do not include qobject_impl.h directly #endif +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index 2d2107f666..8d85175a17 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -45,6 +45,11 @@ #error Do not include qobjectdefs_impl.h directly #endif +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + QT_BEGIN_NAMESPACE diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index a8d626a43f..a0a851eabb 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index 220dade850..b755256ff7 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE +#pragma qt_sync_skip_header_check #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 3121bcdf40..5e30cf3ecb 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -45,6 +45,11 @@ #error Do not include qsharedpointer_impl.h directly #endif +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #if 0 // These macros are duplicated here to make syncqt not complain a about // this header, as we have a "qt_sync_stop_processing" below, which in turn diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h index 61bfb595cc..6213fab344 100644 --- a/src/gui/opengl/qopengles2ext.h +++ b/src/gui/opengl/qopengles2ext.h @@ -3,6 +3,7 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index 68025f3e5c..e65578caee 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -3,6 +3,7 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif -- cgit v1.2.3