From abc024eef78cfc84a577ce9f1638c5b6dc4d101b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 31 Jul 2018 16:03:59 +0200 Subject: uic: Fix clang-tidy warnings - Simplify/streamline if statmenents - Change else if to if after return/break/continue - Use isEmpty() for containers instead of checking size() - Replace index-based loops by range-based for Change-Id: I008228a99082a4d0e27be9f6c6af392602140b2f Reviewed-by: Jarek Kobus --- src/tools/uic/cpp/cppwritedeclaration.cpp | 19 +++---- src/tools/uic/cpp/cppwriteinitialization.cpp | 81 +++++++++++++--------------- src/tools/uic/cpp/cppwriteinitialization.h | 7 +-- src/tools/uic/customwidgetsinfo.cpp | 4 +- src/tools/uic/driver.cpp | 4 +- src/tools/uic/driver.h | 1 + src/tools/uic/treewalker.h | 2 +- src/tools/uic/uic.cpp | 4 +- src/tools/uic/uic.h | 1 + src/tools/uic/utils.h | 8 +-- 10 files changed, 58 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp index 9e774ad07b..995b99b692 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.cpp +++ b/src/tools/uic/cpp/cppwritedeclaration.cpp @@ -40,10 +40,11 @@ QT_BEGIN_NAMESPACE namespace { - void openNameSpaces(const QStringList &namespaceList, QTextStream &output) { - for (auto it = namespaceList.begin(), end = namespaceList.end(); it != end; ++it) { - if (!it->isEmpty()) - output << "namespace " << *it << " {\n"; + void openNameSpaces(const QStringList &namespaceList, QTextStream &output) + { + for (const QString &n : namespaceList) { + if (!n.isEmpty()) + output << "namespace " << n << " {\n"; } } @@ -103,13 +104,9 @@ void WriteDeclaration::acceptUI(DomUI *node) << "public:\n"; const QStringList connections = m_uic->databaseInfo()->connections(); - for (int i=0; ielementWidget()); diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 0e980ced1c..e6d90540b3 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -519,11 +519,9 @@ void WriteInitialization::acceptUI(DomUI *node) acceptWidget(node->elementWidget()); - if (m_buddies.size() > 0) + if (!m_buddies.empty()) openIfndef(m_output, QLatin1String(shortcutDefineC)); - for (int i=0; isetBuddy(" << b.buddy << ");\n"; } - if (m_buddies.size() > 0) + if (!m_buddies.empty()) closeIfndef(m_output, QLatin1String(shortcutDefineC)); if (node->elementTabStops()) @@ -817,9 +815,7 @@ void WriteInitialization::acceptWidget(DomWidget *node) m_layoutChain.pop(); const QStringList zOrder = node->elementZOrder(); - for (int i = 0; i < zOrder.size(); ++i) { - const QString name = zOrder.at(i); - + for (const QString &name : zOrder) { if (!m_registeredWidgets.contains(name)) { fprintf(stderr, "%s: Warning: Z-order assignment: '%s' is not a valid widget.\n", qPrintable(m_option.messagePrefix()), @@ -827,11 +823,8 @@ void WriteInitialization::acceptWidget(DomWidget *node) continue; } - if (name.isEmpty()) { - continue; - } - - m_output << m_indent << name << "->raise();\n"; + if (!name.isEmpty()) + m_output << m_indent << name << "->raise();\n"; } } @@ -1159,8 +1152,7 @@ void WriteInitialization::writeProperties(const QString &varName, leftMargin = topMargin = rightMargin = bottomMargin = -1; bool frameShadowEncountered = false; - for (int i=0; iattributeName(); @@ -1172,30 +1164,35 @@ void WriteInitialization::writeProperties(const QString &varName, const DomRect *r = p->elementRect(); m_output << m_indent << varName << "->resize(" << r->elementWidth() << ", " << r->elementHeight() << ");\n"; continue; - } else if (propertyName == QLatin1String("currentRow") // QListWidget::currentRow - && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QListWidget"))) { + } + if (propertyName == QLatin1String("currentRow") // QListWidget::currentRow + && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QListWidget"))) { m_delayedOut << m_indent << varName << "->setCurrentRow(" << p->elementNumber() << ");\n"; continue; - } else if (propertyName == QLatin1String("currentIndex") // set currentIndex later - && (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QComboBox")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStackedWidget")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTabWidget")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox")))) { + } + if (propertyName == QLatin1String("currentIndex") // set currentIndex later + && (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QComboBox")) + || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStackedWidget")) + || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTabWidget")) + || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox")))) { m_delayedOut << m_indent << varName << "->setCurrentIndex(" << p->elementNumber() << ");\n"; continue; - } else if (propertyName == QLatin1String("tabSpacing") - && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox"))) { + } + if (propertyName == QLatin1String("tabSpacing") + && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox"))) { m_delayedOut << m_indent << varName << "->layout()->setSpacing(" << p->elementNumber() << ");\n"; continue; - } else if (propertyName == QLatin1String("control") // ActiveQt support - && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QAxWidget"))) { + } + if (propertyName == QLatin1String("control") // ActiveQt support + && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QAxWidget"))) { // already done ;) continue; - } else if (propertyName == QLatin1String("default") - && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QPushButton"))) { + } + if (propertyName == QLatin1String("default") + && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QPushButton"))) { // QTBUG-44406: Setting of QPushButton::default needs to be delayed until the parent is set delayProperty = true; } else if (propertyName == QLatin1String("database") @@ -1850,7 +1847,7 @@ void WriteInitialization::acceptTabStops(DomTabStops *tabStops) const QStringList l = tabStops->elementTabStop(); for (int i=0; isetHeaderItem(" << itemName << ");\n"; - if (w->elementItem().size() == 0) + if (w->elementItem().empty()) return; QString tempName = disableSorting(w, varName); @@ -2176,9 +2173,8 @@ QList WriteInitialization::initializeTreeWidgetItem int col = -1; const DomPropertyList properties = domItem->elementProperty(); - for (int j = 0; j < properties.size(); ++j) { - DomProperty *p = properties.at(j); - if (p->attributeName() == QLatin1String("text")) { + for (DomProperty *p : properties) { + if (p->attributeName() == QLatin1String("text")) { if (!map.isEmpty()) { addCommonInitializers(item, map, col); map.clear(); @@ -2205,7 +2201,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) // columns const auto &columns = w->elementColumn(); - if (columns.size() != 0) { + if (!columns.empty()) { m_output << m_indent << "if (" << varName << "->columnCount() < " << columns.size() << ")\n" << m_dindent << varName << "->setColumnCount(" << columns.size() << ");\n"; } @@ -2227,7 +2223,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) // rows const auto &rows = w->elementRow(); - if (rows.size() != 0) { + if (!rows.isEmpty()) { m_output << m_indent << "if (" << varName << "->rowCount() < " << rows.size() << ")\n" << m_dindent << varName << "->setRowCount(" << rows.size() << ");\n"; } @@ -2251,8 +2247,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) const auto &items = w->elementItem(); - for (int i = 0; i < items.size(); ++i) { - const DomItem *cell = items.at(i); + for (const DomItem *cell : items) { if (cell->hasAttributeRow() && cell->hasAttributeColumn() && !cell->elementProperty().isEmpty()) { const int r = cell->attributeRow(); const int c = cell->attributeColumn(); @@ -2460,13 +2455,13 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp return QString(); bool generateMultiDirective = false; - if (emptyItemPolicy == Item::ConstructItemOnly && m_children.size() == 0) { + if (emptyItemPolicy == Item::ConstructItemOnly && m_children.isEmpty()) { if (m_setupUiData.policy == ItemData::DontGenerate) { m_setupUiStream << m_indent << "new " << m_itemClassName << '(' << parent << ");\n"; - return QString(); - } else if (m_setupUiData.policy == ItemData::GenerateWithMultiDirective) { - generateMultiDirective = true; + return QString(); } + if (m_setupUiData.policy == ItemData::GenerateWithMultiDirective) + generateMultiDirective = true; } if (generateMultiDirective) diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 2ba0b1352a..e6950a00ea 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -161,6 +161,7 @@ private: // special initialization // class Item { + Q_DISABLE_COPY(Item) public: Item(const QString &itemClassName, const QString &indent, QTextStream &setupUiStream, QTextStream &retranslateUiStream, Driver *driver); ~Item(); @@ -176,15 +177,15 @@ private: int setupUiCount() const { return m_setupUiData.setters.count(); } int retranslateUiCount() const { return m_retranslateUiData.setters.count(); } private: - struct ItemData { - ItemData() : policy(DontGenerate) {} + struct ItemData + { QMultiMap setters; // directive to setter QSet directives; enum TemporaryVariableGeneratorPolicy { // policies with priority, number describes the priority DontGenerate = 1, GenerateWithMultiDirective = 2, Generate = 3 - } policy; + } policy = DontGenerate; }; ItemData m_setupUiData; ItemData m_retranslateUiData; diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp index 6883b715ae..0ac0c2b6a3 100644 --- a/src/tools/uic/customwidgetsinfo.cpp +++ b/src/tools/uic/customwidgetsinfo.cpp @@ -33,9 +33,7 @@ QT_BEGIN_NAMESPACE -CustomWidgetsInfo::CustomWidgetsInfo() -{ -} +CustomWidgetsInfo::CustomWidgetsInfo() = default; void CustomWidgetsInfo::acceptUI(DomUI *node) { diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 72be667468..6b3a6f8f69 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -41,9 +41,7 @@ Driver::Driver() m_output = &m_stdout; } -Driver::~Driver() -{ -} +Driver::~Driver() = default; QString Driver::findOrInsertWidget(DomWidget *ui_widget) { diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h index 41c1572860..1563bdbd83 100644 --- a/src/tools/uic/driver.h +++ b/src/tools/uic/driver.h @@ -49,6 +49,7 @@ class DomButtonGroup; class Driver { + Q_DISABLE_COPY(Driver) public: Driver(); virtual ~Driver(); diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h index 78da17d628..43d4633d83 100644 --- a/src/tools/uic/treewalker.h +++ b/src/tools/uic/treewalker.h @@ -77,7 +77,7 @@ class DomButtonGroup; struct TreeWalker { - inline virtual ~TreeWalker() {} + inline virtual ~TreeWalker() = default; virtual void acceptUI(DomUI *ui); virtual void acceptLayoutDefault(DomLayoutDefault *layoutDefault); diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index 8e4709c831..957a50b1d5 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -56,9 +56,7 @@ Uic::Uic(Driver *d) { } -Uic::~Uic() -{ -} +Uic::~Uic() = default; bool Uic::printDependencies() { diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h index e00dc595bc..1c229bc516 100644 --- a/src/tools/uic/uic.h +++ b/src/tools/uic/uic.h @@ -53,6 +53,7 @@ struct Option; class Uic { + Q_DISABLE_COPY(Uic) public: Uic(Driver *driver); ~Uic(); diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h index 1f8fd28639..3f32a532ca 100644 --- a/src/tools/uic/utils.h +++ b/src/tools/uic/utils.h @@ -94,12 +94,8 @@ inline QString fixString(const QString &str, const QString &indent) inline QHash propertyMap(const QList &properties) { QHash map; - - for (int i=0; iattributeName(), p); - } - + for (DomProperty *p : properties) + map.insert(p->attributeName(), p); return map; } -- cgit v1.2.3