feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Refactor: Move NAM to utils, rss model to welcome.

Browse Source 
Change-Id: I0dddedd820e75df05c3a028e7fbb02b642c79659
Reviewed-on: http://codereview.qt.nokia.com/1902
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Daniel Molkentin
2011-07-15 15:24:43 +02:00
committed by Eike Ziller
parent d20594a71d
commit 49b5556921
16 changed files with 118 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -52,7 +52,7 @@
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkRequest>
#include <coreplugin/networkaccessmanager.h>
#include <utils/networkaccessmanager.h>
using namespace Find;
using namespace Help;
@@ -107,7 +107,7 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
// -- HelpNetworkAccessManager
class HelpNetworkAccessManager : public Core::NetworkAccessManager
class HelpNetworkAccessManager : public Utils::NetworkAccessManager
{
public:
HelpNetworkAccessManager(QObject *parent);
@@ -118,7 +118,7 @@ protected:
};
HelpNetworkAccessManager::HelpNetworkAccessManager(QObject *parent)
: Core::NetworkAccessManager(parent)
: Utils::NetworkAccessManager(parent)
{
}
@@ -126,7 +126,7 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
const QNetworkRequest &request, QIODevice* outgoingData)
{
if (!HelpViewer::isLocalUrl(request.url()))
return Core::NetworkAccessManager::createRequest(op, request, outgoingData);
return Utils::NetworkAccessManager::createRequest(op, request, outgoingData);
QString url = request.url().toString();
const QHelpEngineCore &engine = LocalHelpManager::helpEngine();