Whitespace cleanup

Minor change to the perl postprocessing script and resulting changes to
the affected source files.

This deals with two issues:
- "foreach"-like structures were not always treated correctly
- some longer calculations that ended on "+ constant" were reformatted in
  a rather unatractive manner

In one source file (divelist.c) I ended up adding braces to the sources...
trying to cascade the indentation further down without having the block
there seemed a lot more trouble than it's worth.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

10 files changed, 26 insertions, 26 deletions

diff --git a/dive.c b/dive.c
index 405812271..5eef5bab0 100644
--- a/dive.c
+++ b/dive.c
@@ -670,7 +670,7 @@ static void fixup_duration(struct dive *dive)
 	int duration = 0;
 
 	for_each_dc(dive, dc)
-	duration = MAX(duration, dc->duration.seconds);
+		duration = MAX(duration, dc->duration.seconds);
 
 	dive->duration.seconds = duration;
 }
@@ -896,7 +896,7 @@ struct dive *fixup_dive(struct dive *dive)
 	dive->maxcns = dive->cns;
 
 	for_each_dc(dive, dc)
-	fixup_dive_dc(dive, dc);
+		fixup_dive_dc(dive, dc);
 
 	fixup_water_salinity(dive);
 	fixup_surface_pressure(dive);
diff --git a/divelist.c b/divelist.c
index f34c91e7b..223205e27 100644
--- a/divelist.c
+++ b/divelist.c
@@ -371,9 +371,10 @@ int get_divenr(struct dive *dive)
 {
 	int i;
 	struct dive *d;
-	for_each_dive(i, d)
-	if (d == dive)
-		return i;
+	for_each_dive(i, d) {
+		if (d == dive)
+			return i;
+	}
 	return -1;
 }
 
diff --git a/profile.c b/profile.c
index 194a0c4de..c9f3892ab 100644
--- a/profile.c
+++ b/profile.c
@@ -1278,17 +1278,14 @@ static void calculate_gas_information(struct dive *dive, struct plot_info *pi)
 		 * END just uses N2 */
 		entry->mod = (prefs.mod_ppO2 / fo2 * 1000 - 1) * 10000;
 		entry->ead = (entry->depth + 10000) *
-				 (entry->po2 + (amb_pressure - entry->po2) * (1 - ratio)) / amb_pressure -
-			     10000;
+				 (entry->po2 + (amb_pressure - entry->po2) * (1 - ratio)) / amb_pressure - 10000;
 		entry->end = (entry->depth + 10000) *
-				 (amb_pressure - entry->po2) * (1 - ratio) / amb_pressure / N2_IN_AIR * 1000 -
-			     10000;
+				 (amb_pressure - entry->po2) * (1 - ratio) / amb_pressure / N2_IN_AIR * 1000 - 10000;
 		entry->eadd = (entry->depth + 10000) *
 				  (entry->po2 / amb_pressure * O2_DENSITY + entry->pn2 / amb_pressure *
 										N2_DENSITY +
 				   entry->phe / amb_pressure * HE_DENSITY) /
-				  (O2_IN_AIR * O2_DENSITY + N2_IN_AIR * N2_DENSITY) * 1000 -
-			      10000;
+				  (O2_IN_AIR * O2_DENSITY + N2_IN_AIR * N2_DENSITY) * 1000 - 10000;
 		if (entry->mod < 0)
 			entry->mod = 0;
 		if (entry->ead < 0)
@@ -1343,17 +1340,14 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
 		 * END just uses N2 */
 		entry->mod = (prefs.mod_ppO2 / fo2 * 1000 - 1) * 10000;
 		entry->ead = (entry->depth + 10000) *
-				 (entry->po2 + (amb_pressure - entry->po2) * (1 - ratio)) / amb_pressure -
-			     10000;
+				 (entry->po2 + (amb_pressure - entry->po2) * (1 - ratio)) / amb_pressure - 10000;
 		entry->end = (entry->depth + 10000) *
-				 (amb_pressure - entry->po2) * (1 - ratio) / amb_pressure / N2_IN_AIR * 1000 -
-			     10000;
+				 (amb_pressure - entry->po2) * (1 - ratio) / amb_pressure / N2_IN_AIR * 1000 - 10000;
 		entry->eadd = (entry->depth + 10000) *
 				  (entry->po2 / amb_pressure * O2_DENSITY + entry->pn2 / amb_pressure *
 										N2_DENSITY +
 				   entry->phe / amb_pressure * HE_DENSITY) /
