From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 23 Feb 2012 21:40:01 +0000 (+0100)
Subject: QFontMetrics: make conversion from QFont to QFontMetrics explicit
X-Git-Tag: qt-v5.0.0-alpha1~585^2^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c1bdc1854a7700c2b3a345b95f6a2fdca84037d;p=profile%2Fivi%2Fqtbase.git

QFontMetrics: make conversion from QFont to QFontMetrics explicit

There is no user of this in qtbase, and I don't think
this is a desireable feature anyway.

Change-Id: Ifebba5872b0eadb0daba3c3cd5f8b19abeed5c12
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---

diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 7ddc897..e48460f 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -61,7 +61,7 @@ class QRect;
 class Q_GUI_EXPORT QFontMetrics
 {
 public:
-    QFontMetrics(const QFont &);
+    explicit QFontMetrics(const QFont &);
     QFontMetrics(const QFont &, QPaintDevice *pd);
     QFontMetrics(const QFontMetrics &);
     ~QFontMetrics();
@@ -127,7 +127,7 @@ private:
 class Q_GUI_EXPORT QFontMetricsF
 {
 public:
-    QFontMetricsF(const QFont &);
+    explicit QFontMetricsF(const QFont &);
     QFontMetricsF(const QFont &, QPaintDevice *pd);
     QFontMetricsF(const QFontMetrics &);
     QFontMetricsF(const QFontMetricsF &);