summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitorious/gitorious.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-04-09 09:58:17 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2013-04-09 11:39:56 +0200
commit9d7e786b03b5af13048471a23d9f4ccb34b32d8e (patch)
treeacd4a0fdbad7d3817eccbe69d8e2ad920e7bc34b /src/plugins/git/gitorious/gitorious.cpp
parent2ead48fb2674c26aede63382277e9647f93e6586 (diff)
downloadqt-creator-9d7e786b03b5af13048471a23d9f4ccb34b32d8e.tar.gz
Provide instance()-method for Utils::NetworkAccessManager.
Preemptively fix exit warning "QEventLoop cannot be used without QApplication" (Qt 5/dev) emitted by destruction of the of the generic highlighter manager singleton which had a member of type Utils::NetworkAccessManager. Use a single instance of Utils::NetworkAccessManager for the main thread and clean up properly using a qAddPostRoutine(). Change-Id: Ida57b9028a79eb4927818ce49088ea567f3bdfd6 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/git/gitorious/gitorious.cpp')
-rw-r--r--src/plugins/git/gitorious/gitorious.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp
index f76f15a437..fd61b2d6f7 100644
--- a/src/plugins/git/gitorious/gitorious.cpp
+++ b/src/plugins/git/gitorious/gitorious.cpp
@@ -357,11 +357,6 @@ void GitoriousProjectReader::readUnknownElement(QXmlStreamReader &reader)
// --- Gitorious
-Gitorious::Gitorious() :
- m_networkManager(0)
-{
-}
-
Gitorious &Gitorious::instance()
{
static Gitorious gitorious;
@@ -523,9 +518,7 @@ void Gitorious::slotReplyFinished()
// dispatch. Use host name in case an entry is removed in-between
QNetworkReply *Gitorious::createRequest(const QUrl &url, int protocol, int hostIndex, int page)
{
- if (!m_networkManager)
- m_networkManager = new Utils::NetworkAccessManager(this);
- QNetworkReply *reply = m_networkManager->get(QNetworkRequest(url));
+ QNetworkReply *reply = Utils::NetworkAccessManager::instance()->get(QNetworkRequest(url));
connect(reply, SIGNAL(finished()), this, SLOT(slotReplyFinished()));
reply->setProperty(protocolPropertyC, QVariant(protocol));
reply->setProperty(hostNamePropertyC, QVariant(hostName(hostIndex)));