Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / search / filenamesearchprotocol.cpp

diff --git a/src/search/filenamesearchprotocol.cpp b/src/search/filenamesearchprotocol.cpp
index fd7f09a8806f5d04f526bb15c99d79f6647e2c4d..b56a9958024832107c0a186422d048dd335ee193 100644 (file)
--- a/src/search/filenamesearchprotocol.cpp
+++ b/src/search/filenamesearchprotocol.cpp
@@ -25,6 +25,7 @@
 #include <KIO/NetAccess>
 #include <KIO/Job>
 #include <KUrl>
 #include <KIO/NetAccess>
 #include <KIO/Job>
 #include <KUrl>

+#include <kdemacros.h>

 #include <ktemporaryfile.h>
 
 #include <QCoreApplication>
 #include <ktemporaryfile.h>
 
 #include <QCoreApplication>


@@ -44,22 +45,22 @@ FileNameSearchProtocol::~FileNameSearchProtocol()
     cleanup();
 }
 
     cleanup();
 }
 

-void FileNameSearchProtocol::listDir(const KUrl& url)
+void FileNameSearchProtocol::listDir(const QUrl& url)

 {
     cleanup();
 
 {
     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;
     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;
     }
 
     if (checkContent == QLatin1String("yes")) {
         m_checkContent = true;
     }
 

-    const QString urlString = url.queryItem("url");
+    const QString urlString = url.queryItemValue("url");

     searchDirectory(KUrl(urlString));
 
     cleanup();
     searchDirectory(KUrl(urlString));
 
     cleanup();


@@ -80,8 +81,8 @@ void FileNameSearchProtocol::searchDirectory(const KUrl& directory)
     dirLister->openUrl(directory);
 
     QEventLoop eventLoop;
     dirLister->openUrl(directory);
 
     QEventLoop eventLoop;

-    QObject::connect(dirLister, SIGNAL(canceled()), &eventLoop, SLOT(quit()));
-    QObject::connect(dirLister, SIGNAL(completed()), &eventLoop, SLOT(quit()));
+    QObject::connect(dirLister, static_cast<void(KDirLister::*)()>(&KDirLister::canceled), &eventLoop, &QEventLoop::quit);
+    QObject::connect(dirLister, static_cast<void(KDirLister::*)()>(&KDirLister::completed), &eventLoop, &QEventLoop::quit);

     eventLoop.exec();
 
     // Visualize all items that match the search pattern
     eventLoop.exec();
 
     // Visualize all items that match the search pattern


@@ -91,11 +92,8 @@ void FileNameSearchProtocol::searchDirectory(const KUrl& directory)
         bool addItem = false;
         if (!m_regExp || item.name().contains(*m_regExp)) {
             addItem = true;
         bool addItem = false;
         if (!m_regExp || item.name().contains(*m_regExp)) {
             addItem = true;

-        } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
-            qDebug() << "### Checking" << item;
+        } else if (m_checkContent && item.determineMimeType().inherits(QLatin1String("text/plain"))) {

             addItem = contentContainsPattern(item.url());
             addItem = contentContainsPattern(item.url());

-        } else {
-            qDebug() << "### NOT Checking" << item;

         }
 
         if (addItem) {
         }
 
         if (addItem) {