mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 20:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fulltext: rename fulltext_reload() to fulltext_populate()

Browse source 
This function was named improperly: it was only used on freshly
loaded data. Indeed, attempts to use it to actually reload lead
to crashes.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-04-08 09:05:28 +02:00 • committed by Dirk Hohndel
parent d8b92a1852
commit d9599589c7
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/divelist.c
View file

@ -831,7 +831,7 @@ void process_loaded_dives()
/* Autogroup dives if desired by user. */ /* Autogroup dives if desired by user. */
autogroup_dives(&dive_table, &trip_table); autogroup_dives(&dive_table, &trip_table);
fulltext_reload(); fulltext_populate();
} }
/* /*

8
core/fulltext.cpp
View file

@ -18,7 +18,7 @@ class FullText {
std::map<QString, std::vector<dive *>> words; // Dives that belong to each word std::map<QString, std::vector<dive *>> words; // Dives that belong to each word
public: public:
void reload(); // Rebuild from current dive_table void populate(); // Rebuild from current dive_table
void registerDive(struct dive *d); // Note: can be called repeatedly void registerDive(struct dive *d); // Note: can be called repeatedly
void unregisterDive(struct dive *d); // Note: can be called repeatedly void unregisterDive(struct dive *d); // Note: can be called repeatedly
void unregisterAll(); // Unregister all dives in the dive table void unregisterAll(); // Unregister all dives in the dive table
@ -51,9 +51,9 @@ void fulltext_unregister_all()
self.unregisterAll(); self.unregisterAll();
} }
void fulltext_reload() void fulltext_populate()
{ {
self.reload(); self.populate();
} }
} // extern "C" } // extern "C"
@ -141,7 +141,7 @@ static std::vector<QString> getWords(const dive *d)
return res; return res;
} }
void FullText::reload() void FullText::populate()
{ {
// we want this to be two calls as the second text is overwritten below by the lines starting with "\r" // we want this to be two calls as the second text is overwritten below by the lines starting with "\r"
uiNotification(QObject::tr("Create full text index")); uiNotification(QObject::tr("Create full text index"));

2
core/fulltext.h
View file

@ -24,7 +24,7 @@ struct dive;
void fulltext_register(struct dive *d); // Note: can be called repeatedly void fulltext_register(struct dive *d); // Note: can be called repeatedly
void fulltext_unregister(struct dive *d); // Note: can be called repeatedly void fulltext_unregister(struct dive *d); // Note: can be called repeatedly
void fulltext_unregister_all(); // Unregisters all dives in the dive table void fulltext_unregister_all(); // Unregisters all dives in the dive table
void fulltext_reload(); // Registers all dives in the dive table void fulltext_populate(); // Registers all dives in the dive table
#ifdef __cplusplus #ifdef __cplusplus
} }