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 /desktop-widgets/tab-widgets | |
| 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 'desktop-widgets/tab-widgets')
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveInformation.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveStatistics.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 18391e7ca..09f180cb1 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp @@ -3,7 +3,7 @@ #include "ui_TabDiveInformation.h" #include "../tagwidget.h" -#include <core/helpers.h> +#include <core/qthelper.h> #include <core/statistics.h> #include <core/display.h> diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp index cc7946a88..55f61eb5a 100644 --- a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp +++ b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp @@ -2,7 +2,7 @@ #include "TabDiveStatistics.h" #include "ui_TabDiveStatistics.h" -#include <core/helpers.h> +#include <core/qthelper.h> #include <core/display.h> #include <core/statistics.h> diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index c9dccc7ea..62925ee52 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -8,7 +8,7 @@ #include "desktop-widgets/tab-widgets/maintab.h" #include "desktop-widgets/mainwindow.h" #include "desktop-widgets/mapwidget.h" -#include "core/helpers.h" +#include "core/qthelper.h" #include "core/statistics.h" #include "desktop-widgets/modeldelegates.h" #include "qt-models/diveplannermodel.h" |