[dia/zbrown/graphene-rect: 10/11] general: fixup various warnings

[Zander Brown <zbrown src gnome org>]

commit a94a9f9023fe270042d71690281e58b063673d2c
Author: Zander Brown <zbrown gnome org>
Date:   Tue Apr 6 21:49:33 2021 +0100

    general: fixup various warnings

 app/diagram_tree_model.c                   | 17 ++++++++++-------
 app/interface.h                            |  2 --
 app/recent_files.c                         |  2 +-
 app/sheet-editor/sheets_dialog_callbacks.h | 13 ++-----------
 lib/dia_svg.c                              |  4 ++++
 lib/diapatternselector.c                   |  9 ++++-----
 lib/orth_conn.c                            |  2 --
 lib/renderer/diacairo.c                    |  6 +++---
 objects/AADL/aadl.h                        |  4 +++-
 objects/FS/function.c                      |  2 +-
 objects/custom/custom_object.c             |  4 ++++
 plug-ins/cairo/diacairo.c                  |  6 +++---
 12 files changed, 35 insertions(+), 36 deletions(-)
---
diff --git a/app/diagram_tree_model.c b/app/diagram_tree_model.c
index cb5a52b42..c35744c06 100644
--- a/app/diagram_tree_model.c
+++ b/app/diagram_tree_model.c
@@ -56,13 +56,6 @@ typedef struct _DiagramTreeModel
 static GType _dtm_get_type (void);
 static void _dtm_finalize (GObject *object);
 
-static void
-_dtm_class_init (DiagramTreeModelClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = _dtm_finalize;
-}
 
 #define DIA_TYPE_DIAGRAM_TREE_MODEL (_dtm_get_type ())
 #define DIAGRAM_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_DIAGRAM_TREE_MODEL, 
DiagramTreeModel))
@@ -72,6 +65,16 @@ G_DEFINE_TYPE_WITH_CODE (DiagramTreeModel, _dtm, G_TYPE_OBJECT,
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
                                                _dtm_iface_init))
 
