diff options
| author | Fayne Aldan <FayneAldan@gmail.com> | 2022-11-15 18:34:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 18:34:24 -0700 |
| commit | e8b871ac72430c210e4750dcae8a119e8d757e20 (patch) | |
| tree | 243cf3dabfb9316c92414994e47a1861497906b5 /launcher/meta | |
| parent | 9f30c6d94b3c3fd5dbc5f998c9e9c8083b4d57df (diff) | |
| parent | cedc7754d96e4c53d50bcce2b2a0f139b840f3d0 (diff) | |
| download | PrismLauncher-e8b871ac72430c210e4750dcae8a119e8d757e20.tar.gz PrismLauncher-e8b871ac72430c210e4750dcae8a119e8d757e20.tar.bz2 PrismLauncher-e8b871ac72430c210e4750dcae8a119e8d757e20.zip | |
Merge branch 'PrismLauncher:develop' into version
Diffstat (limited to 'launcher/meta')
| -rw-r--r-- | launcher/meta/Index.cpp | 4 | ||||
| -rw-r--r-- | launcher/meta/JsonFormat.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/launcher/meta/Index.cpp b/launcher/meta/Index.cpp index eec1b329..242aad9f 100644 --- a/launcher/meta/Index.cpp +++ b/launcher/meta/Index.cpp @@ -58,11 +58,11 @@ QVariant Index::data(const QModelIndex &index, int role) const } int Index::rowCount(const QModelIndex &parent) const { - return m_lists.size(); + return parent.isValid() ? 0 : m_lists.size(); } int Index::columnCount(const QModelIndex &parent) const { - return 1; + return parent.isValid() ? 0 : 1; } QVariant Index::headerData(int section, Qt::Orientation orientation, int role) const { diff --git a/launcher/meta/JsonFormat.h b/launcher/meta/JsonFormat.h index 93217b7e..63128a4e 100644 --- a/launcher/meta/JsonFormat.h +++ b/launcher/meta/JsonFormat.h @@ -60,11 +60,6 @@ struct Require QString suggests; }; -inline Q_DECL_PURE_FUNCTION uint qHash(const Require &key, uint seed = 0) Q_DECL_NOTHROW -{ - return qHash(key.uid, seed); -} - using RequireSet = std::set<Require>; void parseIndex(const QJsonObject &obj, Index *ptr); |