[nautilus: 3/3] Merge branch 'AlexFazakas/include-guards-for-pragma-once' into 'master'
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus: 3/3] Merge branch 'AlexFazakas/include-guards-for-pragma-once' into 'master'
- Date: Mon, 19 Mar 2018 18:04:19 +0000 (UTC)
commit fb4ebc0c250aee9698ed29e7b5310c353bee42bd
Merge: 089801d50 aa7cfcf01
Author: Ernestas Kulik <ernestas kulik gmail com>
Date: Mon Mar 19 18:03:11 2018 +0000
Merge branch 'AlexFazakas/include-guards-for-pragma-once' into 'master'
Replace include guards with pragma once functionality
Closes #294
See merge request GNOME/nautilus!141
eel/eel-accessibility.h | 7 +--
eel/eel-art-extensions.h | 7 +--
eel/eel-canvas.h | 7 +--
eel/eel-debug.h | 7 +--
eel/eel-glib-extensions.h | 7 +--
eel/eel-graphic-effects.h | 7 +--
eel/eel-gtk-extensions.h | 7 +--
eel/eel-lib-self-check-functions.h | 2 +
eel/eel-self-checks.h | 51 ++++++++++------------
eel/eel-stock-dialogs.h | 7 +--
eel/eel-string.h | 7 +--
eel/eel-vfs-extensions.h | 5 +--
eel/eel.h | 7 +--
.../nautilus-image-properties-page-provider.h | 7 +--
.../nautilus-image-properties-page.h | 7 +--
extensions/sendto/nautilus-nste.h | 7 +--
libgd | 1 +
libnautilus-extension/nautilus-column-provider.h | 7 +--
libnautilus-extension/nautilus-column.h | 5 +--
libnautilus-extension/nautilus-extension-private.h | 7 +--
libnautilus-extension/nautilus-extension-types.h | 5 +--
libnautilus-extension/nautilus-extension.h | 3 +-
libnautilus-extension/nautilus-file-info.h | 7 +--
libnautilus-extension/nautilus-info-provider.h | 7 +--
.../nautilus-location-widget-provider.h | 7 +--
libnautilus-extension/nautilus-menu-item.h | 7 +--
libnautilus-extension/nautilus-menu-provider.h | 5 +--
libnautilus-extension/nautilus-menu.h | 15 +++----
.../nautilus-property-page-provider.h | 7 +--
libnautilus-extension/nautilus-property-page.h | 7 +--
src/animation/egg-animation.h | 7 +--
src/animation/egg-frame-source.h | 7 +--
src/animation/ide-box-theatric.h | 7 +--
src/animation/ide-cairo.h | 7 +--
src/gtk/nautilusgtkplacesviewprivate.h | 3 +-
src/gtk/nautilusgtkplacesviewrowprivate.h | 11 +----
src/nautilus-application.h | 7 +--
src/nautilus-batch-rename-dialog.h | 7 +--
src/nautilus-batch-rename-utilities.h | 7 +--
src/nautilus-bookmark-list.h | 7 +--
src/nautilus-bookmark.h | 7 +--
src/nautilus-canvas-container.h | 5 +--
src/nautilus-canvas-dnd.h | 5 +--
src/nautilus-canvas-item.h | 7 +--
src/nautilus-canvas-private.h | 5 +--
src/nautilus-canvas-view-container.h | 5 +--
src/nautilus-canvas-view.h | 7 +--
src/nautilus-clipboard.h | 5 +--
src/nautilus-column-chooser.h | 5 +--
src/nautilus-column-utilities.h | 6 +--
src/nautilus-compress-dialog-controller.h | 5 +--
src/nautilus-container-max-width.h | 8 +---
src/nautilus-dbus-manager.h | 5 +--
src/nautilus-debug.h | 5 +--
src/nautilus-desktop-item-properties.h | 5 +--
src/nautilus-directory-notify.h | 2 +
src/nautilus-directory-private.h | 2 +
src/nautilus-directory.h | 5 +--
src/nautilus-dnd.h | 5 +--
src/nautilus-error-reporting.h | 7 +--
src/nautilus-file-attributes.h | 5 +--
src/nautilus-file-changes-queue.h | 6 +--
src/nautilus-file-conflict-dialog.h | 7 +--
src/nautilus-file-name-widget-controller.h | 6 +--
src/nautilus-file-operations.h | 8 +---
src/nautilus-file-private.h | 7 +--
src/nautilus-file-queue.h | 5 +--
src/nautilus-file-undo-manager.h | 5 +--
src/nautilus-file-undo-operations.h | 8 +---
src/nautilus-file-utilities.h | 5 +--
src/nautilus-file.h | 5 +--
src/nautilus-files-view-dnd.h | 8 +---
src/nautilus-files-view.h | 7 +--
src/nautilus-floating-bar.h | 8 +---
src/nautilus-freedesktop-dbus.h | 6 +--
src/nautilus-global-preferences.h | 7 +--
src/nautilus-icon-info.h | 8 +---
src/nautilus-icon-names.h | 8 +---
src/nautilus-keyfile-metadata.h | 7 +--
src/nautilus-lib-self-check-functions.h | 2 +
src/nautilus-link.h | 7 +--
src/nautilus-list-model.h | 9 ++--
src/nautilus-list-view-dnd.h | 8 ++--
src/nautilus-list-view-private.h | 2 +
src/nautilus-list-view.h | 7 +--
src/nautilus-location-entry.h | 7 +--
src/nautilus-metadata.h | 7 +--
src/nautilus-mime-actions.h | 8 +---
src/nautilus-mime-application-chooser.h | 5 +--
src/nautilus-module.h | 5 +--
src/nautilus-monitor.h | 7 +--
src/nautilus-new-folder-dialog-controller.h | 7 +--
src/nautilus-notebook.h | 8 +---
src/nautilus-operations-ui-manager.h | 7 +--
src/nautilus-other-locations-window-slot.h | 8 +---
src/nautilus-pathbar.h | 7 +--
src/nautilus-places-view.h | 5 +--
src/nautilus-preferences-window.h | 7 +--
src/nautilus-previewer.h | 5 +--
src/nautilus-profile.h | 7 +--
src/nautilus-program-choosing.h | 7 +--
src/nautilus-progress-info-manager.h | 7 +--
src/nautilus-progress-info-widget.h | 7 +--
src/nautilus-progress-info.h | 9 +---
src/nautilus-progress-persistence-handler.h | 7 +--
src/nautilus-properties-window.h | 7 +--
src/nautilus-query-editor.h | 7 +--
src/nautilus-query.h | 7 +--
src/nautilus-recent.h | 9 +---
src/nautilus-rename-file-popover-controller.h | 7 +--
src/nautilus-search-directory-file.h | 7 +--
src/nautilus-search-directory.h | 7 +--
src/nautilus-search-engine-model.h | 7 +--
src/nautilus-search-engine-simple.h | 7 +--
src/nautilus-search-engine-tracker.h | 7 +--
src/nautilus-search-engine.h | 7 +--
src/nautilus-search-hit.h | 5 +--
src/nautilus-search-popover.h | 7 +--
src/nautilus-search-provider.h | 7 +--
src/nautilus-selection-canvas-item.h | 7 +--
src/nautilus-self-check-functions.h | 3 +-
src/nautilus-shell-search-provider.h | 7 +--
src/nautilus-signaller.h | 7 +--
src/nautilus-special-location-bar.h | 7 +--
src/nautilus-starred-directory.h | 7 +--
src/nautilus-tag-manager.h | 7 +--
src/nautilus-thumbnails.h | 8 +---
src/nautilus-toolbar-menu-sections.h | 8 ++--
src/nautilus-toolbar.h | 7 +--
src/nautilus-trash-bar.h | 7 +--
src/nautilus-trash-monitor.h | 7 +--
src/nautilus-tree-view-drag-dest.h | 7 +--
src/nautilus-ui-utilities.h | 8 ++--
src/nautilus-undo-private.h | 7 +--
src/nautilus-vfs-directory.h | 7 +--
src/nautilus-vfs-file.h | 7 +--
src/nautilus-view-icon-controller.h | 8 +---
src/nautilus-view-icon-item-ui.h | 6 +--
src/nautilus-view-icon-ui.h | 9 ++--
src/nautilus-view-item-model.h | 8 +---
src/nautilus-view-model.h | 8 +---
src/nautilus-view.h | 8 +---
src/nautilus-window-slot-dnd.h | 7 +--
src/nautilus-window-slot.h | 7 +--
src/nautilus-window.h | 7 +--
src/nautilus-x-content-bar.h | 7 +--
test/interactive/test.h | 7 +--
147 files changed, 291 insertions(+), 720 deletions(-)
---
diff --cc src/nautilus-query-editor.h
index 9d20dfc58,9b3b300cc..d5d298e8d
--- a/src/nautilus-query-editor.h
+++ b/src/nautilus-query-editor.h
@@@ -30,58 -29,26 +29,56 @@@
G_DECLARE_DERIVABLE_TYPE (NautilusQueryEditor, nautilus_query_editor, NAUTILUS, QUERY_EDITOR, GtkSearchBar)
-struct _NautilusQueryEditorClass {
- GtkSearchBarClass parent_class;
-
- void (* changed) (NautilusQueryEditor *editor,
- NautilusQuery *query,
- gboolean reload);
- void (* cancel) (NautilusQueryEditor *editor);
- void (* activated) (NautilusQueryEditor *editor);
-};
+struct _NautilusQueryEditorClass
+{
+ GtkSearchBarClass parent_class;
-#include "nautilus-window-slot.h"
+ void (* changed) (NautilusQueryEditor *editor,
+ NautilusQuery *query,
+ gboolean reload);
+ void (* cancel) (NautilusQueryEditor *editor);
+ void (* activated) (NautilusQueryEditor *editor);
+};
-GType nautilus_query_editor_get_type (void);
-GtkWidget* nautilus_query_editor_new (void);
+GtkWidget *nautilus_query_editor_new (void);
-NautilusQuery *nautilus_query_editor_get_query (NautilusQueryEditor *editor);
-void nautilus_query_editor_set_query (NautilusQueryEditor *editor,
- NautilusQuery *query);
-GFile * nautilus_query_editor_get_location (NautilusQueryEditor *editor);
+/**
+ * nautilus_query_editor_get_query:
+ *
+ * @editor: A #NautilusQueryEditor instance.
+ *
+ * Returns: (nullable) (transfer full): The #NautilusQuery for the editor.
+ */
+NautilusQuery *nautilus_query_editor_get_query (NautilusQueryEditor *editor);
+/**
+ * nautilus_query_editor_set_query:
+ *
+ * @editor: A #NautilusQueryEditor instance.
+ * @query: (nullable) (transfer full): The #NautilusQuery for the search.
+ */
+void nautilus_query_editor_set_query (NautilusQueryEditor *editor,
+ NautilusQuery *query);
+/**
+ * nautilus_query_editor_get_location:
+ *
+ * @editor: A #NautilusQueryEditor instance.
+ *
+ * Returns: (nullable) (transfer full): The location of the current search.
+ */
+GFile *nautilus_query_editor_get_location (NautilusQueryEditor *editor);
+/**
+ * nautilus_query_editor_set_location:
+ *
+ * @editor: A #NautilusQueryEditor instance.
+ * @location: (nullable) (transfer full): The location in which the search will take place.
+ */
void nautilus_query_editor_set_location (NautilusQueryEditor *editor,
- GFile *location);
+ GFile *location);
+/**
+ * nautilus_query_editor_set_text:
+ *
+ * @editor: A #NautilusQueryEditor instance.
+ * @text: (not nullable) (transfer none): The search text.
+ */
void nautilus_query_editor_set_text (NautilusQueryEditor *editor,
- const gchar *text);
-
- #endif /* NAUTILUS_QUERY_EDITOR_H */
+ const gchar *text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
