GNOME.org
 

[dia] general: bring together autoptr defs

commit 8d4eee28f066f372c7267c9a1a225d983de1e6c2
Author: Zander Brown <zbrown gnome org>
Date:   Fri May 1 03:01:39 2020 +0100

    general: bring together autoptr defs
    
    Of course these all go away in gtk3, but keeping them in a single header avoids redefinitions

 app/dia-builder.h                   |  4 ++--
 app/dia-colour-area.h               | 15 +++++--------
 app/dia-line-width-area.h           | 17 ++++++--------
 app/dia-props.h                     |  2 +-
 app/layer-editor/dia-layer-editor.h |  6 ++---
 app/layer-editor/dia-layer-list.h   |  5 ++---
 app/layer-editor/dia-layer-widget.h |  5 ++---
 docs/dia/dia-docs.xml               |  1 -
 lib/dia-arrow-cell-renderer.h       |  3 ++-
 lib/dia-autoptr.h                   | 44 +++++++++++++++++++++++++++++++++++++
 lib/dia-colour-cell-renderer.h      |  3 ++-
 lib/dia-line-cell-renderer.h        |  3 ++-
 lib/dia-simple-list.h               |  4 ++--
 lib/diafontselector.h               |  3 ++-
 lib/diaoptionmenu.h                 |  3 ++-
 lib/diatypes.h                      |  4 ++++
 lib/widgets.h                       | 28 ++++++++++-------------
 17 files changed, 94 insertions(+), 56 deletions(-)
---
diff --git a/app/dia-builder.h b/app/dia-builder.h
index 37096654..0bae1921 100644
--- a/app/dia-builder.h
+++ b/app/dia-builder.h
@@ -24,14 +24,14 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
+
 G_BEGIN_DECLS
 
 struct _DiaBuilder {
   GtkBuilder parent;
 };
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkBuilder, g_object_unref)
-
 #define DIA_TYPE_BUILDER dia_builder_get_type()
 G_DECLARE_FINAL_TYPE (DiaBuilder, dia_builder, DIA, BUILDER, GtkBuilder)
 
diff --git a/app/dia-colour-area.h b/app/dia-colour-area.h
index 161f41d5..18957b07 100644
--- a/app/dia-colour-area.h
+++ b/app/dia-colour-area.h
@@ -15,19 +15,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifndef COLOUR_AREA_H
-#define COLOUR_AREA_H
+
+#pragma once
 
 #include <gtk/gtk.h>
 
 #include "color.h"
+#include "dia-autoptr.h"
+
+G_BEGIN_DECLS
 
-#ifndef __GTK_DOC_IGNORE__
-#ifndef EVENT_APTR
-#define EVENT_APTR
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkEventBox, g_object_unref)
-#endif
-#endif
 
 #define DIA_TYPE_COLOUR_AREA (dia_colour_area_get_type ())
 G_DECLARE_FINAL_TYPE (DiaColourArea, dia_colour_area, DIA, COLOUR_AREA, GtkEventBox)
@@ -49,4 +46,4 @@ struct _DiaColourArea
 
 GtkWidget *dia_colour_area_new (int width, int height);
 
-#endif /* COLOUR_AREA_H */
+G_END_DECLS
diff --git a/app/dia-line-width-area.h b/app/dia-line-width-area.h
index df62db2c..dad5a8bf 100644
--- a/app/dia-line-width-area.h
+++ b/app/dia-line-width-area.h
@@ -15,17 +15,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifndef LINEWDITH_AREA_H
-#define LINEWDITH_AREA_H
+
+#pragma once
 
 #include <gtk/gtk.h>
 
-#ifndef __GTK_DOC_IGNORE__
-#ifndef EVENT_APTR
-#define EVENT_APTR
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkEventBox, g_object_unref)
-#endif
-#endif
+#include "dia-autoptr.h"
+
+G_BEGIN_DECLS
+
 
 #define DIA_TYPE_LINE_WIDTH_AREA (dia_line_width_area_get_type ())
 G_DECLARE_FINAL_TYPE (DiaLineWidthArea, dia_line_width_area, DIA, LINE_WIDTH_AREA, GtkEventBox)
