From 6afde37f3e3dfe707dcaf81994d34e94f74d9537 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 27 Jan 2013 09:50:37 +0100 Subject: Remove QT_{BEGIN,END}_HEADER macro usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Change-Id: I208ae87694deeb4edc73bb1a4be314c30861910f Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Reviewed-by: Jędrzej Nowacki --- src/assistant/clucene/qclucene_global_p.h | 4 ---- src/assistant/help/qhelp_global.h | 4 ---- src/assistant/help/qhelpcontentwidget.h | 4 ---- src/assistant/help/qhelpdatainterface_p.h | 4 ---- src/assistant/help/qhelpengine.h | 4 ---- src/assistant/help/qhelpenginecore.h | 4 ---- src/assistant/help/qhelpgenerator_p.h | 4 ---- src/assistant/help/qhelpindexwidget.h | 4 ---- src/assistant/help/qhelpprojectdata_p.h | 4 ---- src/assistant/help/qhelpsearchengine.h | 4 ---- src/assistant/help/qhelpsearchquerywidget.h | 4 ---- src/assistant/help/qhelpsearchresultwidget.h | 4 ---- src/designer/src/lib/components/qdesigner_components.h | 4 ---- src/designer/src/lib/components/qdesigner_components_global.h | 4 ---- src/designer/src/lib/extension/default_extensionfactory.h | 4 ---- src/designer/src/lib/extension/extension.h | 4 ---- src/designer/src/lib/extension/extension_global.h | 2 -- src/designer/src/lib/extension/qextensionmanager.h | 4 ---- src/designer/src/lib/sdk/abstractactioneditor.h | 4 ---- src/designer/src/lib/sdk/abstractdialoggui_p.h | 4 ---- src/designer/src/lib/sdk/abstractdnditem.h | 4 ---- src/designer/src/lib/sdk/abstractformeditor.h | 4 ---- src/designer/src/lib/sdk/abstractformeditorplugin.h | 4 ---- src/designer/src/lib/sdk/abstractformwindow.h | 4 ---- src/designer/src/lib/sdk/abstractformwindowcursor.h | 4 ---- src/designer/src/lib/sdk/abstractformwindowmanager.h | 4 ---- src/designer/src/lib/sdk/abstractformwindowtool.h | 4 ---- src/designer/src/lib/sdk/abstractintegration.h | 4 ---- src/designer/src/lib/sdk/abstractintrospection_p.h | 4 ---- src/designer/src/lib/sdk/abstractlanguage.h | 4 ---- src/designer/src/lib/sdk/abstractmetadatabase.h | 4 ---- src/designer/src/lib/sdk/abstractnewformwidget.h | 4 ---- src/designer/src/lib/sdk/abstractobjectinspector.h | 4 ---- src/designer/src/lib/sdk/abstractoptionspage.h | 4 ---- src/designer/src/lib/sdk/abstractpromotioninterface.h | 4 ---- src/designer/src/lib/sdk/abstractpropertyeditor.h | 4 ---- src/designer/src/lib/sdk/abstractresourcebrowser.h | 4 ---- src/designer/src/lib/sdk/abstractsettings.h | 4 ---- src/designer/src/lib/sdk/abstractwidgetbox.h | 4 ---- src/designer/src/lib/sdk/abstractwidgetdatabase.h | 4 ---- src/designer/src/lib/sdk/abstractwidgetfactory.h | 4 ---- src/designer/src/lib/sdk/dynamicpropertysheet.h | 4 ---- src/designer/src/lib/sdk/extrainfo.h | 4 ---- src/designer/src/lib/sdk/layoutdecoration.h | 4 ---- src/designer/src/lib/sdk/membersheet.h | 4 ---- src/designer/src/lib/sdk/propertysheet.h | 4 ---- src/designer/src/lib/sdk/sdk_global.h | 2 -- src/designer/src/lib/sdk/taskmenu.h | 4 ---- src/designer/src/lib/uilib/abstractformbuilder.h | 4 ---- src/designer/src/lib/uilib/container.h | 4 ---- src/designer/src/lib/uilib/customwidget.h | 4 ---- src/designer/src/lib/uilib/extension.h | 4 ---- src/designer/src/lib/uilib/formbuilder.h | 4 ---- src/designer/src/lib/uilib/qdesignerexportwidget.h | 4 ---- src/designer/src/lib/uilib/uilib_global.h | 2 -- src/designer/src/uitools/quiloader.h | 4 ---- src/designer/src/uitools/quiloader_p.h | 4 ---- 57 files changed, 222 deletions(-) diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h index 738e9672d..6d8e8197c 100644 --- a/src/assistant/clucene/qclucene_global_p.h +++ b/src/assistant/clucene/qclucene_global_p.h @@ -44,8 +44,6 @@ # include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifdef QT_STATIC @@ -130,6 +128,4 @@ using namespace QtCLuceneHelpers; QT_END_NAMESPACE -QT_END_HEADER - #endif // QCLUCENE_GLOBAL_P_H diff --git a/src/assistant/help/qhelp_global.h b/src/assistant/help/qhelp_global.h index 409d49b9d..23adc25db 100644 --- a/src/assistant/help/qhelp_global.h +++ b/src/assistant/help/qhelp_global.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELP_GLOBAL_H diff --git a/src/assistant/help/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h index f10cb35f2..ba5c1789e 100644 --- a/src/assistant/help/qhelpcontentwidget.h +++ b/src/assistant/help/qhelpcontentwidget.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,7 +137,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/assistant/help/qhelpdatainterface_p.h b/src/assistant/help/qhelpdatainterface_p.h index 3b4e3ac84..ebb2bc172 100644 --- a/src/assistant/help/qhelpdatainterface_p.h +++ b/src/assistant/help/qhelpdatainterface_p.h @@ -58,8 +58,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QHELP_EXPORT QHelpDataContentItem @@ -150,6 +148,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELPDATAINTERFACE_H diff --git a/src/assistant/help/qhelpengine.h b/src/assistant/help/qhelpengine.h index 45bdec090..1a7ffb539 100644 --- a/src/assistant/help/qhelpengine.h +++ b/src/assistant/help/qhelpengine.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h index e17ae880c..76a384fb2 100644 --- a/src/assistant/help/qhelpenginecore.h +++ b/src/assistant/help/qhelpenginecore.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -130,6 +128,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELPENGINECORE_H diff --git a/src/assistant/help/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h index 3c447e898..49de20c1a 100644 --- a/src/assistant/help/qhelpgenerator_p.h +++ b/src/assistant/help/qhelpgenerator_p.h @@ -58,8 +58,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QHelpGeneratorPrivate; @@ -113,6 +111,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/assistant/help/qhelpindexwidget.h b/src/assistant/help/qhelpindexwidget.h index f852f44ed..fb043c503 100644 --- a/src/assistant/help/qhelpindexwidget.h +++ b/src/assistant/help/qhelpindexwidget.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -108,6 +106,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/assistant/help/qhelpprojectdata_p.h b/src/assistant/help/qhelpprojectdata_p.h index 198bac8fc..97db84c9a 100644 --- a/src/assistant/help/qhelpprojectdata_p.h +++ b/src/assistant/help/qhelpprojectdata_p.h @@ -56,8 +56,6 @@ #include "qhelp_global.h" #include "qhelpdatainterface_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QHelpProjectDataPrivate; @@ -84,6 +82,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/assistant/help/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h index 5312ff25a..697987151 100644 --- a/src/assistant/help/qhelpsearchengine.h +++ b/src/assistant/help/qhelpsearchengine.h @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -119,6 +117,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELPSEARCHENGINE_H diff --git a/src/assistant/help/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h index b55961c23..f72e2ae39 100644 --- a/src/assistant/help/qhelpsearchquerywidget.h +++ b/src/assistant/help/qhelpsearchquerywidget.h @@ -51,8 +51,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELPSEARCHQUERYWIDGET_H diff --git a/src/assistant/help/qhelpsearchresultwidget.h b/src/assistant/help/qhelpsearchresultwidget.h index a8af7f04d..13f8ac201 100644 --- a/src/assistant/help/qhelpsearchresultwidget.h +++ b/src/assistant/help/qhelpsearchresultwidget.h @@ -51,8 +51,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELPSEARCHRESULTWIDGET_H diff --git a/src/designer/src/lib/components/qdesigner_components.h b/src/designer/src/lib/components/qdesigner_components.h index f27a49b37..e5c168292 100644 --- a/src/designer/src/lib/components/qdesigner_components.h +++ b/src/designer/src/lib/components/qdesigner_components.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; @@ -77,6 +75,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESIGNER_COMPONENTS_H diff --git a/src/designer/src/lib/components/qdesigner_components_global.h b/src/designer/src/lib/components/qdesigner_components_global.h index 1a7701fdb..98b289a85 100644 --- a/src/designer/src/lib/components/qdesigner_components_global.h +++ b/src/designer/src/lib/components/qdesigner_components_global.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define QDESIGNER_COMPONENTS_EXTERN Q_DECL_EXPORT @@ -61,6 +59,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESIGNER_COMPONENTS_GLOBAL_H diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h index 685444700..c9ae32397 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.h +++ b/src/designer/src/lib/extension/default_extensionfactory.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QExtensionManager; @@ -81,6 +79,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DEFAULT_EXTENSIONFACTORY_H diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h index 75fd12937..7f0685588 100644 --- a/src/designer/src/lib/extension/extension.h +++ b/src/designer/src/lib/extension/extension.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define Q_TYPEID(IFace) QLatin1String(IFace##_iid) @@ -104,6 +102,4 @@ template <> inline IFace *qt_extension(QAbstractExtensionManager *manag QT_END_NAMESPACE -QT_END_HEADER - #endif // EXTENSION_H diff --git a/src/designer/src/lib/extension/extension_global.h b/src/designer/src/lib/extension/extension_global.h index f1c9adf8c..1ea217e5f 100644 --- a/src/designer/src/lib/extension/extension_global.h +++ b/src/designer/src/lib/extension/extension_global.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_EXTENSION_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // EXTENSION_GLOBAL_H diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h index aaf413fec..e220cee46 100644 --- a/src/designer/src/lib/extension/qextensionmanager.h +++ b/src/designer/src/lib/extension/qextensionmanager.h @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; // Fool syncqt @@ -74,6 +72,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QEXTENSIONMANAGER_H diff --git a/src/designer/src/lib/sdk/abstractactioneditor.h b/src/designer/src/lib/sdk/abstractactioneditor.h index a1e124283..5ab553244 100644 --- a/src/designer/src/lib/sdk/abstractactioneditor.h +++ b/src/designer/src/lib/sdk/abstractactioneditor.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -71,6 +69,4 @@ public Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTACTIONEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractdialoggui_p.h b/src/designer/src/lib/sdk/abstractdialoggui_p.h index 9b533b3bf..635646456 100644 --- a/src/designer/src/lib/sdk/abstractdialoggui_p.h +++ b/src/designer/src/lib/sdk/abstractdialoggui_p.h @@ -57,8 +57,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -102,6 +100,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTDIALOGGUI_H diff --git a/src/designer/src/lib/sdk/abstractdnditem.h b/src/designer/src/lib/sdk/abstractdnditem.h index d43f13a1c..342f58468 100644 --- a/src/designer/src/lib/sdk/abstractdnditem.h +++ b/src/designer/src/lib/sdk/abstractdnditem.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DomUI; @@ -70,6 +68,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTDNDITEM_H diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h index 1ced0611f..1e7ae1d5b 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.h +++ b/src/designer/src/lib/sdk/abstractformeditor.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerWidgetBoxInterface; @@ -141,6 +139,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractformeditorplugin.h b/src/designer/src/lib/sdk/abstractformeditorplugin.h index 57dbba0c2..54d007162 100644 --- a/src/designer/src/lib/sdk/abstractformeditorplugin.h +++ b/src/designer/src/lib/sdk/abstractformeditorplugin.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -68,6 +66,4 @@ Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "org.qt-project.Qt.Desig QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMEDITORPLUGIN_H diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h index d7667d5fc..b38d2ca41 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.h +++ b/src/designer/src/lib/sdk/abstractformwindow.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -196,6 +194,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOW_H diff --git a/src/designer/src/lib/sdk/abstractformwindowcursor.h b/src/designer/src/lib/sdk/abstractformwindowcursor.h index a03149c35..707f65751 100644 --- a/src/designer/src/lib/sdk/abstractformwindowcursor.h +++ b/src/designer/src/lib/sdk/abstractformwindowcursor.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; @@ -104,6 +102,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOWCURSOR_H diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h index 9f16ded6f..e70ebdd54 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.h +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -157,6 +155,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOWMANAGER_H diff --git a/src/designer/src/lib/sdk/abstractformwindowtool.h b/src/designer/src/lib/sdk/abstractformwindowtool.h index 74e1f7afb..28ed11d16 100644 --- a/src/designer/src/lib/sdk/abstractformwindowtool.h +++ b/src/designer/src/lib/sdk/abstractformwindowtool.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -80,6 +78,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOWTOOL_H diff --git a/src/designer/src/lib/sdk/abstractintegration.h b/src/designer/src/lib/sdk/abstractintegration.h index e15f0df15..d28f61f32 100644 --- a/src/designer/src/lib/sdk/abstractintegration.h +++ b/src/designer/src/lib/sdk/abstractintegration.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; @@ -189,6 +187,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTINTEGRATION_H diff --git a/src/designer/src/lib/sdk/abstractintrospection_p.h b/src/designer/src/lib/sdk/abstractintrospection_p.h index 12dbdc461..327e40d73 100644 --- a/src/designer/src/lib/sdk/abstractintrospection_p.h +++ b/src/designer/src/lib/sdk/abstractintrospection_p.h @@ -57,8 +57,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDESIGNER_SDK_EXPORT QDesignerMetaEnumInterface @@ -169,6 +167,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTMETAOBJECT_H diff --git a/src/designer/src/lib/sdk/abstractlanguage.h b/src/designer/src/lib/sdk/abstractlanguage.h index 1d20b8c89..11c56c3d1 100644 --- a/src/designer/src/lib/sdk/abstractlanguage.h +++ b/src/designer/src/lib/sdk/abstractlanguage.h @@ -55,8 +55,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDialog; @@ -103,6 +101,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerLanguageExtension, "org.qt-project.Qt.Des QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESIGNER_ABTRACT_LANGUAGE_H diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h index bd97bde93..80aae6bf3 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.h +++ b/src/designer/src/lib/sdk/abstractmetadatabase.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QCursor; @@ -94,6 +92,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTMETADATABASE_H diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.h b/src/designer/src/lib/sdk/abstractnewformwidget.h index c40f99696..b1295851b 100644 --- a/src/designer/src/lib/sdk/abstractnewformwidget.h +++ b/src/designer/src/lib/sdk/abstractnewformwidget.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -72,6 +70,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTNEWFORMWIDGET_H diff --git a/src/designer/src/lib/sdk/abstractobjectinspector.h b/src/designer/src/lib/sdk/abstractobjectinspector.h index 4462c5834..d461c6116 100644 --- a/src/designer/src/lib/sdk/abstractobjectinspector.h +++ b/src/designer/src/lib/sdk/abstractobjectinspector.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -68,6 +66,4 @@ public Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTOBJECTINSPECTOR_H diff --git a/src/designer/src/lib/sdk/abstractoptionspage.h b/src/designer/src/lib/sdk/abstractoptionspage.h index e98e5b012..2e3aecea6 100644 --- a/src/designer/src/lib/sdk/abstractoptionspage.h +++ b/src/designer/src/lib/sdk/abstractoptionspage.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; @@ -63,6 +61,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTOPTIONSPAGE_P_H diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.h b/src/designer/src/lib/sdk/abstractpromotioninterface.h index 3d1eb716a..dd8510071 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.h +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerWidgetDataBaseItemInterface; @@ -86,6 +84,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTPROMOTIONINTERFACE_H diff --git a/src/designer/src/lib/sdk/abstractpropertyeditor.h b/src/designer/src/lib/sdk/abstractpropertyeditor.h index 87dc43a45..39a6ad2b3 100644 --- a/src/designer/src/lib/sdk/abstractpropertyeditor.h +++ b/src/designer/src/lib/sdk/abstractpropertyeditor.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -79,6 +77,4 @@ public Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTPROPERTYEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractresourcebrowser.h b/src/designer/src/lib/sdk/abstractresourcebrowser.h index 317781828..d369a8cbd 100644 --- a/src/designer/src/lib/sdk/abstractresourcebrowser.h +++ b/src/designer/src/lib/sdk/abstractresourcebrowser.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; // FIXME: fool syncqt @@ -69,7 +67,5 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractsettings.h b/src/designer/src/lib/sdk/abstractsettings.h index deb0f0763..8aa787861 100644 --- a/src/designer/src/lib/sdk/abstractsettings.h +++ b/src/designer/src/lib/sdk/abstractsettings.h @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; @@ -68,6 +66,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTSETTINGS_P_H diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 6f37129fe..15396fc17 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DomUI; @@ -141,6 +139,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QDesignerWidgetBoxInterface::Widget)) -QT_END_HEADER - #endif // ABSTRACTWIDGETBOX_H diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h index 44e9e7bea..b993ef49a 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QIcon; @@ -132,6 +130,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTWIDGETDATABASE_H diff --git a/src/designer/src/lib/sdk/abstractwidgetfactory.h b/src/designer/src/lib/sdk/abstractwidgetfactory.h index 24084ac6c..eb76da598 100644 --- a/src/designer/src/lib/sdk/abstractwidgetfactory.h +++ b/src/designer/src/lib/sdk/abstractwidgetfactory.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -74,6 +72,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTWIDGETFACTORY_H diff --git a/src/designer/src/lib/sdk/dynamicpropertysheet.h b/src/designer/src/lib/sdk/dynamicpropertysheet.h index 9904bc12e..9bf431ef2 100644 --- a/src/designer/src/lib/sdk/dynamicpropertysheet.h +++ b/src/designer/src/lib/sdk/dynamicpropertysheet.h @@ -55,8 +55,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; // FIXME: fool syncqt @@ -76,6 +74,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerDynamicPropertySheetExtension, "org.qt-pr QT_END_NAMESPACE -QT_END_HEADER - #endif // DYNAMICPROPERTYSHEET_H diff --git a/src/designer/src/lib/sdk/extrainfo.h b/src/designer/src/lib/sdk/extrainfo.h index 34be80b3a..96930dffd 100644 --- a/src/designer/src/lib/sdk/extrainfo.h +++ b/src/designer/src/lib/sdk/extrainfo.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DomWidget; @@ -79,6 +77,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerExtraInfoExtension, "org.qt-project.Qt.De QT_END_NAMESPACE -QT_END_HEADER - #endif // EXTRAINFO_H diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h index 2965cf765..91d08964b 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.h +++ b/src/designer/src/lib/sdk/layoutdecoration.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPoint; @@ -94,6 +92,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerLayoutDecorationExtension, "org.qt-projec QT_END_NAMESPACE -QT_END_HEADER - #endif // LAYOUTDECORATION_H diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h index a2d87c324..4b33a11cf 100644 --- a/src/designer/src/lib/sdk/membersheet.h +++ b/src/designer/src/lib/sdk/membersheet.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; // FIXME: fool syncqt @@ -84,6 +82,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt. QT_END_NAMESPACE -QT_END_HEADER - #endif // MEMBERSHEET_H diff --git a/src/designer/src/lib/sdk/propertysheet.h b/src/designer/src/lib/sdk/propertysheet.h index c29102389..ca1dfd4eb 100644 --- a/src/designer/src/lib/sdk/propertysheet.h +++ b/src/designer/src/lib/sdk/propertysheet.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVariant; @@ -88,6 +86,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerPropertySheetExtension, QT_END_NAMESPACE -QT_END_HEADER - #endif // PROPERTYSHEET_H diff --git a/src/designer/src/lib/sdk/sdk_global.h b/src/designer/src/lib/sdk/sdk_global.h index 8eb0d0a31..3621b660e 100644 --- a/src/designer/src/lib/sdk/sdk_global.h +++ b/src/designer/src/lib/sdk/sdk_global.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_SDK_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // SDK_GLOBAL_H diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h index a483b0880..7948d7181 100644 --- a/src/designer/src/lib/sdk/taskmenu.h +++ b/src/designer/src/lib/sdk/taskmenu.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAction; @@ -67,6 +65,4 @@ inline QAction *QDesignerTaskMenuExtension::preferredEditAction() const QT_END_NAMESPACE -QT_END_HEADER - #endif // TASKMENU_H diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index c0b7bf16d..332291bbd 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // pragma for syncqt, don't remove. @@ -268,6 +266,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMBUILDER_H diff --git a/src/designer/src/lib/uilib/container.h b/src/designer/src/lib/uilib/container.h index 2da07c77a..f4ed62d77 100644 --- a/src/designer/src/lib/uilib/container.h +++ b/src/designer/src/lib/uilib/container.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -77,6 +75,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerContainerExtension, "org.qt-project.Qt.De QT_END_NAMESPACE -QT_END_HEADER - #endif // CONTAINER_H diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/lib/uilib/customwidget.h index 75e15ad0b..d051866f0 100644 --- a/src/designer/src/lib/uilib/customwidget.h +++ b/src/designer/src/lib/uilib/customwidget.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -100,6 +98,4 @@ Q_DECLARE_INTERFACE(QDesignerCustomWidgetCollectionInterface, QDesignerCustomWid QT_END_NAMESPACE -QT_END_HEADER - #endif // CUSTOMWIDGET_H diff --git a/src/designer/src/lib/uilib/extension.h b/src/designer/src/lib/uilib/extension.h index 75fd12937..7f0685588 100644 --- a/src/designer/src/lib/uilib/extension.h +++ b/src/designer/src/lib/uilib/extension.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define Q_TYPEID(IFace) QLatin1String(IFace##_iid) @@ -104,6 +102,4 @@ template <> inline IFace *qt_extension(QAbstractExtensionManager *manag QT_END_NAMESPACE -QT_END_HEADER - #endif // EXTENSION_H diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h index bbbb0919a..91d34275f 100644 --- a/src/designer/src/lib/uilib/formbuilder.h +++ b/src/designer/src/lib/uilib/formbuilder.h @@ -45,8 +45,6 @@ #include "uilib_global.h" #include "abstractformbuilder.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // pragma for syncqt, don't remove. @@ -105,6 +103,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // FORMBUILDER_H diff --git a/src/designer/src/lib/uilib/qdesignerexportwidget.h b/src/designer/src/lib/uilib/qdesignerexportwidget.h index f5f62571c..74ffe27fe 100644 --- a/src/designer/src/lib/uilib/qdesignerexportwidget.h +++ b/src/designer/src/lib/uilib/qdesignerexportwidget.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 @@ -61,6 +59,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif //QDESIGNEREXPORTWIDGET_H diff --git a/src/designer/src/lib/uilib/uilib_global.h b/src/designer/src/lib/uilib/uilib_global.h index 873c540ce..f8624cb73 100644 --- a/src/designer/src/lib/uilib/uilib_global.h +++ b/src/designer/src/lib/uilib/uilib_global.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // UILIB_GLOBAL_H diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h index 6977d20a4..12124dc0c 100644 --- a/src/designer/src/uitools/quiloader.h +++ b/src/designer/src/uitools/quiloader.h @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -97,6 +95,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QUILOADER_H diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h index 6ee4ca325..e7cbfb607 100644 --- a/src/designer/src/uitools/quiloader_p.h +++ b/src/designer/src/uitools/quiloader_p.h @@ -66,8 +66,6 @@ #define PROP_TABPAGETOOLTIP "_q_tabPageToolTip_notr" #define PROP_TABPAGEWHATSTHIS "_q_tabPageWhatsThis_notr" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUiTranslatableStringValue @@ -101,8 +99,6 @@ extern const QUiItemRolePair qUiItemRoles[]; QT_END_NAMESPACE -QT_END_HEADER - Q_DECLARE_METATYPE(QUiTranslatableStringValue) -- cgit v1.2.1