GUI: Fix includes for dialogs/views.

kimmov · kimmov · commit 3261f848c374 · 2010-07-17T22:57:32.000+03:00
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.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 /// @{
 
