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

core: make getCloudURL() return an std::string

Browse source 
Let's use std::string in the core. Notably, I'd like to make
the numerous main() functions mostly independent of Qt. Some
things will have to remain, such as argument parsing, of course.

This changes the API: instead of returning an error code and
taking a pointer to the actual return-value, return an
std::optional<std::string>> that is set if the function succeeds.

Returning an empty string in the error case might be simpler,
but oh well...

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-24 22:05:28 +01:00 • committed by bstoeger
parent 8e106b0449
commit c6cd10a43f
7 changed files with 54 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

18
desktop-widgets/mainwindow.cpp
View file

@ -404,17 +404,17 @@ void MainWindow::on_actionCloudstorageopen_triggered()
if (!okToClose(tr("Please save or cancel the current dive edit before opening a new file.")))
return;
QString filename;
if (getCloudURL(filename))
auto filename = getCloudURL();
if (!filename)
return;
if (verbose)
qDebug() << "Opening cloud storage from:" << filename;
report_info("Opening cloud storage from: %s", filename->c_str());
closeCurrentFile();
showProgressBar();
QByteArray fileNamePtr = QFile::encodeName(filename);
QByteArray fileNamePtr = QFile::encodeName(QString::fromStdString(*filename));
if (!parse_file(fileNamePtr.data(), &divelog))
setCurrentFile(fileNamePtr.toStdString());
process_loaded_dives();
@ -435,23 +435,23 @@ static bool saveToCloudOK()
void MainWindow::on_actionCloudstoragesave_triggered()
{
QString filename;
if (!saveToCloudOK())
return;
if (getCloudURL(filename))
auto filename = getCloudURL();
if (!filename)
return;
if (verbose)
qDebug() << "Saving cloud storage to:" << filename;
report_info("Saving cloud storage to: %s", filename->c_str());
mainTab->stealFocus(); // Make sure that any currently edited field is updated before saving.
showProgressBar();
int error = save_dives(qPrintable(filename));
int error = save_dives(filename->c_str());
hideProgressBar();
if (error)
return;
setCurrentFile(filename.toStdString());
setCurrentFile(*filename);
Command::setClean();
}