mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the header files

Browse source 
Lots and lots and lots of header files were being included without being
needed. This attempts to clean some of that crud up.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-01-17 22:43:52 +13:00
parent e0280048bc
commit f9ceff009b
40 changed files with 12 additions and 287 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/configuredivecomputerdialog.cpp
View file

@ -1,17 +1,10 @@
#include "configuredivecomputerdialog.h"
#include "divecomputer.h"
#include "libdivecomputer.h"
#include "helpers.h"
#include "display.h"
#include "divelist.h"
#include "configuredivecomputer.h"
#include "mainwindow.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QSettings>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QNetworkReply>
struct product {

2
qt-ui/divecomputermanagementdialog.cpp
View file

@ -1,7 +1,5 @@
#include "divecomputermanagementdialog.h"
#include "models.h"
#include "mainwindow.h"
#include "qthelper.h"
#include "helpers.h"
#include <QMessageBox>
#include <QShortcut>

21
qt-ui/divelistview.cpp
View file

@ -5,31 +5,12 @@
*
*/
#include "divelistview.h"
#include "models.h"
#include "filtermodels.h"
#include "modeldelegates.h"
#include "mainwindow.h"
#include "subsurfacewebservices.h"
#include "divelogexportdialog.h"
#include "../display.h"
#include "exif.h"
#include "../file.h"
#include <QApplication>
#include <QHeaderView>
#include <QDebug>
#include <QSettings>
#include <QKeyEvent>
#include <QSortFilterProxyModel>
#include <QAction>
#include <QLineEdit>
#include <QKeyEvent>
#include <QMenu>
#include <QFileDialog>
#include <string>
#include <iostream>
#include <QHttpMultiPart>
#include "socialnetworks.h"
#include "../qthelper.h"
#include "qthelper.h"
// # Date Rtg Dpth Dur Tmp Wght Suit Cyl Gas SAC OTU CNS Loc
static int defaultWidth[] = { 70, 140, 90, 50, 50, 50, 50, 70, 50, 50, 70, 50, 50, 500};

8
qt-ui/divelogexportdialog.cpp
View file

@ -1,21 +1,13 @@
#include <QFileDialog>
#include <QString>
#include <QShortcut>
#include <QAbstractButton>
#include <QTextStream>
#include <QSettings>
#include <QDir>
#include <QDebug>
#include "mainwindow.h"
#include "divelogexportdialog.h"
#include "diveshareexportdialog.h"
#include "ui_divelogexportdialog.h"
#include "subsurfacewebservices.h"
#include "worldmap-save.h"
#include "save-html.h"
#include "helpers.h"
#include "statistics.h"
#define GET_UNIT(name, field, f, t) \
v = settings.value(QString(name)); \

8
qt-ui/divelogimportdialog.cpp
View file

@ -1,15 +1,9 @@
#include <QtDebug>
#include <QFileDialog>
#include <QShortcut>
#include "divelogimportdialog.h"
#include "mainwindow.h"
#include "ui_divelogimportdialog.h"
#include <QAbstractListModel>
#include <QAbstractTableModel>
#include <QMouseEvent>
#include <QShortcut>
#include <QDrag>
#include <QMimeData>
#include <QFile>
static QString subsurface_mimedata = "subsurface/csvcolumns";
static QString subsurface_index = "subsurface/csvindex";

6
qt-ui/divepicturewidget.cpp
View file

@ -1,11 +1,9 @@
#include "divepicturewidget.h"
#include "metrics.h"
#include <dive.h>
#include <divelist.h>
#include "dive.h"
#include "divelist.h"
#include <QtConcurrentMap>
#include <QDir>
#include <QHash>
DivePictureModel *DivePictureModel::instance()
{

17
qt-ui/diveplanner.cpp
View file

@ -1,31 +1,14 @@
#include "diveplanner.h"
#include "graphicsview-common.h"
#include "models.h"
#include "modeldelegates.h"
#include "mainwindow.h"
#include "maintab.h"
#include "tableview.h"
#include "dive.h"
#include "divelist.h"
#include "planner.h"
#include "display.h"
#include "helpers.h"
#include <QMouseEvent>
#include <QDebug>
#include <QGraphicsSceneMouseEvent>
#include <QMessageBox>
#include <QListView>
#include <QModelIndex>
#include <QSettings>
#include <QTableView>
#include <QColor>
#include <QShortcut>
#include <algorithm>
#include <string.h>
#define TIME_INITIAL_MAX 30
#define MAX_DEPTH M_OR_FT(150, 450)

5
qt-ui/diveshareexportdialog.cpp
View file

@ -2,11 +2,10 @@
#include "ui_diveshareexportdialog.h"
#include "mainwindow.h"
#include "save-html.h"
#include "qt-ui/usersurvey.h"
#include "qt-ui/subsurfacewebservices.h"
#include "usersurvey.h"
#include "subsurfacewebservices.h"
#include <QDesktopServices>
#include <QUrl>
#include <QSettings>
DiveShareExportDialog::DiveShareExportDialog(QWidget *parent) :

8
qt-ui/downloadfromdivecomputer.cpp
View file

@ -1,15 +1,7 @@
#include "downloadfromdivecomputer.h"
#include "divecomputer.h"
#include "libdivecomputer.h"
#include "helpers.h"
#include "display.h"
#include "divelist.h"
#include "mainwindow.h"
#include <cstdlib>
#include <QThread>
#include <QDebug>
#include <QStringListModel>
#include <QTimer>
#include <QFileDialog>
#include <QMessageBox>

3
qt-ui/filtermodels.cpp
View file

@ -1,8 +1,5 @@
#include "filtermodels.h"
#include "dive.h"
#include "models.h"
#include "mainwindow.h"
#include "display.h"
#define CREATE_INSTANCE_METHOD( CLASS ) \
CLASS *CLASS::instance() \

11
qt-ui/globe.cpp
View file

@ -1,14 +1,7 @@
#include "globe.h"
#ifndef NO_MARBLE
#include "kmessagewidget.h"
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "dive.h"
#include "divelist.h"
#include "helpers.h"
#include "display.h"
#include <QDebug>
#include <QTimer>
#include <marble/AbstractFloatItem.h>
@ -17,7 +10,7 @@
#include <marble/MarbleModel.h>
#include <marble/MarbleDirs.h>
#include <marble/MapThemeManager.h>
#include <marble/GeoDataLineString.h>
#ifdef MARBLE_SUBSURFACE_BRANCH
#include <marble/MarbleDebug.h>
#endif
@ -26,8 +19,6 @@
#else
#include <marble/GeoDataTreeModel.h>
#endif
#include <QMouseEvent>
#include <QMessageBox>
// as of Marble 4.10 (which has MARBLE_VERSION 0x001000) zoomView is
// deprecated and has been replaced by setZoom with the same function signature

10
qt-ui/groupedlineedit.cpp
View file

@ -28,19 +28,9 @@
#include "groupedlineedit.h"
#include <QStyleOptionFrameV3>
#include <QFontMetrics>
#include <QApplication>
#include <QScrollBar>
#include <QTextDocument>
#include <QTextBlock>
#include <QTextLayout>
#include <QTextLine>
#include <QPainter>
#include <QPainterPath>
#include <QBrush>
#include <QColor>
#include <QPalette>
struct GroupedLineEdit::Private {
struct Block {

1
qt-ui/kmessagewidget.cpp
View file

@ -19,7 +19,6 @@
*/
#include "kmessagewidget.h"
#include <QEvent>
#include <QGridLayout>
#include <QDialogButtonBox>
#include <QLabel>

16
qt-ui/maintab.cpp
View file

@ -6,28 +6,16 @@
*/
#include "maintab.h"
#include "mainwindow.h"
#include "../helpers.h"
#include "../statistics.h"
#include "divelistview.h"
#include "helpers.h"
#include "statistics.h"
#include "modeldelegates.h"
#include "globe.h"
#include "diveplanner.h"
#include "divelist.h"
#include "qthelper.h"
#include "display.h"
#include "divepicturewidget.h"
#if defined(FBSUPPORT)
#include "socialnetworks.h"
#endif
#include <QLabel>
#include <QCompleter>
#include <QDebug>
#include <QSet>
#include <QSettings>
#include <QTableView>
#include <QPalette>
#include <QScrollBar>
#include <QShortcut>
#include <QMessageBox>

25
qt-ui/mainwindow.cpp
View file

@ -5,45 +5,20 @@
*/
#include "mainwindow.h"
#include <QVBoxLayout>
#include <QFileDialog>
#include <QMessageBox>
#include <QtDebug>
#include <QDateTime>
#include <QSettings>
#include <QCloseEvent>
#include <QApplication>
#include <QFontMetrics>
#include <QTableView>
#include <QDesktopWidget>
#include <QDesktopServices>
#include <QStringList>
#include <QSettings>
#include <QShortcut>
#include <QToolBar>
#include <fcntl.h>
#include "divelistview.h"
#include "starwidget.h"
#include "ssrf-version.h"
#include "dive.h"
#include "display.h"
#include "divelist.h"
#include "pref.h"
#include "helpers.h"
#include "modeldelegates.h"
#include "models.h"
#include "downloadfromdivecomputer.h"
#include "preferences.h"
#include "subsurfacewebservices.h"
#include "divecomputermanagementdialog.h"
#include "simplewidgets.h"
#include "diveplanner.h"
#include "about.h"
#include "worldmap-save.h"
#include "updatemanager.h"
#include "planner.h"
#include "configuredivecomputerdialog.h"
#include "statistics/statisticswidget.h"
#include "filtermodels.h"
#ifndef NO_PRINTING
#include <QPrintDialog>

17
qt-ui/modeldelegates.cpp
View file

@ -1,26 +1,9 @@
#include "modeldelegates.h"
#include "dive.h"
#include "divelist.h"
#include "starwidget.h"
#include "models.h"
#include "diveplanner.h"
#include "simplewidgets.h"
#include "gettextfromc.h"
#include "profile/profilewidget2.h"
#include "mainwindow.h"
#include <QtDebug>
#include <QPainter>
#include <QSortFilterProxyModel>
#include <QStyle>
#include <QStyleOption>
#include <QComboBox>
#include <QCompleter>
#include <QLineEdit>
#include <QKeyEvent>
#include <QAbstractItemView>
#include <QApplication>
#include <QTextDocument>
QSize DiveListDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{

1
qt-ui/preferences.cpp
View file

@ -1,7 +1,6 @@
#include "preferences.h"
#include "mainwindow.h"
#include <QSettings>
#include <QDebug>
#include <QFileDialog>
#include <QMessageBox>
#include <QShortcut>

6
qt-ui/printdialog.cpp
View file

@ -3,16 +3,10 @@
#include "printlayout.h"
#include "mainwindow.h"
#include <QDebug>
#include <QPushButton>
#include <QProgressBar>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QPrintPreviewDialog>
#include <QPrintDialog>
#include <QShortcut>
#include <QPrinterInfo>
#include <QMessageBox>
#include <QSettings>
#if QT_VERSION >= 0x050300

9
qt-ui/printlayout.cpp
View file

@ -1,20 +1,11 @@
#include <QtCore/qmath.h>
#include <QDebug>
#include <QPainter>
#include <QDesktopWidget>
#include <QApplication>
#include <QTableView>
#include <QHeaderView>
#include <QPointer>
#include <QPicture>
#include <QMessageBox>
#include "mainwindow.h"
#include "../dive.h"
#include "../display.h"
#include "printdialog.h"
#include "printlayout.h"
#include "models.h"
#include "modeldelegates.h"
PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct print_options *optionsPtr)

2
qt-ui/printoptions.cpp
View file

@ -1,5 +1,5 @@
#include "printoptions.h"
#include "../display.h"
#include "display.h"
PrintOptions::PrintOptions(QWidget *parent, struct print_options *printOpt)
{

2
qt-ui/profile/animationfunctions.cpp
View file

@ -1,8 +1,6 @@
#include "animationfunctions.h"
#include "dive.h"
#include "pref.h"
#include <QPropertyAnimation>
#include <QPointF>
namespace Animations {

7
qt-ui/profile/divecartesianaxis.cpp
View file

@ -1,17 +1,10 @@
#include "divecartesianaxis.h"
#include "divelineitem.h"
#include "divetextitem.h"
#include "helpers.h"
#include "preferences.h"
#include "diveplotdatamodel.h"
#include "animationfunctions.h"
#include "mainwindow.h"
#include <QPen>
#include <QGraphicsScene>
#include <QDebug>
#include <QGraphicsView>
#include <QStyleOption>
#include <QSettings>
static QPen gridPen()
{

3
qt-ui/profile/diveeventitem.cpp
View file

@ -3,10 +3,7 @@
#include "divecartesianaxis.h"
#include "animationfunctions.h"
#include "libdivecomputer.h"
#include "dive.h"
#include "planner.h"
#include "profile.h"
#include <QDebug>
#include "gettextfromc.h"
#include "metrics.h"

2
qt-ui/profile/divelineitem.cpp
View file

@ -1,6 +1,4 @@
#include "divelineitem.h"
#include "animationfunctions.h"
#include <QPropertyAnimation>
DiveLineItem::DiveLineItem(QGraphicsItem *parent) : QGraphicsLineItem(parent)
{

5
qt-ui/profile/divepixmapitem.cpp
View file

@ -3,12 +3,7 @@
#include <divepicturewidget.h>
#include <preferences.h>
#include <QPen>
#include <QBrush>
#include <QGraphicsDropShadowEffect>
#include <QDesktopServices>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsView>
#include <QUrl>

2
qt-ui/profile/diveplotdatamodel.cpp
View file

@ -1,10 +1,8 @@
#include "diveplotdatamodel.h"
#include "dive.h"
#include "display.h"
#include "profile.h"
#include "graphicsview-common.h"
#include "divelist.h"
#include <QDebug>
DivePlotDataModel::DivePlotDataModel(QObject *parent) : QAbstractTableModel(parent), diveId(0)
{

9
qt-ui/profile/diveprofileitem.cpp
View file

@ -1,24 +1,15 @@
#include "diveprofileitem.h"
#include "diveplotdatamodel.h"
#include "divecartesianaxis.h"
#include "graphicsview-common.h"
#include "divetextitem.h"
#include "profilewidget2.h"
#include "animationfunctions.h"
#include "dive.h"
#include "profile.h"
#include "preferences.h"
#include "helpers.h"
#include "diveplanner.h"
#include "libdivecomputer/parser.h"
#include "mainwindow.h"
#include <QPen>
#include <QPainter>
#include <QLinearGradient>
#include <QDebug>
#include <QApplication>
#include <QGraphicsItem>
#include <QSettings>
AbstractProfilePolygonItem::AbstractProfilePolygonItem() : QObject(), QGraphicsPolygonItem(), hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1)

9
qt-ui/profile/divetextitem.cpp
View file

@ -1,15 +1,6 @@
#include "divetextitem.h"
#include "animationfunctions.h"
#include "mainwindow.h"
#include <QPropertyAnimation>
#include <QApplication>
#include <QFont>
#include <QFontMetrics>
#include <QBrush>
#include <QPen>
#include <QDebug>
DiveTextItem::DiveTextItem(QGraphicsItem *parent) : QGraphicsItemGroup(parent),
internalAlignFlags(Qt::AlignHCenter | Qt::AlignVCenter),
textBackgroundItem(new QGraphicsPathItem(this)),

6
qt-ui/profile/divetooltipitem.cpp
View file

@ -1,19 +1,13 @@
#include "divetooltipitem.h"
#include "divecartesianaxis.h"
#include "profilewidget2.h"
#include "dive.h"
#include "profile.h"
#include "membuffer.h"
#include "metrics.h"
#include <QPropertyAnimation>
#include <QGraphicsSceneMouseEvent>
#include <QPen>
#include <QBrush>
#include <QGraphicsScene>
#include <QSettings>
#include <QGraphicsView>
#include <QStyleOptionGraphicsItem>
#include <QDebug>
#define PORT_IN_PROGRESS 1
#ifdef PORT_IN_PROGRESS

11
qt-ui/profile/profilewidget2.cpp
View file

@ -1,27 +1,16 @@
#include "profilewidget2.h"
#include "diveplotdatamodel.h"
#include "divepixmapitem.h"
#include "diverectitem.h"
#include "divecartesianaxis.h"
#include "diveprofileitem.h"
#include "helpers.h"
#include "profile.h"
#include "diveeventitem.h"
#include "divetextitem.h"
#include "divetooltipitem.h"
#include "animationfunctions.h"
#include "planner.h"
#include "device.h"
#include "ruleritem.h"
#include "tankitem.h"
#include "dive.h"
#include "pref.h"
#include <libdivecomputer/parser.h>
#include <QSignalTransition>
#include <QPropertyAnimation>
#include <QMenu>
#include <QContextMenuEvent>
#include <QDebug>
#include <QScrollBar>
#include <QtCore/qmath.h>
#include <QMessageBox>

11
qt-ui/profile/ruleritem.cpp
View file

@ -1,21 +1,10 @@
#include "ruleritem.h"
#include "divetextitem.h"
#include "profilewidget2.h"
#include "preferences.h"
#include "mainwindow.h"
#include <QFont>
#include <QFontMetrics>
#include <QPainter>
#include <QGraphicsScene>
#include <QGraphicsView>
#include <qgraphicssceneevent.h>
#include <QDebug>
#include <stdint.h>
#include "profile.h"
#include "display.h"
RulerNodeItem2::RulerNodeItem2() : entry(NULL), ruler(NULL)
{

2
qt-ui/profile/tankitem.cpp
View file

@ -2,8 +2,6 @@
#include "diveplotdatamodel.h"
#include "divetextitem.h"
#include "profile.h"
#include <QGradient>
#include <QDebug>
#include <QPen>
TankItem::TankItem(QObject *parent) :

19
qt-ui/simplewidgets.cpp
View file

@ -1,31 +1,14 @@
#include "simplewidgets.h"
#include "filtermodels.h"
#include <QLabel>
#include <QProcess>
#include <QStringList>
#include <QDebug>
#include <QFileDialog>
#include <QShortcut>
#include <QCalendarWidget>
#include <QSortFilterProxyModel>
#include <QToolButton>
#include <QToolBar>
#include <QUrlQuery>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QJsonValue>
#include <QNetworkReply>
#include <QNetworkRequest>
#include <QNetworkAccessManager>
#include "exif.h"
#include "dive.h"
#include "file.h"
#include "display.h"
#include "mainwindow.h"
#include "helpers.h"
#include "ui_filterwidget.h"
#include "libdivecomputer/parser.h"

6
qt-ui/starwidget.cpp
View file

@ -1,13 +1,7 @@
#include "starwidget.h"
#include "metrics.h"
#include <QSvgRenderer>
#include <QPainter>
#include <QPaintEvent>
#include <QDebug>
#include <QMouseEvent>
#include <unistd.h>
#include <QStyle>
#include <QStyleOption>
#include "simplewidgets.h"
QImage StarWidget::activeStar;

9
qt-ui/subsurfacewebservices.cpp
View file

@ -2,25 +2,16 @@
#include "webservice.h"
#include "mainwindow.h"
#include "usersurvey.h"
#include <libxml/parser.h>
#include <zip.h>
#include <errno.h>
#include <QDir>
#include <QHttpMultiPart>
#include <QMessageBox>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QDebug>
#include <QSettings>
#include <QXmlStreamReader>
#include <qdesktopservices.h>
#include <QShortcut>
#include "dive.h"
#include "divelist.h"
#include "display.h"
#ifdef Q_OS_UNIX
#include <unistd.h> // for dup(2)
#endif

4
qt-ui/tableview.cpp
View file

@ -3,11 +3,7 @@
#include "modeldelegates.h"
#include <QPushButton>
#include <QLayout>
#include <QFile>
#include <QTextStream>
#include <QSettings>
#include <QStyle>
TableView::TableView(QWidget *parent) : QGroupBox(parent)
{

6
qt-ui/tagwidget.cpp
View file

@ -1,10 +1,6 @@
#include "tagwidget.h"
#include <QPair>
#include <QAbstractItemView>
#include <QSettings>
#include <QCompleter>
#include <QFont>
#include "mainwindow.h"
#include <QCompleter>
TagWidget::TagWidget(QWidget *parent) : GroupedLineEdit(parent), m_completer(NULL), lastFinishedTag(false)
{

1
qt-ui/updatemanager.cpp
View file

@ -2,7 +2,6 @@
#include "usersurvey.h"
#include <QtNetwork>
#include <QMessageBox>
#include <QDateTime>
#include "subsurfacewebservices.h"
#include "ssrf-version.h"
#include "mainwindow.h"

1
qt-ui/usermanual.cpp
View file

@ -1,7 +1,6 @@
#include <QDesktopServices>
#include <QShortcut>
#include <QFile>
#include <QDebug>
#include "usermanual.h"

1
qt-ui/usersurvey.cpp
View file

@ -1,6 +1,5 @@
#include <QShortcut>
#include <QMessageBox>
#include <QDebug>
#include <QSettings>
#include "usersurvey.h"