diff options
author | Thomas Haller <thaller@redhat.com> | 2016-09-29 13:49:01 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-10-04 09:50:56 +0200 |
commit | 4d37f7a1e94f469fb1e3eacde4d2424ebf6ccf0b (patch) | |
tree | 304dd68a6f6bab8fb3ba9cb63d76faf69a530650 /src/nm-rfkill-manager.h | |
parent | 92e9822e1be23b0a1964b8b16a1cd2c0c51ee59b (diff) | |
download | NetworkManager-4d37f7a1e94f469fb1e3eacde4d2424ebf6ccf0b.tar.gz |
core: refactor private data in "src"
- use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere.
- reorder statements, to have GObject related functions (init, dispose,
constructed) at the bottom of each file and in a consistent order w.r.t.
each other.
- unify whitespaces in signal and properties declarations.
- use NM_GOBJECT_PROPERTIES_DEFINE() and _notify()
- drop unused signal slots in class structures
- drop unused header files for device factories
Diffstat (limited to 'src/nm-rfkill-manager.h')
-rw-r--r-- | src/nm-rfkill-manager.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h index 3aca8f50b9..490c1ca28f 100644 --- a/src/nm-rfkill-manager.h +++ b/src/nm-rfkill-manager.h @@ -19,10 +19,8 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__ -#define __NETWORKMANAGER_RFKILL_MANAGER_H__ - -#define NM_RFKILL_MANAGER_SIGNAL_RFKILL_CHANGED "rfkill-changed" +#ifndef __NM_RFKILL_MANAGER_H__ +#define __NM_RFKILL_MANAGER_H__ typedef enum { /*< skip >*/ RFKILL_UNBLOCKED = 0, @@ -42,7 +40,6 @@ typedef enum { /*< skip >*/ RFKILL_TYPE_MAX = RFKILL_TYPE_UNKNOWN } RfKillType; - #define NM_TYPE_RFKILL_MANAGER (nm_rfkill_manager_get_type ()) #define NM_RFKILL_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_RFKILL_MANAGER, NMRfkillManager)) #define NM_RFKILL_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_RFKILL_MANAGER, NMRfkillManagerClass)) @@ -50,16 +47,9 @@ typedef enum { /*< skip >*/ #define NM_IS_RFKILL_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_RFKILL_MANAGER)) #define NM_RFKILL_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_RFKILL_MANAGER, NMRfkillManagerClass)) -struct _NMRfkillManager { - GObject parent; -}; - -typedef struct { - GObjectClass parent; +#define NM_RFKILL_MANAGER_SIGNAL_RFKILL_CHANGED "rfkill-changed" - /* signals */ - void (*rfkill_changed) (NMRfkillManager *manager, RfKillType rtype, RfKillState state); -} NMRfkillManagerClass; +typedef struct _NMRfkillManagerClass NMRfkillManagerClass; GType nm_rfkill_manager_get_type (void); @@ -67,5 +57,4 @@ NMRfkillManager *nm_rfkill_manager_new (void); RfKillState nm_rfkill_manager_get_rfkill_state (NMRfkillManager *manager, RfKillType rtype); -#endif /* NM_RFKILL_MANAGER_H */ - +#endif /* __NM_RFKILL_MANAGER_H__ */ |