From 420df9fe9c915aad59f22595b1d20d6f95fa948f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 8 Aug 2019 15:11:56 +0000 Subject: [PATCH] remove redundant default cases from QDate short/long month/day getters upstream commits: https://github.com/qt/qtbase/commit/0b77e1b6112dfe8a159d6704fbdb940ba477b467 https://github.com/qt/qtbase/commit/613449a58d3957267ed8abb0d629ebdac72ec6cb Signed-off-by: Ivailo Monev --- src/core/tools/qdatetime.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/core/tools/qdatetime.cpp b/src/core/tools/qdatetime.cpp index 0ec2b9199..39dd34451 100644 --- a/src/core/tools/qdatetime.cpp +++ b/src/core/tools/qdatetime.cpp @@ -499,8 +499,6 @@ QString QDate::shortMonthName(int month, QDate::MonthNameType type) return QLocale::system().monthName(month, QLocale::ShortFormat); case QDate::StandaloneFormat: return QLocale::system().standaloneMonthName(month, QLocale::ShortFormat); - default: - break; } return QString(); } @@ -541,8 +539,6 @@ QString QDate::longMonthName(int month, MonthNameType type) return QLocale::system().monthName(month, QLocale::LongFormat); case QDate::StandaloneFormat: return QLocale::system().standaloneMonthName(month, QLocale::LongFormat); - default: - break; } return QString(); } @@ -578,8 +574,6 @@ QString QDate::shortDayName(int weekday, MonthNameType type) return QLocale::system().dayName(weekday, QLocale::ShortFormat); case QDate::StandaloneFormat: return QLocale::system().standaloneDayName(weekday, QLocale::ShortFormat); - default: - break; } return QString(); } @@ -615,10 +609,8 @@ QString QDate::longDayName(int weekday, MonthNameType type) return QLocale::system().dayName(weekday, QLocale::LongFormat); case QDate::StandaloneFormat: return QLocale::system().standaloneDayName(weekday, QLocale::LongFormat); - default: - break; } - return QLocale::system().dayName(weekday, QLocale::LongFormat); + return QString(); } #endif //QT_NO_TEXTDATE