diff options
| author | Sirbu Lavinia Stefania <sirbu.lavinia.stefania@gmail.com> | 2016-10-04 00:38:48 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@src.gnome.org> | 2016-10-07 15:59:07 +0300 |
| commit | 4e4d4df069af714500f260aa77f3cae5da6d4392 (patch) | |
| tree | 662b0ef6bb702c7fae2a82fff569ff860d554b6d /src/nautilus-file-conflict-dialog.h | |
| parent | 0b617a38874376c3c50f33afc22e0b5a80fa1543 (diff) | |
| download | nautilus-4e4d4df069af714500f260aa77f3cae5da6d4392.tar.gz | |
file-conflict-dialog: port to G_DECLARE* type
Currently we are using the old GObject class declarations, which have two
problems.
One problem is that we cannot use smart pointers like g_autoptr. The other
problem is the boilerplate code generated that makes the code less readable,
so harder to understand.
To fix this use G_DECLARE* type.
https://bugzilla.gnome.org/show_bug.cgi?id=771844
Diffstat (limited to 'src/nautilus-file-conflict-dialog.h')
| -rw-r--r-- | src/nautilus-file-conflict-dialog.h | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/src/nautilus-file-conflict-dialog.h b/src/nautilus-file-conflict-dialog.h index eee92d38f..1b8452fe7 100644 --- a/src/nautilus-file-conflict-dialog.h +++ b/src/nautilus-file-conflict-dialog.h @@ -27,36 +27,11 @@ #include <gio/gio.h> #include <gtk/gtk.h> -#define NAUTILUS_TYPE_FILE_CONFLICT_DIALOG \ - (nautilus_file_conflict_dialog_get_type ()) -#define NAUTILUS_FILE_CONFLICT_DIALOG(o) \ - (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,\ - NautilusFileConflictDialog)) -#define NAUTILUS_FILE_CONFLICT_DIALOG_CLASS(k) \ - (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,\ - NautilusFileConflictDialogClass)) -#define NAUTILUS_IS_FILE_CONFLICT_DIALOG(o) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG)) -#define NAUTILUS_IS_FILE_CONFLICT_DIALOG_CLASS(k) \ - (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG)) -#define NAUTILUS_FILE_CONFLICT_DIALOG_GET_CLASS(o) \ - (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,\ - NautilusFileConflictDialogClass)) +G_BEGIN_DECLS -typedef struct _NautilusFileConflictDialog NautilusFileConflictDialog; -typedef struct _NautilusFileConflictDialogClass NautilusFileConflictDialogClass; -typedef struct _NautilusFileConflictDialogDetails NautilusFileConflictDialogDetails; +#define NAUTILUS_TYPE_FILE_CONFLICT_DIALOG (nautilus_file_conflict_dialog_get_type ()) -struct _NautilusFileConflictDialog { - GtkDialog parent; - NautilusFileConflictDialogDetails *details; -}; - -struct _NautilusFileConflictDialogClass { - GtkDialogClass parent_class; -}; - -GType nautilus_file_conflict_dialog_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (NautilusFileConflictDialog, nautilus_file_conflict_dialog, NAUTILUS, FILE_CONFLICT_DIALOG, GtkDialog) NautilusFileConflictDialog* nautilus_file_conflict_dialog_new (GtkWindow *parent); @@ -80,4 +55,6 @@ void nautilus_file_conflict_dialog_disable_apply_to_all (NautilusFileConflictDia char* nautilus_file_conflict_dialog_get_new_name (NautilusFileConflictDialog *dialog); gboolean nautilus_file_conflict_dialog_get_apply_to_all (NautilusFileConflictDialog *dialog); +G_END_DECLS + #endif /* NAUTILUS_FILE_CONFLICT_DIALOG_H */ |