Removed QVariantDataSet and related classes.

There is little point maintaining QVariantDataSet and proxy when we
have QAbstractItemModel based proxy, so removed it and related classes.
Moved and refactored those under rainfall as an example of custom proxy
implementation.

Change-Id: I3df8b50f1780b8a88c27d91a284ec3ed3e6095fb
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index 9f0a9bd1..1053f132 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -61,7 +61,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
 
     m_columnCount = m_numericMonths.size();
 
-    m_proxy = new QVariantBarDataProxy;
+    m_proxy = new VariantBarDataProxy;
     m_proxy->setItemLabelFormat(QStringLiteral(" mm"));
     m_chart->setDataProxy(m_proxy);
 
@@ -146,8 +146,8 @@ void RainfallChart::updateYearsList(int start, int end)
 
 void RainfallChart::addDataSet()
 {
-    m_dataSet =  new QVariantDataSet;
-    QVariantDataItemList *itemList = new QVariantDataItemList;
+    m_dataSet =  new VariantDataSet;
+    VariantDataItemList *itemList = new VariantDataItemList;
     QTextStream stream;
     QFile dataFile(":/data/raindata.txt");
     if (dataFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -161,7 +161,7 @@ void RainfallChart::addDataSet()
                 qWarning() << "Invalid row read from data:" << line;
                 continue;
             }
-            QVariantDataItem *newItem = new QVariantDataItem;
+            VariantDataItem *newItem = new VariantDataItem;
             for (int i = 0; i < 2; i++)
                 newItem->append(strList.at(i).trimmed());
             for (int i = 2; i < 5; i++)
@@ -176,6 +176,6 @@ void RainfallChart::addDataSet()
 
     m_proxy->setDataSet(m_dataSet);
 
-    m_mapping =  new QVariantBarDataMapping(0, 1, m_city, m_years, m_numericMonths);
+    m_mapping =  new VariantBarDataMapping(0, 1, m_city, m_years, m_numericMonths);
     m_proxy->setMapping(m_mapping);
 }