diff options
author | Jake Petroules <jake.petroules@qt.io> | 2016-11-30 16:39:20 -0800 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-01-04 10:41:49 +0000 |
commit | 00a3f9a3ba44dda2257a226c620f7cfcdc3a62a8 (patch) | |
tree | ed8115eb9810288ab3d76bebd0c0c36e8b5d72cd /src/app/config-ui | |
parent | 1b01fd8d1b7729ebeb071fe1cec6dd65256f132e (diff) |
Change style of #includes of Qt headers
By using q<lowercase>.h headers, we become more bootstrap-friendly, as no
full syncqt is required any more.
In the same go, prefix all includes with the module name. This helps
grep-based analysis of which parts of Qt are used and where. It's also
consistent with Qt's public headers (where syncqt enforces the style).
Testdata and examples are excluded from the change, as they are not
relevant for bootstrapping.
Change-Id: I9539b1d795e87fca6e5fc6c91acbb775b79208d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/app/config-ui')
-rw-r--r-- | src/app/config-ui/commandlineparser.cpp | 2 | ||||
-rw-r--r-- | src/app/config-ui/commandlineparser.h | 2 | ||||
-rw-r--r-- | src/app/config-ui/main.cpp | 2 | ||||
-rw-r--r-- | src/app/config-ui/mainwindow.cpp | 20 | ||||
-rw-r--r-- | src/app/config-ui/mainwindow.h | 2 |
5 files changed, 15 insertions, 13 deletions
diff --git a/src/app/config-ui/commandlineparser.cpp b/src/app/config-ui/commandlineparser.cpp index 32004d171..718b64b0a 100644 --- a/src/app/config-ui/commandlineparser.cpp +++ b/src/app/config-ui/commandlineparser.cpp @@ -41,7 +41,7 @@ #include <logging/translator.h> #include <tools/error.h> -#include <QFileInfo> +#include <QtCore/qfileinfo.h> using qbs::Internal::Tr; diff --git a/src/app/config-ui/commandlineparser.h b/src/app/config-ui/commandlineparser.h index 8abda4257..5902f4065 100644 --- a/src/app/config-ui/commandlineparser.h +++ b/src/app/config-ui/commandlineparser.h @@ -39,7 +39,7 @@ #ifndef QBS_CONFIGUI_COMMANDLINEPARSER_H #define QBS_CONFIGUI_COMMANDLINEPARSER_H -#include <QStringList> +#include <QtCore/qstringlist.h> class CommandLineParser { diff --git a/src/app/config-ui/main.cpp b/src/app/config-ui/main.cpp index cec37baa0..ea4c25760 100644 --- a/src/app/config-ui/main.cpp +++ b/src/app/config-ui/main.cpp @@ -43,7 +43,7 @@ #include <logging/translator.h> #include <tools/error.h> -#include <QApplication> +#include <QtWidgets/qapplication.h> #include <cstdlib> #include <iostream> diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp index 250e1c597..c5f629278 100644 --- a/src/app/config-ui/mainwindow.cpp +++ b/src/app/config-ui/mainwindow.cpp @@ -41,15 +41,17 @@ #include <tools/settingsmodel.h> -#include <QAction> -#include <QKeyEvent> -#include <QKeySequence> -#include <QMenu> -#include <QMenuBar> -#include <QMessageBox> -#include <QModelIndex> -#include <QPoint> -#include <QString> +#include <QtCore/qabstractitemmodel.h> +#include <QtCore/qpoint.h> +#include <QtCore/qstring.h> + +#include <QtGui/qevent.h> +#include <QtGui/qkeysequence.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qmenubar.h> +#include <QtWidgets/qmessagebox.h> MainWindow::MainWindow(const QString &settingsDir, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) diff --git a/src/app/config-ui/mainwindow.h b/src/app/config-ui/mainwindow.h index c5ee0e576..73a01bc6a 100644 --- a/src/app/config-ui/mainwindow.h +++ b/src/app/config-ui/mainwindow.h @@ -39,7 +39,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QMainWindow> +#include <QtWidgets/qmainwindow.h> namespace qbs { class SettingsModel; } |