Code clean up, remove unused variables

This commit is contained in:
Robert Fewell 2017-07-23 11:57:01 +01:00 committed by John Ralls
parent 69e927a3a9
commit 0d4bf85718
17 changed files with 4 additions and 50 deletions

View File

@ -147,8 +147,6 @@ gnc_search_callback_button_execute (GNCSearchCallbackButton *cb,
{ {
GNCQueryView *qview = GNC_QUERY_VIEW(sw->result_view); GNCQueryView *qview = GNC_QUERY_VIEW(sw->result_view);
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
// Sanity check // Sanity check
g_assert(qview); g_assert(qview);
@ -188,7 +186,6 @@ gnc_search_dialog_result_clicked (GtkButton *button, GNCSearchWindow *sw)
static void static void
gnc_search_dialog_select_buttons_enable (GNCSearchWindow *sw, gint selected) gnc_search_dialog_select_buttons_enable (GNCSearchWindow *sw, gint selected)
{ {
gint i;
gboolean enable, read_only; gboolean enable, read_only;
GList *blist; GList *blist;

View File

@ -121,7 +121,6 @@ gnc_dup_trans_dialog_create (GtkWidget * parent, DupTransDialog *dt_dialog,
{ {
GtkWidget *date_edit; GtkWidget *date_edit;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *label;
date_edit = gnc_date_edit_new (date, FALSE, FALSE); date_edit = gnc_date_edit_new (date, FALSE, FALSE);
gnc_date_activates_default(GNC_DATE_EDIT(date_edit), TRUE); gnc_date_activates_default(GNC_DATE_EDIT(date_edit), TRUE);

View File

@ -2093,7 +2093,6 @@ component_close_handler (gpointer data)
static void static void
refresh_handler (GHashTable *changes, gpointer user_data) refresh_handler (GHashTable *changes, gpointer user_data)
{ {
GNCOptionWin *retval = user_data;
gnc_commodity *commodity = NULL; gnc_commodity *commodity = NULL;
GtkTreeIter iter; GtkTreeIter iter;
@ -3604,7 +3603,6 @@ gnc_option_set_ui_value_currency_accounting (GNCOption *option,
else else
{ {
GtkWidget *button = NULL; GtkWidget *button = NULL;
int i;
gpointer val; gpointer val;
switch (index) switch (index)

View File

@ -549,7 +549,6 @@ gnc_preferences_build_page (gpointer data,
GtkNotebook *notebook; GtkNotebook *notebook;
addition *add_in; addition *add_in;
struct copy_data copydata; struct copy_data copydata;
gint rows, cols;
gchar **widgetname; gchar **widgetname;
gint i; gint i;
@ -613,7 +612,6 @@ gnc_preferences_build_page (gpointer data,
if (!existing_content) if (!existing_content)
{ {
/* No existing content with this name. Create a blank page */ /* No existing content with this name. Create a blank page */
rows = 0;
existing_content = gtk_grid_new(); existing_content = gtk_grid_new();
gtk_container_set_border_width(GTK_CONTAINER(existing_content), 6); gtk_container_set_border_width(GTK_CONTAINER(existing_content), 6);
label = gtk_label_new(add_in->tabname); label = gtk_label_new(add_in->tabname);
@ -713,7 +711,6 @@ static void
gnc_prefs_connect_font_button (GtkFontButton *fb) gnc_prefs_connect_font_button (GtkFontButton *fb)
{ {
gchar *group, *pref; gchar *group, *pref;
gchar *font;
g_return_if_fail(GTK_IS_FONT_BUTTON(fb)); g_return_if_fail(GTK_IS_FONT_BUTTON(fb));
@ -876,7 +873,6 @@ static void
gnc_prefs_connect_radio_button (GtkRadioButton *button) gnc_prefs_connect_radio_button (GtkRadioButton *button)
{ {
gchar *group, *pref; gchar *group, *pref;
gboolean active;
g_return_if_fail(GTK_IS_RADIO_BUTTON(button)); g_return_if_fail(GTK_IS_RADIO_BUTTON(button));
@ -905,7 +901,6 @@ static void
gnc_prefs_connect_check_button (GtkCheckButton *button) gnc_prefs_connect_check_button (GtkCheckButton *button)
{ {
gchar *group, *pref; gchar *group, *pref;
gboolean active;
g_return_if_fail(GTK_IS_CHECK_BUTTON(button)); g_return_if_fail(GTK_IS_CHECK_BUTTON(button));
@ -934,7 +929,6 @@ static void
gnc_prefs_connect_spin_button (GtkSpinButton *spin) gnc_prefs_connect_spin_button (GtkSpinButton *spin)
{ {
gchar *group, *pref; gchar *group, *pref;
gdouble value;
g_return_if_fail(GTK_IS_SPIN_BUTTON(spin)); g_return_if_fail(GTK_IS_SPIN_BUTTON(spin));
@ -962,7 +956,6 @@ static void
gnc_prefs_connect_combo_box (GtkComboBox *box) gnc_prefs_connect_combo_box (GtkComboBox *box)
{ {
gchar *group, *pref; gchar *group, *pref;
gint active;
g_return_if_fail(GTK_IS_COMBO_BOX(box)); g_return_if_fail(GTK_IS_COMBO_BOX(box));
@ -989,9 +982,7 @@ gnc_prefs_connect_combo_box (GtkComboBox *box)
static void static void
gnc_prefs_connect_currency_edit (GNCCurrencyEdit *gce, const gchar *boxname ) gnc_prefs_connect_currency_edit (GNCCurrencyEdit *gce, const gchar *boxname )
{ {
gnc_commodity *currency;
gchar *group, *pref; gchar *group, *pref;
gchar *mnemonic;
g_return_if_fail(GNC_IS_CURRENCY_EDIT(gce)); g_return_if_fail(GNC_IS_CURRENCY_EDIT(gce));
@ -1017,7 +1008,6 @@ static void
gnc_prefs_connect_entry (GtkEntry *entry) gnc_prefs_connect_entry (GtkEntry *entry)
{ {
gchar *group, *pref; gchar *group, *pref;
gchar *text;
g_return_if_fail(GTK_IS_ENTRY(entry)); g_return_if_fail(GTK_IS_ENTRY(entry));
@ -1046,7 +1036,6 @@ static void
gnc_prefs_connect_period_select (GncPeriodSelect *period, const gchar *boxname ) gnc_prefs_connect_period_select (GncPeriodSelect *period, const gchar *boxname )
{ {
gchar *group, *pref; gchar *group, *pref;
gchar *mnemonic;
g_return_if_fail(GNC_IS_PERIOD_SELECT(period)); g_return_if_fail(GNC_IS_PERIOD_SELECT(period));
@ -1070,7 +1059,6 @@ static void
gnc_prefs_connect_date_edit (GNCDateEdit *gde , const gchar *boxname ) gnc_prefs_connect_date_edit (GNCDateEdit *gde , const gchar *boxname )
{ {
gchar *group, *pref; gchar *group, *pref;
gchar *mnemonic;
g_return_if_fail(GNC_IS_DATE_EDIT(gde)); g_return_if_fail(GNC_IS_DATE_EDIT(gde));
@ -1244,7 +1232,6 @@ gnc_preferences_dialog_create(void)
gnc_commodity *locale_currency; gnc_commodity *locale_currency;
const gchar *currency_name; const gchar *currency_name;
QofBook *book; QofBook *book;
gint64 month, day;
GDate fy_end; GDate fy_end;
gboolean date_is_valid = FALSE; gboolean date_is_valid = FALSE;

View File

@ -181,7 +181,7 @@ gnc_dialog_query_view_new (GList *param_list, Query *q)
{ {
GtkBuilder *builder; GtkBuilder *builder;
DialogQueryView *dqv; DialogQueryView *dqv;
GtkWidget *result_hbox, *close, *scrollWin, *frame, *but_hbox; GtkWidget *result_hbox, *close, *scrollWin, *frame;
GList *node; GList *node;
dqv = g_new0 (DialogQueryView, 1); dqv = g_new0 (DialogQueryView, 1);

View File

@ -1065,7 +1065,6 @@ gnc_xfer_to_amount_update_cb(GtkWidget *widget, GdkEventFocus *event,
{ {
XferDialog *xferData = data; XferDialog *xferData = data;
gnc_numeric price_value; gnc_numeric price_value;
Account *account;
gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (xferData->to_amount_edit)); gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (xferData->to_amount_edit));
price_value = gnc_xfer_dialog_compute_price_value(xferData); price_value = gnc_xfer_dialog_compute_price_value(xferData);
@ -1799,7 +1798,6 @@ gnc_xfer_dialog_close_cb(GtkDialog *dialog, gpointer data)
void void
gnc_xfer_dialog_fetch (GtkButton *button, XferDialog *xferData) gnc_xfer_dialog_fetch (GtkButton *button, XferDialog *xferData)
{ {
GNCPrice *prc;
PriceReq pr; PriceReq pr;
SCM quotes_func; SCM quotes_func;
SCM book_scm; SCM book_scm;

View File

@ -134,7 +134,6 @@ gcrd_init (GncCellRendererDate *date)
GncCellRendererPopup *popup; GncCellRendererPopup *popup;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *bbox;
GtkWidget *button; GtkWidget *button;
popup = GNC_CELL_RENDERER_POPUP (date); popup = GNC_CELL_RENDERER_POPUP (date);
@ -312,7 +311,6 @@ gcrd_show (GncCellRendererPopup *cell,
gint year; gint year;
gint month; gint month;
gint day; gint day;
gint index;
const gchar *text; const gchar *text;
if (parent_class->show_popup) { if (parent_class->show_popup) {
@ -342,7 +340,6 @@ gcrd_show (GncCellRendererPopup *cell,
gtk_calendar_select_day (GTK_CALENDAR (date->calendar), day); gtk_calendar_select_day (GTK_CALENDAR (date->calendar), day);
gtk_calendar_mark_day (GTK_CALENDAR (date->calendar), day); gtk_calendar_mark_day (GTK_CALENDAR (date->calendar), day);
} }
GtkCellRenderer * GtkCellRenderer *

View File

@ -453,13 +453,9 @@ gctt_rebuild_menu (GncCombott *combott, GtkTreeModel *model)
static void static void
gctt_refresh_menu (GncCombott *combott, GtkTreeModel *model) gctt_refresh_menu (GncCombott *combott, GtkTreeModel *model)
{ {
GncCombottPrivate *priv;
g_return_if_fail (GNC_IS_COMBOTT (combott)); g_return_if_fail (GNC_IS_COMBOTT (combott));
g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model)); g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
priv = GNC_COMBOTT_GET_PRIVATE (combott);
gctt_rebuild_menu(combott, model); gctt_rebuild_menu(combott, model);
} }
@ -565,7 +561,6 @@ which_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, Gt
gtk_tree_model_get( priv->model, &priv->active_iter, priv->tip_col, &text, -1 ); gtk_tree_model_get( priv->model, &priv->active_iter, priv->tip_col, &text, -1 );
if(g_strcmp0(text, "") && (text != NULL)) if(g_strcmp0(text, "") && (text != NULL))
{ {
gchar *label = "";
gtk_tooltip_set_text (tooltip, text); gtk_tooltip_set_text (tooltip, text);
g_free(text); g_free(text);
return TRUE; return TRUE;
@ -699,7 +694,6 @@ gnc_combott_set_active (GncCombott *combott, gint index)
GtkTreeIter iter; GtkTreeIter iter;
gboolean valid = TRUE; gboolean valid = TRUE;
gint active = 1; gint active = 1;
gint num = 1;
g_return_if_fail (GNC_IS_COMBOTT (combott)); g_return_if_fail (GNC_IS_COMBOTT (combott));
g_return_if_fail (index >= -1); g_return_if_fail (index >= -1);

View File

@ -302,7 +302,6 @@ static void gnc_currency_edit_active_changed (GtkComboBox *gobject,
gpointer user_data) gpointer user_data)
{ {
GNCCurrencyEdit *self = GNC_CURRENCY_EDIT (gobject); GNCCurrencyEdit *self = GNC_CURRENCY_EDIT (gobject);
GNCCurrencyEditPrivate *priv = GET_PRIVATE (self);
gnc_commodity *currency = gnc_currency_edit_get_currency (self); gnc_commodity *currency = gnc_currency_edit_get_currency (self);
const gchar *mnemonic = gnc_commodity_get_mnemonic (currency); const gchar *mnemonic = gnc_commodity_get_mnemonic (currency);

View File

@ -893,7 +893,6 @@ create_children (GNCDateEdit *gde)
GtkWidget *frame; GtkWidget *frame;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *arrow; GtkWidget *arrow;
GtkComboBox *combo;
GtkTreeStore *store; GtkTreeStore *store;
GtkCellRenderer *cell; GtkCellRenderer *cell;
@ -1170,7 +1169,6 @@ time64
gnc_date_edit_get_date (GNCDateEdit *gde) gnc_date_edit_get_date (GNCDateEdit *gde)
{ {
struct tm tm; struct tm tm;
time64 retval;
g_return_val_if_fail (gde != NULL, 0); g_return_val_if_fail (gde != NULL, 0);
g_return_val_if_fail (GNC_IS_DATE_EDIT (gde), 0); g_return_val_if_fail (GNC_IS_DATE_EDIT (gde), 0);

View File

@ -950,7 +950,6 @@ RESTART:
QofBook *book = qof_session_get_book (new_session); QofBook *book = qof_session_get_book (new_session);
gchar *msg = gnc_features_test_unknown (book); gchar *msg = gnc_features_test_unknown (book);
Account *template_root = gnc_book_get_template_root (book); Account *template_root = gnc_book_get_template_root (book);
GList *child = NULL;
if (msg) if (msg)
{ {

View File

@ -228,7 +228,6 @@ gnc_frequency_init(GncFrequency *gf)
gf->startDate = GNC_DATE_EDIT(gnc_date_edit_new(time(NULL), FALSE, FALSE)); gf->startDate = GNC_DATE_EDIT(gnc_date_edit_new(time(NULL), FALSE, FALSE));
/* Add the new widget to the table. */ /* Add the new widget to the table. */
{ {
gint dont_expand_or_fill = 0;
GtkWidget *table = GTK_WIDGET(gtk_builder_get_object (builder, "gncfreq_table")); GtkWidget *table = GTK_WIDGET(gtk_builder_get_object (builder, "gncfreq_table"));
gtk_grid_attach(GTK_GRID(table), GTK_WIDGET(gf->startDate), 4, 0, 1, 1); gtk_grid_attach(GTK_GRID(table), GTK_WIDGET(gf->startDate), 4, 0, 1, 1);
gtk_widget_set_vexpand (GTK_WIDGET(gf->startDate), FALSE); gtk_widget_set_vexpand (GTK_WIDGET(gf->startDate), FALSE);

View File

@ -64,7 +64,6 @@ void
gnc_load_app_icons (void) gnc_load_app_icons (void)
{ {
GtkIconTheme *icon_theme = gtk_icon_theme_get_default (); GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
gchar *file;
const gchar *default_path; const gchar *default_path;
gchar* pkgdatadir = gnc_path_get_pkgdatadir (); gchar* pkgdatadir = gnc_path_get_pkgdatadir ();
gchar* datadir = gnc_path_get_datadir (); gchar* datadir = gnc_path_get_datadir ();

View File

@ -3844,7 +3844,7 @@ gnc_main_window_switch_page (GtkNotebook *notebook,
GncMainWindowPrivate *priv; GncMainWindowPrivate *priv;
GtkWidget *child; GtkWidget *child;
GncPluginPage *page; GncPluginPage *page;
gboolean immutable, visible; gboolean visible;
ENTER("Notebook %p, page, %p, index %d, window %p", ENTER("Notebook %p, page, %p, index %d, window %p",
notebook, notebook_page, pos, window); notebook, notebook_page, pos, window);

View File

@ -418,11 +418,7 @@ gnc_query_view_init_view (GNCQueryView *qview)
static void static void
gnc_query_view_class_init (GNCQueryViewClass *klass) gnc_query_view_class_init (GNCQueryViewClass *klass)
{ {
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class = (GtkWidgetClass*) klass;
GtkTreeViewClass *view_class;
widget_class = (GtkWidgetClass*) klass;
view_class = (GtkTreeViewClass*) klass;
parent_class = g_type_class_peek (GTK_TYPE_TREE_VIEW); parent_class = g_type_class_peek (GTK_TYPE_TREE_VIEW);
@ -474,7 +470,6 @@ gnc_query_view_select_row_cb (GtkTreeSelection *selection, gpointer user_data)
{ {
GNCQueryView *qview = GNC_QUERY_VIEW (gtk_tree_selection_get_tree_view (selection)); GNCQueryView *qview = GNC_QUERY_VIEW (gtk_tree_selection_get_tree_view (selection));
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeIter iter;
gint number_of_rows; gint number_of_rows;
gpointer entry = NULL; gpointer entry = NULL;
GList *node; GList *node;
@ -687,8 +682,6 @@ void
gnc_query_view_refresh (GNCQueryView *qview) gnc_query_view_refresh (GNCQueryView *qview)
{ {
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeIter iter;
GtkTreeSelection *selection;
GList *old_entry; GList *old_entry;
g_return_if_fail (qview != NULL); g_return_if_fail (qview != NULL);

View File

@ -678,7 +678,6 @@ gnc_tree_view_update_visibility (GtkTreeViewColumn *column,
GncTreeView *view) GncTreeView *view)
{ {
GncTreeViewPrivate *priv; GncTreeViewPrivate *priv;
gchar *name, *key;
gboolean visible; gboolean visible;
g_return_if_fail(GTK_IS_TREE_VIEW_COLUMN(column)); g_return_if_fail(GTK_IS_TREE_VIEW_COLUMN(column));
@ -741,7 +740,7 @@ gnc_tree_view_get_sort_column (GncTreeView *view)
GtkTreeModel *s_model; GtkTreeModel *s_model;
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GtkSortType order; GtkSortType order;
gint model_column, current; gint current;
const gchar *name; const gchar *name;
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view)); s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
@ -1627,7 +1626,6 @@ gnc_tree_view_column_properties (GncTreeView *view,
GtkTreeModel *s_model; GtkTreeModel *s_model;
gboolean visible; gboolean visible;
int width = 0; int width = 0;
gchar *key;
/* Set data used by other functions */ /* Set data used by other functions */
if (pref_name) if (pref_name)

View File

@ -561,7 +561,6 @@ gnc_search_param_prepend_compound (GList *list, char const *title,
GtkJustification justify, GtkJustification justify,
GNCSearchParamKind kind) GNCSearchParamKind kind)
{ {
GList *result;
GList *p; GList *p;
QofIdTypeConst type = NULL; QofIdTypeConst type = NULL;
GNCSearchParamCompound *param; GNCSearchParamCompound *param;