From 942fc8c6fb86444ee1dd85dd35ba8deb2fa449b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 10 Feb 2021 15:11:49 +0000 Subject: [PATCH] src: remove G_BEGIN_DECLS / G_END_DECLS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit None of our header files are installed for public use, so these macros are not required. Signed-off-by: Daniel P. Berrangé --- src/glib-compat.h | 4 ---- src/ovirt-foreign-menu.h | 3 --- src/remote-viewer-iso-list-dialog.h | 4 ---- src/remote-viewer.h | 3 --- src/virt-viewer-app.h | 4 ---- src/virt-viewer-display-spice.h | 3 --- src/virt-viewer-display-vnc.h | 4 ---- src/virt-viewer-display-vte.h | 4 ---- src/virt-viewer-display.h | 4 ---- src/virt-viewer-enums.h.etemplate | 2 -- src/virt-viewer-file-transfer-dialog.h | 4 ---- src/virt-viewer-file.h | 4 ---- src/virt-viewer-notebook.h | 4 ---- src/virt-viewer-session-spice.h | 4 ---- src/virt-viewer-session-vnc.h | 4 ---- src/virt-viewer-session.h | 4 ---- src/virt-viewer-timed-revealer.h | 4 ---- src/virt-viewer-window.h | 4 ---- src/virt-viewer.h | 4 ---- tests/test-hotkeys.c | 4 ---- 20 files changed, 75 deletions(-) diff --git a/src/glib-compat.h b/src/glib-compat.h index 65a7737..b56691f 100644 --- a/src/glib-compat.h +++ b/src/glib-compat.h @@ -23,7 +23,3 @@ #pragma once #include - -G_BEGIN_DECLS - -G_END_DECLS diff --git a/src/ovirt-foreign-menu.h b/src/ovirt-foreign-menu.h index 0f5478b..b612d62 100644 --- a/src/ovirt-foreign-menu.h +++ b/src/ovirt-foreign-menu.h @@ -31,8 +31,6 @@ #include "virt-viewer-file.h" -G_BEGIN_DECLS - #define OVIRT_TYPE_FOREIGN_MENU ovirt_foreign_menu_get_type() G_DECLARE_FINAL_TYPE(OvirtForeignMenu, ovirt_foreign_menu, @@ -67,4 +65,3 @@ GtkWidget *ovirt_foreign_menu_get_gtk_menu(OvirtForeignMenu *foreign_menu); gchar *ovirt_foreign_menu_get_current_iso_name(OvirtForeignMenu *menu); GList *ovirt_foreign_menu_get_iso_names(OvirtForeignMenu *menu); -G_END_DECLS diff --git a/src/remote-viewer-iso-list-dialog.h b/src/remote-viewer-iso-list-dialog.h index 2b2f56a..0cf1058 100644 --- a/src/remote-viewer-iso-list-dialog.h +++ b/src/remote-viewer-iso-list-dialog.h @@ -22,8 +22,6 @@ #include -G_BEGIN_DECLS - #define REMOTE_VIEWER_TYPE_ISO_LIST_DIALOG remote_viewer_iso_list_dialog_get_type() G_DECLARE_FINAL_TYPE(RemoteViewerISOListDialog, remote_viewer_iso_list_dialog, @@ -34,5 +32,3 @@ G_DECLARE_FINAL_TYPE(RemoteViewerISOListDialog, GType remote_viewer_iso_list_dialog_get_type(void) G_GNUC_CONST; GtkWidget *remote_viewer_iso_list_dialog_new(GtkWindow *parent, GObject *foreign_menu); - -G_END_DECLS diff --git a/src/remote-viewer.h b/src/remote-viewer.h index 093ab18..e28fe1d 100644 --- a/src/remote-viewer.h +++ b/src/remote-viewer.h @@ -25,8 +25,6 @@ #include #include "virt-viewer-app.h" -G_BEGIN_DECLS - #define REMOTE_VIEWER_TYPE remote_viewer_get_type() G_DECLARE_FINAL_TYPE(RemoteViewer, remote_viewer, @@ -38,4 +36,3 @@ GType remote_viewer_get_type (void); RemoteViewer *remote_viewer_new (void); -G_END_DECLS diff --git a/src/virt-viewer-app.h b/src/virt-viewer-app.h index f97629f..720eda0 100644 --- a/src/virt-viewer-app.h +++ b/src/virt-viewer-app.h @@ -26,8 +26,6 @@ #include #include "virt-viewer-window.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_APP virt_viewer_app_get_type() G_DECLARE_DERIVABLE_TYPE(VirtViewerApp, virt_viewer_app, @@ -105,5 +103,3 @@ void virt_viewer_app_set_config_share_clipboard(VirtViewerApp *self, gboolean en gboolean virt_viewer_app_get_supports_share_clipboard(VirtViewerApp *self); void virt_viewer_app_set_supports_share_clipboard(VirtViewerApp *self, gboolean enable); - -G_END_DECLS diff --git a/src/virt-viewer-display-spice.h b/src/virt-viewer-display-spice.h index 819f68e..29cb35e 100644 --- a/src/virt-viewer-display-spice.h +++ b/src/virt-viewer-display-spice.h @@ -30,8 +30,6 @@ #include "virt-viewer-display.h" #include "virt-viewer-session-spice.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_DISPLAY_SPICE virt_viewer_display_spice_get_type() G_DECLARE_FINAL_TYPE(VirtViewerDisplaySpice, virt_viewer_display_spice, @@ -45,4 +43,3 @@ GtkWidget* virt_viewer_display_spice_new(VirtViewerSessionSpice *session, SpiceC void virt_viewer_display_spice_set_desktop(VirtViewerDisplay *display, guint x, guint y, guint width, guint height); -G_END_DECLS diff --git a/src/virt-viewer-display-vnc.h b/src/virt-viewer-display-vnc.h index 3bf8676..4037a84 100644 --- a/src/virt-viewer-display-vnc.h +++ b/src/virt-viewer-display-vnc.h @@ -30,8 +30,6 @@ #include "virt-viewer-display.h" #include "virt-viewer-session-vnc.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_DISPLAY_VNC virt_viewer_display_vnc_get_type() G_DECLARE_FINAL_TYPE(VirtViewerDisplayVnc, virt_viewer_display_vnc, @@ -42,5 +40,3 @@ G_DECLARE_FINAL_TYPE(VirtViewerDisplayVnc, GType virt_viewer_display_vnc_get_type(void); GtkWidget* virt_viewer_display_vnc_new(VirtViewerSessionVnc *session, VncDisplay *display); - -G_END_DECLS diff --git a/src/virt-viewer-display-vte.h b/src/virt-viewer-display-vte.h index d581228..76a9dca 100644 --- a/src/virt-viewer-display-vte.h +++ b/src/virt-viewer-display-vte.h @@ -26,8 +26,6 @@ #include "virt-viewer-display.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_DISPLAY_VTE virt_viewer_display_vte_get_type() G_DECLARE_FINAL_TYPE(VirtViewerDisplayVte, virt_viewer_display_vte, @@ -45,5 +43,3 @@ void virt_viewer_display_vte_zoom_reset(VirtViewerDisplayVte *vte); void virt_viewer_display_vte_zoom_in(VirtViewerDisplayVte *vte); void virt_viewer_display_vte_zoom_out(VirtViewerDisplayVte *vte); -G_END_DECLS - diff --git a/src/virt-viewer-display.h b/src/virt-viewer-display.h index 4a48d45..fabbc5e 100644 --- a/src/virt-viewer-display.h +++ b/src/virt-viewer-display.h @@ -27,8 +27,6 @@ #include #include "virt-viewer-enums.h" -G_BEGIN_DECLS - #define MIN_DISPLAY_WIDTH 320 #define MIN_DISPLAY_HEIGHT 200 @@ -111,5 +109,3 @@ gboolean virt_viewer_display_get_selectable(VirtViewerDisplay *display); void virt_viewer_display_queue_resize(VirtViewerDisplay *display); void virt_viewer_display_get_preferred_monitor_geometry(VirtViewerDisplay *self, GdkRectangle* preferred); gint virt_viewer_display_get_nth(VirtViewerDisplay *self); - -G_END_DECLS diff --git a/src/virt-viewer-enums.h.etemplate b/src/virt-viewer-enums.h.etemplate index f33158d..16e540e 100644 --- a/src/virt-viewer-enums.h.etemplate +++ b/src/virt-viewer-enums.h.etemplate @@ -26,7 +26,6 @@ #include -G_BEGIN_DECLS /*** END file-header ***/ /*** BEGIN value-header ***/ @@ -35,7 +34,6 @@ GType @enum_name@_get_type (void) G_GNUC_CONST; /*** END value-header ***/ /*** BEGIN file-tail ***/ -G_END_DECLS #endif /*** END file-tail ***/ diff --git a/src/virt-viewer-file-transfer-dialog.h b/src/virt-viewer-file-transfer-dialog.h index dab571e..bf37c12 100644 --- a/src/virt-viewer-file-transfer-dialog.h +++ b/src/virt-viewer-file-transfer-dialog.h @@ -23,8 +23,6 @@ #include #include -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_FILE_TRANSFER_DIALOG virt_viewer_file_transfer_dialog_get_type() G_DECLARE_FINAL_TYPE(VirtViewerFileTransferDialog, virt_viewer_file_transfer_dialog, @@ -37,5 +35,3 @@ GType virt_viewer_file_transfer_dialog_get_type(void) G_GNUC_CONST; VirtViewerFileTransferDialog *virt_viewer_file_transfer_dialog_new(GtkWindow *parent); void virt_viewer_file_transfer_dialog_add_task(VirtViewerFileTransferDialog *self, SpiceFileTransferTask *task); - -G_END_DECLS diff --git a/src/virt-viewer-file.h b/src/virt-viewer-file.h index f2fdc98..88faa4b 100644 --- a/src/virt-viewer-file.h +++ b/src/virt-viewer-file.h @@ -23,8 +23,6 @@ #include "virt-viewer-app.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_FILE (virt_viewer_file_get_type ()) G_DECLARE_FINAL_TYPE(VirtViewerFile, virt_viewer_file, @@ -119,5 +117,3 @@ gchar* virt_viewer_file_get_ovirt_sso_token(VirtViewerFile* self); void virt_viewer_file_set_ovirt_sso_token(VirtViewerFile* self, const gchar* value); gchar* virt_viewer_file_get_ovirt_ca(VirtViewerFile* self); void virt_viewer_file_set_ovirt_ca(VirtViewerFile* self, const gchar* value); - -G_END_DECLS diff --git a/src/virt-viewer-notebook.h b/src/virt-viewer-notebook.h index b382d5e..1fe96d1 100644 --- a/src/virt-viewer-notebook.h +++ b/src/virt-viewer-notebook.h @@ -27,8 +27,6 @@ #include #include -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_NOTEBOOK virt_viewer_notebook_get_type() G_DECLARE_FINAL_TYPE(VirtViewerNotebook, virt_viewer_notebook, @@ -42,5 +40,3 @@ VirtViewerNotebook* virt_viewer_notebook_new (void); void virt_viewer_notebook_show_status_va(VirtViewerNotebook *self, const gchar *fmt, va_list args) G_GNUC_PRINTF(2, 0); void virt_viewer_notebook_show_status(VirtViewerNotebook *nb, const gchar *fmt, ...) G_GNUC_PRINTF(2, 3); void virt_viewer_notebook_show_display(VirtViewerNotebook *nb); - -G_END_DECLS diff --git a/src/virt-viewer-session-spice.h b/src/virt-viewer-session-spice.h index d1769ec..75a9691 100644 --- a/src/virt-viewer-session-spice.h +++ b/src/virt-viewer-session-spice.h @@ -29,8 +29,6 @@ #include "virt-viewer-session.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_SESSION_SPICE virt_viewer_session_spice_get_type() G_DECLARE_FINAL_TYPE(VirtViewerSessionSpice, virt_viewer_session_spice, @@ -42,5 +40,3 @@ GType virt_viewer_session_spice_get_type(void); VirtViewerSession* virt_viewer_session_spice_new(VirtViewerApp *app, GtkWindow *main_window); SpiceMainChannel* virt_viewer_session_spice_get_main_channel(VirtViewerSessionSpice *self); - -G_END_DECLS diff --git a/src/virt-viewer-session-vnc.h b/src/virt-viewer-session-vnc.h index 6043bc4..1f25d16 100644 --- a/src/virt-viewer-session-vnc.h +++ b/src/virt-viewer-session-vnc.h @@ -29,8 +29,6 @@ #include "virt-viewer-session.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_SESSION_VNC virt_viewer_session_vnc_get_type() G_DECLARE_FINAL_TYPE(VirtViewerSessionVnc, virt_viewer_session_vnc, @@ -41,5 +39,3 @@ G_DECLARE_FINAL_TYPE(VirtViewerSessionVnc, GType virt_viewer_session_vnc_get_type(void); VirtViewerSession *virt_viewer_session_vnc_new(VirtViewerApp *app, GtkWindow *main_window); - -G_END_DECLS diff --git a/src/virt-viewer-session.h b/src/virt-viewer-session.h index a653311..b772ab1 100644 --- a/src/virt-viewer-session.h +++ b/src/virt-viewer-session.h @@ -30,8 +30,6 @@ #include "virt-viewer-file.h" #include "virt-viewer-display.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_SESSION virt_viewer_session_get_type() G_DECLARE_DERIVABLE_TYPE(VirtViewerSession, virt_viewer_session, @@ -109,5 +107,3 @@ gboolean virt_viewer_session_can_share_folder(VirtViewerSession *self); gboolean virt_viewer_session_can_retry_auth(VirtViewerSession *self); void virt_viewer_session_vm_action(VirtViewerSession *self, gint action); - -G_END_DECLS diff --git a/src/virt-viewer-timed-revealer.h b/src/virt-viewer-timed-revealer.h index d69f966..ed4e28f 100644 --- a/src/virt-viewer-timed-revealer.h +++ b/src/virt-viewer-timed-revealer.h @@ -26,8 +26,6 @@ #include #include -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE_TIMED_REVEALER virt_viewer_timed_revealer_get_type() G_DECLARE_FINAL_TYPE(VirtViewerTimedRevealer, virt_viewer_timed_revealer, @@ -43,5 +41,3 @@ virt_viewer_timed_revealer_new(GtkWidget *toolbar); void virt_viewer_timed_revealer_force_reveal(VirtViewerTimedRevealer *self, gboolean fullscreen); - -G_END_DECLS diff --git a/src/virt-viewer-window.h b/src/virt-viewer-window.h index d0a25f4..0244f66 100644 --- a/src/virt-viewer-window.h +++ b/src/virt-viewer-window.h @@ -28,8 +28,6 @@ #include "virt-viewer-notebook.h" #include "virt-viewer-display.h" -G_BEGIN_DECLS - #define MIN_ZOOM_LEVEL 10 #define MAX_ZOOM_LEVEL 400 #define NORMAL_ZOOM_LEVEL 100 @@ -62,5 +60,3 @@ void virt_viewer_window_enter_fullscreen(VirtViewerWindow *self, gint monitor); GtkMenuItem *virt_viewer_window_get_menu_displays(VirtViewerWindow *self); GtkBuilder* virt_viewer_window_get_builder(VirtViewerWindow *window); void virt_viewer_window_set_kiosk(VirtViewerWindow *self, gboolean enabled); - -G_END_DECLS diff --git a/src/virt-viewer.h b/src/virt-viewer.h index 0a0c132..f21e0ed 100644 --- a/src/virt-viewer.h +++ b/src/virt-viewer.h @@ -25,8 +25,6 @@ #include #include "virt-viewer-app.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TYPE virt_viewer_get_type() G_DECLARE_FINAL_TYPE(VirtViewer, virt_viewer, @@ -37,5 +35,3 @@ G_DECLARE_FINAL_TYPE(VirtViewer, GType virt_viewer_get_type (void); VirtViewer *virt_viewer_new (void); - -G_END_DECLS diff --git a/tests/test-hotkeys.c b/tests/test-hotkeys.c index 00ee20a..0cd953c 100644 --- a/tests/test-hotkeys.c +++ b/tests/test-hotkeys.c @@ -26,8 +26,6 @@ #include "virt-viewer-app.h" -G_BEGIN_DECLS - #define VIRT_VIEWER_TEST_TYPE virt_viewer_test_get_type() G_DECLARE_FINAL_TYPE(VirtViewerTest, virt_viewer_test, @@ -45,8 +43,6 @@ G_DEFINE_TYPE (VirtViewerTest, virt_viewer_test, VIRT_VIEWER_TYPE_APP) VirtViewerTest *virt_viewer_test_new (void); -G_END_DECLS - static void virt_viewer_test_class_init (VirtViewerTestClass *klass G_GNUC_UNUSED) {