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

7
mobile-widgets/qmlmanager.cpp
View file

@ -66,10 +66,9 @@ bool noCloudToCloud = false;
#define RED_FONT QLatin1String("<font color=\"red\">")
#define END_FONT QLatin1String("</font>")
void showErrorFromC(char *buf)
static void showError(std::string s)
{
QString error(buf);
free(buf);
QString error = QString::fromStdString(s);
// By using invokeMethod with Qt:AutoConnection, the error string is safely
// transported across thread boundaries, if not called from the UI thread.
QMetaObject::invokeMethod(QMLManager::instance(), "registerError", Qt::AutoConnection, Q_ARG(QString, error));
@ -271,7 +270,7 @@ QMLManager::QMLManager() :
appendTextToLog("No writeable location found, in-memory log only and no libdivecomputer log");
}
#endif
set_error_cb(&showErrorFromC);
set_error_cb(&showError);
uiNotificationCallback = showProgress;
appendTextToLog("Starting " + getUserAgent());
appendTextToLog(QStringLiteral("built with libdivecomputer v%1").arg(dc_version(NULL)));