From 2e4631ece7f7860947165d4cf9019b6d383d492d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 26 Aug 2013 09:43:12 +0300 Subject: Removed setfontsize Task-number: QTRD-2211 Change-Id: I33b363749ccfbd4d4e9ce3faa909eeaf46acb33a Change-Id: I33b363749ccfbd4d4e9ce3faa909eeaf46acb33a Reviewed-by: Miikka Heikkinen --- src/datavis3d/engine/abstract3dcontroller.cpp | 13 ------------- src/datavis3d/engine/abstract3dcontroller_p.h | 4 ---- src/datavis3d/engine/maps3dcontroller.cpp | 12 ------------ src/datavis3d/engine/maps3dcontroller_p.h | 4 ---- src/datavis3d/engine/q3dbars.cpp | 15 --------------- src/datavis3d/engine/q3dbars.h | 4 ---- src/datavis3d/engine/q3dmaps.cpp | 10 ---------- src/datavis3d/engine/q3dmaps.h | 5 ----- src/datavis3d/engine/q3dscatter.cpp | 15 --------------- src/datavis3d/engine/q3dscatter.h | 4 ---- 10 files changed, 86 deletions(-) (limited to 'src/datavis3d') 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 @@ -315,21 +315,6 @@ void Q3DBars::setMeshFileName(const QString &objFileName) d_ptr->m_shared->setMeshFileName(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 * 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 @@ -275,21 +275,6 @@ void Q3DScatter::setMeshFileName(const QString &objFileName) d_ptr->m_shared->setMeshFileName(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 * 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; -- cgit v1.2.3