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>

src/gui/accessible/qaccessible2.h

@@ -115,7 +115,7 @@ public:
 class Q_GUI_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface
 {
 public:
-    QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface);  //###
+    explicit QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface);  //###
 
     void copyText(int startOffset, int endOffset) const;
     void deleteText(int startOffset, int endOffset);

src/gui/image/qmovie.h

@@ -83,7 +83,7 @@ public:
         CacheAll
     };
 
-    QMovie(QObject *parent = 0);
+    explicit QMovie(QObject *parent = 0);
     explicit QMovie(QIODevice *device, const QByteArray &format = QByteArray(), QObject *parent = 0);
     explicit QMovie(const QString &fileName, const QByteArray &format = QByteArray(), QObject *parent = 0);
     ~QMovie();

src/gui/image/qpixmap.h

@@ -67,10 +67,10 @@ public:
     QPixmap();
     explicit QPixmap(QPlatformPixmap *data);
     QPixmap(int w, int h);
-    QPixmap(const QSize &);
+    explicit QPixmap(const QSize &);
     QPixmap(const QString& fileName, const char *format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor);
 #ifndef QT_NO_IMAGEFORMAT_XPM
-    QPixmap(const char * const xpm[]);
+    explicit QPixmap(const char * const xpm[]);
 #endif
     QPixmap(const QPixmap &);
     ~QPixmap();

src/gui/kernel/qclipboard.h

@@ -59,7 +59,7 @@ class Q_GUI_EXPORT QClipboard : public QObject
 {
     Q_OBJECT
 private:
-    QClipboard(QObject *parent);
+    explicit QClipboard(QObject *parent);
     ~QClipboard();
 
 public:

src/gui/kernel/qopenglcontext.h

@@ -94,7 +94,7 @@ class Q_GUI_EXPORT QOpenGLContext : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QOpenGLContext)
 public:
-    QOpenGLContext(QObject *parent = 0);
+    explicit QOpenGLContext(QObject *parent = 0);
     ~QOpenGLContext();
 
     void setFormat(const QSurfaceFormat &format);

src/gui/kernel/qplatformsharedgraphicscache_qpa.h

@@ -65,7 +65,7 @@ public:
         OpenGLTexture
     };
 
-    QPlatformSharedGraphicsCache(QObject *parent = 0) : QObject(parent) {}
+    explicit QPlatformSharedGraphicsCache(QObject *parent = 0) : QObject(parent) {}
 
     Q_INVOKABLE virtual void ensureCacheInitialized(const QByteArray &cacheId, BufferType bufferType,
                                                     PixelFormat pixelFormat) = 0;

src/gui/kernel/qplatformsurface_qpa.h

@@ -59,7 +59,7 @@ public:
     QSurface::SurfaceClass surfaceClass() const;
 
 private:
-    QPlatformSurface(QSurface::SurfaceClass type);
+    explicit QPlatformSurface(QSurface::SurfaceClass type);
 
     QSurface::SurfaceClass m_type;
 

src/gui/kernel/qplatformwindow_qpa.h

@@ -63,7 +63,7 @@ class Q_GUI_EXPORT QPlatformWindow : public QPlatformSurface
 {
     Q_DECLARE_PRIVATE(QPlatformWindow)
 public:
-    QPlatformWindow(QWindow *window);
+    explicit QPlatformWindow(QWindow *window);
     virtual ~QPlatformWindow();
 
     QWindow *window() const;

src/gui/kernel/qscreen.h

@@ -142,7 +142,7 @@ Q_SIGNALS:
     void orientationChanged(Qt::ScreenOrientation orientation);
 
 private:
-    QScreen(QPlatformScreen *screen);
+    explicit QScreen(QPlatformScreen *screen);
 
     Q_DISABLE_COPY(QScreen)
     friend class QGuiApplicationPrivate;

src/gui/kernel/qsurface.h

@@ -80,7 +80,7 @@ public:
     virtual QSize size() const = 0;
 
 protected:
-    QSurface(SurfaceClass type);
+    explicit QSurface(SurfaceClass type);
 
     SurfaceClass m_type;
 

src/gui/kernel/qsurfaceformat.h

@@ -75,7 +75,7 @@ public:
     };
 
     QSurfaceFormat();
-    QSurfaceFormat(FormatOptions options);
+    /*implicit*/ QSurfaceFormat(FormatOptions options);
     QSurfaceFormat(const QSurfaceFormat &other);
     QSurfaceFormat &operator=(const QSurfaceFormat &other);
     ~QSurfaceFormat();

src/gui/kernel/qwindow.h

@@ -94,8 +94,8 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface
 
 public:
 
-    QWindow(QScreen *screen = 0);
-    QWindow(QWindow *parent);
+    explicit QWindow(QScreen *screen = 0);
+    explicit QWindow(QWindow *parent);
     virtual ~QWindow();
 
     void setSurfaceType(SurfaceType surfaceType);

src/gui/math3d/qgenericmatrix.h

@@ -102,7 +102,7 @@ private:
 #endif
     T m[N][M];    // Column-major order to match OpenGL.
 
-    QGenericMatrix(int) {}       // Construct without initializing identity matrix.
+    explicit QGenericMatrix(int) {}       // Construct without initializing identity matrix.
 
 #if !defined(Q_NO_TEMPLATE_FRIENDS)
     template <int NN, int MM, typename TT>

