mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: convert divesite strings to std::string
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
3916125786
commit
7d3977481a
38 changed files with 181 additions and 222 deletions
|
@ -59,7 +59,7 @@ QVariant DivesiteImportedModel::data(const QModelIndex &index, int role) const
|
|||
if (role == Qt::DisplayRole) {
|
||||
switch (index.column()) {
|
||||
case NAME:
|
||||
return QString(ds->name);
|
||||
return QString::fromStdString(ds->name);
|
||||
case LOCATION:
|
||||
return printGPSCoords(&ds->location);
|
||||
case COUNTRY:
|
||||
|
@ -70,7 +70,7 @@ QVariant DivesiteImportedModel::data(const QModelIndex &index, int role) const
|
|||
get_dive_site_by_gps_proximity(&ds->location,
|
||||
40075000, divelog.sites);
|
||||
if (nearest_ds)
|
||||
return QString(nearest_ds->name);
|
||||
return QString::fromStdString(nearest_ds->name);
|
||||
else
|
||||
return QString();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue