diff options
author | Petr Mrázek <peterix@gmail.com> | 2015-09-26 04:04:09 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2015-09-26 04:04:09 +0200 |
commit | cca670013463f0062cec950d9b9bb76f9150ed93 (patch) | |
tree | f3a80479a0184f5f25af6c0ca42714cc7ba4e9c5 /logic/java | |
parent | 0af04dc060cfe94f25d1d3691c8bb87cbab1ecc5 (diff) | |
download | MultiMC-cca670013463f0062cec950d9b9bb76f9150ed93.tar MultiMC-cca670013463f0062cec950d9b9bb76f9150ed93.tar.gz MultiMC-cca670013463f0062cec950d9b9bb76f9150ed93.tar.lz MultiMC-cca670013463f0062cec950d9b9bb76f9150ed93.tar.xz MultiMC-cca670013463f0062cec950d9b9bb76f9150ed93.zip |
NOISSUE fix all clang warnings
Diffstat (limited to 'logic/java')
-rw-r--r-- | logic/java/JavaCheckerJob.h | 2 | ||||
-rw-r--r-- | logic/java/JavaVersionList.cpp | 4 | ||||
-rw-r--r-- | logic/java/JavaVersionList.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/logic/java/JavaCheckerJob.h b/logic/java/JavaCheckerJob.h index 23003a03..d031c435 100644 --- a/logic/java/JavaCheckerJob.h +++ b/logic/java/JavaCheckerJob.h @@ -59,7 +59,7 @@ public: { return javacheckers.size(); } - virtual bool isRunning() const + virtual bool isRunning() const override { return m_running; } diff --git a/logic/java/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp index a463ca6c..e3929f45 100644 --- a/logic/java/JavaVersionList.cpp +++ b/logic/java/JavaVersionList.cpp @@ -104,7 +104,7 @@ void JavaVersionList::updateListData(QList<BaseVersionPtr> versions) m_vlist.push_back(std::make_shared<JavaVersion>("1.9.0_1", "32", "/foo/bar/baz")); m_vlist.push_back(std::make_shared<JavaVersion>("1.9.0_1", "64", "/foo/bar/baz")); */ - sort(); + sortVersions(); if(m_vlist.size()) { auto best = std::dynamic_pointer_cast<JavaVersion>(m_vlist[0]); @@ -136,7 +136,7 @@ bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) return labove19 < rabove19; } -void JavaVersionList::sort() +void JavaVersionList::sortVersions() { beginResetModel(); std::sort(m_vlist.begin(), m_vlist.end(), sortJavas); diff --git a/logic/java/JavaVersionList.h b/logic/java/JavaVersionList.h index 905a5a7b..3acb5343 100644 --- a/logic/java/JavaVersionList.h +++ b/logic/java/JavaVersionList.h @@ -66,13 +66,13 @@ public: virtual bool isLoaded() override; virtual const BaseVersionPtr at(int i) const override; virtual int count() const override; - virtual void sort() override; + virtual void sortVersions() override; virtual QVariant data(const QModelIndex &index, int role) const override; virtual RoleList providesRoles() override; public slots: - virtual void updateListData(QList<BaseVersionPtr> versions); + virtual void updateListData(QList<BaseVersionPtr> versions) override; protected: QList<BaseVersionPtr> m_vlist; |