diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-27 00:34:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 20:32:34 +0100 |
| commit | a5d94eb2207d5134343a05f830b6ff062553205f (patch) | |
| tree | 0bc96b54387729c153043500ba6f29d202b6f263 | |
| parent | c31e5dfc55ce6f6f2761076881c90d57c4b99b70 (diff) | |
Remove QT_{BEGIN,END}_HEADER macro usage
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Ifbece10f535a54baf4230ffcbc11ce0c1972d740
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| -rw-r--r-- | src/activeqt/container/qaxbase.h | 4 | ||||
| -rw-r--r-- | src/activeqt/container/qaxobject.h | 4 | ||||
| -rw-r--r-- | src/activeqt/container/qaxscript.h | 4 | ||||
| -rw-r--r-- | src/activeqt/container/qaxselect.h | 4 | ||||
| -rw-r--r-- | src/activeqt/container/qaxwidget.h | 4 | ||||
| -rw-r--r-- | src/activeqt/control/qaxaggregated.h | 4 | ||||
| -rw-r--r-- | src/activeqt/control/qaxbindable.h | 4 | ||||
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 4 | ||||
| -rw-r--r-- | src/activeqt/shared/qaxtypefunctions.h | 4 | ||||
| -rw-r--r-- | src/activeqt/shared/qaxtypes.h | 4 |
10 files changed, 0 insertions, 40 deletions
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h index 7e54d99..a3bef2e 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 4991c63..f5da6ac 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 285ca9c..6be44b4 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 68bef5b..8feed38 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 1002b10..f7c9d0d 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 a0e031f..f5749ee 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 b1d659e..b2512f4 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 727d258..6c9c49d 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 7bd61c9..03f215c 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 692a50d..528d312 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 |