Merge branch 'debian/master' into ubuntu/master

1 files changed, 24 insertions, 20 deletions

diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h
index bf78d217..afd4f102 100644
--- a/libnm-core/nm-setting-bluetooth.h
+++ b/libnm-core/nm-setting-bluetooth.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2007 - 2009 Red Hat, Inc.
  * Copyright (C) 2007 - 2008 Novell, Inc.
@@ -7,25 +7,29 @@
 #ifndef __NM_SETTING_BLUETOOTH_H__
 #define __NM_SETTING_BLUETOOTH_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_SETTING_BLUETOOTH            (nm_setting_bluetooth_get_type ())
-#define NM_SETTING_BLUETOOTH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetooth))
-#define NM_SETTING_BLUETOOTH_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothClass))
-#define NM_IS_SETTING_BLUETOOTH(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_BLUETOOTH))
-#define NM_IS_SETTING_BLUETOOTH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_BLUETOOTH))
-#define NM_SETTING_BLUETOOTH_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothClass))
+#define NM_TYPE_SETTING_BLUETOOTH (nm_setting_bluetooth_get_type())
+#define NM_SETTING_BLUETOOTH(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetooth))
+#define NM_SETTING_BLUETOOTH_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothClass))
+#define NM_IS_SETTING_BLUETOOTH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_BLUETOOTH))
+#define NM_IS_SETTING_BLUETOOTH_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_BLUETOOTH))
+#define NM_SETTING_BLUETOOTH_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_BLUETOOTH, NMSettingBluetoothClass))
 
 #define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 
-#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
-#define NM_SETTING_BLUETOOTH_TYPE      "type"
+#define NM_SETTING_BLUETOOTH_BDADDR "bdaddr"
+#define NM_SETTING_BLUETOOTH_TYPE   "type"
 
 /**
  * NM_SETTING_BLUETOOTH_TYPE_DUN:
@@ -33,7 +37,7 @@ G_BEGIN_DECLS
  * Connection type describing a connection to devices that support the Bluetooth
  * DUN profile.
  */
-#define NM_SETTING_BLUETOOTH_TYPE_DUN  "dun"
+#define NM_SETTING_BLUETOOTH_TYPE_DUN "dun"
 
 /**
  * NM_SETTING_BLUETOOTH_TYPE_PANU:
@@ -57,21 +61,21 @@ G_BEGIN_DECLS
  * Bluetooth Settings
  */
 struct _NMSettingBluetooth {
-	NMSetting parent;
+    NMSetting parent;
 };
 
 typedef struct {
-	NMSettingClass parent;
+    NMSettingClass parent;
 
-	/*< private >*/
-	gpointer padding[4];
+    /*< private >*/
+    gpointer padding[4];
 } NMSettingBluetoothClass;
 
-GType nm_setting_bluetooth_get_type (void);
+GType nm_setting_bluetooth_get_type(void);
 
-NMSetting *       nm_setting_bluetooth_new                 (void);
-const char *      nm_setting_bluetooth_get_bdaddr          (NMSettingBluetooth *setting);
-const char *      nm_setting_bluetooth_get_connection_type (NMSettingBluetooth *setting);
+NMSetting * nm_setting_bluetooth_new(void);
+const char *nm_setting_bluetooth_get_bdaddr(NMSettingBluetooth *setting);
+const char *nm_setting_bluetooth_get_connection_type(NMSettingBluetooth *setting);
 
 G_END_DECLS