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
parent 5d36ba4593
commit 68ddce5b11
11 changed files with 44 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/filterpreset.cpp
View file

@ -14,14 +14,9 @@ extern "C" int filter_presets_count(void)
return (int)global_table().size();
}
extern "C" char *filter_preset_name(int preset)
extern std::string filter_preset_fulltext_query(int preset)
{
return copy_qstring(filter_preset_name_qstring(preset));
}
extern "C" char *filter_preset_fulltext_query(int preset)
{
return copy_qstring(global_table()[preset].data.fullText.originalQuery);
return global_table()[preset].data.fullText.originalQuery.toStdString();
}
extern "C" const char *filter_preset_fulltext_mode(int preset)
@ -73,7 +68,7 @@ extern "C" void filter_preset_set_name(struct filter_preset *preset, const char
preset->name = name;
}
static int filter_preset_add_to_table(const QString &name, const FilterData &d, struct filter_preset_table &table)
static int filter_preset_add_to_table(const std::string name, const FilterData &d, struct filter_preset_table &table)
{
// std::lower_bound does a binary search - the vector must be sorted.
filter_preset newEntry { name, d };
@ -85,14 +80,14 @@ static int filter_preset_add_to_table(const QString &name, const FilterData &d,
}
// Take care that the name doesn't already exist by adding numbers
static QString get_unique_preset_name(const QString &orig, const struct filter_preset_table &table)
static std::string get_unique_preset_name(const std::string &orig, const struct filter_preset_table &table)
{
QString res = orig;
std::string res = orig;
int count = 2;
while (std::find_if(table.begin(), table.end(),
[&res](const filter_preset &preset)
{ return preset.name == res; }) != table.end()) {
res = orig + "#" + QString::number(count);
res = orig + "#" + std::to_string(count);
++count;
}
return res;
@ -100,7 +95,7 @@ static QString get_unique_preset_name(const QString &orig, const struct filter_p
extern "C" void add_filter_preset_to_table(const struct filter_preset *preset, struct filter_preset_table *table)
{
QString name = get_unique_preset_name(preset->name, *table);
std::string name = get_unique_preset_name(preset->name, *table);
filter_preset_add_to_table(name, preset->data, *table);
}
@ -110,14 +105,14 @@ extern "C" void filter_preset_add_constraint(struct filter_preset *preset, const
preset->data.constraints.emplace_back(type, string_mode, range_mode, negate, data);
}
int filter_preset_id(const QString &name)
int filter_preset_id(const std::string &name)
{
auto it = std::find_if(global_table().begin(), global_table().end(),
[&name] (filter_preset &p) { return p.name == name; });
return it != global_table().end() ? it - global_table().begin() : -1;
}
QString filter_preset_name_qstring(int preset)
std::string filter_preset_name(int preset)
{
return global_table()[preset].name;
}
@ -132,9 +127,9 @@ FilterData filter_preset_get(int preset)
return global_table()[preset].data;
}
int filter_preset_add(const QString &nameIn, const FilterData &d)
int filter_preset_add(const std::string &nameIn, const FilterData &d)
{
QString name = get_unique_preset_name(nameIn, global_table());
std::string name = get_unique_preset_name(nameIn, global_table());
return filter_preset_add_to_table(name, d, global_table());
}

13
core/filterpreset.h
View file

@ -18,9 +18,9 @@ struct filter_constraint;
#ifdef __cplusplus
#include "divefilter.h"
#include <vector>
#include <QStringList>
#include <string>
struct filter_preset {
QString name;
std::string name;
FilterData data;
};
@ -44,8 +44,6 @@ extern "C" {
// The C IO code accesses the filter presets via integer indices.
extern int filter_presets_count(void);
extern char *filter_preset_name(int preset); // name of filter preset - caller must free the result.
extern char *filter_preset_fulltext_query(int preset); // fulltext query of filter preset - caller must free the result.
extern const char *filter_preset_fulltext_mode(int preset); // string mode of fulltext query. ownership is *not* passed to caller.
extern int filter_preset_constraint_count(int preset); // number of constraints in the filter preset.
extern const struct filter_constraint *filter_preset_constraint(int preset, int constraint); // get constraint. ownership is *not* passed to caller.
@ -66,12 +64,13 @@ extern void filter_preset_add_constraint(struct filter_preset *preset, const cha
struct FilterData;
int filter_preset_id(const QString &s); // for now, we assume that names are unique. returns -1 if no preset with that name.
QString filter_preset_name_qstring(int preset);
int filter_preset_id(const std::string &s); // for now, we assume that names are unique. returns -1 if no preset with that name.
void filter_preset_set(int preset, const FilterData &d); // this will override a preset if the name already exists.
FilterData filter_preset_get(int preset);
int filter_preset_add(const QString &name, const FilterData &d); // returns point of insertion
int filter_preset_add(const std::string &name, const FilterData &d); // returns point of insertion
void filter_preset_delete(int preset);
std::string filter_preset_name(int preset); // name of filter preset - caller must free the result.
std::string filter_preset_fulltext_query(int preset); // fulltext query of filter preset - caller must free the result.
#endif

14
core/save-git.cpp
View file

@ -984,18 +984,14 @@ static void format_one_filter_constraint(int preset_id, int constraint_id, struc
*/
static void format_one_filter_preset(int preset_id, struct membuffer *b)
{
char *name, *fulltext;
std::string name = filter_preset_name(preset_id);
show_utf8(b, "name ", name.c_str(), "\n");
name = filter_preset_name(preset_id);
show_utf8(b, "name ", name, "\n");
free(name);
fulltext = filter_preset_fulltext_query(preset_id);
if (!empty_string(fulltext)) {
std::string fulltext = filter_preset_fulltext_query(preset_id);
if (!fulltext.empty()) {
show_utf8(b, "fulltext mode=", filter_preset_fulltext_mode(preset_id), "");
show_utf8(b, " query=", fulltext, "\n");
show_utf8(b, " query=", fulltext.c_str(), "\n");
}
free(fulltext);
for (int i = 0; i < filter_preset_constraint_count(preset_id); i++)
format_one_filter_constraint(preset_id, i, b);

13
core/save-xml.cpp
View file

@ -641,20 +641,17 @@ static void save_filter_presets(struct membuffer *b)
return;
put_format(b, "<filterpresets>\n");
for (i = 0; i < filter_presets_count(); i++) {
char *name, *fulltext;
name = filter_preset_name(i);
std::string name = filter_preset_name(i);
put_format(b, " <filterpreset");
show_utf8(b, name, " name='", "'", 1);
show_utf8(b, name.c_str(), " name='", "'", 1);
put_format(b, ">\n");
free(name);
fulltext = filter_preset_fulltext_query(i);
if (!empty_string(fulltext)) {
std::string fulltext = filter_preset_fulltext_query(i);
if (!fulltext.empty()) {
const char *fulltext_mode = filter_preset_fulltext_mode(i);
show_utf8(b, fulltext_mode, " <fulltext mode='", "'>", 1);
show_utf8(b, fulltext, "", "</fulltext>\n", 0);
show_utf8(b, fulltext.c_str(), "", "</fulltext>\n", 0);
}
free(fulltext);
for (int j = 0; j < filter_preset_constraint_count(i); j++) {
const struct filter_constraint *constraint = filter_preset_constraint(i, j);