aboutsummaryrefslogtreecommitdiff
path: root/launcher/java/JavaInstallList.cpp
diff options
context:
space:
mode:
authortxtsd <code@ihavea.quest>2022-11-04 15:39:41 +0530
committerGitHub <noreply@github.com>2022-11-04 15:39:41 +0530
commit8f045af8679e9ae1da120eb56e4cec452284ac56 (patch)
tree494945886ba7070b23b4256c72896705ad47e04a /launcher/java/JavaInstallList.cpp
parent2cf4d5f8ecd4afb1179b5a4e3bf694bcd359b628 (diff)
parent7956e6f04e32448b0043a49ff08873e117ba0a0b (diff)
downloadPrismLauncher-8f045af8679e9ae1da120eb56e4cec452284ac56.tar.gz
PrismLauncher-8f045af8679e9ae1da120eb56e4cec452284ac56.tar.bz2
PrismLauncher-8f045af8679e9ae1da120eb56e4cec452284ac56.zip
Merge pull request #374 from flowln/fix_lto
Diffstat (limited to 'launcher/java/JavaInstallList.cpp')
-rw-r--r--launcher/java/JavaInstallList.cpp10
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)
{