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

Remove QT_{BEGIN,END}_HEADER macro usage

Browse Source 
The macro was made empty in ba3dc5f3b5
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Id2bb2e2cabde059305d4af5f12593344ba30f001
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Sergio Ahumada 2013-01-26 21:42:12 +01:00 committed by The Qt Project
parent 5620f98dc8
commit 07e3bcdc10
645 changed files with 1 additions and 2503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/widgets/animation/sub-attaq/qanimationstate.h
View File

@ -50,8 +50,6 @@
# include "qabstractanimation.h"
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -86,6 +84,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QANIMATIONSTATE_H

2
src/concurrent/qtconcurrent_global.h
View File

@ -44,7 +44,6 @@
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE
#endif
QT_END_NAMESPACE
QT_END_HEADER
#endif // include guard

2
src/concurrent/qtconcurrentcompilertest.h
View File

@ -46,7 +46,6 @@
#ifndef QT_NO_CONCURRENT
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QtPrivate {
@ -64,7 +63,6 @@ public:
}
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentexception.h
View File

@ -48,7 +48,6 @@
#include <QtCore/qexception.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -65,7 +64,6 @@ typedef Q_DECL_DEPRECATED QUnhandledException UnhandledException;
} // namespace QtConcurrent
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_QFUTURE

2
src/concurrent/qtconcurrentfilter.h
View File

@ -49,7 +49,6 @@
#include <QtConcurrent/qtconcurrentfilterkernel.h>
#include <QtConcurrent/qtconcurrentfunctionwrappers.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -261,7 +260,6 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep)
#endif // Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentfilterkernel.h
View File

@ -50,7 +50,6 @@
#include <QtConcurrent/qtconcurrentmapkernel.h>
#include <QtConcurrent/qtconcurrentreducekernel.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -343,7 +342,6 @@ inline ThreadEngineStarter<ResultType> startFilteredReduced(Iterator begin, Iter
#endif // Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -47,7 +47,6 @@
#ifndef QT_NO_CONCURRENT
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -297,7 +296,6 @@ struct MapResultType<QStringList, U(C::*)() const>
#endif //Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentiteratekernel.h
View File

@ -52,7 +52,6 @@
#include <iterator>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -303,7 +302,6 @@ public:
#endif //Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentmap.h
View File

@ -51,7 +51,6 @@
#include <QtConcurrent/qtconcurrentfunctionwrappers.h>
#include <QtCore/qstringlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -312,7 +311,6 @@ typename QtPrivate::MapResultType<Iterator, MapFunctor>::ResultType blockingMapp
#endif // Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentmapkernel.h
View File

@ -49,7 +49,6 @@
#include <QtConcurrent/qtconcurrentiteratekernel.h>
#include <QtConcurrent/qtconcurrentreducekernel.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -265,7 +264,6 @@ inline ThreadEngineStarter<ResultType> startMappedReduced(Iterator begin, Iterat
#endif //Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentmedian.h
View File

@ -49,7 +49,6 @@
#include <QtCore/qvector.h>
#include <QtCore/qalgorithms.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -122,7 +121,6 @@ private:
#endif //Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentreducekernel.h
View File

@ -54,7 +54,6 @@
#include <QtCore/qthreadpool.h>
#include <QtCore/qvector.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -247,7 +246,6 @@ struct SequenceHolder2 : public Base
} // namespace QtConcurrent
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentrun.h
View File

@ -50,7 +50,6 @@
#include <QtConcurrent/qtconcurrentrunbase.h>
#include <QtConcurrent/qtconcurrentstoredfunctioncall.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -340,7 +339,6 @@ QFuture<T> run(const Class *object, T (Class::*fn)(Param1, Param2, Param3, Param
#endif // Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentrunbase.h
View File

@ -50,7 +50,6 @@
#include <QtCore/qrunnable.h>
#include <QtCore/qthreadpool.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -147,7 +146,6 @@ public:
#endif //Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentstoredfunctioncall.h
View File

