Fix most of the unused assignment errors from static analysis.

There are a very few left that need deeper study, but this gets
rid of most of the noise. For the most part it's just getting rid of
extra variables or removing an assignment that is always
replaced later but before any reads of the variable. A few are
discarded result variables.
This commit is contained in:
John Ralls 2018-11-30 13:56:08 +09:00
parent a93448414f
commit bf55c30aeb
90 changed files with 106 additions and 294 deletions

View File

@ -528,12 +528,10 @@ int Gtk3Gui_GetRawText(const char *text, GWEN_BUFFER *tbuf) {
if (p && p2) {
int startPos;
int endPos;
p2+=7; /* skip "</html>" */
startPos=(p-text);
endPos=(p2-text);
/* append stuff before startPos */
if (startPos)

View File

@ -162,11 +162,8 @@ static void Gtk3Gui_WCheckBox_Toggled_handler(GtkButton *button, gpointer data)
static int Gtk3Gui_WCheckBox_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
gulong toggled_handler_id;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);
@ -184,10 +181,10 @@ static int Gtk3Gui_WCheckBox_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WCheckBox_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WCheckBox_GetCharProperty);
toggled_handler_id=g_signal_connect(g,
"toggled",
G_CALLBACK (Gtk3Gui_WCheckBox_Toggled_handler),
w);
g_signal_connect(g,
"toggled",
G_CALLBACK (Gtk3Gui_WCheckBox_Toggled_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -250,7 +250,6 @@ int Gtk3Gui_WComboBox_Setup(GWEN_WIDGET *w) {
GtkListStore *store;
uint32_t flags;
GWEN_WIDGET *wParent;
gulong changed_handler_id;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
@ -283,10 +282,10 @@ int Gtk3Gui_WComboBox_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WComboBox_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WComboBox_GetCharProperty);
changed_handler_id=g_signal_connect(g,
"changed",
G_CALLBACK (changed_handler),
w);
g_signal_connect(g,
"changed",
G_CALLBACK (changed_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -177,9 +177,7 @@ int Gtk3Gui_WDialog_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
static int Gtk3Gui_WDialog_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
flags=GWEN_Widget_GetFlags(w);
s=GWEN_Widget_GetText(w, 0);
g=gtk_window_new(GTK_WINDOW_TOPLEVEL);

View File

@ -128,7 +128,6 @@ int Gtk3Gui_WGridLayout_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
GTK3_GRIDLAYOUT_WIDGET *xw;
GtkWidget *g;
GtkWidget *gChild;
uint32_t cflags;
int x;
int y;
@ -136,7 +135,6 @@ int Gtk3Gui_WGridLayout_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
xw=GWEN_INHERIT_GETDATA(GWEN_WIDGET, GTK3_GRIDLAYOUT_WIDGET, w);
assert(xw);
cflags=GWEN_Widget_GetFlags(wChild);
g=GTK_WIDGET(GWEN_Widget_GetImplData(w, GTK3_DIALOG_WIDGET_REAL));
assert(g);
@ -194,7 +192,6 @@ void Gtk3Gui_WGridLayout_FreeData(void *bp, void *p) {
static int Gtk3Gui_WGridLayout_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
GTK3_GRIDLAYOUT_WIDGET *xw;
int rows;
@ -203,7 +200,6 @@ static int Gtk3Gui_WGridLayout_Setup(GWEN_WIDGET *w) {
GWEN_NEW_OBJECT(GTK3_GRIDLAYOUT_WIDGET, xw);
GWEN_INHERIT_SETDATA(GWEN_WIDGET, GTK3_GRIDLAYOUT_WIDGET, w, xw, Gtk3Gui_WGridLayout_FreeData);
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
cols=GWEN_Widget_GetColumns(w);
rows=GWEN_Widget_GetRows(w);

View File

@ -171,10 +171,8 @@ static int Gtk3Gui_WGroupBox_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
GtkWidget *gContent;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);

View File

@ -137,10 +137,8 @@ int Gtk3Gui_WHLayout_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
static int Gtk3Gui_WHLayout_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_box_new(GTK_ORIENTATION_HORIZONTAL,

View File

@ -76,10 +76,8 @@ int Gtk3Gui_WHLine_GetIntProperty(GWEN_WIDGET *w,
static int Gtk3Gui_WHLine_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);

View File

@ -76,10 +76,8 @@ int Gtk3Gui_WHSpacer_GetIntProperty(GWEN_WIDGET *w,
static int Gtk3Gui_WHSpacer_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);

View File

@ -146,11 +146,9 @@ const char* Gtk3Gui_WLabel_GetCharProperty(GWEN_WIDGET *w,
static int Gtk3Gui_WLabel_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
GWEN_BUFFER *tbuf;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);

View File

@ -183,8 +183,6 @@ static int Gtk3Gui_WLineEdit_Setup(GWEN_WIDGET *w) {
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
gulong deleted_text_handler_id;
gulong inserted_text_handler_id;
gboolean text_is_visible;
flags=GWEN_Widget_GetFlags(w);
@ -206,15 +204,15 @@ static int Gtk3Gui_WLineEdit_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WLineEdit_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WLineEdit_GetCharProperty);
deleted_text_handler_id=g_signal_connect(gtk_entry_get_buffer(GTK_ENTRY(g)),
"deleted-text",
G_CALLBACK (Gtk3Gui_WLineEdit_Deleted_text_handler),
w);
g_signal_connect(gtk_entry_get_buffer(GTK_ENTRY(g)),
"deleted-text",
G_CALLBACK (Gtk3Gui_WLineEdit_Deleted_text_handler),
w);
inserted_text_handler_id=g_signal_connect(gtk_entry_get_buffer(GTK_ENTRY(g)),
"inserted-text",
G_CALLBACK (Gtk3Gui_WLineEdit_Inserted_text_handler),
w);
g_signal_connect(gtk_entry_get_buffer(GTK_ENTRY(g)),
"inserted-text",
G_CALLBACK (Gtk3Gui_WLineEdit_Inserted_text_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -252,7 +252,6 @@ int Gtk3Gui_WListBox_SetCharProperty(GWEN_WIDGET *w,
GType types[W_LISTBOX_MAX_TYPES];
GtkListStore *sto;
int i;
const char *s;
GtkTreeViewColumn *col;
char *vcopy;
char *p;
@ -262,7 +261,6 @@ int Gtk3Gui_WListBox_SetCharProperty(GWEN_WIDGET *w,
for (i=0; i<cols; i++)
types[i]=G_TYPE_STRING;
sto=gtk_list_store_newv(cols, types);
s=value;
/* clear current headers in tree view */
while( (col=gtk_tree_view_get_column(GTK_TREE_VIEW(g), 0)) )
@ -497,11 +495,8 @@ static void Gtk3Gui_WListBox_CursorChanged_handler(GtkTreeView *g, gpointer data
static int Gtk3Gui_WListBox_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
GtkWidget *gScroll;
uint32_t flags;
GWEN_WIDGET *wParent;
gulong changed_handler_id;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
gScroll=gtk_scrolled_window_new(NULL, NULL);
@ -526,10 +521,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WListBox_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WListBox_GetCharProperty);
changed_handler_id=g_signal_connect(g,
"cursor-changed",
G_CALLBACK (Gtk3Gui_WListBox_CursorChanged_handler),
w);
g_signal_connect(g,
"cursor-changed",
G_CALLBACK (Gtk3Gui_WListBox_CursorChanged_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -209,17 +209,13 @@ static void GWENHYWFAR_CB Gtk3Gui_WProgressBar_FreeData(void *bp, void *p) {
static int Gtk3Gui_WProgressBar_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
W_PROGRESSBAR *xw;
GWEN_NEW_OBJECT(W_PROGRESSBAR, xw);
GWEN_INHERIT_SETDATA(GWEN_WIDGET, W_PROGRESSBAR, w, xw, Gtk3Gui_WProgressBar_FreeData);
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);
g=gtk_progress_bar_new();
GWEN_Widget_SetImplData(w, GTK3_DIALOG_WIDGET_REAL, (void*) g);

View File

@ -156,11 +156,8 @@ static void Gtk3Gui_WPushButton_Clicked_handler(GtkButton *button, gpointer data
static int Gtk3Gui_WPushButton_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
gulong clicked_handler_id;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);
@ -204,10 +201,10 @@ static int Gtk3Gui_WPushButton_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WPushButton_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WPushButton_GetCharProperty);
clicked_handler_id=g_signal_connect(g,
"clicked",
G_CALLBACK (Gtk3Gui_WPushButton_Clicked_handler),
w);
g_signal_connect(g,
"clicked",
G_CALLBACK (Gtk3Gui_WPushButton_Clicked_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -162,13 +162,11 @@ static void Gtk3Gui_WRadioButton_Toggled_handler(GtkButton *button, gpointer dat
static int Gtk3Gui_WRadioButton_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
GWEN_WIDGET *wT;
gulong toggled_handler_id;
int groupId;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
groupId=GWEN_Widget_GetGroupId(w);
@ -208,10 +206,10 @@ static int Gtk3Gui_WRadioButton_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WRadioButton_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WRadioButton_GetCharProperty);
toggled_handler_id=g_signal_connect(g,
"toggled",
G_CALLBACK (Gtk3Gui_WRadioButton_Toggled_handler),
w);
g_signal_connect(g,
"toggled",
G_CALLBACK (Gtk3Gui_WRadioButton_Toggled_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -163,10 +163,8 @@ int Gtk3Gui_WScrollArea_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
static int Gtk3Gui_WScrollArea_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
GtkWidget *gContent;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
/* create widget */

View File

@ -178,18 +178,13 @@ static void Gtk3Gui_WSpinBox_Changed_handler(GtkAdjustment *adjustment, gpointer
static int Gtk3Gui_WSpinBox_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
W_SPINBOX *xw;
gulong changed_handler_id;
GWEN_NEW_OBJECT(W_SPINBOX, xw);
GWEN_INHERIT_SETDATA(GWEN_WIDGET, W_SPINBOX, w, xw, Gtk3Gui_WSpinBox_FreeData);
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);
xw->adjustment=GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 5.0, 5.0));
g=gtk_spin_button_new(xw->adjustment, 1.0, 0);
@ -201,10 +196,10 @@ static int Gtk3Gui_WSpinBox_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WSpinBox_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WSpinBox_GetCharProperty);
changed_handler_id=g_signal_connect(g,
"value-changed",
G_CALLBACK (Gtk3Gui_WSpinBox_Changed_handler),
w);
g_signal_connect(g,
"value-changed",
G_CALLBACK (Gtk3Gui_WSpinBox_Changed_handler),
w);
if (wParent)
GWEN_Widget_AddChildGuiWidget(wParent, w);

View File

@ -147,10 +147,8 @@ int Gtk3Gui_WStack_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
static int Gtk3Gui_WStack_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_notebook_new();

View File

@ -141,10 +141,8 @@ int Gtk3Gui_WTabBook_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
static int Gtk3Gui_WTabBook_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_notebook_new();

View File

@ -193,10 +193,8 @@ static int Gtk3Gui_WTextBrowser_Setup(GWEN_WIDGET *w) {
GtkWidget *gs;
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);

View File

@ -187,11 +187,8 @@ static void Gtk3Gui_WTextEdit_Changed_handler(GtkTextBuffer *buffer, gpointer da
static int Gtk3Gui_WTextEdit_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
const char *s;
uint32_t flags;
GWEN_WIDGET *wParent;
gulong changed_handler_id;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
s=GWEN_Widget_GetText(w, 0);
@ -208,7 +205,7 @@ static int Gtk3Gui_WTextEdit_Setup(GWEN_WIDGET *w) {
GWEN_Widget_SetSetCharPropertyFn(w, Gtk3Gui_WTextEdit_SetCharProperty);
GWEN_Widget_SetGetCharPropertyFn(w, Gtk3Gui_WTextEdit_GetCharProperty);
changed_handler_id=g_signal_connect(gtk_text_view_get_buffer(GTK_TEXT_VIEW(g)),
g_signal_connect(gtk_text_view_get_buffer(GTK_TEXT_VIEW(g)),
"changed",
G_CALLBACK (Gtk3Gui_WTextEdit_Changed_handler),
w);

View File

@ -137,10 +137,8 @@ int Gtk3Gui_WVLayout_AddChildGuiWidget(GWEN_WIDGET *w, GWEN_WIDGET *wChild) {
static int Gtk3Gui_WVLayout_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_box_new(GTK_ORIENTATION_VERTICAL,

View File

@ -76,10 +76,8 @@ int Gtk3Gui_WVLine_GetIntProperty(GWEN_WIDGET *w,
static int Gtk3Gui_WVLine_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_separator_new(GTK_ORIENTATION_VERTICAL);

View File

@ -76,10 +76,8 @@ int Gtk3Gui_WVSpacer_GetIntProperty(GWEN_WIDGET *w,
static int Gtk3Gui_WVSpacer_Setup(GWEN_WIDGET *w) {
GtkWidget *g;
uint32_t flags;
GWEN_WIDGET *wParent;
flags=GWEN_Widget_GetFlags(w);
wParent=GWEN_Widget_Tree_GetParent(w);
g=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);

View File

@ -1184,7 +1184,7 @@ build_tuples( state *s, ub2 d, ub2 f)
{
feature offset[MAX_N]; /* n-1-tuples */
feature tuple[MAX_N]; /* n-tuples that include (d,f) */
sb4 i, j, n = s->n[d][f];
sb4 i, j, n;
ub8 count = 0;
test *t;
tu_iter ctx;
@ -1522,7 +1522,6 @@ cover_tuples( state *s)
ub4 tuple_count = 0;
ub1 covered = FALSE;
feature *tuple = (feature *)0;
ub4 tuple_f, tuple_d;
/* extend lists of tuples and choose one tuple to cover */
for (d=0; d<s->ndim; ++d) {
@ -1533,13 +1532,9 @@ cover_tuples( state *s)
tuple_n = s->n[d][f];
tuple_count = s->tc[d][f];
tuple = s->tu[d][f]->fe;
tuple_f = f;
tuple_d = d;
} else if (s->n[d][f] == tuple_n && s->tc[d][f] > tuple_count) {
tuple_count = s->tc[d][f];
tuple = s->tu[d][f]->fe;
tuple_f = f;
tuple_d = d;
}
}
}
@ -1748,9 +1743,7 @@ which_test( state *s)
static void
reduce_tests( state *s)
{
ub4 t;
prepare_reduce( s);
t = which_test( s);
}
/* Confirm that every tuple is covered by either a testcase or a without */

View File

@ -1352,7 +1352,7 @@ gnc_ui_commodity_dialog_to_object(CommodityWindow * w)
gnc_commodity_commit_edit(c);
/* remember the commodity */
c = gnc_commodity_table_insert(gnc_get_current_commodities(), c);
gnc_commodity_table_insert(gnc_get_current_commodities(), c);
}
else
{

View File

@ -294,7 +294,7 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table,
gtk_widget_hide (GTK_WIDGET(gtk_builder_get_object (builder, "spacer")));
gtk_widget_hide (ntt->name_entry);
/* Tables are great for layout, but a pain when you hide widgets */
widget = GTK_WIDGET(gtk_builder_get_object (builder, "ttd_table"));
GTK_WIDGET(gtk_builder_get_object (builder, "ttd_table"));
gtk_widget_grab_focus (gnc_amount_edit_gtk_entry
(GNC_AMOUNT_EDIT (ntt->amount_entry)));
}

View File

@ -1299,8 +1299,7 @@ gnc_xfer_dialog_set_amount(XferDialog *xferData, gnc_numeric amount)
account = gnc_transfer_dialog_get_selected_account (xferData,
XFER_DIALOG_FROM);
if (account == NULL)
account = gnc_transfer_dialog_get_selected_account (xferData,
XFER_DIALOG_TO);
gnc_transfer_dialog_get_selected_account (xferData, XFER_DIALOG_TO);
gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (xferData->amount_edit), amount);
}

View File

@ -220,8 +220,8 @@ gcrp_grab_on_window (GdkWindow *window,
GdkSeat *seat;
#else
GdkDeviceManager *device_manager;
#endif
GdkDevice *device;
#endif
#if GTK_CHECK_VERSION(3,22,0)
GdkEvent *event = gtk_get_current_event ();
@ -229,7 +229,6 @@ gcrp_grab_on_window (GdkWindow *window,
#if GTK_CHECK_VERSION(3,20,0)
seat = gdk_display_get_default_seat (display);
device = gdk_seat_get_pointer (seat);
#else
device_manager = gdk_display_get_device_manager (display);
device = gdk_device_manager_get_client_pointer (device_manager);
@ -316,7 +315,6 @@ gcrp_show_popup (GncCellRendererPopup *cell,
if (alloc.height > screen_height && y - button_height > screen_height) {
/* We don't, so we show the popup above the cell
instead of below it. */
screen_height = y - button_height;
y -= (alloc.height + button_height);
if (y < 0) {
y = 0;

View File

@ -86,7 +86,7 @@ gnc_file_dialog (GtkWindow *parent,
GtkWidget *file_box;
const char *internal_name;
char *file_name = NULL;
gchar * okbutton = _("_Open");
gchar * okbutton;
const gchar *ok_icon = NULL;
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
gint response;
@ -742,7 +742,6 @@ RESTART:
{
gchar *directory;
show_session_error (parent, io_err, newfile, GNC_FILE_DIALOG_OPEN);
io_err = ERR_BACKEND_NO_ERR;
if (g_file_test (filename, G_FILE_TEST_IS_DIR))
directory = g_strdup (filename);
else

View File

@ -2965,7 +2965,6 @@ gnc_main_window_open_page (GncMainWindow *window,
}
page->window = GTK_WIDGET(window);
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
page->notebook_page = gnc_plugin_page_create_widget (page);
g_object_set_data (G_OBJECT (page->notebook_page),
PLUGIN_PAGE_LABEL, page);
@ -4810,6 +4809,9 @@ do_popup_menu(GncPluginPage *page, GdkEventButton *event)
return;
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event);
#else
if (event)
{
button = event->button;
@ -4820,9 +4822,6 @@ do_popup_menu(GncPluginPage *page, GdkEventButton *event)
button = 0;
event_time = gtk_get_current_event_time ();
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event);
#else
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time);
#endif
LEAVE(" ");

View File

@ -253,7 +253,6 @@ GDate *
gnc_period_select_get_fy_end (GncPeriodSelect *period)
{
GncPeriodSelectPrivate *priv;
priv = GNC_PERIOD_SELECT_GET_PRIVATE(period);
g_return_val_if_fail(period != NULL, NULL);
g_return_val_if_fail(GNC_IS_PERIOD_SELECT(period), NULL);

View File

@ -1082,7 +1082,6 @@ gnc_tree_util_set_number_for_input (GncTreeViewSplitReg *view, Transaction *tran
if (gnc_numeric_zero_p (value))
{
amount = gnc_numeric_create (1,1);
value = gnc_numeric_mul (input, amount, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND);
xaccSplitSetValue (split, input);
xaccSplitSetAmount (split, amount);
LEAVE("");

View File

@ -381,7 +381,7 @@ gnc_tree_view_commodity_new (QofBook *book,
/* Set default visibilities */
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(view), FALSE);
col = gnc_tree_view_add_text_column (
gnc_tree_view_add_text_column (
view, _("Namespace"), "namespace", NULL, "NASDAQ",
GNC_TREE_MODEL_COMMODITY_COL_NAMESPACE,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
@ -398,7 +398,7 @@ gnc_tree_view_commodity_new (QofBook *book,
GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
sort_by_commodity_string);
g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
col = gnc_tree_view_add_text_column (
gnc_tree_view_add_text_column (
view, _("Print Name"), "printname", NULL,
"ACMEACME (Acme Corporation, Inc.)",
GNC_TREE_MODEL_COMMODITY_COL_PRINTNAME,
@ -410,7 +410,7 @@ gnc_tree_view_commodity_new (QofBook *book,
GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
sort_by_commodity_string);
g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
col = gnc_tree_view_add_text_column (
gnc_tree_view_add_text_column (
view, _("Unique Name"), "uniquename", NULL,
"NASDAQ::ACMEACME", GNC_TREE_MODEL_COMMODITY_COL_UNIQUE_NAME,
GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
@ -430,7 +430,7 @@ gnc_tree_view_commodity_new (QofBook *book,
GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
sort_by_fraction);
g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
col = gnc_tree_view_add_toggle_column(
gnc_tree_view_add_toggle_column(
view, _("Get Quotes"),
/* Translators: This string has a context prefix; the translation
must only contain the part after the | character. */
@ -439,7 +439,7 @@ gnc_tree_view_commodity_new (QofBook *book,
GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
sort_by_quote_flag,
NULL);
col = gnc_tree_view_add_text_column (
gnc_tree_view_add_text_column (
view, _("Source"), "quote_source", NULL, "alphavantage",
GNC_TREE_MODEL_COMMODITY_COL_QUOTE_SOURCE,
GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,

View File

@ -420,7 +420,7 @@ gnc_tree_view_price_new (QofBook *book,
sample_text = gnc_commodity_get_printname(gnc_default_currency());
sample_text2 = g_strdup_printf("%s%s", sample_text, sample_text);
col = gnc_tree_view_add_text_column (
gnc_tree_view_add_text_column (
view, _("Security"), "security", NULL, sample_text2,
GNC_TREE_MODEL_PRICE_COL_COMMODITY,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,

View File

@ -1497,20 +1497,11 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
editable = FALSE;
}
else if (is_split && show_extra_dates) {
time64 t = 0;
if (xaccSplitGetReconcile (split) == YREC)
{
t = xaccSplitGetDateReconciled (split);
//If the time returned by xaccTransGetDateEnteredTS is 0 then assume it
//is a new transaction and set the time to current time to show current
//date on new transactions
if (t == 0)
{
t = gnc_time (NULL);
//xaccSplitSetDateReconciledTS (split, ts.tv_sec);
}//if
qof_print_date_buff (datebuff, sizeof(datebuff), 0);
time64 t = xaccSplitGetDateReconciled (split);
qof_print_date_buff (datebuff, sizeof(datebuff), t);
}
editable = FALSE;
}
@ -1870,7 +1861,6 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
if (is_trow2)
{
s = "";
editable = FALSE;
}
else if (is_trow1) // Value
{
@ -1878,12 +1868,8 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
{
Split *this_split;
this_split = gtv_sr_get_this_split (view, trans);
num = xaccTransGetAccountValue (trans, anchor);
editable = !expanded && !gnc_tree_util_split_reg_is_multi (this_split);
if (expanded)
s = "";
else
@ -1892,7 +1878,6 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
else
{
s = "";
editable = FALSE;
}
}
@ -1902,7 +1887,6 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
{
num = xaccSplitGetAmount (split);
s = xaccPrintAmount (num, gnc_account_print_info (xaccSplitGetAccount (split), SHOW_SYMBOL));
editable = TRUE;
}
else if (anchor)
{
@ -1913,13 +1897,11 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
{
num = xaccSplitGetAmount (split);
s = xaccPrintAmount (num, gnc_account_print_info (xaccSplitGetAccount (split), SHOW_SYMBOL));
editable = TRUE;
}
}
else
{
s = "";
editable = FALSE;
}
if (gtv_sr_get_imbalance (trans))
@ -1945,14 +1927,12 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
if (is_trow2)
{
s = "";
editable = FALSE;
}
else if (is_trow1)
{
if (expanded)
{
s = "";
editable = FALSE;
}
else
{
@ -1968,22 +1948,18 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
else
num = xaccSplitGetSharePrice (this_split);
editable = !expanded && !gnc_tree_util_split_reg_is_multi (this_split);
if (gnc_numeric_check (num) == GNC_ERROR_OK)
if (gnc_numeric_check (num) == GNC_ERROR_OK)
{
s = xaccPrintAmount (num, gnc_split_amount_print_info (split, SHOW_SYMBOL));
}
else
{
s = "";
editable = FALSE;
}
}
else
{
s = "";
editable = FALSE;
}
}
}
@ -2001,18 +1977,15 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
if (gnc_numeric_check (num) == GNC_ERROR_OK)
{
s = xaccPrintAmount (num, gnc_split_amount_print_info (split, SHOW_SYMBOL));
editable = TRUE;
}
else
{
s = "";
editable = FALSE;
}
}
else
{
s = "";
editable = FALSE;
}
if (gtv_sr_get_imbalance (trans))
@ -2041,7 +2014,6 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
if (!gnc_tree_util_split_reg_get_debcred_entry (view, trans, split, is_blank, &num, &print_info))
num = gnc_numeric_zero();
editable = TRUE;
if (gtv_sr_get_imbalance (trans))
g_object_set (cell, "cell-background", PINKCELL, (gchar*)NULL);
}
@ -2049,18 +2021,15 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
{
if (anchor)
{
editable = !expanded && !gnc_tree_util_split_reg_is_multi (gtv_sr_get_this_split (view, trans));
num = xaccTransGetAccountAmount (trans, anchor);
}
else
{
editable = FALSE;
num = gnc_numeric_zero();
}
}
else if (is_trow2)
{
editable = FALSE;
num = gnc_numeric_zero();
}
@ -2081,12 +2050,10 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
}
else
{
editable = TRUE;
if (is_trow1 || is_trow2)
{
s = "";
editable = FALSE;
}
else if (is_split && viewcol == COL_DEBIT)
s = gnc_tree_util_split_reg_template_get_fdebt_entry (split);
@ -4031,8 +3998,6 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
g_free (string);
}
model = gnc_tree_view_split_reg_get_model_from_view (view);
/* Step to the next column, we may wrap */
gnc_tree_view_keynav (GNC_TREE_VIEW (view), &col, spath, event); // returns path and column

View File

@ -1652,7 +1652,6 @@ gnc_tree_view_column_properties (GncTreeView *view,
}
else
{
priv = GNC_TREE_VIEW_GET_PRIVATE(view);
/* If saved state comes back with a width of zero (or there is no saved
* state width) the use the default width for the column. Allow for

View File

@ -270,11 +270,6 @@ verify_term_ok (NewBillTerm *nbt)
gint days_due_days, days_disc_days;
gint prox_due_days, prox_disc_days;
days_due_days=0;
days_disc_days=0;
prox_due_days=0;
prox_disc_days=0;
notebook = &nbt->notebook;
result=TRUE;

View File

@ -446,10 +446,8 @@ gnc_payment_window_fill_docs_list (PaymentWindow *pw)
for (node = pw->tx_info->lots; node; node = node->next)
{
PreExistLotInfo *lot_info = node->data;
if (!gnc_numeric_zero_p (gnc_lot_get_balance (lot_info->lot)))
/* This case will be handled below when the lot is processed as part of the open lots */
tx_lot = lot_info->lot;
else
if (gnc_numeric_zero_p (gnc_lot_get_balance (lot_info->lot)))
/* The not-zero case will be handled below when the lot is processed as part of the open lots */
{
GncOwner lotowner;
gncOwnerInitUndefined(&lotowner, NULL);
@ -486,7 +484,7 @@ gnc_payment_window_fill_docs_list (PaymentWindow *pw)
const gchar *doc_cred_str = NULL;
GtkTreeIter iter;
GncInvoice *document;
gnc_numeric value = gnc_numeric_zero();
gnc_numeric value;
gnc_numeric debit = gnc_numeric_zero();
gnc_numeric credit = gnc_numeric_zero();

View File

@ -429,7 +429,7 @@ gnc_prices_dialog_remove_old_clicked (GtkWidget *widget, gpointer data)
gtk_cell_renderer_set_alignment (cr, 0.5, 0.5);
// Load the view and get the earliest date
first = gnc_prices_dialog_load_view (pdb_dialog->remove_view, pdb_dialog->price_db);
gnc_prices_dialog_load_view (pdb_dialog->remove_view, pdb_dialog->price_db);
gtk_tree_selection_select_all (selection);
g_signal_connect (selection, "changed", G_CALLBACK(selection_changed_cb), pdb_dialog);

View File

@ -636,7 +636,7 @@ gnc_sxed_split_check_account (GncSxEditorDialog *sxed, Split *s,
gnc_commodity *base_cmdty, gboolean *multi_cmdty)
{
gnc_commodity *split_cmdty = NULL;
gnc_numeric split_amount = gnc_numeric_zero ();
gnc_numeric split_amount;
Account *acct = NULL;
GncGUID *acct_guid = NULL;
qof_instance_get (QOF_INSTANCE (s),

View File

@ -514,7 +514,7 @@ gnc_sxed_check_consistent (GncSxEditorDialog2 *sxed)
{
gboolean multi_commodity = FALSE;
gnc_commodity *base_cmdty = NULL;
gint ttVarCount, splitCount;
gint ttVarCount, splitCount = 0;
GList *schedule = NULL;
/* Do checks on validity and such, interrupting the user if
@ -536,8 +536,6 @@ gnc_sxed_check_consistent (GncSxEditorDialog2 *sxed)
* right... ]
*/
ttVarCount = 0;
splitCount = 0;
{
static const int NUM_ITERS_WITH_VARS = 5;
static const int NUM_ITERS_NO_VARS = 1;

View File

@ -913,7 +913,7 @@ budget_total_col_source(Account *account, GtkTreeViewColumn *col,
GtkCellRenderer *cell)
{
GncBudget *budget;
gnc_numeric total = gnc_numeric_zero();
gnc_numeric total;
gchar amtbuff[100]; //FIXME: overkill, where's the #define?
budget = GNC_BUDGET(g_object_get_data(G_OBJECT(col), "budget"));

View File

@ -857,7 +857,6 @@ gnc_plugin_page_register_focus (GncPluginPageRegister *page)
{
if (GNC_IS_PLUGIN_PAGE_REGISTER(page))
{
GncPluginPageRegisterPrivate *priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE(page);
GNCSplitReg *gsr = gnc_plugin_page_register_get_gsr(GNC_PLUGIN_PAGE(page));
gnc_split_reg_focus_on_sheet (gsr);
}
@ -3121,7 +3120,6 @@ gnc_plugin_page_register_set_filter_tooltip (GncPluginPageRegister *page)
ENTER(" ");
priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE(page);
plugin_page = GNC_PLUGIN_PAGE(page);
// filtered start time
if (priv->fd.start_time != 0)

View File

@ -2870,7 +2870,6 @@ gnc_plugin_page_register2_cmd_void_transaction (GtkAction *action,
}
if (xaccTransHasReconciledSplits (trans) || xaccTransHasSplitsInState (trans, CREC))
{
GtkWindow *window = GTK_WINDOW (gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page)));
gnc_error_dialog (NULL, "%s", _("You cannot void a transaction with reconciled or cleared splits."));
LEAVE("trans with reconciled splits");
return;

View File

@ -560,9 +560,6 @@ gsr2_redraw_all_cb (GncTreeViewSplitReg *view, gpointer user_data)
if (gsr->value_label != NULL)
{
char string[256];
QofBook *book = gnc_account_get_book (leader);
GNCPriceDB *pricedb = gnc_pricedb_get_db (book);
gnc_commodity *commodity = xaccAccountGetCommodity (leader);
gnc_commodity *currency = gnc_default_currency ();
print_info = gnc_commodity_print_info (currency, TRUE);
xaccSPrintAmount (string, amount, print_info);

View File

@ -174,9 +174,7 @@ gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y,
gdk_window_get_origin (parent_window, &root_x, &root_y);
screen = gtk_widget_get_screen (GTK_WIDGET (qview));
/* Get a list of toplevel windows */
/* Get a list of toplevel windows */
win_list = gtk_window_list_toplevels ();
/* Look for the gtk-tooltip window, we do this as gtk_widget_get_tooltip_window

View File

@ -584,7 +584,7 @@ gnc_reconcile_interest_xfer_run(startRecnWindowData *data)
GNC_AMOUNT_EDIT(data->end_value) );
gnc_numeric before = gnc_amount_edit_get_amount(
GNC_AMOUNT_EDIT(data->end_value) );
gnc_numeric after = gnc_numeric_zero();
gnc_numeric after;
recnInterestXferWindow( data );
@ -937,6 +937,9 @@ do_popup_menu(RecnWindow *recnData, GdkEventButton *event)
return;
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event);
#else
if (event)
{
button = event->button;
@ -948,9 +951,6 @@ do_popup_menu(RecnWindow *recnData, GdkEventButton *event)
event_time = gtk_get_current_event_time ();
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event);
#else
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time);
#endif
}

View File

@ -544,7 +544,7 @@ gnc_reconcile_interest_xfer_run (startRecnWindowData *data)
GNC_AMOUNT_EDIT(data->end_value));
gnc_numeric before = gnc_amount_edit_get_amount (
GNC_AMOUNT_EDIT(data->end_value));
gnc_numeric after = gnc_numeric_zero();
gnc_numeric after;
recnInterestXferWindow (data);
@ -896,6 +896,9 @@ do_popup_menu (RecnWindow2 *recnData, GdkEventButton *event)
return;
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event);
#else
if (event)
{
button = event->button;
@ -907,9 +910,6 @@ do_popup_menu (RecnWindow2 *recnData, GdkEventButton *event)
event_time = gtk_get_current_event_time ();
}
#if GTK_CHECK_VERSION(3,22,0)
gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent *) event);
#else
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time);
#endif
}

View File

@ -983,12 +983,11 @@ gnc_ab_trans_dialog_templ_list_row_activated_cb(GtkTreeView *view,
GncABTransDialog *td = user_data;
GtkTreeIter iter;
GncABTransTempl *templ;
const gchar *old_name, *new_name;
const gchar *old_account, *new_account;
const gchar *old_bankcode, *new_bankcode;
const gchar *old_purpose, *new_purpose;
const gchar *old_purpose_cont, *new_purpose_cont;
GtkWidget *amount_widget;
const gchar *new_name;
const gchar *new_account;
const gchar *new_bankcode;
const gchar *new_purpose;
const gchar *new_purpose_cont;
const gchar *old_amount_text;
gnc_numeric old_amount, new_amount;
@ -1004,16 +1003,6 @@ gnc_ab_trans_dialog_templ_list_row_activated_cb(GtkTreeView *view,
gtk_tree_model_get(GTK_TREE_MODEL(td->template_list_store), &iter,
TEMPLATE_POINTER, &templ, -1);
/* Get old values */
old_name = gtk_entry_get_text(GTK_ENTRY(td->recp_name_entry));
old_account = gtk_entry_get_text(GTK_ENTRY(td->recp_account_entry));
old_bankcode = gtk_entry_get_text(GTK_ENTRY(td->recp_bankcode_entry));
old_purpose = gtk_entry_get_text(GTK_ENTRY(td->purpose_entry));
old_purpose_cont = gtk_entry_get_text(GTK_ENTRY(td->purpose_cont_entry));
amount_widget = gnc_amount_edit_gtk_entry(GNC_AMOUNT_EDIT(td->amount_edit));
old_amount_text = gtk_entry_get_text(GTK_ENTRY(amount_widget));
old_amount = gnc_amount_edit_get_amount(GNC_AMOUNT_EDIT(td->amount_edit));
/* Get new values */
new_name = gnc_ab_trans_templ_get_recp_name(templ);
new_account = gnc_ab_trans_templ_get_recp_account(templ);

View File

@ -401,7 +401,7 @@ set_commodity_for_combo (GtkComboBox *combo, gnc_commodity *comm)
valid = gtk_tree_model_iter_next (model, &iter);
}
// Not found, set it to first iter
valid = gtk_tree_model_get_iter_first (model, &iter);
gtk_tree_model_get_iter_first (model, &iter);
if (gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT(sort_model), &siter, &iter))
gtk_combo_box_set_active_iter (combo, &siter);
}
@ -829,7 +829,6 @@ CsvImpPriceAssist::preview_settings_delete ()
void
CsvImpPriceAssist::preview_settings_save ()
{
auto title = _("Save the Import Settings.");
auto new_name = price_imp->settings_name();
/* Check if the entry text matches an already existing preset */

View File

@ -1741,7 +1741,6 @@ csv_tximp_acct_match_text_parse (std::string acct_name)
alt_sep = "-";
else
alt_sep = ":";
sep_pos = acct_name.find(sep);
for (sep_pos = acct_name.find(sep); sep_pos != std::string::npos;
sep_pos = acct_name.find(sep))
acct_name.replace (sep_pos, strlen(sep), alt_sep);

View File

@ -639,7 +639,6 @@ void gnc_file_log_replay (GtkWindow *parent)
{
do
{
read_retval = fgets(read_buf, sizeof(read_buf), log_file);
/*DEBUG("Chunk read: %s",read_retval);*/
if (strncmp(record_start_str, read_buf, strlen(record_start_str)) == 0) /* If a record started */
{

View File

@ -673,7 +673,6 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
!found_divider_upper && need_divider_upper)
{
table->model->dividing_row_upper = vcell_loc.virt_row;
found_divider_upper = TRUE;
}
/* If we didn't find the pending transaction, it was removed

View File

@ -549,7 +549,7 @@ gnc_split_register_save_cells (gpointer save_data,
SplitRegister *reg = user_data;
Split *other_split;
gnc_commodity *txn_cur;
gnc_numeric rate = gnc_numeric_zero();
gnc_numeric rate;
g_return_if_fail (sd != NULL);

View File

@ -55,7 +55,7 @@ gnc_split_register_get_rbaln (VirtualLocation virt_loc, gpointer user_data, gboo
SplitRegister *reg = user_data;
Split *split;
SRInfo *info = gnc_split_register_get_info (reg);
gnc_numeric balance = gnc_numeric_zero();
gnc_numeric balance;
Account *account = NULL;
Transaction *trans;
GList *node, *child;

View File

@ -693,8 +693,6 @@ gnc_combo_cell_direct_update (BasicCell *bcell,
}
}
new_pos = *cursor_position;
if (find_pos >= 0)
{
new_pos = find_pos;

View File

@ -462,8 +462,6 @@ gnc_header_event (GtkWidget *widget, GdkEvent *event)
if (event->button.button != 1)
break;
x = event->button.x;
y = event->button.y;
if (header->in_resize)
{

View File

@ -913,7 +913,6 @@ check_popup_height_is_true (GtkWidget *widget,
gpointer user_data)
{
GncItemEdit *item_edit = GNC_ITEM_EDIT(user_data);
GnucashSheet *sheet = item_edit->sheet;
// if a larger font is specified in css for the sheet, the popup returned height value
// on first pop does not reflect the true height but the minimum height so just to be
@ -955,7 +954,6 @@ gnc_item_edit_show_popup (GncItemEdit *item_edit)
gtk_widget_get_allocation (GTK_WIDGET (sheet), &alloc);
view_height = alloc.height;
view_width = alloc.width;
vadj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(sheet));
hadj = gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(sheet));

View File

@ -335,7 +335,7 @@ gnucash_sheet_get_text_cursor_position (GnucashSheet *sheet, const VirtualLocati
x_offset = gnucash_sheet_get_text_offset (sheet, virt_loc,
rect.width, logical_rect.width);
result = pango_layout_xy_to_index (layout,
pango_layout_xy_to_index (layout,
PANGO_SCALE * (sheet->button_x - rect.x - x_offset),
PANGO_SCALE * (height/2), &index, &trailing);
@ -1169,7 +1169,7 @@ gnucash_sheet_draw_cb (GtkWidget *widget, cairo_t *cr, G_GNUC_UNUSED gpointer da
gtk_style_context_restore (context);
//FIXME what should be done with result being TRUE or FALSE
result = gnucash_sheet_draw_internal (sheet, cr, &alloc);
gnucash_sheet_draw_internal (sheet, cr, &alloc);
gnucash_sheet_draw_cursor (sheet->cursor, cr);
return FALSE;
@ -1531,7 +1531,7 @@ gnucash_sheet_button_press_event (GtkWidget *widget, GdkEventButton *event)
return TRUE;
//FIXME does something need to be done if changed_cells is true or false ?
changed_cells = gnucash_sheet_cursor_move (sheet, new_virt_loc);
gnucash_sheet_cursor_move (sheet, new_virt_loc);
if (button_1)
gnucash_sheet_check_grab (sheet);

View File

@ -228,7 +228,7 @@ set_dimensions_pass_one (GnucashSheet *sheet, CellBlock *cursor,
cd->pixel_width = MAX (cd->pixel_width, width);
}
cd = g_table_index (dimensions->cell_dimensions, row, 0);
g_table_index (dimensions->cell_dimensions, row, 0);
dimensions->height += max_height;
}
@ -294,7 +294,6 @@ set_dimensions_pass_two (GnucashSheet *sheet, int default_width)
cd = g_table_index (cd_table, 0, col);
cd->pixel_width += (default_width - width);
width += (default_width - width);
widths[col] = cd->pixel_width;
break;
@ -316,8 +315,6 @@ set_dimensions_pass_two (GnucashSheet *sheet, int default_width)
cd = g_table_index (cd_table, 0, col);
old_width = cd->pixel_width;
cd->pixel_width += (default_width - width);
text = cell->sample_text;
@ -335,7 +332,6 @@ set_dimensions_pass_two (GnucashSheet *sheet, int default_width)
cd->pixel_width = MAX (cd->pixel_width, sample_width);
width += cd->pixel_width - old_width;
widths[col] = cd->pixel_width;
break;

View File

@ -1675,7 +1675,6 @@ Amortization_init (amort_sched_ptr amortsched)
if (pmt == 0.0)
{
s = 0;
amortsched->pve = pv;
}
else
@ -1854,8 +1853,6 @@ Amortization_Schedule (amort_sched_ptr amortsched)
amortsched->schedule.first_yr =
amortyr = (amort_sched_yr_ptr) calloc (1, sizeof (amort_sched_yr));
d = pv;
for (per_cnt = 0, s = 1, j = n; pv != fv; j -= 2, per_cnt++)
{
/* basic equation to compute interest this payment period */
@ -1999,8 +1996,6 @@ Amortization_Schedule (amort_sched_ptr amortsched)
amortsched->schedule.first_yr =
amortyr = (amort_sched_yr_ptr) calloc (1, sizeof (amort_sched_yr));
d = pv;
/* set advnaced payment */
adv_pmt = amortsched->fixed_pmt;

View File

@ -568,7 +568,6 @@ gnc_exp_parser_parse_separate_vars (const char * expression,
newVars = parser_get_vars( pe );
for ( ; newVars ; newVars = newVars->next_var )
{
pnum = newVars->value;
if ( g_hash_table_lookup_extended( varHash, newVars->variable_name,
&maybeKey, &maybeValue ) )
{

View File

@ -1857,7 +1857,6 @@ integer_to_words(gint64 val)
if (val > 0)
{
this_part = val;
val -= this_part;
g_string_append(result, gettext(small_numbers[this_part]));
g_string_append_c(result, ' ');
}

View File

@ -1134,7 +1134,6 @@ gboolean gnc_option_get_range_info(GNCOption *option,
/* step size */
value = SCM_CAR(list);
list = SCM_CDR(list);
if (!scm_is_number(value))
return FALSE;
@ -1694,7 +1693,7 @@ gnc_commit_option(GNCOption *option)
{
SCM oops;
char *section, *name;
const char *message;
const char *message = NULL;
const char *format = _("There is a problem with option %s:%s.\n%s");
const char *bad_value = _("Invalid option value");
@ -1711,13 +1710,14 @@ gnc_commit_option(GNCOption *option)
name ? name : "(null)",
bad_value);
}
message = gnc_scm_to_utf8_string (oops);
retval = g_strdup_printf(format,
section ? section : "(null)",
name ? name : "(null)",
message ? message : "(null)");
else
{
message = gnc_scm_to_utf8_string (oops);
retval = g_strdup_printf(format,
section ? section : "(null)",
name ? name : "(null)",
message ? message : "(null)");
}
if (name != NULL)
free(name);
if (section != NULL)

View File

@ -205,7 +205,7 @@ set_options(dbi_conn conn, const PairVec& options)
if (result < 0)
{
const char *msg = nullptr;
int err = dbi_conn_error(conn, &msg);
dbi_conn_error(conn, &msg);
PERR("Error setting %s option to %s: %s", opt, val, msg);
throw std::runtime_error(msg);
}

View File

@ -542,8 +542,8 @@ GncDbiSqlConnection::quote_string (const std::string& unquoted_str)
char* quoted_str;
size_t size;
size = dbi_conn_quote_string_copy (m_conn, unquoted_str.c_str(),
&quoted_str);
dbi_conn_quote_string_copy (m_conn, unquoted_str.c_str(),
&quoted_str);
if (quoted_str == nullptr)
return std::string{""};
std::string retval{quoted_str};

View File

@ -144,7 +144,7 @@ std::string
GncDbiSqlResult::IteratorImpl::get_string_at_col(const char* col) const
{
auto type = dbi_result_get_field_type (m_inst->m_dbi_result, col);
auto attrs = dbi_result_get_field_attribs (m_inst->m_dbi_result, col);
dbi_result_get_field_attribs (m_inst->m_dbi_result, col);
if(type != DBI_TYPE_STRING)
throw (std::invalid_argument{"Requested string from non-string column."});
auto strval = dbi_result_get_string(m_inst->m_dbi_result, col);
@ -160,7 +160,7 @@ GncDbiSqlResult::IteratorImpl::get_time64_at_col (const char* col) const
{
auto result = (dbi_result_t*) (m_inst->m_dbi_result);
auto type = dbi_result_get_field_type (result, col);
auto attrs = dbi_result_get_field_attribs (result, col);
dbi_result_get_field_attribs (result, col);
if (type != DBI_TYPE_DATETIME)
throw (std::invalid_argument{"Requested time64 from non-time64 column."});
#if HAVE_LIBDBI_TO_LONGLONG

View File

@ -244,8 +244,7 @@ GncSqlBillTermBackend::load_all (GncSqlBackend* sql_be)
for (auto row : *result)
{
auto pBillTerm =
load_single_billterm (sql_be, row, l_billterms_needing_parents);
load_single_billterm (sql_be, row, l_billterms_needing_parents);
}
delete result;
std::string pkey(col_table[0]->name());

View File

@ -333,7 +333,7 @@ GncSqlBudgetBackend::load_all (GncSqlBackend* sql_be)
auto stmt = sql_be->create_statement_from_sql(sql);
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
auto b = load_single_budget (sql_be, row);
load_single_budget (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -134,7 +134,7 @@ GncSqlCustomerBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncCustomer* pCustomer = load_single_customer (sql_be, row);
load_single_customer (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -118,7 +118,7 @@ GncSqlEmployeeBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncEmployee* pEmployee = load_single_employee (sql_be, row);
load_single_employee (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -203,7 +203,7 @@ GncSqlEntryBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncEntry* pEntry = load_single_entry (sql_be, row);
load_single_entry (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -141,7 +141,7 @@ GncSqlInvoiceBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncInvoice* pInvoice = load_single_invoice (sql_be, row);
load_single_invoice (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -113,7 +113,7 @@ GncSqlJobBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncJob* pJob = load_single_job (sql_be, row);
load_single_job (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -115,7 +115,7 @@ GncSqlOrderBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncOrder* pOrder = load_single_order (sql_be, row);
load_single_order (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -508,7 +508,7 @@ GncSqlBackend::sync(QofBook* book)
else
{
set_error (ERR_BACKEND_SERVER_ERR);
is_ok = m_conn->rollback_transaction ();
m_conn->rollback_transaction ();
}
finish_progress();
LEAVE ("book=%p", book);

View File

@ -216,7 +216,6 @@ load_single_split (GncSqlBackend* sql_be, GncSqlRow& row)
if (guid_equal (guid, guid_null ()))
{
PWARN ("Bad GUID, creating new");
bad_guid = TRUE;
split_guid = guid_new_return ();
}
else

View File

@ -123,7 +123,7 @@ GncSqlVendorBackend::load_all (GncSqlBackend* sql_be)
auto result = sql_be->execute_select_statement(stmt);
for (auto row : *result)
GncVendor* pVendor = load_single_vendor (sql_be, row);
load_single_vendor (sql_be, row);
std::string pkey(col_table[0]->name());
sql = "SELECT DISTINCT ";

View File

@ -3710,7 +3710,6 @@ xaccAccountCountSplits (const Account *acc, gboolean include_children)
{
gint64 nr, i;
nr = 0;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), 0);
nr = g_list_length(xaccAccountGetSplitList(acc));

View File

@ -151,7 +151,6 @@ scrub_other_link (GNCLot *from_lot, Split *ll_from_split,
// At this point ll_to_split and real_from_split should have the same value
// If not, flag a warning and skip to the next iteration
to_val = xaccSplitGetValue (ll_to_split);
from_val = xaccSplitGetValue (ll_from_split);
real_from_val = xaccSplitGetValue (real_from_split);
if (!gnc_numeric_equal (real_from_val, to_val))
{

View File

@ -532,7 +532,7 @@ xaccSplitComputeCapGains(Split *split, Account *gain_acc)
GNCPolicy *pcy;
gnc_commodity *currency = NULL;
gnc_numeric zero = gnc_numeric_zero();
gnc_numeric value = zero;
gnc_numeric value;
gnc_numeric frac;
gnc_numeric opening_amount, opening_value;
gnc_numeric lot_amount, lot_value;

View File

@ -769,7 +769,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
is_regex = scm_is_true (scm);
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_string (scm)) break;
matchstring = gnc_scm_to_utf8_string (scm);
@ -790,7 +789,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
options = gnc_query_scm2date (scm);
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (scm_is_null (scm))
break;
date = scm_to_int64 (scm);
@ -810,7 +808,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
options = gnc_query_scm2numericop (scm);
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (!gnc_query_numeric_p (scm))
break;
val = gnc_query_scm2numeric (scm);
@ -830,7 +827,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
options = gnc_query_scm2guid (scm);
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_list (scm))
break;
guids = gnc_scm2guid_glist (scm);
@ -845,7 +841,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
gint64 val;
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (scm_is_null (scm))
break;
val = scm_to_int64 (scm);
@ -858,7 +853,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
double val;
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_number (scm))
break;
val = scm_to_double (scm);
@ -871,7 +865,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
gboolean val;
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_bool (scm))
break;
val = scm_is_true (scm);
@ -891,7 +884,6 @@ gnc_scm2query_term_query_v2 (SCM qt_scm)
options = gnc_query_scm2char (scm);
scm = SCM_CAR (qt_scm);
qt_scm = SCM_CDR (qt_scm);
if (!scm_is_string (scm))
break;
char_list = gnc_scm_to_utf8_string (scm);
@ -1014,7 +1006,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
break;
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
end = scm_to_int64 (scm);
xaccQueryAddDateMatchTT (q, use_start, start, use_end, end, QOF_QUERY_OR);
@ -1047,7 +1038,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
if (scm_is_null (query_term_scm))
break;
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
val = gnc_numeric_create (scm_to_int64(scm_numerator(scm)),
scm_to_int64(scm_denominator(scm)));
@ -1099,7 +1089,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
}
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
account_guids = gnc_scm2guid_glist (scm);
@ -1137,7 +1126,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
break;
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
matchstring = gnc_scm_to_utf8_string (scm);
if (!g_strcmp0 (pr_type, "pr-action"))
@ -1184,7 +1172,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
break;
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
how = gnc_scm2cleared_match_how (scm);
xaccQueryAddClearedMatch (q, how, QOF_QUERY_OR);
@ -1200,7 +1187,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
break;
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
if (gnc_scm2balance_match_how (scm, &how) == FALSE)
break;
@ -1223,7 +1209,6 @@ gnc_scm2query_term_query_v1 (SCM query_term_scm)
/* id type */
scm = SCM_CAR (query_term_scm);
query_term_scm = SCM_CDR (query_term_scm);
id_type = (QofIdType) gnc_scm_to_utf8_string (scm);
xaccQueryAddGUIDMatch (q, &guid, id_type, QOF_QUERY_OR);

View File

@ -150,7 +150,6 @@ gnc_ab_trans_templ_list_new_from_book(QofBook *b)
auto n_func = [frame](const char* key)
{ auto slot = frame->get_slot({key});
return slot == nullptr ? gnc_numeric_zero() : slot->get<gnc_numeric>();};
auto amt_slot = frame->get_slot({TT_AMOUNT});
auto templ = new _GncABTransTempl (c_func(TT_NAME), c_func(TT_RNAME),
c_func(TT_RACC), c_func(TT_RBCODE),
n_func(TT_AMOUNT), c_func(TT_PURPOS),

View File

@ -1495,7 +1495,6 @@ gnc_pricedb_process_removal_list (GNCPriceDB *db, GDate *fiscal_end_date,
gboolean save_first_price = FALSE;
gint saved_test_value = 0, next_test_value = 0;
GNCPrice *cloned_price = NULL;
GDateMonth fiscal_month_end = g_date_get_month (fiscal_end_date);
GDateMonth fiscal_month_start;
GDate *tmp_date = g_date_new_dmy (g_date_get_day (fiscal_end_date),
g_date_get_month (fiscal_end_date),
@ -1527,7 +1526,6 @@ gnc_pricedb_process_removal_list (GNCPriceDB *db, GDate *fiscal_end_date,
if (save_first_price == TRUE)
{
clone_price (&cloned_price, item->data);
save_first_price = FALSE;
continue;
}

View File

@ -435,9 +435,6 @@ namespace IANAParser
time_count = *(endian_swap(reinterpret_cast<uint32_t*>(tzh.timecnt)));
type_count = *(endian_swap(reinterpret_cast<uint32_t*>(tzh.typecnt)));
char_count = *(endian_swap(reinterpret_cast<uint32_t*>(tzh.charcnt)));
isgmt_count = *(endian_swap(reinterpret_cast<uint32_t*>(tzh.ttisgmtcnt)));
isstd_count = *(endian_swap(reinterpret_cast<uint32_t*>(tzh.ttisstdcnt)));
leap_count = *(endian_swap(reinterpret_cast<uint32_t*>(tzh.leapcnt)));
transition_size = 8;
}
fb_index += sizeof(tzh);

View File

@ -953,7 +953,6 @@ gncInvoiceGetTotalInternal(GncInvoice *invoice, gboolean use_value,
if (!invoice) return gnc_numeric_zero();
denom = gnc_commodity_get_fraction(gncInvoiceGetCurrency(invoice));
total = gncInvoiceGetNetAndTaxesInternal(invoice, use_value, use_tax? &taxes : NULL, use_payment_type, type);
if (use_tax)
@ -998,7 +997,7 @@ AccountValueList *gncInvoiceGetTotalTaxList (GncInvoice *invoice)
AccountValueList *taxes;
if (!invoice) return NULL;
unused = gncInvoiceGetNetAndTaxesInternal(invoice, FALSE, &taxes, FALSE, 0);
gncInvoiceGetNetAndTaxesInternal(invoice, FALSE, &taxes, FALSE, 0);
return taxes;
}

View File

@ -212,8 +212,7 @@ qof_book_get_property (GObject* object,
qof_instance_get_path_kvp (QOF_INSTANCE (book), value, {"fy_end"});
break;
case PROP_AB_TEMPLATES:
key = const_cast<char*>(AB_KEY "/" AB_TEMPLATES);
qof_instance_get_path_kvp (QOF_INSTANCE (book), value, {"AB_KEY", "AB_TEMPLATES"});
qof_instance_get_path_kvp (QOF_INSTANCE (book), value, {"AB_KEY", "AB_TEMPLATES"});
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);

View File

@ -937,7 +937,6 @@ void
qof_instance_set (QofInstance *inst, const gchar *first_prop, ...)
{
va_list ap;
QofInstancePrivate *priv = GET_PRIVATE(inst);
g_return_if_fail (QOF_IS_INSTANCE (inst));
qof_instance_set_dirty (inst);

View File

@ -803,7 +803,6 @@ static GList * qof_query_run_internal (QofQuery *q,
g_list_free(matching_objects);
matching_objects = NULL;
}
object_count = q->max_results;
}
q->changed = 0;