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/subsurface-qt | |
| 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/subsurface-qt')
| -rw-r--r-- | core/subsurface-qt/CylinderObjectHelper.cpp | 2 | ||||
| -rw-r--r-- | core/subsurface-qt/DiveObjectHelper.cpp | 1 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/subsurface-qt/CylinderObjectHelper.cpp b/core/subsurface-qt/CylinderObjectHelper.cpp index ccff48d36..f2216af6f 100644 --- a/core/subsurface-qt/CylinderObjectHelper.cpp +++ b/core/subsurface-qt/CylinderObjectHelper.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "CylinderObjectHelper.h" -#include "../helpers.h" +#include "../qthelper.h" static QString EMPTY_CYLINDER_STRING = QStringLiteral(""); CylinderObjectHelper::CylinderObjectHelper(cylinder_t *cylinder) : diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index a1cfa4540..46f274522 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -5,7 +5,6 @@ #include <QTextDocument> #include "core/qthelper.h" -#include "core/helpers.h" #include "core/subsurface-string.h" #include "qt-models/tankinfomodel.h" diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 60473ec1a..ec80f62b8 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -6,7 +6,7 @@ #include <QDate> #include <QNetworkProxy> -#include "core/helpers.h" +#include "core/qthelper.h" DiveComputerSettings::DiveComputerSettings(QObject *parent): QObject(parent) |