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: replace dive master by dive guide

Browse source 
In general, replace "dive master" by "dive guide".

However, do not change written dive logs for now. On reading,
accept both versions.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-02-12 14:03:18 +01:00 • committed by Dirk Hohndel
parent 889827aadb
commit 9e0712d5dc
38 changed files with 141 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-models/completionmodels.cpp
View file

@ -53,14 +53,14 @@ bool BuddyCompletionModel::relevantDiveField(const DiveField &f)
return f.buddy;
}
QStringList DiveMasterCompletionModel::getStrings()
QStringList DiveGuideCompletionModel::getStrings()
{
return getCSVList(&dive::divemaster);
return getCSVList(&dive::diveguide);
}
bool DiveMasterCompletionModel::relevantDiveField(const DiveField &f)
bool DiveGuideCompletionModel::relevantDiveField(const DiveField &f)
{
return f.divemaster;
return f.diveguide;
}
QStringList SuitCompletionModel::getStrings()

2
qt-models/completionmodels.h
View file

@ -26,7 +26,7 @@ private:
bool relevantDiveField(const DiveField &f) override;
};
class DiveMasterCompletionModel final : public CompletionModelBase {
class DiveGuideCompletionModel final : public CompletionModelBase {
Q_OBJECT
private:
QStringList getStrings() override;

2
qt-models/divetripmodel.cpp
View file

@ -234,7 +234,7 @@ QVariant DiveTripModelBase::diveData(const struct dive *d, int column, int role)
case MobileListModel::WaterTempRole: return get_temperature_string(d->watertemp, true);
case MobileListModel::SacRole: return formatSac(d);
case MobileListModel::SumWeightRole: return formatSumWeight(d);
case MobileListModel::DiveMasterRole: return d->divemaster;
case MobileListModel::DiveGuideRole: return d->diveguide;
case MobileListModel::BuddyRole: return d->buddy;
case MobileListModel::TagsRole: return get_taglist_string(d->tag_list);
case MobileListModel::NotesRole: return formatNotes(d);

2
qt-models/mobilelistmodel.cpp
View file

@ -31,7 +31,7 @@ QHash<int, QByteArray> MobileListModelBase::roleNames() const
roles[WaterTempRole] = "waterTemp";
roles[SacRole] = "sac";
roles[SumWeightRole] = "sumWeight";
roles[DiveMasterRole] = "diveMaster";
roles[DiveGuideRole] = "diveGuide";
roles[BuddyRole] = "buddy";
roles[TagsRole] = "tags";
roles[NotesRole]= "notes";

2
qt-models/mobilelistmodel.h
View file

@ -39,7 +39,7 @@ public:
WaterTempRole,
SacRole,
SumWeightRole,
DiveMasterRole,
DiveGuideRole,
BuddyRole,
TagsRole,
NotesRole,