mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Settings update: Some code cleanup
The only block of code that I removed here is because the QSettings preferences that is being read is the exact one that we populate on the prefs. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
a1b22797ca
commit
83236f7e9e
2 changed files with 1 additions and 7 deletions
|
@ -906,7 +906,6 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event)
|
|||
event->accept();
|
||||
}
|
||||
|
||||
|
||||
void DiveListView::shiftTimes()
|
||||
{
|
||||
ShiftTimesDialog::instance()->show();
|
||||
|
@ -950,7 +949,6 @@ void DiveListView::loadWebImages()
|
|||
if (!urlDialog.exec())
|
||||
return;
|
||||
loadImageFromURL(QUrl::fromUserInput(urlDialog.url()));
|
||||
|
||||
}
|
||||
|
||||
void DiveListView::loadImageFromURL(QUrl url)
|
||||
|
@ -993,11 +991,8 @@ void DiveListView::loadImageFromURL(QUrl url)
|
|||
matchImagesToDives(QStringList(url.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
QString DiveListView::lastUsedImageDir()
|
||||
{
|
||||
QSettings settings;
|
||||
|
|
|
@ -384,8 +384,7 @@ SubsurfaceWebServices::SubsurfaceWebServices(QWidget *parent, Qt::WindowFlags f)
|
|||
|
||||
// figure out if we know (or can determine) the user's web service userid
|
||||
QString userid(prefs.userid);
|
||||
if (userid.isEmpty())
|
||||
userid = s.value("subsurface_webservice_uid").toString().toUpper();
|
||||
|
||||
if (userid.isEmpty() &&
|
||||
!same_string(prefs.cloud_storage_email, "") &&
|
||||
!same_string(prefs.cloud_storage_password, ""))
|
||||
|
|
Loading…
Add table
Reference in a new issue