mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 18:54:36 +00:00
clang-format: use "IndentPPDirectives:None" instead of "BeforeHash"
Subjectively, I think this looks better.
This commit is contained in:
parent
dedd228667
commit
4e109bacab
|
@ -44,7 +44,7 @@ BreakStringLiterals: true
|
|||
IncludeBlocks: Preserve
|
||||
IndentCaseLabels: false
|
||||
IndentGotoLabels: false
|
||||
IndentPPDirectives: BeforeHash
|
||||
IndentPPDirectives: None
|
||||
IndentWrappedFunctionNames: false
|
||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
MaxEmptyLinesToKeep: 1
|
||||
|
|
|
@ -12,9 +12,7 @@
|
|||
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
|
||||
#elif !defined(_NMLOG_DEVICE_TYPE)
|
||||
#define _NM_DEVICE_CAST(self) \
|
||||
_Generic((self), NMDevice * \
|
||||
: ((NMDevice *) (self)), NMDevice *const \
|
||||
: ((NMDevice *) (self)))
|
||||
_Generic((self), NMDevice * : ((NMDevice *) (self)), NMDevice *const : ((NMDevice *) (self)))
|
||||
#else
|
||||
#define _NM_DEVICE_CAST(self) \
|
||||
_Generic((self), \
|
||||
|
|
|
@ -47,8 +47,7 @@ _addr_family_to_path_part(int addr_family)
|
|||
#define NM_DHCP_DHCLIENT_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
|
||||
#define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
|
||||
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
|
||||
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
|
||||
#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
|
||||
|
||||
|
|
|
@ -22,8 +22,7 @@
|
|||
#define NM_DHCP_DHCPCANON_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
|
||||
#define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON))
|
||||
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
|
||||
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
|
||||
#define NM_DHCP_DHCPCANON_GET_CLASS(obj) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
|
||||
|
||||
|
|
|
@ -23,8 +23,7 @@
|
|||
/*****************************************************************************/
|
||||
|
||||
#define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type())
|
||||
#define NM_DHCP_DHCPCD(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
|
||||
#define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
|
||||
#define NM_DHCP_DHCPCD_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
|
||||
#define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD))
|
||||
|
|
|
@ -192,8 +192,7 @@ _nm_auto_freev(gpointer ptr)
|
|||
_Pragma("GCC diagnostic push") _Pragma(_NM_PRAGMA_WARNING_DO(warning))
|
||||
#elif defined(__clang__)
|
||||
#define NM_PRAGMA_WARNING_DISABLE(warning) \
|
||||
_Pragma("clang diagnostic push") \
|
||||
_Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \
|
||||
_Pragma("clang diagnostic push") _Pragma(_NM_PRAGMA_WARNING_DO("-Wunknown-warning-option")) \
|
||||
_Pragma(_NM_PRAGMA_WARNING_DO(warning))
|
||||
#else
|
||||
#define NM_PRAGMA_WARNING_DISABLE(warning)
|
||||
|
|
|
@ -2741,10 +2741,7 @@ typedef enum {
|
|||
} \
|
||||
G_STMT_END
|
||||
|
||||
#define NMTST_VARIANT_CHANGE_PROPERTY(__setting_name, \
|
||||
__property_name, \
|
||||
__format_string, \
|
||||
__value) \
|
||||
#define NMTST_VARIANT_CHANGE_PROPERTY(__setting_name, __property_name, __format_string, __value) \
|
||||
G_STMT_START \
|
||||
{ \
|
||||
NMTST_VARIANT_DROP_PROPERTY(__setting_name, __property_name); \
|
||||
|
|
Loading…
Reference in a new issue