diff --git a/src/plugins/qmldesigner/components/componentcore/theme.cpp b/src/plugins/qmldesigner/components/componentcore/theme.cpp index 586419910eb..d7eba033ca3 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.cpp +++ b/src/plugins/qmldesigner/components/componentcore/theme.cpp @@ -53,7 +53,7 @@ QColor Theme::evaluateColorAtThemeInstance(const QString &themeColorName) } qWarning() << Q_FUNC_INFO << "error while evaluating" << themeColorName; - return QColor(); + return {}; } Theme *Theme::instance() diff --git a/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp index c6b4ca6fd07..8a863d1931d 100644 --- a/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp @@ -46,10 +46,10 @@ void BindingIndicatorGraphicsItem::paint(QPainter *painter, const QStyleOptionGr QRectF BindingIndicatorGraphicsItem::boundingRect() const { - return QRectF(m_bindingLine.x1(), + return {m_bindingLine.x1(), m_bindingLine.y1(), m_bindingLine.x2() - m_bindingLine.x1() + 3, - m_bindingLine.y2() - m_bindingLine.y1() + 3); + m_bindingLine.y2() - m_bindingLine.y1() + 3}; } void BindingIndicatorGraphicsItem::updateBindingIndicator(const QLineF &bindingLine) diff --git a/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp b/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp index 7e026fcd68f..e7f9d0b6c4f 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp @@ -186,22 +186,22 @@ void ResizeController::hide() static QPointF topCenter(const QRectF &rect) { - return QPointF(rect.center().x(), rect.top()); + return {rect.center().x(), rect.top()}; } static QPointF leftCenter(const QRectF &rect) { - return QPointF(rect.left(), rect.center().y()); + return {rect.left(), rect.center().y()}; } static QPointF rightCenter(const QRectF &rect) { - return QPointF(rect.right(), rect.center().y()); + return {rect.right(), rect.center().y()}; } static QPointF bottomCenter(const QRectF &rect) { - return QPointF(rect.center().x(), rect.bottom()); + return {rect.center().x(), rect.bottom()}; } diff --git a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp index bc17616f6ae..a44bbadcdaf 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp @@ -48,7 +48,7 @@ void ResizeHandleItem::setHandlePosition(const QPointF & globalPosition, const Q QRectF ResizeHandleItem::boundingRect() const { - return QRectF(- 5., - 5., 9., 9.); + return {- 5., - 5., 9., 9.}; } void ResizeHandleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */) diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp index f62ddf85e34..eec5c3ab1ef 100644 --- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp +++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp @@ -289,7 +289,7 @@ QLineF Snapper::createSnapLine(Qt::Orientation orientation, if (orientation == Qt::Horizontal) { double lowerX(qMin(lowerLimit, double(itemRect.left()))); double upperX(qMax(upperLimit, double(itemRect.right()))); - return QLineF(lowerX, snapLine, upperX, snapLine); + return {lowerX, snapLine, upperX, snapLine}; } else { double lowerY(qMin(lowerLimit, double(itemRect.top()))); double upperY(qMax(upperLimit, double(itemRect.bottom()))); @@ -461,7 +461,7 @@ static QLineF mergedHorizontalLine(const QList &lineList) } double y(lineList.constFirst().y1()); - return QLineF(minimumX, y, maximumX, y); + return {minimumX, y, maximumX, y}; } static QLineF mergedVerticalLine(const QList &lineList) @@ -479,7 +479,7 @@ static QLineF mergedVerticalLine(const QList &lineList) } double x(lineList.constFirst().x1()); - return QLineF(x, minimumY, x, maximumY); + return {x, minimumY, x, maximumY}; } static QList mergedHorizontalLines(const QList &lineList) diff --git a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp index a6e53143435..0371d0f1bba 100644 --- a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp +++ b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp @@ -55,7 +55,7 @@ IconCheckboxItemDelegate::IconCheckboxItemDelegate(QObject *parent, QSize IconCheckboxItemDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex & /*modelIndex*/) const { - return QSize(15, 20); + return {15, 20}; } static bool isChecked(const QModelIndex &modelIndex) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index d1f7f41d022..38be04f5dc8 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -260,7 +260,7 @@ QModelIndex NavigatorTreeModel::index(int row, int column, const QModelIndex &parent) const { if (!m_view->model()) - return QModelIndex(); + return {}; if (!hasIndex(row, column, parent)) return QModelIndex(); @@ -288,7 +288,7 @@ QVariant NavigatorTreeModel::headerData(int, Qt::Orientation, int) const QModelIndex NavigatorTreeModel::parent(const QModelIndex &index) const { if (!index.isValid()) - return QModelIndex(); + return {}; const ModelNode modelNode = modelNodeForIndex(index); diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp index d445fdc1047..aa7cfe1bb08 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp @@ -213,7 +213,7 @@ QColor GradientModel::getColor(int index) const return stop.modelValue("color").value(); } qWarning() << Q_FUNC_INFO << "invalid color index"; - return QColor(); + return {}; } qreal GradientModel::getPosition(int index) const diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index 6c602ab4a03..dc8243e1c81 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -71,7 +71,7 @@ QColor convertColorFromString(const QString &s) uchar r = fromHex(s, 3); uchar g = fromHex(s, 5); uchar b = fromHex(s, 7); - return QColor(r, g, b, a); + return {r, g, b, a}; } else { QColor rv(s); return rv; diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp index 45999b0fe03..07e758b35ac 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp @@ -60,7 +60,7 @@ int StatesEditorModel::count() const QModelIndex StatesEditorModel::index(int row, int column, const QModelIndex &parent) const { if (m_statesEditorView.isNull()) - return QModelIndex(); + return {}; int internalNodeId = 0; diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 6829933cfeb..9a8527e6591 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -778,7 +778,7 @@ QRectF NodeInstanceView::sceneRect() const if (rootNodeInstance().isValid()) return rootNodeInstance().boundingRect(); - return QRectF(); + return {}; } QList filterNodesForSkipItems(const QList &nodeList) @@ -945,7 +945,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() ClearSceneCommand NodeInstanceView::createClearSceneCommand() const { - return ClearSceneCommand(); + return {}; } CompleteComponentCommand NodeInstanceView::createComponentCompleteCommand(const QList &instanceList) const diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp index 943294d3456..46f2e111914 100644 --- a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp @@ -69,7 +69,7 @@ QColor colorFromString(const QString &s, bool *ok) uchar g = fromHex(s, 5); uchar b = fromHex(s, 7); if (ok) *ok = true; - return QColor(r, g, b, a); + return {r, g, b, a}; } else { QColor rv(s); if (ok) *ok = rv.isValid(); @@ -82,7 +82,7 @@ QPointF pointFFromString(const QString &s, bool *ok) if (s.count(QLatin1Char(',')) != 1) { if (ok) *ok = false; - return QPointF(); + return {}; } bool xGood, yGood; @@ -105,7 +105,7 @@ QRectF rectFFromString(const QString &s, bool *ok) if (s.count(QLatin1Char(',')) != 2 || s.count(QLatin1Char('x')) != 1) { if (ok) *ok = false; - return QRectF(); + return {}; } bool xGood, yGood, wGood, hGood; @@ -132,7 +132,7 @@ QSizeF sizeFFromString(const QString &s, bool *ok) if (s.count(QLatin1Char('x')) != 1) { if (ok) *ok = false; - return QSizeF(); + return {}; } bool wGood, hGood; @@ -155,7 +155,7 @@ QVector3D vector3DFromString(const QString &s, bool *ok) if (s.count(QLatin1Char(',')) != 2) { if (ok) *ok = false; - return QVector3D(); + return {}; } bool xGood, yGood, zGood; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 0805a437ef4..fb695723a8e 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -455,7 +455,7 @@ QPointF QmlItemNode::instanceScenePosition() const else if (modelNode().hasParentProperty() && QmlItemNode::isValidQmlItemNode(modelNode().parentProperty().parentModelNode())) return QmlItemNode(modelNode().parentProperty().parentModelNode()).instanceSceneTransform().map(nodeInstance().position()); - return QPointF(); + return {}; } QPointF QmlItemNode::instancePosition() const diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp index 2c6e14d094c..6d858a86de2 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp @@ -498,7 +498,7 @@ QRectF PathItem::instanceBoundingRect() const if (formEditorItem()) return formEditorItem()->qmlItemNode().instanceBoundingRect(); - return QRectF(); + return {}; } void PathItem::readControlPoints()