Totally reorganize header includes to improve compilation speed

connectionsettingsengine.cpp

@@ -1,5 +1,23 @@
 #include "connectionsettingsengine.h"
+#include "qvarianthelper.h"
+
+#include <NetworkManagerQt/Connection>
+#include <NetworkManagerQt/ConnectionSettings>
+#include <NetworkManagerQt/Ipv4Setting>
+#include <NetworkManagerQt/Ipv6Setting>
+#include <NetworkManagerQt/Manager>
+#include <NetworkManagerQt/Security8021xSetting>
+#include <NetworkManagerQt/Setting>
+#include <NetworkManagerQt/Settings>
+#include <NetworkManagerQt/Utils>
+#include <NetworkManagerQt/WiredSetting>
+#include <NetworkManagerQt/WirelessSetting>
+#include <QDBusPendingCallWatcher>
+#include <QDBusPendingReply>
 #include <QDebug>
+#include <QHash>
+#include <QList>
+#include <QProcess>
 
 QString ConnectionSettingsEngine::targetConnUuidStr = QString();
 

connectionsettingsengine.h

@@ -1,25 +1,8 @@
 #ifndef CONNECTIONSETTINGSENGINE_H
 #define CONNECTIONSETTINGSENGINE_H
 
-#include "qvarianthelper.h"
-#include <NetworkManagerQt/Connection>
-#include <NetworkManagerQt/ConnectionSettings>
-#include <NetworkManagerQt/Settings>
-#include <NetworkManagerQt/Manager>
-#include <NetworkManagerQt/Setting>
-#include <NetworkManagerQt/Security8021xSetting>
-#include <NetworkManagerQt/WiredSetting>
-#include <NetworkManagerQt/WirelessSetting>
-#include <NetworkManagerQt/Utils>
-#include <NetworkManagerQt/Ipv4Setting>
-#include <NetworkManagerQt/Ipv6Setting>
 #include <QString>
 #include <QVariant>
