diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp index 16b7d11a7..54e6cd848 100644 --- a/src/libcalamares/locale/Tests.cpp +++ b/src/libcalamares/locale/Tests.cpp @@ -47,6 +47,7 @@ private Q_SLOTS: void testInterlingue(); // TimeZone testing + void testRegions(); void testSimpleZones(); void testComplexZones(); }; @@ -244,18 +245,25 @@ LocaleTests::testTranslatableConfig2() QCOMPARE( ts3.count(), 1 ); // The empty string } +void +LocaleTests::testRegions() +{ + CalamaresUtils::Locale::RegionsModel regions; + + QVERIFY( regions.rowCount( QModelIndex() ) > 3 ); // Africa, America, Asia +} + + void LocaleTests::testSimpleZones() { using namespace CalamaresUtils::Locale; - } void LocaleTests::testComplexZones() { using namespace CalamaresUtils::Locale; - } QTEST_GUILESS_MAIN( LocaleTests ) diff --git a/src/libcalamares/locale/TimeZone.cpp b/src/libcalamares/locale/TimeZone.cpp index 37f94b6f2..0dba52a2a 100644 --- a/src/libcalamares/locale/TimeZone.cpp +++ b/src/libcalamares/locale/TimeZone.cpp @@ -92,36 +92,37 @@ namespace CalamaresUtils namespace Locale { -struct Private { +struct Private +{ }; -static Private* privateInstance() +static Private* +privateInstance() { static Private* s_p = new Private; return s_p; } -RegionsModel::RegionsModel() -: QAbstractListModel() -, m_private( privateInstance() ) +RegionsModel::RegionsModel( QObject* parent ) + : QAbstractListModel( parent ) + , m_private( privateInstance() ) { } -RegionsModel::~RegionsModel() -{ -} +RegionsModel::~RegionsModel() {} -int RegionsModel::rowCount(const QModelIndex& parent) const +int +RegionsModel::rowCount( const QModelIndex& parent ) const { return 0; } -QVariant RegionsModel::data(const QModelIndex& index, int role) const +QVariant +RegionsModel::data( const QModelIndex& index, int role ) const { return QVariant(); } - } // namespace Locale } // namespace CalamaresUtils diff --git a/src/libcalamares/locale/TimeZone.h b/src/libcalamares/locale/TimeZone.h index a34e03248..b3d57c4fd 100644 --- a/src/libcalamares/locale/TimeZone.h +++ b/src/libcalamares/locale/TimeZone.h @@ -43,17 +43,16 @@ class DLLEXPORT RegionsModel : public QAbstractListModel { Q_OBJECT - RegionsModel(); public: + RegionsModel( QObject* parent = nullptr ); virtual ~RegionsModel() override; - static RegionsModel* instance(); int rowCount( const QModelIndex& parent ) const override; QVariant data( const QModelIndex& index, int role ) const override; private: - Private *m_private; + Private* m_private; }; } // namespace Locale