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

[locale] Tidy up types

Browse Source 
- use JobList typedef where possible
 - remove unused forward type definitions
This commit is contained in:
Adriaan de Groot 2019-11-25 10:52:22 +01:00
parent 2034dd62a4
commit 1df6454cfe
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,7 +301,7 @@ LocalePage::prettyStatus() const
} }
QList< Calamares::job_ptr > Calamares::JobList
LocalePage::createJobs() LocalePage::createJobs()
{ {
QList< Calamares::job_ptr > list; QList< Calamares::job_ptr > list;

8
src/modules/locale/LocaleViewStep.cpp
View File

@ -142,7 +142,7 @@ LocaleViewStep::isAtEnd() const
} }
QList< Calamares::job_ptr > Calamares::JobList
LocaleViewStep::jobs() const LocaleViewStep::jobs() const
{ {
return m_jobs; return m_jobs;
@ -163,12 +163,9 @@ LocaleViewStep::onActivate()
void void
LocaleViewStep::onLeave() LocaleViewStep::onLeave()
{ {
m_jobs.clear();
if ( m_actualWidget ) if ( m_actualWidget )
{ {
m_jobs.append( m_actualWidget->createJobs() ); m_jobs = m_actualWidget->createJobs();
m_prettyStatus = m_actualWidget->prettyStatus(); m_prettyStatus = m_actualWidget->prettyStatus();
auto map = m_actualWidget->localesMap(); auto map = m_actualWidget->localesMap();
@ -182,6 +179,7 @@ LocaleViewStep::onLeave()
} }
else else
{ {
m_jobs.clear();
Calamares::JobQueue::instance()->globalStorage()->remove( "localeConf" ); Calamares::JobQueue::instance()->globalStorage()->remove( "localeConf" );
} }
} }

5
src/modules/locale/LocaleViewStep.h
View File

@ -33,7 +33,6 @@
#include <memory> #include <memory>
class LocalePage; class LocalePage;
class WaitingWidget;
class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep
{ {
@ -54,7 +53,7 @@ public:
bool isAtBeginning() const override; bool isAtBeginning() const override;
bool isAtEnd() const override; bool isAtEnd() const override;
QList< Calamares::job_ptr > jobs() const override; Calamares::JobList jobs() const override;
void onActivate() override; void onActivate() override;
void onLeave() override; void onLeave() override;
@ -78,7 +77,7 @@ private:
CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone; CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone;
QString m_localeGenPath; QString m_localeGenPath;
QList< Calamares::job_ptr > m_jobs; Calamares::JobList m_jobs;
std::unique_ptr< CalamaresUtils::GeoIP::Handler > m_geoip; std::unique_ptr< CalamaresUtils::GeoIP::Handler > m_geoip;
}; };