diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:34:59 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:36:17 +0200 |
commit | 64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch) | |
tree | 6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualization/theme | |
parent | ca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff) |
Removed QDataVis and namespace macros
- docs will be fixed in QTRD-2594
Task-number: QTRD-2699
Task-number: QTRD-2700
Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/theme')
-rw-r--r-- | src/datavisualization/theme/q3dtheme.cpp | 20 | ||||
-rw-r--r-- | src/datavisualization/theme/q3dtheme.h | 7 | ||||
-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, 20 insertions, 19 deletions
diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index bf225b83..aec39637 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -19,7 +19,7 @@ #include "q3dtheme_p.h" #include "thememanager_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { /*! * \class Q3DTheme @@ -122,22 +122,22 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * \row * \li multiHighlightColor * \li The color to be used for highlighted objects, if \l{Q3DBars::selectionMode}{selectionMode} - * of the graph has \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set. + * of the graph has \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set. * \li Qt::blue * \row * \li multiHighlightGradient * \li The gradient to be used for highlighted objects, if \l{Q3DBars::selectionMode}{selectionMode} - * of the graph has \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set. + * of the graph has \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set. * \li QLinearGradient(). Essentially fully black. * \row * \li singleHighlightColor * \li The color to be used for a highlighted object, if \l{Q3DBars::selectionMode}{selectionMode} - * of the graph has \c QDataVis::SelectionItem flag set. + * of the graph has \c QAbstract3DGraph::SelectionItem flag set. * \li Qt::red * \row * \li singleHighlightGradient * \li The gradient to be used for a highlighted object, if \l{Q3DBars::selectionMode}{selectionMode} - * of the graph has \c QDataVis::SelectionItem flag set. + * of the graph has \c QAbstract3DGraph::SelectionItem flag set. * \li QLinearGradient(). Essentially fully black. * \row * \li windowColor @@ -554,7 +554,7 @@ QColor Q3DTheme::gridLineColor() const * \property Q3DTheme::singleHighlightColor * * Highlight color for a highlighted object. Used if \l{Q3DBars::selectionMode}{selectionMode} has - * \c QDataVis::SelectionItem flag set. + * \c QAbstract3DGraph::SelectionItem flag set. */ void Q3DTheme::setSingleHighlightColor(const QColor &color) { @@ -574,7 +574,7 @@ QColor Q3DTheme::singleHighlightColor() const * \property Q3DTheme::multiHighlightColor * * Highlight color for highlighted objects. Used if \l{Q3DBars::selectionMode}{selectionMode} has - * \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set. + * \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set. */ void Q3DTheme::setMultiHighlightColor(const QColor &color) { @@ -643,7 +643,7 @@ QList<QLinearGradient> Q3DTheme::baseGradients() const * \property Q3DTheme::singleHighlightGradient * * Highlight gradient for a highlighted object. Used if \l{Q3DBars::selectionMode}{selectionMode} - * has \c QDataVis::SelectionItem flag set. + * has \c QAbstract3DGraph::SelectionItem flag set. */ void Q3DTheme::setSingleHighlightGradient(const QLinearGradient &gradient) { @@ -663,7 +663,7 @@ QLinearGradient Q3DTheme::singleHighlightGradient() const * \property Q3DTheme::multiHighlightGradient * * Highlight gradient for highlighted objects. Used if \l{Q3DBars::selectionMode}{selectionMode} - * has \c QDataVis::SelectionRow or \c QDataVis::SelectionColumn flag set. + * has \c QAbstract3DGraph::SelectionRow or \c QAbstract3DGraph::SelectionColumn flag set. */ void Q3DTheme::setMultiHighlightGradient(const QLinearGradient &gradient) { @@ -1072,4 +1072,4 @@ bool Q3DThemePrivate::sync(Q3DThemePrivate &other) return changed; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 44e58e5d..632beb47 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -19,12 +19,13 @@ #ifndef Q3DTHEME_H #define Q3DTHEME_H -#include <QtDataVisualization/qdatavisualizationenums.h> +#include <QtDataVisualization/qdatavisualizationglobal.h> + #include <QLinearGradient> #include <QFont> #include <QColor> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class Q3DThemePrivate; @@ -183,6 +184,6 @@ private: Q_DISABLE_COPY(Q3DTheme) }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h index 078c2d7d..0180ddc3 100644 --- a/src/datavisualization/theme/q3dtheme_p.h +++ b/src/datavisualization/theme/q3dtheme_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include "q3dtheme.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { struct Q3DThemeDirtyBitField { bool baseColorDirty : 1; @@ -144,6 +144,6 @@ protected: Q3DTheme *q_ptr; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index d93e9b20..ab3eecc8 100644 --- a/src/datavisualization/theme/thememanager.cpp +++ b/src/datavisualization/theme/thememanager.cpp @@ -19,7 +19,7 @@ #include "thememanager_p.h" #include "q3dtheme_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { const float defaultBuiltInColorLevel = 0.7f; // for built-in gradient themes const float defaultColorLevel = 0.5f; // for built-in uniform themes @@ -590,4 +590,4 @@ void ThemeManager::setColorStyle(Q3DTheme *theme, Q3DTheme::ColorStyle style) theme->setColorStyle(style); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h index 13cbcdc9..343cf8a5 100644 --- a/src/datavisualization/theme/thememanager_p.h +++ b/src/datavisualization/theme/thememanager_p.h @@ -33,7 +33,7 @@ #include "abstract3dcontroller_p.h" #include "q3dtheme.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class ThemeManager : public QObject { @@ -81,6 +81,6 @@ private: Abstract3DController *m_controller; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif |