aboutsummaryrefslogtreecommitdiffstats
path: root/qt-models
diff options
context:
space:
mode:
authorGravatar Jeremie Guichard <djebrest@gmail.com>2018-04-09 10:09:34 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-04-09 07:59:51 -0700
commit7753352e6210ae69c2a79bdf2387eaca46becc64 (patch)
tree88c2594af6ff7c87b7923c7b3625653f3b5d7cfe /qt-models
parentf1830cd44e75ac552e09dfd79f6ec9e0d90f8808 (diff)
downloadsubsurface-7753352e6210ae69c2a79bdf2387eaca46becc64.tar.gz
Change taglist_get_tagstring to support 'unlimited' tag list size
Previous taglist_get_tagstring signature/implementation did not allow handling of cases where inputted buffer could not contain all tags. New implementation allocates buffer based on pre-computed size allowing to insert all tags in the returned string. Added get_taglist_string in qthelper to handle conversion to QString Added TestTagList with tests for taglist_get_tagstring Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
Diffstat (limited to 'qt-models')
-rw-r--r--qt-models/divetripmodel.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 082d3212e..7df52c94a 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -422,12 +422,7 @@ QString DiveItem::displayWeightWithUnit() const
QString DiveItem::displayTags() const
{
struct dive *dive = get_dive_by_uniq_id(diveId);
- if (!dive->tag_list)
- return QString();
-
- char buf[1024];
- taglist_get_tagstring(dive->tag_list, buf, 1024);
- return QString(buf);
+ return get_taglist_string(dive->tag_list);
}
int DiveItem::weight() const