[modules] Be more consistent in include punctuation

- Use <> for Qt, system, externals
 - Use double-quotes for Calamares headers
This commit is contained in:
Adriaan de Groot 2020-03-09 20:45:40 -05:00
parent 841ea9ff48
commit ebb3f319cc
27 changed files with 58 additions and 60 deletions

View File

@ -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
{

View File

@ -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
{

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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"

View File

@ -20,7 +20,7 @@
#ifndef SETKEYBOARDLAYOUTJOB_H
#define SETKEYBOARDLAYOUTJOB_H
#include <Job.h>
#include "Job.h"
class SetKeyboardLayoutJob : public Calamares::Job

View File

@ -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>

View File

@ -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"

View File

@ -19,7 +19,7 @@
#ifndef SETTIMEZONEJOB_H
#define SETTIMEZONEJOB_H
#include <Job.h>
#include "Job.h"
class SetTimezoneJob : public Calamares::Job

View File

@ -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
{

View File

@ -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>

View File

@ -19,7 +19,7 @@
#include "EncryptWidget.h"
#include <utils/CalamaresUtilsGui.h>
#include "utils/CalamaresUtilsGui.h"
EncryptWidget::EncryptWidget( QWidget* parent )
: QWidget( parent )

View File

@ -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 "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include <kpmcore/core/device.h>
#include <utils/CalamaresUtilsGui.h>
#include <utils/Logger.h>
// Qt
#include <QDebug>
#include <QGuiApplication>
#include <QMouseEvent>

View File

@ -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"

View File

@ -19,7 +19,7 @@
#ifndef PARTITIONJOBTESTS_H
#define PARTITIONJOBTESTS_H
#include <JobQueue.h>
#include "JobQueue.h"
// CalaPM
#include <core/device.h>

View File

@ -22,7 +22,7 @@
#include <QObject>
#include <QVariantMap>
#include <Job.h>
#include "Job.h"
class PlasmaLnfJob : public Calamares::Job
{

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

@ -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"

View File

@ -19,7 +19,7 @@
#ifndef CREATEUSERJOB_H
#define CREATEUSERJOB_H
#include <Job.h>
#include "Job.h"
#include <QStringList>

View File

@ -21,7 +21,7 @@
#ifndef SETHOSTNAMEJOB_CPP_H
#define SETHOSTNAMEJOB_CPP_H
#include <Job.h>
#include "Job.h"
class SetHostNameJob : public Calamares::Job
{

View File

@ -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"

View File

@ -20,7 +20,7 @@
#ifndef SETPASSWORDJOB_H
#define SETPASSWORDJOB_H
#include <Job.h>
#include "Job.h"
class SetPasswordJob : public Calamares::Job

View File

@ -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>

View File

@ -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>