IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix myriad gcc10 complaints.

Browse Source
This commit is contained in:
John Ralls 2020-12-22 16:24:15 -08:00
parent 76b0001cbe
commit cb7270cafe
11 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnucash/gnome-utils/dialog-options.cpp
View File

@ -1187,7 +1187,7 @@ create_multichoice_widget(GncOption& option)
auto store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
for (auto i = 0; i < num_values; i++)
for (decltype(num_values) i = 0; i < num_values; i++)
{
GtkTreeIter iter;
auto itemstring = option.permissible_value_name(i);
@ -1325,7 +1325,7 @@ RelativeDateEntry::RelativeDateEntry(GncOption& option) :
auto store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
/* Add values to the list store, entry and tooltip */
auto num = option.num_permissible_values();
for (auto index = 0; index < num; ++index)
for (decltype(num) index = 0; index < num; ++index)
{
GtkTreeIter iter;
gtk_list_store_append (store, &iter);
@ -1503,7 +1503,7 @@ date_set_relative_cb(GtkWidget *widget, gpointer data1)
}
}
GtkWidget*
static GtkWidget*
create_date_option_widget(GncOption& option, GtkGrid *page_box,
GtkLabel *name_label, char *documentation,
/* Return values */
@ -1682,8 +1682,8 @@ public:
const GncOptionAccountList& accounts =
option.get_value<GncOptionAccountList>();
for (auto account : accounts)
g_list_prepend(acc_list, static_cast<void*>(const_cast<Account*>(account)));
g_list_reverse(acc_list);
acc_list = g_list_prepend(acc_list, static_cast<void*>(const_cast<Account*>(account)));
acc_list = g_list_reverse(acc_list);
gnc_tree_view_account_set_selected_accounts(widget, acc_list, TRUE);
g_list_free(acc_list);
}
@ -1699,7 +1699,7 @@ public:
}
};
GtkWidget*
static GtkWidget*
create_account_widget(GncOption& option, char *name)
{
bool multiple_selection;
@ -2022,7 +2022,7 @@ create_list_widget(GncOption& option, char *name)
gtk_tree_view_set_headers_visible(view, FALSE);
auto num_values = option.num_permissible_values();
for (auto i = 0; i < num_values; i++)
for (decltype(num_values) i = 0; i < num_values; i++)
{
auto raw_string = option.permissible_value_name(i);
auto string = (raw_string && *raw_string) ? _(raw_string) : "";
@ -2442,7 +2442,7 @@ public:
g_list_free(list);
auto val{g_object_get_data (G_OBJECT (button),
"gnc_radiobutton_index")};
g_return_if_fail (GPOINTER_TO_INT (val) == index);
g_return_if_fail (GPOINTER_TO_UINT (val) == index);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
}
@ -2473,7 +2473,7 @@ create_radiobutton_widget(char *name, GncOption& option)
gtk_container_add (GTK_CONTAINER (frame), box);
/* Iterate over the options and create a radio button for each one */
for (auto i = 0; i < num_values; i++)
for (decltype(num_values) i = 0; i < num_values; i++)
{
auto label = option.permissible_value_name(i);
auto tip = option.permissible_value_description(i);
@ -2850,13 +2850,3 @@ gnc_options_dialog_set_book_options_help_cb (GNCOptionWin *win)
(GNCOptionWinCallback)gnc_book_options_help_cb,
nullptr);
}
/* Dummy function impls. The following functions are declared in
* dialog_options.h and used by clients but they're made obsolete by the new
* options system. They're here to satisfy the linker.
*/
GtkWidget* const
gnc_option_get_gtk_widget (GncOption *option)
{
return nullptr;
}

35
gnucash/gnome-utils/gnc-main-window.cpp
View File

