summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2019-03-18 21:32:14 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-18 19:40:32 -0700
commitc7bb67c5bef01772a9e52dddccfa5f02d91393ff (patch)
treed032174cd0f5206de3063274d6a641a881c1dbe4
parent4524e2b0b39f47996cd8acc0c938c47753f31854 (diff)
downloadsubsurface-c7bb67c5bef01772a9e52dddccfa5f02d91393ff.tar.gz
Profile: pass by reference rather than by value for large struct
Addresses LGTM.com suggestion. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--profile-widget/profilewidget2.cpp2
-rw-r--r--profile-widget/ruleritem.cpp8
-rw-r--r--profile-widget/ruleritem.h2
-rw-r--r--qt-models/yearlystatisticsmodel.cpp24
4 files changed, 18 insertions, 18 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 5d282fd95..156c456bc 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -718,7 +718,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict
cylinderPressureAxis->setMinimum(plotInfo.minpressure);
cylinderPressureAxis->setMaximum(plotInfo.maxpressure);
#ifndef SUBSURFACE_MOBILE
- rulerItem->setPlotInfo(plotInfo);
+ rulerItem->setPlotInfo(&plotInfo);
#endif
#ifdef SUBSURFACE_MOBILE
diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp
index 0bcebc4d4..c7b82a3c6 100644
--- a/profile-widget/ruleritem.cpp
+++ b/profile-widget/ruleritem.cpp
@@ -152,11 +152,11 @@ RulerNodeItem2 *RulerItem2::destNode() const
return dest;
}
-void RulerItem2::setPlotInfo(plot_info info)
+void RulerItem2::setPlotInfo(plot_info *info)
{
- pInfo = info;
- dest->setPlotInfo(info);
- source->setPlotInfo(info);
+ pInfo = *info;
+ dest->setPlotInfo(*info);
+ source->setPlotInfo(*info);
dest->recalculate();
source->recalculate();
recalculate();
diff --git a/profile-widget/ruleritem.h b/profile-widget/ruleritem.h
index 3a6c59480..3462a5d35 100644
--- a/profile-widget/ruleritem.h
+++ b/profile-widget/ruleritem.h
@@ -37,7 +37,7 @@ public:
explicit RulerItem2();
void recalculate();
- void setPlotInfo(struct plot_info pInfo);
+ void setPlotInfo(struct plot_info *pInfo);
RulerNodeItem2 *sourceNode() const;
RulerNodeItem2 *destNode() const;
void setAxis(DiveCartesianAxis *time, DiveCartesianAxis *depth);
diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp
index a820a23aa..4c46c0a1f 100644
--- a/qt-models/yearlystatisticsmodel.cpp
+++ b/qt-models/yearlystatisticsmodel.cpp
@@ -28,13 +28,13 @@ public:
};
QVariant data(int column, int role) const;
- YearStatisticsItem(stats_t interval);
+ YearStatisticsItem(stats_t *interval);
private:
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);
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;
for (j = 0; combined_months < stats.stats_yearly[i].selection_size; ++j) {
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);
iChild->parent = item;
month++;
@@ -204,9 +204,9 @@ void YearlyStatisticsModel::update_yearly_stats()
}
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) {
- YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_by_trip[i]);
+ YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_by_trip[i]);
item->children.append(iChild);
iChild->parent = item;
}
@@ -216,11 +216,11 @@ void YearlyStatisticsModel::update_yearly_stats()
/* Show the statistic sorted by dive type */
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) {
if (stats.stats_by_type[i].selection_size == 0)
continue;
- YearStatisticsItem *iChild = new YearStatisticsItem(stats.stats_by_type[i]);
+ YearStatisticsItem *iChild = new YearStatisticsItem(&stats.stats_by_type[i]);
item->children.append(iChild);
iChild->parent = item;
}
@@ -230,13 +230,13 @@ void YearlyStatisticsModel::update_yearly_stats()
/* Show the statistic sorted by dive depth */
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)
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),
get_depth_string(i * (STATS_DEPTH_BUCKET * 1000), true, false));
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);
iChild->parent = item;
}
@@ -246,7 +246,7 @@ void YearlyStatisticsModel::update_yearly_stats()
/* Show the statistic sorted by dive temperature */
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)
if (stats.stats_by_temp[i].selection_size) {
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),
get_temperature_string(t_range_max, true));
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);
iChild->parent = item;
}