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

[locale] QML doesn't like const

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-06 15:58:11 +02:00
parent 91cc5a2b42
commit 32c8338a9c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/locale/Config.h
View File

@ -42,7 +42,7 @@ class Config : public QObject
Q_PROPERTY( QAbstractItemModel* regionalZonesModel READ regionalZonesModel CONSTANT FINAL )
Q_PROPERTY(
const CalamaresUtils::Locale::TimeZoneData* currentLocation READ currentLocation NOTIFY currentLocationChanged )
CalamaresUtils::Locale::TimeZoneData* currentLocation READ currentLocation_c NOTIFY currentLocationChanged )
// Status are complete, human-readable, messages
Q_PROPERTY( QString currentLocationStatus READ currentLocationStatus NOTIFY currentLanguageStatusChanged )
@ -94,9 +94,16 @@ public:
const CalamaresUtils::Locale::TimeZoneData* currentLocation() const { return m_currentLocation; }
/// Special case, set location from starting timezone if not already set
void setCurrentLocation();
private:
CalamaresUtils::Locale::TimeZoneData* currentLocation_c() const
{
return const_cast< CalamaresUtils::Locale::TimeZoneData* >( m_currentLocation );
}
public Q_SLOTS:
/// Set a language by user-choice, overriding future location changes
void setLanguageExplicitly( const QString& language );