diff options
author | hjk <hjk@theqtcompany.com> | 2015-04-27 16:51:02 +0200 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2015-05-08 09:06:16 +0000 |
commit | 51b05427d35d1dfbc5a0724aab17dfb12b803619 (patch) | |
tree | d91f2a21bcb8717aeaba7746146e12171b04b3b1 /src/plugins/texteditor/generichighlighter/definitiondownloader.cpp | |
parent | 5615c406eac76595cceabdb9e6ff7568f12e7f9f (diff) |
TextEditor: Simplify definitiondowloader.h
Change-Id: I01621753851a99275ef8bee2c55c69840dc29580
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/generichighlighter/definitiondownloader.cpp')
-rw-r--r-- | src/plugins/texteditor/generichighlighter/definitiondownloader.cpp | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp index 6050f83766..5b983a3d9a 100644 --- a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp +++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp @@ -41,8 +41,22 @@ #include <utils/networkaccessmanager.h> -using namespace TextEditor; -using namespace Internal; +namespace TextEditor { +namespace Internal { + +static QNetworkReply *getData(const QUrl &url) +{ + Utils::NetworkAccessManager *manager = Utils::NetworkAccessManager::instance(); + + QNetworkRequest request(url); + QNetworkReply *reply = manager->get(request); + + QEventLoop eventLoop; + QObject::connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit); + eventLoop.exec(); + + return reply; +} DefinitionDownloader::DefinitionDownloader(const QUrl &url, const QString &localPath) : m_url(url), m_localPath(localPath), m_status(Unknown) @@ -50,12 +64,10 @@ DefinitionDownloader::DefinitionDownloader(const QUrl &url, const QString &local void DefinitionDownloader::run() { - Utils::NetworkAccessManager *manager = Utils::NetworkAccessManager::instance(); - int currentAttempt = 0; const int maxAttempts = 5; while (currentAttempt < maxAttempts) { - QScopedPointer<QNetworkReply> reply(getData(manager)); + QScopedPointer<QNetworkReply> reply(getData(m_url)); if (reply->error() != QNetworkReply::NoError) { m_status = NetworkError; return; @@ -72,18 +84,6 @@ void DefinitionDownloader::run() } } -QNetworkReply *DefinitionDownloader::getData(QNetworkAccessManager *manager) const -{ - QNetworkRequest request(m_url); - QNetworkReply *reply = manager->get(request); - - QEventLoop eventLoop; - connect(reply, SIGNAL(finished()), &eventLoop, SLOT(quit())); - eventLoop.exec(); - - return reply; -} - void DefinitionDownloader::saveData(QNetworkReply *reply) { const QString &urlPath = m_url.path(); @@ -106,3 +106,6 @@ void DefinitionDownloader::saveData(QNetworkReply *reply) DefinitionDownloader::Status DefinitionDownloader::status() const { return m_status; } + +} // namespace Internal +} // namespace TextEditor |