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

preferences: use std::string in struct preferences

Browse source 
This is a messy commit, because the "qPref" system relies
heavily on QString, which means lots of conversions between
the two worlds. Ultimately, I plan to base the preferences
system on std::string and only convert to QString when
pushing through Qt's property system or when writing into
Qt's settings.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-13 22:59:32 +02:00 • committed by bstoeger
parent 82fc9de40b
commit ccdd92aeb7
78 changed files with 645 additions and 694 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cli-downloader.cpp
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "qt-models/diveimportedmodel.h"
void cliDownloader(const char *vendor, const char *product, const char *device)
void cliDownloader(const std::string &vendor, const std::string &product, const std::string &device)
{
DiveImportedModel diveImportedModel;
DiveImportedModel::connect(&diveImportedModel, &DiveImportedModel::downloadFinished, [] {
@ -10,11 +10,11 @@ void cliDownloader(const char *vendor, const char *product, const char *device)
});
auto data = diveImportedModel.thread.data();
data->setVendor(vendor);
data->setProduct(product);
data->setVendor(QString::fromStdString(vendor));
data->setProduct(QString::fromStdString(product));
data->setBluetoothMode(false);
if (data->vendor() == "Uemis") {
QString devname(device);
QString devname = QString::fromStdString(device);
int colon = devname.indexOf(QStringLiteral(":\\ (UEMISSDA)"));
if (colon >= 0) {
devname.truncate(colon + 2);
@ -22,7 +22,7 @@ void cliDownloader(const char *vendor, const char *product, const char *device)
}
data->setDevName(devname);
} else {
data->setDevName(device);
data->setDevName(QString::fromStdString(device));
}
// some assumptions - should all be configurable