GNOME.org
 

[gnome-commander: 170/170] Remove inline keyword on various places to remove compilation errors


commit cba0ec1acc97973475a94bd03f8074c4602a84cc
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Thu Dec 24 00:49:19 2020 +0100

    Remove inline keyword on various places to remove compilation errors

 src/dialogs/gnome-cmd-edit-profile-dialog.h   |  4 +--
 src/dialogs/gnome-cmd-key-shortcuts-dialog.cc | 31 ++++++++++-------
 src/dialogs/gnome-cmd-mkdir-dialog.cc         |  2 +-
 src/dialogs/gnome-cmd-mkdir-dialog.h          |  3 ++
 src/dialogs/gnome-cmd-options-dialog.cc       | 50 ++++++++++++++++++---------
 src/gnome-cmd-advrename-profile-component.cc  |  2 +-
 src/intviewer/viewer-window.cc                | 21 ++++++-----
 src/intviewer/viewer-window.h                 |  5 +--
 src/tags/gnome-cmd-tags-exiv2.cc              |  2 +-
 src/tags/gnome-cmd-tags-taglib.cc             |  6 ++--
 src/utils.cc                                  |  7 ++++
 src/utils.h                                   |  9 +----
 12 files changed, 86 insertions(+), 56 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-edit-profile-dialog.h b/src/dialogs/gnome-cmd-edit-profile-dialog.h
