Removed setfontsize

Task-number: QTRD-2211

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

20 files changed, 17 insertions, 139 deletions

diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp
index cf94c5da..744de129 100644
--- a/examples/mapdata/mapdata.cpp
+++ b/examples/mapdata/mapdata.cpp
@@ -32,7 +32,9 @@ MapsModifier::MapsModifier(Q3DMaps *maps)
     QImage image = QImage(QStringLiteral(":/images/finland"));
     m_imageRect = image.rect();
     m_chart->setAreaSpecs(m_imageRect, image);
-    m_chart->setFontSize(m_fontSize);
+    QFont font = m_chart->font();
+    font.setPointSize(m_fontSize);
+    m_chart->setFont(font);
 
 #if 0
     m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustHeight);
@@ -296,14 +298,15 @@ void MapsModifier::changeFont(const QFont &font)
 {
     QFont newFont = font;
     newFont.setPointSizeF(m_fontSize);
-    //qDebug() << newFont << newFont.style();
     m_chart->setFont(newFont);
 }
 
 void MapsModifier::changeFontSize(int fontsize)
 {
     m_fontSize = fontsize;
-    m_chart->setFontSize((GLfloat)m_fontSize);
+    QFont font = m_chart->font();
+    font.setPointSize(m_fontSize);
+    m_chart->setFont(font);
 }
 
 void MapsModifier::changeShadowQuality(int quality)
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 33ee6303..fd2c6e2e 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -74,7 +74,8 @@ Item {
             id: testscatter
             width: dataView.width
             height: dataView.height
-            fontSize: 30.0
+            font.family: "Times New Roman"
+            font.pointSize: 40
             mapping: scatterMapping
             shadowQuality: Scatter3D.ShadowNone
             selectionMode: Scatter3D.ModeItem
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index 8655898b..5e1935b8 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -30,7 +30,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     : m_chart(scatter),
       m_fontSize(30.0f)
 {
-    m_chart->setFontSize(m_fontSize);
+    QFont font = m_chart->font();
+    font.setPointSize(m_fontSize);
+    m_chart->setFont(font);
     m_chart->setObjectType(QDataVis::Spheres, true);
     m_chart->setTheme(QDataVis::ThemeBrownSand);
     m_chart->setShadowQuality(QDataVis::ShadowHigh);
@@ -147,7 +149,9 @@ void ScatterDataModifier::changeFont(const QFont &font)
 void ScatterDataModifier::changeFontSize(int fontsize)
 {
     m_fontSize = fontsize;
-    m_chart->setFontSize((GLfloat)m_fontSize);
+    QFont font = m_chart->font();
+    font.setPointSize(m_fontSize);
+    m_chart->setFont(font);
 }
 
 void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 6cbe6201..32985ada 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -348,14 +348,15 @@ void ChartModifier::changeFont(const QFont &font)
 {
     QFont newFont = font;
     newFont.setPointSize(m_fontSize);
-    //qDebug() << newFont << newFont.style();
     m_chart->setFont(newFont);
 }
 
 void ChartModifier::changeFontSize(int fontsize)
 {
     m_fontSize = fontsize;
-    m_chart->setFontSize((GLfloat)m_fontSize);
+    QFont font = m_chart->font();
+    font.setPointSize(m_fontSize);
+    m_chart->setFont(font);
 }
 
 void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavis3d/engine/abstract3dcontroller.cpp
index 45919f97..de80bd41 100644
--- a/src/datavis3d/engine/abstract3dcontroller.cpp
+++ b/src/datavis3d/engine/abstract3dcontroller.cpp
@@ -459,19 +459,6 @@ Theme Abstract3DController::theme()
     return m_theme;
 }
 
-void Abstract3DController::setFontSize(float fontsize)
-{
-    m_font.setPointSizeF(fontsize);
-
-    m_changeTracker.fontChanged = true;
-    emit fontChanged(m_font);
-}
-
-float Abstract3DController::fontSize()
-{
-    return m_font.pointSizeF();
-}
-
 void Abstract3DController::setFont(const QFont &font)
 {
     m_font = font;
diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavis3d/engine/abstract3dcontroller_p.h
index 878448a0..4868e3eb 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavis3d/engine/abstract3dcontroller_p.h
@@ -223,10 +223,6 @@ public:
     virtual void setColorTheme(QDataVis::ColorTheme colorTheme);
     virtual Theme theme();
 
-    // Font size adjustment
-    virtual void setFontSize(float fontsize);
-    virtual float fontSize();
-
     // Set font
     virtual void setFont(const QFont &font);
     virtual QFont font();
diff --git a/src/datavis3d/engine/maps3dcontroller.cpp b/src/datavis3d/engine/maps3dcontroller.cpp
index 9157fa6f..21b46eda 100644
--- a/src/datavis3d/engine/maps3dcontroller.cpp
+++ b/src/datavis3d/engine/maps3dcontroller.cpp
@@ -1300,18 +1300,6 @@ QDataVis::SelectionMode Maps3DController::selectionMode()
     return m_selectionMode;
 }
 
-void Maps3DController::setFontSize(float fontsize)
-{
-    m_font.setPointSizeF(fontsize);
-    m_drawer->setFont(m_font);
-    m_updateLabels = true;
-}
-
-float Maps3DController::fontSize()
-{
-    return m_font.pointSizeF();
-}
-
 void Maps3DController::setFont(const QFont &font)
 {
     m_font = font;
diff --git a/src/datavis3d/engine/maps3dcontroller_p.h b/src/datavis3d/engine/maps3dcontroller_p.h
index 8011cf9a..7f87db9d 100644
--- a/src/datavis3d/engine/maps3dcontroller_p.h
+++ b/src/datavis3d/engine/maps3dcontroller_p.h
@@ -117,10 +117,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode();
 
-    // Font size adjustment
-    void setFontSize(float fontsize);
-    float fontSize();
-
     // Set font
     void setFont(const QFont &font);
     QFont font();
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index 058b0be1..eb157634 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -316,21 +316,6 @@ void Q3DBars::setMeshFileName(const QString &objFileName)
 }
 
 /*!
- * \property Q3DBars::fontSize
- *
- * Sets font size to \a fontsize.
- */
-void Q3DBars::setFontSize(float fontsize)
-{
-    d_ptr->m_shared->setFontSize(fontsize);
-}
-
-float Q3DBars::fontSize()
-{
-    return d_ptr->m_shared->fontSize();
-}
-
-/*!
  * \property Q3DBars::font
  *
  * Sets the \a font for labels. It is preset to \c Arial by default.
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index c78fa2ec..8eb14690 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -37,7 +37,6 @@ class QT_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow
     Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
     Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(QFont font READ font WRITE setFont)
-    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(QPoint selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged)
@@ -73,9 +72,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode() const;
 
-    void setFontSize(float fontsize);
-    float fontSize();
-
     void setFont(const QFont &font);
     QFont font() const;
 
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp
index 8bb93ad2..3ff9bc7c 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/datavis3d/engine/q3dmaps.cpp
@@ -195,16 +195,6 @@ QDataVis::SelectionMode Q3DMaps::selectionMode() const
     return d_ptr->m_shared->selectionMode();
 }
 
-void Q3DMaps::setFontSize(float fontsize)
-{
-    d_ptr->m_shared->setFontSize(fontsize);
-}
-
-float Q3DMaps::fontSize() const
-{
-    return d_ptr->m_shared->fontSize();
-}
-
 void Q3DMaps::setFont(const QFont &font)
 {
     d_ptr->m_shared->setFont(font);
diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h
index e911995f..0dbeaf14 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/datavis3d/engine/q3dmaps.h
@@ -38,7 +38,6 @@ class QT_DATAVIS3D_EXPORT Q3DMaps : public Q3DWindow
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont)
-    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
 
 public:
 
@@ -95,10 +94,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode() const;
 
-    // Font size adjustment
-    void setFontSize(float fontsize);
-    float fontSize() const;
-
     // Set font
     void setFont(const QFont &font);
     QFont font() const;
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavis3d/engine/q3dscatter.cpp
index e4f44d78..ae4fcb70 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavis3d/engine/q3dscatter.cpp
@@ -276,21 +276,6 @@ void Q3DScatter::setMeshFileName(const QString &objFileName)
 }
 
 /*!
- * \property Q3DScatter::fontSize
- *
- * Sets font size to \a fontsize.
- */
-void Q3DScatter::setFontSize(float fontsize)
-{
-    d_ptr->m_shared->setFontSize(fontsize);
-}
-
-float Q3DScatter::fontSize() const
-{
-    return d_ptr->m_shared->fontSize();
-}
-
-/*!
  * \property Q3DScatter::font
  *
  * Sets the \a font for labels. It is preset to \c Arial by default.
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h
index dfb386ca..bbc6dcec 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavis3d/engine/q3dscatter.h
@@ -38,7 +38,6 @@ class QT_DATAVIS3D_EXPORT Q3DScatter : public Q3DWindow
     Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
     Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(QFont font READ font WRITE setFont)
-    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
@@ -65,9 +64,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode() const;
 
-    void setFontSize(float fontsize);
-    float fontSize() const;
-
     void setFont(const QFont &font);
     QFont font() const;
 
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavis3dqml2/declarativebars.cpp
index 5d40df8c..6c63bda4 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavis3dqml2/declarativebars.cpp
@@ -265,16 +265,6 @@ QDataVis::ColorTheme DeclarativeBars::theme()
     return m_theme;
 }
 
-void DeclarativeBars::setFontSize(float fontsize)
-{
-    m_shared->setFontSize(fontsize);
-}
-
-float DeclarativeBars::fontSize()
-{
-    return m_shared->fontSize();
-}
-
 void DeclarativeBars::setFont(const QFont &font)
 {
     m_shared->setFont(font);
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavis3dqml2/declarativebars_p.h
index aa26c674..b06b8f6c 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavis3dqml2/declarativebars_p.h
@@ -63,7 +63,6 @@ class DeclarativeBars : public QQuickItem
     Q_PROPERTY(bool barSmooth READ barSmooth WRITE setBarSmooth)
     Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
     Q_PROPERTY(QFont font READ font WRITE setFont)
-    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(int rows READ rows WRITE setRows)
@@ -149,10 +148,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode();
 
-    // Font size adjustment
-    void setFontSize(float fontsize);
-    float fontSize();
-
     // Set font
     void setFont(const QFont &font);
     QFont font();
diff --git a/src/datavis3dqml2/declarativemaps.cpp b/src/datavis3dqml2/declarativemaps.cpp
index e70ef40b..a0e1c927 100644
--- a/src/datavis3dqml2/declarativemaps.cpp
+++ b/src/datavis3dqml2/declarativemaps.cpp
@@ -150,16 +150,6 @@ QDataVis::SelectionMode DeclarativeMaps::selectionMode()
     return m_shared->selectionMode();
 }
 
-void DeclarativeMaps::setFontSize(float fontsize)
-{
-    m_shared->setFontSize(fontsize);
-}
-
-float DeclarativeMaps::fontSize()
-{
-    return m_shared->fontSize();
-}
-
 void DeclarativeMaps::setFont(const QFont &font)
 {
     m_shared->setFont(font);
diff --git a/src/datavis3dqml2/declarativemaps_p.h b/src/datavis3dqml2/declarativemaps_p.h
index 669df421..ef276571 100644
--- a/src/datavis3dqml2/declarativemaps_p.h
+++ b/src/datavis3dqml2/declarativemaps_p.h
@@ -48,7 +48,6 @@ class DeclarativeMaps : public QQuickItem
     Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
     Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(QFont font READ font WRITE setFont)
-    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(QItemModelMapDataMapping *mapping READ mapping WRITE setMapping)
     Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
     Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
@@ -102,10 +101,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode();
 
-    // Font size adjustment
-    void setFontSize(float fontsize);
-    float fontSize();
-
     // Set font
     void setFont(const QFont &font);
     QFont font();
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index 22f73ec4..3d35e420 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -229,16 +229,6 @@ QDataVis::ColorTheme DeclarativeScatter::theme()
     return m_theme;
 }
 
-void DeclarativeScatter::setFontSize(float fontsize)
-{
-    m_shared->setFontSize(fontsize);
-}
-
-float DeclarativeScatter::fontSize()
-{
-    return m_shared->fontSize();
-}
-
 void DeclarativeScatter::setFont(const QFont &font)
 {
     m_shared->setFont(font);
diff --git a/src/datavis3dqml2/declarativescatter_p.h b/src/datavis3dqml2/declarativescatter_p.h
index 687809ea..46ad730b 100644
--- a/src/datavis3dqml2/declarativescatter_p.h
+++ b/src/datavis3dqml2/declarativescatter_p.h
@@ -58,7 +58,6 @@ class DeclarativeScatter : public QQuickItem
     Q_PROPERTY(bool objectSmooth READ objectSmooth WRITE setObjectSmooth)
     Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
     Q_PROPERTY(QFont font READ font WRITE setFont)
-    Q_PROPERTY(float fontSize READ fontSize WRITE setFontSize)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
@@ -124,10 +123,6 @@ public:
     void setSelectionMode(QDataVis::SelectionMode mode);
     QDataVis::SelectionMode selectionMode();
 
-    // Font size adjustment
-    void setFontSize(float fontsize);
-    float fontSize();
-
     // Set font
     void setFont(const QFont &font);
     QFont font();