From 3261f848c374d2e571107bdb00bcc99a2b6d549f Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sat, 17 Jul 2010 22:34:07 +0300
Subject: [PATCH] GUI: Fix includes for dialogs/views.

At first we created the GUI in the code and so needed all the layouts
etc include to the code. Now when we are using UI files we don't need
all those included. So clean them up. Also use forward declarations
instead of includes in header files when possible.
---
 gui/aboutdialog.cpp       |  6 ++----
 gui/aboutdialog.h         |  3 ++-
 gui/applicationdialog.cpp |  7 ++-----
 gui/applicationdialog.h   |  3 +++
 gui/fileviewdialog.cpp    |  6 +-----
 gui/fileviewdialog.h      |  3 +++
 gui/resultsview.cpp       |  2 +-
 gui/resultsview.h         |  1 -
 gui/settingsdialog.cpp    |  4 +++-
 gui/settingsdialog.h      | 13 ++++---------
 10 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/gui/aboutdialog.cpp b/gui/aboutdialog.cpp
index 25db77990..2d1b800da 100644
--- a/gui/aboutdialog.cpp
+++ b/gui/aboutdialog.cpp
@@ -15,11 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include <QDialog>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QWidget>
 #include "aboutdialog.h"
 
 AboutDialog::AboutDialog(const QString &version, QWidget *parent)
diff --git a/gui/aboutdialog.h b/gui/aboutdialog.h
index 8fac3c687..17d7021bc 100644
--- a/gui/aboutdialog.h
+++ b/gui/aboutdialog.h
@@ -21,9 +21,10 @@
 
 #include <QDialog>
 #include <QString>
-
 #include "ui_about.h"
 
+class QWidget;
+
 /// @addtogroup GUI
 /// @{
 
diff --git a/gui/applicationdialog.cpp b/gui/applicationdialog.cpp
index 56df70886..320798417 100644
--- a/gui/applicationdialog.cpp
+++ b/gui/applicationdialog.cpp
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "applicationdialog.h"
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QWidget>
 #include <QFileDialog>
 #include <QDebug>
 #include <QMessageBox>
+#include "applicationdialog.h"
 
 
 ApplicationDialog::ApplicationDialog(const QString &name,
diff --git a/gui/applicationdialog.h b/gui/applicationdialog.h
index 3ec88846d..803b5b88e 100644
--- a/gui/applicationdialog.h
+++ b/gui/applicationdialog.h
@@ -21,8 +21,11 @@
 
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
 #include "ui_application.h"
 
+class QWidget;
+
 /// @addtogroup GUI
 /// @{
 
diff --git a/gui/fileviewdialog.cpp b/gui/fileviewdialog.cpp
index f0d947ee2..5106ee9c2 100644
--- a/gui/fileviewdialog.cpp
+++ b/gui/fileviewdialog.cpp
@@ -16,14 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDialog>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QTextEdit>
-#include <QPushButton>
 #include <QFile>
 #include <QByteArray>
 #include <QMessageBox>
+#include <QTextEdit>
 #include "fileviewdialog.h"
 
 FileViewDialog::FileViewDialog(const QString &file,
diff --git a/gui/fileviewdialog.h b/gui/fileviewdialog.h
index eaeeba738..876bf3e00 100644
--- a/gui/fileviewdialog.h
+++ b/gui/fileviewdialog.h
@@ -23,6 +23,9 @@
 #include <QString>
 #include "ui_file.h"
 
+class QWidget;
+class QTextEdit;
+
 /// @addtogroup GUI
 /// @{
 
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
index bbea6d44f..8d28b44b1 100644
--- a/gui/resultsview.cpp
+++ b/gui/resultsview.cpp
@@ -17,11 +17,11 @@
  */
 
 #include <QDebug>
-#include <QVBoxLayout>
 #include <QFile>
 #include <QMessageBox>
 #include "erroritem.h"
 #include "resultsview.h"
+#include "resultstree.h"
 #include "report.h"
 #include "txtreport.h"
 #include "xmlreport.h"
diff --git a/gui/resultsview.h b/gui/resultsview.h
index bc81d28d1..cb66a5749 100644
--- a/gui/resultsview.h
+++ b/gui/resultsview.h
@@ -24,7 +24,6 @@
 #include <QWidget>
 #include <QProgressBar>
 #include "../lib/errorlogger.h"
-#include "resultstree.h"
 #include "common.h"
 #include "report.h"
 #include "ui_resultsview.h"
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 90f8fcb2f..1272ac687 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -17,13 +17,15 @@
  */
 
 
-#include "settingsdialog.h"
 #include <QDialog>
 #include <QWidget>
 #include <QLabel>
 #include <QDebug>
 #include <QTabWidget>
+#include <QSettings>
+#include "settingsdialog.h"
 #include "applicationdialog.h"
+#include "applicationlist.h"
 #include "common.h"
 
 SettingsDialog::SettingsDialog(QSettings *programSettings,
diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 86deebcce..e35239c0c 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -21,18 +21,13 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QSettings>
-#include <QCheckBox>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include "applicationlist.h"
-
-#include <QListWidget>
 #include <QKeyEvent>
 #include "ui_settings.h"
 
+class QSettings;
+class QWidget;
+class ApplicationList;
+
 /// @addtogroup GUI
 /// @{