From 1ee5cd64881a790b55b1140f761f034187ac1804 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Thu, 10 Apr 2014 16:34:35 +0200 Subject: [PATCH] make FileNameSearchProtocol::listDir override the KIO::SlaveBase method The parameter changed from KUrl to QUrl -> we have to add this. Found with -Woverloaded-virtual --- src/search/filenamesearchprotocol.cpp | 8 ++++---- src/search/filenamesearchprotocol.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/search/filenamesearchprotocol.cpp b/src/search/filenamesearchprotocol.cpp index ee7531879..fa42c3994 100644 --- a/src/search/filenamesearchprotocol.cpp +++ b/src/search/filenamesearchprotocol.cpp @@ -45,22 +45,22 @@ FileNameSearchProtocol::~FileNameSearchProtocol() cleanup(); } -void FileNameSearchProtocol::listDir(const KUrl& url) +void FileNameSearchProtocol::listDir(const QUrl& url) { cleanup(); - const QString search = url.queryItem("search"); + const QString search = url.queryItemValue("search"); if (!search.isEmpty()) { m_regExp = new QRegExp(search, Qt::CaseInsensitive, QRegExp::Wildcard); } m_checkContent = false; - const QString checkContent = url.queryItem("checkContent"); + const QString checkContent = url.queryItemValue("checkContent"); if (checkContent == QLatin1String("yes")) { m_checkContent = true; } - const QString urlString = url.queryItem("url"); + const QString urlString = url.queryItemValue("url"); searchDirectory(KUrl(urlString)); cleanup(); diff --git a/src/search/filenamesearchprotocol.h b/src/search/filenamesearchprotocol.h index 4a854d729..f691f998b 100644 --- a/src/search/filenamesearchprotocol.h +++ b/src/search/filenamesearchprotocol.h @@ -39,7 +39,7 @@ public: FileNameSearchProtocol(const QByteArray& pool, const QByteArray& app); virtual ~FileNameSearchProtocol(); - virtual void listDir(const KUrl& url); + virtual void listDir(const QUrl& url) Q_DECL_OVERRIDE; private: void searchDirectory(const KUrl& directory);