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

Cleanup: Move stringToList to core/qthelper.cpp

Browse source 
The same code was used in desktop and undo commands. Let's unify.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-01-10 07:09:17 +08:00 • committed by bstoeger
parent c495a49b1b
commit 2a97934db4
4 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands/command_edit.cpp
View file

@ -726,15 +726,6 @@ DiveField EditTags::fieldId() const
return DiveField::TAGS; return DiveField::TAGS;
} }
// String list helper
static QStringList stringToList(const QString &s)
{
QStringList res = s.split(",", QString::SkipEmptyParts);
for (QString &str: res)
str = str.trimmed();
return res;
}
// ***** Buddies ***** // ***** Buddies *****
QStringList EditBuddies::data(struct dive *d) const QStringList EditBuddies::data(struct dive *d) const
{ {

8
core/qthelper.cpp
View file

@ -1219,6 +1219,14 @@ QString get_taglist_string(struct tag_entry *tag_list)
return ret; return ret;
} }
QStringList stringToList(const QString &s)
{
QStringList res = s.split(",", QString::SkipEmptyParts);
for (QString &str: res)
str = str.trimmed();
return res;
}
weight_t string_to_weight(const char *str) weight_t string_to_weight(const char *str)
{ {
const char *end; const char *end;

1
core/qthelper.h
View file

@ -29,6 +29,7 @@ QList<int> getDivesInTrip(struct dive_trip *trip);
QString get_gas_string(struct gasmix gas); QString get_gas_string(struct gasmix gas);
QString get_divepoint_gas_string(struct dive *d, const struct divedatapoint &dp); QString get_divepoint_gas_string(struct dive *d, const struct divedatapoint &dp);
QString get_taglist_string(struct tag_entry *tag_list); QString get_taglist_string(struct tag_entry *tag_list);
QStringList stringToList(const QString &s);
void read_hashes(); void read_hashes();
void write_hashes(); void write_hashes();
QString thumbnailFileName(const QString &filename); QString thumbnailFileName(const QString &filename);

8
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -631,14 +631,6 @@ void MainTab::divesEdited(int i)
ui.multiDiveWarningMessage->show(); ui.multiDiveWarningMessage->show();
} }
static QStringList stringToList(const QString &s)
{
QStringList res = s.split(",", QString::SkipEmptyParts);
for (QString &str: res)
str = str.trimmed();
return res;
}
void MainTab::on_buddy_editingFinished() void MainTab::on_buddy_editingFinished()
{ {
if (editMode == IGNORE_MODE || !current_dive) if (editMode == IGNORE_MODE || !current_dive)