diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h index 7e54d9976b1527b1890f8970f976e38fd7e45ac7..a3bef2efbdc9aba8d64629d3d012e6c3de065a81 100644 --- a/src/activeqt/container/qaxbase.h +++ b/src/activeqt/container/qaxbase.h @@ -49,8 +49,6 @@ struct IUnknown; struct IDispatch; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -231,6 +229,4 @@ Q_DECLARE_METATYPE(IDispatch*) #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXBASE_H diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h index 4991c630339d35ad683ed34ea7d935c7b555daf8..f5da6ac451c4a33da8419fad952c52774538ee0b 100644 --- a/src/activeqt/container/qaxobject.h +++ b/src/activeqt/container/qaxobject.h @@ -43,8 +43,6 @@ #include <ActiveQt/qaxbase.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -97,6 +95,4 @@ Q_DECLARE_METATYPE(QAxObject*) #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXOBJECT_H diff --git a/src/activeqt/container/qaxscript.h b/src/activeqt/container/qaxscript.h index 285ca9c1aad973fada76ff0e69416bd1c7376e5f..6be44b4c0ed1f03eccc9164de9d738f4c4c71370 100644 --- a/src/activeqt/container/qaxscript.h +++ b/src/activeqt/container/qaxscript.h @@ -45,8 +45,6 @@ struct IActiveScript; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -242,6 +240,4 @@ inline void QAxScriptManager::addObject(QObject *object) QT_END_NAMESPACE #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXSCRIPT_H diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h index 68bef5bb9cdeaf554e507a0b57ec0e13a634a094..8feed381fb86b48aa702414fb1c3a3100dc356d9 100644 --- a/src/activeqt/container/qaxselect.h +++ b/src/activeqt/container/qaxselect.h @@ -42,8 +42,6 @@ #define QAXSELECT_H #include <QtWidgets/QDialog> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXSELECT_H diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h index 1002b103b7aec2167c397f02bbd583e3c81022c2..f7c9d0d40a4bc45789edd2c56b619ae7acc43fc3 100644 --- a/src/activeqt/container/qaxwidget.h +++ b/src/activeqt/container/qaxwidget.h @@ -44,8 +44,6 @@ #include <ActiveQt/qaxbase.h> #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -119,6 +117,4 @@ template <> inline QAxWidget *qobject_cast<QAxWidget*>(QObject *o) QT_END_NAMESPACE #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXWIDGET_H diff --git a/src/activeqt/control/qaxaggregated.h b/src/activeqt/control/qaxaggregated.h index a0e031f0eaeb29da1ecf184cc8de951d7029403f..f5749ee108edcf125a08c2a3e940f8f15657ee7b 100644 --- a/src/activeqt/control/qaxaggregated.h +++ b/src/activeqt/control/qaxaggregated.h @@ -45,8 +45,6 @@ struct IUnknown; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAXAGGREGATED_H diff --git a/src/activeqt/control/qaxbindable.h b/src/activeqt/control/qaxbindable.h index b1d659e4350e29fc8b677d6031244ec98ab0c543..b2512f496711ef0bbe9023cc0150dfb708ce5959 100644 --- a/src/activeqt/control/qaxbindable.h +++ b/src/activeqt/control/qaxbindable.h @@ -45,8 +45,6 @@ struct IUnknown; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -81,6 +79,4 @@ private: QT_END_NAMESPACE #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXBINDABLE_H diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 727d2588bb23211fc9dd665ef69140c6cb5734b1..6c9c49d4886ea1de1027aff3a0ab4e5e3c0a1801 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -50,8 +50,6 @@ struct IUnknown; struct IDispatch; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -307,6 +305,4 @@ Q_DECLARE_METATYPE(IDispatch*) #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXFACTORY_H diff --git a/src/activeqt/shared/qaxtypefunctions.h b/src/activeqt/shared/qaxtypefunctions.h index 7bd61c94ccb9395a6dd3587370051dc74209c0ba..03f215c452206ac385064306d111a572ab7ee44f 100644 --- a/src/activeqt/shared/qaxtypefunctions.h +++ b/src/activeqt/shared/qaxtypefunctions.h @@ -49,8 +49,6 @@ #include <QtCore/qdatetime.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -91,6 +89,4 @@ QT_END_NAMESPACE #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXTYPEFUNCTIONS_P_H diff --git a/src/activeqt/shared/qaxtypes.h b/src/activeqt/shared/qaxtypes.h index 692a50d5dcdc4b49825f693fecce2e8ae9307a31..528d31252635a622f15fed9b4eaace9f103966b4 100644 --- a/src/activeqt/shared/qaxtypes.h +++ b/src/activeqt/shared/qaxtypes.h @@ -43,8 +43,6 @@ #include "qaxtypefunctions.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_WIN_ACTIVEQT @@ -76,6 +74,4 @@ inline QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName QT_END_NAMESPACE #endif // QT_NO_WIN_ACTIVEQT -QT_END_HEADER - #endif // QAXTYPES_H