From d91e065526fe084374b206b6e7c9f0d628abb93d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 17 Feb 2014 16:18:27 +0200 Subject: Clean up public API and includes usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7 Reviewed-by: Tomi Korpipää --- src/datavisualization/theme/q3dtheme.h | 41 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'src/datavisualization/theme/q3dtheme.h') diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 91c5bb6f..43278c79 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -20,10 +20,10 @@ #define Q3DTHEME_H #include - -#include -#include -#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -149,23 +149,23 @@ public: signals: void typeChanged(Theme themeType); - void baseColorsChanged(QList colors); - void backgroundColorChanged(QColor color); - void windowColorChanged(QColor color); - void labelTextColorChanged(QColor color); - void labelBackgroundColorChanged(QColor color); - void gridLineColorChanged(QColor color); - void singleHighlightColorChanged(QColor color); - void multiHighlightColorChanged(QColor color); - void lightColorChanged(QColor color); - void baseGradientsChanged(QList gradients); - void singleHighlightGradientChanged(QLinearGradient gradient); - void multiHighlightGradientChanged(QLinearGradient gradient); + void baseColorsChanged(const QList &colors); + void backgroundColorChanged(const QColor &color); + void windowColorChanged(const QColor &color); + void labelTextColorChanged(const QColor &color); + void labelBackgroundColorChanged(const QColor &color); + void gridLineColorChanged(const QColor &color); + void singleHighlightColorChanged(const QColor &color); + void multiHighlightColorChanged(const QColor &color); + void lightColorChanged(const QColor &color); + void baseGradientsChanged(const QList &gradients); + void singleHighlightGradientChanged(const QLinearGradient &gradient); + void multiHighlightGradientChanged(const QLinearGradient &gradient); void lightStrengthChanged(float strength); void ambientLightStrengthChanged(float strength); void highlightLightStrengthChanged(float strength); void labelBorderEnabledChanged(bool enabled); - void fontChanged(QFont font); + void fontChanged(const QFont &font); void backgroundEnabledChanged(bool enabled); void gridEnabledChanged(bool enabled); void labelBackgroundEnabledChanged(bool enabled); @@ -173,16 +173,17 @@ signals: protected: explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0); + QScopedPointer d_ptr; +private: + Q_DISABLE_COPY(Q3DTheme) + friend class ThemeManager; friend class Abstract3DRenderer; friend class Bars3DController; friend class AbstractDeclarative; friend class Abstract3DController; - -private: - Q_DISABLE_COPY(Q3DTheme) }; QT_END_NAMESPACE_DATAVISUALIZATION -- cgit v1.2.3