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 /profile-widget | |
| 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 'profile-widget')
| -rw-r--r-- | profile-widget/divecartesianaxis.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/diveprofileitem.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 062ed78fc..29a4165b1 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "profile-widget/divecartesianaxis.h" #include "profile-widget/divetextitem.h" -#include "core/helpers.h" +#include "core/qthelper.h" #include "core/subsurface-string.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #ifndef SUBSURFACE_MOBILE diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index 4e7cc0a36..eca2637cf 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -9,7 +9,7 @@ #include "desktop-widgets/preferences/preferencesdialog.h" #endif #include "qt-models/diveplannermodel.h" -#include "core/helpers.h" +#include "core/qthelper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #include "libdivecomputer/parser.h" #include "profile-widget/profilewidget2.h" diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 25bff64ea..5a1babb99 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -2,7 +2,7 @@ #include "profile-widget/profilewidget2.h" #include "qt-models/diveplotdatamodel.h" #include "core/subsurface-string.h" -#include "core/helpers.h" +#include "core/qthelper.h" #include "core/profile.h" #include "profile-widget/diveeventitem.h" #include "profile-widget/divetextitem.h" |