diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile index b79edf8d14..255c5066a2 100644 --- a/src/apps/haikudepot/Jamfile +++ b/src/apps/haikudepot/Jamfile @@ -229,9 +229,6 @@ local generatedReferenceParserSourceFiles = DumpExportReferenceJsonListener.cpp ; -# Use the deprecated libnetapi.so network classes -SubDirC++Flags [ FDefines LIBNETAPI_DEPRECATED ] ; - Application HaikuDepot : $(applicationSources) @@ -243,7 +240,7 @@ Application HaikuDepot $(generatedRepositoryParserSourceFiles) $(generatedReferenceParserSourceFiles) : - be package bnetapi translation libcolumnlistview.a shared + be package bnetapi translation libnetservices.a libcolumnlistview.a shared [ TargetLibstdc++ ] [ TargetLibsupc++ ] localestub : HaikuDepot.rdef diff --git a/src/apps/haikudepot/server/AbstractServerProcess.cpp b/src/apps/haikudepot/server/AbstractServerProcess.cpp index d438f30f1f..ae79af8329 100644 --- a/src/apps/haikudepot/server/AbstractServerProcess.cpp +++ b/src/apps/haikudepot/server/AbstractServerProcess.cpp @@ -27,6 +27,9 @@ #include "ToFileUrlProtocolListener.h" +using namespace BPrivate::Network; + + #define MAX_REDIRECTS 3 #define MAX_FAILURES 2 @@ -133,9 +136,9 @@ AbstractServerProcess::SetIfModifiedSinceHeaderValueFromMetaData( // An example of this output would be; 'Fri, 24 Oct 2014 19:32:27 +0000' BDateTime modifiedDateTime = metaData .GetDataModifiedTimestampAsDateTime(); - BPrivate::BHttpTime modifiedHttpTime(modifiedDateTime); + BHttpTime modifiedHttpTime(modifiedDateTime); headerValue.SetTo(modifiedHttpTime - .ToString(BPrivate::B_HTTP_TIME_FORMAT_COOKIE)); + .ToString(B_HTTP_TIME_FORMAT_COOKIE)); } diff --git a/src/apps/haikudepot/server/AbstractServerProcess.h b/src/apps/haikudepot/server/AbstractServerProcess.h index fd787ad14f..4185341a9d 100644 --- a/src/apps/haikudepot/server/AbstractServerProcess.h +++ b/src/apps/haikudepot/server/AbstractServerProcess.h @@ -14,6 +14,9 @@ #include "StandardMetaData.h" +using BPrivate::Network::BHttpRequest; + + typedef enum server_process_options { SERVER_PROCESS_NO_NETWORKING = 1 << 0, SERVER_PROCESS_PREFER_CACHE = 1 << 1, diff --git a/src/apps/haikudepot/server/ServerHelper.h b/src/apps/haikudepot/server/ServerHelper.h index a8eb4f9115..802d178d9e 100644 --- a/src/apps/haikudepot/server/ServerHelper.h +++ b/src/apps/haikudepot/server/ServerHelper.h @@ -10,6 +10,8 @@ #include "ValidationFailure.h" +using BPrivate::Network::BHttpHeaders; + class BMessage; diff --git a/src/apps/haikudepot/server/ServerSettings.h b/src/apps/haikudepot/server/ServerSettings.h index 51f6073d4b..7e37019cb6 100644 --- a/src/apps/haikudepot/server/ServerSettings.h +++ b/src/apps/haikudepot/server/ServerSettings.h @@ -13,6 +13,8 @@ #include +using BPrivate::Network::BHttpHeaders; + class ServerSettings { public: static status_t SetBaseUrl(const BUrl& baseUrl); diff --git a/src/apps/haikudepot/server/WebAppInterface.cpp b/src/apps/haikudepot/server/WebAppInterface.cpp index 0828437e55..f85b7d9ae7 100644 --- a/src/apps/haikudepot/server/WebAppInterface.cpp +++ b/src/apps/haikudepot/server/WebAppInterface.cpp @@ -26,6 +26,9 @@ #include "ServerHelper.h" +using namespace BPrivate::Network; + + #define BASEURL_DEFAULT "https://depot.haiku-os.org" #define USERAGENT_FALLBACK_VERSION "0.0.0" #define LOG_PAYLOAD_LIMIT 8192 diff --git a/src/apps/haikudepot/util/ToFileUrlProtocolListener.cpp b/src/apps/haikudepot/util/ToFileUrlProtocolListener.cpp index 9395fc892a..d135a81181 100644 --- a/src/apps/haikudepot/util/ToFileUrlProtocolListener.cpp +++ b/src/apps/haikudepot/util/ToFileUrlProtocolListener.cpp @@ -10,6 +10,10 @@ #include "Logger.h" + +using namespace BPrivate::Network; + + ToFileUrlProtocolListener::ToFileUrlProtocolListener(BPath path, BString traceLoggingIdentifier, bool traceLogging) { diff --git a/src/apps/haikudepot/util/ToFileUrlProtocolListener.h b/src/apps/haikudepot/util/ToFileUrlProtocolListener.h index a65b29b0d4..50c4d02533 100644 --- a/src/apps/haikudepot/util/ToFileUrlProtocolListener.h +++ b/src/apps/haikudepot/util/ToFileUrlProtocolListener.h @@ -6,6 +6,12 @@ #include #include + +using BPrivate::Network::BUrlProtocolDebugMessage; +using BPrivate::Network::BUrlProtocolListener; +using BPrivate::Network::BUrlRequest; +using BPrivate::Network::BUrlResult; + class ToFileUrlProtocolListener : public BUrlProtocolListener { public: ToFileUrlProtocolListener(BPath path,