diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-07-25 18:45:58 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-07-25 18:45:58 +0200 |
| commit | 9eacb8ca7b3a7c5600fea6abdd018ab980c2163b (patch) | |
| tree | 6459fd3f8a1138b9d4d5a0f7e0eb14d628b5d5e5 /gio/src/networkmonitor.hg | |
| parent | fecf08e8ece1c9d7ca765497f89ddd8bbf560354 (diff) | |
| download | glibmm-9eacb8ca7b3a7c5600fea6abdd018ab980c2163b.tar.gz | |
Gio: Derive all interfaces directly from Glib::Interface
* gio/src/dbusactiongroup.hg: Implement ActionGroup.
* gio/src/fileicon.hg: Implement Icon.
* gio/src/loadableicon.[ccg|hg]:
* gio/src/networkmonitor.hg:
* gio/src/remoteactiongroup.hg: Derive directly from Glib::Interface.
* gio/src/pollableinputstream.hg:
* gio/src/pollableoutputstream.hg: Fix a comment.
A subclass of GInterface can't be derived from another subclass of GInterface.
Correspondingly, an interface in glibmm shall be derived directly from
Glib::Interface, and not from a subclass of Glib::Interface. Bug 776537
Diffstat (limited to 'gio/src/networkmonitor.hg')
| -rw-r--r-- | gio/src/networkmonitor.hg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/src/networkmonitor.hg b/gio/src/networkmonitor.hg index ca845595..df55fda7 100644 --- a/gio/src/networkmonitor.hg +++ b/gio/src/networkmonitor.hg @@ -15,14 +15,14 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <giomm/initable.h> +#include <glibmm/interface.h> #include <giomm/asyncresult.h> #include <giomm/cancellable.h> #include <giomm/socketconnectable.h> #include <gio/gio.h> _DEFS(giomm,gio) -_PINCLUDE(giomm/private/initable_p.h) +_PINCLUDE(glibmm/private/interface_p.h) _PINCLUDE(gio/gio.h) #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -39,9 +39,9 @@ _WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity, NO_GTYPE) * * @newin{2,44} */ -class NetworkMonitor : public Initable +class NetworkMonitor : public Glib::Interface { - _CLASS_INTERFACE(NetworkMonitor, GNetworkMonitor, G_NETWORK_MONITOR, GNetworkMonitorInterface, Initable, GInitable) + _CLASS_INTERFACE(NetworkMonitor, GNetworkMonitor, G_NETWORK_MONITOR, GNetworkMonitorInterface) public: _WRAP_METHOD(static Glib::RefPtr<NetworkMonitor> get_default(), g_network_monitor_get_default, newin "2,44") |