Cleanup of includes in GUI (Removed redundant includes, use forward declarations) - Build speedup by 3% in VS10 (LINKCORE=yes, Qt 4.8.3)

2012-10-07 12:25:34 +02:00 · 2012-10-07 12:25:34 +02:00 · b1a768e5ec
parent 5d796a5936
commit b1a768e5ec
35 changed files with 17 additions and 65 deletions
--- a/gui/applicationdialog.cpp
+++ b/gui/applicationdialog.cpp
@ -20,7 +20,6 @@
 #include <QWidget>
 #include <QDialog>
 #include <QFileDialog>
-#include <QDebug>
 #include <QMessageBox>
 #include "applicationdialog.h"
 #include "application.h"
--- a/gui/applicationdialog.h
+++ b/gui/applicationdialog.h
@ -20,7 +20,6 @@
 #define APPLICATIONDIALOG_H

 #include <QDialog>
-#include <QLineEdit>
 #include <QString>
 #include "application.h"
 #include "ui_application.h"
--- a/gui/applicationlist.cpp
+++ b/gui/applicationlist.cpp
@ -16,7 +16,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <QStringList>
 #include <QFileInfo>
 #include <QObject>
 #include <QSettings>
--- a/gui/applicationlist.h
+++ b/gui/applicationlist.h
@ -20,7 +20,6 @@
 #define APPLICATIONLIST_H

 #include <QObject>
-#include <QSettings>
 #include "application.h"

 /// @addtogroup GUI
--- a/gui/checkstatistics.cpp
+++ b/gui/checkstatistics.cpp
@ -17,7 +17,6 @@
 */

 #include <QDebug>
-#include "common.h"
 #include "checkstatistics.h"

 CheckStatistics::CheckStatistics(QObject *parent)
--- a/gui/checkstatistics.h
+++ b/gui/checkstatistics.h
@ -20,7 +20,6 @@
 #define CHECKSTATISTICS_H

 #include <QObject>
-#include "common.h"
 #include "showtypes.h"

 /// @addtogroup GUI
--- a/gui/checkthread.h
+++ b/gui/checkthread.h
@ -22,9 +22,10 @@

 #include <QThread>
 #include "cppcheck.h"
-#include "settings.h"
 #include "threadresult.h"

+class Settings;
+
 /// @addtogroup GUI
 /// @{

--- a/gui/csvreport.cpp
+++ b/gui/csvreport.cpp
@ -19,7 +19,6 @@
 #include <QObject>
 #include <QString>
 #include <QDir>
-#include <QFile>
 #include <QTextStream>
 #include "report.h"
 #include "csvreport.h"
--- a/gui/csvreport.h
+++ b/gui/csvreport.h
@ -21,8 +21,6 @@

 #include <QObject>
 #include <QString>
-#include <QStringList>
-#include <QFile>
 #include <QTextStream>
 #include "report.h"

--- a/gui/filelist.cpp
+++ b/gui/filelist.cpp
@ -20,7 +20,6 @@
 #include <QStringList>
 #include <QDir>
 #include <QFileInfo>
-#include <QDebug>
 #include "filelist.h"

 QStringList FileList::GetDefaultFilters()
--- a/gui/filelist.h
+++ b/gui/filelist.h
@ -19,7 +19,6 @@
 #ifndef FILELIST_H
 #define FILELIST_H

-#include <QList>
 #include <QFileInfoList>
 #include <QStringList>

--- a/gui/main.cpp
+++ b/gui/main.cpp
@ -20,7 +20,6 @@
 #include <QApplication>
 #include <QCoreApplication>
 #include <QTextCodec>
-#include <QTranslator>
 #include <QMetaType>
 #include <QStringList>
 #ifdef _WIN32
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@ -18,12 +18,7 @@

 #include <QApplication>
 #include <QDebug>
-#include <QMenu>
-#include <QDirIterator>
-#include <QMenuBar>
 #include <QMessageBox>
-#include <QToolBar>
-#include <QKeySequence>
 #include <QFileInfo>
 #include <QDir>
 #include <QDesktopServices>
