Commit 08b50129 authored by Adriaan de Groot's avatar Adriaan de Groot

[locale] Apply coding style to Config

- ci/calamaresstyle
- sort includes by kind (local module, Calamares, Qt, STL)
- add copyright line
parent 412a8043
This diff is collapsed.
/* === This file is part of Calamares - <> ===
* Copyright 2019-2020, Adriaan de Groot <>
* Copyright 2020, Camilo Higuita <>
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -19,21 +20,23 @@
#include <QObject>
#include <QUrl>
#include <QAbstractListModel>
#include "Job.h"
#include "locale/TimeZone.h"
#include "LocaleConfiguration.h"
#include "timezonewidget/localeglobal.h"
#include "Job.h"
#include "locale/TimeZone.h"
#include <QAbstractListModel>
#include <QObject>
#include <memory>
class Config : public QObject
Q_PROPERTY(CalamaresUtils::Locale::CStringListModel * zonesModel READ zonesModel CONSTANT FINAL)
Q_PROPERTY(CalamaresUtils::Locale::CStringListModel * regionModel READ regionModel CONSTANT FINAL)
Q_PROPERTY(QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL)
Q_PROPERTY( CalamaresUtils::Locale::CStringListModel* zonesModel READ zonesModel CONSTANT FINAL )
Q_PROPERTY( CalamaresUtils::Locale::CStringListModel* regionModel READ regionModel CONSTANT FINAL )
Q_PROPERTY( QString prettyStatus READ prettyStatus NOTIFY prettyStatusChanged FINAL )
Config( QObject* parent = nullptr );
......@@ -41,7 +44,7 @@ public:
CalamaresUtils::Locale::CStringListModel* regionModel() const;
CalamaresUtils::Locale::CStringListModel* zonesModel() const;
void setLocaleInfo(const QString& initialRegion, const QString& initialZone, const QString& localeGenPath);
void setLocaleInfo( const QString& initialRegion, const QString& initialZone, const QString& localeGenPath );
Calamares::JobList createJobs();
QMap< QString, QString > localesMap();
......@@ -49,8 +52,8 @@ public:
CalamaresUtils::Locale::CStringPairList m_regionList;
CalamaresUtils::Locale::CStringListModel * m_regionModel;
CalamaresUtils::Locale::CStringListModel * m_zonesModel;
CalamaresUtils::Locale::CStringListModel* m_regionModel;
CalamaresUtils::Locale::CStringListModel* m_zonesModel;
LocaleConfiguration m_selectedLocaleConfiguration;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment