napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[modules] Be more consistent in include punctuation

Browse Source 
- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View File

@ -23,11 +23,11 @@
#include <QObject> #include <QObject>
#include <QVariantMap> #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 class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob
{ {

6
src/modules/dummycpp/DummyCppJob.h
View File

@ -23,11 +23,11 @@
#include <QObject> #include <QObject>
#include <QVariantMap> #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 class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob
{ {

4
src/modules/fsresizer/ResizeFSJob.h
View File

@ -22,13 +22,13 @@
#include <QObject> #include <QObject>
#include <QVariantMap> #include <QVariantMap>
#include <CppJob.h> #include "CppJob.h"
#include "partition/KPMManager.h" #include "partition/KPMManager.h"
#include "partition/PartitionSize.h" #include "partition/PartitionSize.h"
#include "utils/PluginFactory.h" #include "utils/PluginFactory.h"
#include <DllMacro.h> #include "DllMacro.h"
class CoreBackend; // From KPMCore class CoreBackend; // From KPMCore
class Device; // From KPMCore class Device; // From KPMCore

6
src/modules/interactiveterminal/InteractiveTerminalViewStep.h
View File

@ -22,10 +22,10 @@
#include <QObject> #include <QObject>
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
class InteractiveTerminalPage; class InteractiveTerminalPage;

6
src/modules/keyboard/KeyboardViewStep.h
View File

@ -22,10 +22,10 @@
#include <QObject> #include <QObject>
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
class KeyboardPage; class KeyboardPage;

2
src/modules/keyboard/SetKeyboardLayoutJob.cpp
View File

@ -22,7 +22,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <SetKeyboardLayoutJob.h> #include "SetKeyboardLayoutJob.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"

2
src/modules/keyboard/SetKeyboardLayoutJob.h
View File

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

6
src/modules/license/LicenseViewStep.h
View File

@ -20,9 +20,9 @@
#ifndef LICENSEPAGEPLUGIN_H #ifndef LICENSEPAGEPLUGIN_H
#define LICENSEPAGEPLUGIN_H #define LICENSEPAGEPLUGIN_H
#include <DllMacro.h> #include "DllMacro.h"
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>

2
src/modules/locale/SetTimezoneJob.cpp
View File

@ -17,7 +17,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <SetTimezoneJob.h> #include "SetTimezoneJob.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"

2
src/modules/locale/SetTimezoneJob.h
View File

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

6
src/modules/machineid/MachineIdJob.h
View File

@ -22,11 +22,11 @@
#include <QObject> #include <QObject>
#include <QVariantMap> #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 class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob
{ {

6
src/modules/oemid/OEMViewStep.h
View File

@ -19,10 +19,10 @@
#ifndef OEMVIEWSTEP_H #ifndef OEMVIEWSTEP_H
#define OEMVIEWSTEP_H #define OEMVIEWSTEP_H
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
#include <QVariantMap> #include <QVariantMap>

2
src/modules/partition/gui/EncryptWidget.cpp
View File

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

12
src/modules/partition/gui/PartitionBarsView.cpp
View File

@ -18,16 +18,14 @@
*/ */
#include "gui/PartitionBarsView.h" #include "gui/PartitionBarsView.h"
#include <core/PartitionModel.h> #include "core/PartitionModel.h"
#include <core/ColorUtils.h> #include "core/ColorUtils.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
#include <utils/CalamaresUtilsGui.h>
#include <utils/Logger.h>
// Qt
#include <QDebug> #include <QDebug>
#include <QGuiApplication> #include <QGuiApplication>
#include <QMouseEvent> #include <QMouseEvent>

6
src/modules/partition/gui/PartitionViewStep.h
View File

@ -21,10 +21,10 @@
#ifndef PARTITIONVIEWSTEP_H #ifndef PARTITIONVIEWSTEP_H
#define PARTITIONVIEWSTEP_H #define PARTITIONVIEWSTEP_H
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
#include "core/PartitionActions.h" #include "core/PartitionActions.h"

2
src/modules/partition/tests/PartitionJobTests.h
View File

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

2
src/modules/plasmalnf/PlasmaLnfJob.h
View File

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

6
src/modules/plasmalnf/PlasmaLnfViewStep.h
View File

@ -19,9 +19,9 @@
#ifndef PLASMALNFVIEWSTEP_H #ifndef PLASMALNFVIEWSTEP_H
#define PLASMALNFVIEWSTEP_H #define PLASMALNFVIEWSTEP_H
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>

6
src/modules/summary/SummaryViewStep.h
View File

@ -21,10 +21,10 @@
#include <QObject> #include <QObject>
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
class SummaryPage; class SummaryPage;

6
src/modules/tracking/TrackingViewStep.h
View File

@ -21,9 +21,9 @@
#include "TrackingType.h" #include "TrackingType.h"
#include <DllMacro.h> #include "DllMacro.h"
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>

2
src/modules/users/CreateUserJob.cpp
View File

@ -17,7 +17,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <CreateUserJob.h> #include "CreateUserJob.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"

2
src/modules/users/CreateUserJob.h
View File

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

2
src/modules/users/SetHostNameJob.h
View File

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

2
src/modules/users/SetPasswordJob.cpp
View File

@ -17,7 +17,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <SetPasswordJob.h> #include "SetPasswordJob.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"

2
src/modules/users/SetPasswordJob.h
View File

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

6
src/modules/webview/WebViewStep.h
View File

@ -23,10 +23,10 @@
#include "WebViewConfig.h" #include "WebViewConfig.h"
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
#include <QVariantMap> #include <QVariantMap>

6
src/modules/welcome/WelcomeViewStep.h
View File

@ -22,10 +22,10 @@
#include <QObject> #include <QObject>
#include <modulesystem/Requirement.h> #include <modulesystem/Requirement.h>
#include <utils/PluginFactory.h> #include "utils/PluginFactory.h"
#include <viewpages/ViewStep.h> #include "viewpages/ViewStep.h"
#include <DllMacro.h> #include "DllMacro.h"
#include <QVariantMap> #include <QVariantMap>