diff options
| -rw-r--r-- | src/dbus/qdbuserror.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 8 | ||||
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpolygon.h | 14 | ||||
| -rw-r--r-- | src/gui/text/qtextoption.h | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 8964f20415..7fe5b45f8e 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -97,7 +97,7 @@ public: QDBusError(); #ifndef QT_BOOTSTRAPPED explicit QDBusError(const DBusError *error); - /*implicit*/ QDBusError(const QDBusMessage& msg); + Q_IMPLICIT QDBusError(const QDBusMessage& msg); #endif QDBusError(ErrorType error, const QString &message); QDBusError(const QDBusError &other); diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index be1d9b89e1..a44c95e240 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -96,9 +96,9 @@ public: inline QDBusPendingReply(const QDBusPendingReply &other) : QDBusPendingReplyBase(other) { } - inline /*implicit*/ QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code + inline Q_IMPLICIT QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code { *this = call; } - inline /*implicit*/ QDBusPendingReply(const QDBusMessage &message) + inline Q_IMPLICIT QDBusPendingReply(const QDBusMessage &message) { *this = message; } inline QDBusPendingReply &operator=(const QDBusPendingReply &other) @@ -173,9 +173,9 @@ public: inline QDBusPendingReply(const QDBusPendingReply &other) : QDBusPendingReplyBase(other) { } - inline /*implicit*/ QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code + inline Q_IMPLICIT QDBusPendingReply(const QDBusPendingCall &call) // required by qdbusxml2cpp-generated code { *this = call; } - inline /*implicit*/ QDBusPendingReply(const QDBusMessage &message) + inline Q_IMPLICIT QDBusPendingReply(const QDBusMessage &message) { *this = message; } inline QDBusPendingReply &operator=(const QDBusPendingReply &other) diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h index 20d666b4b8..bacbf2a987 100644 --- a/src/gui/kernel/qsurfaceformat.h +++ b/src/gui/kernel/qsurfaceformat.h @@ -94,7 +94,7 @@ public: #endif QSurfaceFormat(); - /*implicit*/ QSurfaceFormat(FormatOptions options); + Q_IMPLICIT QSurfaceFormat(FormatOptions options); QSurfaceFormat(const QSurfaceFormat &other); QSurfaceFormat &operator=(const QSurfaceFormat &other); ~QSurfaceFormat(); diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index a861da5f32..32567dcef8 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -58,9 +58,9 @@ class QPolygon : public QList<QPoint> public: using QList<QPoint>::QList; QPolygon() = default; - /* implicit */ QPolygon(const QList<QPoint> &v) : QList<QPoint>(v) { } - /* implicit */ QPolygon(QList<QPoint> &&v) noexcept : QList<QPoint>(std::move(v)) { } - /* implicit */ Q_GUI_EXPORT QPolygon(const QRect &r, bool closed=false); + Q_IMPLICIT QPolygon(const QList<QPoint> &v) : QList<QPoint>(v) { } + Q_IMPLICIT QPolygon(QList<QPoint> &&v) noexcept : QList<QPoint>(std::move(v)) { } + Q_IMPLICIT Q_GUI_EXPORT QPolygon(const QRect &r, bool closed=false); Q_GUI_EXPORT QPolygon(int nPoints, const int *points); void swap(QPolygon &other) noexcept { QList<QPoint>::swap(other); } // prevent QList<QPoint><->QPolygon swaps @@ -132,10 +132,10 @@ class QPolygonF : public QList<QPointF> public: using QList<QPointF>::QList; QPolygonF() = default; - /* implicit */ QPolygonF(const QList<QPointF> &v) : QList<QPointF>(v) { } - /* implicit */ QPolygonF(QList<QPointF> &&v) noexcept : QList<QPointF>(std::move(v)) { } - /* implicit */ Q_GUI_EXPORT QPolygonF(const QRectF &r); - /* implicit */ Q_GUI_EXPORT QPolygonF(const QPolygon &a); + Q_IMPLICIT QPolygonF(const QList<QPointF> &v) : QList<QPointF>(v) { } + Q_IMPLICIT QPolygonF(QList<QPointF> &&v) noexcept : QList<QPointF>(std::move(v)) { } + Q_IMPLICIT Q_GUI_EXPORT QPolygonF(const QRectF &r); + Q_IMPLICIT Q_GUI_EXPORT QPolygonF(const QPolygon &a); inline void swap(QPolygonF &other) { QList<QPointF>::swap(other); } // prevent QList<QPointF><->QPolygonF swaps Q_GUI_EXPORT operator QVariant() const; diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index 51e255e6f2..629c1d48da 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -81,7 +81,7 @@ public: }; QTextOption(); - /*implicit*/ QTextOption(Qt::Alignment alignment); + Q_IMPLICIT QTextOption(Qt::Alignment alignment); ~QTextOption(); QTextOption(const QTextOption &o); |