Include the ui_*.h headers in the main headers.

This means we can also remove the forward declarations.

This is the first step in removing the memory allocation for the ui
sub-classes. Without the second step, this commit is just making the
compilation time increase for no good reason :-)

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

qt-ui/about.cpp

@@ -1,5 +1,4 @@
 #include "about.h"
-#include "ui_about.h"
 #include "version.h"
 #include <QDebug>
 #include <QDialogButtonBox>

qt-ui/about.h

@@ -3,10 +3,7 @@
 
 #include <QDialog>
 #include <QPushButton>
-
+#include "ui_about.h"
-namespace Ui {
-	class SubsurfaceAbout;
-}
 
 class SubsurfaceAbout : public QDialog {
 	Q_OBJECT

qt-ui/divecomputermanagementdialog.cpp

@@ -1,6 +1,5 @@
 #include "divecomputermanagementdialog.h"
 #include "models.h"
-#include "ui_divecomputermanagementdialog.h"
 #include "mainwindow.h"
 #include <QMessageBox>
 #include "../qthelper.h"

qt-ui/divecomputermanagementdialog.h

@@ -1,12 +1,10 @@
 #ifndef DIVECOMPUTERMANAGEMENTDIALOG_H
 #define DIVECOMPUTERMANAGEMENTDIALOG_H
 #include <QDialog>
+#include "ui_divecomputermanagementdialog.h"
 
 class QModelIndex;
 class DiveComputerModel;
-namespace Ui{
-	class DiveComputerManagementDialog;
-};
 
 class DiveComputerManagementDialog : public QDialog{
 Q_OBJECT

qt-ui/diveplanner.cpp

@@ -2,7 +2,6 @@
 #include "graphicsview-common.h"
 #include "models.h"
 #include "modeldelegates.h"
-#include "ui_diveplanner.h"
 #include "mainwindow.h"
 #include "maintab.h"
 #include "tableview.h"

qt-ui/diveplanner.h

@@ -8,10 +8,7 @@
 #include <QDateTime>
 
 #include "dive.h"
-
+#include "ui_diveplanner.h"
-namespace Ui{
-	class DivePlanner;
-};
 
 class QListView;
 class QStringListModel;

qt-ui/downloadfromdivecomputer.cpp

@@ -1,5 +1,4 @@
 #include "downloadfromdivecomputer.h"
-#include "ui_downloadfromdivecomputer.h"
 
 #include "../libdivecomputer.h"
 #include "../helpers.h"

qt-ui/downloadfromdivecomputer.h

@@ -6,10 +6,8 @@
 #include <QHash>
 #include <QMap>
 #include "../libdivecomputer.h"
+#include "ui_downloadfromdivecomputer.h"
 
-namespace Ui{
-	class DownloadFromDiveComputer;
-}
 struct device_data_t;
 
 class DownloadThread : public QThread{

qt-ui/maintab.cpp

@@ -5,7 +5,6 @@
  *
  */
 #include "maintab.h"
-#include "ui_maintab.h"
 #include "mainwindow.h"
 #include "../helpers.h"
 #include "../statistics.h"

qt-ui/maintab.h

@@ -12,13 +12,10 @@
 #include <QMap>
 
 #include "models.h"
+#include "ui_maintab.h"
 
 class QCompleter;
 struct dive;
-namespace Ui
-{
-	class MainTab;
-}
 
 struct NotesBackup{
 	QString airtemp;

qt-ui/mainwindow.cpp

@@ -4,7 +4,6 @@
  * classes for the main UI window in Subsurface
  */
 #include "mainwindow.h"
-#include "ui_mainwindow.h"
 
 #include <QVBoxLayout>
 #include <QFileDialog>

qt-ui/mainwindow.h

@@ -10,15 +10,12 @@
 #include <QMainWindow>
 #include <QAction>
 
+#include "ui_mainwindow.h"
+
 struct DiveList;
 class QSortFilterProxyModel;
 class DiveTripModel;
 
-namespace Ui
-{
-	class MainWindow;
-}
-
 class DiveInfo;
 class DiveNotes;
 class Stats;

qt-ui/preferences.cpp

@@ -1,5 +1,4 @@
 #include "preferences.h"
-#include "ui_preferences.h"
 #include <QSettings>
 #include <QDebug>
 

qt-ui/preferences.h

@@ -5,9 +5,8 @@
 #include "../dive.h"
 #include "../pref.h"
 
-namespace Ui{
+#include "ui_preferences.h"
-class PreferencesDialog;
+
-}
 class QAbstractButton;
 
 class PreferencesDialog :public QDialog{

qt-ui/printoptions.cpp

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

qt-ui/printoptions.h

@@ -5,9 +5,7 @@
 #include <QSlider>
 #include <QLabel>
 
-namespace Ui {
+#include "ui_printoptions.h"
-	class PrintOptions;
-};
 
 // should be based on a custom QPrintDialog class
 class PrintOptions : public QWidget {

qt-ui/simplewidgets.cpp

@@ -14,8 +14,6 @@
 
 #include "../dive.h"
 
-#include "ui_renumber.h"
-
 class MinMaxAvgWidgetPrivate{
 public:
 	QLabel *avgIco, *avgValue;

qt-ui/simplewidgets.h

@@ -7,6 +7,8 @@ class QAbstractButton;
 #include <QWidget>
 #include <QDialog>
 
+#include "ui_renumber.h"
+
 class MinMaxAvgWidget : public QWidget{
 	Q_OBJECT
 	Q_PROPERTY(double minimum READ minimum WRITE setMinimum)

qt-ui/subsurfacewebservices.cpp

@@ -1,5 +1,4 @@
 #include "subsurfacewebservices.h"
-#include "ui_subsurfacewebservices.h"
 #include "../webservice.h"
 
 #include <libxml/parser.h>

qt-ui/tableview.cpp

@@ -1,5 +1,4 @@
 #include "tableview.h"
-#include "ui_tableview.h"
 #include "models.h"
 
 #include <QPushButton>

qt-ui/tableview.h

@@ -7,13 +7,12 @@
  */
 #include <QWidget>
 
+#include "ui_tableview.h"
+
 class QPushButton;
 class QAbstractItemModel;
 class QModelIndex;
 class QTableView;
-namespace Ui{
-	class TableView;
-};
 
 class TableView : public QWidget {
 Q_OBJECT