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: turn picture-table into std::vector<>

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-30 15:00:28 +02:00 • committed by bstoeger
parent 3cb04d230b
commit 9e3e0a5a05
29 changed files with 170 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/qthelper.cpp
View file

@ -333,24 +333,12 @@ std::string move_away(const std::string &old_path)
return newPath;
}
std::string get_file_name(const char *fileName)
std::string get_file_name(const std::string &fileName)
{
QFileInfo fileInfo(fileName);
QFileInfo fileInfo(fileName.c_str());
return fileInfo.fileName().toStdString();
}
void copy_image_and_overwrite(const char *cfileName, const char *path, const char *cnewName)
{
QString fileName(cfileName);
QString newName(path);
newName += cnewName;
QFile file(newName);
if (file.exists())
file.remove();
if (!QFile::copy(fileName, newName))
report_info("copy of %s to %s failed", cfileName, qPrintable(newName));
}
static bool lessThan(const QPair<QString, int> &a, const QPair<QString, int> &b)
{
return a.second < b.second;
@ -1174,9 +1162,9 @@ QStringList videoExtensionFilters()
return filters;
}
const char *local_file_path(struct picture *picture)
std::string local_file_path(const struct picture &picture)
{
return copy_qstring(localFilePath(picture->filename));
return localFilePath(QString::fromStdString(picture.filename)).toStdString();
}
QString get_gas_string(struct gasmix gas)