mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove DiveItem::icon_names member array

Browse source 
Each DiveItem (which is a wrapper around diveId with some virtual
functions), had a member icon_names, which is an array of
four QStrings. These were not used anywhere and must be an obscure
oversight and was probably planned as a static cons array?.
In any case, remove it.

There *was* a function-local analogous icon_names array in
DiveItem::data() though. This array would initialize four
QStrings from C-string literals on every invocation. Make
this array static, local to the translation unit and use
the QStringLiteral macro to construct the QString object at
compile-time.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-07-22 12:21:58 +02:00 committed by Lubomir I. Ivanov
parent be50ee2017
commit 7dd49acf4b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qt-models/divetripmodel.cpp
View file

@ -82,11 +82,16 @@ QVariant TripItem::data(int column, int role) const
return ret; return ret;
} }
static const QString icon_names[4] = {
QStringLiteral(":zero"),
QStringLiteral(":photo-in-icon"),
QStringLiteral(":photo-out-icon"),
QStringLiteral(":photo-in-out-icon")
};
QVariant DiveItem::data(int column, int role) const QVariant DiveItem::data(int column, int role) const
{ {
QVariant retVal; QVariant retVal;
QString icon_names[4] = {":zero",":photo-in-icon", ":photo-out-icon", ":photo-in-out-icon" };
struct dive *dive = get_dive_by_uniq_id(diveId); struct dive *dive = get_dive_by_uniq_id(diveId);
if (!dive) if (!dive)
return QVariant(); return QVariant();

1
qt-models/divetripmodel.h
View file

@ -47,7 +47,6 @@ public:
QString displayTags() const; QString displayTags() const;
int countPhotos(dive *dive) const; int countPhotos(dive *dive) const;
int weight() const; int weight() const;
QString icon_names[4];
}; };
struct TripItem : public TreeItem { struct TripItem : public TreeItem {