mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
preferences: use std::string in struct preferences
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:
parent
82fc9de40b
commit
ccdd92aeb7
78 changed files with 645 additions and 694 deletions
|
@ -911,7 +911,7 @@ static std::string fingerprint_file(device_data_t *devdata)
|
|||
serial = devdata->devinfo.serial;
|
||||
|
||||
return format_string_std("%s/fingerprints/%04x.%u",
|
||||
system_default_directory(),
|
||||
system_default_directory().c_str(),
|
||||
model, serial);
|
||||
}
|
||||
|
||||
|
@ -952,7 +952,7 @@ static void save_fingerprint(device_data_t *devdata)
|
|||
return;
|
||||
|
||||
// Make sure the fingerprints directory exists
|
||||
std::string dir = format_string_std("%s/fingerprints", system_default_directory());
|
||||
std::string dir = system_default_directory() + "/fingerprints";
|
||||
subsurface_mkdir(dir.c_str());
|
||||
|
||||
std::string final = fingerprint_file(devdata);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue