Fix theme ownership

Theme ownership now uses similar model as axis and inputhandler
ownership: Graph can own multiple themes, but only one is active
at the time.

Task-number: QTRD-2623

Change-Id: I7134384df6f8cc465cc28fbebb454b7d2e254f83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/datavisualization/theme/thememanager_p.h b/src/datavisualization/theme/thememanager_p.h
index c6e6a107..254bb7bf 100644
--- a/src/datavisualization/theme/thememanager_p.h
+++ b/src/datavisualization/theme/thememanager_p.h
@@ -42,8 +42,11 @@ public:
     ThemeManager(Abstract3DController *controller);
     ~ThemeManager();
 
-    void setTheme(Q3DTheme *theme);
-    Q3DTheme *theme() const;
+    void addTheme(Q3DTheme *theme);
+    void releaseTheme(Q3DTheme *theme);
+    void setActiveTheme(Q3DTheme *theme);
+    Q3DTheme *activeTheme() const;
+    QList<Q3DTheme *> themes() const;
 
 protected:
     void connectThemeSignals();
@@ -72,7 +75,8 @@ protected:
     void setColorStyle(Q3DTheme::ColorStyle style);
 
 private:
-    QScopedPointer<Q3DTheme> m_theme;
+    Q3DTheme *m_activeTheme;
+    QList<Q3DTheme *> m_themes; // List of all added themes
     Abstract3DController *m_controller;
 };