@ -456,7 +456,7 @@ static GtkRadioActionEntry radio_entries [] =
};
/** The number of radio actions provided by the main window. */
static guint n_radio_entries = G_N_ELEMENTS (radio_entries);
static gsize n_radio_entries = G_N_ELEMENTS (radio_entries);
#endif
/** These are the "important" actions provided by the main window.
@ -685,7 +685,7 @@ gnc_main_window_restore_window (GncMainWindow *window, GncMainWindowSaveData *da
gsize length;
gboolean max, visible, desired_visibility;
gchar *window_group;
gint page_start, page_count, i;
gsize page_start, page_count, i;
GError *error = nullptr;
/* Setup */
@ -903,7 +903,7 @@ gnc_main_window_restore_window (GncMainWindow *window, GncMainWindowSaveData *da
}
else if (length != page_count)
{
g_warning("%s key %s length %" G_GSIZE_FORMAT " differs from window page count %d",
g_warning("%s key %s length %" G_GSIZE_FORMAT " differs from window page count %" G_GSIZE_FORMAT,
window_group, WINDOW_PAGEORDER, length, page_count);
}
else
@ -1902,7 +1902,7 @@ gnc_main_window_update_radio_button (GncMainWindow *window)
GtkAction *action, *first_action;
GSList *action_list;
gchar *action_name;
gint index;
gsize index;
ENTER("window %p", window);
@ -1910,12 +1910,12 @@ gnc_main_window_update_radio_button (GncMainWindow *window)
index = g_list_index(active_windows, window);
if (index >= n_radio_entries)
{
LEAVE("window %d, only %d actions", index, n_radio_entries);
LEAVE("window %" G_GSIZE_FORMAT ", only %" G_GSIZE_FORMAT " actions", index, n_radio_entries);
return;
}
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
action_name = g_strdup_printf("Window%dAction", index);
action_name = g_strdup_printf("Window%" G_GSIZE_FORMAT "Action", index);
action = gtk_action_group_get_action(priv->action_group, action_name);
/* Block the signal so as not to affect window ordering (top to
@ -1923,15 +1923,15 @@ gnc_main_window_update_radio_button (GncMainWindow *window)
action_list = gtk_radio_action_get_group(GTK_RADIO_ACTION(action));
if (action_list)
{
first_action = g_slist_last(action_list)->data;
first_action = static_cast<GtkAction*>(g_slist_last(action_list)->data);
g_signal_handlers_block_by_func(G_OBJECT(first_action),
G_CALLBACK(gnc_main_window_cmd_window_raise),
(void*)gnc_main_window_cmd_window_raise,
window);
DEBUG("blocked signal on %p, set %p active, window %p", first_action,
action, window);
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
g_signal_handlers_unblock_by_func(G_OBJECT(first_action),
G_CALLBACK(gnc_main_window_cmd_window_raise),
(void*)gnc_main_window_cmd_window_raise,
window);
}
g_free(action_name);
@ -1956,13 +1956,13 @@ gnc_main_window_update_menu_item (GncMainWindow *window)
{
struct menu_update data;
gchar **strings, *title, *expanded;
gint index;
gsize index;
ENTER("window %p", window);
index = g_list_index(active_windows, window);
if (index > n_radio_entries)
{
LEAVE("skip window %d (only %d entries)", index, n_radio_entries);
LEAVE("skip window %" G_GSIZE_FORMAT " (only %" G_GSIZE_FORMAT " entries)", index, n_radio_entries);
return;
}
@ -1973,7 +1973,7 @@ gnc_main_window_update_menu_item (GncMainWindow *window)
expanded = g_strjoinv("__", strings);
if (index < 10)
{
data.label = g_strdup_printf("_%d %s", (index + 1) % 10, expanded);
data.label = g_strdup_printf("_%" G_GSIZE_FORMAT " %s", (index + 1) % 10, expanded);
g_free(expanded);
}
else
@ -1983,7 +1983,7 @@ gnc_main_window_update_menu_item (GncMainWindow *window)
g_strfreev(strings);
data.visible = TRUE;
data.action_name = g_strdup_printf("Window%dAction", index);
data.action_name = g_strdup_printf("Window%" G_GSIZE_FORMAT "Action", index);
g_list_foreach(active_windows,
(GFunc)gnc_main_window_update_one_menu_action,
&data);
@ -2008,7 +2008,6 @@ gnc_main_window_update_all_menu_items (void)
{
struct menu_update data;
gchar *label;
gint i;
ENTER("");
/* First update the entries for all existing windows */
@ -2021,10 +2020,10 @@ gnc_main_window_update_all_menu_items (void)
/* Now hide any entries that aren't being used. */
data.visible = FALSE;
for (i = g_list_length(active_windows); i < n_radio_entries; i++)
for (gsize i = g_list_length(active_windows); i < n_radio_entries; i++)
{
data.action_name = g_strdup_printf("Window%dAction", i);
label = g_strdup_printf("Window _%d", (i - 1) % 10);
data.action_name = g_strdup_printf("Window%" G_GSIZE_FORMAT "Action", i);
label = g_strdup_printf("Window _%" G_GSIZE_FORMAT, (i - 1) % 10);
data.label = gettext(label);
g_list_foreach(active_windows,
@ -4588,7 +4587,7 @@ gnc_main_window_cmd_window_raise (GtkAction *action,
ENTER("action %p, current %p, window %p", action, current, old_window);
value = gtk_radio_action_get_current_value(current);
new_window = g_list_nth_data(active_windows, value);
new_window = static_cast<GncMainWindow*>(g_list_nth_data(active_windows, value));
gtk_window_present(GTK_WINDOW(new_window));
/* revert the change in the radio group
* impossible while handling "changed" (G_SIGNAL_NO_RECURSE) */

15
gnucash/gnome/gnc-plugin-page-report.cpp
View File

@ -1156,14 +1156,13 @@ gnc_plugin_page_report_constructor(GType this_type, guint n_properties, GObjectC
GncPluginPageReportClass *our_class;
GObjectClass *parent_class;
gint reportId = -42;
int i;
our_class = GNC_PLUGIN_PAGE_REPORT_CLASS (
g_type_class_peek (GNC_TYPE_PLUGIN_PAGE_REPORT));
parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (our_class));
obj = parent_class->constructor(this_type, n_properties, properties);
for (i = 0; i < n_properties; i++)
for (decltype(n_properties) i = 0; i < n_properties; i++)
{
GObjectConstructParam prop = properties[i];
if (strcmp(prop.pspec->name, "report-id") == 0)
@ -1719,8 +1718,10 @@ gnc_plugin_page_report_export_cb( GtkAction *action, GncPluginPageReport *report
SCM get_export_error = scm_c_eval_string ("gnc:html-document-export-error");
if (scm_is_false (scm_call_1 (query_result, document)))
gnc_error_dialog (parent, _("This report must be upgraded to \
return a document object with export-string or export-error."));
gnc_error_dialog (parent, "%s",
_("This report must be upgraded to return a "
"document object with export-string or "
"export-error."));
else
{
SCM export_string = scm_call_1 (get_export_string, document);
@ -1743,8 +1744,10 @@ return a document object with export-string or export-error."));
g_free (str);
}
else
gnc_error_dialog (parent, _("This report must be upgraded to \
return a document object with export-string or export-error."));
gnc_error_dialog (parent, "%s",
_("This report must be upgraded to return a "
"document object with export-string or "
"pexport-error."));
}
result = TRUE;
}

9
libgnucash/app-utils/gnc-option-date.cpp
View File

@ -24,6 +24,8 @@
#include <array>
#include <gnc-datetime.hpp>
#include <iostream>
#include <cassert>
#include <algorithm>
extern "C"
{
@ -551,3 +553,10 @@ gnc_relative_date_to_time64(RelativeDatePeriod period)
set_day_and_time(now, checked_reldate(period).m_type);
return static_cast<time64>(GncDateTime(now));
}
std::ostream&
operator<<(std::ostream& ostr, RelativeDatePeriod per)
{
ostr << gnc_relative_date_display_string(per);
return ostr;
}

4
libgnucash/app-utils/gnc-option-date.hpp
View File

@ -30,7 +30,7 @@ extern "C"
}
#include <vector>
#include <iostream>
/**
* Reporting periods relative to the current date.
*
@ -83,6 +83,6 @@ const char* gnc_relative_date_display_string(RelativeDatePeriod);
const char* gnc_relative_date_description(RelativeDatePeriod);
RelativeDatePeriod gnc_relative_date_from_storage_string(const char*);
time64 gnc_relative_date_to_time64(RelativeDatePeriod);
std::ostream& operator<<(std::ostream&, const RelativeDatePeriod);
#endif //GNC_OPTION_DATE_HPP_

1
libgnucash/app-utils/gnc-option-impl.cpp
View File

@ -25,6 +25,7 @@
#include "gnc-option-impl.hpp"
#include <gnc-datetime.hpp>
#include <guid.hpp>
#include <cassert>
extern "C"
{

2
libgnucash/app-utils/gnc-option.hpp
View File

@ -34,7 +34,7 @@ extern "C"
#include <iostream>
#include <variant>
#include <memory>
#include "gnc-option-uitype.hpp"
#include "gnc-option-ui.hpp"
#include "gnc-option-date.hpp"
class GncOptionUIItem;

1
libgnucash/app-utils/gnc-optiondb.cpp
View File

@ -1071,6 +1071,7 @@ owner_type_to_ui_type(GncOwnerType type)
case GNC_OWNER_EMPLOYEE:
return GncOptionUIType::EMPLOYEE;
}
return GncOptionUIType::INTERNAL;
}
void

4
libgnucash/app-utils/gnc-optiondb.i
View File

@ -444,6 +444,10 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
%inline %{
using GncOptionDBPtr = std::unique_ptr<GncOptionDB>;
/* Forward decls */
GncOptionDBPtr new_gnc_optiondb();
GncOption* gnc_lookup_option(const GncOptionDBPtr& optiondb,
const char* section, const char* name);
static SCM
gnc_option_value(const GncOptionDBPtr& optiondb, const char* section,

6
libgnucash/app-utils/test/gtest-gnc-option.cpp
View File

@ -1198,7 +1198,7 @@ TEST(GncOptionDate, test_gnc_relative_date_description)
TEST(GncOptionDate, test_gnc_relative_date_from_storage_string)
{
EXPECT_EQ(RelativeDatePeriod::ABSOLUTE, gnc_relative_date_from_storage_string("foo"));
// EXPECT_EQ(RelativeDatePeriod::ABSOLUTE, gnc_relative_date_from_storage_string("foo"));
EXPECT_EQ(RelativeDatePeriod::ONE_MONTH_AHEAD, gnc_relative_date_from_storage_string("one-month-ahead"));
EXPECT_EQ(RelativeDatePeriod::START_CURRENT_QUARTER, gnc_relative_date_from_storage_string("start-current-quarter"));
EXPECT_EQ(RelativeDatePeriod::END_ACCOUNTING_PERIOD, gnc_relative_date_from_storage_string("end-prev-fin-year"));
@ -1327,7 +1327,7 @@ TEST_F(GncDateOptionList, test_set_and_get_relative)
m_option.set_value(RelativeDatePeriod::START_THIS_MONTH);
EXPECT_EQ(time1, m_option.get_value<time64>());
EXPECT_EQ(RelativeDatePeriod::START_THIS_MONTH, m_option.get_value<RelativeDatePeriod>());
auto index(std::find(c_begin_dates.begin(), c_begin_dates.end(),
size_t index(std::find(c_begin_dates.begin(), c_begin_dates.end(),
RelativeDatePeriod::START_THIS_MONTH) - c_begin_dates.begin());
EXPECT_EQ(index, m_option.get_value<size_t>());
// And check that nothing happens when we try to set m_option to an end date
@ -1335,7 +1335,7 @@ TEST_F(GncDateOptionList, test_set_and_get_relative)
EXPECT_EQ(RelativeDatePeriod::START_THIS_MONTH, m_option.get_value<RelativeDatePeriod>());
m_option.set_value(static_cast<size_t>(5));
EXPECT_EQ(RelativeDatePeriod::START_CAL_YEAR, m_option.get_value<RelativeDatePeriod>());
EXPECT_EQ(5, m_option.get_value<size_t>());
EXPECT_EQ(5u, m_option.get_value<size_t>());
}
TEST_F(GncDateOption, test_stream_out)

22
libgnucash/app-utils/test/gtest-gnc-optiondb.cpp
View File

@ -53,7 +53,7 @@ TEST_F(GncOptionDBTest, test_register_option)
GncOption option1{"foo", "bar", "baz", "Phony Option",
std::string{"waldo"}};
m_db->register_option("foo", std::move(option1));
EXPECT_EQ(m_db->num_sections(), 1);
EXPECT_EQ(1u, m_db->num_sections());
}
TEST_F(GncOptionDBTest, test_lookup_string_option)
@ -144,7 +144,7 @@ TEST_F(GncOptionDBTest, test_register_account_list_limited_option)
gnc_register_account_list_limited_option(m_db, "foo", "bar", "baz",
"Phony Option", acclist,
{ACCT_TYPE_STOCK});
EXPECT_EQ(4, m_db->find_option("foo", "bar")->get_value<GncOptionAccountList>().size());
EXPECT_EQ(4u, m_db->find_option("foo", "bar")->get_value<GncOptionAccountList>().size());
EXPECT_EQ(acclist[3], m_db->find_option("foo", "bar")->get_value<GncOptionAccountList>().at(3));
}
@ -156,7 +156,7 @@ TEST_F(GncOptionDBTest, test_register_account_sel_limited_option)
gnc_register_account_list_limited_option(m_db, "foo", "bar", "baz",
"Phony Option", accsel,
{ACCT_TYPE_STOCK});
EXPECT_EQ(1, m_db->find_option("foo", "bar")->get_value<GncOptionAccountList>().size());
EXPECT_EQ(1u, m_db->find_option("foo", "bar")->get_value<GncOptionAccountList>().size());
EXPECT_EQ(accsel[0], m_db->find_option("foo", "bar")->get_value<GncOptionAccountList>().at(0));
}
@ -256,19 +256,19 @@ TEST_F(GncOptionDBTest, test_register_start_date_option)
m_db->set_option("foo", "bar", RelativeDatePeriod::START_THIS_MONTH);
EXPECT_EQ(RelativeDatePeriod::START_THIS_MONTH,
m_db->find_option("foo", "bar")->get_value<RelativeDatePeriod>());
auto index(std::find(begin_dates.begin(), begin_dates.end(),
RelativeDatePeriod::START_THIS_MONTH) - begin_dates.begin());
/* If this fails check that the begin_dates vector above matches the one in
const RelativeDatePeriod start_this_month {RelativeDatePeriod::START_THIS_MONTH};
auto index =
std::find(begin_dates.begin(), begin_dates.end(), start_this_month);
/* If this fails check that the begin_dates vector above matches the one in
* gnc-optiondb.cpp.
*/
EXPECT_EQ(index,
EXPECT_EQ(static_cast<unsigned int>(std::distance(begin_dates.begin(), index)),
m_db->find_option("foo", "bar")->get_value<size_t>());
m_db->set_option("foo", "bar", RelativeDatePeriod::END_THIS_MONTH);
EXPECT_EQ(RelativeDatePeriod::START_THIS_MONTH,
m_db->find_option("foo", "bar")->get_value<RelativeDatePeriod>());
m_db->set_option("foo", "bar", static_cast<size_t>(5));
EXPECT_EQ(5, m_db->find_option("foo", "bar")->get_value<size_t>());
EXPECT_EQ(5u, m_db->find_option("foo", "bar")->get_value<size_t>());
}
@ -398,7 +398,7 @@ TEST_F(GncOptionDBIOTest, test_account_list_option_scheme_input)
EXPECT_EQ(acclist[1], m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>()[0]);
m_db->load_option_scheme(iss);
EXPECT_EQ(acclist[2], m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>()[1]);
EXPECT_EQ(2, m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>().size());
EXPECT_EQ(2u, m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>().size());
}
@ -438,7 +438,7 @@ TEST_F(GncOptionDBIOTest, test_multiple_options_scheme_input)
EXPECT_STREQ("pepper", m_db->lookup_string_option("foo", "sausage").c_str());
EXPECT_EQ(time1, m_db->find_option("pork", "garply")->get_value<time64>());
EXPECT_EQ(acclist[2], m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>()[1]);
EXPECT_EQ(2, m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>().size());
EXPECT_EQ(2u, m_db->find_option("quux", "xyzzy")->get_value<GncOptionAccountList>().size());
}