diff options
Diffstat (limited to 'src/corelib/kernel')
29 files changed, 0 insertions, 113 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index c07c395a84..6f21cefa4e 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -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 diff --git a/src/corelib/kernel/qabstractnativeeventfilter.h b/src/corelib/kernel/qabstractnativeeventfilter.h index 09701a4923..9d1db2c19b 100644 --- a/src/corelib/kernel/qabstractnativeeventfilter.h +++ b/src/corelib/kernel/qabstractnativeeventfilter.h @@ -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 */ diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h index 4fdb00d633..432e4d58c8 100644 --- a/src/corelib/kernel/qbasictimer.h +++ b/src/corelib/kernel/qbasictimer.h @@ -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 diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 5333ea22f4..b235e327e0 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -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 diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index d35b5198a9..47a461d330 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -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 diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index d4141a05bc..926be08265 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -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 diff --git a/src/corelib/kernel/qeventloop_p.h b/src/corelib/kernel/qeventloop_p.h index 21a1dcda4c..8e2bfdb55e 100644 --- a/src/corelib/kernel/qeventloop_p.h +++ b/src/corelib/kernel/qeventloop_p.h @@ -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 diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h index 2cb9d16c95..bc44a21cb8 100644 --- a/src/corelib/kernel/qfunctions_nacl.h +++ b/src/corelib/kernel/qfunctions_nacl.h @@ -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 diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h index 57c6a8f295..6e094f1ed3 100644 --- a/src/corelib/kernel/qfunctions_p.h +++ b/src/corelib/kernel/qfunctions_p.h @@ -72,8 +72,5 @@ # define Q_STATIC_GLOBAL_INLINE_OPERATOR static inline #endif -QT_BEGIN_HEADER -QT_END_HEADER - #endif diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index 6776a6a721..d12a302c8d 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -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 diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index e20a4ceaca..4eeb9cff6a 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -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 diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h index 097200d690..ce49a91e93 100644 --- a/src/corelib/kernel/qmath.h +++ b/src/corelib/kernel/qmath.h @@ -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 diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 6d6b849d75..23fc89ffe3 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -45,8 +45,6 @@ #include <QtCore/qobjectdefs.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -274,6 +272,4 @@ Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QMETAOBJECT_H diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 3ffbfb8385..76cee612ce 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -56,8 +56,6 @@ #error qmetatype.h must be included before any header file that defines Bool #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -980,6 +978,4 @@ QT_END_NAMESPACE QT_FOR_EACH_STATIC_TYPE(Q_DECLARE_BUILTIN_METATYPE) -QT_END_HEADER - #endif // QMETATYPE_H diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h index 774a6e4986..84c73262b2 100644 --- a/src/corelib/kernel/qmimedata.h +++ b/src/corelib/kernel/qmimedata.h @@ -45,8 +45,6 @@ #include <QtCore/qvariant.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMIMEDATA_H diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 92392fe994..7d47c377da 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -56,8 +56,6 @@ #include <QtCore/qobject_impl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -508,8 +506,6 @@ namespace QtPrivate { QT_END_NAMESPACE -QT_END_HEADER - #endif #endif // QOBJECT_H diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index fbc523b8b7..49fa1897f7 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -45,8 +45,6 @@ #error Do not include qobject_impl.h directly #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -207,6 +205,4 @@ namespace QtPrivate { QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/kernel/qobjectcleanuphandler.h b/src/corelib/kernel/qobjectcleanuphandler.h index 96faabc173..1f053cc34b 100644 --- a/src/corelib/kernel/qobjectcleanuphandler.h +++ b/src/corelib/kernel/qobjectcleanuphandler.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QOBJECTCLEANUPHANDLER_H diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index a0617379d5..afbe1a5ece 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -46,8 +46,6 @@ #include <QtCore/qobjectdefs_impl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -483,6 +481,4 @@ inline const QMetaObject *QMetaObject::superClass() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QOBJECTDEFS_H diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index 68d8fdf961..2d2107f666 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -45,8 +45,6 @@ #error Do not include qobjectdefs_impl.h directly #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -601,6 +599,4 @@ namespace QtPrivate { QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index ebdeb156ba..e84900e3b1 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -46,8 +46,6 @@ #ifndef QT_NO_QOBJECT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVariant; @@ -194,8 +192,6 @@ qPointerFromVariant(const QVariant &variant) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QOBJECT #endif // QPOINTER_H diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index d87ba02ac9..6b44548f44 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -114,7 +112,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSHAREDMEMORY_H diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index f1f4428118..997e8e46de 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSignalMapperPrivate; @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSIGNALMAPPER_H diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index 97321521e4..8cc6b9c4c4 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSocketNotifierPrivate; @@ -84,6 +82,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSOCKETNOTIFIER_H diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/kernel/qsystemsemaphore.h index 52547f0c1f..b7dd220832 100644 --- a/src/corelib/kernel/qsystemsemaphore.h +++ b/src/corelib/kernel/qsystemsemaphore.h @@ -45,8 +45,6 @@ #include <QtCore/qstring.h> #include <QtCore/qscopedpointer.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -96,7 +94,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSYSTEMSEMAPHORE_H diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 9a90ecc772..34bfff9089 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -47,8 +47,6 @@ #include <QtCore/qbasictimer.h> // conceptual inheritance #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -114,8 +112,6 @@ inline void QTimer::setSingleShot(bool asingleShot) { single = asingleShot; } QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QOBJECT #endif // QTIMER_H diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 98c0b81c97..c3957aff3f 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -45,8 +45,6 @@ #include <QtCore/qobject.h> #include <QtCore/qbytearray.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTRANSLATOR_H diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 166a5cad6f..172ce29050 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -51,8 +51,6 @@ #include <QtCore/qstring.h> #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -622,6 +620,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant::Type); QT_END_NAMESPACE -QT_END_HEADER - #endif // QVARIANT_H diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index ca84054d71..56605d9aaa 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -47,8 +47,6 @@ #ifdef Q_OS_WIN #include "QtCore/qt_windows.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWinEventNotifierPrivate; @@ -83,8 +81,6 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // Q_OS_WIN #endif // QWINEVENTNOTIFIER_H |