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

[libcalamares] Avoid weak vtables in string-pair implementation

Browse Source
This commit is contained in:
Adriaan de Groot 2019-11-26 12:30:59 +01:00
parent fc7f49b610
commit 94fe4d2fda
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libcalamares/locale/TimeZone.cpp
View File

@ -79,5 +79,20 @@ CStringPair::~CStringPair()
free( m_key ); free( m_key );
} }
QString
TZRegion::tr() const
{
// NOTE: context name must match what's used in zone-extractor.py
return QObject::tr( m_human, "tz_regions" );
}
QString
TZZone::tr() const
{
// NOTE: context name must match what's used in zone-extractor.py
return QObject::tr( m_human, "tz_names" );
}
} // namespace Locale } // namespace Locale
} // namespace CalamaresUtils } // namespace CalamaresUtils

8
src/libcalamares/locale/TimeZone.h
View File

@ -61,9 +61,7 @@ class TZRegion : public CStringPair
{ {
public: public:
using CStringPair::CStringPair; using CStringPair::CStringPair;
QString tr() const override;
// NOTE: context name must match what's used in zone-extractor.py
QString tr() const override { return QObject::tr( m_human, "tz_regions" ); }
}; };
/// @brief A pair of strings for specific timezone names (e.g. "New_York") /// @brief A pair of strings for specific timezone names (e.g. "New_York")
@ -71,9 +69,7 @@ class TZZone : public CStringPair
{ {
public: public:
using CStringPair::CStringPair; using CStringPair::CStringPair;
QString tr() const override;
// NOTE: context name must match what's used in zone-extractor.py
QString tr() const override { return QObject::tr( m_human, "tz_names" ); }
}; };
} // namespace Locale } // namespace Locale