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

Cleanup some uninitialized variables

Browse source 
I can't really see any point in passing a local loop variable around,
and copying a uninitialized pointer. Better use local variables there
and let the compiler optimize them away if it feels for doing that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2013-12-05 00:48:38 +01:00 • committed by Dirk Hohndel
parent a0df62d913
commit 28b8d177c3
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-ui/printlayout.cpp
View file

@ -93,14 +93,16 @@ void PrintLayout::setup()
} }
// go trought the dive table and find how many dives we are a going to print // go trought the dive table and find how many dives we are a going to print
void PrintLayout::estimateTotalDives(struct dive *dive, int *i, int *total) const int PrintLayout::estimateTotalDives() const
{ {
*total = 0; int total = 0, i = 0;
for_each_dive(*i, dive) { struct dive *dive;
for_each_dive(i, dive) {
if (!dive->selected && printOptions->print_selected) if (!dive->selected && printOptions->print_selected)
continue; continue;
(*total)++; total++;
} }
return total;
} }
/* the used formula here is: /* the used formula here is:
@ -116,9 +118,8 @@ void PrintLayout::estimateTotalDives(struct dive *dive, int *i, int *total) cons
void PrintLayout::printProfileDives(int divesPerRow, int divesPerColumn) void PrintLayout::printProfileDives(int divesPerRow, int divesPerColumn)
{ {
int i, row = 0, col = 0, printed = 0, total = 0; int i, row = 0, col = 0, printed = 0, total = estimateTotalDives();
struct dive *dive; struct dive *dive;
estimateTotalDives(dive, &i, &total);
if (!total) if (!total)
return; return;
@ -273,8 +274,7 @@ void PrintLayout::printTable()
{ {
struct dive *dive; struct dive *dive;
const int stage = 33; // there are 3 stages in this routine: 100% / 3 ~= 33% const int stage = 33; // there are 3 stages in this routine: 100% / 3 ~= 33%
int i, row = 0, total, progress; int i, row = 0, progress, total = estimateTotalDives();
estimateTotalDives(dive, &i, &total);
if (!total) if (!total)
return; return;

2
qt-ui/printlayout.h
View file

@ -34,7 +34,7 @@ private:
QList<unsigned int> profilePrintColumnWidths, profilePrintRowHeights; QList<unsigned int> profilePrintColumnWidths, profilePrintRowHeights;
void setup(); void setup();
void estimateTotalDives(struct dive *dive, int *i, int *total) const; int estimateTotalDives() const;
void printProfileDives(int divesPerRow, int divesPerColumn); void printProfileDives(int divesPerRow, int divesPerColumn);
QTableView *createProfileTable(ProfilePrintModel *model, const int tableW); QTableView *createProfileTable(ProfilePrintModel *model, const int tableW);
void printTable(); void printTable();