dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: 6.2 deprecation warning regard the QScopedPointer::swap function (#3655)

Browse source
This commit is contained in:
timoreo 2025-05-05 14:42:09 +02:00 • committed by GitHub
commit ca258109c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

13
launcher/ui/pages/modplatform/flame/FlamePage.cpp
View file

@ -341,17 +341,20 @@ void FlamePage::setSearchTerm(QString term)
void FlamePage::createFilterWidget()
{
auto widget = ModFilterWidget::create(nullptr, false, this);
m_filterWidget.swap(widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
auto widget = new ModFilterWidget(nullptr, false, this);
if (m_filterWidget) {
m_filterWidget->deleteLater();
}
m_filterWidget = (widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget);
// because we replaced the widget we also need to delete it
if (old) {
delete old;
old->deleteLater();
}
connect(ui->filterButton, &QPushButton::clicked, this, [this] { m_filterWidget->setHidden(!m_filterWidget->isHidden()); });
connect(m_filterWidget.get(), &ModFilterWidget::filterChanged, this, &FlamePage::triggerSearch);
connect(m_filterWidget, &ModFilterWidget::filterChanged, this, &FlamePage::triggerSearch);
auto response = std::make_shared<QByteArray>();
m_categoriesTask = FlameAPI::getCategories(response, ModPlatform::ResourceType::MODPACK);
QObject::connect(m_categoriesTask.get(), &Task::succeeded, [this, response]() {

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
QTimer m_search_timer;
unique_qobject_ptr<ModFilterWidget> m_filterWidget;
ModFilterWidget* m_filterWidget;
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;
}
unique_qobject_ptr<ModFilterWidget> FlameModPage::createFilterWidget()
ModFilterWidget* FlameModPage::createFilterWidget()
{
return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), false, this);
return new ModFilterWidget(&static_cast<MinecraftInstance&>(m_baseInstance), false, this);
}
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"; }
void openUrl(const QUrl& url) override;
unique_qobject_ptr<ModFilterWidget> createFilterWidget() override;
ModFilterWidget* createFilterWidget() override;
protected:
virtual void prepareProviderCategories() override;