index d243775d..56a3dae0 100644
--- a/src/dialogs/gnome-cmd-edit-profile-dialog.h
+++ b/src/dialogs/gnome-cmd-edit-profile-dialog.h
@@ -1,5 +1,5 @@
 /** 
- * @file gnome-cmd-edit-profile-dialog.h
+ * @FILE gnome-cmd-edit-profile-dialog.h
  * @copyright (C) 2001-2006 Marcus Bjurman\n
  * @copyright (C) 2007-2012 Piotr Eljasiak\n
  * @copyright (C) 2013-2020 Uwe Scholz\n
@@ -75,7 +75,7 @@ namespace GnomeCmd
     }
 
     template <typename PROFILE, typename COMPONENT>
-    inline EditProfileDialog<PROFILE,COMPONENT>::EditProfileDialog(GtkWindow *parent, PROFILE &profile, 
const char *id):  help_id(id)
+    EditProfileDialog<PROFILE,COMPONENT>::EditProfileDialog(GtkWindow *parent, PROFILE &profile, const char 
*id):  help_id(id)
     {
         GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Edit Profile"), parent,
                                                          GtkDialogFlags (GTK_DIALOG_MODAL | 
GTK_DIALOG_DESTROY_WITH_PARENT),
diff --git a/src/dialogs/gnome-cmd-key-shortcuts-dialog.cc b/src/dialogs/gnome-cmd-key-shortcuts-dialog.cc
index 38773c2d..8037e9e5 100644
--- a/src/dialogs/gnome-cmd-key-shortcuts-dialog.cc
+++ b/src/dialogs/gnome-cmd-key-shortcuts-dialog.cc
@@ -39,6 +39,14 @@ using namespace std;
 #define GNOME_CMD_IS_KEY_SHORTCUTS_DIALOG(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GNOME_CMD_TYPE_KEY_SHORTCUTS_DIALOG)
 
 
+GtkTreeViewColumn *create_new_accel_column (GtkTreeView *view, GtkCellRenderer *&renderer, gint COL_KEYS_ID, 
gint COL_MODS_ID, const gchar *title);
+GtkTreeViewColumn *create_new_combo_column (GtkTreeView *view, GtkTreeModel *model, GtkCellRenderer 
*&renderer, gint COL_ID, const gchar *title);
+gboolean conflict_confirm (GtkWidget *view, const gchar *action, guint accel_key, GdkModifierType 
accel_mask);
+gboolean equal_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkModifierType mask);
+gboolean find_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkModifierType mask);
+void set_accel (GtkTreeModel *model, GtkTreePath *path, guint accel_key, GdkModifierType accel_mask);
+
+
 struct GnomeCmdKeyShortcutsDialogPrivate
 {
     GnomeCmdKeyShortcutsDialogPrivate();
@@ -61,11 +69,10 @@ struct GnomeCmdKeyShortcutsDialogClass
 };
 
 
-inline GnomeCmdKeyShortcutsDialogPrivate::GnomeCmdKeyShortcutsDialogPrivate()
+GnomeCmdKeyShortcutsDialogPrivate::GnomeCmdKeyShortcutsDialogPrivate()
 {
 }
 
-
 GnomeCmdUserActions *GnomeCmdKeyShortcutsDialog::user_actions = NULL;
 
 
@@ -177,8 +184,8 @@ static void gnome_cmd_key_shortcuts_dialog_class_init (GnomeCmdKeyShortcutsDialo
 }
 
 
-inline GtkWidget *create_view_and_model (GnomeCmdUserActions &user_actions);
-inline GtkTreeModel *create_and_fill_model (GnomeCmdUserActions &user_actions);
+GtkWidget *create_view_and_model (GnomeCmdUserActions &user_actions);
+GtkTreeModel *create_and_fill_model (GnomeCmdUserActions &user_actions);
 
 static void accel_edited_callback (GtkCellRendererAccel *accel, const char *path_string, guint accel_key, 
GdkModifierType accel_mask, guint hardware_keycode, GtkWidget *view);
 static void cell_edited_callback (GtkCellRendererText *cell, gchar *path_string, gchar *new_text, GtkWidget 
*view);
@@ -268,7 +275,7 @@ gboolean gnome_cmd_key_shortcuts_dialog_new (GnomeCmdUserActions &user_actions)
 }
 
 
-inline GtkTreeViewColumn *create_new_accel_column (GtkTreeView *view, GtkCellRenderer *&renderer, gint 
COL_KEYS_ID, gint COL_MODS_ID, const gchar *title=NULL)
+GtkTreeViewColumn *create_new_accel_column (GtkTreeView *view, GtkCellRenderer *&renderer, gint COL_KEYS_ID, 
gint COL_MODS_ID, const gchar *title=NULL)
 {
     renderer = egg_cell_renderer_keys_new ();
 
@@ -294,7 +301,7 @@ inline GtkTreeViewColumn *create_new_accel_column (GtkTreeView *view, GtkCellRen
 }
 
 
-inline GtkTreeViewColumn *create_new_combo_column (GtkTreeView *view, GtkTreeModel *model, GtkCellRenderer 
*&renderer, gint COL_ID, const gchar *title=NULL)
+GtkTreeViewColumn *create_new_combo_column (GtkTreeView *view, GtkTreeModel *model, GtkCellRenderer 
*&renderer, gint COL_ID, const gchar *title=NULL)
 {
     renderer = gtk_cell_renderer_combo_new ();
 
@@ -331,7 +338,7 @@ enum
 };
 
 
-inline GtkWidget *create_view_and_model (GnomeCmdUserActions &user_actions)
+GtkWidget *create_view_and_model (GnomeCmdUserActions &user_actions)
 {
     GtkWidget *view = gtk_tree_view_new ();
 
@@ -443,7 +450,7 @@ static gint sort_by_accel (GtkTreeModel *model, GtkTreeIter *i1, GtkTreeIter *i2
 }
 
 
-inline GtkTreeModel *create_and_fill_model (GnomeCmdUserActions &user_actions)
+GtkTreeModel *create_and_fill_model (GnomeCmdUserActions &user_actions)
 {
     GtkListStore *store = gtk_list_store_new (NUM_COLUMNS,
                                               G_TYPE_UINT,              //  COL_ACCEL_KEY
@@ -479,7 +486,7 @@ inline GtkTreeModel *create_and_fill_model (GnomeCmdUserActions &user_actions)
 }
 
 
-inline gboolean conflict_confirm (GtkWidget *view, const gchar *action, guint accel_key, GdkModifierType 
accel_mask)
+gboolean conflict_confirm (GtkWidget *view, const gchar *action, guint accel_key, GdkModifierType accel_mask)
 {
     gchar *accel_string = egg_accelerator_get_label (accel_key, accel_mask);
 
@@ -507,7 +514,7 @@ inline gboolean conflict_confirm (GtkWidget *view, const gchar *action, guint ac
 }
 
 
-inline gboolean equal_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkModifierType mask)
+gboolean equal_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkModifierType mask)
 {
     guint accel_key  = 0;
     GdkModifierType accel_mask = (GdkModifierType) 0;
@@ -521,7 +528,7 @@ inline gboolean equal_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, Gdk
 }
 
 
-inline gboolean find_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkModifierType mask)
+gboolean find_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkModifierType mask)
 {
     gboolean valid_iter;
 
@@ -533,7 +540,7 @@ inline gboolean find_accel (GtkTreeModel *model, GtkTreeIter *i, guint key, GdkM
 }
 
 
-inline void set_accel (GtkTreeModel *model, GtkTreePath *path, guint accel_key, GdkModifierType accel_mask)
+void set_accel (GtkTreeModel *model, GtkTreePath *path, guint accel_key, GdkModifierType accel_mask)
 {
     GtkTreeIter iter;
 
diff --git a/src/dialogs/gnome-cmd-mkdir-dialog.cc b/src/dialogs/gnome-cmd-mkdir-dialog.cc
index dc981171..87257f07 100644
--- a/src/dialogs/gnome-cmd-mkdir-dialog.cc
+++ b/src/dialogs/gnome-cmd-mkdir-dialog.cc
@@ -30,7 +30,7 @@
 using namespace std;
 
 
-inline GSList *make_uri_list (GnomeCmdDir *dir, string filename)
+GSList *make_uri_list (GnomeCmdDir *dir, string filename)
 {
     g_return_val_if_fail (GNOME_CMD_IS_DIR (dir), NULL);
 
diff --git a/src/dialogs/gnome-cmd-mkdir-dialog.h b/src/dialogs/gnome-cmd-mkdir-dialog.h
index aed0c19e..6a6c1f7a 100644
--- a/src/dialogs/gnome-cmd-mkdir-dialog.h
+++ b/src/dialogs/gnome-cmd-mkdir-dialog.h
@@ -22,5 +22,8 @@
 #pragma once
 
 #include "gnome-cmd-dir.h"
+using namespace std;
+
+GSList *make_uri_list (GnomeCmdDir *dir, string filename);
 
 gboolean gnome_cmd_mkdir_dialog_new (GnomeCmdDir *dir, GnomeCmdFile *selected_file=NULL);
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 7bd3f45d..7828f67b 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -31,8 +31,24 @@
 
 using namespace std;
 
-
-inline GtkWidget *create_font_picker (GtkWidget *parent, const gchar *name)
+GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData::Options &cfg);
+GtkWidget *create_font_picker (GtkWidget *parent, const gchar *name);
+GtkWidget *create_tabs_tab (GtkWidget *parent, GnomeCmdData::Options &cfg);
+void add_app_to_list (GtkCList *clist, GnomeCmdApp *app);
+void add_device_to_list (GtkCList *clist, GnomeCmdConDevice *dev);
+void get_device_dialog_values (GtkWidget *dialog, gchar **alias, gchar **device_utf8, gchar **mountp_utf8, 
gchar **icon_path);
+void store_confirmation_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_devices_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_filter_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_format_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_layout_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_programs_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void store_tabs_options (GtkWidget *dialog, GnomeCmdData::Options &cfg);
+void update_app_in_list (GtkCList *clist, GnomeCmdApp *app);
+void update_device_in_list (GtkCList *clist, GnomeCmdConDevice *dev, gchar *alias, gchar *device_fn, gchar 
*mountp, gchar *icon_path);
+
+GtkWidget *create_font_picker (GtkWidget *parent, const gchar *name)
 {
     GtkWidget *w = gtk_font_button_new ();
     g_object_ref (w);
@@ -239,7 +255,7 @@ static GtkWidget *create_general_tab (GtkWidget *parent, GnomeCmdData::Options &
 }
 
 
-inline void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_general_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *lmb_singleclick_radio = lookup_widget (dialog, "lmb_singleclick_radio");
     GtkWidget *lmb_unselects_check = lookup_widget (dialog, "lmb_unselects_check");
@@ -414,7 +430,7 @@ static GtkWidget *create_format_tab (GtkWidget *parent, GnomeCmdData::Options &c
 }
 
 
-inline void store_format_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_format_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *size_powered_radio = lookup_widget (dialog, "size_powered_radio");
     GtkWidget *size_locale_radio = lookup_widget (dialog, "size_locale_radio");
@@ -869,7 +885,7 @@ static GtkWidget *create_layout_tab (GtkWidget *parent, GnomeCmdData::Options &c
 }
 
 
-inline void store_layout_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_layout_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *iconsize_spin       = lookup_widget (dialog, "iconsize_spin");
     GtkWidget *iconquality_scale   = lookup_widget (dialog, "iconquality_scale");
@@ -925,7 +941,7 @@ inline void store_layout_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
  *
  **********************************************************************/
 
