diff options
author | Sergio Martins <smartins@kde.org> | 2017-10-18 15:24:20 +0100 |
---|---|---|
committer | Sergio Martins <iamsergio@gmail.com> | 2017-10-18 15:24:20 +0100 |
commit | 1dbc2cda5489d5cc084cdb2385223d54f2527f7f (patch) | |
tree | faecac697b98f66a9e5067d2d300abc7e63a6ae5 /src | |
parent | 2c54b0c723b92fbe4ffe1b6c33187e88ca2113ba (diff) | |
parent | 387b7d5b96078179d751c6df7e560431dcc7da17 (diff) |
Merge branch '1.2'
Diffstat (limited to 'src')
-rw-r--r-- | src/QtUtils.cpp | 2 | ||||
-rw-r--r-- | src/checks/level1/detachingtemporary.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/QtUtils.cpp b/src/QtUtils.cpp index fdc8eb6a..6054d34f 100644 --- a/src/QtUtils.cpp +++ b/src/QtUtils.cpp @@ -271,7 +271,7 @@ CXXMethodDecl *QtUtils::pmfFromConnect(CallExpr *funcCall, int argIndex) } if (argIndex >= numArgs) { - llvm::errs() << "error, invalid argIndex " << argIndex << " number of arguments " << numArgs << " "; + llvm::errs() << "error, invalid argIndex " << argIndex << " number of arguments " << numArgs << "\n"; return nullptr; } diff --git a/src/checks/level1/detachingtemporary.cpp b/src/checks/level1/detachingtemporary.cpp index 940894fe..c0462b57 100644 --- a/src/checks/level1/detachingtemporary.cpp +++ b/src/checks/level1/detachingtemporary.cpp @@ -42,12 +42,12 @@ DetachingTemporary::DetachingTemporary(const std::string &name, ClazyContext *co m_writeMethodsByType["QString"] = {"push_back", "push_front", "clear", "chop"}; m_writeMethodsByType["QList"] = {"takeAt", "takeFirst", "takeLast", "removeOne", "removeAll", "erase"}; m_writeMethodsByType["QVector"] = { "fill", "insert"}; - m_writeMethodsByType["QMap"] = { "erase", "insert", "insertMulti", "remove", "take", "unite" }; - m_writeMethodsByType["QHash"] = { "erase", "insert", "insertMulti", "remove", "take", "unite"}; + m_writeMethodsByType["QMap"] = { "erase", "insert", "insertMulti", "remove", "take"}; + m_writeMethodsByType["QHash"] = { "erase", "insert", "insertMulti", "remove", "take"}; m_writeMethodsByType["QMultiHash"] = m_writeMethodsByType["QHash"]; m_writeMethodsByType["QMultiMap"] = m_writeMethodsByType["QMap"]; m_writeMethodsByType["QLinkedList"] = {"takeFirst", "takeLast", "removeOne", "removeAll", "erase"}; - m_writeMethodsByType["QSet"] = {"erase", "insert", "intersect", "unite", "subtract"}; + m_writeMethodsByType["QSet"] = {"erase", "insert"}; m_writeMethodsByType["QStack"] = {"push", "swap"}; m_writeMethodsByType["QQueue"] = {"enqueue", "swap"}; m_writeMethodsByType["QListSpecialMethods"] = {"sort", "replaceInStrings", "removeDuplicates"}; |