diff --git a/src/effect/effectframe.cpp b/src/effect/effectframe.cpp index 901c80d2ea..0dbae24994 100644 --- a/src/effect/effectframe.cpp +++ b/src/effect/effectframe.cpp @@ -59,7 +59,7 @@ bool EffectFrameQuickScene::isStatic() const return m_static; } -const QFont &EffectFrameQuickScene::font() const +QFont EffectFrameQuickScene::font() const { return m_font; } @@ -75,7 +75,7 @@ void EffectFrameQuickScene::setFont(const QFont &font) reposition(); } -const QIcon &EffectFrameQuickScene::icon() const +QIcon EffectFrameQuickScene::icon() const { return m_icon; } @@ -87,7 +87,7 @@ void EffectFrameQuickScene::setIcon(const QIcon &icon) reposition(); } -const QSize &EffectFrameQuickScene::iconSize() const +QSize EffectFrameQuickScene::iconSize() const { return m_iconSize; } @@ -103,7 +103,7 @@ void EffectFrameQuickScene::setIconSize(const QSize &iconSize) reposition(); } -const QString &EffectFrameQuickScene::text() const +QString EffectFrameQuickScene::text() const { return m_text; } @@ -254,7 +254,7 @@ void EffectFrame::setAlignment(Qt::Alignment alignment) m_view->setAlignment(alignment); } -const QFont &EffectFrame::font() const +QFont EffectFrame::font() const { return m_view->font(); } @@ -279,7 +279,7 @@ void EffectFrame::setGeometry(const QRect &geometry, bool force) m_view->setGeometry(geometry); } -const QIcon &EffectFrame::icon() const +QIcon EffectFrame::icon() const { return m_view->icon(); } @@ -293,7 +293,7 @@ void EffectFrame::setIcon(const QIcon &icon) } } -const QSize &EffectFrame::iconSize() const +QSize EffectFrame::iconSize() const { return m_view->iconSize(); } @@ -322,7 +322,7 @@ void EffectFrame::render(const RenderTarget &renderTarget, const RenderViewport effects->renderOffscreenQuickView(renderTarget, viewport, m_view); } -const QString &EffectFrame::text() const +QString EffectFrame::text() const { return m_view->text(); } diff --git a/src/effect/effectframe.h b/src/effect/effectframe.h index 90f470400e..7c9a9ba6ae 100644 --- a/src/effect/effectframe.h +++ b/src/effect/effectframe.h @@ -48,20 +48,19 @@ public: EffectFrameStyle style() const; bool isStatic() const; - // has to be const-ref to match EffectFrameImpl... - const QFont &font() const; + QFont font() const; void setFont(const QFont &font); Q_SIGNAL void fontChanged(const QFont &font); - const QIcon &icon() const; + QIcon icon() const; void setIcon(const QIcon &icon); Q_SIGNAL void iconChanged(const QIcon &icon); - const QSize &iconSize() const; + QSize iconSize() const; void setIconSize(const QSize &iconSize); Q_SIGNAL void iconSizeChanged(const QSize &iconSize); - const QString &text() const; + QString text() const; void setText(const QString &text); Q_SIGNAL void textChanged(const QString &text); @@ -142,16 +141,16 @@ public: QRect geometry() const; void setText(const QString &text); - const QString &text() const; + QString text() const; void setFont(const QFont &font); - const QFont &font() const; + QFont font() const; /** * Set the icon that will appear on the left-hand size of the frame. */ void setIcon(const QIcon &icon); - const QIcon &icon() const; + QIcon icon() const; void setIconSize(const QSize &size); - const QSize &iconSize() const; + QSize iconSize() const; /** * @returns The style of this EffectFrame.