1105308 - [Bluetooth] Cleanup BluetoothUtils.{cpp,h}

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Bluetooth, defect)

Description

[Thomas Zimmermann [:tzimmermann] [:tdz]]

There are two files named BluetoothUtils.{cpp,h}; for BlueZ and Bluedroid backends respectively. The content of these files is mostly the same.

We should merge the backend-independent code into a single file and move it out of the backend directories.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [01] Bug 1105308: Cleanup non-shared functions in BlueZ' BluetoothUtils.{cpp,h}

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [02] Bug 1105308: Cleanup non-shared functions in Bluedroid's BluetoothUtils.{cpp,h}

Comment 3

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [03] Bug 1105308: Merge BluetoothUtils.{cpp,h}

Comment 4

[Ben Tian (inactive)]

Comment on attachment 8529114 [details] [diff] [review]
[01] Bug 1105308: Cleanup non-shared functions in BlueZ' BluetoothUtils.{cpp,h}

Review of attachment 8529114 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM.

Comment 5

[Ben Tian (inactive)]

Comment on attachment 8529115 [details] [diff] [review]
[02] Bug 1105308: Cleanup non-shared functions in Bluedroid's BluetoothUtils.{cpp,h}

Review of attachment 8529115 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM.

Comment 6

[Ben Tian (inactive)]

Comment on attachment 8529116 [details] [diff] [review]
[03] Bug 1105308: Merge BluetoothUtils.{cpp,h}

Review of attachment 8529116 [details] [diff] [review]:
-----------------------------------------------------------------

r=me with nit addressed.

::: dom/bluetooth/BluetoothUtils.h
@@ +4,5 @@
>   * License, v. 2.0. If a copy of the MPL was not distributed with this file,
>   * You can obtain one at http://mozilla.org/MPL/2.0/. */
>  
> +#ifndef mozilla_dom_bluetooth_bluetoothutils_h
> +#define mozilla_dom_bluetooth_bluetoothutils_h

nit: add back '__' at the end.

Comment 7

[Thomas Zimmermann [:tzimmermann] [:tdz]]

(In reply to Ben Tian [:btian] from comment #6)
> Comment on attachment 8529116 [details] [diff] [review]
> [03] Bug 1105308: Merge BluetoothUtils.{cpp,h}
> 
> Review of attachment 8529116 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> r=me with nit addressed.
> 
> ::: dom/bluetooth/BluetoothUtils.h
> @@ +4,5 @@
> >   * License, v. 2.0. If a copy of the MPL was not distributed with this file,
> >   * You can obtain one at http://mozilla.org/MPL/2.0/. */
> >  
> > +#ifndef mozilla_dom_bluetooth_bluetoothutils_h
> > +#define mozilla_dom_bluetooth_bluetoothutils_h
> 
> nit: add back '__' at the end.

May I ask why? The underscores violate Mozilla's style guide.

Comment 8

[Ben Tian (inactive)]

(In reply to Thomas Zimmermann [:tzimmermann] [:tdz] from comment #7)
> > ::: dom/bluetooth/BluetoothUtils.h
> > @@ +4,5 @@
> > >   * License, v. 2.0. If a copy of the MPL was not distributed with this file,
> > >   * You can obtain one at http://mozilla.org/MPL/2.0/. */
> > >  
> > > +#ifndef mozilla_dom_bluetooth_bluetoothutils_h
> > > +#define mozilla_dom_bluetooth_bluetoothutils_h
> > 
> > nit: add back '__' at the end.
> May I ask why? The underscores violate Mozilla's style guide.

You are right. I just realize all other headers should be fixed as well. Please keep the change and open another follow-up bug to revise all headers under bluetooth/ and bluetooth2/ folders. Thanks.

Comment 9

[Thomas Zimmermann [:tzimmermann] [:tdz]]

OK, done so: bug 1106007.

Comment 10

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Thanks a lot!

https://hg.mozilla.org/integration/b2g-inbound/rev/d359d36fbaa8
https://hg.mozilla.org/integration/b2g-inbound/rev/6230fb3f608a
https://hg.mozilla.org/integration/b2g-inbound/rev/10ecf1e770b1

https://treeherder.mozilla.org/ui/#/jobs?repo=b2g-inbound&revision=eb2a8052241b

Comment 11

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/d359d36fbaa8
https://hg.mozilla.org/mozilla-central/rev/6230fb3f608a
https://hg.mozilla.org/mozilla-central/rev/10ecf1e770b1