diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 18:30:42 +0100 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 18:30:42 +0100 |
commit | 21a7af535c8b5b9d231aa3c41f7a990689fde560 (patch) | |
tree | af106527454f91335ec02b17bd36746bf2c3af60 /launcher/java/JavaInstallList.cpp | |
parent | a241d3f187f07cd3049c0d17f711c674fd6e7ccd (diff) | |
parent | 8f045af8679e9ae1da120eb56e4cec452284ac56 (diff) | |
download | PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.tar.gz PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.tar.bz2 PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.zip |
Merge branch 'develop' into macos-drag-n-drop
Diffstat (limited to 'launcher/java/JavaInstallList.cpp')
-rw-r--r-- | launcher/java/JavaInstallList.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index 0249bd22..155c956a 100644 --- a/launcher/java/JavaInstallList.cpp +++ b/launcher/java/JavaInstallList.cpp @@ -73,7 +73,7 @@ void JavaInstallList::load() } } -const BaseVersionPtr JavaInstallList::at(int i) const +const BaseVersion::Ptr JavaInstallList::at(int i) const { return m_vlist.at(i); } @@ -122,7 +122,7 @@ BaseVersionList::RoleList JavaInstallList::providesRoles() const } -void JavaInstallList::updateListData(QList<BaseVersionPtr> versions) +void JavaInstallList::updateListData(QList<BaseVersion::Ptr> versions) { beginResetModel(); m_vlist = versions; @@ -137,7 +137,7 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions) m_loadTask.reset(); } -bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) +bool sortJavas(BaseVersion::Ptr left, BaseVersion::Ptr right) { auto rleft = std::dynamic_pointer_cast<JavaInstall>(right); auto rright = std::dynamic_pointer_cast<JavaInstall>(left); @@ -210,11 +210,11 @@ void JavaListLoadTask::javaCheckerFinished() } } - QList<BaseVersionPtr> javas_bvp; + QList<BaseVersion::Ptr> javas_bvp; for (auto java : candidates) { //qDebug() << java->id << java->arch << " at " << java->path; - BaseVersionPtr bp_java = std::dynamic_pointer_cast<BaseVersion>(java); + BaseVersion::Ptr bp_java = std::dynamic_pointer_cast<BaseVersion>(java); if (bp_java) { |