From 36b9e5e31eca0354f9ad277fb668c3846714b81e Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 3 Jun 2018 22:15:19 +0200 Subject: 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 --- desktop-widgets/tab-widgets/TabDiveInformation.cpp | 2 +- desktop-widgets/tab-widgets/TabDiveStatistics.cpp | 2 +- desktop-widgets/tab-widgets/maintab.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'desktop-widgets/tab-widgets') 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 +#include #include #include 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 +#include #include #include 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" -- cgit v1.2.3-70-g09d2