From 43ebfec1ff1048cad7cab9f977ee21654c011dd7 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:22:41 +0200 Subject: btdeviceselectiondialog.cpp: fix unused variable Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/btdeviceselectiondialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/btdeviceselectiondialog.cpp b/desktop-widgets/btdeviceselectiondialog.cpp index fb2cbc1f3..546f50ea3 100644 --- a/desktop-widgets/btdeviceselectiondialog.cpp +++ b/desktop-widgets/btdeviceselectiondialog.cpp @@ -52,8 +52,7 @@ BtDeviceSelectionDialog::BtDeviceSelectionDialog(QWidget *parent) : // Initialize WinSock and ask for version 2.2. ulRetCode = WSAStartup(MAKEWORD(2, 2), &WSAData); if (ulRetCode != SUCCESS) { - QMessageBox::StandardButton warningBox; - warningBox = QMessageBox::critical(this, "Bluetooth", + QMessageBox::critical(this, "Bluetooth", tr("Could not initialize Winsock version 2.2"), QMessageBox::Ok); return; } -- cgit v1.2.3-70-g09d2 From 9f7c26cb386a7d061a440829e4b801ea6d629f97 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:23:25 +0200 Subject: locationinformation.cpp: fix unused variable Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/locationinformation.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index aee0b7328..ab2235120 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -540,7 +540,6 @@ void DiveLocationLineEdit::fixPopupPosition() { const QRect screen = QApplication::desktop()->availableGeometry(this); const int maxVisibleItems = 5; - Qt::LayoutDirection dir = layoutDirection(); QPoint pos; int rh, w; int h = (view->sizeHintForRow(0) * qMin(maxVisibleItems, view->model()->rowCount()) + 3) + 3; -- cgit v1.2.3-70-g09d2 From d40caaaa31f94ed006859ee1437880d055c9dc45 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:32:19 +0200 Subject: divelogimportdialog.cpp: declare an enum as type 'known' is a static variable which is not used. by declaring 'enum Known', now there is a *type* which enumerates the values. Having 'static Known known = ' would then work, but since there is no use of such a variable there is no point of declaring it. There is also no use of the 'Known' type itself and an anonymous enum would work as well. Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/divelogimportdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index 025d181d1..5747f3652 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -22,7 +22,7 @@ const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] = { NULL, } }; -static enum { +enum Known { MANUAL, APD, APD2, @@ -30,7 +30,7 @@ static enum { SENSUS, SEABEAR, SUBSURFACE -} known; +}; ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(parent) { -- cgit v1.2.3-70-g09d2 From c1495f08ec68a067fc7d1e73445aab20b375f7e1 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:40:44 +0200 Subject: subsurfacewebservices.cpp: remove unused FILE variable Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/subsurfacewebservices.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index ee079cc48..c0866aa35 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -188,7 +188,6 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile, int i; struct dive *dive; for_each_dive (i, dive) { - FILE *f; char filename[PATH_MAX]; int streamsize; const char *membuf; -- cgit v1.2.3-70-g09d2 From c2ff2be210cba14386d8b468dd3e6fde5f4abc40 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:40:55 +0200 Subject: subsurfacewebservices.cpp: make sure 'changed' is not unused Make sure 'changed' in SubsurfaceWebServices::buttonClicked() is not unused even if NO_MARBLE is defined. It appears to be used only in the #ifndef NO_MARBLE branch. Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/subsurfacewebservices.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'desktop-widgets') diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index c0866aa35..d66d3653b 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -411,6 +411,7 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton *button) struct dive *d; struct dive_site *ds; bool changed = false; + (void)changed; clear_table(&gps_location_table); QByteArray url = tr("Webservice").toLocal8Bit(); parse_xml_buffer(url.data(), downloadedData.data(), downloadedData.length(), &gps_location_table, NULL); -- cgit v1.2.3-70-g09d2 From 9614952611597bd70a49533e9f67ee084ca39a5d Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:44:06 +0200 Subject: mainwindow.cpp: remove unused variable 'diveSitePictures' Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/mainwindow.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index e1f82fdf1..b9112c11a 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -137,8 +137,6 @@ MainWindow::MainWindow() : QMainWindow(), connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite, mainTab, &MainTab::refreshDisplayedDiveSite); - QWidget *diveSitePictures = new QWidget(); // Placeholder - std::pair enabled = std::make_pair("enabled", QVariant(true)); std::pair disabled = std::make_pair("enabled", QVariant(false)); PropertyList enabledList; -- cgit v1.2.3-70-g09d2 From e7cd9d615c7a6b002775bad11f5c43c8130c0c3e Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:46:29 +0200 Subject: facebook_integration.cpp: add return statement to a 'bool' method Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/plugins/facebook/facebook_integration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/plugins/facebook/facebook_integration.cpp b/desktop-widgets/plugins/facebook/facebook_integration.cpp index e9b2297a0..700c8f624 100644 --- a/desktop-widgets/plugins/facebook/facebook_integration.cpp +++ b/desktop-widgets/plugins/facebook/facebook_integration.cpp @@ -7,7 +7,7 @@ FacebookPlugin::FacebookPlugin(QObject* parent): QObject(parent) bool FacebookPlugin::isConnected() { - + return false; } void FacebookPlugin::requestLogin() -- cgit v1.2.3-70-g09d2 From 6f713fcb9999071d1e16d221bda6db5708e18666 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:48:06 +0200 Subject: maintab.cpp: remove unused variable Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/maintab.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/maintab.cpp b/desktop-widgets/maintab.cpp index 864c24782..c36c69f20 100644 --- a/desktop-widgets/maintab.cpp +++ b/desktop-widgets/maintab.cpp @@ -1642,6 +1642,6 @@ void MainTab::contextMenuEvent(QContextMenuEvent *event) popup.addSeparator(); popup.addAction(tr("Delete selected images"), this, SLOT(removeSelectedPhotos())); popup.addAction(tr("Delete all images"), this, SLOT(removeAllPhotos())); - QAction *actionTaken = popup.exec(event->globalPos()); + popup.exec(event->globalPos()); event->accept(); } -- cgit v1.2.3-70-g09d2 From aee6f0b2c4131ec65c1e1688eb9648d66c0bd506 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 22:50:30 +0200 Subject: diveshareexportdialog.cpp: fix an argument order warning Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/diveshareexportdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp index 9fe6eefd6..435f5366e 100644 --- a/desktop-widgets/diveshareexportdialog.cpp +++ b/desktop-widgets/diveshareexportdialog.cpp @@ -11,8 +11,8 @@ DiveShareExportDialog::DiveShareExportDialog(QWidget *parent) : QDialog(parent), ui(new Ui::DiveShareExportDialog), - reply(NULL), - exportSelected(false) + exportSelected(false), + reply(NULL) { ui->setupUi(this); } -- cgit v1.2.3-70-g09d2 From 73ddd57cf0e3ce3c45ba9c340af47ae74267235a Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 23:00:14 +0200 Subject: preferences_network.cpp: remove some unused 'reply' variables Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/preferences/preferences_network.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'desktop-widgets') 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 +} -- cgit v1.2.3-70-g09d2 From 809f50753770a6b55cafb0ac5d9dc0a63b47d0d4 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 23:17:24 +0200 Subject: preferencesdialog.cpp: silence a switch warning Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/preferences/preferencesdialog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'desktop-widgets') 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; } } -- cgit v1.2.3-70-g09d2 From 829f7a2ee264b4e25e8ea926a98199f8049a23d6 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 7 Nov 2015 23:20:09 +0200 Subject: abstractpreferenceswidget.cpp: fix argument warning Signed-off-by: Lubomir I. Ivanov --- desktop-widgets/preferences/abstractpreferenceswidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop-widgets') 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) { } -- cgit v1.2.3-70-g09d2