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

[libcalamares] Reduce warnings (extra ;, empty statement ..)

Browse Source
This commit is contained in:
Adriaan de Groot 2020-01-07 10:19:22 +01:00
parent b4c0ebe8ab
commit 1b62b2f66c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,6 @@ TZRegion::fromFile( const char* fileName )
} }
QString region = timezoneParts.first().trimmed(); QString region = timezoneParts.first().trimmed();
;
if ( region.isEmpty() ) if ( region.isEmpty() )
{ {
continue; continue;
@ -243,7 +242,7 @@ CStringListModel::CStringListModel( CStringPairList l )
CStringListModel::~CStringListModel() {} CStringListModel::~CStringListModel() {}
int int
CStringListModel::rowCount( const QModelIndex& parent ) const CStringListModel::rowCount( const QModelIndex& ) const
{ {
return m_list.count(); return m_list.count();
} }

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

@ -48,7 +48,7 @@ class CStringPair
{ {
public: public:
/// @brief An empty pair /// @brief An empty pair
CStringPair() {}; CStringPair() {}
/// @brief Given an identifier, create the pair /// @brief Given an identifier, create the pair
explicit CStringPair( const char* s1 ); explicit CStringPair( const char* s1 );
CStringPair( CStringPair&& t ); CStringPair( CStringPair&& t );
@ -88,7 +88,7 @@ class TZRegion : public CStringPair
{ {
public: public:
using CStringPair::CStringPair; using CStringPair::CStringPair;
virtual ~TZRegion(); virtual ~TZRegion() override;
QString tr() const override; QString tr() const override;
QString region() const { return key(); } QString region() const { return key(); }