diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2018-06-03 09:44:43 +0400 |
---|---|---|
committer | Robert Ancell <robert.ancell@gmail.com> | 2018-08-02 21:48:03 +0000 |
commit | b51af0fc58bbd8ea6e04e4bc7fa0b897f3f3ca83 (patch) | |
tree | 85ce6aaeda77cf3630ef7e289457c59903ec4527 /panels/wacom | |
parent | aeca65c729e83bde85fa0c9e8a5e3a695dac97c2 (diff) | |
download | gnome-control-center-b51af0fc58bbd8ea6e04e4bc7fa0b897f3f3ca83.tar.gz |
wacom: Replace ifdefs with #pragma once
Diffstat (limited to 'panels/wacom')
-rw-r--r-- | panels/wacom/cc-drawing-area.h | 5 | ||||
-rw-r--r-- | panels/wacom/cc-tablet-tool-map.h | 5 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-button-row.h | 5 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-device.h | 6 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-mapping-panel.h | 5 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-nav-button.h | 6 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-page.h | 6 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-panel.h | 6 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-stylus-page.h | 6 | ||||
-rw-r--r-- | panels/wacom/cc-wacom-tool.h | 5 | ||||
-rw-r--r-- | panels/wacom/gsd-wacom-key-shortcut-button.h | 5 |
11 files changed, 12 insertions, 48 deletions
diff --git a/panels/wacom/cc-drawing-area.h b/panels/wacom/cc-drawing-area.h index 936716350..9b22a4233 100644 --- a/panels/wacom/cc-drawing-area.h +++ b/panels/wacom/cc-drawing-area.h @@ -17,8 +17,7 @@ * Author: Carlos Garnacho <carlosg@gnome.org> */ -#ifndef _CC_DRAWING_AREA_H -#define _CC_DRAWING_AREA_H +#pragma once #include <gtk/gtk.h> @@ -30,5 +29,3 @@ G_DECLARE_FINAL_TYPE (CcDrawingArea, cc_drawing_area, CC, DRAWING_AREA, GtkEvent GtkWidget *cc_drawing_area_new (void); G_END_DECLS - -#endif /* _CC_DRAWING_AREA_H */ diff --git a/panels/wacom/cc-tablet-tool-map.h b/panels/wacom/cc-tablet-tool-map.h index 5e542a826..a65eb2a37 100644 --- a/panels/wacom/cc-tablet-tool-map.h +++ b/panels/wacom/cc-tablet-tool-map.h @@ -18,8 +18,7 @@ * */ -#ifndef __CC_TABLET_TOOL_MAP_H__ -#define __CC_TABLET_TOOL_MAP_H__ +#pragma once #include "config.h" #include <gtk/gtk.h> @@ -43,5 +42,3 @@ void cc_tablet_tool_map_add_relation (CcTabletToolMap *map, CcWacomTool *tool); G_END_DECLS - -#endif /* __CC_TABLET_TOOL_MAP_H__ */ diff --git a/panels/wacom/cc-wacom-button-row.h b/panels/wacom/cc-wacom-button-row.h index 91cb17e4d..7a30d11db 100644 --- a/panels/wacom/cc-wacom-button-row.h +++ b/panels/wacom/cc-wacom-button-row.h @@ -17,8 +17,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __CC_WACOM_BUTTON_ROW_H__ -#define __CC_WACOM_BUTTON_ROW_H__ +#pragma once #include <gtk/gtk.h> #include <gdesktop-enums.h> @@ -42,5 +41,3 @@ GtkWidget * cc_wacom_button_row_new (guint button, GSettings *settings); G_END_DECLS - -#endif /* __CC_WACOM_PAGE_H__ */ diff --git a/panels/wacom/cc-wacom-device.h b/panels/wacom/cc-wacom-device.h index ffc46f61b..fae504a36 100644 --- a/panels/wacom/cc-wacom-device.h +++ b/panels/wacom/cc-wacom-device.h @@ -17,8 +17,8 @@ * Authors: Carlos Garnacho <carlosg@gnome.org> * */ -#ifndef __CC_WACOM_DEVICE_H__ -#define __CC_WACOM_DEVICE_H__ + +#pragma once #include "config.h" #include <glib-object.h> @@ -61,5 +61,3 @@ guint cc_wacom_device_get_num_buttons (CcWacomDevice *wacom_device); GSettings * cc_wacom_device_get_button_settings (CcWacomDevice *device, guint button); - -#endif /* __CC_WACOM_DEVICE_H__ */ diff --git a/panels/wacom/cc-wacom-mapping-panel.h b/panels/wacom/cc-wacom-mapping-panel.h index 211126761..ac9501cca 100644 --- a/panels/wacom/cc-wacom-mapping-panel.h +++ b/panels/wacom/cc-wacom-mapping-panel.h @@ -18,8 +18,7 @@ * */ -#ifndef CC_WACOM_MAPPING_PANEL_H_ -#define CC_WACOM_MAPPING_PANEL_H_ +#pragma once #include <gtk/gtk.h> #include "cc-wacom-device.h" @@ -35,5 +34,3 @@ void cc_wacom_mapping_panel_set_device (CcWacomMappingPanel *self, CcWacomDevice *device); G_END_DECLS - -#endif /* CC_WACOM_MAPPING_PANEL_H_ */ diff --git a/panels/wacom/cc-wacom-nav-button.h b/panels/wacom/cc-wacom-nav-button.h index 74c0a1453..6b60105fd 100644 --- a/panels/wacom/cc-wacom-nav-button.h +++ b/panels/wacom/cc-wacom-nav-button.h @@ -17,9 +17,7 @@ * Authors: Bastien Nocera <hadess@hadess.net> */ - -#ifndef _CC_WACOM_NAV_BUTTON_H -#define _CC_WACOM_NAV_BUTTON_H +#pragma once #include <gtk/gtk.h> @@ -31,5 +29,3 @@ G_DECLARE_FINAL_TYPE (CcWacomNavButton, cc_wacom_nav_button, CC, WACOM_NAV_BUTTO GtkWidget * cc_wacom_nav_button_new (void); G_END_DECLS - -#endif /* _CC_WACOM_NAV_BUTTON_H */ diff --git a/panels/wacom/cc-wacom-page.h b/panels/wacom/cc-wacom-page.h index 50c242a3c..cd3a6ae39 100644 --- a/panels/wacom/cc-wacom-page.h +++ b/panels/wacom/cc-wacom-page.h @@ -18,9 +18,7 @@ * Bastien Nocera <hadess@hadess.net> */ - -#ifndef _CC_WACOM_PAGE_H -#define _CC_WACOM_PAGE_H +#pragma once #include <gtk/gtk.h> #include "cc-wacom-panel.h" @@ -48,5 +46,3 @@ void cc_wacom_page_calibrate (CcWacomPage *page); gboolean cc_wacom_page_can_calibrate (CcWacomPage *page); G_END_DECLS - -#endif /* _CC_WACOM_PAGE_H */ diff --git a/panels/wacom/cc-wacom-panel.h b/panels/wacom/cc-wacom-panel.h index b85bac4c9..55bf1f96e 100644 --- a/panels/wacom/cc-wacom-panel.h +++ b/panels/wacom/cc-wacom-panel.h @@ -18,9 +18,7 @@ * Bastien Nocera <hadess@hadess.net> */ - -#ifndef _CC_WACOM_PANEL_H -#define _CC_WACOM_PANEL_H +#pragma once #include <shell/cc-panel.h> @@ -40,5 +38,3 @@ void cc_wacom_panel_set_osd_visibility (CcWacomPanel *self, GDBusProxy * cc_wacom_panel_get_gsd_wacom_bus_proxy (CcWacomPanel *self); G_END_DECLS - -#endif /* _CC_WACOM_PANEL_H */ diff --git a/panels/wacom/cc-wacom-stylus-page.h b/panels/wacom/cc-wacom-stylus-page.h index 05ec2910b..23810d9b0 100644 --- a/panels/wacom/cc-wacom-stylus-page.h +++ b/panels/wacom/cc-wacom-stylus-page.h @@ -18,9 +18,7 @@ * Bastien Nocera <hadess@hadess.net> */ - -#ifndef _CC_WACOM_STYLUS_PAGE_H -#define _CC_WACOM_STYLUS_PAGE_H +#pragma once #include <gtk/gtk.h> #include "cc-wacom-tool.h" @@ -38,5 +36,3 @@ void cc_wacom_stylus_page_set_navigation (CcWacomStylusPage *page, GtkNotebook *notebook); G_END_DECLS - -#endif /* _CC_WACOM_STYLUS_PAGE_H */ diff --git a/panels/wacom/cc-wacom-tool.h b/panels/wacom/cc-wacom-tool.h index a7da46818..f988e1ff6 100644 --- a/panels/wacom/cc-wacom-tool.h +++ b/panels/wacom/cc-wacom-tool.h @@ -18,8 +18,7 @@ * */ -#ifndef __CC_WACOM_TOOL_H__ -#define __CC_WACOM_TOOL_H__ +#pragma once #include "config.h" #include "gsd-device-manager.h" @@ -43,5 +42,3 @@ GSettings * cc_wacom_tool_get_settings (CcWacomTool *tool); guint cc_wacom_tool_get_num_buttons (CcWacomTool *tool); gboolean cc_wacom_tool_get_has_eraser (CcWacomTool *tool); - -#endif /* __CC_WACOM_TOOL_H__ */ diff --git a/panels/wacom/gsd-wacom-key-shortcut-button.h b/panels/wacom/gsd-wacom-key-shortcut-button.h index 444d52718..f4d55250c 100644 --- a/panels/wacom/gsd-wacom-key-shortcut-button.h +++ b/panels/wacom/gsd-wacom-key-shortcut-button.h @@ -19,8 +19,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __GSD_WACOM_KEY_SHORTCUT_BUTTON_H__ -#define __GSD_WACOM_KEY_SHORTCUT_BUTTON_H__ +#pragma once #include <gtk/gtk.h> @@ -39,5 +38,3 @@ typedef enum } GsdWacomKeyShortcutButtonMode; GtkWidget * gsd_wacom_key_shortcut_button_new (void); - -#endif /* __GSD_WACOM_KEY_SHORTCUT_BUTTON_H__ */ |