Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnetservices.a: move BGeoLocation from libshared.a

Browse Source 
The BGeolocation class uses the network interface in libnetservices.a, so it
is moved here for now.

This will break any out of tree projects that depend on it, but it is a source
incompatible change only.

Change-Id: I6f5b1332eb87ad37dd33fbe09fdb11b16f7f26e4
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3670
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Niels Sascha Reedijk 2021-01-22 20:35:29 +00:00
parent 4080dbd635
commit 2a7090df71
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/private/shared/Geolocation.h → headers/private/netservices/Geolocation.h
View File

@ -12,6 +12,7 @@
namespace BPrivate { namespace BPrivate {
namespace Network {
class BGeolocation { class BGeolocation {
public: public:
@ -36,6 +37,7 @@ private:
static const char* kDefaultGeocodingService; static const char* kDefaultGeocodingService;
}; };
} // namespace Network
} // namespace BPrivate } // namespace BPrivate

2
src/kits/shared/Geolocation.cpp → src/kits/network/libnetservices/Geolocation.cpp
View File

@ -19,6 +19,7 @@
namespace BPrivate { namespace BPrivate {
namespace Network {
class GeolocationListener: public BUrlProtocolListener class GeolocationListener: public BUrlProtocolListener
{ {
@ -248,5 +249,6 @@ const char* BGeolocation::kDefaultGeocodingService = "";
#endif #endif
} // namespace Network
} // namespace BPrivate } // namespace BPrivate

5
src/kits/network/libnetservices/JamCommon
View File

@ -36,6 +36,10 @@ local sources =
UrlSynchronousRequest.cpp UrlSynchronousRequest.cpp
; ;
if [ Glob $(SUBDIR) : DefaultGeolocationServiceKey.h ] {
SubDirC++Flags [ FDefines HAVE_DEFAULT_GEOLOCATION_SERVICE_KEY ] ;
}
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
@ -52,6 +56,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
} else { } else {
StaticLibrary [ MultiArchDefaultGristFiles libnetservices.a ] : StaticLibrary [ MultiArchDefaultGristFiles libnetservices.a ] :
$(sources) $(sources)
Geolocation.cpp
; ;
} }

11
src/kits/shared/Jamfile
View File

@ -5,13 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ;
UseLibraryHeaders agg ; UseLibraryHeaders agg ;
UsePrivateHeaders shared locale ; UsePrivateHeaders shared locale ;
if [ Glob $(SUBDIR) : DefaultGeolocationServiceKey.h ] {
SubDirC++Flags [ FDefines HAVE_DEFAULT_GEOLOCATION_SERVICE_KEY ] ;
}
# Use the deprecated libnetapi.so classes
SubDirC++Flags [ FDefines LIBNETAPI_DEPRECATED ] ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
@ -31,9 +24,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# for BKeymap # for BKeymap
UsePrivateHeaders interface ; UsePrivateHeaders interface ;
# for BGeolocation
UsePrivateHeaders netservices ;
StaticLibrary <$(architecture)>libshared.a : StaticLibrary <$(architecture)>libshared.a :
AboutMenuItem.cpp AboutMenuItem.cpp
ArgumentVector.cpp ArgumentVector.cpp
@ -44,7 +34,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
CommandPipe.cpp CommandPipe.cpp
DragTrackingFilter.cpp DragTrackingFilter.cpp
DriverSettingsMessageAdapter.cpp DriverSettingsMessageAdapter.cpp
Geolocation.cpp
HashString.cpp HashString.cpp
IconButton.cpp IconButton.cpp
IconView.cpp IconView.cpp