mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: make lastUsedDir() functions static and non-slot, respectively

Browse source 
The lastUsedDir() functions of MainWindow and Smrtk2ssrfcWindow don't
use any member-objects and are only used in their respective translation
units. Therefore, remove them from the class and made of static linkage.

The lastUsedImageDir() function was declared as a slog, which makes
no sense. Make it a normal static function (though one might argue
why it is assiociated with the DiveListView class in the first place).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-06-09 16:24:39 +02:00 • committed by Dirk Hohndel
parent 64c0881e9f
commit 4e8079f527
5 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
desktop-widgets/mainwindow.cpp
View file

@ -544,6 +544,18 @@ void MainWindow::on_actionNew_triggered()
on_actionClose_triggered();
}
static QString lastUsedDir()
{
QSettings settings;
QString lastDir = QDir::homePath();
settings.beginGroup("FileDialog");
if (settings.contains("LastDir"))
if (QDir(settings.value("LastDir").toString()).exists())
lastDir = settings.value("LastDir").toString();
return lastDir;
}
void MainWindow::on_actionOpen_triggered()
{
if (!okToClose(tr("Please save or cancel the current dive edit before opening a new file.")))
@ -784,18 +796,6 @@ void MainWindow::on_actionClose_triggered()
}
}
QString MainWindow::lastUsedDir()
{
QSettings settings;
QString lastDir = QDir::homePath();
settings.beginGroup("FileDialog");
if (settings.contains("LastDir"))
if (QDir(settings.value("LastDir").toString()).exists())
lastDir = settings.value("LastDir").toString();
return lastDir;
}
void MainWindow::updateLastUsedDir(const QString &dir)
{
QSettings s;