QtGui: make some constructors explicit

This is a semi-automatic search, so I'm
reasonably sure that all the exported ones
have been caught.

Change-Id: I5b122db2498dbb2aee50c7ad95c67e708aade45b
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 9cc61198a5..cd1e3f0880 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -272,7 +272,7 @@ public:
     inline void resolve(uint mask) { resolve_mask = mask; }
 
 private:
-    QFont(QFontPrivate *);
+    explicit QFont(QFontPrivate *);
 
     void detach();
 
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 7209fbdfc3..fe9e1d16c7 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -535,7 +535,7 @@ int QFontMetrics::width(const QString &text, int len, int flags) const
         return qRound(width);
     }
 
-    QStackTextEngine layout(text, d.data());
+    QStackTextEngine layout(text, QFont(d.data()));
     layout.ignoreBidi = true;
     return qRound(layout.width(0, len));
 }
@@ -611,7 +611,7 @@ int QFontMetrics::charWidth(const QString &text, int pos) const
         int from = qMax(0, pos - 8);
         int to = qMin(text.length(), pos + 8);
         QString cstr = QString::fromRawData(text.unicode() + from, to - from);
-        QStackTextEngine layout(cstr, d.data());
+        QStackTextEngine layout(cstr, QFont(d.data()));
         layout.ignoreBidi = true;
         layout.itemize();
         width = qRound(layout.width(pos-from, 1));
@@ -660,7 +660,7 @@ QRect QFontMetrics::boundingRect(const QString &text) const
     if (text.length() == 0)
         return QRect();
 
-    QStackTextEngine layout(text, d.data());
+    QStackTextEngine layout(text, QFont(d.data()));
     layout.ignoreBidi = true;
     layout.itemize();
     glyph_metrics_t gm = layout.boundingBox(0, text.length());
@@ -830,7 +830,7 @@ QRect QFontMetrics::tightBoundingRect(const QString &text) const
     if (text.length() == 0)
         return QRect();
 
-    QStackTextEngine layout(text, d.data());
+    QStackTextEngine layout(text, QFont(d.data()));
     layout.ignoreBidi = true;
     layout.itemize();
     glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
@@ -1364,7 +1364,7 @@ qreal QFontMetricsF::width(const QString &text) const
     int pos = text.indexOf(QLatin1Char('\x9c'));
     int len = (pos != -1) ? pos : text.length();
 
-    QStackTextEngine layout(text, d.data());
+    QStackTextEngine layout(text, QFont(d.data()));
     layout.ignoreBidi = true;
     layout.itemize();
     return layout.width(0, len).toReal();
@@ -1441,7 +1441,7 @@ QRectF QFontMetricsF::boundingRect(const QString &text) const
     if (len == 0)
         return QRectF();
 
-    QStackTextEngine layout(text, d.data());
+    QStackTextEngine layout(text, QFont(d.data()));
     layout.ignoreBidi = true;
     layout.itemize();
     glyph_metrics_t gm = layout.boundingBox(0, len);
@@ -1614,7 +1614,7 @@ QRectF QFontMetricsF::tightBoundingRect(const QString &text) const
     if (text.length() == 0)
         return QRect();
 
-    QStackTextEngine layout(text, d.data());
+    QStackTextEngine layout(text, QFont(d.data()));
     layout.ignoreBidi = true;
     layout.itemize();
     glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h
index 244f40b7ed..7107238a95 100644
--- a/src/gui/text/qsyntaxhighlighter.h
+++ b/src/gui/text/qsyntaxhighlighter.h
@@ -66,8 +66,8 @@ class Q_GUI_EXPORT QSyntaxHighlighter : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QSyntaxHighlighter)
 public:
-    QSyntaxHighlighter(QObject *parent);
-    QSyntaxHighlighter(QTextDocument *parent);
+    explicit QSyntaxHighlighter(QObject *parent);
+    explicit QSyntaxHighlighter(QTextDocument *parent);
     virtual ~QSyntaxHighlighter();
 
     void setDocument(QTextDocument *doc);
diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h
index c0dea06f8f..b7743b1ff7 100644
--- a/src/gui/text/qtextdocumentwriter.h
+++ b/src/gui/text/qtextdocumentwriter.h
@@ -59,7 +59,7 @@ class Q_GUI_EXPORT QTextDocumentWriter
 public:
     QTextDocumentWriter();
     QTextDocumentWriter(QIODevice *device, const QByteArray &format);
-    QTextDocumentWriter(const QString &fileName, const QByteArray &format = QByteArray());
+    explicit QTextDocumentWriter(const QString &fileName, const QByteArray &format = QByteArray());
     ~QTextDocumentWriter();
 
     void setFormat (const QByteArray &format);
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 56098b0bdb..95b8f48ec5 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -340,7 +340,7 @@ QTextLayout::QTextLayout(const QString& text, const QFont &font, QPaintDevice *p
     QFont f(font);
     if (paintdevice)
         f = QFont(font, paintdevice);
-    d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f.d.data());
+    d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f);
 }
 
 /*!
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index a0a4c76282..96a0cdda9b 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -86,7 +86,7 @@ public:
     };
 
     QTextOption();
-    QTextOption(Qt::Alignment alignment);
+    /*implicit*/ QTextOption(Qt::Alignment alignment);
     ~QTextOption();
 
     QTextOption(const QTextOption &o);