diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-08 13:49:49 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-15 16:23:21 +0100 |
commit | e8a4f4a92cfbab9fd43aea326dc5a7c88dbe390a (patch) | |
tree | 368c889fe1a1be32eea35730c7722cb6d04db8de /src/shared | |
parent | ec4b367cc41375564b6869cea833b60484965ac9 (diff) |
Qt Designer: Fix Qt API usage
Replace:
empty() by isEmpty()
front()/back() by constFirst()/constLast(), preventing detaching
Streamline some code.
Task-number: QTBUG-79896
Change-Id: Ic3f8414db79a83a30b55369a9352f332b41aa621
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/fontpanel/fontpanel.cpp | 10 | ||||
-rw-r--r-- | src/shared/qtpropertybrowser/qteditorfactory.cpp | 2 | ||||
-rw-r--r-- | src/shared/qtpropertybrowser/qtpropertymanager.cpp | 4 | ||||
-rw-r--r-- | src/shared/qttoolbardialog/qttoolbardialog.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp index 6121421fc..59238f6eb 100644 --- a/src/shared/fontpanel/fontpanel.cpp +++ b/src/shared/fontpanel/fontpanel.cpp @@ -119,10 +119,10 @@ void FontPanel::setSelectedFont(const QFont &f) if (m_familyComboBox->currentIndex() < 0) { // family not in writing system - find the corresponding one? QList<QFontDatabase::WritingSystem> familyWritingSystems = m_fontDatabase.writingSystems(f.family()); - if (familyWritingSystems.empty()) + if (familyWritingSystems.isEmpty()) return; - setWritingSystem(familyWritingSystems.front()); + setWritingSystem(familyWritingSystems.constFirst()); m_familyComboBox->setCurrentFont(f); } @@ -213,7 +213,7 @@ void FontPanel::updateFamily(const QString &family) const QString &oldStyleString = styleString(); const QStringList &styles = m_fontDatabase.styles(family); - const bool hasStyles = !styles.empty(); + const bool hasStyles = !styles.isEmpty(); m_styleComboBox->setCurrentIndex(-1); m_styleComboBox->clear(); @@ -270,10 +270,10 @@ void FontPanel::updatePointSizes(const QString &family, const QString &styleStri const int oldPointSize = pointSize(); QList<int> pointSizes = m_fontDatabase.pointSizes(family, styleString); - if (pointSizes.empty()) + if (pointSizes.isEmpty()) pointSizes = QFontDatabase::standardSizes(); - const bool hasSizes = !pointSizes.empty(); + const bool hasSizes = !pointSizes.isEmpty(); m_pointSizeComboBox->clear(); m_pointSizeComboBox->setEnabled(hasSizes); m_pointSizeComboBox->setCurrentIndex(-1); diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp index 664667c65..aa3ddbf00 100644 --- a/src/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp @@ -124,7 +124,7 @@ void EditorFactoryPrivate<Editor>::slotEditorDestroyed(QObject *object) const typename PropertyToEditorListMap::iterator pit = m_createdEditors.find(property); if (pit != m_createdEditors.end()) { pit.value().removeAll(editor); - if (pit.value().empty()) + if (pit.value().isEmpty()) m_createdEditors.erase(pit); } m_editorToProperty.erase(itEditor); diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp index 40a459c59..2abcb1657 100644 --- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -5660,7 +5660,7 @@ void QtFontPropertyManagerPrivate::slotFontDatabaseDelayedChange() m_familyNames = fontDatabase()->families(); // Adapt all existing properties - if (!m_propertyToFamily.empty()) { + if (!m_propertyToFamily.isEmpty()) { PropertyPropertyMap::const_iterator cend = m_propertyToFamily.constEnd(); for (PropertyPropertyMap::const_iterator it = m_propertyToFamily.constBegin(); it != cend; ++it) { QtProperty *familyProp = it.value(); @@ -5875,7 +5875,7 @@ void QtFontPropertyManager::initializeProperty(QtProperty *property) QtProperty *familyProp = d_ptr->m_enumPropertyManager->addProperty(); familyProp->setPropertyName(tr("Family")); - if (d_ptr->m_familyNames.empty()) + if (d_ptr->m_familyNames.isEmpty()) d_ptr->m_familyNames = fontDatabase()->families(); d_ptr->m_enumPropertyManager->setEnumNames(familyProp, d_ptr->m_familyNames); int idx = d_ptr->m_familyNames.indexOf(val.family()); diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp index bce8e4345..3e9363b93 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp @@ -1388,7 +1388,7 @@ void QtToolBarDialogPrivate::leftClicked() ToolBarItem *item = widgetActionToToolBar.value(action); if (item == currentToolBar) { // have to be toolBarToWidgetActions[item].remove(action); - if (toolBarToWidgetActions[item].empty()) + if (toolBarToWidgetActions[item].isEmpty()) toolBarToWidgetActions.remove(item); } widgetActionToToolBar.insert(action, 0); @@ -1437,7 +1437,7 @@ void QtToolBarDialogPrivate::rightClicked() if (toolBar) { currentState[toolBar].removeAll(action); toolBarToWidgetActions[toolBar].remove(action); - if (toolBarToWidgetActions[toolBar].empty()) + if (toolBarToWidgetActions[toolBar].isEmpty()) toolBarToWidgetActions.remove(toolBar); } widgetActionToToolBar.insert(action, currentToolBar); |