--- a/browsercore/core/network/webnetworkaccessmanager.h Fri May 14 15:40:36 2010 +0300
+++ b/browsercore/core/network/webnetworkaccessmanager.h Tue Jun 29 00:46:29 2010 -0400
@@ -1,21 +1,24 @@
/*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
*
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program. If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
*
-* Description:
+* Description:
*
*/
-
#ifndef __WEBNETWORKACCESSMANAGER_H__
#define __WEBNETWORKACCESSMANAGER_H__
@@ -25,6 +28,7 @@
#if QT_VERSION >= 0x040500
#include <QNetworkDiskCache>
+// #include "networkdiskcache.h"
#endif
namespace WRT {
@@ -43,7 +47,8 @@
virtual ~WebNetworkAccessManager();
void onMessageBoxResponse(int retValue);
-
+ int activeNetworkInterfaces();
+
public slots:
protected:
@@ -56,24 +61,23 @@
QNetworkReply* createRequestHelper(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
private slots:
-#ifdef NETWORK_DEBUG
- void error(QNetworkReply::NetworkError code);
-#endif
+ void onfinished(QNetworkReply* reply);
private:
WrtBrowserContainer* m_browserContainer;
CookieJar* m_cookieJar;
QNetworkReply* m_reply;
- QNetworkReply* n_reply; // Not owned, do not delete
QNetworkRequest* m_req;
#if QT_VERSION >= 0x040500
QNetworkDiskCache *qDiskCache;
+// NetworkDiskCache *qDiskCache;
#endif
signals:
void showMessageBox(WRT::MessageBoxProxy* data);
-
+ void networkErrorHappened(const QString & msg);
+ void networkErrorUrl(const QUrl & url);
};
}
#endif