From 603e0bdf6208f145a0ef40cd37c71b0f285c1d96 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Wed, 20 Jan 2021 07:51:41 +0000 Subject: [PATCH] libnetapi.so: make headers of deprecated classes private These classes have been moved to the public API too soon, and they need some more time to mature before they can be declared stable. Change-Id: I9c52a8e6cc103922abde7a6b911fe0c3e6bf5700 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3665 Reviewed-by: Adrien Destugues --- headers/{os/net => private/netservices}/DataRequest.h | 0 headers/{os/net => private/netservices}/FileRequest.h | 0 headers/{os/net => private/netservices}/GopherRequest.h | 0 headers/{os/net => private/netservices}/HttpAuthentication.h | 0 headers/{os/net => private/netservices}/HttpForm.h | 0 headers/{os/net => private/netservices}/HttpHeaders.h | 0 headers/{os/net => private/netservices}/HttpRequest.h | 0 headers/{os/net => private/netservices}/HttpResult.h | 0 headers/private/{net => netservices}/HttpTime.h | 0 headers/{os/net => private/netservices}/NetworkCookie.h | 0 headers/{os/net => private/netservices}/NetworkCookieJar.h | 0 headers/{os/net => private/netservices}/NetworkRequest.h | 0 headers/{os/net => private/netservices}/UrlContext.h | 0 .../netservices}/UrlProtocolAsynchronousListener.h | 0 .../netservices}/UrlProtocolDispatchingListener.h | 0 headers/{os/net => private/netservices}/UrlProtocolListener.h | 0 headers/{os/net => private/netservices}/UrlProtocolRoster.h | 0 headers/{os/net => private/netservices}/UrlRequest.h | 0 headers/{os/net => private/netservices}/UrlResult.h | 0 .../{os/net => private/netservices}/UrlSynchronousRequest.h | 0 src/add-ons/media/plugins/http_streamer/Jamfile | 2 +- src/apps/haikudepot/Jamfile | 3 ++- src/apps/webpositive/Jamfile | 2 +- src/kits/network/libnetservices/Jamfile | 2 +- src/kits/package/Jamfile | 1 + src/kits/shared/Jamfile | 3 +++ 26 files changed, 9 insertions(+), 4 deletions(-) rename headers/{os/net => private/netservices}/DataRequest.h (100%) rename headers/{os/net => private/netservices}/FileRequest.h (100%) rename headers/{os/net => private/netservices}/GopherRequest.h (100%) rename headers/{os/net => private/netservices}/HttpAuthentication.h (100%) rename headers/{os/net => private/netservices}/HttpForm.h (100%) rename headers/{os/net => private/netservices}/HttpHeaders.h (100%) rename headers/{os/net => private/netservices}/HttpRequest.h (100%) rename headers/{os/net => private/netservices}/HttpResult.h (100%) rename headers/private/{net => netservices}/HttpTime.h (100%) rename headers/{os/net => private/netservices}/NetworkCookie.h (100%) rename headers/{os/net => private/netservices}/NetworkCookieJar.h (100%) rename headers/{os/net => private/netservices}/NetworkRequest.h (100%) rename headers/{os/net => private/netservices}/UrlContext.h (100%) rename headers/{os/net => private/netservices}/UrlProtocolAsynchronousListener.h (100%) rename headers/{os/net => private/netservices}/UrlProtocolDispatchingListener.h (100%) rename headers/{os/net => private/netservices}/UrlProtocolListener.h (100%) rename headers/{os/net => private/netservices}/UrlProtocolRoster.h (100%) rename headers/{os/net => private/netservices}/UrlRequest.h (100%) rename headers/{os/net => private/netservices}/UrlResult.h (100%) rename headers/{os/net => private/netservices}/UrlSynchronousRequest.h (100%) diff --git a/headers/os/net/DataRequest.h b/headers/private/netservices/DataRequest.h similarity index 100% rename from headers/os/net/DataRequest.h rename to headers/private/netservices/DataRequest.h diff --git a/headers/os/net/FileRequest.h b/headers/private/netservices/FileRequest.h similarity index 100% rename from headers/os/net/FileRequest.h rename to headers/private/netservices/FileRequest.h diff --git a/headers/os/net/GopherRequest.h b/headers/private/netservices/GopherRequest.h similarity index 100% rename from headers/os/net/GopherRequest.h rename to headers/private/netservices/GopherRequest.h diff --git a/headers/os/net/HttpAuthentication.h b/headers/private/netservices/HttpAuthentication.h similarity index 100% rename from headers/os/net/HttpAuthentication.h rename to headers/private/netservices/HttpAuthentication.h diff --git a/headers/os/net/HttpForm.h b/headers/private/netservices/HttpForm.h similarity index 100% rename from headers/os/net/HttpForm.h rename to headers/private/netservices/HttpForm.h diff --git a/headers/os/net/HttpHeaders.h b/headers/private/netservices/HttpHeaders.h similarity index 100% rename from headers/os/net/HttpHeaders.h rename to headers/private/netservices/HttpHeaders.h diff --git a/headers/os/net/HttpRequest.h b/headers/private/netservices/HttpRequest.h similarity index 100% rename from headers/os/net/HttpRequest.h rename to headers/private/netservices/HttpRequest.h diff --git a/headers/os/net/HttpResult.h b/headers/private/netservices/HttpResult.h similarity index 100% rename from headers/os/net/HttpResult.h rename to headers/private/netservices/HttpResult.h diff --git a/headers/private/net/HttpTime.h b/headers/private/netservices/HttpTime.h similarity index 100% rename from headers/private/net/HttpTime.h rename to headers/private/netservices/HttpTime.h diff --git a/headers/os/net/NetworkCookie.h b/headers/private/netservices/NetworkCookie.h similarity index 100% rename from headers/os/net/NetworkCookie.h rename to headers/private/netservices/NetworkCookie.h diff --git a/headers/os/net/NetworkCookieJar.h b/headers/private/netservices/NetworkCookieJar.h similarity index 100% rename from headers/os/net/NetworkCookieJar.h rename to headers/private/netservices/NetworkCookieJar.h diff --git a/headers/os/net/NetworkRequest.h b/headers/private/netservices/NetworkRequest.h similarity index 100% rename from headers/os/net/NetworkRequest.h rename to headers/private/netservices/NetworkRequest.h diff --git a/headers/os/net/UrlContext.h b/headers/private/netservices/UrlContext.h similarity index 100% rename from headers/os/net/UrlContext.h rename to headers/private/netservices/UrlContext.h diff --git a/headers/os/net/UrlProtocolAsynchronousListener.h b/headers/private/netservices/UrlProtocolAsynchronousListener.h similarity index 100% rename from headers/os/net/UrlProtocolAsynchronousListener.h rename to headers/private/netservices/UrlProtocolAsynchronousListener.h diff --git a/headers/os/net/UrlProtocolDispatchingListener.h b/headers/private/netservices/UrlProtocolDispatchingListener.h similarity index 100% rename from headers/os/net/UrlProtocolDispatchingListener.h rename to headers/private/netservices/UrlProtocolDispatchingListener.h diff --git a/headers/os/net/UrlProtocolListener.h b/headers/private/netservices/UrlProtocolListener.h similarity index 100% rename from headers/os/net/UrlProtocolListener.h rename to headers/private/netservices/UrlProtocolListener.h diff --git a/headers/os/net/UrlProtocolRoster.h b/headers/private/netservices/UrlProtocolRoster.h similarity index 100% rename from headers/os/net/UrlProtocolRoster.h rename to headers/private/netservices/UrlProtocolRoster.h diff --git a/headers/os/net/UrlRequest.h b/headers/private/netservices/UrlRequest.h similarity index 100% rename from headers/os/net/UrlRequest.h rename to headers/private/netservices/UrlRequest.h diff --git a/headers/os/net/UrlResult.h b/headers/private/netservices/UrlResult.h similarity index 100% rename from headers/os/net/UrlResult.h rename to headers/private/netservices/UrlResult.h diff --git a/headers/os/net/UrlSynchronousRequest.h b/headers/private/netservices/UrlSynchronousRequest.h similarity index 100% rename from headers/os/net/UrlSynchronousRequest.h rename to headers/private/netservices/UrlSynchronousRequest.h diff --git a/src/add-ons/media/plugins/http_streamer/Jamfile b/src/add-ons/media/plugins/http_streamer/Jamfile index c8180ce131..5d28db78cc 100644 --- a/src/add-ons/media/plugins/http_streamer/Jamfile +++ b/src/add-ons/media/plugins/http_streamer/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons media plugins http_streamer ; -UsePrivateHeaders media shared ; +UsePrivateHeaders media netservices shared ; UsePrivateHeaders [ FDirName media experimental ] ; local architectureObject ; diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile index f56bc2ea0d..f8f24f1305 100644 --- a/src/apps/haikudepot/Jamfile +++ b/src/apps/haikudepot/Jamfile @@ -6,7 +6,8 @@ SubDirC++Flags -Wno-error ; include [ FDirName $(HAIKU_TOP) src apps haikudepot build jam HdsSchemaGenRules ] ; -UsePrivateHeaders interface kernel net package shared storage support locale ; +UsePrivateHeaders interface kernel net netservices package shared storage ; +UsePrivateHeaders support locale ; HAIKUDEPOT_GENERATED_SOURCES_DIRECTORY = $(TARGET_COMMON_DEBUG_LOCATE_TARGET) ; diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile index bf82ab804c..e2bc7783bb 100644 --- a/src/apps/webpositive/Jamfile +++ b/src/apps/webpositive/Jamfile @@ -65,7 +65,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { # private OS headers UseLibraryHeaders icon ; - UsePrivateHeaders interface shared tracker ; + UsePrivateHeaders interface netservices shared tracker ; SubDirHdrs $(HAIKU_TOP) src kits tracker ; Application WebPositive : diff --git a/src/kits/network/libnetservices/Jamfile b/src/kits/network/libnetservices/Jamfile index 8f24667a46..845e4da369 100644 --- a/src/kits/network/libnetservices/Jamfile +++ b/src/kits/network/libnetservices/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src kits network libnetservices ; -UsePrivateHeaders net shared support ; +UsePrivateHeaders net netservices shared support ; local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile index 9fb8563733..e4fcb04372 100644 --- a/src/kits/package/Jamfile +++ b/src/kits/package/Jamfile @@ -5,6 +5,7 @@ AddResources libpackage.so : libpackage.rdef ; UsePrivateHeaders app kernel + netservices shared libroot storage diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile index 51b0d2e4bd..d10c0a6032 100644 --- a/src/kits/shared/Jamfile +++ b/src/kits/shared/Jamfile @@ -28,6 +28,9 @@ for architectureObject in [ MultiArchSubDirSetup ] { # for BKeymap UsePrivateHeaders interface ; + # for BGeolocation + UsePrivateHeaders netservices ; + StaticLibrary <$(architecture)>libshared.a : AboutMenuItem.cpp ArgumentVector.cpp