@ -48,7 +48,6 @@
#ifndef QT_NO_CONCURRENT
#include <QtConcurrent/qtconcurrentrunbase.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -1305,7 +1304,6 @@ private:
#endif // Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

2
src/concurrent/qtconcurrentthreadengine.h
View File

@ -54,7 +54,6 @@
#include <QtCore/qatomic.h>
#include <QtCore/qsemaphore.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -273,7 +272,6 @@ inline ThreadEngineStarter<typename ThreadEngine::ResultType> startThreadEngine(
#endif //Q_QDOC
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_CONCURRENT

4
src/corelib/animation/qabstractanimation.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -177,6 +175,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTANIMATION_H

4
src/corelib/animation/qanimationgroup.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qabstractanimation.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -82,6 +80,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif //QANIMATIONGROUP_H

4
src/corelib/animation/qparallelanimationgroup.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qanimationgroup.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -80,6 +78,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QPARALLELANIMATIONGROUP

4
src/corelib/animation/qpauseanimation.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qanimationgroup.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -78,6 +76,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QPAUSEANIMATION_H

4
src/corelib/animation/qpropertyanimation.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qvariantanimation.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -83,6 +81,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QPROPERTYANIMATION_H

4
src/corelib/animation/qsequentialanimationgroup.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qanimationgroup.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -90,6 +88,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif //QSEQUENTIALANIMATIONGROUP_H

4
src/corelib/animation/qvariantanimation.h
View File

@ -48,8 +48,6 @@
#include <QtCore/qvariant.h>
#include <QtCore/qpair.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -124,6 +122,4 @@ void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to,
QT_END_NAMESPACE
QT_END_HEADER
#endif //QVARIANTANIMATION_H

4
src/corelib/arch/qatomic_alpha.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qoldbasicatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
@ -517,6 +515,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_ALPHA_H

6
src/corelib/arch/qatomic_armv5.h
View File

@ -45,15 +45,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -190,6 +186,4 @@ T QBasicAtomicOps<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveTy
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_ARMV5_H

6
src/corelib/arch/qatomic_armv6.h
View File

@ -45,15 +45,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -729,6 +725,4 @@ void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_ARMV6_H

2
src/corelib/arch/qatomic_armv7.h
View File

@ -54,11 +54,9 @@
#if 0
// silence syncqt warnings
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
QT_END_HEADER
#endif
#endif // QATOMIC_ARMV7_H

4
src/corelib/arch/qatomic_bfin.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qoldbasicatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE
@ -340,6 +338,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_BFIN_H

6
src/corelib/arch/qatomic_bootstrap.h
View File

@ -45,15 +45,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -98,6 +94,4 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> >
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_BOOTSTRAP_H

4
src/corelib/arch/qatomic_cxx11.h
View File

@ -45,14 +45,11 @@
#include <QtCore/qgenericatomic.h>
#include <atomic>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -247,6 +244,5 @@ template <typename T> struct QAtomicOps
#endif
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_CXX0X_H

5
src/corelib/arch/qatomic_gcc.h
View File

@ -44,14 +44,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -132,6 +129,4 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> >
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_GCC_H

6
src/corelib/arch/qatomic_ia64.h
View File

@ -45,15 +45,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -1089,6 +1085,4 @@ T QBasicAtomicOps<size>::fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiv
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_IA64_H

4
src/corelib/arch/qatomic_integrity.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qoldbasicatomic.h>
#include <INTEGRITY.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define qt_i2addr(a) reinterpret_cast<Address *>(const_cast<int *>(a))
@ -284,7 +282,5 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_INTEGRITY_H

6
src/corelib/arch/qatomic_mips.h
View File

@ -45,15 +45,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -362,6 +358,4 @@ T QBasicAtomicOps<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveTy
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_MIPS_H

5
src/corelib/arch/qatomic_msvc.h
View File

@ -214,14 +214,11 @@ extern "C" {
////////////////////////////////////////////////////////////////////////////////////////////////////
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -383,6 +380,4 @@ inline T *QAtomicOps<T *>::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd)
#undef QT_INTERLOCKED_EXCHANGE_ADD_POINTER
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_MSVC_H

