Merge branch 'warnings' of github.com:neolit123/subsurface

3 files changed, 6 insertions, 5 deletions

diff --git a/desktop-widgets/preferences/abstractpreferenceswidget.cpp b/desktop-widgets/preferences/abstractpreferenceswidget.cpp
index 9334c74ed..54d2417f9 100644
--- a/desktop-widgets/preferences/abstractpreferenceswidget.cpp
+++ b/desktop-widgets/preferences/abstractpreferenceswidget.cpp
@@ -1,7 +1,7 @@
 #include "abstractpreferenceswidget.h"
 
 AbstractPreferencesWidget::AbstractPreferencesWidget(const QString& name, const QIcon& icon, float positionHeight)
-: QWidget(), _name(name), _icon(icon), _positionHeight(positionHeight)
+: QWidget(), _icon(icon), _name(name), _positionHeight(positionHeight)
 {
 }
 
diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp
index 3780a6c91..d812f4ab1 100644
--- a/desktop-widgets/preferences/preferences_network.cpp
+++ b/desktop-widgets/preferences/preferences_network.cpp
@@ -76,7 +76,7 @@ void PreferencesNetwork::syncSettings()
 				CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
 				connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
 				connect(cloudAuth, SIGNAL(passwordChangeSuccessful()), this, SLOT(passwordUpdateSuccessfull()));
-				QNetworkReply *reply = cloudAuth->backend(email, password, "", newpassword);
+				cloudAuth->backend(email, password, "", newpassword);
 				ui->cloud_storage_new_passwd->setText("");
 				free(prefs.cloud_storage_newpassword);
 				prefs.cloud_storage_newpassword = strdup(qPrintable(newpassword));
@@ -97,7 +97,7 @@ void PreferencesNetwork::syncSettings()
 			} else {
 				CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
 				connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
-				QNetworkReply *reply = cloudAuth->backend(email, password);
+				cloudAuth->backend(email, password);
 			}
 		}
 	} else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) {
@@ -110,7 +110,7 @@ void PreferencesNetwork::syncSettings()
 			}
 			CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
 			connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
-			QNetworkReply *reply = cloudAuth->backend(email, password, pin);
+			cloudAuth->backend(email, password, pin);
 		}
 	}
 	SAVE_OR_REMOVE("email", default_prefs.cloud_storage_email, email);
@@ -169,4 +169,4 @@ void PreferencesNetwork::proxyType_changed(int idx)
 void PreferencesNetwork::passwordUpdateSuccessfull()
 {
 	ui->cloud_storage_password->setText(prefs.cloud_storage_password);
-}
\ No newline at end of file
+}
diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp
index 6f3523c0b..6885469c5 100644
--- a/desktop-widgets/preferences/preferencesdialog.cpp
+++ b/desktop-widgets/preferences/preferencesdialog.cpp
@@ -84,6 +84,7 @@ void PreferencesDialog::buttonClicked(QAbstractButton* btn)
 	case QDialogButtonBox::AcceptRole : applyRequested(true); return;
 	case QDialogButtonBox::RejectRole : cancelRequested(); return;
 	case QDialogButtonBox::ResetRole : defaultsRequested(); return;
+	default: return;
 	}
 }