Reorder and sort includes

Fabian Müller · Fabian Müller · commit 30a411a55c9c · 2022-05-04T17:11:30.000+02:00
diff --git a/src/gui/newwizard/jobs/resolveurljobfactory.cpp b/src/gui/newwizard/jobs/resolveurljobfactory.cpp
@@ -1,6 +1,8 @@
 #include "resolveurljobfactory.h"
+
 #include "common/utility.h"
 #include "gui/updateurldialog.h"
+
 #include <QNetworkReply>
 
 namespace {
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp
@@ -1,12 +1,13 @@
 #include "accountconfiguredwizardpage.h"
+#include "ui_accountconfiguredwizardpage.h"
 
 #include "theme.h"
-#include "ui_accountconfiguredwizardpage.h"
 
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
 
+
 namespace OCC::Wizard {
 
 AccountConfiguredWizardPage::AccountConfiguredWizardPage(const QString &defaultSyncTargetDir, bool vfsIsAvailable, bool enableVfsByDefault, bool vfsModeIsExperimental)
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.h b/src/gui/newwizard/pages/accountconfiguredwizardpage.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QSharedPointer>
-
 #include "abstractsetupwizardpage.h"
 #include "setupwizardcontroller.h"
 
+#include <QSharedPointer>
+
 namespace Ui {
 class AccountConfiguredWizardPage;
 }
diff --git a/src/gui/newwizard/pages/basiccredentialssetupwizardpage.cpp b/src/gui/newwizard/pages/basiccredentialssetupwizardpage.cpp
@@ -1,7 +1,7 @@
 #include "basiccredentialssetupwizardpage.h"
+#include "ui_basiccredentialssetupwizardpage.h"
 
 #include "theme.h"
-#include "ui_basiccredentialssetupwizardpage.h"
 
 namespace OCC::Wizard {
 
diff --git a/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp b/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.cpp
@@ -1,7 +1,7 @@
 #include "oauthcredentialssetupwizardpage.h"
+#include "ui_oauthcredentialssetupwizardpage.h"
 
 #include "theme.h"
-#include "ui_oauthcredentialssetupwizardpage.h"
 
 namespace OCC::Wizard {
 
diff --git a/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.h b/src/gui/newwizard/pages/oauthcredentialssetupwizardpage.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include "abstractsetupwizardpage.h"
 
 namespace Ui {
diff --git a/src/gui/newwizard/pages/serverurlsetupwizardpage.cpp b/src/gui/newwizard/pages/serverurlsetupwizardpage.cpp
@@ -1,9 +1,11 @@
 #include "serverurlsetupwizardpage.h"
+#include "ui_serverurlsetupwizardpage.h"
 
 #include "theme.h"
-#include "ui_serverurlsetupwizardpage.h"
+
 #include <QIcon>
 
+
 namespace OCC::Wizard {
 
 ServerUrlSetupWizardPage::ServerUrlSetupWizardPage(const QUrl &serverUrl)
diff --git a/src/gui/newwizard/pagination.cpp b/src/gui/newwizard/pagination.cpp
@@ -1,9 +1,8 @@
+#include "pagination.h"
 
 #include <QDebug>
 #include <QRadioButton>
 
-#include "pagination.h"
-
 namespace OCC::Wizard {
 
 Pagination::Pagination(QWidget *parent)
diff --git a/src/gui/newwizard/setupwizardaccountbuilder.cpp b/src/gui/newwizard/setupwizardaccountbuilder.cpp
@@ -1,5 +1,5 @@
-
 #include "setupwizardaccountbuilder.h"
+
 #include "gui/accountmanager.h"
 
 namespace OCC::Wizard {
diff --git a/src/gui/newwizard/setupwizardaccountbuilder.h b/src/gui/newwizard/setupwizardaccountbuilder.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "account.h"
 #include "gui/creds/httpcredentialsgui.h"
 #include "networkjobs.h"
-#include <account.h>
 
 namespace OCC::Wizard {
 
diff --git a/src/gui/newwizard/setupwizardcontroller.cpp b/src/gui/newwizard/setupwizardcontroller.cpp
@@ -1,12 +1,12 @@
 #include "setupwizardcontroller.h"
+
 #include "creds/oauth.h"
 #include "determineauthtypejobfactory.h"
 #include "jobs/resolveurljobfactory.h"
 #include "pages/accountconfiguredwizardpage.h"
 #include "pages/basiccredentialssetupwizardpage.h"
 #include "pages/oauthcredentialssetupwizardpage.h"
 #include "pages/serverurlsetupwizardpage.h"
-
 #include "gui/application.h"
 #include "gui/folderman.h"
 #include "theme.h"
@@ -15,8 +15,6 @@
 #include <QDir>
 #include <QTimer>
 
-#include <chrono>
-
 using namespace std::chrono_literals;
 
 namespace {
diff --git a/src/gui/newwizard/setupwizardcontroller.h b/src/gui/newwizard/setupwizardcontroller.h
@@ -1,12 +1,13 @@
 #pragma once
 
+#include "account.h"
 #include "pages/abstractsetupwizardpage.h"
+#include "setupwizardaccountbuilder.h"
+#include "setupwizardwindow.h"
 #include "syncmode.h"
+
 #include <QDialog>
-#include <account.h>
 #include <optional>
-#include <setupwizardaccountbuilder.h>
-#include <setupwizardwindow.h>
 
 namespace OCC::Wizard {
 /**
diff --git a/src/gui/newwizard/setupwizardwindow.cpp b/src/gui/newwizard/setupwizardwindow.cpp
@@ -1,12 +1,12 @@
 #include "setupwizardwindow.h"
-
-#include <QLabel>
+#include "ui_setupwizardwindow.h"
 
 #include "gui/application.h"
 #include "gui/owncloudgui.h"
 #include "gui/settingsdialog.h"
 #include "theme.h"
-#include "ui_setupwizardwindow.h"
+
+#include <QLabel>
 
 using namespace std::chrono_literals;
 
diff --git a/src/gui/newwizard/setupwizardwindow.h b/src/gui/newwizard/setupwizardwindow.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include "3rdparty/QProgressIndicator/QProgressIndicator.h"
+#include "pages/abstractsetupwizardpage.h"
+#include "pagination.h"
+#include "setupwizardaccountbuilder.h"
+
 #include <QDialog>
 #include <QEvent>
 #include <QKeyEvent>
@@ -8,11 +13,6 @@
 #include <QStackedLayout>
 #include <QStackedWidget>
 
-#include "3rdparty/QProgressIndicator/QProgressIndicator.h"
-#include "pages/abstractsetupwizardpage.h"
-#include "pagination.h"
-#include "setupwizardaccountbuilder.h"
-
 namespace Ui {
 class SetupWizardWindow;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#pragma once`
	`2`	`+`
`2`	`3`	`#include "abstractsetupwizardpage.h"`
`3`	`4`
`4`	`5`	`namespace Ui {`