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

This reverts commit ca258109c5, reversing
changes made to 693d9d02bc.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2025-05-06 00:06:56 +03:00
parent cb8f6f5e80
commit 476f3edce0
12 changed files with 36 additions and 36 deletions

View File

@@ -391,19 +391,17 @@ QString ModrinthPage::getSerachTerm() const
void ModrinthPage::createFilterWidget()
{
auto widget = new ModFilterWidget(nullptr, true, this);
if (m_filterWidget)
m_filterWidget->deleteLater();
m_filterWidget = widget;
auto old = ui->splitter->replaceWidget(0, m_filterWidget);
auto widget = ModFilterWidget::create(nullptr, true, this);
m_filterWidget.swap(widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
// because we replaced the widget we also need to delete it
if (old) {
old->deleteLater();
delete old;
}
connect(ui->filterButton, &QPushButton::clicked, this, [this] { m_filterWidget->setHidden(!m_filterWidget->isHidden()); });
connect(m_filterWidget, &ModFilterWidget::filterChanged, this, &ModrinthPage::triggerSearch);
connect(m_filterWidget.get(), &ModFilterWidget::filterChanged, this, &ModrinthPage::triggerSearch);
auto response = std::make_shared<QByteArray>();
m_categoriesTask = ModrinthAPI::getModCategories(response);
QObject::connect(m_categoriesTask.get(), &Task::succeeded, [this, response]() {

View File

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

View File

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

View File

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