whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port some more /*implicit*/-like comments to Q_IMPLICIT 

Change-Id: Ib70ad3f29365153af647deea54fc45467c413cb9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Giuseppe D'Angelo 2020-10-15 02:08:30 +02:00
parent 2ded340d55
commit 35c565e965
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus/qdbuserror.h
View File

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

8
src/dbus/qdbuspendingreply.h
View File

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

2
src/gui/kernel/qsurfaceformat.h
View File

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

14
src/gui/painting/qpolygon.h
View File

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

2
src/gui/text/qtextoption.h
View File

@ -81,7 +81,7 @@ public:
};
QTextOption();
/*implicit*/ QTextOption(Qt::Alignment alignment);
Q_IMPLICIT QTextOption(Qt::Alignment alignment);
~QTextOption();
QTextOption(const QTextOption &o);