gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Tue Oct 16 12:00:34 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/08e28bfc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/893383ce (commit)
	from  https://github.com/Gnucash/gnucash/commit/e374da8a (commit)



commit 08e28bfc811c0fdbd7ba6c465c6b3db334767318
Merge: e374da8 893383c
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Oct 16 08:55:38 2018 -0700

    Merge Di Mang's Double-semicolon fix into maint.


commit 893383ce9b308279551d01cb53a5c857df40a048
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Sun Sep 30 19:10:50 2018 +0200

    removing double semicolons at the end of lines

diff --git a/gnucash/gnome-search/search-reconciled.c b/gnucash/gnome-search/search-reconciled.c
index 565f377..31f3866 100644
--- a/gnucash/gnome-search/search-reconciled.c
+++ b/gnucash/gnome-search/search-reconciled.c
@@ -111,7 +111,7 @@ gnc_search_reconciled_class_init (GNCSearchReconciledClass *klass)
 static void
 gnc_search_reconciled_init (GNCSearchReconciled *o)
 {
-    o->how = QOF_CHAR_MATCH_ANY;;
+    o->how = QOF_CHAR_MATCH_ANY;
     o->value = CLEARED_NO;
 }
 
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index cfd33fa..915bd6c 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -3455,7 +3455,7 @@ gnc_option_set_ui_value_number_range (GNCOption *option, gboolean use_default,
                                       GtkWidget *widget, SCM value)
 {
     GtkSpinButton *spinner;
-    gdouble d_value;;
+    gdouble d_value;
 
     spinner = GTK_SPIN_BUTTON(widget);
 
diff --git a/gnucash/gnome-utils/dialog-tax-table.c b/gnucash/gnome-utils/dialog-tax-table.c
index 9212fa5..9f9b8a8 100644
--- a/gnucash/gnome-utils/dialog-tax-table.c
+++ b/gnucash/gnome-utils/dialog-tax-table.c
@@ -481,7 +481,7 @@ tax_table_window_refresh (TaxTableWindow *ttw)
             gtk_tree_path_free(path);
         }
     }
-    ;;
+
     tax_table_entries_refresh (ttw);
     /* select_row() above will refresh the entries window */
 }
diff --git a/gnucash/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c
index b6d31ba..1f50547 100644
--- a/gnucash/gnome-utils/gnc-dense-cal.c
+++ b/gnucash/gnome-utils/gnc-dense-cal.c
@@ -884,7 +884,7 @@ gnc_dense_cal_draw(GtkWidget *widget, cairo_t *cr, gpointer user_data)
 
     dcal = GNC_DENSE_CAL(user_data);
 
-    cairo_save (cr);;
+    cairo_save (cr);
     cairo_set_source_surface (cr, dcal->surface, 0, 0);
     cairo_paint (cr);
     cairo_restore (cr);
diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c
index 06597b3..d480d40 100644
--- a/gnucash/gnome/gnc-plugin-page-sx-list.c
+++ b/gnucash/gnome/gnc-plugin-page-sx-list.c
@@ -485,7 +485,7 @@ gnc_plugin_page_sx_list_create_widget (GncPluginPage *plugin_page)
 
     /* Add vbox and label */
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);;
+    gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
     gtk_paned_pack2( GTK_PANED(widget), vbox, TRUE, FALSE);
 
     label = gtk_label_new(NULL);
diff --git a/libgnucash/backend/sql/gnc-budget-sql.cpp b/libgnucash/backend/sql/gnc-budget-sql.cpp
index 826e56d..564c3db 100644
--- a/libgnucash/backend/sql/gnc-budget-sql.cpp
+++ b/libgnucash/backend/sql/gnc-budget-sql.cpp
@@ -258,7 +258,7 @@ save_budget_amounts (GncSqlBackend* sql_be, GncBudget* budget)
     GList* node;
     budget_amount_info_t info;
     guint num_periods;
-    gboolean is_ok = TRUE;;
+    gboolean is_ok = TRUE;
 
     g_return_val_if_fail (sql_be != NULL, FALSE);
     g_return_val_if_fail (budget != NULL, FALSE);
