introducing Q_FALLTHROUGH
This commit is contained in:
parent
33023f37b7
commit
4c74d9c19a
|
@ -55,4 +55,10 @@ void qskAsConst( const T && ) = delete;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef Q_FALLTHROUGH
|
||||||
|
#define QSK_FALLTHROUGH Q_FALLTHROUGH
|
||||||
|
#else
|
||||||
|
#define QSK_FALLTHROUGH
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -338,8 +338,6 @@ QString QskInputPanel::displayLanguageName() const
|
||||||
default:
|
default:
|
||||||
return QStringLiteral( "English (UK)" );
|
return QStringLiteral( "English (UK)" );
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
case QLocale::Spanish:
|
case QLocale::Spanish:
|
||||||
|
@ -907,12 +905,14 @@ void QskInputPanel::updateLocale( const QLocale& locale )
|
||||||
m_data->currentLayout = &qskInputPanelLayouts.zh;
|
m_data->currentLayout = &qskInputPanelLayouts.zh;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
|
||||||
qWarning() << "QskInputPanel: unsupported locale:" << locale;
|
|
||||||
|
|
||||||
case QLocale::C:
|
case QLocale::C:
|
||||||
m_data->currentLayout = &qskInputPanelLayouts.en_US;
|
m_data->currentLayout = &qskInputPanelLayouts.en_US;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
qWarning() << "QskInputPanel: unsupported locale:" << locale;
|
||||||
|
m_data->currentLayout = &qskInputPanelLayouts.en_US;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_EMIT displayLanguageNameChanged();
|
Q_EMIT displayLanguageNameChanged();
|
||||||
|
|
Loading…
Reference in New Issue