mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: fold core/helpers.h into core/qthelper.h

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-06-03 22:15:19 +02:00 • committed by Dirk Hohndel
parent 9f349a4efc
commit 36b9e5e31e
53 changed files with 85 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/configuredivecomputerdialog.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "desktop-widgets/mainwindow.h"
#include "core/display.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"

2
desktop-widgets/divecomputermanagementdialog.cpp
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/divecomputermanagementdialog.h"
#include "desktop-widgets/mainwindow.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "qt-models/divecomputermodel.h"
#include <QMessageBox>
#include <QShortcut>

1
desktop-widgets/divelistview.cpp
View file

@ -24,7 +24,6 @@
#include "desktop-widgets/divelistview.h"
#include "qt-models/divepicturemodel.h"
#include "core/metrics.h"
#include "core/helpers.h"
DiveListView::DiveListView(QWidget *parent) : QTreeView(parent), mouseClickSelection(false), sortColumn(0),
currentOrder(Qt::DescendingOrder), dontEmitDiveChangedSignal(false), selectionSaved(false)

1
desktop-widgets/divelogexportdialog.h
View file

@ -5,7 +5,6 @@
#include <QDialog>
#include <QTextStream>
#include <QFuture>
#include "core/helpers.h"
#include "core/statistics.h"
class QAbstractButton;

2
desktop-widgets/diveplanner.cpp
View file

@ -3,7 +3,7 @@
#include "desktop-widgets/modeldelegates.h"
#include "desktop-widgets/mainwindow.h"
#include "core/planner.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "qt-models/cylindermodel.h"

2
desktop-widgets/diveshareexportdialog.cpp
View file

@ -4,7 +4,7 @@
#include "desktop-widgets/mainwindow.h"
#include "core/save-html.h"
#include "desktop-widgets/subsurfacewebservices.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "core/cloudstorage.h"
#include <QDesktopServices>

2
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/downloadfromdivecomputer.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "desktop-widgets/mainwindow.h"
#include "desktop-widgets/divelistview.h"
#include "core/display.h"

2
desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
View file

@ -26,7 +26,7 @@
#include "profile-widget/profilewidget2.h"
#include "core/pref.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "ui_socialnetworksdialog.h"

2
desktop-widgets/preferences/preferences_language.cpp
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "preferences_language.h"
#include "ui_preferences_language.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include <QApplication>

2
desktop-widgets/printer.cpp
View file

@ -2,7 +2,7 @@
#include "printer.h"
#include "templatelayout.h"
#include "core/statistics.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include <algorithm>
#include <QPainter>

2
desktop-widgets/printoptions.cpp
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "printoptions.h"
#include "templateedit.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include <QDebug>
#include <QFileDialog>

3
desktop-widgets/simplewidgets.cpp
View file

@ -13,13 +13,12 @@
#include "core/file.h"
#include "desktop-widgets/mainwindow.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "libdivecomputer/parser.h"
#include "desktop-widgets/divelistview.h"
#include "core/display.h"
#include "profile-widget/profilewidget2.h"
#include "desktop-widgets/undocommands.h"
#include "core/qthelper.h"
#include "core/metadata.h"
class MinMaxAvgWidgetPrivate {

2
desktop-widgets/subsurfacewebservices.cpp
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/subsurfacewebservices.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "core/webservice.h"
#include "desktop-widgets/mainwindow.h"
#include "desktop-widgets/usersurvey.h"

2
desktop-widgets/tab-widgets/TabDiveInformation.cpp
View file

@ -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>

2
desktop-widgets/tab-widgets/TabDiveStatistics.cpp
View file

@ -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>

2
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -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"

1
desktop-widgets/templatelayout.cpp
View file

@ -3,7 +3,6 @@
#include <string>
#include "templatelayout.h"
#include "core/helpers.h"
#include "core/display.h"
QList<QString> grantlee_templates, grantlee_statistics_templates;

1
desktop-widgets/templatelayout.h
View file

@ -8,7 +8,6 @@
#include "printoptions.h"
#include "core/statistics.h"
#include "core/qthelper.h"
#include "core/helpers.h"
#include "core/subsurface-qt/DiveObjectHelper.h"
int getTotalWork(print_options *printOptions);

1
desktop-widgets/updatemanager.cpp
View file

@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/updatemanager.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include <QtNetwork>
#include <QMessageBox>

2
desktop-widgets/usermanual.cpp
View file

@ -5,7 +5,7 @@
#include "desktop-widgets/usermanual.h"
#include "desktop-widgets/mainwindow.h"
#include "core/helpers.h"
#include "core/qthelper.h"
SearchBar::SearchBar(QWidget *parent): QWidget(parent)
{

2
desktop-widgets/usersurvey.cpp
View file

@ -9,7 +9,7 @@
#include "desktop-widgets/subsurfacewebservices.h"
#include "desktop-widgets/updatemanager.h"
#include "core/helpers.h"
#include "core/qthelper.h"
#include "core/subsurfacesysinfo.h"
UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),