From 0a37bcf24547101595299572533e5e3a98e04e1d Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 8 Sep 2012 19:08:53 +0200 Subject: Mark (non-public API's) ctor's as explicit Make C++ class constructors that can be used with only one required argument 'explicit' to minimize wrong use of the class. Change-Id: I12ad5b6eb1794108c6b7464a2573e84068733b03 Reviewed-by: Sergio Ahumada Reviewed-by: Thiago Macieira --- src/widgets/dialogs/qfilesystemmodel_p.h | 2 +- src/widgets/dialogs/qfscompleter_p.h | 2 +- src/widgets/styles/qwindowsxpstyle_p.h | 4 ++-- src/widgets/util/qundostack_p.h | 2 +- src/widgets/widgets/qdatetimeedit_p.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index 48bd82d7d9..6474e0bb9d 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -81,7 +81,7 @@ public: class QFileSystemNode { public: - QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = 0) + explicit QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = 0) : fileName(filename), populatedChildren(false), isVisible(false), dirtyChildrenIndex(-1), parent(p), info(0) {} ~QFileSystemNode() { QHash::const_iterator i = children.constBegin(); diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index eae972aa32..a5c4b3bc61 100644 --- a/src/widgets/dialogs/qfscompleter_p.h +++ b/src/widgets/dialogs/qfscompleter_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE */ class Q_WIDGETS_EXPORT QFSCompleter : public QCompleter { public: - QFSCompleter(QFileSystemModel *model, QObject *parent = 0) + explicit QFSCompleter(QFileSystemModel *model, QObject *parent = 0) : QCompleter(model, parent), proxyModel(0), sourceModel(model) { #if defined(Q_OS_WIN) diff --git a/src/widgets/styles/qwindowsxpstyle_p.h b/src/widgets/styles/qwindowsxpstyle_p.h index 1ef60096c7..bce9e3b9d2 100644 --- a/src/widgets/styles/qwindowsxpstyle_p.h +++ b/src/widgets/styles/qwindowsxpstyle_p.h @@ -209,8 +209,8 @@ QT_BEGIN_NAMESPACE class XPThemeData { public: - XPThemeData(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1, - int part = 0, int state = 0, const QRect &r = QRect()) + explicit XPThemeData(const QWidget *w = 0, QPainter *p = 0, int themeIn = -1, + int part = 0, int state = 0, const QRect &r = QRect()) : widget(w), painter(p), theme(themeIn), htheme(0), partId(part), stateId(state), mirrorHorizontally(false), mirrorVertically(false), noBorder(false), noContent(false), rotate(0), rect(r) diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h index 2b9735b7a7..681d4721e0 100644 --- a/src/widgets/util/qundostack_p.h +++ b/src/widgets/util/qundostack_p.h @@ -98,7 +98,7 @@ class QUndoAction : public QAction { Q_OBJECT public: - QUndoAction(const QString &prefix, QObject *parent = 0); + explicit QUndoAction(const QString &prefix, QObject *parent = 0); void setTextFormat(const QString &textFormat, const QString &defaultText); public Q_SLOTS: void setPrefixedText(const QString &text); diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index f7e6861677..73d8b9ebea 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -147,7 +147,7 @@ class QCalendarPopup : public QWidget { Q_OBJECT public: - QCalendarPopup(QWidget *parent = 0, QCalendarWidget *cw = 0); + explicit QCalendarPopup(QWidget *parent = 0, QCalendarWidget *cw = 0); QDate selectedDate() { return verifyCalendarInstance()->selectedDate(); } void setDate(const QDate &date); void setDateRange(const QDate &min, const QDate &max); -- cgit v1.2.3