@@ -41,5 +39,4 @@ struct _DiaLineWidthArea
 
 GtkWidget *dia_line_width_area_new ();
 
-
-#endif /* LINEWDITH_AREA_H */
+G_END_DECLS
diff --git a/app/dia-props.h b/app/dia-props.h
index 51a88236..f5d7e0d9 100644
--- a/app/dia-props.h
+++ b/app/dia-props.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
+#include "dia-autoptr.h"
 #include "diagram.h"
 
 #include <gtk/gtk.h>
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkDialog, g_object_unref)
 
 #define DIA_TYPE_DIAGRAM_PROPERTIES_DIALOG dia_diagram_properties_dialog_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaDiagramPropertiesDialog, dia_diagram_properties_dialog, DIA, 
DIAGRAM_PROPERTIES_DIALOG, GtkDialog)
diff --git a/app/layer-editor/dia-layer-editor.h b/app/layer-editor/dia-layer-editor.h
index 1e5624ee..2c00e245 100644
--- a/app/layer-editor/dia-layer-editor.h
+++ b/app/layer-editor/dia-layer-editor.h
@@ -19,14 +19,14 @@
 #pragma once
 
 #include <gtk/gtk.h>
+
+#include "dia-autoptr.h"
 #include "diagram.h"
 
 G_BEGIN_DECLS
 
-#define DIA_TYPE_LAYER_EDITOR dia_layer_editor_get_type ()
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkVBox, g_object_unref)
 
+#define DIA_TYPE_LAYER_EDITOR dia_layer_editor_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaLayerEditor, dia_layer_editor, DIA, LAYER_EDITOR, GtkVBox)
 
 struct _DiaLayerEditorClass {
diff --git a/app/layer-editor/dia-layer-list.h b/app/layer-editor/dia-layer-list.h
index 33411944..c62fd544 100644
--- a/app/layer-editor/dia-layer-list.h
+++ b/app/layer-editor/dia-layer-list.h
@@ -25,14 +25,13 @@
 #include <gtk/gtk.h>
 
 #include "diagramdata.h"
+#include "dia-autoptr.h"
 #include "dia-layer-widget.h"
 
 G_BEGIN_DECLS
 
-#define DIA_TYPE_LAYER_LIST dia_layer_list_get_type ()
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkContainer, g_object_unref)
 
+#define DIA_TYPE_LAYER_LIST dia_layer_list_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaLayerList, dia_layer_list, DIA, LAYER_LIST, GtkContainer)
 
 
diff --git a/app/layer-editor/dia-layer-widget.h b/app/layer-editor/dia-layer-widget.h
index a5189bb3..1d85782c 100644
--- a/app/layer-editor/dia-layer-widget.h
+++ b/app/layer-editor/dia-layer-widget.h
@@ -20,15 +20,14 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
 #include "dia-layer.h"
 #include "dia-layer-editor.h"
 
 G_BEGIN_DECLS
 
-#define DIA_TYPE_LAYER_WIDGET dia_layer_widget_get_type ()
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkBin, g_object_unref)
 
+#define DIA_TYPE_LAYER_WIDGET dia_layer_widget_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaLayerWidget, dia_layer_widget, DIA, LAYER_WIDGET, GtkBin)
 
 struct _DiaLayerWidgetClass {
diff --git a/docs/dia/dia-docs.xml b/docs/dia/dia-docs.xml
index 412a94c2..9872afa8 100644
--- a/docs/dia/dia-docs.xml
+++ b/docs/dia/dia-docs.xml
@@ -74,7 +74,6 @@
     <xi:include href="xml/create.xml"/>
     <xi:include href="xml/diatransform.xml"/>
     <xi:include href="xml/object_index.sgml"/>
-    <xi:include href="xml/diatypes.xml"/>
     <xi:include href="xml/sheet.xml"/>
     <xi:include href="xml/diavar.xml"/>
     <xi:include href="xml/object.xml"/>
diff --git a/lib/dia-arrow-cell-renderer.h b/lib/dia-arrow-cell-renderer.h
index 88d3e535..b75728c0 100644
--- a/lib/dia-arrow-cell-renderer.h
+++ b/lib/dia-arrow-cell-renderer.h
@@ -22,11 +22,12 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
+
 #pragma once
 
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkCellRenderer, g_object_unref)
 
 #define DIA_TYPE_ARROW_CELL_RENDERER dia_arrow_cell_renderer_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaArrowCellRenderer, dia_arrow_cell_renderer, DIA, ARROW_CELL_RENDERER, 