@ -31,13 +26,18 @@
 #include <QAction>
 #include <QActionGroup>
 #include "mainwindow.h"
+#include "cppcheck.h"
+#include "applicationlist.h"
 #include "aboutdialog.h"
+#include "common.h"
 #include "threadhandler.h"
 #include "fileviewdialog.h"
 #include "projectfile.h"
 #include "project.h"
 #include "report.h"
 #include "statsdialog.h"
+#include "settingsdialog.h"
+#include "translationhandler.h"
 #include "logview.h"
 #include "filelist.h"
 #include "showtypes.h"
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@ -22,26 +22,20 @@
 #include <QMainWindow>
 #include <QSettings>
 #include <QFileDialog>
-#include <QSignalMapper>
 #include <QActionGroup>
 #include <QTimer>
-#include <QToolBar>
 #include <QStringList>

-#include "resultsview.h"
-#include "settingsdialog.h"
-#include "translationhandler.h"
 #include "settings.h"
 #include "platforms.h"
 #include "ui_main.h"

 class ThreadHandler;
+class TranslationHandler;
 class LogView;
 class Project;
 class ErrorItem;
-class StatsDialog;
 class QAction;
-class QActionGroup;

 /// @addtogroup GUI
 /// @{
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@ -22,7 +22,6 @@
 #include <QStringList>
 #include <QFileInfo>
 #include <QFileDialog>
-#include <QLineEdit>
 #include <QDir>
 #include <QSettings>
 #include "common.h"
--- a/gui/projectfiledialog.h
+++ b/gui/projectfiledialog.h
@ -25,9 +25,7 @@

 #include "ui_projectfile.h"

-class ProjectFile;
 class QWidget;
-class QLineEdit;

 /// @addtogroup GUI
 /// @{
--- a/gui/report.cpp
+++ b/gui/report.cpp
@ -19,7 +19,6 @@
 #include <QObject>
 #include <QString>
 #include <QFile>
-#include "erroritem.h"
 #include "report.h"

 Report::Report(const QString &filename, QObject * parent) :
--- a/gui/report.h
+++ b/gui/report.h
@ -21,7 +21,6 @@

 #include <QObject>
 #include <QString>
-#include <QStringList>
 #include <QFile>
 #include "erroritem.h"

--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@ -19,7 +19,6 @@
 #include <QApplication>
 #include <QWidget>
 #include <QStandardItem>
-#include <QModelIndex>
 #include <QDebug>
 #include <QString>
 #include <QStringList>
@ -37,13 +36,11 @@
 #include <QClipboard>
 #include <QContextMenuEvent>
 #include <QModelIndex>
-#include <QItemSelectionModel>
+#include "common.h"
 #include "erroritem.h"
-#include "settings.h"
 #include "applicationlist.h"
 #include "resultstree.h"
 #include "report.h"
-#include "xmlreport.h"
 #include "application.h"
 #include "showtypes.h"

--- a/gui/resultstree.h
+++ b/gui/resultstree.h
@ -25,12 +25,10 @@
 #include <QStandardItem>
 #include <QSettings>
 #include <QContextMenuEvent>
-#include <QTextStream>
-#include "common.h"
-#include "applicationlist.h"
 #include "errorlogger.h" // Severity
 #include "showtypes.h"

+class ApplicationList;
 class Report;
 class ErrorItem;
 class ErrorLine;
--- a/gui/resultsview.cpp
+++ b/gui/resultsview.cpp
@ -16,8 +16,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <QDebug>
-#include <QFile>
 #include <QMessageBox>
 #include <QStandardItemModel>
 #include <QStandardItem>
@ -28,7 +26,6 @@
 #include "common.h"
 #include "erroritem.h"
 #include "resultsview.h"
-#include "resultstree.h"
 #include "report.h"
 #include "txtreport.h"
 #include "xmlreport.h"
--- a/gui/resultsview.h
+++ b/gui/resultsview.h
@ -22,8 +22,6 @@


 #include <QWidget>
