From Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>:
Niels Sascha Reedijk has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3671 ;)
Change subject: Package Kit: switch to libnetservices.a
......................................................................
Package Kit: switch to libnetservices.a
Switch to the experimental services API as the copy in libbnetapi.so is
deprecated.
---
M src/kits/package/FetchFileJob.cpp
M src/kits/package/FetchFileJob.h
M src/kits/package/Jamfile
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/71/3671/1
diff --git a/src/kits/package/FetchFileJob.cpp
b/src/kits/package/FetchFileJob.cpp
index 92ab428..bf80c89 100644
--- a/src/kits/package/FetchFileJob.cpp
+++ b/src/kits/package/FetchFileJob.cpp
@@ -21,6 +21,7 @@
# include <HttpRequest.h>
# include <UrlRequest.h>
# include <UrlProtocolRoster.h>
+using namespace HaikuExt;
#endif
#include "FetchUtils.h"
diff --git a/src/kits/package/FetchFileJob.h b/src/kits/package/FetchFileJob.h
index b4ba423..9f8c9ac 100644
--- a/src/kits/package/FetchFileJob.h
+++ b/src/kits/package/FetchFileJob.h
@@ -25,7 +25,7 @@
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-class FetchFileJob : public BJob, public BUrlProtocolListener {
+class FetchFileJob : public BJob, public HaikuExt::BUrlProtocolListener {
#else // HAIKU_TARGET_PLATFORM_HAIKU
class FetchFileJob : public BJob {
#endif // HAIKU_TARGET_PLATFORM_HAIKU
@@ -46,11 +46,12 @@
off_t DownloadTotalBytes()
const;
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
- virtual void DataReceived(BUrlRequest*, const char* data,
+ virtual void DataReceived(HaikuExt::BUrlRequest*, const char* data,
off_t position, ssize_t size);
- virtual void DownloadProgress(BUrlRequest*, ssize_t bytesReceived,
- ssize_t bytesTotal);
- virtual void RequestCompleted(BUrlRequest* request, bool success);
+ virtual void DownloadProgress(HaikuExt::BUrlRequest*,
+ ssize_t bytesReceived, ssize_t
bytesTotal);
+ virtual void RequestCompleted(HaikuExt::BUrlRequest* request,
+ bool success);
#endif
protected:
diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile
index 4307a1b..2139d42 100644
--- a/src/kits/package/Jamfile
+++ b/src/kits/package/Jamfile
@@ -13,9 +13,6 @@
;
UsePrivateSystemHeaders ;
-# Use the deprecated libnetapi.so classes
-SubDirC++Flags [ FDefines LIBNETAPI_DEPRECATED ] ;
-
HPKG_SOURCES =
AttributeDataReader.cpp
BlockBufferPool.cpp
@@ -134,6 +131,7 @@
shared
bnetapi
be localestub
+ libnetservices.a
[ TargetLibstdc++ ]
$(TARGET_NETWORK_LIBS)
;
--
To view, visit https://review.haiku-os.org/c/haiku/+/3671
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ia0742038937d078c6a59ae13180a00a4c4eeb177
Gerrit-Change-Number: 3671
Gerrit-PatchSet: 1
Gerrit-Owner: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Gerrit-MessageType: newchange
