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

4
src/libs/qmljs/qmljsdialect.cpp
View File

@@ -221,9 +221,9 @@ QList<Dialect> Dialect::companionLanguages() const
return langs;
}
Utils::QHashValueType qHash(const Dialect &o)
size_t qHash(const Dialect &o)
{
return Utils::QHashValueType(o.dialect());
return size_t(o.dialect());
}
QDebug operator << (QDebug &dbg, const Dialect &dialect)

2
src/libs/qmljs/qmljsdialect.h
View File

@@ -74,7 +74,7 @@ private:
Enum m_dialect;
};
QMLJS_EXPORT Utils::QHashValueType qHash(const Dialect &o);
QMLJS_EXPORT size_t qHash(const Dialect &o);
QMLJS_EXPORT QDebug operator << (QDebug &dbg, const Dialect &dialect);

4
src/libs/qmljs/qmljsimportdependencies.cpp
View File

@@ -502,9 +502,9 @@ QString ImportKey::toString() const
return res;
}
Utils::QHashValueType qHash(const ImportKey &info)
size_t qHash(const ImportKey &info)
{
Utils::QHashValueType res = ::qHash(info.type) ^
size_t res = ::qHash(info.type) ^
::qHash(info.majorVersion) ^ ::qHash(info.minorVersion);
foreach (const QString &s, info.splitPath)
res = res ^ ::qHash(s);

2
src/libs/qmljs/qmljsimportdependencies.h
View File

@@ -118,7 +118,7 @@ public:
QString toString() const;
};
Utils::QHashValueType qHash(const ImportKey &info);
size_t qHash(const ImportKey &info);
bool operator ==(const ImportKey &i1, const ImportKey &i2);
bool operator !=(const ImportKey &i1, const ImportKey &i2);
bool operator <(const ImportKey &i1, const ImportKey &i2);

2
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -175,7 +175,7 @@ bool FakeMetaObjectWithOrigin::operator ==(const FakeMetaObjectWithOrigin &o) co
return fakeMetaObject == o.fakeMetaObject;
}
Utils::QHashValueType qHash(const FakeMetaObjectWithOrigin &fmoo)
size_t qHash(const FakeMetaObjectWithOrigin &fmoo)
{
return qHash(fmoo.fakeMetaObject);
}

2
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -735,7 +735,7 @@ public:
bool operator ==(const FakeMetaObjectWithOrigin &o) const;
};
QMLJS_EXPORT Utils::QHashValueType qHash(const FakeMetaObjectWithOrigin &fmoo);
QMLJS_EXPORT size_t qHash(const FakeMetaObjectWithOrigin &fmoo);
class QMLJS_EXPORT CppQmlTypes
{

4
src/libs/qmljs/qmljslink.cpp
View File

@@ -55,7 +55,7 @@ public:
{}
private:
friend Utils::QHashValueType qHash(const ImportCacheKey &);
friend size_t qHash(const ImportCacheKey &);
friend bool operator==(const ImportCacheKey &, const ImportCacheKey &);
int m_type;
@@ -64,7 +64,7 @@ private:
int m_minorVersion;
};
Utils::QHashValueType qHash(const ImportCacheKey &info)
size_t qHash(const ImportCacheKey &info)
{
return ::qHash(info.m_type) ^ ::qHash(info.m_path) ^
::qHash(info.m_majorVersion) ^ ::qHash(info.m_minorVersion);