From a96ef64c37b32bbbb9799bd8567dff383cb49549 Mon Sep 17 00:00:00 2001
From: Jason Barron <jbarron@trolltech.com>
Date: Wed, 12 Aug 2009 13:37:29 +0200
Subject: Revert "Fix to QtNetwork ARMV5 UDEB compilation"

This reverts commit 32f931cb6ab5f3e50f1f582276d896f2dff716f1.
This reverts commit e39de8681800cbe2ce31c155d23237410b7c21f3.

The above commits were added as a workaround to a bug in RVCT which has
been fixed.

Conflicts:

	src/network/access/qnetworkcookie.h
	src/network/access/qnetworkrequest.h
---
 src/network/access/qnetworkcookie.cpp  | 37 ----------------------------------
 src/network/access/qnetworkcookie.h    |  4 +---
 src/network/access/qnetworkrequest.cpp | 12 -----------
 src/network/access/qnetworkrequest.h   |  4 +---
 4 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/src/network/access/qnetworkcookie.cpp b/src/network/access/qnetworkcookie.cpp
index dd5edb0..854bd17 100644
--- a/src/network/access/qnetworkcookie.cpp
+++ b/src/network/access/qnetworkcookie.cpp
@@ -97,43 +97,6 @@ QT_BEGIN_NAMESPACE
 
 /*!
     Create a new QNetworkCookie object, initializing the cookie name
-    and its value to empty QByteArray
-
-    A cookie is only valid if it has a name. However, the value is
-    opaque to the application and being empty may have significance to
-    the remote server.
-*/
-QNetworkCookie::QNetworkCookie()
-    : d(new QNetworkCookiePrivate)
-{
-    qRegisterMetaType<QNetworkCookie>();
-    qRegisterMetaType<QList<QNetworkCookie> >();
-
-    d->name = QByteArray();
-    d->value = QByteArray();
-}
-
-/*!
-    Create a new QNetworkCookie object, initializing the cookie name
-    to \a name and its value to empty QByteArray.
-
-    A cookie is only valid if it has a name. However, the value is
-    opaque to the application and being empty may have significance to
-    the remote server.
-*/
-QNetworkCookie::QNetworkCookie( const QByteArray &name )
-    : d(new QNetworkCookiePrivate)
-{
-    qRegisterMetaType<QNetworkCookie>();
-    qRegisterMetaType<QList<QNetworkCookie> >();
-
-    d->name = name;
-    d->value = QByteArray();
-}
-
-
-/*!
-    Create a new QNetworkCookie object, initializing the cookie name
     to \a name and its value to \a value.
 
     A cookie is only valid if it has a name. However, the value is
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 35c7095..ef309a8 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -67,9 +67,7 @@ public:
         Full
     };
 
-    QNetworkCookie();
-    QNetworkCookie(const QByteArray &name );
-    QNetworkCookie(const QByteArray &name, const QByteArray &value );
+    QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray());
     QNetworkCookie(const QNetworkCookie &other);
     ~QNetworkCookie();
     QNetworkCookie &operator=(const QNetworkCookie &other);
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index caa8669..d6d76f7 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -242,18 +242,6 @@ public:
 };
 
 /*!
-    Constructs a QNetworkRequest object with empty QUrl.
-
-    \sa url(), setUrl()
-*/
-QNetworkRequest::QNetworkRequest()
-    : d(new QNetworkRequestPrivate)
-{
-    d->url = QUrl();
-}
-
-
-/*!
     Constructs a QNetworkRequest object with \a url as the URL to be
     requested.
 
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index cf06f7c..1ea7934 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -87,9 +87,7 @@ public:
         AlwaysCache
     };
 
-
-    explicit QNetworkRequest();
-    explicit QNetworkRequest(const QUrl &url);
+    explicit QNetworkRequest(const QUrl &url = QUrl());
     QNetworkRequest(const QNetworkRequest &other);
     ~QNetworkRequest();
     QNetworkRequest &operator=(const QNetworkRequest &other);
-- 
cgit v0.12