aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compatibility with Qt 6.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-06-24 09:33:35 +03:00
parent 8b29cd6b36
commit aeba78f127
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/vpatterndb/vcontainer.h
View File

@ -240,7 +240,11 @@ private:
template <typename T> template <typename T>
void AddVariable(const QSharedPointer<T> &var, const QString &name); void AddVariable(const QSharedPointer<T> &var, const QString &name);
template <class T> auto qHash(const QSharedPointer<T> &p) -> uint; #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
template <class T> auto qHash(const QSharedPointer<T> &p, uint seed = 0) -> uint;
#else
template <class T> auto qHash(const QSharedPointer<T> &p, size_t seed = 0) -> size_t;
#endif
template <typename T> void UpdateObject(const quint32 &id, const QSharedPointer<T> &point); template <typename T> void UpdateObject(const quint32 &id, const QSharedPointer<T> &point);
@ -376,9 +380,13 @@ template <typename T> void VContainer::AddVariable(const QSharedPointer<T> &var,
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <class T> auto VContainer::qHash(const QSharedPointer<T> &p) -> uint #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
template <class T> auto VContainer::qHash(const QSharedPointer<T> &p, uint seed) -> uint
#else
template <class T> auto VContainer::qHash(const QSharedPointer<T> &p, size_t seed) -> size_t
#endif
{ {
return qHash(p.data()); return qHash(p.data(), seed);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------