From 1df6454cfea949c15cab807605e81b7393e7a60f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 25 Nov 2019 10:52:22 +0100
Subject: [PATCH] [locale] Tidy up types
- use JobList typedef where possible
- remove unused forward type definitions
---
src/modules/locale/LocalePage.cpp | 2 +-
src/modules/locale/LocaleViewStep.cpp | 8 +++-----
src/modules/locale/LocaleViewStep.h | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 7720a840c..fc715e3f3 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -301,7 +301,7 @@ LocalePage::prettyStatus() const
}
-QList< Calamares::job_ptr >
+Calamares::JobList
LocalePage::createJobs()
{
QList< Calamares::job_ptr > list;
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index 4acfcb2de..4fa219065 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -142,7 +142,7 @@ LocaleViewStep::isAtEnd() const
}
-QList< Calamares::job_ptr >
+Calamares::JobList
LocaleViewStep::jobs() const
{
return m_jobs;
@@ -163,12 +163,9 @@ LocaleViewStep::onActivate()
void
LocaleViewStep::onLeave()
{
- m_jobs.clear();
-
if ( m_actualWidget )
{
- m_jobs.append( m_actualWidget->createJobs() );
-
+ m_jobs = m_actualWidget->createJobs();
m_prettyStatus = m_actualWidget->prettyStatus();
auto map = m_actualWidget->localesMap();
@@ -182,6 +179,7 @@ LocaleViewStep::onLeave()
}
else
{
+ m_jobs.clear();
Calamares::JobQueue::instance()->globalStorage()->remove( "localeConf" );
}
}
diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h
index ca8ecc3fa..eb8d64177 100644
--- a/src/modules/locale/LocaleViewStep.h
+++ b/src/modules/locale/LocaleViewStep.h
@@ -33,7 +33,6 @@
#include <memory>
class LocalePage;
-class WaitingWidget;
class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep
{
@@ -54,7 +53,7 @@ public:
bool isAtBeginning() const override;
bool isAtEnd() const override;
- QList< Calamares::job_ptr > jobs() const override;
+ Calamares::JobList jobs() const override;
void onActivate() override;
void onLeave() override;
@@ -78,7 +77,7 @@ private:
CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone;
QString m_localeGenPath;
- QList< Calamares::job_ptr > m_jobs;
+ Calamares::JobList m_jobs;
std::unique_ptr< CalamaresUtils::GeoIP::Handler > m_geoip;
};