-#include "errorlogger.h"
-#include "common.h"
 #include "report.h"
 #include "showtypes.h"
 #include "ui_resultsview.h"
--- a/gui/selectfilesdialog.cpp
+++ b/gui/selectfilesdialog.cpp
@ -20,8 +20,6 @@
 #include "ui_selectfilesdialog.h"
 #include "filelist.h"

-#include <QTreeView>
-#include <QVBoxLayout>
 #include <QFileSystemModel>
 #include <QStringList>
 #include <QPushButton>
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@ -19,11 +19,8 @@

 #include <QDialog>
 #include <QWidget>
-#include <QLabel>
 #include <QList>
-#include <QDebug>
 #include <QListWidgetItem>
-#include <QTabWidget>
 #include <QSettings>
 #include <QFileDialog>
 #include <QThread>
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@ -21,7 +21,6 @@
 #define SETTINGSDIALOG_H

 #include <QDialog>
-#include <QKeyEvent>
 #include "ui_settings.h"

 class QSettings;
--- a/gui/statsdialog.cpp
+++ b/gui/statsdialog.cpp
@ -21,7 +21,6 @@
 #include <QString>
 #include <QClipboard>
 #include <QMimeData>
-#include "common.h"
 #include "project.h"
 #include "projectfile.h"
 #include "statsdialog.h"
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@ -20,7 +20,9 @@
 #include <QFileInfo>
 #include <QStringList>
 #include <QDebug>
+#include "common.h"
 #include "settings.h"
+#include "checkthread.h"
 #include "threadhandler.h"
 #include "resultsview.h"

--- a/gui/threadhandler.h
+++ b/gui/threadhandler.h
@ -24,11 +24,12 @@
 #include <QStringList>
 #include <QDateTime>
 #include <set>
-#include "settings.h"
-#include "cppcheck.h"
 #include "threadresult.h"
-#include "checkthread.h"
-#include "resultsview.h"
+
+class ResultsView;
+class CheckThread;
+class QSettings;
+class Settings;

 /// @addtogroup GUI
 /// @{
--- a/gui/threadresult.h
+++ b/gui/threadresult.h
@ -23,7 +23,6 @@
 #include <QMutex>
 #include <QObject>
 #include <QStringList>
-#include <QVariant>
 #include "errorlogger.h"

 class ErrorItem;
--- a/gui/txtreport.cpp
+++ b/gui/txtreport.cpp
@ -17,8 +17,6 @@
 */

 #include <QDir>
-#include <QFile>
-#include <QTextStream>
 #include "txtreport.h"

 TxtReport::TxtReport(const QString &filename, QObject * parent) :
--- a/gui/txtreport.h
+++ b/gui/txtreport.h
@ -21,8 +21,6 @@

 #include <QObject>
 #include <QString>
-#include <QStringList>
-#include <QFile>
 #include <QTextStream>
 #include "report.h"

--- a/gui/xmlreportv1.cpp
+++ b/gui/xmlreportv1.cpp
@ -20,7 +20,6 @@
 #include <QString>
 #include <QList>
 #include <QDir>
-#include <QFile>
 #include <QXmlStreamWriter>
 #include <QDebug>
 #include "report.h"
--- a/gui/xmlreportv1.h
+++ b/gui/xmlreportv1.h
@ -21,8 +21,6 @@

 #include <QObject>
 #include <QString>
-#include <QStringList>
-#include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 #include "xmlreport.h"
--- a/gui/xmlreportv2.cpp
+++ b/gui/xmlreportv2.cpp
@ -20,7 +20,6 @@
 #include <QString>
 #include <QList>
 #include <QDir>
-#include <QFile>
 #include <QXmlStreamWriter>
 #include <QDebug>
 #include "report.h"
--- a/gui/xmlreportv2.h
+++ b/gui/xmlreportv2.h
@ -21,11 +21,8 @@

 #include <QObject>
 #include <QString>
-#include <QStringList>
-#include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include "report.h"
 #include "xmlreport.h"

 /// @addtogroup GUI