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

fulltext: replace plain pointer by std::unique_ptr<>

Browse source 
This was a plain pointer owing to C compatibility.

Replacing it by a unique_ptr<> allows us to make it
'self-desctruct' in the constructor. However, we do this
with a special twist: the data is _not_ copied when copying
the dive, since the copied dive is not registered in the fulltext
system. Hackish, but it should(!) work.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-03 19:09:43 +02:00 • committed by bstoeger
parent 5c7cfb1057
commit c9d4ce0c15
4 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/fulltext.cpp
View file

@ -10,11 +10,6 @@
#include <QLocale>
#include <map>
// This class caches each dives words, so that we can unregister a dive from the full text search
struct full_text_cache {
std::vector<QString> words;
};
// The FullText-search class
class FullText {
std::map<QString, std::vector<dive *>> words; // Dives that belong to each word
@ -160,7 +155,7 @@ void FullText::registerDive(struct dive *d)
if (d->full_text)
unregisterWords(d, d->full_text->words);
else
d->full_text = new full_text_cache;
d->full_text = std::make_unique<full_text_cache>();
d->full_text->words = getWords(d);
registerWords(d, d->full_text->words);
}
@ -170,18 +165,15 @@ void FullText::unregisterDive(struct dive *d)
if (!d->full_text)
return;
unregisterWords(d, d->full_text->words);
delete d->full_text;
d->full_text = nullptr;
d->full_text.reset();
}
void FullText::unregisterAll()
{
int i;
dive *d;
for_each_dive(i, d) {
delete d->full_text;
d->full_text = nullptr;
}
for_each_dive(i, d)
d->full_text.reset();
words.clear();
}