aboutsummaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/btdeviceselectiondialog.cpp3
-rw-r--r--desktop-widgets/divelogimportdialog.cpp4
-rw-r--r--desktop-widgets/diveshareexportdialog.cpp4
-rw-r--r--desktop-widgets/locationinformation.cpp1
-rw-r--r--desktop-widgets/maintab.cpp2
-rw-r--r--desktop-widgets/mainwindow.cpp2
-rw-r--r--desktop-widgets/plugins/facebook/facebook_integration.cpp2
-rw-r--r--desktop-widgets/preferences/abstractpreferenceswidget.cpp2
-rw-r--r--desktop-widgets/preferences/preferences_network.cpp8
-rw-r--r--desktop-widgets/preferences/preferencesdialog.cpp1
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp2
11 files changed, 14 insertions, 17 deletions
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;
}
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)
{
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);
}
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;
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();
}
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<QByteArray, QVariant> enabled = std::make_pair("enabled", QVariant(true));
std::pair<QByteArray, QVariant> disabled = std::make_pair("enabled", QVariant(false));
PropertyList enabledList;
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()
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;
}
}
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index ee079cc48..d66d3653b 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;
@@ -412,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);