diff options
| author | Sergio Martins <smartins@kde.org> | 2022-01-20 23:20:47 +0000 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2022-01-20 23:20:47 +0000 |
| commit | 2a51a070007fdd450a9dbca4c4e3c0942ededd95 (patch) | |
| tree | f5223d0fe48f221da7cbad554b543bf69f681ed0 | |
| parent | 6f3efcb612b206dcc5d40260df348dfb10202721 (diff) | |
| parent | 821296032a16932cabe012649b4ce898de6e34eb (diff) | |
Merge branch '1.11'
| -rw-r--r-- | src/checks/manuallevel/qt6-deprecated-api-fixes.h | 7 | ||||
| -rw-r--r-- | tests/docker/images/clazy-archlinux/Dockerfile | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/checks/manuallevel/qt6-deprecated-api-fixes.h b/src/checks/manuallevel/qt6-deprecated-api-fixes.h index 78419cde..fc55f418 100644 --- a/src/checks/manuallevel/qt6-deprecated-api-fixes.h +++ b/src/checks/manuallevel/qt6-deprecated-api-fixes.h @@ -58,8 +58,11 @@ public: private: std::vector<clang::SourceLocation> m_listingMacroExpand; void fixForDeprecatedOperator(clang::Stmt* stmt, std::string className); - std::string buildReplacementforQDir(clang::DeclRefExpr *decl_operator, bool isPointer, string replacement, string replacement_var2); - std::string buildReplacementForQVariant(clang::DeclRefExpr* decl_operator, string replacement, string replacement_var2); + std::string buildReplacementforQDir(clang::DeclRefExpr *decl_operator, bool isPointer, + std::string replacement, std::string replacement_var2); + std::string buildReplacementForQVariant(clang::DeclRefExpr* decl_operator, + std::string replacement, + std::string replacement_var2); }; #endif diff --git a/tests/docker/images/clazy-archlinux/Dockerfile b/tests/docker/images/clazy-archlinux/Dockerfile index 377c1b12..56bb2f93 100644 --- a/tests/docker/images/clazy-archlinux/Dockerfile +++ b/tests/docker/images/clazy-archlinux/Dockerfile @@ -2,7 +2,7 @@ # You can run, for example: clazy/tests/docker/test_docker.py -b 1.6 , which will run the tests in all containers # Or explicitly: docker run -i -t iamsergio/clazy-archlinux sh /root/clazy/tests/docker/build-clazy.sh 1.6 -j12 none /usr -FROM archlinux/base +FROM archlinux MAINTAINER Sergio Martins (sergio.martins@kdab.com) RUN pacman -Syu --noconfirm |