Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: replaced deprecated unique_qobject_ptr::swap with unique_ptr

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2025-05-06 00:17:38 +03:00
parent 476f3edce0
commit 7523bc1925
12 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/pages/modplatform/ModPage.cpp
View File

@ -61,7 +61,7 @@ ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance& instance) : ResourcePa
connect(m_ui->resourceFilterButton, &QPushButton::clicked, this, &ModPage::filterMods); connect(m_ui->resourceFilterButton, &QPushButton::clicked, this, &ModPage::filterMods);
} }
void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget) void ModPage::setFilterWidget(std::unique_ptr<ModFilterWidget>& widget)
{ {
if (m_filter_widget) if (m_filter_widget)
disconnect(m_filter_widget.get(), nullptr, nullptr, nullptr); disconnect(m_filter_widget.get(), nullptr, nullptr, nullptr);

6
launcher/ui/pages/modplatform/ModPage.h
View File

@ -51,11 +51,11 @@ class ModPage : public ResourcePage {
void addResourceToPage(ModPlatform::IndexedPack::Ptr, ModPlatform::IndexedVersion&, std::shared_ptr<ResourceFolderModel>) override; void addResourceToPage(ModPlatform::IndexedPack::Ptr, ModPlatform::IndexedVersion&, std::shared_ptr<ResourceFolderModel>) override;
virtual unique_qobject_ptr<ModFilterWidget> createFilterWidget() = 0; virtual std::unique_ptr<ModFilterWidget> createFilterWidget() = 0;
[[nodiscard]] bool supportsFiltering() const override { return true; }; [[nodiscard]] bool supportsFiltering() const override { return true; };
auto getFilter() const -> const std::shared_ptr<ModFilterWidget::Filter> { return m_filter; } auto getFilter() const -> const std::shared_ptr<ModFilterWidget::Filter> { return m_filter; }
void setFilterWidget(unique_qobject_ptr<ModFilterWidget>&); void setFilterWidget(std::unique_ptr<ModFilterWidget>&);
protected: protected:
ModPage(ModDownloadDialog* dialog, BaseInstance& instance); ModPage(ModDownloadDialog* dialog, BaseInstance& instance);
@ -67,7 +67,7 @@ class ModPage : public ResourcePage {
void triggerSearch() override; void triggerSearch() override;
protected: protected:
unique_qobject_ptr<ModFilterWidget> m_filter_widget; std::unique_ptr<ModFilterWidget> m_filter_widget;
std::shared_ptr<ModFilterWidget::Filter> m_filter; std::shared_ptr<ModFilterWidget::Filter> m_filter;
}; };

2
launcher/ui/pages/modplatform/flame/FlamePage.cpp
View File

@ -341,7 +341,7 @@ void FlamePage::setSearchTerm(QString term)
void FlamePage::createFilterWidget() void FlamePage::createFilterWidget()
{ {
auto widget = ModFilterWidget::create(nullptr, false, this); auto widget = ModFilterWidget::create(nullptr, false);
m_filterWidget.swap(widget); m_filterWidget.swap(widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget.get()); auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
// because we replaced the widget we also need to delete it // because we replaced the widget we also need to delete it

2
launcher/ui/pages/modplatform/flame/FlamePage.h
View File

@ -100,6 +100,6 @@ class FlamePage : public QWidget, public ModpackProviderBasePage {
// Used to do instant searching with a delay to cache quick changes // Used to do instant searching with a delay to cache quick changes
QTimer m_search_timer; QTimer m_search_timer;
unique_qobject_ptr<ModFilterWidget> m_filterWidget; std::unique_ptr<ModFilterWidget> m_filterWidget;
Task::Ptr m_categoriesTask; Task::Ptr m_categoriesTask;
}; };

4
launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
View File

@ -207,9 +207,9 @@ auto FlameShaderPackPage::shouldDisplay() const -> bool
return true; return true;
} }
unique_qobject_ptr<ModFilterWidget> FlameModPage::createFilterWidget() std::unique_ptr<ModFilterWidget> FlameModPage::createFilterWidget()
{ {
return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), false, this); return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), false);
} }
void FlameModPage::prepareProviderCategories() void FlameModPage::prepareProviderCategories()

