From 4c74d9c19ae8aef1502634b0669145d4227cc50d Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 11 Dec 2017 08:58:57 +0100 Subject: [PATCH] introducing Q_FALLTHROUGH --- src/common/QskGlobal.h | 6 ++++++ src/controls/QskInputPanel.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/common/QskGlobal.h b/src/common/QskGlobal.h index 46394806..a083fdb0 100644 --- a/src/common/QskGlobal.h +++ b/src/common/QskGlobal.h @@ -55,4 +55,10 @@ void qskAsConst( const T && ) = delete; #endif +#ifdef Q_FALLTHROUGH +#define QSK_FALLTHROUGH Q_FALLTHROUGH +#else +#define QSK_FALLTHROUGH +#endif + #endif diff --git a/src/controls/QskInputPanel.cpp b/src/controls/QskInputPanel.cpp index d774258a..4395c987 100644 --- a/src/controls/QskInputPanel.cpp +++ b/src/controls/QskInputPanel.cpp @@ -338,8 +338,6 @@ QString QskInputPanel::displayLanguageName() const default: return QStringLiteral( "English (UK)" ); } - - break; } case QLocale::Spanish: @@ -907,12 +905,14 @@ void QskInputPanel::updateLocale( const QLocale& locale ) m_data->currentLayout = &qskInputPanelLayouts.zh; break; - default: - qWarning() << "QskInputPanel: unsupported locale:" << locale; - case QLocale::C: m_data->currentLayout = &qskInputPanelLayouts.en_US; break; + + default: + qWarning() << "QskInputPanel: unsupported locale:" << locale; + m_data->currentLayout = &qskInputPanelLayouts.en_US; + } Q_EMIT displayLanguageNameChanged();