From d5bde429c1c78787729d17d2ca72774f99f83fd8 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 26 Apr 2013 14:12:45 +0200 Subject: [PATCH] * Renamed WebResultHintChecker to ResultUrlChecker. --- src/libtomahawk/CMakeLists.txt | 2 +- src/libtomahawk/Pipeline.cpp | 10 +++++----- src/libtomahawk/Pipeline.h | 2 +- .../{WebResultHintChecker.cpp => ResultUrlChecker.cpp} | 10 +++++----- .../{WebResultHintChecker.h => ResultUrlChecker.h} | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) rename src/libtomahawk/utils/{WebResultHintChecker.cpp => ResultUrlChecker.cpp} (90%) rename src/libtomahawk/utils/{WebResultHintChecker.h => ResultUrlChecker.h} (90%) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 0927f0c7d..1384df576 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -117,7 +117,7 @@ set( libGuiSources utils/BinaryInstallerHelper.cpp utils/BinaryExtractWorker.cpp utils/SharedTimeLine.cpp - utils/WebResultHintChecker.cpp + utils/ResultUrlChecker.cpp utils/NetworkReply.cpp widgets/AnimatedCounterLabel.cpp diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp index bee02619b..85eb0e6bc 100644 --- a/src/libtomahawk/Pipeline.cpp +++ b/src/libtomahawk/Pipeline.cpp @@ -27,7 +27,7 @@ #include "resolvers/QtScriptResolver.h" #include "Source.h" #include "SourceList.h" -#include "utils/WebResultHintChecker.h" +#include "utils/ResultUrlChecker.h" #include "utils/Logger.h" #include "boost/bind.hpp" @@ -301,8 +301,8 @@ Pipeline::reportResults( QID qid, const QList< result_ptr >& results ) cleanResults << r; } - WebResultHintChecker* checker = new WebResultHintChecker( q, httpResults ); - connect( checker, SIGNAL( done() ), SLOT( onWebResultCheckerDone() ) ); + ResultUrlChecker* checker = new ResultUrlChecker( q, httpResults ); + connect( checker, SIGNAL( done() ), SLOT( onResultUrlCheckerDone() ) ); addResultsToQuery( q, cleanResults ); if ( q->solved() && !q->isFullTextQuery() ) @@ -348,10 +348,10 @@ Pipeline::addResultsToQuery( const query_ptr& query, const QList< result_ptr >& void -Pipeline::onWebResultCheckerDone() +Pipeline::onResultUrlCheckerDone() { tDebug() << Q_FUNC_INFO; - WebResultHintChecker* checker = qobject_cast< WebResultHintChecker* >( sender() ); + ResultUrlChecker* checker = qobject_cast< ResultUrlChecker* >( sender() ); if ( !checker ) return; diff --git a/src/libtomahawk/Pipeline.h b/src/libtomahawk/Pipeline.h index 7c16e97c9..14ff44882 100644 --- a/src/libtomahawk/Pipeline.h +++ b/src/libtomahawk/Pipeline.h @@ -94,7 +94,7 @@ private slots: void shuntNext(); void onTemporaryQueryTimer(); - void onWebResultCheckerDone(); + void onResultUrlCheckerDone(); private: void addResultsToQuery( const query_ptr& query, const QList< result_ptr >& results ); diff --git a/src/libtomahawk/utils/WebResultHintChecker.cpp b/src/libtomahawk/utils/ResultUrlChecker.cpp similarity index 90% rename from src/libtomahawk/utils/WebResultHintChecker.cpp rename to src/libtomahawk/utils/ResultUrlChecker.cpp index f6451f2e0..be131ab68 100644 --- a/src/libtomahawk/utils/WebResultHintChecker.cpp +++ b/src/libtomahawk/utils/ResultUrlChecker.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "WebResultHintChecker.h" +#include "ResultUrlChecker.h" #include #include @@ -31,7 +31,7 @@ using namespace Tomahawk; -WebResultHintChecker::WebResultHintChecker( const query_ptr& query, const QList< result_ptr >& results ) +ResultUrlChecker::ResultUrlChecker( const query_ptr& query, const QList< result_ptr >& results ) : QObject( 0 ) , m_query( query ) , m_results( results ) @@ -40,13 +40,13 @@ WebResultHintChecker::WebResultHintChecker( const query_ptr& query, const QList< } -WebResultHintChecker::~WebResultHintChecker() +ResultUrlChecker::~ResultUrlChecker() { } void -WebResultHintChecker::check() +ResultUrlChecker::check() { foreach ( const result_ptr& result, m_results ) { @@ -63,7 +63,7 @@ WebResultHintChecker::check() void -WebResultHintChecker::headFinished() +ResultUrlChecker::headFinished() { NetworkReply* r = qobject_cast( sender() ); r->deleteLater(); diff --git a/src/libtomahawk/utils/WebResultHintChecker.h b/src/libtomahawk/utils/ResultUrlChecker.h similarity index 90% rename from src/libtomahawk/utils/WebResultHintChecker.h rename to src/libtomahawk/utils/ResultUrlChecker.h index 598c6f17f..543c6e9e1 100644 --- a/src/libtomahawk/utils/WebResultHintChecker.h +++ b/src/libtomahawk/utils/ResultUrlChecker.h @@ -29,12 +29,12 @@ namespace Tomahawk { -class WebResultHintChecker : public QObject +class ResultUrlChecker : public QObject { Q_OBJECT public: - WebResultHintChecker( const query_ptr& query, const QList< result_ptr >& results ); - virtual ~WebResultHintChecker(); + ResultUrlChecker( const query_ptr& query, const QList< result_ptr >& results ); + virtual ~ResultUrlChecker(); query_ptr query() const { return m_query; } QList< result_ptr > results() const { return m_results; }