Gratuitous whitespace changes

I keep trying to get to consistenct.
Completely hopeless.

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

android.cpp

@@ -77,5 +77,4 @@ void subsurface_console_exit(void)
 {
 	/* NOP */
 }
-
 }

profile.h

@@ -80,7 +80,6 @@ int get_maxtime(struct plot_info *pi);
 int get_maxdepth(struct plot_info *pi);
 
 
-
 #define SENSOR_PR 0
 #define INTERPOLATED_PR 1
 #define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]

qt-ui/divelogexportdialog.cpp

@@ -8,8 +8,7 @@
 #include "subsurfacewebservices.h"
 #include "worldmap-save.h"
 
-DiveLogExportDialog::DiveLogExportDialog(QWidget *parent) :
+DiveLogExportDialog::DiveLogExportDialog(QWidget *parent) : QDialog(parent),
-	QDialog(parent),
 	ui(new Ui::DiveLogExportDialog)
 {
 	ui->setupUi(this);

qt-ui/divelogexportdialog.h

@@ -7,15 +7,15 @@ namespace Ui {
 	class DiveLogExportDialog;
 }
 
-class DiveLogExportDialog : public QDialog
+class DiveLogExportDialog : public QDialog {
-{
 	Q_OBJECT
 
 public:
 	explicit DiveLogExportDialog(QWidget *parent = 0);
 	~DiveLogExportDialog();
 
-private slots:
+private
+slots:
 	void on_buttonBox_accepted();
 
 private:

qt-ui/divelogimportdialog.h

@@ -6,8 +6,7 @@
 #include "../dive.h"
 #include "../divelist.h"
 
-namespace Ui
+namespace Ui {
-{
 	class DiveLogImportDialog;
 }
 

qt-ui/downloadfromdivecomputer.cpp

@@ -34,8 +34,7 @@ struct mydescriptor {
 	unsigned int model;
 };
 
-namespace DownloadFromDcGlobal
+namespace DownloadFromDcGlobal {
-{
 	const char *err_string;
 };
 

qt-ui/exif.cpp

@@ -34,8 +34,7 @@
 
 using std::string;
 
-namespace
+namespace {
-{
 	// IF Entry
 	struct IFEntry {
 		// Raw fields

qt-ui/globe.cpp

@@ -211,8 +211,7 @@ void GlobeGPS::centerOnCurrentDive()
 {
 	struct dive *dive = current_dive;
 	// dive has changed, if we had the 'editingDive', hide it.
-	if (messageWidget->isVisible()
+	if (messageWidget->isVisible() && (!dive || dive_has_gps_location(dive) || amount_selected != 1))
-	    && (!dive || dive_has_gps_location(dive) || amount_selected != 1 ))
 		messageWidget->hide();
 
 	editingDiveLocation = false;
@@ -222,8 +221,7 @@ void GlobeGPS::centerOnCurrentDive()
 	qreal longitude = dive->longitude.udeg / 1000000.0;
 	qreal latitude = dive->latitude.udeg / 1000000.0;
 
-	if ((!dive_has_gps_location(dive) || MainWindow::instance()->information()->isEditing())
+	if ((!dive_has_gps_location(dive) || MainWindow::instance()->information()->isEditing()) && amount_selected == 1) {
-	    && amount_selected == 1) {
 		prepareForGetDiveCoordinates();
 		return;
 	}
@@ -341,10 +339,23 @@ void GlobeGPS::resizeEvent(QResizeEvent *event)
 }
 #else
 
-GlobeGPS::GlobeGPS(QWidget* parent) { setText("MARBLE DISABLED AT BUILD TIME"); }
+GlobeGPS::GlobeGPS(QWidget *parent)
-void GlobeGPS::repopulateLabels() {}
+{
-void GlobeGPS::centerOnCurrentDive() {}
+	setText("MARBLE DISABLED AT BUILD TIME");
-bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev) {}
+}
-void GlobeGPS::prepareForGetDiveCoordinates() {}
+void GlobeGPS::repopulateLabels()
-void GlobeGPS::reload() {}
+{
+}
+void GlobeGPS::centerOnCurrentDive()
+{
+}
+bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev)
+{
+}
+void GlobeGPS::prepareForGetDiveCoordinates()
+{
+}
+void GlobeGPS::reload()
+{
+}
 #endif

qt-ui/globe.h

@@ -56,7 +56,8 @@ public:
 	void repopulateLabels();
 	void centerOnCurrentDive();
 	bool eventFilter(QObject *, QEvent *);
-public slots:
+public
+slots:
 	void prepareForGetDiveCoordinates();
 };
 

qt-ui/models.cpp

@@ -364,8 +364,7 @@ void CylindersModel::remove(const QModelIndex &index)
 	cylinder_t *cyl = &current->cylinder[index.row()];
 	if ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING &&
 	     DivePlannerPointsModel::instance()->tankInUse(cyl->gasmix.o2.permille, cyl->gasmix.he.permille)) ||
-	    (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && cyl->used))
+	    (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && cyl->used)) {
-	{
 		QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(
 								 	tr("Cylinder cannot be removed"),
 									tr("This gas in use. Only cylinders that are not used in the dive can be removed.")),

qt-ui/profile/animationfunctions.cpp

@@ -4,8 +4,7 @@
 #include <QPropertyAnimation>
 #include <QPointF>
 
-namespace Animations
+namespace Animations {
-{
 
 	void hide(QObject *obj)
 	{
@@ -32,8 +31,7 @@ namespace Animations
 			animation->setStartValue(obj->property("pos").toPointF());
 			animation->setEndValue(QPointF(x, y));
 			animation->start(QAbstractAnimation::DeleteWhenStopped);
-		}
+		} else {
-		else{
 			obj->setProperty("pos", QPointF(x, y));
 		}
 	}

qt-ui/profile/animationfunctions.h

@@ -6,8 +6,7 @@
 
 class QObject;
 
-namespace Animations
+namespace Animations {
-{
 	void hide(QObject *obj);
 	void moveTo(QObject *obj, qreal x, qreal y);
 	void moveTo(QObject *obj, const QPointF &pos);

qt-ui/profile/diveprofileitem.cpp

@@ -684,7 +684,6 @@ void PartialPressureGasItem::paint(QPainter *painter, const QStyleOptionGraphics
 	painter->setPen(QPen(alertColor, pWidth));
 	Q_FOREACH (const QPolygonF &poly, alertPolygons)
 		painter->drawPolyline(poly);
-
 }
 
 void PartialPressureGasItem::setThreshouldSettingsKey(const QString &threshouldSettingsKey)

qt-ui/profile/ruleritem.h

@@ -43,7 +43,8 @@ public:
 	void setAxis(DiveCartesianAxis *time, DiveCartesianAxis *depth);
 	void setVisible(bool visible);
 
-public slots:
+public
+slots:
 	void settingsChanged();
 
 private:

qt-ui/updatemanager.cpp

@@ -4,8 +4,7 @@
 #include "subsurfacewebservices.h"
 #include "ssrf-version.h"
 
-UpdateManager::UpdateManager(QObject *parent) :
+UpdateManager::UpdateManager(QObject *parent) : QObject(parent)
-	QObject(parent)
 {
 	manager = SubsurfaceWebServices::manager();
 	connect(manager, SIGNAL(finished(QNetworkReply *)), SLOT(requestReceived(QNetworkReply *)));

qt-ui/updatemanager.h

@@ -6,15 +6,16 @@
 class QNetworkAccessManager;
 class QNetworkReply;
 
-class UpdateManager : public QObject
+class UpdateManager : public QObject {
-{
 	Q_OBJECT
 public:
 	explicit UpdateManager(QObject *parent = 0);
 	void checkForUpdates();
+
 private:
 	QNetworkAccessManager *manager;
-public slots:
+public
+slots:
 	void requestReceived(QNetworkReply *reply);
 };
 

qt-ui/usermanual.h

@@ -4,8 +4,7 @@
 #include <QMainWindow>
 #include <QWebPage>
 
-namespace Ui
+namespace Ui {
-{
 	class UserManual;
 }
 

qthelper.cpp

@@ -10,7 +10,6 @@
 #define tr(_arg) QObject::tr(_arg)
 
 
-
 QString weight_string(int weight_in_grams)
 {
 	QString str;