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: remove getDivesInTrip() in qthelper.cpp

Browse source 
This function was not used anywhere. Moreover, remove a few
unused includes from qthelper.h. Surprisingly, a number of users
of qthelper.h depend on these, so readd them at the appropriate
places.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-12-28 14:30:57 +01:00 • committed by Dirk Hohndel
parent 8758b95881
commit bbbd4c8818
7 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/metadata.cpp
View file

@ -5,6 +5,7 @@
#include "qthelper.h" #include "qthelper.h"
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#include <QFileInfo>
#include <QDateTime> #include <QDateTime>
// Weirdly, android builds fail owing to undefined UINT64_MAX // Weirdly, android builds fail owing to undefined UINT64_MAX

1
core/qt-init.cpp
View file

@ -4,6 +4,7 @@
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QTextCodec> #include <QTextCodec>
#include <QTranslator>
#include "qthelper.h" #include "qthelper.h"
#include "errorhelper.h" #include "errorhelper.h"
#include "core/settings/qPref.h" #include "core/settings/qPref.h"

13
core/qthelper.cpp
View file

@ -290,19 +290,6 @@ bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_te
} }
#endif #endif
QList<int> getDivesInTrip(dive_trip_t *trip)
{
QList<int> ret;
int i;
struct dive *d;
for_each_dive (i, d) {
if (d->divetrip == trip) {
ret.push_back(get_divenr(d));
}
}
return ret;
}
static xmlDocPtr get_stylesheet_doc(const xmlChar *uri, xmlDictPtr, int, void *, xsltLoadType) static xmlDocPtr get_stylesheet_doc(const xmlChar *uri, xmlDictPtr, int, void *, xsltLoadType)
{ {
QFile f(QLatin1String(":/xslt/") + (const char *)uri); QFile f(QLatin1String(":/xslt/") + (const char *)uri);

5
core/qthelper.h
View file

@ -19,15 +19,12 @@ enum watertypes {FRESHWATER, BRACKISHWATER, EN13319WATER, SALTWATER, DC_WATERTYP
#ifdef __cplusplus #ifdef __cplusplus
#include <QMultiMap>
#include <QString> #include <QString>
#include <QTranslator>
#include <QDir>
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
QString weight_string(int weight_in_grams); QString weight_string(int weight_in_grams);
QString distance_string(int distanceInMeters); QString distance_string(int distanceInMeters);
bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0); bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0);
QList<int> getDivesInTrip(struct dive_trip *trip);
QString get_gas_string(struct gasmix gas); QString get_gas_string(struct gasmix gas);
QString get_taglist_string(struct tag_entry *tag_list); QString get_taglist_string(struct tag_entry *tag_list);
QStringList stringToList(const QString &s); QStringList stringToList(const QString &s);

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

@ -4,7 +4,7 @@
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPrefLanguage.h" #include "core/settings/qPrefLanguage.h"
#include <QApplication> #include <QDir>
#include <QMessageBox> #include <QMessageBox>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>

2
desktop-widgets/templatelayout.cpp
View file

@ -1,4 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <QDir>
#include <QFile>
#include <QFileDevice> #include <QFileDevice>
#include <QRegularExpression> #include <QRegularExpression>
#include <QTextStream> #include <QTextStream>

1
qt-models/models.cpp
View file

@ -10,6 +10,7 @@
#include "core/dive.h" #include "core/dive.h"
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include <QDir>
#include <QLocale> #include <QLocale>
Qt::ItemFlags GasSelectionModel::flags(const QModelIndex&) const Qt::ItemFlags GasSelectionModel::flags(const QModelIndex&) const