-#include <QHash>
-#include <QList>
-#include <QProcess>
-#include <QDBusPendingReply>
-#include <QDBusPendingCallWatcher>
 
 class ConnectionSettingsEngine
 {

ethernetsettings.cpp

@@ -1,4 +1,10 @@
+#include "connectionsettingsengine.h"
 #include "ethernetsettings.h"
+#include "ethernetsettingstab.h"
+#include "generalsettingstab.h"
+#include "ipv4settingstab.h"
+#include "ipv6settingstab.h"
+#include "security802_1xtab.h"
 #include "ui_genericsettings.h"
 
 EthernetSettings::EthernetSettings(QString connUuidStr, QWidget *parent) :

ethernetsettings.h

@@ -1,19 +1,18 @@
 #ifndef ETHERNETSETTINGS_H
 #define ETHERNETSETTINGS_H
 
-#include "connectionsettingsengine.h"
-#include "generalsettingstab.h"
-#include "ethernetsettingstab.h"
-#include "security802_1xtab.h"
-#include "ipv4settingstab.h"
-#include "ipv6settingstab.h"
-
 #include <QDialog>
 
 namespace Ui {
 class GenericSettings;
 }
 
+class GeneralSettingsTab;
+class EthernetSettingsTab;
+class Security802_1xTab;
+class Ipv4SettingsTab;
+class Ipv6SettingsTab;
+
 class EthernetSettings : public QDialog
 {
     Q_OBJECT

ethernetsettingstab.cpp

@@ -1,3 +1,4 @@
+#include "connectionsettingsengine.h"
 #include "ethernetsettingstab.h"
 #include "ui_ethernetsettingstab.h"
 

ethernetsettingstab.h

@@ -1,7 +1,6 @@
 #ifndef ETHERNETSETTINGSTAB_H
 #define ETHERNETSETTINGSTAB_H
 
-#include "connectionsettingsengine.h"
 #include <QWidget>
 
 namespace Ui {

generalsettingstab.cpp

@@ -1,6 +1,10 @@
+#include "connectionsettingsengine.h"
 #include "generalsettingstab.h"
 #include "ui_generalsettingstab.h"
 
+#include <NetworkManagerQt/Connection>
+#include <NetworkManagerQt/ConnectionSettings>
+
 GeneralSettingsTab::GeneralSettingsTab(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::GeneralSettingsTab)

generalsettingstab.h

@@ -1,12 +1,8 @@
 #ifndef GENERALSETTINGSTAB_H
 #define GENERALSETTINGSTAB_H
 
-#include "connectionsettingsengine.h"
-#include <NetworkManagerQt/Connection>
-#include <NetworkManagerQt/ConnectionSettings>
-#include <QWidget>
-#include <QString>
 #include <QVariant>
+#include <QWidget>
 
 namespace Ui {
 class GeneralSettingsTab;

ipv4settingstab.cpp

@@ -1,4 +1,7 @@
+#include "connectionsettingsengine.h"
 #include "ipv4settingstab.h"
+#include "listeditordialog.h"
+#include "qvarianthelper.h"
 #include "ui_ipv4settingstab.h"
 
 Ipv4SettingsTab::Ipv4SettingsTab(QWidget *parent) :

ipv4settingstab.h

@@ -1,9 +1,6 @@
 #ifndef IPV4SETTINGSTAB_H
 #define IPV4SETTINGSTAB_H
 
-#include "qvarianthelper.h"
-#include "connectionsettingsengine.h"
-#include "listeditordialog.h"
 #include <QWidget>
 
 namespace Ui {

ipv6settingstab.cpp

@@ -1,4 +1,7 @@
+#include "connectionsettingsengine.h"
 #include "ipv6settingstab.h"
+#include "listeditordialog.h"
+#include "qvarianthelper.h"
 #include "ui_ipv6settingstab.h"
 
 Ipv6SettingsTab::Ipv6SettingsTab(QWidget *parent) :

ipv6settingstab.h

@@ -1,9 +1,7 @@
 #ifndef IPV6SETTINGSTAB_H
 #define IPV6SETTINGSTAB_H
 
-#include "qvarianthelper.h"
+#include <QVariantMap>
-#include "connectionsettingsengine.h"
-#include "listeditordialog.h"
 #include <QWidget>
 
 namespace Ui {

listeditordialog.cpp

@@ -1,6 +1,10 @@
 #include "listeditordialog.h"
 #include "ui_listeditordialog.h"
 
+#include <QChar>
+#include <QList>
+#include <QStringList>
+
 ListEditorDialog::ListEditorDialog(QWidget *parent, QString listStr, QChar separator) :
     QDialog(parent),
     ui(new Ui::ListEditorDialog)

listeditordialog.h

@@ -2,10 +2,6 @@
 #define LISTEDITORDIALOG_H
 
 #include <QDialog>
-#include <QString>
-#include <QChar>
-#include <QList>
-#include <QStringList>
 
 namespace Ui {
 class ListEditorDialog;

main.cpp

@@ -1,10 +1,10 @@
 #include "networkselector.h"
 
 #include <QApplication>
+#include <QDBusMetaType>
+#include <QDebug>
 #include <QLocale>
 #include <QTranslator>
-#include <QDebug>
-#include <QDBusMetaType>
 
 int main(int argc, char *argv[])
 {

networkcreator.cpp

@@ -1,6 +1,15 @@
 #include "networkcreator.h"
 #include "ui_networkcreator.h"
+
+#include <NetworkManagerQt/ConnectionSettings>
+#include <NetworkManagerQt/Settings>
+#include <NetworkManagerQt/WiredSetting>
+#include <NetworkManagerQt/WirelessSetting>
+#include <QDBusPendingCallWatcher>
+#include <QDBusPendingReply>
 #include <QDebug>
+#include <QStringList>
+#include <QUuid>
 
 NetworkCreator::NetworkCreator(QWidget *parent) :
     QDialog(parent),

networkcreator.h

@@ -2,15 +2,6 @@
 #define NETWORKCREATOR_H
 
 #include <QDialog>
-#include <QString>
-#include <QStringList>
-#include <QUuid>
-#include <NetworkManagerQt/Settings>
-#include <NetworkManagerQt/ConnectionSettings>
-#include <NetworkManagerQt/WiredSetting>
-#include <NetworkManagerQt/WirelessSetting>
-#include <QDBusPendingReply>
-#include <QDBusPendingCallWatcher>
 
 namespace Ui {
 class NetworkCreator;

networkdeleter.cpp

@@ -1,6 +1,15 @@
 #include "networkdeleter.h"
 #include "ui_networkdeleter.h"
 
+#include <NetworkManagerQt/Connection>
+#include <NetworkManagerQt/ConnectionSettings>
+#include <NetworkManagerQt/Settings>
+#include <QDBusPendingCallWatcher>
+#include <QDBusPendingReply>
+#include <QIcon>
+#include <QLayout>
+#include <QMessageBox>
+
 NetworkDeleter::NetworkDeleter(QString networkName, QString networkUuidStr, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::NetworkDeleter)

networkdeleter.h

@@ -2,14 +2,8 @@
 #define NETWORKDELETER_H
 
 #include <QDialog>
-#include <QLayout>
+
-#include <NetworkManagerQt/Settings>
+class QDBusPendingCallWatcher;
-#include <NetworkManagerQt/Connection>
-#include <NetworkManagerQt/ConnectionSettings>
-#include <QMessageBox>
-#include <QIcon>
-#include <QDBusPendingReply>
-#include <QDBusPendingCallWatcher>
 
 namespace Ui {
 class NetworkDeleter;

networkselector.cpp

@@ -1,6 +1,20 @@
+#include "ethernetsettings.h"
+#include "networkcreator.h"
+#include "networkdeleter.h"
 #include "networkselector.h"
-#include "./ui_networkselector.h"
+#include "ui_networkselector.h"
+#include "wifisettings.h"
+
+#include <NetworkManagerQt/ConnectionSettings>
+#include <NetworkManagerQt/Settings>
 #include <QDebug>
+#include <QPushButton>
+#include <QMessageBox>
+#include <QModelIndex>
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QTreeView>
+#include <QUuid>
 
 NetworkSelector::NetworkSelector(QWidget *parent)
     : QMainWindow(parent)

networkselector.h

@@ -1,24 +1,12 @@
 #ifndef NETWORKSELECTOR_H
 #define NETWORKSELECTOR_H
 
-#include "ethernetsettings.h"
-#include "wifisettings.h"
-#include "networkcreator.h"
-#include "networkdeleter.h"
-
 #include <NetworkManagerQt/Connection>
-#include <NetworkManagerQt/ConnectionSettings>
-#include <NetworkManagerQt/Settings>
-
-#include <QMessageBox>
-#include <QMainWindow>
-#include <QTreeView>
-#include <QPushButton>
-#include <QStandardItem>
-#include <QStandardItemModel>
 #include <QList>
-#include <QUuid>
+#include <QMainWindow>
-#include <QModelIndex>
+#include <QStandardItem>
+
+class QStandardItemModel;
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class NetworkSelector; }

security802_1xtab.cpp

@@ -1,6 +1,9 @@
+#include "connectionsettingsengine.h"
 #include "security802_1xtab.h"
 #include "ui_security802_1xtab.h"
+
 #include <QDebug>
+#include <QFileDialog>
 
 Security802_1xTab::Security802_1xTab(QWidget *parent) :
     QDialog(parent),

security802_1xtab.h

@@ -1,9 +1,7 @@
 #ifndef SECURITY802_1XTAB_H
 #define SECURITY802_1XTAB_H
 
-#include "connectionsettingsengine.h"
 #include <QDialog>
-#include <QFileDialog>
 
 namespace Ui {
 class Security802_1xTab;

wifisettings.cpp

@@ -1,5 +1,10 @@
-#include "wifisettings.h"
+#include "connectionsettingsengine.h"
+#include "generalsettingstab.h"
+#include "ipv4settingstab.h"
+#include "ipv6settingstab.h"
 #include "ui_genericsettings.h"
+#include "wifisettings.h"
+#include "wifisettingstab.h"
 
 WifiSettings::WifiSettings(QString connUuidStr, QWidget *parent) :
     QDialog(parent),

wifisettings.h

@@ -1,12 +1,10 @@
 #ifndef WIFISETTINGS_H
 #define WIFISETTINGS_H
 
-#include "connectionsettingsengine.h"
+class GeneralSettingsTab;
-#include "generalsettingstab.h"
+class WifiSettingsTab;
-#include "wifisettingstab.h"
+class Ipv4SettingsTab;
-#include "security802_1xtab.h"
+class Ipv6SettingsTab;
-#include "ipv4settingstab.h"
-#include "ipv6settingstab.h"
 
 #include <QDialog>
 

wifisettingstab.cpp

@@ -1,5 +1,8 @@
-#include "wifisettingstab.h"
+#include "connectionsettingsengine.h"
 #include "ui_wifisettingstab.h"
+#include "wifisettingstab.h"
+
+#include <NetworkManagerQt/Utils>
 
 WifiSettingsTab::WifiSettingsTab(QWidget *parent) :
     QWidget(parent),

wifisettingstab.h

@@ -1,9 +1,7 @@
 #ifndef WIFISETTINGSTAB_H
 #define WIFISETTINGSTAB_H
 
-#include "connectionsettingsengine.h"
 #include <QWidget>
-#include <NetworkManagerQt/Utils>
 
 namespace Ui {
 class WifiSettingsTab;