diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-06-03 22:15:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-04 08:50:10 -0700 |
| commit | 36b9e5e31eca0354f9ad277fb668c3846714b81e (patch) | |
| tree | 81c2f5127c9f8259cd661ab7947e5607d6e14bd9 /core/qthelper.cpp | |
| parent | 9f349a4efca6ef10efaf2b9c70f2ebb22278747e (diff) | |
| download | subsurface-36b9e5e31eca0354f9ad277fb668c3846714b81e.tar.gz | |
Cleanup: fold core/helpers.h into core/qthelper.h
helpers.h included qthelper.h and all functions declared in helpers.h
were defined in qthelper.h. Therefore fold the former into the latter,
since the split seems completely arbitrary.
While doing so, change the return-type of get_dc_nichname from
"const QString" to "QString".
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/qthelper.cpp')
| -rw-r--r-- | core/qthelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/qthelper.cpp b/core/qthelper.cpp index cf4f8d021..b09e125ca 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "qthelper.h" #include "subsurface-string.h" -#include "helpers.h" #include "subsurface-string.h" #include "gettextfromc.h" #include "statistics.h" @@ -556,7 +555,7 @@ void set_filename(const char *filename) existing_filename = copy_string(filename); } -const QString get_dc_nickname(const char *model, uint32_t deviceid) +QString get_dc_nickname(const char *model, uint32_t deviceid) { const DiveComputerNode *existNode = dcList.getExact(model, deviceid); |