4
src/corelib/arch/qatomic_power.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qoldbasicatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
@ -511,6 +509,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_POWER_H

4
src/corelib/arch/qatomic_s390.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qoldbasicatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
@ -423,6 +421,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_S390_H

4
src/corelib/arch/qatomic_sh4a.h
View File

@ -44,15 +44,11 @@
#include <QtCore/qoldbasicatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
QT_END_HEADER
#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
inline bool QBasicAtomicInt::isReferenceCountingNative()

4
src/corelib/arch/qatomic_sparc.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qoldbasicatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if defined(_LP64)
@ -522,6 +520,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_SPARC_H

5
src/corelib/arch/qatomic_unix.h
View File

@ -44,14 +44,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -112,6 +109,4 @@ struct QAtomicOps<T *> : QGenericAtomicOps<QAtomicOps<T *> >
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_UNIX_H

4
src/corelib/arch/qatomic_vxworks.h
View File

@ -42,8 +42,6 @@
#ifndef QATOMIC_VXWORKS_H
#define QATOMIC_VXWORKS_H
QT_BEGIN_HEADER
#if defined(__ppc)
# include <QtCore/qatomic_power.h>
#else // generic implementation with taskLock()
@ -320,6 +318,4 @@ QT_END_NAMESPACE
#endif // generic implementation with taskLock()
QT_END_HEADER
#endif // QATOMIC_VXWORKS_H

6
src/corelib/arch/qatomic_x86.h
View File

@ -45,15 +45,11 @@
#include <QtCore/qgenericatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if 0
// silence syncqt warnings
QT_END_NAMESPACE
QT_END_HEADER
#pragma qt_sync_stop_processing
#endif
@ -423,6 +419,4 @@ template <> struct QBasicAtomicOps<8>: QGenericAtomicOps<QBasicAtomicOps<8> >
QT_END_NAMESPACE
QT_END_HEADER
#endif // QATOMIC_X86_H

4
src/corelib/codecs/qtextcodec.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qstring.h>
#include <QtCore/qlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -166,6 +164,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QTEXTCODEC_H

4
src/corelib/global/qendian.h
View File

@ -52,8 +52,6 @@
#include <byteswap.h>
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -386,6 +384,4 @@ template <> inline qint8 qbswap<qint8>(qint8 source)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QENDIAN_H

4
src/corelib/global/qflags.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qtypeinfo.h>
#include <QtCore/qtypetraits.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QFlag
@ -152,6 +150,4 @@ typedef uint Flags;
QT_END_NAMESPACE
QT_END_HEADER
#endif // QFLAGS_H

6
src/corelib/global/qglobal.h
View File

