From e6210aafc560c303fc72360dca877cde939db98b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 2 Jan 2020 08:52:00 -0800 Subject: [PATCH] code cleanup: initialize all elements in structure This seems silly. I don't like that warning and would rather disable the warning. Signed-off-by: Dirk Hohndel --- commands/command_divelist.cpp | 8 ++++---- desktop-widgets/locationinformation.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commands/command_divelist.cpp b/commands/command_divelist.cpp index 1d1a90387..acb44f88f 100644 --- a/commands/command_divelist.cpp +++ b/commands/command_divelist.cpp @@ -469,10 +469,10 @@ ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips, str // this only matters if undoit were called before redoit currentDive = nullptr; - struct dive_table dives_to_add = { 0 }; - struct dive_table dives_to_remove = { 0 }; - struct trip_table trips_to_add = { 0 }; - struct dive_site_table sites_to_add = { 0 }; + struct dive_table dives_to_add = { 0, 0, 0 }; + struct dive_table dives_to_remove = { 0, 0, 0 }; + struct trip_table trips_to_add = { 0, 0, 0 }; + struct dive_site_table sites_to_add = { 0, 0, 0 }; process_imported_dives(dives, trips, sites, flags, &dives_to_add, &dives_to_remove, &trips_to_add, &sites_to_add); // Add trips to the divesToAdd.trips structure diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 331a8555e..f7b33cae4 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -264,12 +264,12 @@ void LocationInformationWidget::reverseGeocode() location_t location = parseGpsText(ui.diveSiteCoordinates->text()); if (!diveSite || !has_location(&location)) return; - taxonomy_data taxonomy = { 0 }; + taxonomy_data taxonomy = { 0, 0 }; reverseGeoLookup(location.lat, location.lon, &taxonomy); Command::editDiveSiteTaxonomy(diveSite, taxonomy); } -DiveLocationFilterProxyModel::DiveLocationFilterProxyModel(QObject *) : currentLocation({0, 0}) +DiveLocationFilterProxyModel::DiveLocationFilterProxyModel(QObject *) : currentLocation({{0}, {0}}) { } @@ -573,7 +573,7 @@ void DiveLocationLineEdit::setCurrentDiveSite(struct dive *d) currentLocation = dive_get_gps_location(d); } else { currDs = nullptr; - currentLocation = location_t{0, 0}; + currentLocation = location_t{{0}, {0}}; } if (!currDs) clear();