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 /qt-models/divetripmodel.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 'qt-models/divetripmodel.cpp')
| -rw-r--r-- | qt-models/divetripmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index 1e1f1530f..329858b34 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -3,7 +3,7 @@ #include "core/gettextfromc.h" #include "core/metrics.h" #include "core/divelist.h" -#include "core/helpers.h" +#include "core/qthelper.h" #include "core/subsurface-string.h" #include <QIcon> #include <QDebug> |