From ebb3f319cc8df05d7725a76bd66cf40d34bfe20b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Mar 2020 20:45:40 -0500
Subject: [PATCH] [modules] Be more consistent in include punctuation

 - Use <> for Qt, system, externals
 - Use double-quotes for Calamares headers
---
 src/modules/dracutlukscfg/DracutLuksCfgJob.h         |  6 +++---
 src/modules/dummycpp/DummyCppJob.h                   |  6 +++---
 src/modules/fsresizer/ResizeFSJob.h                  |  4 ++--
 .../InteractiveTerminalViewStep.h                    |  6 +++---
 src/modules/keyboard/KeyboardViewStep.h              |  6 +++---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp        |  2 +-
 src/modules/keyboard/SetKeyboardLayoutJob.h          |  2 +-
 src/modules/license/LicenseViewStep.h                |  6 +++---
 src/modules/locale/SetTimezoneJob.cpp                |  2 +-
 src/modules/locale/SetTimezoneJob.h                  |  2 +-
 src/modules/machineid/MachineIdJob.h                 |  6 +++---
 src/modules/oemid/OEMViewStep.h                      |  6 +++---
 src/modules/partition/gui/EncryptWidget.cpp          |  2 +-
 src/modules/partition/gui/PartitionBarsView.cpp      | 12 +++++-------
 src/modules/partition/gui/PartitionViewStep.h        |  6 +++---
 src/modules/partition/tests/PartitionJobTests.h      |  2 +-
 src/modules/plasmalnf/PlasmaLnfJob.h                 |  2 +-
 src/modules/plasmalnf/PlasmaLnfViewStep.h            |  6 +++---
 src/modules/summary/SummaryViewStep.h                |  6 +++---
 src/modules/tracking/TrackingViewStep.h              |  6 +++---
 src/modules/users/CreateUserJob.cpp                  |  2 +-
 src/modules/users/CreateUserJob.h                    |  2 +-
 src/modules/users/SetHostNameJob.h                   |  2 +-
 src/modules/users/SetPasswordJob.cpp                 |  2 +-
 src/modules/users/SetPasswordJob.h                   |  2 +-
 src/modules/webview/WebViewStep.h                    |  6 +++---
 src/modules/welcome/WelcomeViewStep.h                |  6 +++---
 27 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h
index ccf0adb70..52b290d1c 100644
--- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h
+++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h
@@ -23,11 +23,11 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include <CppJob.h>
+#include "CppJob.h"
 
