From f6f14c5d1c0464f34a1a7637c1a9c356df4172aa Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 15 Oct 2013 10:11:59 +0200
Subject: [PATCH] Make BUrlProtocolAsynchronousListener inherit
 BUrlProtocolListener

 * With so long class names, there's no way I'm going to follow the 64
char limit on commit headlines.
 * The class share the same API, so having them separate is not very
useful.
 * This makes it possible to use the same listener in either synchronous
or asycnhronous mode (or both, for different requests)
---
 .../os/net/UrlProtocolAsynchronousListener.h  | 17 +-----
 .../UrlProtocolAsynchronousListener.cpp       | 52 +------------------
 2 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/headers/os/net/UrlProtocolAsynchronousListener.h b/headers/os/net/UrlProtocolAsynchronousListener.h
index 37b616f200..910cec0e26 100644
--- a/headers/os/net/UrlProtocolAsynchronousListener.h
+++ b/headers/os/net/UrlProtocolAsynchronousListener.h
@@ -11,26 +11,13 @@
 #include <UrlProtocolDispatchingListener.h>
 
 
-class BUrlProtocolAsynchronousListener : public BHandler {
+class BUrlProtocolAsynchronousListener : public BHandler,
+	public BUrlProtocolListener {
 public:
 								BUrlProtocolAsynchronousListener(
 									bool transparent = false);
 	virtual						~BUrlProtocolAsynchronousListener();
 
-	virtual	void				ConnectionOpened(BUrlRequest* caller);
-	virtual void				HostnameResolved(BUrlRequest* caller,
-									const char* ip);
-	virtual void				ResponseStarted(BUrlRequest* caller);
-	virtual void				HeadersReceived(BUrlRequest* caller);
-	virtual void				DataReceived(BUrlRequest* caller,
-									const char* data, ssize_t size);
-	virtual	void				DownloadProgress(BUrlRequest* caller,
-									ssize_t bytesReceived, ssize_t bytesTotal);
-	virtual void				UploadProgress(BUrlRequest* caller,
-									ssize_t bytesSent, ssize_t bytesTotal);
-	virtual void				RequestCompleted(BUrlRequest* caller,
-									bool success);
-									
 	// Synchronous listener access
 			BUrlProtocolListener* SynchronousListener();
 									
diff --git a/src/kits/network/libnetapi/UrlProtocolAsynchronousListener.cpp b/src/kits/network/libnetapi/UrlProtocolAsynchronousListener.cpp
index b577d56bc7..b91d0fb3de 100644
--- a/src/kits/network/libnetapi/UrlProtocolAsynchronousListener.cpp
+++ b/src/kits/network/libnetapi/UrlProtocolAsynchronousListener.cpp
@@ -20,6 +20,7 @@ BUrlProtocolAsynchronousListener::BUrlProtocolAsynchronousListener(
 	bool transparent) 
 	:
 	BHandler("UrlProtocolAsynchronousListener"),
+	BUrlProtocolListener(),
 	fSynchronousListener(NULL)
 {
 	if (be_app->Lock()) {
@@ -45,57 +46,6 @@ BUrlProtocolAsynchronousListener::~BUrlProtocolAsynchronousListener()
 }
 
 
-void
-BUrlProtocolAsynchronousListener::ConnectionOpened(BUrlRequest*)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::HostnameResolved(BUrlRequest*, const char*)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::ResponseStarted(BUrlRequest*)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::HeadersReceived(BUrlRequest*)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::DataReceived(BUrlRequest*, const char*,
-	ssize_t)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::DownloadProgress(BUrlRequest*, ssize_t,
-	ssize_t)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::UploadProgress(BUrlRequest*, ssize_t,
-	ssize_t)
-{
-}
-
-
-void
-BUrlProtocolAsynchronousListener::RequestCompleted(BUrlRequest*, bool)
-{
-}
-
-
 // #pragma mark Synchronous listener access