Commit f19aff89 authored by Thomas Haller's avatar Thomas Haller

all: cleanup includes in header files

- don't include "nm-default.h" in header files. Every source file must
  include as first header "nm-default.h", thus our headers get the
  default include already implicitly.

- we don't support compiling NetworkManager itself with a C++ compiler. Remove
  G_BEGIN_DECLS/G_END_DECLS from internal headers. We do however support
  users of libnm to use C++, thus they stay in public headers.
parent b2eb64a4
......@@ -21,8 +21,6 @@
#ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
#define __NETWORKMANAGER_DISPATCHER_UTILS_H__
#include "nm-default.h"
char **
nm_dispatcher_utils_construct_envp (const char *action,
GVariant *connection_dict,
......
......@@ -19,7 +19,6 @@
* Copyright 2010 - 2015 Red Hat, Inc.
*/
/* Generated configuration file */
#include "nm-default.h"
#include <stdio.h>
......
......@@ -126,7 +126,6 @@ nmc_start_polkit_agent_start_try (NmCli *nmc)
#else
/* polkit agent is not avalable; implement stub functions. */
#include "nm-default.h"
#include "nmcli.h"
#include "polkit-agent.h"
......
......@@ -17,8 +17,6 @@
* Copyright 2010 - 2015 Red Hat, Inc.
*/
/* Generated configuration file */
#include "nm-default.h"
#include <stdio.h>
......
......@@ -22,10 +22,6 @@
#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
#include <polkitagent/polkitagent.h>
#include "nm-default.h"
G_BEGIN_DECLS
#define NM_TYPE_POLKIT_LISTENER (nm_polkit_listener_get_type ())
#define NM_POLKIT_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLKIT_LISTENER, NMPolkitListener))
#define NM_POLKIT_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_POLKIT_LISTENER, NMPolkitListenerClass))
......@@ -99,6 +95,4 @@ void nm_polkit_listener_set_show_error_callback (NMPolkitListener *self,
void nm_polkit_listener_set_completed_callback (NMPolkitListener *self,
NMPolkitListenerOnCompletedFunc completed_callback);
G_END_DECLS
#endif /* __NM_POLKIT_LISTENER_H__ */
......@@ -22,8 +22,6 @@
#include <NetworkManager.h>
#include <nm-secret-agent-old.h>
G_BEGIN_DECLS
#define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ())
#define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))
#define NM_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
......@@ -59,6 +57,4 @@ void nm_secret_agent_simple_response (NMSecretAgentSimpl
void nm_secret_agent_simple_enable (NMSecretAgentSimple *self,
const char *path);
G_END_DECLS
#endif /* __NM_SECRET_AGENT_SIMPLE_H__ */
......@@ -21,8 +21,6 @@
#include <NetworkManager.h>
#include "nm-default.h"
struct {
const char *name;
const char *ui_name;
......
......@@ -21,8 +21,6 @@
#include "nmt-newt-grid.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_BUTTON_BOX (nmt_newt_button_box_get_type ())
#define NMT_NEWT_BUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_BUTTON_BOX, NmtNewtButtonBox))
#define NMT_NEWT_BUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_BUTTON_BOX, NmtNewtButtonBoxClass))
......@@ -60,6 +58,4 @@ void nmt_newt_button_box_add_widget_end (NmtNewtButtonBox *bbox,
NmtNewtWidget *widget);
G_END_DECLS
#endif /* NMT_NEWT_BUTTON_BOX_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_BUTTON (nmt_newt_button_get_type ())
#define NMT_NEWT_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_BUTTON, NmtNewtButton))
#define NMT_NEWT_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_BUTTON, NmtNewtButtonClass))
......@@ -48,6 +46,4 @@ void nmt_newt_button_set_label (NmtNewtButton *button,
const char *label);
const char *nmt_newt_button_get_label (NmtNewtButton *button);
G_END_DECLS
#endif /* NMT_NEWT_BUTTON_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_CHECKBOX (nmt_newt_checkbox_get_type ())
#define NMT_NEWT_CHECKBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckbox))
#define NMT_NEWT_CHECKBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_CHECKBOX, NmtNewtCheckboxClass))
......@@ -48,6 +46,4 @@ void nmt_newt_checkbox_set_active (NmtNewtCheckbox *checkbox,
gboolean active);
gboolean nmt_newt_checkbox_get_active (NmtNewtCheckbox *checkbox);
G_END_DECLS
#endif /* NMT_NEWT_CHECKBOX_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-widget.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_COMPONENT (nmt_newt_component_get_type ())
#define NMT_NEWT_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_COMPONENT, NmtNewtComponent))
#define NMT_NEWT_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_COMPONENT, NmtNewtComponentClass))
......@@ -52,6 +50,4 @@ gboolean nmt_newt_component_get_sensitive (NmtNewtComponent *component);
void nmt_newt_component_set_sensitive (NmtNewtComponent *component,
gboolean sensitive);
G_END_DECLS
#endif /* NMT_NEWT_COMPONENT_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-widget.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_CONTAINER (nmt_newt_container_get_type ())
#define NMT_NEWT_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_CONTAINER, NmtNewtContainer))
#define NMT_NEWT_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_CONTAINER, NmtNewtContainerClass))
......@@ -56,6 +54,4 @@ void nmt_newt_container_remove (NmtNewtContainer *container,
GSList *nmt_newt_container_get_children (NmtNewtContainer *container);
G_END_DECLS
#endif /* NMT_NEWT_CONTAINER_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-entry.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_ENTRY_NUMERIC (nmt_newt_entry_numeric_get_type ())
#define NMT_NEWT_ENTRY_NUMERIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_ENTRY_NUMERIC, NmtNewtEntryNumeric))
#define NMT_NEWT_ENTRY_NUMERIC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_ENTRY_NUMERIC, NmtNewtEntryNumericClass))
......@@ -46,6 +44,4 @@ NmtNewtWidget *nmt_newt_entry_numeric_new (int width,
int min,
int max);
G_END_DECLS
#endif /* NMT_NEWT_ENTRY_NUMERIC_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_ENTRY (nmt_newt_entry_get_type ())
#define NMT_NEWT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_ENTRY, NmtNewtEntry))
#define NMT_NEWT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_ENTRY, NmtNewtEntryClass))
......@@ -69,6 +67,4 @@ void nmt_newt_entry_set_width (NmtNewtEntry *entry,
int width);
int nmt_newt_entry_get_width (NmtNewtEntry *entry);
G_END_DECLS
#endif /* NMT_NEWT_ENTRY_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-container.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_FORM (nmt_newt_form_get_type ())
#define NMT_NEWT_FORM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_FORM, NmtNewtForm))
#define NMT_NEWT_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_FORM, NmtNewtFormClass))
......@@ -61,6 +59,4 @@ void nmt_newt_form_quit (NmtNewtForm *form);
void nmt_newt_form_set_focus (NmtNewtForm *form,
NmtNewtWidget *widget);
G_END_DECLS
#endif /* NMT_NEWT_FORM_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-container.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_GRID (nmt_newt_grid_get_type ())
#define NMT_NEWT_GRID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_GRID, NmtNewtGrid))
#define NMT_NEWT_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_GRID, NmtNewtGridClass))
......@@ -67,6 +65,4 @@ void nmt_newt_grid_set_flags (NmtNewtGrid *grid,
NmtNewtWidget *widget,
NmtNewtGridFlags flags);
G_END_DECLS
#endif /* NMT_NEWT_GRID_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_LABEL (nmt_newt_label_get_type ())
#define NMT_NEWT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_LABEL, NmtNewtLabel))
#define NMT_NEWT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_LABEL, NmtNewtLabelClass))
......@@ -61,6 +59,4 @@ void nmt_newt_label_set_highlight (NmtNewtLabel *label,
gboolean highlight);
gboolean nmt_newt_label_get_highlight (NmtNewtLabel *label);
G_END_DECLS
#endif /* NMT_NEWT_LABEL_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_LISTBOX (nmt_newt_listbox_get_type ())
#define NMT_NEWT_LISTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_LISTBOX, NmtNewtListbox))
#define NMT_NEWT_LISTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_LISTBOX, NmtNewtListboxClass))
......@@ -66,6 +64,4 @@ void nmt_newt_listbox_set_active_key (NmtNewtListbox *listbox,
int nmt_newt_listbox_get_active (NmtNewtListbox *listbox);
gpointer nmt_newt_listbox_get_active_key (NmtNewtListbox *listbox);
G_END_DECLS
#endif /* NMT_NEWT_LISTBOX_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-button.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_POPUP (nmt_newt_popup_get_type ())
#define NMT_NEWT_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_POPUP, NmtNewtPopup))
#define NMT_NEWT_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_POPUP, NmtNewtPopupClass))
......@@ -57,6 +55,4 @@ const char *nmt_newt_popup_get_active_id (NmtNewtPopup *popup);
void nmt_newt_popup_set_active_id (NmtNewtPopup *popup,
const char *active_id);
G_END_DECLS
#endif /* NMT_NEWT_POPUP_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-container.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_SECTION (nmt_newt_section_get_type ())
#define NMT_NEWT_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_SECTION, NmtNewtSection))
#define NMT_NEWT_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_SECTION, NmtNewtSectionClass))
......@@ -52,6 +50,4 @@ void nmt_newt_section_set_body (NmtNewtSection *section,
NmtNewtWidget *body);
NmtNewtWidget *nmt_newt_section_get_body (NmtNewtSection *section);
G_END_DECLS
#endif /* NMT_NEWT_SECTION_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_SEPARATOR (nmt_newt_separator_get_type ())
#define NMT_NEWT_SEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_SEPARATOR, NmtNewtSeparator))
#define NMT_NEWT_SEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_SEPARATOR, NmtNewtSeparatorClass))
......@@ -44,6 +42,4 @@ GType nmt_newt_separator_get_type (void);
NmtNewtWidget *nmt_newt_separator_new (void);
G_END_DECLS
#endif /* NMT_NEWT_SEPARATOR_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-container.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_STACK (nmt_newt_stack_get_type ())
#define NMT_NEWT_STACK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_STACK, NmtNewtStack))
#define NMT_NEWT_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_STACK, NmtNewtStackClass))
......@@ -56,6 +54,4 @@ void nmt_newt_stack_set_active_id (NmtNewtStack *stack,
const char *id);
const char * nmt_newt_stack_get_active_id (NmtNewtStack *stack);
G_END_DECLS
#endif /* NMT_NEWT_STACK_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-component.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_TEXTBOX (nmt_newt_textbox_get_type ())
#define NMT_NEWT_TEXTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_TEXTBOX, NmtNewtTextbox))
#define NMT_NEWT_TEXTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_TEXTBOX, NmtNewtTextboxClass))
......@@ -54,6 +52,4 @@ void nmt_newt_textbox_set_text (NmtNewtTextbox *textbox,
const char *text);
const char *nmt_newt_textbox_get_text (NmtNewtTextbox *textbox);
G_END_DECLS
#endif /* NMT_NEWT_TEXTBOX_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-button.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_TOGGLE_BUTTON (nmt_newt_toggle_button_get_type ())
#define NMT_NEWT_TOGGLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButton))
#define NMT_NEWT_TOGGLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_TOGGLE_BUTTON, NmtNewtToggleButtonClass))
......@@ -49,6 +47,4 @@ gboolean nmt_newt_toggle_button_get_active (NmtNewtToggleButton *button);
void nmt_newt_toggle_button_set_active (NmtNewtToggleButton *button,
gboolean active);
G_END_DECLS
#endif /* NMT_NEWT_TOGGLE_BUTTON_H */
......@@ -21,10 +21,6 @@
#include <newt.h>
#include "nm-default.h"
G_BEGIN_DECLS
typedef struct _NmtNewtButton NmtNewtButton;
typedef struct _NmtNewtButtonBox NmtNewtButtonBox;
typedef struct _NmtNewtCheckbox NmtNewtCheckbox;
......@@ -45,6 +41,4 @@ typedef struct _NmtNewtTextbox NmtNewtTextbox;
typedef struct _NmtNewtToggleButton NmtNewtToggleButton;
typedef struct _NmtNewtWidget NmtNewtWidget;
G_END_DECLS
#endif /* NMT_NEWT_COMPONENT_H */
......@@ -21,10 +21,6 @@
#include <newt.h>
#include "nm-default.h"
G_BEGIN_DECLS
void nmt_newt_init (void);
void nmt_newt_finished (void);
......@@ -49,6 +45,4 @@ int nmt_newt_choice_dialog (const char *button1,
char *nmt_newt_edit_string (const char *data);
G_END_DECLS
#endif /* NMT_NEWT_UTILS_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt-types.h"
G_BEGIN_DECLS
#define NMT_TYPE_NEWT_WIDGET (nmt_newt_widget_get_type ())
#define NMT_NEWT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_NEWT_WIDGET, NmtNewtWidget))
#define NMT_NEWT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_NEWT_WIDGET, NmtNewtWidgetClass))
......@@ -113,6 +111,4 @@ void nmt_newt_widget_needs_rebuild (NmtNewtWidget *widget);
void nmt_newt_widget_set_valid (NmtNewtWidget *widget,
gboolean valid);
G_END_DECLS
#endif /* NMT_NEWT_WIDGET_H */
......@@ -21,8 +21,6 @@
#include <NetworkManager.h>
G_BEGIN_DECLS
void nm_editor_bindings_init (void);
void nm_editor_bind_ip_addresses_with_prefix_to_strv (int family,
......@@ -71,6 +69,4 @@ void nm_editor_bind_wireless_security_wep_key (NMSettingWirelessSecurity
void nm_editor_bind_vlan_name (NMSettingVlan *s_vlan,
NMSettingConnection *s_con);
G_END_DECLS
#endif /* NM_EDITOR_BINDINGS_H */
......@@ -21,8 +21,6 @@
#include <NetworkManager.h>
G_BEGIN_DECLS
typedef struct {
const char *name;
GType setting_type;
......@@ -38,6 +36,4 @@ NMConnection *nm_editor_utils_create_connection (GType type,
NMConnection *master,
NMClient *client);
G_END_DECLS
#endif /* NM_EDITOR_UTILS_H */
......@@ -21,8 +21,6 @@
#include "nmt-widget-list.h"
G_BEGIN_DECLS
#define NMT_TYPE_ADDRESS_LIST (nmt_address_list_get_type ())
#define NMT_ADDRESS_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_ADDRESS_LIST, NmtAddressList))
#define NMT_ADDRESS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_ADDRESS_LIST, NmtAddressListClass))
......@@ -52,6 +50,4 @@ typedef enum {
NmtNewtWidget *nmt_address_list_new (NmtAddressListType list_type);
G_END_DECLS
#endif /* NMT_ADDRESS_LIST_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt.h"
G_BEGIN_DECLS
#define NMT_TYPE_CONNECT_CONNECTION_LIST (nmt_connect_connection_list_get_type ())
#define NMT_CONNECT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_CONNECT_CONNECTION_LIST, NmtConnectConnectionList))
#define NMT_CONNECT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_CONNECT_CONNECTION_LIST, NmtConnectConnectionListClass))
......@@ -56,6 +54,4 @@ gboolean nmt_connect_connection_list_get_selection (NmtConnectConnectionList *
NMObject **specific_object,
NMActiveConnection **active);
G_END_DECLS
#endif /* NMT_CONNECT_CONNECTION_LIST_H */
......@@ -23,8 +23,6 @@
#include <NetworkManager.h>
G_BEGIN_DECLS
#define NMT_TYPE_DEVICE_ENTRY (nmt_device_entry_get_type ())
#define NMT_DEVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntry))
#define NMT_DEVICE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntryClass))
......@@ -55,6 +53,4 @@ void nmt_device_entry_set_device_filter (NmtDeviceEntry *deventry,
NmtDeviceEntryDeviceFilter filter,
gpointer user_data);
G_END_DECLS
#endif /* NMT_DEVICE_ENTRY_H */
......@@ -23,8 +23,6 @@
#include <NetworkManager.h>
G_BEGIN_DECLS
#define NMT_TYPE_EDIT_CONNECTION_LIST (nmt_edit_connection_list_get_type ())
#define NMT_EDIT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionList))
#define NMT_EDIT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionListClass))
......@@ -54,6 +52,4 @@ typedef gboolean (*NmtEditConnectionListFilter) (NmtEditConnectionList *list,
NMConnection *connection,
gpointer user_data);
G_END_DECLS
#endif /* NMT_EDIT_CONNECTION_LIST_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt.h"
G_BEGIN_DECLS
#define NMT_TYPE_EDITOR_GRID (nmt_editor_grid_get_type ())
#define NMT_EDITOR_GRID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_GRID, NmtEditorGrid))
#define NMT_EDITOR_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_GRID, NmtEditorGridClass))
......@@ -57,6 +55,4 @@ void nmt_editor_grid_set_row_flags (NmtEditorGrid *grid,
NmtNewtWidget *widget,
NmtEditorGridRowFlags flags);
G_END_DECLS
#endif /* NMT_EDITOR_GRID_H */
......@@ -22,8 +22,6 @@
#include "nmt-editor-page.h"
#include "nmt-device-entry.h"
G_BEGIN_DECLS
#define NMT_TYPE_EDITOR_PAGE_DEVICE (nmt_editor_page_device_get_type ())
#define NMT_EDITOR_PAGE_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_PAGE_DEVICE, NmtEditorPageDevice))
#define NMT_EDITOR_PAGE_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_PAGE_DEVICE, NmtEditorPageDeviceClass))
......@@ -45,6 +43,4 @@ GType nmt_editor_page_device_get_type (void);
NmtDeviceEntry *nmt_editor_page_device_get_device_entry (NmtEditorPageDevice *page);
G_END_DECLS
#endif /* NMT_EDITOR_PAGE_DEVICE_H */
......@@ -24,8 +24,6 @@
#include "nmt-editor-grid.h"
#include "nmt-editor-section.h"
G_BEGIN_DECLS
#define NMT_TYPE_EDITOR_PAGE (nmt_editor_page_get_type ())
#define NMT_EDITOR_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_PAGE, NmtEditorPage))
#define NMT_EDITOR_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_PAGE, NmtEditorPageClass))
......@@ -53,6 +51,4 @@ GSList *nmt_editor_page_get_sections (NmtEditorPage *page);
void nmt_editor_page_add_section (NmtEditorPage *page,
NmtEditorSection *section);
G_END_DECLS
#endif /* NMT_EDITOR_PAGE_H */
......@@ -22,8 +22,6 @@
#include "nmt-newt-section.h"
#include "nmt-editor-grid.h"
G_BEGIN_DECLS
#define NMT_TYPE_EDITOR_SECTION (nmt_editor_section_get_type ())
#define NMT_EDITOR_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR_SECTION, NmtEditorSection))
#define NMT_EDITOR_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR_SECTION, NmtEditorSectionClass))
......@@ -51,6 +49,4 @@ const char *nmt_editor_section_get_title (NmtEditorSection *sectio
NmtNewtWidget *nmt_editor_section_get_header_widget (NmtEditorSection *section);
NmtEditorGrid *nmt_editor_section_get_body (NmtEditorSection *section);
G_END_DECLS
#endif /* NMT_EDITOR_SECTION_H */
......@@ -23,8 +23,6 @@
#include "nmt-newt.h"
G_BEGIN_DECLS
#define NMT_TYPE_EDITOR (nmt_editor_get_type ())
#define NMT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDITOR, NmtEditor))
#define NMT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDITOR, NmtEditorClass))
......@@ -46,6 +44,4 @@ GType nmt_editor_get_type (void);
NmtNewtForm *nmt_editor_new (NMConnection *connection);
G_END_DECLS
#endif /* NMT_EDITOR_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt.h"
G_BEGIN_DECLS
#define NMT_TYPE_IP_ENTRY (nmt_ip_entry_get_type ())
#define NMT_IP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_IP_ENTRY, NmtIPEntry))
#define NMT_IP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_IP_ENTRY, NmtIPEntryClass))
......@@ -47,6 +45,4 @@ NmtNewtWidget *nmt_ip_entry_new (int width,
gboolean prefix,
gboolean optional);
G_END_DECLS
#endif /* NMT_IP_ENTRY_H */
......@@ -19,12 +19,9 @@
#ifndef NMT_MAC_ENTRY_H
#define NMT_MAC_ENTRY_H
#include "nm-default.h"
#include "nm-utils.h"
#include "nmt-newt.h"
G_BEGIN_DECLS
typedef enum { /*< skip >*/
NMT_MAC_ENTRY_TYPE_MAC,
NMT_MAC_ENTRY_TYPE_CLONED,
......@@ -53,6 +50,4 @@ NmtNewtWidget *nmt_mac_entry_new (int width,
int mac_length,
NmtMacEntryType type);
G_END_DECLS
#endif /* NMT_MAC_ENTRY_H */
......@@ -21,8 +21,6 @@
#include "nmt-newt.h"
G_BEGIN_DECLS
#define NMT_TYPE_MTU_ENTRY (nmt_mtu_entry_get_type ())
#define NMT_MTU_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_MTU_ENTRY, NmtMtuEntry))
#define NMT_MTU_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_MTU_ENTRY, NmtMtuEntryClass))
......@@ -44,6 +42,4 @@ GType nmt_mtu_entry_get_type (void);
NmtNewtWidget *nmt_mtu_entry_new (void);
G_END_DECLS
#endif /* NMT_MTU_ENTRY_H */
......@@ -21,8 +21,6 @@
#include "nmt-editor-page-device.h"
G_BEGIN_DECLS
#define NMT_TYPE_PAGE_BOND (nmt_page_bond_get_type ())
#define NMT_PAGE_BOND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BOND, NmtPageBond))
#define NMT_PAGE_BOND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BOND, NmtPageBondClass))
......@@ -45,6 +43,4 @@ GType nmt_page_bond_get_type (void);
NmtEditorPage *nmt_page_bond_new (NMConnection *conn,
NmtDeviceEntry *deventry);
G_END_DECLS
#endif /* NMT_PAGE_BOND_H */
......@@ -21,8 +21,6 @@
#include "nmt-editor-page.h"
G_BEGIN_DECLS
#define NMT_TYPE_PAGE_BRIDGE_PORT (nmt_page_bridge_port_get_type ())
#define NMT_PAGE_BRIDGE_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BRIDGE_PORT, NmtPageBridgePort))
#define NMT_PAGE_BRIDGE_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BRIDGE_PORT, NmtPageBridgePortClass))
......@@ -44,6 +42,4 @@ GType nmt_page_bridge_port_get_type (void);
NmtEditorPage *nmt_page_bridge_port_new (NMConnection *conn);
G_END_DECLS
#endif /* NMT_PAGE_BRIDGE_PORT_H */
......@@ -21,8 +21,6 @@
#include "nmt-editor-page-device.h"
G_BEGIN_DECLS
#define NMT_TYPE_PAGE_BRIDGE (nmt_page_bridge_get_type ())
#define NMT_PAGE_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_BRIDGE, NmtPageBridge))
#define NMT_PAGE_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_BRIDGE, NmtPageBridgeClass))
......@@ -45,6 +43,4 @@ GType nmt_page_bridge_get_type (void);
NmtEditorPage *nmt_page_bridge_new (NMConnection *conn,
NmtDeviceEntry *deventry);
G_END_DECLS
#endif /* NMT_PAGE_BRIDGE_H */
......@@ -19,11 +19,8 @@
#ifndef NMT_PAGE_DSL_H
#define NMT_PAGE_DSL_H
#include "nm-default.h"
#include "nmt-editor-page-device.h"
G_BEGIN_DECLS
#define NMT_TYPE_PAGE_DSL (nmt_page_dsl_get_type ())
#define NMT_PAGE_DSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_DSL, NmtPageDsl))
#define NMT_PAGE_DSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_DSL, NmtPageDslClass))
......@@ -46,6 +43,4 @@ GType nmt_page_dsl_get_type (void);
NmtEditorPage *nmt_page_dsl_new (NMConnection *conn,
NmtDeviceEntry *deventry);
G_END_DECLS
#endif /* NMT_PAGE_DSL_H */