diff options
| author | Enrico Weigelt, metux ITS <metuxitservice@googlemail.com> | 2012-11-16 00:00:58 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene.engelhard.re@googlemail.com> | 2012-11-16 13:55:23 +0000 |
| commit | 0e682df529bb9216e009da39c449dab29ccf2807 (patch) | |
| tree | a56584aa2cac6d2cfc00c8011a3600bbdf785ddf /sd | |
| parent | dcb080347ca127044313bbb3c11c37761cc2a7a2 (diff) | |
renamed --enable-bluetooth to --enable-sdremote-bluetooth
The current configure option --enable-bluetooth is a bit misleading,
it doesn't really tell what it's actually for. Therefore renamed it,
so it's more clear that it's an sdremote backend using bluetooth.
Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa
Reviewed-on: https://gerrit.libreoffice.org/1086
Reviewed-by: Rene Engelhard <rene.engelhard.re@googlemail.com>
Tested-by: Rene Engelhard <rene.engelhard.re@googlemail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 4 | ||||
| -rw-r--r-- | sd/Library_sdui.mk | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/RemoteDialog.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index ae4b8a59baea..227a3c05203f 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -527,13 +527,13 @@ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ )) $(eval $(call gb_Library_add_defs,sd,\ - -DENABLE_BLUETOOTH \ + -DENABLE_SDREMOTE_BLUETOOTH \ )) endif diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 9d4ec750fd0b..2304d493feb9 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -42,9 +42,9 @@ $(eval $(call gb_Library_add_defs,sdui,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) $(eval $(call gb_Library_add_defs,sdui,\ - -DENABLE_BLUETOOTH \ + -DENABLE_SDREMOTE_BLUETOOTH \ )) endif diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 1d52dc5448ef..d5c66caa6296 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -28,7 +28,7 @@ RemoteDialog::RemoteDialog( Window *pWindow ) : #ifdef ENABLE_SDREMOTE FreeResource(); -#ifdef ENABLE_BLUETOOTH +#ifdef ENABLE_SDREMOTE_BLUETOOTH mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable(); if ( !mPreviouslyDiscoverable ) RemoteServer::setBluetoothDiscoverable( true ); @@ -61,7 +61,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) { // setBusy( true ); // Fixme: Try and connect -#if defined(ENABLE_SDREMOTE) && defined(ENABLE_BLUETOOTH) +#if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH) long aSelected = mClientBox.GetActiveEntryIndex(); if ( aSelected < 0 ) return 1; @@ -79,7 +79,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) { -#if defined(ENABLE_SDREMOTE) && defined(ENABLE_BLUETOOTH) +#if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH) if ( !mPreviouslyDiscoverable ) { RemoteServer::setBluetoothDiscoverable( false ); diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 69a53f4e6837..c2bff30e5af9 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -175,7 +175,7 @@ void RemoteServer::setup() spServer = new RemoteServer(); spServer->launch(); -#ifdef ENABLE_BLUETOOTH +#ifdef ENABLE_SDREMOTE_BLUETOOTH sd::BluetoothServer::setup( &(spServer->mCommunicators) ); #endif } @@ -309,7 +309,7 @@ void SdDLL::RegisterRemotes() bool RemoteServer::isBluetoothDiscoverable() { -#ifdef ENABLE_BLUETOOTH +#ifdef ENABLE_SDREMOTE_BLUETOOTH return BluetoothServer::isDiscoverable(); #else return false; @@ -318,7 +318,7 @@ bool RemoteServer::isBluetoothDiscoverable() void RemoteServer::setBluetoothDiscoverable( bool aDiscoverable ) { -#ifdef ENABLE_BLUETOOTH +#ifdef ENABLE_SDREMOTE_BLUETOOTH BluetoothServer::setDiscoverable( aDiscoverable ); #else (void) aDiscoverable; |