diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-13 16:41:23 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-13 19:50:52 +0000 |
| commit | 9ded38c57a2e61630abdcdd26cd9e928d079ea79 (patch) | |
| tree | d68f6644faf52fc314c7ffb73c74d31ad298f500 | |
| parent | 4dddea47b2a4882a43abf313c31af5466a0ab1b5 (diff) | |
| download | qttools-9ded38c57a2e61630abdcdd26cd9e928d079ea79.tar.gz | |
Place the QT_END_NAMESPACE in the right place
Moving the QT_END_NAMESPACE before the #endif of the include guard.
Task-number: QTBUG-109394
Change-Id: I13f8e71aca28b8dacbe00d7006f4e7ef807a9904
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 65faebe5876a13381dc6432d0430fc4905165f23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
6 files changed, 12 insertions, 12 deletions
diff --git a/src/designer/src/components/objectinspector/objectinspector.h b/src/designer/src/components/objectinspector/objectinspector.h index fd5c413d9..c856d7d91 100644 --- a/src/designer/src/components/objectinspector/objectinspector.h +++ b/src/designer/src/components/objectinspector/objectinspector.h @@ -52,6 +52,6 @@ private: } // namespace qdesigner_internal -#endif // OBJECTINSPECTOR_H - QT_END_NAMESPACE + +#endif // OBJECTINSPECTOR_H diff --git a/src/designer/src/components/objectinspector/objectinspector_global.h b/src/designer/src/components/objectinspector/objectinspector_global.h index 88469ec7c..6a1185564 100644 --- a/src/designer/src/components/objectinspector/objectinspector_global.h +++ b/src/designer/src/components/objectinspector/objectinspector_global.h @@ -18,6 +18,6 @@ QT_BEGIN_NAMESPACE #define QT_OBJECTINSPECTOR_EXPORT #endif -#endif // OBJECTINSPECTOR_GLOBAL_H - QT_END_NAMESPACE + +#endif // OBJECTINSPECTOR_GLOBAL_H diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index dc13ca337..20cd7ecee 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -124,6 +124,6 @@ namespace qdesigner_internal { }; } // namespace qdesigner_internal -#endif // OBJECTINSPECTORMODEL_H - QT_END_NAMESPACE + +#endif // OBJECTINSPECTORMODEL_H diff --git a/src/designer/src/plugins/tools/view3d/view3d_global.h b/src/designer/src/plugins/tools/view3d/view3d_global.h index 41b33cfe3..99afc452d 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_global.h +++ b/src/designer/src/plugins/tools/view3d/view3d_global.h @@ -18,6 +18,6 @@ QT_BEGIN_NAMESPACE #define VIEW3D_EXPORT #endif -#endif // VIEW3D_GLOBAL_H - QT_END_NAMESPACE + +#endif // VIEW3D_GLOBAL_H diff --git a/src/designer/src/plugins/tools/view3d/view3d_plugin.h b/src/designer/src/plugins/tools/view3d/view3d_plugin.h index 2133f33ec..d73415aba 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_plugin.h +++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.h @@ -43,6 +43,6 @@ private: QAction *m_action; }; -#endif // QVIEW3D_PLUGIN_H - QT_END_NAMESPACE + +#endif // QVIEW3D_PLUGIN_H diff --git a/src/designer/src/plugins/tools/view3d/view3d_tool.h b/src/designer/src/plugins/tools/view3d/view3d_tool.h index 8973ac777..bc496ea7b 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_tool.h +++ b/src/designer/src/plugins/tools/view3d/view3d_tool.h @@ -35,6 +35,6 @@ private: QAction *m_action; }; -#endif // VIEW3D_TOOL_H - QT_END_NAMESPACE + +#endif // VIEW3D_TOOL_H |