Qt Designer/Property browser: Fix some repetitive type names

Use auto or return {}.

Task-number: QTBUG-113670
Change-Id: Ia04ad73aaef36d7bcf3faa53593b7748cdf20d46
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit ed892aa1a00308fbec11c0bb12b643a54160f90e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

8 files changed, 157 insertions, 159 deletions

diff --git a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
index 3336e96d9..20276fa7a 100644
--- a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
@@ -61,7 +61,7 @@ private:
 
 QToolButton *QtButtonPropertyBrowserPrivate::createButton(QWidget *parent) const
 {
-    QToolButton *button = new QToolButton(parent);
+    auto *button = new QToolButton(parent);
     button->setCheckable(true);
     button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
     button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
@@ -104,14 +104,13 @@ void QtButtonPropertyBrowserPrivate::init(QWidget *parent)
 {
     m_mainLayout = new QGridLayout();
     parent->setLayout(m_mainLayout);
-    QLayoutItem *item = new QSpacerItem(0, 0,
-                QSizePolicy::Fixed, QSizePolicy::Expanding);
+    auto *item = new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
     m_mainLayout->addItem(item, 0, 0);
 }
 
 void QtButtonPropertyBrowserPrivate::slotEditorDestroyed()
 {
-    QWidget *editor = qobject_cast<QWidget *>(q_ptr->sender());
+    auto *editor = qobject_cast<QWidget *>(q_ptr->sender());
     if (!editor)
         return;
     if (!m_widgetToItem.contains(editor))
@@ -202,7 +201,7 @@ void QtButtonPropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, QtBr
     WidgetItem *afterItem = m_indexToItem.value(afterIndex);
     WidgetItem *parentItem = m_indexToItem.value(index->parent());
 
-    WidgetItem *newItem = new WidgetItem();
+    auto *newItem = new WidgetItem();
     newItem->parent = parentItem;
 
     QGridLayout *layout = nullptr;
@@ -236,7 +235,7 @@ void QtButtonPropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, QtBr
             } else {
                 l = m_mainLayout;
             }
-            QFrame *container = new QFrame();
+            auto *container = new QFrame();
             container->setFrameShape(QFrame::Panel);
             container->setFrameShadow(QFrame::Raised);
             parentItem->container = container;
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp
index 4afc34f74..0954d61c2 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -65,7 +65,7 @@ public:
 template <class Editor>
 Editor *EditorFactoryPrivate<Editor>::createEditor(QtProperty *property, QWidget *parent)
 {
-    Editor *editor = new Editor(parent);
+    auto *editor = new Editor(parent);
     initializeEditor(property, editor);
     return editor;
 }
@@ -382,7 +382,7 @@ void QtSliderFactory::connectPropertyManager(QtIntPropertyManager *manager)
 QWidget *QtSliderFactory::createEditor(QtIntPropertyManager *manager, QtProperty *property,
         QWidget *parent)
 {
-    QSlider *editor = new QSlider(Qt::Horizontal, parent);
+    auto *editor = new QSlider(Qt::Horizontal, parent);
     d_ptr->initializeEditor(property, editor);
     editor->setSingleStep(manager->singleStep(property));
     editor->setRange(manager->minimum(property), manager->maximum(property));
@@ -534,7 +534,7 @@ void QtScrollBarFactory::connectPropertyManager(QtIntPropertyManager *manager)
 QWidget *QtScrollBarFactory::createEditor(QtIntPropertyManager *manager, QtProperty *property,
         QWidget *parent)
 {
-    QScrollBar *editor = new QScrollBar(Qt::Horizontal, parent);
+    auto *editor = new QScrollBar(Qt::Horizontal, parent);
     d_ptr->initializeEditor(property, editor);
     editor->setSingleStep(manager->singleStep(property));
     editor->setRange(manager->minimum(property), manager->maximum(property));
@@ -974,7 +974,7 @@ QWidget *QtLineEditFactory::createEditor(QtStringPropertyManager *manager,
     QLineEdit *editor = d_ptr->createEditor(property, parent);
     QRegularExpression regExp = manager->regExp(property);
     if (regExp.isValid() && !regExp.pattern().isEmpty()) {
-        QValidator *validator = new QRegularExpressionValidator(regExp, editor);
+        auto *validator = new QRegularExpressionValidator(regExp, editor);
         editor->setValidator(validator);
     }
     editor->setText(manager->value(property));
@@ -1498,7 +1498,7 @@ private:
 QtCharEdit::QtCharEdit(QWidget *parent)
     : QWidget(parent),  m_lineEdit(new QLineEdit(this))
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
+    auto *layout = new QHBoxLayout(this);
     layout->addWidget(m_lineEdit);
     layout->setContentsMargins(QMargins());
     m_lineEdit->installEventFilter(this);
@@ -1525,7 +1525,7 @@ bool QtCharEdit::eventFilter(QObject *o, QEvent *e)
         QAction *actionBefore = nullptr;
         if (actions.size() > 0)
             actionBefore = actions[0];
-        QAction *clearAction = new QAction(tr("Clear Char"), menu);
+        auto *clearAction = new QAction(tr("Clear Char"), menu);
         menu->insertAction(actionBefore, clearAction);
         menu->insertSeparator(actionBefore);
         clearAction->setEnabled(!m_value.isNull());
@@ -2118,7 +2118,7 @@ QtColorEditWidget::QtColorEditWidget(QWidget *parent) :
     m_label(new QLabel),
     m_button(new QToolButton)
 {
-    QHBoxLayout *lt = new QHBoxLayout(this);
+    auto *lt = new QHBoxLayout(this);
     setupTreeViewEditorMargin(lt);
     lt->setSpacing(0);
     lt->addWidget(m_pixmapLabel);
@@ -2318,7 +2318,7 @@ QtFontEditWidget::QtFontEditWidget(QWidget *parent) :
     m_label(new QLabel),
     m_button(new QToolButton)
 {
-    QHBoxLayout *lt = new QHBoxLayout(this);
+    auto *lt = new QHBoxLayout(this);
     setupTreeViewEditorMargin(lt);
     lt->setSpacing(0);
     lt->addWidget(m_pixmapLabel);
diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
index a7a23b5a3..9d1cb562d 100644
--- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
@@ -58,14 +58,13 @@ void QtGroupBoxPropertyBrowserPrivate::init(QWidget *parent)
 {
     m_mainLayout = new QGridLayout();
     parent->setLayout(m_mainLayout);
-    QLayoutItem *item = new QSpacerItem(0, 0,
-                QSizePolicy::Fixed, QSizePolicy::Expanding);
+    auto *item = new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
     m_mainLayout->addItem(item, 0, 0);
 }
 
 void QtGroupBoxPropertyBrowserPrivate::slotEditorDestroyed()
 {
-    QWidget *editor = qobject_cast<QWidget *>(q_ptr->sender());
+    auto *editor = qobject_cast<QWidget *>(q_ptr->sender());
     if (!editor)
         return;
     if (!m_widgetToItem.contains(editor))
@@ -126,7 +125,7 @@ void QtGroupBoxPropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, Qt
     WidgetItem *afterItem = m_indexToItem.value(afterIndex);
     WidgetItem *parentItem = m_indexToItem.value(index->parent());
 
-    WidgetItem *newItem = new WidgetItem();
+    auto *newItem = new WidgetItem();
     newItem->parent = parentItem;
 
     QGridLayout *layout = nullptr;
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
index 07bf57a9c..bb432349e 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp
@@ -1309,7 +1309,7 @@ void QtAbstractPropertyBrowserPrivate::createBrowserIndexes(QtProperty *property
 QtBrowserItem *QtAbstractPropertyBrowserPrivate::createBrowserIndex(QtProperty *property,
         QtBrowserItem *parentIndex, QtBrowserItem *afterIndex)
 {
-    QtBrowserItem *newIndex = new QtBrowserItem(q_ptr, property, parentIndex);
+    auto *newIndex = new QtBrowserItem(q_ptr, property, parentIndex);
     if (parentIndex) {
         parentIndex->d_ptr->addChild(newIndex, afterIndex);
     } else {
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
index 1716652f2..9b47132e6 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
@@ -98,7 +98,7 @@ QString QtCursorDatabase::cursorToShapeName(const QCursor &cursor) const
     int val = cursorToValue(cursor);
     if (val >= 0)
         return m_cursorNames.at(val);
-    return QString();
+    return {};
 }
 
 QIcon QtCursorDatabase::cursorToShapeIcon(const QCursor &cursor) const
@@ -122,7 +122,7 @@ QCursor QtCursorDatabase::valueToCursor(int value) const
 {
     if (m_valueToCursorShape.contains(value))
         return QCursor(m_valueToCursorShape[value]);
-    return QCursor();
+    return {};
 }
 #endif
 
@@ -221,7 +221,7 @@ QtBoolEdit::QtBoolEdit(QWidget *parent) :
     m_checkBox(new QCheckBox(this)),
     m_textVisible(true)
 {
-    QHBoxLayout *lt = new QHBoxLayout;
+    auto *lt = new QHBoxLayout;
     if (QApplication::layoutDirection() == Qt::LeftToRight)
         lt->setContentsMargins(4, 0, 0, 0);
     else
diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
index 1f710298d..ddf35ecc9 100644
--- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
@@ -687,7 +687,7 @@ QString QtIntPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return QString::number(it.value().val);
 }
 
@@ -984,7 +984,7 @@ QString QtDoublePropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return QString::number(it.value().val, 'f', it.value().decimals);
 }
 
@@ -1254,7 +1254,7 @@ QString QtStringPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return it.value().val;
 }
 
@@ -1443,7 +1443,7 @@ QString QtBoolPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     static const QString trueText = tr("True");
     static const QString falseText = tr("False");
@@ -1457,7 +1457,7 @@ QIcon QtBoolPropertyManager::valueIcon(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QIcon();
+        return {};
 
     return it.value() ? d_ptr->m_checkedIcon : d_ptr->m_uncheckedIcon;
 }
@@ -1625,7 +1625,7 @@ QString QtDatePropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return it.value().val.toString(d_ptr->m_format);
 }
 
@@ -1809,7 +1809,7 @@ QString QtTimePropertyManager::valueText(const QtProperty *property) const
 {
    const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return it.value().toString(d_ptr->m_format);
 }
 
@@ -1924,7 +1924,7 @@ QString QtDateTimePropertyManager::valueText(const QtProperty *property) const
 {
    const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return it.value().toString(d_ptr->m_format);
 }
 
@@ -2034,7 +2034,7 @@ QString QtKeySequencePropertyManager::valueText(const QtProperty *property) cons
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     return it.value().toString(QKeySequence::NativeText);
 }
 
@@ -2142,7 +2142,7 @@ QString QtCharPropertyManager::valueText(const QtProperty *property) const
 {
    const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QChar c = it.value();
     return c.isNull() ? QString() : QString(c);
 }
@@ -2322,7 +2322,7 @@ QString QtLocalePropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     const QLocale loc = it.value();
 
@@ -2565,7 +2565,7 @@ QString QtPointPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QPoint v = it.value();
     return tr("(%1, %2)").arg(v.x()).arg(v.y());
 }
@@ -2802,7 +2802,7 @@ QString QtPointFPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QPointF v = it.value().val;
     const int dec =  it.value().decimals;
     return tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec),
@@ -3121,7 +3121,7 @@ QString QtSizePropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QSize v = it.value().val;
     return tr("%1 x %2").arg(v.width()).arg(v.height());
 }
@@ -3482,7 +3482,7 @@ QString QtSizeFPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QSizeF v = it.value().val;
     const int dec = it.value().decimals;
     return tr("%1 x %2").arg(QString::number(v.width(), 'f', dec),
@@ -3874,7 +3874,7 @@ QString QtRectPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QRect v = it.value().val;
     return tr("[(%1, %2), %3 x %4]").arg(v.x()) .arg(v.y())
                                     .arg(v.width()).arg(v.height());
@@ -4300,7 +4300,7 @@ QString QtRectFPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
     const QRectF v = it.value().val;
     const int dec = it.value().decimals;
     return QString(tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x(), 'f', dec),
@@ -4661,14 +4661,14 @@ QString QtEnumPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     const QtEnumPropertyManagerPrivate::Data &data = it.value();
 
     const int v = data.val;
     if (v >= 0 && v < data.enumNames.size())
         return data.enumNames.at(v);
-    return QString();
+    return {};
 }
 
 /*!
@@ -4678,7 +4678,7 @@ QIcon QtEnumPropertyManager::valueIcon(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QIcon();
+        return {};
 
     const QtEnumPropertyManagerPrivate::Data &data = it.value();
 
@@ -4980,7 +4980,7 @@ QString QtFlagPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     const QtFlagPropertyManagerPrivate::Data &data = it.value();
 
@@ -5316,7 +5316,7 @@ QString QtSizePolicyPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     const QSizePolicy sp = it.value();
     const QtMetaEnumProvider *mep = metaEnumProvider();
@@ -5743,7 +5743,7 @@ QString QtFontPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     return QtPropertyBrowserUtils::fontValueText(it.value());
 }
@@ -5755,7 +5755,7 @@ QIcon QtFontPropertyManager::valueIcon(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QIcon();
+        return {};
 
     return QtPropertyBrowserUtils::fontValueIcon(it.value());
 }
@@ -6078,7 +6078,7 @@ QString QtColorPropertyManager::valueText(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     return QtPropertyBrowserUtils::colorValueText(it.value());
 }
@@ -6091,7 +6091,7 @@ QIcon QtColorPropertyManager::valueIcon(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QIcon();
+        return {};
     return QtPropertyBrowserUtils::brushValueIcon(QBrush(it.value()));
 }
 
@@ -6276,7 +6276,7 @@ QString QtCursorPropertyManager::valueText(const QtProperty *property) const
 {
    const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QString();
+        return {};
 
     return QtCursorDatabase::instance()->cursorToShapeName(it.value());
 }
@@ -6288,7 +6288,7 @@ QIcon QtCursorPropertyManager::valueIcon(const QtProperty *property) const
 {
     const auto it = d_ptr->m_values.constFind(property);
     if (it == d_ptr->m_values.constEnd())
-        return QIcon();
+        return {};
 
     return QtCursorDatabase::instance()->cursorToShapeIcon(it.value());
 }
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index 68560836d..875f476c1 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -243,7 +243,7 @@ int QtPropertyEditorDelegate::indentation(const QModelIndex &index) const
 
 void QtPropertyEditorDelegate::slotEditorDestroyed(QObject *object)
 {
-    if (QWidget *w = qobject_cast<QWidget *>(object)) {
+    if (auto *w = qobject_cast<QWidget *>(object)) {
         const auto it = m_editorToProperty.find(w);
         if (it != m_editorToProperty.end()) {
             m_propertyToEditor.remove(it.value());
@@ -393,7 +393,7 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style)
 
 void QtTreePropertyBrowserPrivate::init(QWidget *parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout(parent);
+    auto *layout = new QHBoxLayout(parent);
     layout->setContentsMargins(QMargins());
     m_treeWidget = new QtPropertyEditorView(parent);
     m_treeWidget->setEditorPrivate(this);
diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.cpp b/src/shared/qtpropertybrowser/qtvariantproperty.cpp
index 538c5c081..5384dbb4f 100644
--- a/src/shared/qtpropertybrowser/qtvariantproperty.cpp
+++ b/src/shared/qtpropertybrowser/qtvariantproperty.cpp
@@ -886,7 +886,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
     d_ptr->m_propertyType = 0;
 
     // IntPropertyManager
-    QtIntPropertyManager *intPropertyManager = new QtIntPropertyManager(this);
+    auto *intPropertyManager = new QtIntPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::Int] = intPropertyManager;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::Int][d_ptr->m_minimumAttribute] = QMetaType::Int;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::Int][d_ptr->m_maximumAttribute] = QMetaType::Int;
@@ -902,7 +902,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, int value)
             { d_ptr->slotSingleStepChanged(property, value); });
     // DoublePropertyManager
-    QtDoublePropertyManager *doublePropertyManager = new QtDoublePropertyManager(this);
+    auto *doublePropertyManager = new QtDoublePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::Double] = doublePropertyManager;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::Double][d_ptr->m_minimumAttribute] =
             QMetaType::Double;
@@ -926,14 +926,14 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, int value)
             { d_ptr->slotDecimalsChanged(property, value); });
     // BoolPropertyManager
-    QtBoolPropertyManager *boolPropertyManager = new QtBoolPropertyManager(this);
+    auto *boolPropertyManager = new QtBoolPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::Bool] = boolPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::Bool] = QMetaType::Bool;
     connect(boolPropertyManager, &QtBoolPropertyManager::valueChanged,
             this, [this](QtProperty *property, bool value)
             { d_ptr->slotValueChanged(property, value); });
     // StringPropertyManager
-    QtStringPropertyManager *stringPropertyManager = new QtStringPropertyManager(this);
+    auto *stringPropertyManager = new QtStringPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QString] = stringPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QString] = QMetaType::QString;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QString][d_ptr->m_regExpAttribute] =
@@ -945,7 +945,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, const QRegularExpression &value)
             { d_ptr->slotRegExpChanged(property, value); });
     // DatePropertyManager
-    QtDatePropertyManager *datePropertyManager = new QtDatePropertyManager(this);
+    auto *datePropertyManager = new QtDatePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QDate] = datePropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QDate] = QMetaType::QDate;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QDate][d_ptr->m_minimumAttribute] =
@@ -959,35 +959,35 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, const QDate &min, const QDate &max)
             { d_ptr->slotRangeChanged(property, min, max); });
     // TimePropertyManager
-    QtTimePropertyManager *timePropertyManager = new QtTimePropertyManager(this);
+    auto *timePropertyManager = new QtTimePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QTime] = timePropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QTime] = QMetaType::QTime;
     connect(timePropertyManager, &QtTimePropertyManager::valueChanged,
             this, [this](QtProperty *property, const QTime &value)
             { d_ptr->slotValueChanged(property, value); });
     // DateTimePropertyManager
-    QtDateTimePropertyManager *dateTimePropertyManager = new QtDateTimePropertyManager(this);
+    auto *dateTimePropertyManager = new QtDateTimePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QDateTime] = dateTimePropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QDateTime] = QMetaType::QDateTime;
     connect(dateTimePropertyManager, &QtDateTimePropertyManager::valueChanged,
             this, [this](QtProperty *property, const QDateTime &value)
             { d_ptr->slotValueChanged(property, value); });
     // KeySequencePropertyManager
-    QtKeySequencePropertyManager *keySequencePropertyManager = new QtKeySequencePropertyManager(this);
+    auto *keySequencePropertyManager = new QtKeySequencePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QKeySequence] = keySequencePropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QKeySequence] = QMetaType::QKeySequence;
     connect(keySequencePropertyManager, &QtKeySequencePropertyManager::valueChanged,
             this, [this](QtProperty *property, const QKeySequence &value)
             { d_ptr->slotValueChanged(property, value); });
     // CharPropertyManager
-    QtCharPropertyManager *charPropertyManager = new QtCharPropertyManager(this);
+    auto *charPropertyManager = new QtCharPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QChar] = charPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QChar] = QMetaType::QChar;
     connect(charPropertyManager, &QtCharPropertyManager::valueChanged,
             this, [this](QtProperty *property, const QChar &value)
             { d_ptr->slotValueChanged(property, value); });
     // LocalePropertyManager
-    QtLocalePropertyManager *localePropertyManager = new QtLocalePropertyManager(this);
+    auto *localePropertyManager = new QtLocalePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QLocale] = localePropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QLocale] = QMetaType::QLocale;
     connect(localePropertyManager, &QtLocalePropertyManager::valueChanged,
@@ -1003,7 +1003,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // PointPropertyManager
-    QtPointPropertyManager *pointPropertyManager = new QtPointPropertyManager(this);
+    auto *pointPropertyManager = new QtPointPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QPoint] = pointPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QPoint] = QMetaType::QPoint;
     connect(pointPropertyManager, &QtPointPropertyManager::valueChanged,
@@ -1019,7 +1019,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // PointFPropertyManager
-    QtPointFPropertyManager *pointFPropertyManager = new QtPointFPropertyManager(this);
+    auto *pointFPropertyManager = new QtPointFPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QPointF] = pointFPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QPointF] = QMetaType::QPointF;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QPointF][d_ptr->m_decimalsAttribute] =
@@ -1040,7 +1040,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // SizePropertyManager
-    QtSizePropertyManager *sizePropertyManager = new QtSizePropertyManager(this);
+    auto *sizePropertyManager = new QtSizePropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QSize] = sizePropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QSize] = QMetaType::QSize;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QSize][d_ptr->m_minimumAttribute] =
@@ -1066,7 +1066,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // SizeFPropertyManager
-    QtSizeFPropertyManager *sizeFPropertyManager = new QtSizeFPropertyManager(this);
+    auto *sizeFPropertyManager = new QtSizeFPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QSizeF] = sizeFPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QSizeF] = QMetaType::QSizeF;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QSizeF][d_ptr->m_minimumAttribute] =
@@ -1094,7 +1094,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // RectPropertyManager
-    QtRectPropertyManager *rectPropertyManager = new QtRectPropertyManager(this);
+    auto *rectPropertyManager = new QtRectPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QRect] = rectPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QRect] = QMetaType::QRect;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QRect][d_ptr->m_constraintAttribute] =
@@ -1118,7 +1118,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // RectFPropertyManager
-    QtRectFPropertyManager *rectFPropertyManager = new QtRectFPropertyManager(this);
+    auto *rectFPropertyManager = new QtRectFPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QRectF] = rectFPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QRectF] = QMetaType::QRectF;
     d_ptr->m_typeToAttributeToAttributeType[QMetaType::QRectF][d_ptr->m_constraintAttribute] =
@@ -1144,7 +1144,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // ColorPropertyManager
-    QtColorPropertyManager *colorPropertyManager = new QtColorPropertyManager(this);
+    auto *colorPropertyManager = new QtColorPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QColor] = colorPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QColor] = QMetaType::QColor;
     connect(colorPropertyManager, &QtColorPropertyManager::valueChanged,
@@ -1161,7 +1161,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // EnumPropertyManager
     int enumId = enumTypeId();
-    QtEnumPropertyManager *enumPropertyManager = new QtEnumPropertyManager(this);
+    auto *enumPropertyManager = new QtEnumPropertyManager(this);
     d_ptr->m_typeToPropertyManager[enumId] = enumPropertyManager;
     d_ptr->m_typeToValueType[enumId] = QMetaType::Int;
     d_ptr->m_typeToAttributeToAttributeType[enumId][d_ptr->m_enumNamesAttribute] =
@@ -1178,7 +1178,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, const QMap<int,QIcon> &value)
             { d_ptr->slotEnumIconsChanged(property, value); });
     // SizePolicyPropertyManager
-    QtSizePolicyPropertyManager *sizePolicyPropertyManager = new QtSizePolicyPropertyManager(this);
+    auto *sizePolicyPropertyManager = new QtSizePolicyPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QSizePolicy] = sizePolicyPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QSizePolicy] = QMetaType::QSizePolicy;
     connect(sizePolicyPropertyManager, &QtSizePolicyPropertyManager::valueChanged,
@@ -1203,7 +1203,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // FontPropertyManager
-    QtFontPropertyManager *fontPropertyManager = new QtFontPropertyManager(this);
+    auto *fontPropertyManager = new QtFontPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QFont] = fontPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QFont] = QMetaType::QFont;
     connect(fontPropertyManager, &QtFontPropertyManager::valueChanged,
@@ -1231,7 +1231,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             this, [this](QtProperty *property, QtProperty *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // CursorPropertyManager
-    QtCursorPropertyManager *cursorPropertyManager = new QtCursorPropertyManager(this);
+    auto *cursorPropertyManager = new QtCursorPropertyManager(this);
     d_ptr->m_typeToPropertyManager[QMetaType::QCursor] = cursorPropertyManager;
     d_ptr->m_typeToValueType[QMetaType::QCursor] = QMetaType::QCursor;
     connect(cursorPropertyManager, &QtCursorPropertyManager::valueChanged,
@@ -1239,7 +1239,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             { d_ptr->slotValueChanged(property, value); });
     // FlagPropertyManager
     int flagId = flagTypeId();
-    QtFlagPropertyManager *flagPropertyManager = new QtFlagPropertyManager(this);
+    auto *flagPropertyManager = new QtFlagPropertyManager(this);
     d_ptr->m_typeToPropertyManager[flagId] = flagPropertyManager;
     d_ptr->m_typeToValueType[flagId] = QMetaType::Int;
     d_ptr->m_typeToAttributeToAttributeType[flagId][d_ptr->m_flagNamesAttribute] =
@@ -1261,7 +1261,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
             { d_ptr->slotPropertyRemoved(property, parent); });
     // FlagPropertyManager
     int groupId = groupTypeId();
-    QtGroupPropertyManager *groupPropertyManager = new QtGroupPropertyManager(this);
+    auto *groupPropertyManager = new QtGroupPropertyManager(this);
     d_ptr->m_typeToPropertyManager[groupId] = groupPropertyManager;
     d_ptr->m_typeToValueType[groupId] = QMetaType::UnknownType;
 }
@@ -1347,58 +1347,58 @@ QVariant QtVariantPropertyManager::value(const QtProperty *property) const
 {
     QtProperty *internProp = propertyToWrappedProperty()->value(property, nullptr);
     if (internProp == nullptr)
-        return QVariant();
+        return {};
 
     QtAbstractPropertyManager *manager = internProp->propertyManager();
-    if (QtIntPropertyManager *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
+    if (auto *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
         return intManager->value(internProp);
-    } else if (QtDoublePropertyManager *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
+    } else if (auto *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
         return doubleManager->value(internProp);
-    } else if (QtBoolPropertyManager *boolManager = qobject_cast<QtBoolPropertyManager *>(manager)) {
+    } else if (auto *boolManager = qobject_cast<QtBoolPropertyManager *>(manager)) {
         return boolManager->value(internProp);
-    } else if (QtStringPropertyManager *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
+    } else if (auto *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
         return stringManager->value(internProp);
-    } else if (QtDatePropertyManager *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
+    } else if (auto *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
         return dateManager->value(internProp);
-    } else if (QtTimePropertyManager *timeManager = qobject_cast<QtTimePropertyManager *>(manager)) {
+    } else if (auto *timeManager = qobject_cast<QtTimePropertyManager *>(manager)) {
         return timeManager->value(internProp);
-    } else if (QtDateTimePropertyManager *dateTimeManager = qobject_cast<QtDateTimePropertyManager *>(manager)) {
+    } else if (auto *dateTimeManager = qobject_cast<QtDateTimePropertyManager *>(manager)) {
         return dateTimeManager->value(internProp);
-    } else if (QtKeySequencePropertyManager *keySequenceManager = qobject_cast<QtKeySequencePropertyManager *>(manager)) {
+    } else if (auto *keySequenceManager = qobject_cast<QtKeySequencePropertyManager *>(manager)) {
         return QVariant::fromValue(keySequenceManager->value(internProp));
-    } else if (QtCharPropertyManager *charManager = qobject_cast<QtCharPropertyManager *>(manager)) {
+    } else if (auto *charManager = qobject_cast<QtCharPropertyManager *>(manager)) {
         return charManager->value(internProp);
-    } else if (QtLocalePropertyManager *localeManager = qobject_cast<QtLocalePropertyManager *>(manager)) {
+    } else if (auto *localeManager = qobject_cast<QtLocalePropertyManager *>(manager)) {
         return localeManager->value(internProp);
-    } else if (QtPointPropertyManager *pointManager = qobject_cast<QtPointPropertyManager *>(manager)) {
+    } else if (auto *pointManager = qobject_cast<QtPointPropertyManager *>(manager)) {
         return pointManager->value(internProp);
-    } else if (QtPointFPropertyManager *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
+    } else if (auto *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
         return pointFManager->value(internProp);
-    } else if (QtSizePropertyManager *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
+    } else if (auto *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
         return sizeManager->value(internProp);
-    } else if (QtSizeFPropertyManager *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
+    } else if (auto *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
         return sizeFManager->value(internProp);
-    } else if (QtRectPropertyManager *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
+    } else if (auto *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
         return rectManager->value(internProp);
-    } else if (QtRectFPropertyManager *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
+    } else if (auto *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
         return rectFManager->value(internProp);
-    } else if (QtColorPropertyManager *colorManager = qobject_cast<QtColorPropertyManager *>(manager)) {
+    } else if (auto *colorManager = qobject_cast<QtColorPropertyManager *>(manager)) {
         return colorManager->value(internProp);
-    } else if (QtEnumPropertyManager *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
+    } else if (auto *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
         return enumManager->value(internProp);
     } else if (QtSizePolicyPropertyManager *sizePolicyManager =
                qobject_cast<QtSizePolicyPropertyManager *>(manager)) {
         return sizePolicyManager->value(internProp);
-    } else if (QtFontPropertyManager *fontManager = qobject_cast<QtFontPropertyManager *>(manager)) {
+    } else if (auto *fontManager = qobject_cast<QtFontPropertyManager *>(manager)) {
         return fontManager->value(internProp);
 #ifndef QT_NO_CURSOR
-    } else if (QtCursorPropertyManager *cursorManager = qobject_cast<QtCursorPropertyManager *>(manager)) {
+    } else if (auto *cursorManager = qobject_cast<QtCursorPropertyManager *>(manager)) {
         return cursorManager->value(internProp);
 #endif
-    } else if (QtFlagPropertyManager *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
+    } else if (auto *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
         return flagManager->value(internProp);
     }
-    return QVariant();
+    return {};
 }
 
 /*!
@@ -1451,31 +1451,31 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
 {
     int propType = propertyType(property);
     if (!propType)
-        return QVariant();
+        return {};
 
     const auto it = d_ptr->m_typeToAttributeToAttributeType.constFind(propType);
     if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd())
-        return QVariant();
+        return {};
 
     const QMap<QString, int> &attributes = it.value();
     const auto itAttr = attributes.constFind(attribute);
     if (itAttr == attributes.constEnd())
-        return QVariant();
+        return {};
 
     QtProperty *internProp = propertyToWrappedProperty()->value(property, nullptr);
     if (internProp == nullptr)
-        return QVariant();
+        return {};
 
     QtAbstractPropertyManager *manager = internProp->propertyManager();
-    if (QtIntPropertyManager *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
+    if (auto *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             return intManager->maximum(internProp);
         if (attribute == d_ptr->m_minimumAttribute)
             return intManager->minimum(internProp);
         if (attribute == d_ptr->m_singleStepAttribute)
             return intManager->singleStep(internProp);
-        return QVariant();
-    } else if (QtDoublePropertyManager *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
+        return {};
+    } else if (auto *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             return doubleManager->maximum(internProp);
         if (attribute == d_ptr->m_minimumAttribute)
@@ -1484,46 +1484,46 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
             return doubleManager->singleStep(internProp);
         if (attribute == d_ptr->m_decimalsAttribute)
             return doubleManager->decimals(internProp);
-        return QVariant();
-    } else if (QtStringPropertyManager *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_regExpAttribute)
             return stringManager->regExp(internProp);
-        return QVariant();
-    } else if (QtDatePropertyManager *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
+        return {};
+    } else if (auto *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             return dateManager->maximum(internProp);
         if (attribute == d_ptr->m_minimumAttribute)
             return dateManager->minimum(internProp);
-        return QVariant();
-    } else if (QtPointFPropertyManager *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_decimalsAttribute)
             return pointFManager->decimals(internProp);
-        return QVariant();
-    } else if (QtSizePropertyManager *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
+        return {};
+    } else if (auto *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             return sizeManager->maximum(internProp);
         if (attribute == d_ptr->m_minimumAttribute)
             return sizeManager->minimum(internProp);
-        return QVariant();
-    } else if (QtSizeFPropertyManager *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             return sizeFManager->maximum(internProp);
         if (attribute == d_ptr->m_minimumAttribute)
             return sizeFManager->minimum(internProp);
         if (attribute == d_ptr->m_decimalsAttribute)
             return sizeFManager->decimals(internProp);
-        return QVariant();
-    } else if (QtRectPropertyManager *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_constraintAttribute)
             return rectManager->constraint(internProp);
-        return QVariant();
-    } else if (QtRectFPropertyManager *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_constraintAttribute)
             return rectFManager->constraint(internProp);
         if (attribute == d_ptr->m_decimalsAttribute)
             return rectFManager->decimals(internProp);
-        return QVariant();
-    } else if (QtEnumPropertyManager *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_enumNamesAttribute)
             return enumManager->enumNames(internProp);
         if (attribute == d_ptr->m_enumIconsAttribute) {
@@ -1531,13 +1531,13 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
             v.setValue(enumManager->enumIcons(internProp));
             return v;
         }
-        return QVariant();
-    } else if (QtFlagPropertyManager *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
+        return {};
+    } else if (auto *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_flagNamesAttribute)
             return flagManager->flagNames(internProp);
-        return QVariant();
+        return {};
     }
-    return QVariant();
+    return {};
 }
 
 /*!
@@ -1549,7 +1549,7 @@ QStringList QtVariantPropertyManager::attributes(int propertyType) const
 {
     const auto it = d_ptr->m_typeToAttributeToAttributeType.constFind(propertyType);
     if (it == d_ptr->m_typeToAttributeToAttributeType.constEnd())
-        return QStringList();
+        return {};
     return it.value().keys();
 }
 
@@ -1605,73 +1605,73 @@ void QtVariantPropertyManager::setValue(QtProperty *property, const QVariant &va
 
 
     QtAbstractPropertyManager *manager = internProp->propertyManager();
-    if (QtIntPropertyManager *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
+    if (auto *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
         intManager->setValue(internProp, qvariant_cast<int>(val));
         return;
-    } else if (QtDoublePropertyManager *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
+    } else if (auto *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
         doubleManager->setValue(internProp, qvariant_cast<double>(val));
         return;
-    } else if (QtBoolPropertyManager *boolManager = qobject_cast<QtBoolPropertyManager *>(manager)) {
+    } else if (auto *boolManager = qobject_cast<QtBoolPropertyManager *>(manager)) {
         boolManager->setValue(internProp, qvariant_cast<bool>(val));
         return;
-    } else if (QtStringPropertyManager *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
+    } else if (auto *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
         stringManager->setValue(internProp, qvariant_cast<QString>(val));
         return;
-    } else if (QtDatePropertyManager *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
+    } else if (auto *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
         dateManager->setValue(internProp, qvariant_cast<QDate>(val));
         return;
-    } else if (QtTimePropertyManager *timeManager = qobject_cast<QtTimePropertyManager *>(manager)) {
+    } else if (auto *timeManager = qobject_cast<QtTimePropertyManager *>(manager)) {
         timeManager->setValue(internProp, qvariant_cast<QTime>(val));
         return;
-    } else if (QtDateTimePropertyManager *dateTimeManager = qobject_cast<QtDateTimePropertyManager *>(manager)) {
+    } else if (auto *dateTimeManager = qobject_cast<QtDateTimePropertyManager *>(manager)) {
         dateTimeManager->setValue(internProp, qvariant_cast<QDateTime>(val));
         return;
-    } else if (QtKeySequencePropertyManager *keySequenceManager = qobject_cast<QtKeySequencePropertyManager *>(manager)) {
+    } else if (auto *keySequenceManager = qobject_cast<QtKeySequencePropertyManager *>(manager)) {
         keySequenceManager->setValue(internProp, qvariant_cast<QKeySequence>(val));
         return;
-    } else if (QtCharPropertyManager *charManager = qobject_cast<QtCharPropertyManager *>(manager)) {
+    } else if (auto *charManager = qobject_cast<QtCharPropertyManager *>(manager)) {
         charManager->setValue(internProp, qvariant_cast<QChar>(val));
         return;
-    } else if (QtLocalePropertyManager *localeManager = qobject_cast<QtLocalePropertyManager *>(manager)) {
+    } else if (auto *localeManager = qobject_cast<QtLocalePropertyManager *>(manager)) {
         localeManager->setValue(internProp, qvariant_cast<QLocale>(val));
         return;
-    } else if (QtPointPropertyManager *pointManager = qobject_cast<QtPointPropertyManager *>(manager)) {
+    } else if (auto *pointManager = qobject_cast<QtPointPropertyManager *>(manager)) {
         pointManager->setValue(internProp, qvariant_cast<QPoint>(val));
         return;
-    } else if (QtPointFPropertyManager *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
+    } else if (auto *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
         pointFManager->setValue(internProp, qvariant_cast<QPointF>(val));
         return;
-    } else if (QtSizePropertyManager *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
+    } else if (auto *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
         sizeManager->setValue(internProp, qvariant_cast<QSize>(val));
         return;
-    } else if (QtSizeFPropertyManager *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
+    } else if (auto *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
         sizeFManager->setValue(internProp, qvariant_cast<QSizeF>(val));
         return;
-    } else if (QtRectPropertyManager *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
+    } else if (auto *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
         rectManager->setValue(internProp, qvariant_cast<QRect>(val));
         return;
-    } else if (QtRectFPropertyManager *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
+    } else if (auto *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
         rectFManager->setValue(internProp, qvariant_cast<QRectF>(val));
         return;
-    } else if (QtColorPropertyManager *colorManager = qobject_cast<QtColorPropertyManager *>(manager)) {
+    } else if (auto *colorManager = qobject_cast<QtColorPropertyManager *>(manager)) {
         colorManager->setValue(internProp, qvariant_cast<QColor>(val));
         return;
-    } else if (QtEnumPropertyManager *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
+    } else if (auto *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
         enumManager->setValue(internProp, qvariant_cast<int>(val));
         return;
     } else if (QtSizePolicyPropertyManager *sizePolicyManager =
                qobject_cast<QtSizePolicyPropertyManager *>(manager)) {
         sizePolicyManager->setValue(internProp, qvariant_cast<QSizePolicy>(val));
         return;
-    } else if (QtFontPropertyManager *fontManager = qobject_cast<QtFontPropertyManager *>(manager)) {
+    } else if (auto *fontManager = qobject_cast<QtFontPropertyManager *>(manager)) {
         fontManager->setValue(internProp, qvariant_cast<QFont>(val));
         return;
 #ifndef QT_NO_CURSOR
-    } else if (QtCursorPropertyManager *cursorManager = qobject_cast<QtCursorPropertyManager *>(manager)) {
+    } else if (auto *cursorManager = qobject_cast<QtCursorPropertyManager *>(manager)) {
         cursorManager->setValue(internProp, qvariant_cast<QCursor>(val));
         return;
 #endif
-    } else if (QtFlagPropertyManager *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
+    } else if (auto *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
         flagManager->setValue(internProp, qvariant_cast<int>(val));
         return;
     }
@@ -1708,7 +1708,7 @@ void QtVariantPropertyManager::setAttribute(QtProperty *property,
         return;
 
     QtAbstractPropertyManager *manager = internProp->propertyManager();
-    if (QtIntPropertyManager *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
+    if (auto *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             intManager->setMaximum(internProp, qvariant_cast<int>(value));
         else if (attribute == d_ptr->m_minimumAttribute)
@@ -1716,7 +1716,7 @@ void QtVariantPropertyManager::setAttribute(QtProperty *property,
         else if (attribute == d_ptr->m_singleStepAttribute)
             intManager->setSingleStep(internProp, qvariant_cast<int>(value));
         return;
-    } else if (QtDoublePropertyManager *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
+    } else if (auto *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             doubleManager->setMaximum(internProp, qvariant_cast<double>(value));
         if (attribute == d_ptr->m_minimumAttribute)
@@ -1726,27 +1726,27 @@ void QtVariantPropertyManager::setAttribute(QtProperty *property,
         if (attribute == d_ptr->m_decimalsAttribute)
             doubleManager->setDecimals(internProp, qvariant_cast<int>(value));
         return;
-    } else if (QtStringPropertyManager *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
+    } else if (auto *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_regExpAttribute)
             stringManager->setRegExp(internProp, qvariant_cast<QRegularExpression>(value));
         return;
-    } else if (QtDatePropertyManager *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
+    } else if (auto *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             dateManager->setMaximum(internProp, qvariant_cast<QDate>(value));
         if (attribute == d_ptr->m_minimumAttribute)
             dateManager->setMinimum(internProp, qvariant_cast<QDate>(value));
         return;
-    } else if (QtPointFPropertyManager *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
+    } else if (auto *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_decimalsAttribute)
             pointFManager->setDecimals(internProp, qvariant_cast<int>(value));
         return;
-    } else if (QtSizePropertyManager *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
+    } else if (auto *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             sizeManager->setMaximum(internProp, qvariant_cast<QSize>(value));
         if (attribute == d_ptr->m_minimumAttribute)
             sizeManager->setMinimum(internProp, qvariant_cast<QSize>(value));
         return;
-    } else if (QtSizeFPropertyManager *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
+    } else if (auto *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
             sizeFManager->setMaximum(internProp, qvariant_cast<QSizeF>(value));
         if (attribute == d_ptr->m_minimumAttribute)
@@ -1754,23 +1754,23 @@ void QtVariantPropertyManager::setAttribute(QtProperty *property,
         if (attribute == d_ptr->m_decimalsAttribute)
             sizeFManager->setDecimals(internProp, qvariant_cast<int>(value));
         return;
-    } else if (QtRectPropertyManager *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
+    } else if (auto *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_constraintAttribute)
             rectManager->setConstraint(internProp, qvariant_cast<QRect>(value));
         return;
-    } else if (QtRectFPropertyManager *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
+    } else if (auto *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_constraintAttribute)
             rectFManager->setConstraint(internProp, qvariant_cast<QRectF>(value));
         if (attribute == d_ptr->m_decimalsAttribute)
             rectFManager->setDecimals(internProp, qvariant_cast<int>(value));
         return;
-    } else if (QtEnumPropertyManager *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
+    } else if (auto *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_enumNamesAttribute)
             enumManager->setEnumNames(internProp, qvariant_cast<QStringList>(value));
         if (attribute == d_ptr->m_enumIconsAttribute)
             enumManager->setEnumIcons(internProp, qvariant_cast<QtIconMap>(value));
         return;
-    } else if (QtFlagPropertyManager *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
+    } else if (auto *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_flagNamesAttribute)
             flagManager->setFlagNames(internProp, qvariant_cast<QStringList>(value));
         return;
@@ -1865,7 +1865,7 @@ QtProperty *QtVariantPropertyManager::createProperty()
     if (!d_ptr->m_creatingProperty)
         return 0;
 
-    QtVariantProperty *property = new QtVariantProperty(this);
+    auto *property = new QtVariantProperty(this);
     d_ptr->m_propertyToType.insert(property, qMakePair(property, d_ptr->m_propertyType));
 
     return property;