-inline GtkWidget *create_tabs_tab (GtkWidget *parent, GnomeCmdData::Options &cfg)
+GtkWidget *create_tabs_tab (GtkWidget *parent, GnomeCmdData::Options &cfg)
 {
     GtkWidget *frame, *hbox, *scrolled_window, *vbox, *cat, *cat_box;
     GtkWidget *radio, *check;
@@ -975,7 +991,7 @@ inline GtkWidget *create_tabs_tab (GtkWidget *parent, GnomeCmdData::Options &cfg
 }
 
 
-inline void store_tabs_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_tabs_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *always_show_tabs = lookup_widget (dialog, "always_show_tabs");
     GtkWidget *tab_lock_icon_radio = lookup_widget (dialog, "tab_lock_icon_radio");
@@ -1089,7 +1105,7 @@ static GtkWidget *create_confirmation_tab (GtkWidget *parent, GnomeCmdData::Opti
 }
 
 
-inline void store_confirmation_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_confirmation_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *confirm_delete_check = lookup_widget (dialog, "confirm_delete_check");
     GtkWidget *delete_default_check = lookup_widget (dialog, "delete_default_check");
@@ -1143,7 +1159,7 @@ static void on_filter_backup_files_toggled (GtkToggleButton *btn, GtkWidget *dia
 }
 
 
-inline GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData::Options &cfg)
+GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData::Options &cfg)
 {
     GtkWidget *frame, *hbox, *vbox, *scrolled_window, *cat, *cat_box;
     GtkWidget *check, *backup_check, *entry;
@@ -1218,7 +1234,7 @@ inline GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData::Options &c
 }
 
 
