summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp/cppwriteinitialization.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-07-31 16:03:59 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-08-03 20:35:41 +0000
commitabc024eef78cfc84a577ce9f1638c5b6dc4d101b (patch)
treecfe20a5daf67c80824e8b2594996c800f4d2b9ef /src/tools/uic/cpp/cppwriteinitialization.h
parent22eb4bacaedab1612977fc23c5720a86179d1b04 (diff)
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 <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.h')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.h7
1 files changed, 4 insertions, 3 deletions
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<QString, QString> setters; // directive to setter
QSet<QString> 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;