diff --git a/libgnucash/backend/sql/gnc-transaction-sql.cpp b/libgnucash/backend/sql/gnc-transaction-sql.cpp
index 7fa0f94..16f9820 100644
--- a/libgnucash/backend/sql/gnc-transaction-sql.cpp
+++ b/libgnucash/backend/sql/gnc-transaction-sql.cpp
@@ -715,7 +715,7 @@ GncSqlTransBackend::load_all (GncSqlBackend* sql_be)
 {
     g_return_if_fail (sql_be != NULL);
 
-    auto root = gnc_book_get_root_account (sql_be->book());;
+    auto root = gnc_book_get_root_account (sql_be->book());
     gnc_account_foreach_descendant(root, (AccountCb)xaccAccountBeginEdit,
                                    nullptr);
     query_transactions (sql_be, "");
diff --git a/libgnucash/backend/xml/io-example-account.cpp b/libgnucash/backend/xml/io-example-account.cpp
index 558effa..80572b0 100644
--- a/libgnucash/backend/xml/io-example-account.cpp
+++ b/libgnucash/backend/xml/io-example-account.cpp
@@ -402,7 +402,7 @@ gboolean
 gnc_write_example_account (GncExampleAccount* gea, const gchar* filename)
 {
     FILE* out;
-    sixtp_gdv2 data = { 0 };;
+    sixtp_gdv2 data = { 0 };
 
     out = g_fopen (filename, "w");
     if (out == NULL)
diff --git a/libgnucash/backend/xml/io-gncxml-v1.cpp b/libgnucash/backend/xml/io-gncxml-v1.cpp
index 4a605ff..ef3ad33 100644
--- a/libgnucash/backend/xml/io-gncxml-v1.cpp
+++ b/libgnucash/backend/xml/io-gncxml-v1.cpp
@@ -913,7 +913,7 @@ kvp_frame_fail_handler (gpointer data_for_children,
 static void
 kvp_frame_result_cleanup (sixtp_child_result* cr)
 {
-    auto f = static_cast<KvpFrame*> (cr->data);;
+    auto f = static_cast<KvpFrame*> (cr->data);
     if (f) delete f;
 }
 
diff --git a/libgnucash/engine/Transaction.c b/libgnucash/engine/Transaction.c
index d6041b3..cc83775 100644
--- a/libgnucash/engine/Transaction.c
+++ b/libgnucash/engine/Transaction.c
@@ -2370,7 +2370,7 @@ xaccTransGetDate (const Transaction *trans)
 time64
 xaccTransGetDateEntered (const Transaction *trans)
 {
-    return trans ? trans->date_entered : 0;;
+    return trans ? trans->date_entered : 0;
 }
 /*################## Added for Reg2 #################*/
 
diff --git a/libgnucash/engine/gnc-timezone.cpp b/libgnucash/engine/gnc-timezone.cpp
index 01325b4..275e234 100644
--- a/libgnucash/engine/gnc-timezone.cpp
+++ b/libgnucash/engine/gnc-timezone.cpp
@@ -314,7 +314,7 @@ using std::to_string;
 #include <istream>
 #include <cstdlib>
 
-using boost::posix_time::ptime;;
+using boost::posix_time::ptime;
 //To enable using Transition with different meanings for IANA files
 //and for DSTRules.
 namespace IANAParser
diff --git a/libgnucash/engine/test/test-gnc-uri-utils.c b/libgnucash/engine/test/test-gnc-uri-utils.c
index b2bd4de..3d162db 100644
--- a/libgnucash/engine/test/test-gnc-uri-utils.c
+++ b/libgnucash/engine/test/test-gnc-uri-utils.c
@@ -301,7 +301,7 @@ test_gnc_uri_is_file_protocol()
         gboolean tis_file_protocol;
 
         tis_file_protocol = gnc_uri_is_file_protocol( strs[i].protocol );
-        g_assert_true ( tis_file_protocol == strs[i].is_file_protocol );;
+        g_assert_true ( tis_file_protocol == strs[i].is_file_protocol );
     }
 }
 



Summary of changes:
 gnucash/gnome-search/search-reconciled.c       | 2 +-
 gnucash/gnome-utils/dialog-options.c           | 2 +-
 gnucash/gnome-utils/dialog-tax-table.c         | 2 +-
 gnucash/gnome-utils/gnc-dense-cal.c            | 2 +-
 gnucash/gnome/gnc-plugin-page-sx-list.c        | 2 +-
 libgnucash/backend/sql/gnc-budget-sql.cpp      | 2 +-
 libgnucash/backend/sql/gnc-transaction-sql.cpp | 2 +-
 libgnucash/backend/xml/io-example-account.cpp  | 2 +-
 libgnucash/backend/xml/io-gncxml-v1.cpp        | 2 +-
 libgnucash/engine/Transaction.c                | 2 +-
 libgnucash/engine/gnc-timezone.cpp             | 2 +-
 libgnucash/engine/test/test-gnc-uri-utils.c    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)



More information about the gnucash-changes mailing list