User-modifiable themes, part 1

Task-number: QTRD-2120

+ old functionality remade
- new functionality to be added

+ fixed a compilation error in qbarseries for mingw

Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964
Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h
index c4bc8d1b..f9d70514 100644
--- a/src/datavisualization/engine/drawer_p.h
+++ b/src/datavisualization/engine/drawer_p.h
@@ -31,7 +31,7 @@
 
 #include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
-#include "theme_p.h"
+#include "q3dtheme.h"
 #include "labelitem_p.h"
 #include "abstractrenderitem_p.h"
 #include <QFont>
@@ -63,13 +63,13 @@ public:
     };
 
 public:
-    explicit Drawer(const Theme &theme, const QFont &font, QDataVis::LabelStyle style);
+    explicit Drawer(Q3DTheme *theme, const QFont &font, QDataVis::LabelStyle style);
     ~Drawer();
 
     void initializeOpenGL();
 
-    void setTheme(const Theme &theme);
-    Theme theme() const;
+    void setTheme(Q3DTheme *theme);
+    Q3DTheme *theme() const;
     void setFont(const QFont &font);
     QFont font() const;
     void setStyle(QDataVis::LabelStyle style);
@@ -93,7 +93,7 @@ Q_SIGNALS:
     void drawerChanged();
 
 private:
-    Theme m_theme;
+    Q3DTheme *m_theme;
     QFont m_font;
     QDataVis::LabelStyle m_style;
     TextureHelper *m_textureHelper;