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 (file)
--- 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 &);