diff options
Diffstat (limited to 'src/designer/src/components/widgetbox/widgetboxtreewidget.cpp')
-rw-r--r-- | src/designer/src/components/widgetbox/widgetboxtreewidget.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index dd17b3a4e..054d622a0 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -160,7 +160,7 @@ void WidgetBoxTreeWidget::restoreExpandedState() const auto &closedCategoryList = settings->value(groupKey + QLatin1String(widgetBoxExpandedKeyC), QStringList()).toStringList(); const StringSet closedCategories(closedCategoryList.cbegin(), closedCategoryList.cend()); expandAll(); - if (closedCategories.empty()) + if (closedCategories.isEmpty()) return; if (const int numCategories = categoryCount()) { @@ -366,7 +366,7 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString while (!reader.atEnd()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement: { - const QStringRef tag = reader.name(); + const auto tag = reader.name(); if (tag == QLatin1String(widgetBoxRootElementC)) { //<widgetbox version="4.5"> continue; @@ -411,7 +411,7 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString break; } case QXmlStreamReader::EndElement: { - const QStringRef tag = reader.name(); + const auto tag = reader.name(); if (tag == QLatin1String(widgetBoxRootElementC)) { continue; } @@ -472,7 +472,7 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe case QXmlStreamReader::StartElement: if (nesting++ == 0) { // First element must be <ui> or (legacy) <widget> - const QStringRef name = r.name(); + const auto name = r.name(); if (name == QLatin1String(uiElementC)) { startTagPosition = currentPosition; } else { @@ -593,9 +593,8 @@ static int findCategory(const QString &name, const WidgetBoxTreeWidget::Category static inline bool isValidIcon(const QIcon &icon) { if (!icon.isNull()) { - const QList<QSize> availableSizes = icon.availableSizes(); - if (!availableSizes.empty()) - return !availableSizes.front().isEmpty(); + const auto availableSizes = icon.availableSizes(); + return !availableSizes.isEmpty() && !availableSizes.constFirst().isEmpty(); } return false; } @@ -606,7 +605,7 @@ WidgetBoxTreeWidget::CategoryList WidgetBoxTreeWidget::loadCustomCategoryList() const QDesignerPluginManager *pm = m_core->pluginManager(); const QDesignerPluginManager::CustomWidgetList customWidgets = pm->registeredCustomWidgets(); - if (customWidgets.empty()) + if (customWidgets.isEmpty()) return result; static const QString customCatName = tr("Custom Widgets"); |