introducing Q_FALLTHROUGH

This commit is contained in:
Uwe Rathmann 2017-12-11 08:58:57 +01:00
parent 33023f37b7
commit 4c74d9c19a
2 changed files with 11 additions and 5 deletions

View File

@ -55,4 +55,10 @@ void qskAsConst( const T && ) = delete;
#endif
#ifdef Q_FALLTHROUGH
#define QSK_FALLTHROUGH Q_FALLTHROUGH
#else
#define QSK_FALLTHROUGH
#endif
#endif

View File

@ -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();