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

16
core/android.cpp
View file

@ -41,31 +41,31 @@ static std::string make_default_filename()
return system_default_path() + "/subsurface.xml";
}
const char android_system_divelist_default_font[] = "Roboto";
const char *system_divelist_default_font = android_system_divelist_default_font;
double system_divelist_default_font_size = -1;
using namespace std::string_literals;
std::string system_divelist_default_font = "Roboto"s;
double system_divelist_default_font_size = -1.0;
int get_usb_fd(uint16_t idVendor, uint16_t idProduct);
void subsurface_OS_pref_setup()
{
}
bool subsurface_ignore_font(const char *font)
bool subsurface_ignore_font(const std::string &font)
{
// there are no old default fonts that we would want to ignore
return false;
}
const char *system_default_directory()
std::string system_default_directory()
{
static const std::string path = system_default_path();
return path.c_str();
return path;
}
const char *system_default_filename()
std::string system_default_filename()
{
static const std::string fn = make_default_filename();
return fn.c_str();
return fn;
}