@ -151,14 +151,10 @@ namespace QT_NAMESPACE {}
#endif /* __cplusplus */
#define QT_BEGIN_HEADER
#define QT_END_HEADER
#if defined(Q_OS_DARWIN) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
/*
@ -968,8 +964,6 @@ template <typename T> struct QEnableIf<true, T> { typedef T Type; };
}
QT_END_NAMESPACE
QT_END_HEADER
// Q_GLOBAL_STATIC
#include <QtCore/qglobalstatic.h>

3
src/corelib/global/qglobalstatic.h
View File

@ -46,7 +46,6 @@
#include <QtCore/qatomic.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QtGlobalStatic {
@ -139,6 +138,4 @@ struct QGlobalStatic
Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ())
QT_END_NAMESPACE
QT_END_HEADER
#endif // QGLOBALSTATIC_H

3
src/corelib/global/qisenum.h
View File

@ -62,9 +62,6 @@
#endif
// shut up syncqt
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
QT_END_HEADER
#endif // QISENUM_H

4
src/corelib/global/qlibraryinfo.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qstring.h>
#include <QtCore/qdatetime.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class Q_CORE_EXPORT QLibraryInfo
@ -103,6 +101,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QLIBRARYINFO_H

3
src/corelib/global/qlogging.h
View File

@ -49,7 +49,6 @@
#pragma qt_no_master_include
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
/*
@ -172,6 +171,4 @@ Q_CORE_EXPORT QtMessageHandler qInstallMessageHandler(QtMessageHandler);
Q_CORE_EXPORT void qSetMessagePattern(const QString &messagePattern);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QLOGGING_H

4
src/corelib/global/qnamespace.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -1603,6 +1601,4 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QNAMESPACE_H

4
src/corelib/global/qnumeric.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -65,6 +63,4 @@ Q_CORE_EXPORT double qInf();
QT_END_NAMESPACE
QT_END_HEADER
#endif // QNUMERIC_H

3
src/corelib/global/qsysinfo.h
View File

@ -44,7 +44,6 @@
#ifndef QSYSINFO_H
#define QSYSINFO_H
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
/*
@ -151,6 +150,4 @@ public:
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSYSINFO_H

3
src/corelib/global/qtypeinfo.h
View File

@ -44,7 +44,6 @@
#ifndef QTYPEINFO_H
#define QTYPEINFO_H
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
/*
@ -241,6 +240,4 @@ Q_DECLARE_TYPEINFO(long double, Q_PRIMITIVE_TYPE);
#endif
QT_END_NAMESPACE
QT_END_HEADER
#endif // QTYPEINFO_H

3
src/corelib/global/qtypetraits.h
View File

@ -109,7 +109,6 @@
#include <utility> // For pair
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace QtPrivate {
@ -505,6 +504,4 @@ Q_STATIC_ASSERT(( is_signed<qint64>::value));
} // namespace QtPrivate
QT_END_NAMESPACE
QT_END_HEADER
#endif // QTYPETRAITS_H

4
src/corelib/io/qbuffer.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qiodevice.h>
#include <QtCore/qbytearray.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -106,6 +104,4 @@ inline void QBuffer::setData(const char *adata, int alen)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QBUFFER_H

4
src/corelib/io/qdatastream.h
View File

@ -50,8 +50,6 @@
#error qdatastream.h must be included before any header file that defines Status
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -435,6 +433,4 @@ inline QDataStream& operator<<(QDataStream& s, const QPair<T1, T2>& p)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QDATASTREAM_H

4
src/corelib/io/qdebug.h
View File

@ -53,8 +53,6 @@
#include <QtCore/qset.h>
#include <QtCore/qcontiguouscache.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -291,6 +289,4 @@ inline QDebug operator<<(QDebug debug, const QFlags<T> &flags)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QDEBUG_H

4
src/corelib/io/qdir.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qshareddata.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -236,6 +234,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QDir &dir);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QDIR_H

4
src/corelib/io/qdiriterator.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qdir.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -91,6 +89,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDirIterator::IteratorFlags)
QT_END_NAMESPACE
QT_END_HEADER
#endif

4
src/corelib/io/qfile.h
View File

@ -50,8 +50,6 @@
#error qfile.h must be included before any header file that defines open
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QTemporaryFile;
@ -154,6 +152,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QFILE_H

4
src/corelib/io/qfiledevice.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qiodevice.h>
#include <QtCore/qstring.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QFileDevicePrivate;
@ -142,6 +140,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDevice::Permissions)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QFILEDEVICE_H

4
src/corelib/io/qfileinfo.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qshareddata.h>
#include <QtCore/qmetatype.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -159,6 +157,4 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QFileInfo)
QT_END_HEADER
#endif // QFILEINFO_H

4
src/corelib/io/qfilesystemwatcher.h
View File

@ -46,8 +46,6 @@
#ifndef QT_NO_FILESYSTEMWATCHER
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -90,7 +88,5 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_FILESYSTEMWATCHER
#endif // QFILESYSTEMWATCHER_H

4
src/corelib/io/qiodevice.h
View File

@ -54,8 +54,6 @@
#error qiodevice.h must be included before any header file that defines open
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -177,6 +175,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, QIODevice::OpenMode modes);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QIODEVICE_H

4
src/corelib/io/qprocess.h
View File

@ -46,8 +46,6 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qshareddata.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -261,6 +259,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QPROCESS_H

4
src/corelib/io/qresource.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -98,6 +96,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QRESOURCE_H

4
src/corelib/io/qsavefile.h
View File

@ -49,8 +49,6 @@
#error qsavefile.h must be included before any header file that defines open
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -89,6 +87,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSAVEFILE_H

4
src/corelib/io/qsettings.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qstring.h>
#include <QtCore/qscopedpointer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
@ -198,6 +196,4 @@ QT_END_NAMESPACE
#endif // QT_NO_SETTINGS
QT_END_HEADER
#endif // QSETTINGS_H

4
src/corelib/io/qstandardpaths.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qstringlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -102,6 +100,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSTANDARDPATHS_H

4
src/corelib/io/qtemporarydir.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qdir.h>
#include <QtCore/QScopedPointer>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -79,6 +77,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QTEMPORARYDIR_H

4
src/corelib/io/qtemporaryfile.h
View File

@ -49,8 +49,6 @@
#error qtemporaryfile.h must be included before any header file that defines open
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -105,6 +103,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QTEMPORARYFILE_H

4
src/corelib/io/qtextstream.h
View File

@ -54,8 +54,6 @@
#error qtextstream.h must be included before any header file that defines Status
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -285,6 +283,4 @@ inline QTextStreamManipulator qSetRealNumberPrecision(int precision)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QTEXTSTREAM_H

4
src/corelib/io/qurl.h
View File

@ -50,8 +50,6 @@
#include <QtCore/qpair.h>
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -384,6 +382,4 @@ QT_END_NAMESPACE
# include <QtCore/qurlquery.h>
#endif
QT_END_HEADER
#endif // QURL_H

4
src/corelib/io/qurlquery.h
View File

@ -50,8 +50,6 @@
#include <QtCore/qstringlist.h>
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QUrlQueryPrivate;
@ -173,6 +171,4 @@ inline QList<QByteArray> QUrl::allEncodedQueryItemValues(const QByteArray &key)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QURLQUERY_H

4
src/corelib/io/qwindowspipereader_p.h
View File

@ -60,8 +60,6 @@
#include <qt_windows.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -117,6 +115,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QWINDOWSPIPEREADER_P_H

4
src/corelib/io/qwindowspipewriter_p.h
View File

@ -59,8 +59,6 @@
#include <qwaitcondition.h>
#include <qt_windows.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -156,6 +154,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_PROCESS

4
src/corelib/io/qwinoverlappedionotifier_p.h
View File

@ -57,8 +57,6 @@
#include <qt_windows.h>
#include <qqueue.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QWinIoCompletionPort;
@ -112,6 +110,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QWINOVERLAPPEDIONOTIFIER_P_H

4
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qhash.h>
#include <QtCore/qvector.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -473,6 +471,4 @@ inline uint qHash(const QModelIndex &index)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTITEMMODEL_H

4
src/corelib/itemmodels/qabstractproxymodel.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qabstractitemmodel.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -116,6 +114,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTPROXYMODEL_H

4
src/corelib/itemmodels/qidentityproxymodel.h
View File

@ -47,8 +47,6 @@
#ifndef QT_NO_IDENTITYPROXYMODEL
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -113,8 +111,6 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_IDENTITYPROXYMODEL
#endif // QIDENTITYPROXYMODEL_H

4
src/corelib/itemmodels/qitemselectionmodel.h
View File

@ -47,8 +47,6 @@
#include <QtCore/qlist.h>
#include <QtCore/qabstractitemmodel.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -253,6 +251,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QITEMSELECTIONMODEL_H

4
src/corelib/itemmodels/qsortfilterproxymodel.h
View File

@ -48,8 +48,6 @@
#include <QtCore/qregexp.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -198,8 +196,6 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_SORTFILTERPROXYMODEL
#endif // QSORTFILTERPROXYMODEL_H

4
src/corelib/itemmodels/qstringlistmodel.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qstringlist.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -86,6 +84,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QSTRINGLISTMODEL_H

4
src/corelib/json/qjsonarray.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qjsonvalue.h>
#include <QtCore/qiterator.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDebug;
@ -219,6 +217,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonArray &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QJSONARRAY_H

4
src/corelib/json/qjsondocument.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qjsonvalue.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDebug;
@ -155,6 +153,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QJSONDOCUMENT_H

4
src/corelib/json/qjsonobject.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qjsonvalue.h>
#include <QtCore/qiterator.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDebug;
@ -214,6 +212,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonObject &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QJSONOBJECT_H

4
src/corelib/json/qjsonvalue.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qglobal.h>
#include <QtCore/qstring.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDebug;
@ -184,6 +182,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QJSONVALUE_H

4
src/corelib/kernel/qabstracteventdispatcher.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qobject.h>
#include <QtCore/qeventloop.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAbstractNativeEventFilter;
@ -129,6 +127,4 @@ protected:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTEVENTDISPATCHER_H

4
src/corelib/kernel/qabstractnativeeventfilter.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qnamespace.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAbstractNativeEventFilterPrivate;
@ -65,6 +63,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif /* QABSTRACTNATIVEEVENTFILTER_H */