-inline void store_filter_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_filter_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *hide_unknown_check = lookup_widget (dialog, "hide_unknown_check");
     GtkWidget *hide_regular_check = lookup_widget (dialog, "hide_regular_check");
@@ -1271,7 +1287,7 @@ inline void store_filter_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
  *
  **********************************************************************/
 
-inline void add_app_to_list (GtkCList *clist, GnomeCmdApp *app)
+void add_app_to_list (GtkCList *clist, GnomeCmdApp *app)
 {
     gchar *text[3];
 
@@ -1289,7 +1305,7 @@ inline void add_app_to_list (GtkCList *clist, GnomeCmdApp *app)
 }
 
 
-inline void update_app_in_list (GtkCList *clist, GnomeCmdApp *app)
+void update_app_in_list (GtkCList *clist, GnomeCmdApp *app)
 {
     gint row = gtk_clist_find_row_from_data (clist, app);
     GnomeCmdPixmap *pm = gnome_cmd_app_get_pixmap (app);
@@ -1735,7 +1751,7 @@ static GtkWidget *create_programs_tab (GtkWidget *parent, GnomeCmdData::Options
 }
 
 
-inline void store_programs_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_programs_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *entry1 = lookup_widget (dialog, "viewer");
     GtkWidget *entry2 = lookup_widget (dialog, "editor");
@@ -1766,7 +1782,7 @@ inline void store_programs_options (GtkWidget *dialog, GnomeCmdData::Options &cf
  *
  **********************************************************************/
 
-inline void add_device_to_list (GtkCList *clist, GnomeCmdConDevice *dev)
+void add_device_to_list (GtkCList *clist, GnomeCmdConDevice *dev)
 {
     gchar *text[2];
 
@@ -1783,7 +1799,7 @@ inline void add_device_to_list (GtkCList *clist, GnomeCmdConDevice *dev)
 }
 
 
-inline void update_device_in_list (GtkCList *clist, GnomeCmdConDevice *dev, gchar *alias, gchar *device_fn, 
gchar *mountp, gchar *icon_path)
+void update_device_in_list (GtkCList *clist, GnomeCmdConDevice *dev, gchar *alias, gchar *device_fn, gchar 
*mountp, gchar *icon_path)
 {
     gnome_cmd_con_device_set_alias (dev, alias);
     gnome_cmd_con_device_set_device_fn (dev, device_fn);
@@ -1810,7 +1826,7 @@ static void on_device_dialog_cancel (GtkButton *button, GtkWidget *dialog)
 }
 
 
-inline void get_device_dialog_values (GtkWidget *dialog, gchar **alias, gchar **device_utf8,
+void get_device_dialog_values (GtkWidget *dialog, gchar **alias, gchar **device_utf8,
     gchar **mountp_utf8, gchar **icon_path)
 {
     GtkWidget *alias_entry = lookup_widget (dialog, "alias_entry");
@@ -2092,7 +2108,7 @@ static GtkWidget *create_devices_tab (GtkWidget *parent, GnomeCmdData::Options &
 }
 
 
-inline void store_devices_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
+void store_devices_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
 {
     GtkWidget *device_only_icon = lookup_widget (dialog, "device_only_icon");
     GtkWidget *skip_mounting = lookup_widget (dialog, "skip_mounting");
diff --git a/src/gnome-cmd-advrename-profile-component.cc b/src/gnome-cmd-advrename-profile-component.cc
index fec395b1..4c32e4d5 100644
--- a/src/gnome-cmd-advrename-profile-component.cc
+++ b/src/gnome-cmd-advrename-profile-component.cc
@@ -580,7 +580,7 @@ void GnomeCmdAdvrenameProfileComponent::Private::insert_num_tag(GnomeCmdAdvrenam
 }
 
 
-inline gchar *GnomeCmdAdvrenameProfileComponent::Private::get_selected_range (GtkWindow *parent, const gchar 
*title, const gchar *placeholder, const gchar *filename)
+gchar *GnomeCmdAdvrenameProfileComponent::Private::get_selected_range (GtkWindow *parent, const gchar 
*title, const gchar *placeholder, const gchar *filename)
 {
     if (!filename)
         filename = "Lorem ipsum dolor sit amet, consectetur adipisici elit, sed do eiusmod tempor incididunt 
ut labore et dolore magna aliqua. " \
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index a6addcf3..ff2f3c4c 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -58,6 +58,11 @@ using namespace std;
  * Functions for using GSettings
  ***********************************/
 
+GtkWidget *gviewer_window_new ()
+{
+    return (GtkWidget *) g_object_new (gviewer_window_get_type (), NULL);
+}
+
 struct _InternalViewerSettings
 {
     GObject parent;
@@ -148,8 +153,8 @@ static gboolean gviewer_window_key_pressed(GtkWidget *widget, GdkEventKey *event
 
 static GtkWidget *gviewer_window_create_menus(GViewerWindow *gViewerWindow);
 
-inline void gviewer_window_show_metadata(GViewerWindow *gViewerWindow);
-inline void gviewer_window_hide_metadata(GViewerWindow *gViewerWindow);
+void gviewer_window_show_metadata(GViewerWindow *gViewerWindow);
+void gviewer_window_hide_metadata(GViewerWindow *gViewerWindow);
 
 gboolean gviewerwindow_get_metadata_visble(GViewerWindow *gViewerWindow);
 
@@ -180,8 +185,8 @@ static void menu_settings_save_settings(GtkMenuItem *item, GViewerWindow *gViewe
 static void menu_help_quick_help(GtkMenuItem *item, GViewerWindow *gViewerWindow);
 static void menu_help_keyboard(GtkMenuItem *item, GViewerWindow *gViewerWindow);
 
-inline GtkTreeModel *create_model ();
-inline void fill_model (GtkTreeStore *treestore, GnomeCmdFile *f);
+GtkTreeModel *create_model ();
+void fill_model (GtkTreeStore *treestore, GnomeCmdFile *f);
 GtkWidget *create_view ();
 
 /*****************************************
@@ -1211,7 +1216,7 @@ static void menu_help_keyboard(GtkMenuItem *item, GViewerWindow *gViewerWindow)
 }
 
 
-inline void gviewer_window_show_metadata(GViewerWindow *gViewerWindow)
+void gviewer_window_show_metadata(GViewerWindow *gViewerWindow)
 {
     g_return_if_fail (gViewerWindow != nullptr);
     g_return_if_fail (gViewerWindow->priv->f != nullptr);
@@ -1247,7 +1252,7 @@ inline void gviewer_window_show_metadata(GViewerWindow *gViewerWindow)
 }
 
 
-inline void gviewer_window_hide_metadata(GViewerWindow *gViewerWindow)
+void gviewer_window_hide_metadata(GViewerWindow *gViewerWindow)
 {
     g_return_if_fail (gViewerWindow);
 
@@ -1275,7 +1280,7 @@ enum
 } ;
 
 
-inline GtkTreeModel *create_model ()
+GtkTreeModel *create_model ()
 {
     GtkTreeStore *tree = gtk_tree_store_new (NUM_COLS,
                                              G_TYPE_UINT,
@@ -1287,7 +1292,7 @@ inline GtkTreeModel *create_model ()
 }
 
 
-inline void fill_model (GtkTreeStore *tree, GnomeCmdFile *f)
+void fill_model (GtkTreeStore *tree, GnomeCmdFile *f)
 {
     if (!gcmd_tags_bulk_load (f))
         return;
diff --git a/src/intviewer/viewer-window.h b/src/intviewer/viewer-window.h
index 71b8d349..fa76f8a5 100644
--- a/src/intviewer/viewer-window.h
+++ b/src/intviewer/viewer-window.h
@@ -98,10 +98,7 @@ struct GViewerWindowClass
 
 GtkType gviewer_window_get_type ();
 
-inline GtkWidget *gviewer_window_new ()
-{
-    return (GtkWidget *) g_object_new (gviewer_window_get_type (), NULL);
-}
+GtkWidget *gviewer_window_new ();
 
 void gviewer_window_load_file (GViewerWindow *gViewerWindow, GnomeCmdFile *f);
 
diff --git a/src/tags/gnome-cmd-tags-exiv2.cc b/src/tags/gnome-cmd-tags-exiv2.cc
index 3bd1a3ed..6868e457 100644
--- a/src/tags/gnome-cmd-tags-exiv2.cc
+++ b/src/tags/gnome-cmd-tags-exiv2.cc
@@ -45,7 +45,7 @@ static DICT<GnomeCmdTag> exiv2_tags(TAG_NONE);
 
 
 template <typename T>
-inline void readTags(GnomeCmdFileMetadata *metadata, const T &data)
+void readTags(GnomeCmdFileMetadata *metadata, const T &data)
 {
     if (data.empty())  return;
 
diff --git a/src/tags/gnome-cmd-tags-taglib.cc b/src/tags/gnome-cmd-tags-taglib.cc
index f4f4338b..db079ad9 100644
--- a/src/tags/gnome-cmd-tags-taglib.cc
+++ b/src/tags/gnome-cmd-tags-taglib.cc
@@ -47,13 +47,15 @@
 
 using namespace std;
 
+bool getAudioProperties(GnomeCmdFileMetadata &metadata, const TagLib::AudioProperties *properties);
+bool readTags(GnomeCmdFileMetadata &metadata, const TagLib::Ogg::XiphComment *oggTag);
 
 #ifdef HAVE_ID3
 static DICT<GnomeCmdTag> id3v2tags(TAG_NONE);
 static DICT<GnomeCmdTag> oggtags(TAG_NONE);
 
 
-inline bool getAudioProperties(GnomeCmdFileMetadata &metadata, const TagLib::AudioProperties *properties)
+bool getAudioProperties(GnomeCmdFileMetadata &metadata, const TagLib::AudioProperties *properties)
 {
     if (!properties)
         return false;
@@ -247,7 +249,7 @@ static void readTags(GnomeCmdFileMetadata &metadata, const TagLib::ID3v2::Tag *i
 }
 
 
-inline bool readTags(GnomeCmdFileMetadata &metadata, const TagLib::Ogg::XiphComment *oggTag)
+bool readTags(GnomeCmdFileMetadata &metadata, const TagLib::Ogg::XiphComment *oggTag)
 {
     metadata.add(TAG_VORBIS_VENDOR, oggTag->vendorID().to8Bit(true));
 
diff --git a/src/utils.cc b/src/utils.cc
index d336bb74..7f5af812 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -1052,6 +1052,13 @@ void gnome_cmd_help_display (const gchar *file_name, const gchar *link_id)
 }
 
 
+void gnome_cmd_error_message (const gchar *title, GError *error)
+{
+    gnome_cmd_prompt_message (NULL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, title, error->message);
+    g_error_free (error);
+}
+
+
 gboolean gnome_cmd_prepend_su_to_vector (int &argc, char **&argv)
 {
     // sanity
diff --git a/src/utils.h b/src/utils.h
index 54bd5baf..6a734e13 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -265,13 +265,6 @@ inline void gnome_cmd_show_message (GtkWindow *parent, std::string message, cons
 void gnome_cmd_help_display (const gchar *file_name, const gchar *link_id=NULL);
 
 
-inline void gnome_cmd_error_message (const gchar *title, GError *error)
-{
-    gnome_cmd_prompt_message (NULL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, title, error->message);
-    g_error_free (error);
-}
-
-
 inline std::string truncate(const std::string &s, guint n=100)
 {
     if (s.size()<=n)
@@ -406,4 +399,4 @@ gboolean move_old_to_new_location(const gchar* oldPath, const gchar* newPath);
 
 gchar* get_package_config_dir();
 
-gchar *string_double_underscores (const gchar *string);
\ No newline at end of file
+gchar *string_double_underscores (const gchar *string);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]