GtkCellRenderer)
diff --git a/lib/dia-autoptr.h b/lib/dia-autoptr.h
new file mode 100644
index 00000000..b69bcc3d
--- /dev/null
+++ b/lib/dia-autoptr.h
@@ -0,0 +1,44 @@
+/* Dia -- an diagram creation/manipulation program
+ * Copyright (C) 1998 Alexander Larsson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Copyright © 2020 Zander Brown <zbrown gnome org>
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkBuilder, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkSpinButton, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkComboBox, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkHBox, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkTreeView, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkCellRenderer, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkCellRendererText, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkBin, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkContainer, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkVBox, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkDialog, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkEventBox, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkTable, g_object_unref)
+
+G_END_DECLS
diff --git a/lib/dia-colour-cell-renderer.h b/lib/dia-colour-cell-renderer.h
index 149de9c3..4e4701c2 100644
--- a/lib/dia-colour-cell-renderer.h
+++ b/lib/dia-colour-cell-renderer.h
@@ -22,11 +22,12 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
+
 #pragma once
 
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkCellRendererText, g_object_unref)
 
 #define DIA_TYPE_COLOUR_CELL_RENDERER dia_colour_cell_renderer_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaColourCellRenderer, dia_colour_cell_renderer, DIA, COLOUR_CELL_RENDERER, 
GtkCellRendererText)
diff --git a/lib/dia-line-cell-renderer.h b/lib/dia-line-cell-renderer.h
index e903ea02..854b6470 100644
--- a/lib/dia-line-cell-renderer.h
+++ b/lib/dia-line-cell-renderer.h
@@ -22,11 +22,12 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
+
 #pragma once
 
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkCellRenderer, g_object_unref)
 
 #define DIA_TYPE_LINE_CELL_RENDERER dia_line_cell_renderer_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaLineCellRenderer, dia_line_cell_renderer, DIA, LINE_CELL_RENDERER, 
GtkCellRenderer)
diff --git a/lib/dia-simple-list.h b/lib/dia-simple-list.h
index 33b989f4..efe5aac8 100644
--- a/lib/dia-simple-list.h
+++ b/lib/dia-simple-list.h
@@ -22,12 +22,12 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
+
 #pragma once
 
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkTreeView, g_object_unref)
-
 #define DIA_TYPE_SIMPLE_LIST dia_simple_list_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaSimpleList, dia_simple_list, DIA, SIMPLE_LIST, GtkTreeView)
 
diff --git a/lib/diafontselector.h b/lib/diafontselector.h
index 681108d0..59437e64 100644
--- a/lib/diafontselector.h
+++ b/lib/diafontselector.h
@@ -17,13 +17,14 @@
  */
 
 #include <gtk/gtk.h>
+
 #include "diatypes.h"
+#include "dia-autoptr.h"
 
 #pragma once
 
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkHBox, g_object_unref)
 
 struct _DiaFontSelector
 {
diff --git a/lib/diaoptionmenu.h b/lib/diaoptionmenu.h
index 933bdb8e..38183324 100644
--- a/lib/diaoptionmenu.h
+++ b/lib/diaoptionmenu.h
@@ -23,9 +23,10 @@
 
 #include <gtk/gtk.h>
 
+#include "dia-autoptr.h"
+
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkComboBox, g_object_unref)
 
 #define DIA_TYPE_OPTION_MENU dia_option_menu_get_type ()
 G_DECLARE_DERIVABLE_TYPE (DiaOptionMenu, dia_option_menu, DIA, OPTION_MENU, GtkComboBox)