src/gui/math3d/qmatrix4x4.h

@@ -201,7 +201,7 @@ private:
     };
 
     // Construct without initializing identity matrix.
-    QMatrix4x4(int) { }
+    explicit QMatrix4x4(int) { }
 
     QMatrix4x4 orthonormalInverse() const;
 

src/gui/opengl/qopenglframebufferobject.h

@@ -67,7 +67,7 @@ public:
         Depth
     };
 
-    QOpenGLFramebufferObject(const QSize &size, GLenum target = GL_TEXTURE_2D);
+    explicit QOpenGLFramebufferObject(const QSize &size, GLenum target = GL_TEXTURE_2D);
     QOpenGLFramebufferObject(int width, int height, GLenum target = GL_TEXTURE_2D);
 #if !defined(QT_OPENGL_ES) || defined(Q_QDOC)
     QOpenGLFramebufferObject(const QSize &size, Attachment attachment,

src/gui/opengl/qopenglfunctions.h

@@ -198,7 +198,7 @@ class Q_GUI_EXPORT QOpenGLFunctions
 {
 public:
     QOpenGLFunctions();
-    QOpenGLFunctions(QOpenGLContext *context);
+    explicit QOpenGLFunctions(QOpenGLContext *context);
     ~QOpenGLFunctions() {}
 
     enum OpenGLFeature

src/gui/opengl/qopenglpaintdevice.h

@@ -71,7 +71,7 @@ class Q_GUI_EXPORT QOpenGLPaintDevice : public QPaintDevice
 {
     Q_DECLARE_PRIVATE(QOpenGLPaintDevice)
 public:
-    QOpenGLPaintDevice(const QSize &size);
+    explicit QOpenGLPaintDevice(const QSize &size);
     QOpenGLPaintDevice(int width, int height);
     virtual ~QOpenGLPaintDevice();
 

src/gui/painting/qbackingstore.h

@@ -62,7 +62,7 @@ class QPlatformBackingStore;
 class Q_GUI_EXPORT QBackingStore
 {
 public:
-    QBackingStore(QWindow *window);
+    explicit QBackingStore(QWindow *window);
     ~QBackingStore();
 
     QWindow *window() const;

src/gui/painting/qpdfwriter.h

@@ -57,8 +57,8 @@ class Q_GUI_EXPORT QPdfWriter : public QObject, public QPagedPaintDevice
 {
     Q_OBJECT
 public:
-    QPdfWriter(const QString &filename);
-    QPdfWriter(QIODevice *device);
+    explicit QPdfWriter(const QString &filename);
+    explicit QPdfWriter(QIODevice *device);
     ~QPdfWriter();
 
     QString title() const;

src/gui/painting/qplatformbackingstore_qpa.h

@@ -62,7 +62,7 @@ class QPlatformWindow;
 class Q_GUI_EXPORT QPlatformBackingStore
 {
 public:
-    QPlatformBackingStore(QWindow *window);
+    explicit QPlatformBackingStore(QWindow *window);
     virtual ~QPlatformBackingStore();
 
     QWindow *window() const;

src/gui/painting/qpolygon.h

@@ -61,9 +61,9 @@ class Q_GUI_EXPORT QPolygon : public QVector<QPoint>
 public:
     inline QPolygon() {}
     inline ~QPolygon() {}
-    inline QPolygon(int size);
+    inline explicit QPolygon(int size);
     inline QPolygon(const QPolygon &a) : QVector<QPoint>(a) {}
-    inline QPolygon(const QVector<QPoint> &v) : QVector<QPoint>(v) {}
+    inline /*implicit*/ QPolygon(const QVector<QPoint> &v) : QVector<QPoint>(v) {}
     QPolygon(const QRect &r, bool closed=false);
     QPolygon(int nPoints, const int *points);
     inline void swap(QPolygon &other) { QVector<QPoint>::swap(other); } // prevent QVector<QPoint><->QPolygon swaps
@@ -135,11 +135,11 @@ class Q_GUI_EXPORT QPolygonF : public QVector<QPointF>
 public:
     inline QPolygonF() {}
     inline ~QPolygonF() {}
-    inline QPolygonF(int size);
+    inline explicit QPolygonF(int size);
     inline QPolygonF(const QPolygonF &a) : QVector<QPointF>(a) {}
-    inline QPolygonF(const QVector<QPointF> &v) : QVector<QPointF>(v) {}
+    inline /*implicit*/ QPolygonF(const QVector<QPointF> &v) : QVector<QPointF>(v) {}
     QPolygonF(const QRectF &r);
-    QPolygonF(const QPolygon &a);
+    /*implicit*/ QPolygonF(const QPolygon &a);
     inline void swap(QPolygonF &other) { QVector<QPointF>::swap(other); } // prevent QVector<QPointF><->QPolygonF swaps
 
     inline void translate(qreal dx, qreal dy);

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

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

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);

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);

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);
 }
 
 /*!

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);

src/gui/util/qvalidator.h

@@ -176,7 +176,7 @@ class Q_GUI_EXPORT QRegExpValidator : public QValidator
 
 public:
     explicit QRegExpValidator(QObject *parent = 0);
-    QRegExpValidator(const QRegExp& rx, QObject *parent = 0);
+    explicit QRegExpValidator(const QRegExp& rx, QObject *parent = 0);
     ~QRegExpValidator();
 
     virtual QValidator::State validate(QString& input, int& pos) const;