1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDebug: fix copy-instead-of-move issues

Browse Source 
Coverity correctly complains that we're copying the QDebug object when
calling print*Container() when we could have moved it into the helper.

So do move it.

Pick-to: 6.6 6.5
Coverity-Id: 406803
Coverity-Id: 407406
Coverity-Id: 408523
Coverity-Id: 408562
Coverity-Id: 418431
Coverity-Id: 424788
Coverity-Id: 425106
Coverity-Id: 426537
Coverity-Id: 427163
Coverity-Id: 428925
Coverity-Id: 444463
Change-Id: Ic80247f315a09fffe9363577dff1d1c781859304
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 7e8196510df88bc956492593c27da1af7b31b8ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-03-25 08:08:58 +01:00 committed by Qt Cherry-pick Bot
parent 406c0d3464
commit aecc4b1aba
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/io/qdebug.h
View File

@ -318,67 +318,67 @@ using QDebugIfHasDebugStreamContainer =
template<typename T> template<typename T>
inline QDebugIfHasDebugStreamContainer<QList<T>, T> operator<<(QDebug debug, const QList<T> &vec) inline QDebugIfHasDebugStreamContainer<QList<T>, T> operator<<(QDebug debug, const QList<T> &vec)
{ {
return QtPrivate::printSequentialContainer(debug, "QList", vec); return QtPrivate::printSequentialContainer(std::move(debug), "QList", vec);
} }
template<typename T, qsizetype P> template<typename T, qsizetype P>
inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, const QVarLengthArray<T, P> &vec) inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, const QVarLengthArray<T, P> &vec)
{ {
return QtPrivate::printSequentialContainer(debug, "QVarLengthArray", vec); return QtPrivate::printSequentialContainer(std::move(debug), "QVarLengthArray", vec);
} }
template <typename T, typename Alloc> template <typename T, typename Alloc>
inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, const std::vector<T, Alloc> &vec) inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, const std::vector<T, Alloc> &vec)
{ {
return QtPrivate::printSequentialContainer(debug, "std::vector", vec); return QtPrivate::printSequentialContainer(std::move(debug), "std::vector", vec);
} }
template <typename T, typename Alloc> template <typename T, typename Alloc>
inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, const std::list<T, Alloc> &vec) inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, const std::list<T, Alloc> &vec)
{ {
return QtPrivate::printSequentialContainer(debug, "std::list", vec); return QtPrivate::printSequentialContainer(std::move(debug), "std::list", vec);
} }
template <typename T> template <typename T>
inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, std::initializer_list<T> list) inline QDebugIfHasDebugStream<T> operator<<(QDebug debug, std::initializer_list<T> list)
{ {
return QtPrivate::printSequentialContainer(debug, "std::initializer_list", list); return QtPrivate::printSequentialContainer(std::move(debug), "std::initializer_list", list);
} }
template <typename Key, typename T, typename Compare, typename Alloc> template <typename Key, typename T, typename Compare, typename Alloc>
inline QDebugIfHasDebugStream<Key, T> operator<<(QDebug debug, const std::map<Key, T, Compare, Alloc> &map) inline QDebugIfHasDebugStream<Key, T> operator<<(QDebug debug, const std::map<Key, T, Compare, Alloc> &map)
{ {
return QtPrivate::printSequentialContainer(debug, "std::map", map); // yes, sequential: *it is std::pair return QtPrivate::printSequentialContainer(std::move(debug), "std::map", map); // yes, sequential: *it is std::pair
} }
template <typename Key, typename T, typename Compare, typename Alloc> template <typename Key, typename T, typename Compare, typename Alloc>
inline QDebugIfHasDebugStream<Key, T> operator<<(QDebug debug, const std::multimap<Key, T, Compare, Alloc> &map) inline QDebugIfHasDebugStream<Key, T> operator<<(QDebug debug, const std::multimap<Key, T, Compare, Alloc> &map)
{ {
return QtPrivate::printSequentialContainer(debug, "std::multimap", map); // yes, sequential: *it is std::pair return QtPrivate::printSequentialContainer(std::move(debug), "std::multimap", map); // yes, sequential: *it is std::pair
} }
template <class Key, class T> template <class Key, class T>
inline QDebugIfHasDebugStreamContainer<QMap<Key, T>, Key, T> operator<<(QDebug debug, const QMap<Key, T> &map) inline QDebugIfHasDebugStreamContainer<QMap<Key, T>, Key, T> operator<<(QDebug debug, const QMap<Key, T> &map)
{ {
return QtPrivate::printAssociativeContainer(debug, "QMap", map); return QtPrivate::printAssociativeContainer(std::move(debug), "QMap", map);
} }
template <class Key, class T> template <class Key, class T>
inline QDebugIfHasDebugStreamContainer<QMultiMap<Key, T>, Key, T> operator<<(QDebug debug, const QMultiMap<Key, T> &map) inline QDebugIfHasDebugStreamContainer<QMultiMap<Key, T>, Key, T> operator<<(QDebug debug, const QMultiMap<Key, T> &map)
{ {
return QtPrivate::printAssociativeContainer(debug, "QMultiMap", map); return QtPrivate::printAssociativeContainer(std::move(debug), "QMultiMap", map);
} }
template <class Key, class T> template <class Key, class T>
inline QDebugIfHasDebugStreamContainer<QHash<Key, T>, Key, T> operator<<(QDebug debug, const QHash<Key, T> &hash) inline QDebugIfHasDebugStreamContainer<QHash<Key, T>, Key, T> operator<<(QDebug debug, const QHash<Key, T> &hash)
{ {
return QtPrivate::printAssociativeContainer(debug, "QHash", hash); return QtPrivate::printAssociativeContainer(std::move(debug), "QHash", hash);
} }
template <class Key, class T> template <class Key, class T>
inline QDebugIfHasDebugStreamContainer<QMultiHash<Key, T>, Key, T> operator<<(QDebug debug, const QMultiHash<Key, T> &hash) inline QDebugIfHasDebugStreamContainer<QMultiHash<Key, T>, Key, T> operator<<(QDebug debug, const QMultiHash<Key, T> &hash)
{ {
return QtPrivate::printAssociativeContainer(debug, "QMultiHash", hash); return QtPrivate::printAssociativeContainer(std::move(debug), "QMultiHash", hash);
} }
template <class T> template <class T>
@ -403,7 +403,7 @@ inline QDebugIfHasDebugStream<T1, T2> operator<<(QDebug debug, const std::pair<T
template <typename T> template <typename T>
inline QDebugIfHasDebugStreamContainer<QSet<T>, T> operator<<(QDebug debug, const QSet<T> &set) inline QDebugIfHasDebugStreamContainer<QSet<T>, T> operator<<(QDebug debug, const QSet<T> &set)
{ {
return QtPrivate::printSequentialContainer(debug, "QSet", set); return QtPrivate::printSequentialContainer(std::move(debug), "QSet", set);
} }
template <class T> template <class T>