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: use std::string in error_callback

Browse source 
No naked free().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-08 23:32:17 +02:00 • committed by bstoeger
parent 71f3189a31
commit d05e289507
8 changed files with 40 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

11
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -440,12 +440,11 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
// this breaks an "else if" across lines... not happy...
#endif
if (data->vendor() == "Uemis") {
char *colon;
char *devname = copy_qstring(ui.device->currentText());
if ((colon = strstr(devname, ":\\ (UEMISSDA)")) != NULL) {
*(colon + 2) = '\0';
report_info("shortened devname to \"%s\"", devname);
QString devname = ui.device->currentText();
auto colon = devname.indexOf(":\\ (UEMISSDA)");
if (colon >= 0) {
devname.resize(colon + 2);
report_info("shortened devname to \"%s\"", qPrintable(devname));
}
data->setDevName(devname);
} else {

8
desktop-widgets/mainwindow.cpp
View file

@ -107,11 +107,9 @@ int updateProgress(const char *text)
MainWindow *MainWindow::m_Instance = nullptr;
void showErrorFromC(char *buf)
static void showError(std::string err)
{
QString error(buf);
free(buf);
emit MainWindow::instance()->showError(error);
emit MainWindow::instance()->showError(QString::fromStdString(err));
}
MainWindow::MainWindow() :
@ -242,7 +240,7 @@ MainWindow::MainWindow() :
setupSocialNetworkMenu();
set_git_update_cb(&updateProgress);
set_error_cb(&showErrorFromC);
set_error_cb(&::showError);
// full screen support is buggy on Windows and Ubuntu.
// require the FULLSCREEN_SUPPORT macro to enable it!