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: port filterpreset.cpp to std::string

Browse source 
Less memory management hassle.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-02-29 13:39:17 +01:00 • committed by Michael Keller
parent 2e1d852e36
commit 119fe908c7
11 changed files with 44 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commands/command_filter.cpp
View file

@ -6,16 +6,16 @@
namespace Command {
static int createFilterPreset(const QString &name, const FilterData &data)
static int createFilterPreset(const std::string &name, const FilterData &data)
{
int index = filter_preset_add(name, data);
emit diveListNotifier.filterPresetAdded(index);
return index;
}
static std::pair<QString, FilterData> removeFilterPreset(int index)
static std::pair<std::string, FilterData> removeFilterPreset(int index)
{
QString oldName = filter_preset_name_qstring(index);
std::string oldName = filter_preset_name(index);
FilterData oldData = filter_preset_get(index);
filter_preset_delete(index);
emit diveListNotifier.filterPresetRemoved(index);
@ -23,7 +23,7 @@ static std::pair<QString, FilterData> removeFilterPreset(int index)
}
CreateFilterPreset::CreateFilterPreset(const QString &nameIn, const FilterData &dataIn) :
name(nameIn), data(dataIn), index(0)
name(nameIn.toStdString()), data(dataIn), index(0)
{
setText(Command::Base::tr("Create filter preset %1").arg(nameIn));
}
@ -46,7 +46,7 @@ void CreateFilterPreset::undo()
RemoveFilterPreset::RemoveFilterPreset(int indexIn) : index(indexIn)
{
setText(Command::Base::tr("Delete filter preset %1").arg(filter_preset_name_qstring(index)));
setText(Command::Base::tr("Delete filter preset %1").arg(QString(filter_preset_name(index).c_str())));
}
bool RemoveFilterPreset::workToBeDone()
@ -68,7 +68,7 @@ void RemoveFilterPreset::undo()
EditFilterPreset::EditFilterPreset(int indexIn, const FilterData &dataIn) :
index(indexIn), data(dataIn)
{
setText(Command::Base::tr("Edit filter preset %1").arg(filter_preset_name_qstring(index)));
setText(Command::Base::tr("Edit filter preset %1").arg(QString(filter_preset_name(index).c_str())));
}
bool EditFilterPreset::workToBeDone()