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

Utils: Collapse most of porting,h

Browse Source 
Taking the Qt 6 branches, leaving some dummies until downstream
adapted.

Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-07-13 09:27:18 +02:00
parent 480da99508
commit 802de0eb5e
82 changed files with 206 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/classview/classviewsymbolinformation.h
View File

@@ -59,7 +59,7 @@ public:
private:
const int m_iconType;
const Utils::QHashValueType m_hash; // precalculated hash value - to speed up qHash
const size_t m_hash; // precalculated hash value - to speed up qHash
const QString m_name; // symbol name (e.g. SymbolInformation)
const QString m_type; // symbol type (e.g. (int char))
};

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

@@ -45,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 Utils::QHashValueType hash() const { return m_hash; }
inline size_t hash() const { return m_hash; }
inline bool operator==(const SymbolLocation &other) const
{
return hash() == other.hash() && line() == other.line() && column() == other.column()
@@ -56,11 +56,11 @@ private:
const QString m_fileName;
const int m_line;
const int m_column;
const Utils::QHashValueType m_hash; // precalculated hash value - to speed up qHash
const size_t m_hash; // precalculated hash value - to speed up qHash
};
//! qHash overload for QHash/QSet
inline Utils::QHashValueType qHash(const ClassView::Internal::SymbolLocation &location)
inline size_t qHash(const ClassView::Internal::SymbolLocation &location)
{
return location.hash();
}