2
launcher/ui/pages/modplatform/flame/FlameResourcePages.h
View File

@ -96,7 +96,7 @@ class FlameModPage : public ModPage {
[[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; } [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
void openUrl(const QUrl& url) override; void openUrl(const QUrl& url) override;
unique_qobject_ptr<ModFilterWidget> createFilterWidget() override; std::unique_ptr<ModFilterWidget> createFilterWidget() override;
protected: protected:
virtual void prepareProviderCategories() override; virtual void prepareProviderCategories() override;

2
launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
View File

@ -391,7 +391,7 @@ QString ModrinthPage::getSerachTerm() const
void ModrinthPage::createFilterWidget() void ModrinthPage::createFilterWidget()
{ {
auto widget = ModFilterWidget::create(nullptr, true, this); auto widget = ModFilterWidget::create(nullptr, true);
m_filterWidget.swap(widget); m_filterWidget.swap(widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget.get()); auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
// because we replaced the widget we also need to delete it // because we replaced the widget we also need to delete it

2
launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
View File

@ -103,6 +103,6 @@ class ModrinthPage : public QWidget, public ModpackProviderBasePage {
// Used to do instant searching with a delay to cache quick changes // Used to do instant searching with a delay to cache quick changes
QTimer m_search_timer; QTimer m_search_timer;
unique_qobject_ptr<ModFilterWidget> m_filterWidget; std::unique_ptr<ModFilterWidget> m_filterWidget;
Task::Ptr m_categoriesTask; Task::Ptr m_categoriesTask;
}; };

4
launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
View File

@ -142,9 +142,9 @@ auto ModrinthShaderPackPage::shouldDisplay() const -> bool
return true; return true;
} }
unique_qobject_ptr<ModFilterWidget> ModrinthModPage::createFilterWidget() std::unique_ptr<ModFilterWidget> ModrinthModPage::createFilterWidget()
{ {
return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), true, this); return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), true);
} }
void ModrinthModPage::prepareProviderCategories() void ModrinthModPage::prepareProviderCategories()

2
launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
View File

@ -94,7 +94,7 @@ class ModrinthModPage : public ModPage {
[[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; } [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
unique_qobject_ptr<ModFilterWidget> createFilterWidget() override; std::unique_ptr<ModFilterWidget> createFilterWidget() override;
protected: protected:
virtual void prepareProviderCategories() override; virtual void prepareProviderCategories() override;

8
launcher/ui/widgets/ModFilterWidget.cpp
View File

@ -49,9 +49,9 @@
#include "Application.h" #include "Application.h"
#include "minecraft/PackProfile.h" #include "minecraft/PackProfile.h"
unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended, QWidget* parent) std::unique_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended)
{ {
return unique_qobject_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended, parent)); return std::unique_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended));
} }
class VersionBasicModel : public QIdentityProxyModel { class VersionBasicModel : public QIdentityProxyModel {
@ -107,8 +107,8 @@ class AllVersionProxyModel : public QSortFilterProxyModel {
} }
}; };
ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, QWidget* parent) ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended)
: QTabWidget(parent), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter()) : QTabWidget(), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter())
{ {
ui->setupUi(this); ui->setupUi(this);

4
launcher/ui/widgets/ModFilterWidget.h
View File

@ -83,7 +83,7 @@ class ModFilterWidget : public QTabWidget {
} }
}; };
static unique_qobject_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended, QWidget* parent = nullptr); static std::unique_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended);
virtual ~ModFilterWidget(); virtual ~ModFilterWidget();
auto getFilter() -> std::shared_ptr<Filter>; auto getFilter() -> std::shared_ptr<Filter>;
@ -96,7 +96,7 @@ class ModFilterWidget : public QTabWidget {
void setCategories(const QList<ModPlatform::Category>&); void setCategories(const QList<ModPlatform::Category>&);
private: private:
ModFilterWidget(MinecraftInstance* instance, bool extendedSupport, QWidget* parent = nullptr); ModFilterWidget(MinecraftInstance* instance, bool extendedSupport);
void loadVersionList(); void loadVersionList();
void prepareBasicFilter(); void prepareBasicFilter();