-#include <utils/PluginFactory.h>
+#include "utils/PluginFactory.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob
 {
diff --git a/src/modules/dummycpp/DummyCppJob.h b/src/modules/dummycpp/DummyCppJob.h
index c60b01d57..bf8625950 100644
--- a/src/modules/dummycpp/DummyCppJob.h
+++ b/src/modules/dummycpp/DummyCppJob.h
@@ -23,11 +23,11 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include <CppJob.h>
+#include "CppJob.h"
 
-#include <utils/PluginFactory.h>
+#include "utils/PluginFactory.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob
 {
diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h
index c681fae36..f7ff676cd 100644
--- a/src/modules/fsresizer/ResizeFSJob.h
+++ b/src/modules/fsresizer/ResizeFSJob.h
@@ -22,13 +22,13 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include <CppJob.h>
+#include "CppJob.h"
 
 #include "partition/KPMManager.h"
 #include "partition/PartitionSize.h"
 #include "utils/PluginFactory.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class CoreBackend;  // From KPMCore
 class Device;  // From KPMCore
diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
index f0af35d3c..bf26ba91e 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
+++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
@@ -22,10 +22,10 @@
 
 #include <QObject>
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class InteractiveTerminalPage;
 
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index 9f362e116..ed072c834 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -22,10 +22,10 @@
 
 #include <QObject>
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class KeyboardPage;
 
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 2a62c576c..79b23d7ca 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -22,7 +22,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <SetKeyboardLayoutJob.h>
+#include "SetKeyboardLayoutJob.h"
 
 #include "JobQueue.h"
 #include "GlobalStorage.h"
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.h b/src/modules/keyboard/SetKeyboardLayoutJob.h
index 60e916fc7..37ca709ef 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.h
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.h
@@ -20,7 +20,7 @@
 #ifndef SETKEYBOARDLAYOUTJOB_H
 #define SETKEYBOARDLAYOUTJOB_H
 
-#include <Job.h>
+#include "Job.h"
 
 
 class SetKeyboardLayoutJob : public Calamares::Job
diff --git a/src/modules/license/LicenseViewStep.h b/src/modules/license/LicenseViewStep.h
index cc1a92896..6bfab4246 100644
--- a/src/modules/license/LicenseViewStep.h
+++ b/src/modules/license/LicenseViewStep.h
@@ -20,9 +20,9 @@
 #ifndef LICENSEPAGEPLUGIN_H
 #define LICENSEPAGEPLUGIN_H
 
-#include <DllMacro.h>
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "DllMacro.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
 #include <QObject>
 #include <QUrl>
diff --git a/src/modules/locale/SetTimezoneJob.cpp b/src/modules/locale/SetTimezoneJob.cpp
index adcac13c1..aa8c4c241 100644
--- a/src/modules/locale/SetTimezoneJob.cpp
+++ b/src/modules/locale/SetTimezoneJob.cpp
@@ -17,7 +17,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <SetTimezoneJob.h>
+#include "SetTimezoneJob.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
diff --git a/src/modules/locale/SetTimezoneJob.h b/src/modules/locale/SetTimezoneJob.h
index f7f2331ad..7b93770bb 100644
--- a/src/modules/locale/SetTimezoneJob.h
+++ b/src/modules/locale/SetTimezoneJob.h
@@ -19,7 +19,7 @@
 #ifndef SETTIMEZONEJOB_H
 #define SETTIMEZONEJOB_H
 
-#include <Job.h>
+#include "Job.h"
 
 
 class SetTimezoneJob : public Calamares::Job
diff --git a/src/modules/machineid/MachineIdJob.h b/src/modules/machineid/MachineIdJob.h
index 3e450accb..08943392a 100644
--- a/src/modules/machineid/MachineIdJob.h
+++ b/src/modules/machineid/MachineIdJob.h
@@ -22,11 +22,11 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include <CppJob.h>
+#include "CppJob.h"
 
-#include <utils/PluginFactory.h>
+#include "utils/PluginFactory.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob
 {
diff --git a/src/modules/oemid/OEMViewStep.h b/src/modules/oemid/OEMViewStep.h
index 57e2bba66..1f0e58915 100644
--- a/src/modules/oemid/OEMViewStep.h
+++ b/src/modules/oemid/OEMViewStep.h
@@ -19,10 +19,10 @@
 #ifndef OEMVIEWSTEP_H
 #define OEMVIEWSTEP_H
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 #include <QVariantMap>
 
diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index 56938dec6..e83d10c2d 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -19,7 +19,7 @@
 
 #include "EncryptWidget.h"
 
-#include <utils/CalamaresUtilsGui.h>
+#include "utils/CalamaresUtilsGui.h"
 
 EncryptWidget::EncryptWidget( QWidget* parent )
     : QWidget( parent )
diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp
index 22e360182..b7c21473c 100644
--- a/src/modules/partition/gui/PartitionBarsView.cpp
+++ b/src/modules/partition/gui/PartitionBarsView.cpp
@@ -18,16 +18,14 @@
  */
 #include "gui/PartitionBarsView.h"
 
-#include <core/PartitionModel.h>
-#include <core/ColorUtils.h>
+#include "core/PartitionModel.h"
+#include "core/ColorUtils.h"
 
-#include <kpmcore/core/device.h>
-
-#include <utils/CalamaresUtilsGui.h>
-#include <utils/Logger.h>
+#include "utils/CalamaresUtilsGui.h"
+#include "utils/Logger.h"
 
+#include <kpmcore/core/device.h>
 
-// Qt
 #include <QDebug>
 #include <QGuiApplication>
 #include <QMouseEvent>
diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h
index 20e9f4f1c..63d11c816 100644
--- a/src/modules/partition/gui/PartitionViewStep.h
+++ b/src/modules/partition/gui/PartitionViewStep.h
@@ -21,10 +21,10 @@
 #ifndef PARTITIONVIEWSTEP_H
 #define PARTITIONVIEWSTEP_H
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 #include "core/PartitionActions.h"
 
diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h
index 1aad945e5..4ce064ec7 100644
--- a/src/modules/partition/tests/PartitionJobTests.h
+++ b/src/modules/partition/tests/PartitionJobTests.h
@@ -19,7 +19,7 @@
 #ifndef PARTITIONJOBTESTS_H
 #define PARTITIONJOBTESTS_H
 
-#include <JobQueue.h>
+#include "JobQueue.h"
 
 // CalaPM
 #include <core/device.h>
diff --git a/src/modules/plasmalnf/PlasmaLnfJob.h b/src/modules/plasmalnf/PlasmaLnfJob.h
index 65e08579f..ef9ee1257 100644
--- a/src/modules/plasmalnf/PlasmaLnfJob.h
+++ b/src/modules/plasmalnf/PlasmaLnfJob.h
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include <Job.h>
+#include "Job.h"
 
 class PlasmaLnfJob : public Calamares::Job
 {
diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.h b/src/modules/plasmalnf/PlasmaLnfViewStep.h
index e99418549..0bf76934c 100644
--- a/src/modules/plasmalnf/PlasmaLnfViewStep.h
+++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h
@@ -19,9 +19,9 @@
 #ifndef PLASMALNFVIEWSTEP_H
 #define PLASMALNFVIEWSTEP_H
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
-#include <DllMacro.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
+#include "DllMacro.h"
 
 #include <QObject>
 #include <QUrl>
diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h
index 2c873e168..5b2f49b8e 100644
--- a/src/modules/summary/SummaryViewStep.h
+++ b/src/modules/summary/SummaryViewStep.h
@@ -21,10 +21,10 @@
 
 #include <QObject>
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 class SummaryPage;
 
diff --git a/src/modules/tracking/TrackingViewStep.h b/src/modules/tracking/TrackingViewStep.h
index df6497d68..bb40d292a 100644
--- a/src/modules/tracking/TrackingViewStep.h
+++ b/src/modules/tracking/TrackingViewStep.h
@@ -21,9 +21,9 @@
 
 #include "TrackingType.h"
 
-#include <DllMacro.h>
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "DllMacro.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
 #include <QObject>
 #include <QUrl>
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index 53b8e1521..2e4e7429e 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -17,7 +17,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreateUserJob.h>
+#include "CreateUserJob.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
diff --git a/src/modules/users/CreateUserJob.h b/src/modules/users/CreateUserJob.h
index 98d7c001e..f2239307e 100644
--- a/src/modules/users/CreateUserJob.h
+++ b/src/modules/users/CreateUserJob.h
@@ -19,7 +19,7 @@
 #ifndef CREATEUSERJOB_H
 #define CREATEUSERJOB_H
 
-#include <Job.h>
+#include "Job.h"
 
 #include <QStringList>
 
diff --git a/src/modules/users/SetHostNameJob.h b/src/modules/users/SetHostNameJob.h
index 619e2ba59..e3867b9d0 100644
--- a/src/modules/users/SetHostNameJob.h
+++ b/src/modules/users/SetHostNameJob.h
@@ -21,7 +21,7 @@
 #ifndef SETHOSTNAMEJOB_CPP_H
 #define SETHOSTNAMEJOB_CPP_H
 
-#include <Job.h>
+#include "Job.h"
 
 class SetHostNameJob : public Calamares::Job
 {
diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp
index 363a04ccc..3199a0a76 100644
--- a/src/modules/users/SetPasswordJob.cpp
+++ b/src/modules/users/SetPasswordJob.cpp
@@ -17,7 +17,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <SetPasswordJob.h>
+#include "SetPasswordJob.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
diff --git a/src/modules/users/SetPasswordJob.h b/src/modules/users/SetPasswordJob.h
index d2ebf64aa..cf5b2f585 100644
--- a/src/modules/users/SetPasswordJob.h
+++ b/src/modules/users/SetPasswordJob.h
@@ -20,7 +20,7 @@
 #ifndef SETPASSWORDJOB_H
 #define SETPASSWORDJOB_H
 
-#include <Job.h>
+#include "Job.h"
 
 
 class SetPasswordJob : public Calamares::Job
diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h
index 9ee2dfac9..a97d465de 100644
--- a/src/modules/webview/WebViewStep.h
+++ b/src/modules/webview/WebViewStep.h
@@ -23,10 +23,10 @@
 
 #include "WebViewConfig.h"
 
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 #include <QVariantMap>
 
diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h
index 217f827e9..a829b65d6 100644
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@@ -22,10 +22,10 @@
 #include <QObject>
 
 #include <modulesystem/Requirement.h>
-#include <utils/PluginFactory.h>
-#include <viewpages/ViewStep.h>
+#include "utils/PluginFactory.h"
+#include "viewpages/ViewStep.h"
 
-#include <DllMacro.h>
+#include "DllMacro.h"
 
 #include <QVariantMap>