+
+static void
+_dtm_class_init (DiagramTreeModelClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = _dtm_finalize;
+}
+
+
 static GtkTreeModelFlags
 _dtm_get_flags (GtkTreeModel *tree_model)
 {
diff --git a/app/interface.h b/app/interface.h
index 9396efc85..0bd810336 100644
--- a/app/interface.h
+++ b/app/interface.h
@@ -48,8 +48,6 @@ void toolbox_hide(void);
 
 GtkWidget *interface_get_toolbox_shell(void);
 
-void create_integrated_ui (void);
-
 void create_sheets(GtkWidget *parent);
 extern GtkWidget *modify_tool_button;
 
diff --git a/app/recent_files.c b/app/recent_files.c
index a5bb1294f..3f5da705d 100644
--- a/app/recent_files.c
+++ b/app/recent_files.c
@@ -134,7 +134,7 @@ recent_file_history_add (const char *fname)
 void
 recent_file_history_init (void)
 {
-  prefs.recent_documents_list_size = CLAMP(prefs.recent_documents_list_size, 0, 16);
+  prefs.recent_documents_list_size = prefs.recent_documents_list_size > 16 ? 16 : 
prefs.recent_documents_list_size;
 
   persistence_register_list("recent-files");
 
diff --git a/app/sheet-editor/sheets_dialog_callbacks.h b/app/sheet-editor/sheets_dialog_callbacks.h
index 5cb931909..276b79139 100644
--- a/app/sheet-editor/sheets_dialog_callbacks.h
+++ b/app/sheet-editor/sheets_dialog_callbacks.h
@@ -17,9 +17,10 @@
  * 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.
- *
  */
 
+#pragma once
+
 #include <gtk/gtk.h>
 
 gboolean    on_sheets_main_dialog_delete_event                     (GtkWidget       *widget,
@@ -29,16 +30,10 @@ void        on_sheets_dialog_combo_changed                         (GtkComboBox
                                                                     gpointer         user_data);
 void        on_sheets_dialog_button_move_up_clicked                (GtkButton       *button,
                                                                     gpointer         user_data);
-void        on_sheets_dialog_button_move_up_clicked                (GtkButton       *button,
-                                                                    gpointer         user_data);
-void        on_sheets_dialog_button_new_clicked                    (GtkButton       *button,
-                                                                    gpointer         user_data);
 void        on_sheets_dialog_button_new_clicked                    (GtkButton       *button,
                                                                     gpointer         user_data);
 void        on_sheets_dialog_button_close_clicked                  (GtkButton       *button,
                                                                     gpointer         user_data);
-void        on_sheets_dialog_button_close_clicked                  (GtkButton       *button,
-                                                                    gpointer         user_data);
 void        on_sheets_new_dialog_button_cancel_clicked             (GtkButton       *button,
                                                                     gpointer         user_data);
 void        on_sheets_dialog_button_edit_clicked                   (GtkButton       *button,
@@ -47,8 +42,6 @@ void        on_sheets_edit_dialog_button_cancel_clicked            (GtkButton
                                                                     gpointer         user_data);
 void        on_sheets_dialog_button_remove_clicked                 (GtkButton       *button,
                                                                     gpointer         user_data);
-void        on_sheets_dialog_button_remove_clicked                 (GtkButton       *button,
-                                                                    gpointer         user_data);
 void        on_sheets_remove_dialog_button_cancel_clicked          (GtkButton       *button,
                                                                     gpointer         user_data);
 void        on_sheets_new_dialog_radiobutton_svg_shape_toggled     (GtkToggleButton *togglebutton,
@@ -65,8 +58,6 @@ void        on_sheets_dialog_button_move_down_clicked              (GtkButton
                                                                     gpointer         user_data);
 void        on_sheets_new_dialog_button_ok_clicked                 (GtkButton       *button,
                                                                     gpointer         user_data);
-void        on_sheets_new_dialog_radiobutton_line_break_toggled    (GtkToggleButton *togglebutton,
-                                                                    gpointer         user_data);
 void        on_sheets_remove_dialog_button_ok_clicked              (GtkButton       *button,
                                                                     gpointer         user_data);
 void        on_sheets_edit_dialog_button_ok_clicked                (GtkButton       *button,
diff --git a/lib/dia_svg.c b/lib/dia_svg.c
index 36e10f5ab..d25183dd2 100644
--- a/lib/dia_svg.c
+++ b/lib/dia_svg.c
@@ -344,7 +344,11 @@ _parse_color(gint32 *color, const char *str)
     int r = 0, g = 0, b = 0;
     if (3 == sscanf (str+4, "%d,%d,%d", &r, &g, &b)) {
       /* Set alpha to 1.0 */
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored "-Wshift-overflow"
+      #warning TODO: Is there a proper solution here?
       *color = ((0xFF<<24) & 0xFF000000) | ((r<<16) & 0xFF0000) | ((g<<8) & 0xFF00) | (b & 0xFF);
+      #pragma GCC diagnostic pop
     } else if (strchr (str+4, '%')) {
       /* e.g. cairo uses percent values */
       char **vals = g_strsplit (str+4, "%,", -1);
diff --git a/lib/diapatternselector.c b/lib/diapatternselector.c
index dd9572fe4..314805d91 100644
--- a/lib/diapatternselector.c
+++ b/lib/diapatternselector.c
@@ -48,6 +48,10 @@ static guint dia_patternsel_signals[DIA_PATTERNSEL_LAST_SIGNAL] = { 0 };
 
 static DiaPattern *_create_preset_pattern (guint n);
 
+GType dia_pattern_selector_get_type (void);
+
+G_DEFINE_TYPE (DiaPatternSelector, dia_pattern_selector, GTK_TYPE_HBOX);
+
 
 static void
 dia_pattern_selector_finalize(GObject *object)
@@ -73,11 +77,6 @@ dia_pattern_selector_class_init (DiaPatternSelectorClass *klass)
   object_class->finalize = dia_pattern_selector_finalize;
 }
 
-static GType dia_pattern_selector_get_type (void);
-
-G_DEFINE_TYPE (DiaPatternSelector, dia_pattern_selector, GTK_TYPE_HBOX);
-
-
 /* GUI stuff - not completely done yet
    - add/remove color stops
    - toggle between radial/linear
diff --git a/lib/orth_conn.c b/lib/orth_conn.c
index 230c86749..be0e8be71 100644
--- a/lib/orth_conn.c
+++ b/lib/orth_conn.c
@@ -85,8 +85,6 @@ endsegment_create_change (OrthConn         *orth,
                           Point            *point,
                           Handle           *handle);
 
-static void
-place_handle_by_swapping(OrthConn *orth, int index, Handle *handle);
 
 struct _DiaOrthConnEndSegmentObjectChange {
   DiaObjectChange obj_change;
diff --git a/lib/renderer/diacairo.c b/lib/renderer/diacairo.c
index bda0febbc..434040686 100644
--- a/lib/renderer/diacairo.c
+++ b/lib/renderer/diacairo.c
@@ -82,7 +82,7 @@ cairo_export_data (DiagramData *data,
    * filename encdong is always utf-8, so another conversion is needed.
    */
   gchar *filename_crt = (gchar *) filename;
-#if DIA_CAIRO_CAN_EMF
+#ifdef DIA_CAIRO_CAN_EMF
   HDC hFileDC = NULL;
 #endif
 
@@ -187,7 +187,7 @@ cairo_export_data (DiagramData *data,
     break;
 #endif
   /* finally cairo can render to MetaFiles */
-#if DIA_CAIRO_CAN_EMF
+#ifdef DIA_CAIRO_CAN_EMF
   case OUTPUT_EMF :
   case OUTPUT_WMF : /* different only on close/'play' */
   case OUTPUT_CLIPBOARD :
@@ -262,7 +262,7 @@ cairo_export_data (DiagramData *data,
       cairo_surface_destroy(renderer->surface);
     }
 #endif
-#if DIA_CAIRO_CAN_EMF
+#ifdef DIA_CAIRO_CAN_EMF
   if (OUTPUT_EMF == kind) {
     FILE* f = g_fopen(filename, "wb");
     HENHMETAFILE hEmf = CloseEnhMetaFile(hFileDC);
diff --git a/objects/AADL/aadl.h b/objects/AADL/aadl.h
index 7fa0170ef..e1efe8837 100644
--- a/objects/AADL/aadl.h
+++ b/objects/AADL/aadl.h
@@ -19,6 +19,9 @@
 */
 
 
+#pragma once
+
+
 #include <config.h>
 
 #include <assert.h>
@@ -214,7 +217,6 @@ void aadlbox_project_point_on_rectangle(DiaRectangle *rectangle,
 void
 aadlbox_inclined_project_point_on_nearest_border(Aadlbox *aadlbox,Point *p,
                                                 real *angle);
-void aadlprocess_text_position(Aadlbox *aadlbox, Point *p);
 
 /* aadlthread.c */
 void aadlbox_draw_inclined_box(Aadlbox *aadlbox, DiaRenderer *renderer,
diff --git a/objects/FS/function.c b/objects/FS/function.c
index dc0e38650..5ae78afbc 100644
--- a/objects/FS/function.c
+++ b/objects/FS/function.c
@@ -706,7 +706,7 @@ struct _IndentedMenus {
  */
 #define FS_SUBMENU_MAXINDENT 5
 
-#if THIS_C_COMPILER_ALSO_UNDERSTANDS_EMACS_LISP
+#ifdef THIS_C_COMPILER_ALSO_UNDERSTANDS_EMACS_LISP
    ; Elisp functions to generate comments:)
    (setq q nil)
    (defun q-pop () (setq q (cdr q)))
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index 969122116..037b6ad44 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -373,7 +373,11 @@ custom_setup_properties (ShapeInfo *info, xmlNodePtr node)
        * Maybe it even works cause the sizeof() in *_get_data_size can be
        * calculated at compile time. Anyway, a mess ;) --hb
        */
+      #pragma GCC diagnostic push
+      #pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
+      #warning TODO: I mean this is clearly wrong
       size = info->props[i].ops->get_data_size (&info->props[i]);
+      #pragma GCC diagnostic pop
       info->ext_attr_size += size;
       offs += size;
     }
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index 9471ea9c2..3a87d7357 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -121,7 +121,7 @@ static DiaExportFilter pnga_export_filter = {
     "cairo-alpha-png"
 };
 
-#if DIA_CAIRO_CAN_EMF
+#ifdef DIA_CAIRO_CAN_EMF
 static const gchar *emf_extensions[] = { "emf", NULL };
 static DiaExportFilter emf_export_filter = {
     N_("Cairo EMF"),
@@ -204,7 +204,7 @@ _plugin_unload (PluginInfo *info)
 #endif
   filter_unregister_export(&png_export_filter);
   filter_unregister_export(&pnga_export_filter);
-#if DIA_CAIRO_CAN_EMF
+#ifdef DIA_CAIRO_CAN_EMF
   filter_unregister_export(&emf_export_filter);
   filter_unregister_export(&wmf_export_filter);
   filter_unregister_callback (&cb_clipboard);
@@ -240,7 +240,7 @@ dia_plugin_init(PluginInfo *info)
 #endif
   filter_register_export(&png_export_filter);
   filter_register_export(&pnga_export_filter);
-#if DIA_CAIRO_CAN_EMF
+#ifdef DIA_CAIRO_CAN_EMF
   filter_register_export(&emf_export_filter);
   filter_register_export(&wmf_export_filter);
   filter_register_callback (&cb_clipboard);