-				  (O2_IN_AIR * O2_DENSITY + N2_IN_AIR * N2_DENSITY) * 1000 -
-			      10000;
+				  (O2_IN_AIR * O2_DENSITY + N2_IN_AIR * N2_DENSITY) * 1000 - 10000;
 		if (entry->mod < 0)
 			entry->mod = 0;
 		if (entry->ead < 0)
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index dd4aacba2..ab4e301ad 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -120,7 +120,7 @@ void DiveListView::restoreExpandedRows()
 {
 	setAnimated(false);
 	Q_FOREACH(const int & i, expandedRows)
-	setExpanded(model()->index(i, 0), true);
+		setExpanded(model()->index(i, 0), true);
 	setAnimated(true);
 }
 void DiveListView::fixMessyQtModelBehaviour()
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 41c906279..bff49156f 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -103,8 +103,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
 		ui->CSV->setValue(VAL);\
 		ui->CSV->setEnabled(VAL >= 0);\
 		ui->BOX->setChecked(VAL >= 0);\
-		ui->CSV->blockSignals(false); \
-})
+		ui->CSV->blockSignals(false); })
 void DiveLogImportDialog::on_knownImports_currentIndexChanged(int index)
 {
 	if (specialCSV.contains(index)) {
diff --git a/qt-ui/groupedlineedit.cpp b/qt-ui/groupedlineedit.cpp
index 3ed6d239a..517623119 100644
--- a/qt-ui/groupedlineedit.cpp
+++ b/qt-ui/groupedlineedit.cpp
@@ -109,7 +109,7 @@ QStringList GroupedLineEdit::getBlockStringList()
 	QStringList retList;
 	Private::Block block;
 	foreach(block, d->blocks)
-	retList.append(block.text);
+		retList.append(block.text);
 	return retList;
 }
 
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 2af6b7b27..7305ee422 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -872,7 +872,7 @@ void MainTab::saveTags()
 	    QString tag;
 	    taglist_clear(mydive->tag_list);
 	    foreach(tag, ui.tagWidget->getBlockStringList())
-	    taglist_add_tag(mydive->tag_list, tag.toUtf8().data()););
+		    taglist_add_tag(mydive->tag_list, tag.toUtf8().data()););
 }
 
 void MainTab::on_tagWidget_textChanged()
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 43f596eb2..d25635c66 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -621,7 +621,7 @@ void MainWindow::initialUiSetup()
 }
 
 #define TOOLBOX_PREF_BUTTON(pref, setting, button) \
-	prefs.pref = s.value(#setting).toBool(); \
+	prefs.pref = s.value(#setting).toBool();   \
 	ui.button->setChecked(prefs.pref);
 
 void MainWindow::readSettings()
@@ -835,7 +835,7 @@ void MainWindow::removeRecentFile(QStringList failedFiles)
 		}
 	}
 
-	foreach (QString file, failedFiles)
+	foreach(QString file, failedFiles)
 		files.removeAll(file);
 
 	for (int c = 1; c <= 4; c++) {
diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp
index 2373b5f2f..585fe8076 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/qt-ui/profile/divecartesianaxis.cpp
@@ -238,9 +238,9 @@ void DiveCartesianAxis::updateTicks()
 	}
 
 	Q_FOREACH(DiveTextItem * item, labels)
-	item->setVisible(textVisibility);
+		item->setVisible(textVisibility);
 	Q_FOREACH(DiveLineItem * item, lines)
-	item->setVisible(lineVisibility);
+		item->setVisible(lineVisibility);
 }
 
 void DiveCartesianAxis::animateChangeLine(const QLineF &newLine)
diff --git a/scripts/whitespace.pl b/scripts/whitespace.pl
index fa4718649..ba97873cf 100644
--- a/scripts/whitespace.pl
+++ b/scripts/whitespace.pl
@@ -2,7 +2,10 @@
 
 my $input = $ARGV[0];
 my $source = `clang-format $input`;
+# for_each_dive (...) and Q_FOREACH and friends...
 $source =~ s/^(.*each.*\(.*\).*)\n\s*{\s*$/$1 {/img;
+$source =~ s/(?:\G|^)(\s+[^#\/*].*each.*\(.*\))\n(\s*)([^{}\s])/$1\n\t$2$3/img;
+
 $source =~ s/^(\s*struct[^()\n]*)\n\s*{\s*$/$1 {/img;
 $source =~ s/^(\s*static\s+struct[^()\n]*)\n\s*{\s*$/$1 {/img;
 $source =~ s/^(\s*union[^()\n]*)\n\s*{\s*$/$1 {/img;
@@ -11,5 +14,8 @@ $source =~ s/^(\s*class.*)\n\s*{\s*$/$1 {/img;
 $source =~ s/^(\S*::\S*.*)\n\s*: /$1 : /img;
 $source =~ s/(?:\G|^)[ ]{6}/\t/mg;
 $source =~ s/(?:\G|^)(\t*)[ ]{4}"/$1\t"/mg;
+# don't put line break before the last single term argument of a
+# calculation
+$source =~ s/(?:\G|^)(.*[+-])\n\s*(\S*\;)$/$1 $2/mg;
 open (DIFF, "| diff -u $input -");
 print DIFF $source ;