diff --git a/lib/diatypes.h b/lib/diatypes.h
index 19277ece..abba78b2 100644
--- a/lib/diatypes.h
+++ b/lib/diatypes.h
@@ -24,6 +24,8 @@
 
 #include <glib-object.h>
 
+#ifndef __GTK_DOC_IGNORE__
+
 /* from geometry.h - but used more generic */
 typedef double real;
 
@@ -194,3 +196,5 @@ typedef enum {
   PATH_INTERSECTION,
   PATH_EXCLUSION
 } PathCombineMode;
+
+#endif
diff --git a/lib/widgets.h b/lib/widgets.h
index 9f0cbc14..f632c845 100644
--- a/lib/widgets.h
+++ b/lib/widgets.h
@@ -26,6 +26,7 @@
 #include "color.h"
 #include "arrows.h"
 #include "units.h"
+#include "dia-autoptr.h"
 
 /* DiaAlignmentSelector: */
 GtkWidget* dia_alignment_selector_new           (void);
@@ -40,7 +41,7 @@ void       dia_alignment_selector_set_alignment (GtkWidget *as, Alignment align)
 GType      dia_line_style_selector_get_type      (void);
 GtkWidget* dia_line_style_selector_new           (void);
 void       dia_line_style_selector_get_linestyle (DiaLineStyleSelector *as,
-                                                 LineStyle *linestyle, 
+                                                 LineStyle *linestyle,
                                                  real *dashlength);
 void       dia_line_style_selector_set_linestyle (DiaLineStyleSelector *as,
                                                  LineStyle linestyle,
@@ -104,12 +105,6 @@ gboolean   dia_size_selector_get_size        (DiaSizeSelector *ss, real *width,
 
 
 /* DiaUnitSpinner */
-#define DIA_UNIT_SPINNER(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, dia_unit_spinner_get_type(), DiaUnitSpinner)
-#define DIA_UNIT_SPINNER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, dia_unit_spinner_get_type(), 
DiaUnitSpinnerClass)
-#define DIA_IS_UNIT_SPINNER(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, dia_unit_spinner_get_type())
-
-typedef struct _DiaUnitSpinner DiaUnitSpinner;
-typedef struct _DiaUnitSpinnerClass DiaUnitSpinnerClass;
 
 struct _DiaUnitSpinner {
   GtkSpinButton parent;
@@ -117,19 +112,18 @@ struct _DiaUnitSpinner {
   DiaUnit unit_num;
 };
 
-struct _DiaUnitSpinnerClass {
-  GtkSpinButtonClass parent_class;
 
-};
+#define DIA_TYPE_UNIT_SPINNER dia_unit_spinner_get_type ()
+G_DECLARE_FINAL_TYPE (DiaUnitSpinner, dia_unit_spinner, DIA, UNIT_SPINNER, GtkSpinButton)
 
-GType      dia_unit_spinner_get_type  (void);
-GtkWidget *dia_unit_spinner_new       (GtkAdjustment *adjustment,
-                                      DiaUnit adj_unit);
-void       dia_unit_spinner_set_value (DiaUnitSpinner *self, gdouble val);
-gdouble    dia_unit_spinner_get_value (DiaUnitSpinner *self);
-void       dia_unit_spinner_set_upper (DiaUnitSpinner *self, gdouble val);
 
-GList *    get_units_name_list(void);
+GtkWidget *dia_unit_spinner_new       (GtkAdjustment  *adjustment,
+                                       DiaUnit         adj_unit);
+void       dia_unit_spinner_set_value (DiaUnitSpinner *self,
+                                       double          val);
+double     dia_unit_spinner_get_value (DiaUnitSpinner *self);
+void       dia_unit_spinner_set_upper (DiaUnitSpinner *self,
+                                       double          val);
 
 /* **** Util functions for Gtk stuff **** */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]