Include some missing function statics

diff --git a/src/bar-exif.cc b/src/bar-exif.cc
index ff3dfcb..34c1886 100644 (file)
--- a/src/bar-exif.cc
+++ b/src/bar-exif.cc
@@ -283,7 +283,7 @@ static void bar_pane_exif_update(PaneExifData *ped)
        gtk_widget_set_sensitive(ped->pane.title, !ped->all_hidden);
 }
 
-void bar_pane_exif_set_fd(GtkWidget *widget, FileData *fd)
+static void bar_pane_exif_set_fd(GtkWidget *widget, FileData *fd)
 {
        PaneExifData *ped;
 
@@ -296,7 +296,7 @@ void bar_pane_exif_set_fd(GtkWidget *widget, FileData *fd)
        bar_pane_exif_update(ped);
 }
 
-gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
+static gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
 {
        PaneExifData *ped;
        gboolean ret = FALSE;

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index 9343a64..7269082 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -564,7 +564,7 @@ static void bar_pane_gps_update(PaneGPSData *pgd)
        pgd->num_added = 0;
 }
 
-void bar_pane_gps_set_map_source(PaneGPSData *pgd, const gchar *map_id)
+static void bar_pane_gps_set_map_source(PaneGPSData *pgd, const gchar *map_id)
 {
        ChamplainMapSource *map_source;
        ChamplainMapSourceFactory *map_factory;
@@ -580,7 +580,7 @@ void bar_pane_gps_set_map_source(PaneGPSData *pgd, const gchar *map_id)
        g_object_unref(map_factory);
 }
 
-void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *, gpointer data)
+static void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *, gpointer data)
 {
        auto pgd = static_cast<PaneGPSData *>(data);
 
@@ -769,7 +769,7 @@ static void bar_pane_gps_notify_cb(FileData *fd, NotifyType type, gpointer data)
                }
 }
 
-const gchar *bar_pane_gps_get_map_id(PaneGPSData *pgd)
+static const gchar *bar_pane_gps_get_map_id(PaneGPSData *pgd)
 {
        const gchar *map_id;
        ChamplainMapSource *mapsource;
@@ -828,7 +828,7 @@ static GtkWidget *bar_pane_gps_menu(PaneGPSData *pgd)
 
 /* Determine if the map is to be re-centred on the marker when another photo is selected
  */
-void bar_pane_gps_map_centreing(PaneGPSData *pgd)
+static void bar_pane_gps_map_centreing(PaneGPSData *pgd)
 {
        GenericDialog *gd;
        GString *message = g_string_new("");

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 8501ad1..e769ddf 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -167,7 +167,7 @@ static void bar_pane_keywords_write(PaneKeywordsData *pkd)
        g_list_free_full(list, g_free);
 }
 
-gboolean bar_keyword_tree_expand_if_set_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean bar_keyword_tree_expand_if_set_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
        auto pkd = static_cast<PaneKeywordsData *>(data);
        gboolean set;
@@ -181,7 +181,7 @@ gboolean bar_keyword_tree_expand_if_set_cb(GtkTreeModel *model, GtkTreePath *pat
        return FALSE;
 }
 
-gboolean bar_keyword_tree_collapse_if_unset_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean bar_keyword_tree_collapse_if_unset_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
        auto pkd = static_cast<PaneKeywordsData *>(data);
        gboolean set;
@@ -248,7 +248,7 @@ static void bar_pane_keywords_update(PaneKeywordsData *pkd)
        g_list_free_full(orig_keywords, g_free);
 }
 
-void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
+static void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
 {
        PaneKeywordsData *pkd;
 
@@ -261,7 +261,7 @@ void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
        bar_pane_keywords_update(pkd);
 }
 
-void bar_keyword_tree_get_expanded_cb(GtkTreeView *keyword_treeview, GtkTreePath *path,  gpointer data)
+static void bar_keyword_tree_get_expanded_cb(GtkTreeView *keyword_treeview, GtkTreePath *path,  gpointer data)
 {
        auto expanded = static_cast<GList **>(data);
        GtkTreeModel *model;
@@ -327,7 +327,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
        WRITE_STRING("</pane_keywords>");
 }
 
-gint bar_pane_keywords_event(GtkWidget *bar, GdkEvent *event)
+static gint bar_pane_keywords_event(GtkWidget *bar, GdkEvent *event)
 {
        PaneKeywordsData *pkd;
 
@@ -384,7 +384,7 @@ static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *, const gcha
        bar_pane_keywords_changed(keyword_buffer, pkd);
 }
 
-void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GValue *value, gint column, gpointer data)
+static void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GValue *value, gint column, gpointer data)
 {
        auto pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *keyword_tree = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
@@ -418,7 +418,7 @@ void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GVa
                }
 }
 
-gboolean bar_pane_keywords_filter_visible(GtkTreeModel *keyword_tree, GtkTreeIter *iter, gpointer data)
+static gboolean bar_pane_keywords_filter_visible(GtkTreeModel *keyword_tree, GtkTreeIter *iter, gpointer data)
 {
        auto filter = static_cast<GtkTreeModel *>(data);
 
@@ -1786,7 +1786,7 @@ static gboolean autocomplete_activate_cb(GtkWidget *, gpointer data)
        return FALSE;
 }
 
-gint autocomplete_sort_iter_compare_func (GtkTreeModel *model,
+static gint autocomplete_sort_iter_compare_func (GtkTreeModel *model,
                                                                        GtkTreeIter *a,
                                                                        GtkTreeIter *b,
                                                                        gpointer)

diff --git a/src/bar.cc b/src/bar.cc
index ce15b5f..188ea7c 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -216,6 +216,8 @@ struct BarData
        gint width;
 };
 
+static const gchar *bar_pane_get_default_config(const gchar *id);
+
 static void bar_expander_move(GtkWidget *, gpointer data, gboolean up, gboolean single_step)
 {
        auto expander = static_cast<GtkWidget *>(data);
@@ -865,7 +867,7 @@ gboolean bar_pane_translate_title(PaneType type, const gchar *id, gchar **title)
        return TRUE;
 }
 
-const gchar *bar_pane_get_default_config(const gchar *id)
+static const gchar *bar_pane_get_default_config(const gchar *id)
 {
        const KnownPanes *pane = known_panes;
 

diff --git a/src/bar.h b/src/bar.h
index 9dab72f..2c4c6f2 100644 (file)
--- a/src/bar.h
+++ b/src/bar.h
@@ -71,7 +71,6 @@ gboolean bar_event(GtkWidget *bar, GdkEvent *event);
 GtkWidget *bar_pane_expander_title(const gchar *title);
 void bar_update_expander(GtkWidget *pane);
 gboolean bar_pane_translate_title(PaneType type, const gchar *id, gchar **title);
-const gchar *bar_pane_get_default_config(const gchar *id);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */