From d20f3e02b142538ef6a8f39bf604f9d87d1519b0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 22 Feb 2015 11:39:25 +0100 Subject: [PATCH] Rename function to handlePostDownload to prevent ambiguity It was too similar to downloadPosts. --- src/mainwindow.cpp | 11 ++++++----- src/mainwindow.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3845afd..eaab79a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -149,7 +149,7 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent) if (DanbooruSettings::self()->autoDownload()) { - postDownload(QStringList(), false); + handlePostDownload(QStringList(), false); } m_connectWidget->hide(); @@ -186,7 +186,7 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent) QDockWidget* searchDockWidget = findChild(QLatin1String("SearchView")); searchDockWidget->hide(); - postDownload(m_searchWidget->selectedTags(), true /* relatedTags */); + handlePostDownload(m_searchWidget->selectedTags(), true /* relatedTags */); }); @@ -435,7 +435,7 @@ void DanbooruMainWindow::downloadPosts() } - postDownload(QStringList(), false); + handlePostDownload(QStringList(), false); } @@ -503,7 +503,7 @@ void DanbooruMainWindow::searchTag(const QModelIndex &index) QString tagName = m_tagModel->itemAt(index.row())->name(); QStringList tags = {tagName}; - postDownload(tags, true /* relatedTags */); + handlePostDownload(tags, true /* relatedTags */); } @@ -517,7 +517,7 @@ void DanbooruMainWindow::clearModels() } -void DanbooruMainWindow::postDownload(const QStringList &tags, bool relatedTags) +void DanbooruMainWindow::handlePostDownload(const QStringList &tags, bool relatedTags) { clearModels(); m_view->rootObject()->setProperty("poolMode", QVariant(false)); @@ -527,6 +527,7 @@ void DanbooruMainWindow::postDownload(const QStringList &tags, bool relatedTags) m_service->getRelatedTags(tags); } + // Call the downloadStarted signal from QML QMetaObject::invokeMethod(m_view->rootObject(), "downloadStarted"); m_service->getPostList(); } diff --git a/src/mainwindow.h b/src/mainwindow.h index 414fd29..8b1b18b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -93,7 +93,7 @@ private: void setupDockWidgets(); void setupConnections(); void clearModels(); - void postDownload(const QStringList& tags = QStringList(), bool relatedTags = false); + void handlePostDownload(const QStringList& tags = QStringList(), bool relatedTags = false); private Q_SLOTS: void connectToBoard();