mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Profile: pass by reference rather than by value for large struct

Browse source 
Addresses LGTM.com suggestion.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2019-03-18 21:32:14 +01:00 • committed by Dirk Hohndel
parent 4524e2b0b3
commit c7bb67c5be
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
profile-widget/profilewidget2.cpp
View file

@ -718,7 +718,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict
cylinderPressureAxis->setMinimum(plotInfo.minpressure); cylinderPressureAxis->setMinimum(plotInfo.minpressure);
cylinderPressureAxis->setMaximum(plotInfo.maxpressure); cylinderPressureAxis->setMaximum(plotInfo.maxpressure);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
rulerItem->setPlotInfo(plotInfo); rulerItem->setPlotInfo(&plotInfo);
#endif #endif
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE

8
profile-widget/ruleritem.cpp
View file

@ -152,11 +152,11 @@ RulerNodeItem2 *RulerItem2::destNode() const
return dest; return dest;
} }
void RulerItem2::setPlotInfo(plot_info info) void RulerItem2::setPlotInfo(plot_info *info)
{ {
pInfo = info; pInfo = *info;
dest->setPlotInfo(info); dest->setPlotInfo(*info);
source->setPlotInfo(info); source->setPlotInfo(*info);
dest->recalculate(); dest->recalculate();
source->recalculate(); source->recalculate();
recalculate(); recalculate();

2
profile-widget/ruleritem.h
View file

@ -37,7 +37,7 @@ public:
explicit RulerItem2(); explicit RulerItem2();
void recalculate(); void recalculate();
void setPlotInfo(struct plot_info pInfo); void setPlotInfo(struct plot_info *pInfo);
RulerNodeItem2 *sourceNode() const; RulerNodeItem2 *sourceNode() const;
RulerNodeItem2 *destNode() const; RulerNodeItem2 *destNode() const;
void setAxis(DiveCartesianAxis *time, DiveCartesianAxis *depth); void setAxis(DiveCartesianAxis *time, DiveCartesianAxis *depth);

24
qt-models/yearlystatisticsmodel.cpp
View file

@ -28,13 +28,13 @@ public:
}; };
QVariant data(int column, int role) const; QVariant data(int column, int role) const;
YearStatisticsItem(stats_t interval); YearStatisticsItem(stats_t *interval);
private: private:
stats_t stats_interval; stats_t stats_interval;
}; };
YearStatisticsItem::YearStatisticsItem(stats_t interval) : stats_interval(interval) YearStatisticsItem::YearStatisticsItem(stats_t *interval) : stats_interval(*interval)
{ {
} }
@ -190,11 +190,11 @@ void YearlyStatisticsModel::update_yearly_stats()
calculate_stats_summary(&stats, false); calculate_stats_summary(&stats, false);
for (i = 0; stats.stats_yearly != NULL && stats.stats_yearly[i].period; ++i) { for (i = 0; stats.stats_yearly != NULL && stats.stats_yearly[i].period; ++i) {
YearStatisticsItem *item = new YearStatisticsItem(stats.stats_yearly[i]); YearStatisticsItem *item = new YearStatisticsItem(&stats.stats_yearly[i]);
combined_months = 0; combined_months = 0;
for (j = 0; combined_months < stats.stats_yearly[i].selection_size; ++j) { for (j = 0; combined_months < stats.stats_yearly[i].selection_size; ++j) {
combined_months += stats.stats_monthly[month].selection_size; combined_months += stats.stats_monthly[month].selection_size;
YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_monthly[month]); YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_monthly[month]);
item->children.append(iChild); item->children.append(iChild);
iChild->parent = item; iChild->parent = item;
month++; month++;
@ -204,9 +204,9 @@ void YearlyStatisticsModel::update_yearly_stats()
} }
if (stats.stats_by_trip != NULL && stats.stats_by_trip[0].is_trip == true) { if (stats.stats_by_trip != NULL && stats.stats_by_trip[0].is_trip == true) {
YearStatisticsItem *item = new YearStatisticsItem(stats.stats_by_trip[0]); YearStatisticsItem *item = new YearStatisticsItem(&stats.stats_by_trip[0]);
for (i = 1; stats.stats_by_trip != NULL && stats.stats_by_trip[i].is_trip; ++i) { for (i = 1; stats.stats_by_trip != NULL && stats.stats_by_trip[i].is_trip; ++i) {
YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_by_trip[i]); YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_by_trip[i]);
item->children.append(iChild); item->children.append(iChild);
iChild->parent = item; iChild->parent = item;
} }
@ -216,11 +216,11 @@ void YearlyStatisticsModel::update_yearly_stats()
/* Show the statistic sorted by dive type */ /* Show the statistic sorted by dive type */
if (stats.stats_by_type != NULL && stats.stats_by_type[0].selection_size) { if (stats.stats_by_type != NULL && stats.stats_by_type[0].selection_size) {
YearStatisticsItem *item = new YearStatisticsItem(stats.stats_by_type[0]); YearStatisticsItem *item = new YearStatisticsItem(&stats.stats_by_type[0]);
for (i = 1; i <= NUM_DIVEMODE; ++i) { for (i = 1; i <= NUM_DIVEMODE; ++i) {
if (stats.stats_by_type[i].selection_size == 0) if (stats.stats_by_type[i].selection_size == 0)
continue; continue;
YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_by_type[i]); YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_by_type[i]);
item->children.append(iChild); item->children.append(iChild);
iChild->parent = item; iChild->parent = item;
} }
@ -230,13 +230,13 @@ void YearlyStatisticsModel::update_yearly_stats()
/* Show the statistic sorted by dive depth */ /* Show the statistic sorted by dive depth */
if (stats.stats_by_depth != NULL && stats.stats_by_depth[0].selection_size) { if (stats.stats_by_depth != NULL && stats.stats_by_depth[0].selection_size) {
YearStatisticsItem *item = new YearStatisticsItem(stats.stats_by_depth[0]); YearStatisticsItem *item = new YearStatisticsItem(&stats.stats_by_depth[0]);
for (i = 1; stats.stats_by_depth[i].is_trip; ++i) for (i = 1; stats.stats_by_depth[i].is_trip; ++i)
if (stats.stats_by_depth[i].selection_size) { if (stats.stats_by_depth[i].selection_size) {
label = QString(tr("%1 - %2")).arg(get_depth_string((i - 1) * (STATS_DEPTH_BUCKET * 1000), true, false), label = QString(tr("%1 - %2")).arg(get_depth_string((i - 1) * (STATS_DEPTH_BUCKET * 1000), true, false),
get_depth_string(i * (STATS_DEPTH_BUCKET * 1000), true, false)); get_depth_string(i * (STATS_DEPTH_BUCKET * 1000), true, false));
stats.stats_by_depth[i].location = strdup(label.toUtf8().data()); stats.stats_by_depth[i].location = strdup(label.toUtf8().data());
YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_by_depth[i]); YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_by_depth[i]);
item->children.append(iChild); item->children.append(iChild);
iChild->parent = item; iChild->parent = item;
} }
@ -246,7 +246,7 @@ void YearlyStatisticsModel::update_yearly_stats()
/* Show the statistic sorted by dive temperature */ /* Show the statistic sorted by dive temperature */
if (stats.stats_by_temp != NULL && stats.stats_by_temp[0].selection_size) { if (stats.stats_by_temp != NULL && stats.stats_by_temp[0].selection_size) {
YearStatisticsItem *item = new YearStatisticsItem(stats.stats_by_temp[0]); YearStatisticsItem *item = new YearStatisticsItem(&stats.stats_by_temp[0]);
for (i = 1; stats.stats_by_temp[i].is_trip; ++i) for (i = 1; stats.stats_by_temp[i].is_trip; ++i)
if (stats.stats_by_temp[i].selection_size) { if (stats.stats_by_temp[i].selection_size) {
t_range_min.mkelvin = C_to_mkelvin((i - 1) * STATS_TEMP_BUCKET); t_range_min.mkelvin = C_to_mkelvin((i - 1) * STATS_TEMP_BUCKET);
@ -254,7 +254,7 @@ void YearlyStatisticsModel::update_yearly_stats()
label = QString(tr("%1 - %2")).arg(get_temperature_string(t_range_min, true), label = QString(tr("%1 - %2")).arg(get_temperature_string(t_range_min, true),
get_temperature_string(t_range_max, true)); get_temperature_string(t_range_max, true));
stats.stats_by_temp[i].location = strdup(label.toUtf8().data()); stats.stats_by_temp[i].location = strdup(label.toUtf8().data());
YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_by_temp[i]); YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_by_temp[i]);
item->children.append(iChild); item->children.append(iChild);
iChild->parent = item; iChild->parent = item;
} }