From 3e964212acfa72f2aeb9f82ae581bcc59774e8f8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 2 May 2017 20:31:34 +0800 Subject: [PATCH] Fix signaling to checkForUpdatesFinished() failed. Fixup of 14e168039cae8e7b241c206754fe6d6f8a7f919e. --- src/gui/search/pluginselectdlg.cpp | 5 ++--- src/gui/search/pluginselectdlg.h | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gui/search/pluginselectdlg.cpp b/src/gui/search/pluginselectdlg.cpp index c53c9e325..d99697741 100644 --- a/src/gui/search/pluginselectdlg.cpp +++ b/src/gui/search/pluginselectdlg.cpp @@ -44,7 +44,6 @@ #include "base/utils/misc.h" #include "base/net/downloadmanager.h" #include "base/net/downloadhandler.h" -#include "base/searchengine.h" #include "ico.h" #include "searchwidget.h" #include "pluginsourcedlg.h" @@ -95,7 +94,7 @@ PluginSelectDlg::PluginSelectDlg(SearchEngine *pluginManager, QWidget *parent) connect(m_pluginManager, SIGNAL(pluginInstallationFailed(QString, QString)), SLOT(pluginInstallationFailed(QString, QString))); connect(m_pluginManager, SIGNAL(pluginUpdated(QString)), SLOT(pluginUpdated(QString))); connect(m_pluginManager, SIGNAL(pluginUpdateFailed(QString, QString)), SLOT(pluginUpdateFailed(QString, QString))); - connect(m_pluginManager, SIGNAL(checkForUpdatesFinished(QHash)), SLOT(checkForUpdatesFinished(QHash))); + connect(m_pluginManager, &SearchEngine::checkForUpdatesFinished, this, &PluginSelectDlg::checkForUpdatesFinished); connect(m_pluginManager, SIGNAL(checkForUpdatesFailed(QString)), SLOT(checkForUpdatesFailed(QString))); show(); @@ -388,7 +387,7 @@ void PluginSelectDlg::iconDownloadFailed(const QString &url, const QString &reas qDebug("Could not download favicon: %s, reason: %s", qPrintable(url), qPrintable(reason)); } -void PluginSelectDlg::checkForUpdatesFinished(const QHash &updateInfo) +void PluginSelectDlg::checkForUpdatesFinished(const QHash &updateInfo) { finishAsyncOp(); if (updateInfo.isEmpty()) { diff --git a/src/gui/search/pluginselectdlg.h b/src/gui/search/pluginselectdlg.h index 23182e0d5..c767563e7 100644 --- a/src/gui/search/pluginselectdlg.h +++ b/src/gui/search/pluginselectdlg.h @@ -34,11 +34,11 @@ #include +#include "base/searchengine.h" + class QDropEvent; class QTreeWidgetItem; -class SearchEngine; - namespace Ui { class PluginSelectDlg; @@ -76,7 +76,7 @@ private slots: void iconDownloaded(const QString &url, QString filePath); void iconDownloadFailed(const QString &url, const QString &reason); - void checkForUpdatesFinished(const QHash &updateInfo); + void checkForUpdatesFinished(const QHash &updateInfo); void checkForUpdatesFailed(const QString &reason); void pluginInstalled(const QString &name); void pluginInstallationFailed(const QString &name, const QString &reason);