diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-01-28 12:16:28 +0200 |
|---|---|---|
| committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-01-28 12:26:47 +0200 |
| commit | 587d44e8077196ed4aa3df1484e69adcba2dc268 (patch) | |
| tree | 2c1e1256a1573cb609418c735868a44f568828d1 /src/datavisualization/theme | |
| parent | 2ee3f2cd5b860a6b030cffc54907d6f09ea572f4 (diff) | |
Remove custom namespace
Fixes: QTBUG-90400
Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/datavisualization/theme')
| -rw-r--r-- | src/datavisualization/theme/q3dtheme.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualization/theme/q3dtheme.h | 4 | ||||
| -rw-r--r-- | src/datavisualization/theme/q3dtheme_p.h | 4 | ||||
| -rw-r--r-- | src/datavisualization/theme/thememanager.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualization/theme/thememanager_p.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index 46a7a5c3..25f2f7c1 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -30,7 +30,7 @@ #include "q3dtheme_p.h" #include "thememanager_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE /*! * \class Q3DTheme @@ -1203,4 +1203,4 @@ bool Q3DThemePrivate::sync(Q3DThemePrivate &other) return updateDrawer; } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index e0a49631..4023bc16 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -36,7 +36,7 @@ #include <QtGui/QFont> #include <QtGui/QColor> -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class Q3DThemePrivate; @@ -197,6 +197,6 @@ private: friend class Abstract3DController; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h index 6061fd38..94d5f4ae 100644 --- a/src/datavisualization/theme/q3dtheme_p.h +++ b/src/datavisualization/theme/q3dtheme_p.h @@ -43,7 +43,7 @@ #include "datavisualizationglobal_p.h" #include "q3dtheme.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE struct Q3DThemeDirtyBitField { bool baseColorDirty : 1; @@ -155,6 +155,6 @@ protected: Q3DTheme *q_ptr; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index 01c7c10b..4f469506 100644 --- a/src/datavisualization/theme/thememanager.cpp +++ b/src/datavisualization/theme/thememanager.cpp @@ -30,7 +30,7 @@ #include "thememanager_p.h" #include "q3dtheme_p.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE const float defaultBuiltInColorLevel = 0.7f; // for built-in gradient themes const float defaultColorLevel = 0.5f; // for built-in uniform themes @@ -601,4 +601,4 @@ void ThemeManager::setColorStyle(Q3DTheme *theme, Q3DTheme::ColorStyle style) theme->setColorStyle(style); } -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h index 2e0be5f0..a04a0d49 100644 --- a/src/datavisualization/theme/thememanager_p.h +++ b/src/datavisualization/theme/thememanager_p.h @@ -44,7 +44,7 @@ #include "abstract3dcontroller_p.h" #include "q3dtheme.h" -QT_BEGIN_NAMESPACE_DATAVISUALIZATION +QT_BEGIN_NAMESPACE class ThemeManager : public QObject { @@ -92,6 +92,6 @@ private: Abstract3DController *m_controller; }; -QT_END_NAMESPACE_DATAVISUALIZATION +QT_END_NAMESPACE #endif |