From 6346c5b426935a767575ea758e99749bc6544f54 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 5 Jul 2024 10:35:57 +0200 Subject: uic: Fix some clang-tidy warnings - Repeated return types - Make member functions static - narrowing int conversions - Use auto * - Use list.isEmpty() - Use modern includes - Remove redundant access specifiers - minor fixes Pick-to: 6.8 Change-Id: I14ddf1add667536739fbb5fabb357dbaa7ef35c3 Reviewed-by: Jarek Kobus --- src/tools/uic/cpp/cppwriteinitialization.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/tools/uic/cpp/cppwriteinitialization.h') diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 0973def52d8..f8c1c12a23f 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -151,7 +151,7 @@ private: void writeRetranslateUi(const QString &parentPath); void addSetter(const QString &setter, const QString &directive = QString(), bool translatable = false); // don't call it if you already added *this as a child of another Item void addChild(Item *child); // all setters should already been added - private: + struct ItemData { QMultiMap setters; // directive to setter @@ -175,10 +175,10 @@ private: }; using Items = QList; - void addInitializer(Item *item, - const QString &name, int column, const QString &value, const QString &directive = QString(), bool translatable = false) const; - void addQtFlagsInitializer(Item *item, const DomPropertyMap &properties, - const QString &name, int column = -1) const; + static void addInitializer(Item *item, const QString &name, int column, + const QString &value, const QString &directive = QString(), bool translatable = false); + static void addQtFlagsInitializer(Item *item, const DomPropertyMap &properties, + const QString &name, int column = -1); void addQtEnumInitializer(Item *item, const DomPropertyMap &properties, const QString &name, int column = -1) const; void addBrushInitializer(Item *item, @@ -206,7 +206,6 @@ private: Declaration findDeclaration(const QString &name); -private: QString writeFontProperties(const DomFont *f); QString writeIconProperties(const DomResourceIcon *i); void writeThemeIconCheckAssignment(const QString &themeValue, const QString &iconName, -- cgit v1.2.3