aboutsummaryrefslogtreecommitdiff
path: root/launcher/java/JavaInstallList.h
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-11-01 19:48:26 -0300
committerflow <flowlnlnln@gmail.com>2022-11-01 19:48:26 -0300
commit7956e6f04e32448b0043a49ff08873e117ba0a0b (patch)
treea451fa409e400f3c9cc27715df3be7abc2ca043e /launcher/java/JavaInstallList.h
parentf6a3fa55b1fb4b10780065fd8e1df722cd40efd8 (diff)
downloadPrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.tar.gz
PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.tar.bz2
PrismLauncher-7956e6f04e32448b0043a49ff08873e117ba0a0b.zip
fix: don't use forward-declared Ptr types in meta/
This would cause ODR violations when those headers were included in other places that also included stuff like "Version.h" (note the "meta/Version.h"), which can cause problems, especially in LTO. Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/java/JavaInstallList.h')
-rw-r--r--launcher/java/JavaInstallList.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/java/JavaInstallList.h b/launcher/java/JavaInstallList.h
index 3c237edf..733dc7e1 100644
--- a/launcher/java/JavaInstallList.h
+++ b/launcher/java/JavaInstallList.h
@@ -42,7 +42,7 @@ public:
Task::Ptr getLoadTask() override;
bool isLoaded() override;
- const BaseVersionPtr at(int i) const override;
+ const BaseVersion::Ptr at(int i) const override;
int count() const override;
void sortVersions() override;
@@ -50,7 +50,7 @@ public:
RoleList providesRoles() const override;
public slots:
- void updateListData(QList<BaseVersionPtr> versions) override;
+ void updateListData(QList<BaseVersion::Ptr> versions) override;
protected:
void load();
@@ -59,7 +59,7 @@ protected:
protected:
Status m_status = Status::NotDone;
shared_qobject_ptr<JavaListLoadTask> m_loadTask;
- QList<BaseVersionPtr> m_vlist;
+ QList<BaseVersion::Ptr> m_vlist;
};
class JavaListLoadTask : public Task