feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Various Qt6 porting

Browse Source 
Rename QHashSeedType to QHashValueType and use it also for return
values.

Use qHashMulti directly instead of continuing using temporary QPairs.
Avoids ugly namespace tricks to find the new pair overloads, and is
actually clearer.

Classes used in signals cannot be forward-declared.  ...

Change-Id: I22450a0c642437a43f876e8e89cc8788fff3db61
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-16 08:17:01 +02:00
parent b17d098d08
commit babc1006f2
11 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/classview/classviewsymbollocation.h
View File

@@ -25,6 +25,8 @@
#pragma once
#include <utils/porting.h>
#include <QMetaType>
#include <QString>
@@ -43,7 +45,7 @@ public:
inline const QString &fileName() const { return m_fileName; }
inline int line() const { return m_line; }
inline int column() const { return m_column; }
inline int hash() const { return m_hash; }
inline Utils::QHashValueType hash() const { return m_hash; }
inline bool operator==(const SymbolLocation &other) const
{
return line() == other.line() && column() == other.column()
@@ -54,11 +56,11 @@ private:
QString m_fileName; //!< file name
int m_line; //!< line number
int m_column; //!< column
int m_hash; //!< precalculated hash value for the object, to speed up qHash
Utils::QHashValueType m_hash; //!< precalculated hash value for the object, to speed up qHash
};
//! qHash overload for QHash/QSet
inline uint qHash(const SymbolLocation &location)
inline Utils::QHashValueType qHash(const ClassView::Internal::SymbolLocation &location)
{
return location.hash();
}