4
src/corelib/kernel/qbasictimer.h
View File

@ -45,8 +45,6 @@
#include <QtCore/qglobal.h>
#include <QtCore/qnamespace.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -70,6 +68,4 @@ Q_DECLARE_TYPEINFO(QBasicTimer, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QBASICTIMER_H

4
src/corelib/kernel/qcoreapplication.h
View File

@ -50,8 +50,6 @@
typedef struct tagMSG MSG;
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -241,6 +239,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const MSG &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCOREAPPLICATION_H

4
src/corelib/kernel/qcoreevent.h
View File

@ -46,8 +46,6 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qobjectdefs.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -377,6 +375,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCOREEVENT_H

4
src/corelib/kernel/qeventloop.h
View File

@ -44,8 +44,6 @@
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -106,6 +104,4 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QEVENTLOOP_H

4
src/corelib/kernel/qeventloop_p.h
View File

@ -44,8 +44,6 @@
#include "qobject_p.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QEventLoopPrivate : public QObjectPrivate
@ -76,6 +74,4 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QEVENTLOOP_P_H

4
src/corelib/kernel/qfunctions_nacl.h
View File

@ -52,8 +52,6 @@
#define PTHREAD_CANCEL_ENABLE 2
#define PTHREAD_INHERIT_SCHED 3
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -89,8 +87,6 @@ int select(int nfds, fd_set * readfds, fd_set * writefds, fd_set * errorfds, str
QT_END_NAMESPACE
QT_END_HEADER
#endif //Q_OS_NACL
#endif //QFUNCTIONS_NACL_H

3
src/corelib/kernel/qfunctions_p.h
View File

@ -72,8 +72,5 @@
# define Q_STATIC_GLOBAL_INLINE_OPERATOR static inline
#endif
QT_BEGIN_HEADER
QT_END_HEADER
#endif

3
src/corelib/kernel/qfunctions_vxworks.h
View File

@ -103,15 +103,12 @@
# undef m_pkthdr
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifdef QT_BUILD_CORE_LIB
#endif
QT_END_NAMESPACE
QT_END_HEADER
#ifndef RTLD_LOCAL
#define RTLD_LOCAL 0

3
src/corelib/kernel/qfunctions_wince.h
View File

@ -56,15 +56,12 @@
#include <winsock.h>
#include <ceconfig.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifdef QT_BUILD_CORE_LIB
#endif
QT_END_NAMESPACE
QT_END_HEADER
// The standard SDK misses this define...
#define _control87 _controlfp

4
src/corelib/kernel/qmath.h
View File

@ -46,8 +46,6 @@
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@ -266,6 +264,4 @@ inline qreal qFastCos(qreal x)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMATH_H

Some files were not shown because too many files have changed in this diff Show More