diff options
Diffstat (limited to 'src/widgets/widgets/qcalendarwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 128 |
1 files changed, 79 insertions, 49 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 48b224fe13..eb216b1ad0 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -53,6 +53,8 @@ #include <qbasictimer.h> #include <qstylepainter.h> +#include <vector> + QT_BEGIN_NAMESPACE enum { @@ -423,6 +425,17 @@ QString QCalendarYearValidator::text(const QDate &date, int repeat) const /////////////////////////////////// +struct SectionToken { + Q_DECL_CONSTEXPR SectionToken(QCalendarDateSectionValidator *v, int rep) + : validator(v), repeat(rep) {} + + QCalendarDateSectionValidator *validator; + int repeat; +}; +} // unnamed namespace +Q_DECLARE_TYPEINFO(SectionToken, Q_PRIMITIVE_TYPE); +namespace { + class QCalendarDateValidator { public: @@ -438,13 +451,6 @@ public: void setLocale(const QLocale &locale); private: - - struct SectionToken { - SectionToken(QCalendarDateSectionValidator *val, int rep) : validator(val), repeat(rep) {} - QCalendarDateSectionValidator *validator; - int repeat; - }; - void toNextToken(); void toPreviousToken(); void applyToDate(); @@ -453,12 +459,12 @@ private: void clear(); QStringList m_separators; - QList<SectionToken *> m_tokens; + std::vector<SectionToken> m_tokens; QCalendarYearValidator m_yearValidator; QCalendarMonthValidator m_monthValidator; QCalendarDayValidator m_dayValidator; - SectionToken *m_currentToken; + int m_currentToken; QDate m_initialDate; QDate m_currentDate; @@ -467,7 +473,7 @@ private: }; QCalendarDateValidator::QCalendarDateValidator() - : m_currentToken(Q_NULLPTR), + : m_currentToken(-1), m_initialDate(QDate::currentDate()), m_currentDate(m_initialDate), m_lastSectionMove(QCalendarDateSectionValidator::ThisSection) @@ -510,17 +516,16 @@ void QCalendarDateValidator::setInitialDate(const QDate &date) QString QCalendarDateValidator::currentText() const { QString str; - QStringListIterator itSep(m_separators); - QListIterator<SectionToken *> itTok(m_tokens); - while (itSep.hasNext()) { - str += itSep.next(); - if (itTok.hasNext()) { - SectionToken *token = itTok.next(); - QCalendarDateSectionValidator *validator = token->validator; - if (m_currentToken == token) - str += validator->text(); + const int numSeps = m_separators.size(); + const int numTokens = int(m_tokens.size()); + for (int i = 0; i < numSeps; ++i) { + str += m_separators.at(i); + if (i < numTokens) { + const SectionToken &token = m_tokens[i]; + if (i == m_currentToken) + str += token.validator->text(); else - str += validator->text(m_currentDate, token->repeat); + str += token.validator->text(m_currentDate, token.repeat); } } return str; @@ -528,14 +533,10 @@ QString QCalendarDateValidator::currentText() const void QCalendarDateValidator::clear() { - QListIterator<SectionToken *> it(m_tokens); - while (it.hasNext()) - delete it.next(); - m_tokens.clear(); m_separators.clear(); - m_currentToken = 0; + m_currentToken = -1; } void QCalendarDateValidator::setFormat(const QString &format) @@ -558,25 +559,25 @@ void QCalendarDateValidator::setFormat(const QString &format) separator += nextChar; quoting = false; } else { - SectionToken *token = 0; + QCalendarDateSectionValidator *validator = 0; if (nextChar == QLatin1Char('d')) { offset = qMin(4, countRepeat(format, pos)); - token = new SectionToken(&m_dayValidator, offset); + validator = &m_dayValidator; } else if (nextChar == QLatin1Char('M')) { offset = qMin(4, countRepeat(format, pos)); - token = new SectionToken(&m_monthValidator, offset); + validator = &m_monthValidator; } else if (nextChar == QLatin1Char('y')) { offset = qMin(4, countRepeat(format, pos)); - token = new SectionToken(&m_yearValidator, offset); + validator = &m_yearValidator; } else { separator += nextChar; } - if (token) { - m_tokens.append(token); + if (validator) { + m_tokens.push_back(SectionToken(validator, offset)); m_separators.append(separator); separator = QString(); - if (!m_currentToken) - m_currentToken = token; + if (m_currentToken < 0) + m_currentToken = int(m_tokens.size()) - 1; } } @@ -595,29 +596,23 @@ void QCalendarDateValidator::applyToDate() void QCalendarDateValidator::toNextToken() { - const int idx = m_tokens.indexOf(m_currentToken); - if (idx == -1) + if (m_currentToken < 0) return; - if (idx + 1 >= m_tokens.count()) - m_currentToken = m_tokens.first(); - else - m_currentToken = m_tokens.at(idx + 1); + ++m_currentToken; + m_currentToken %= m_tokens.size(); } void QCalendarDateValidator::toPreviousToken() { - const int idx = m_tokens.indexOf(m_currentToken); - if (idx == -1) + if (m_currentToken < 0) return; - if (idx - 1 < 0) - m_currentToken = m_tokens.last(); - else - m_currentToken = m_tokens.at(idx - 1); + --m_currentToken; + m_currentToken %= m_tokens.size(); } void QCalendarDateValidator::handleKeyEvent(QKeyEvent *keyEvent) { - if (!m_currentToken) + if (m_currentToken < 0) return; int key = keyEvent->key(); @@ -630,7 +625,7 @@ void QCalendarDateValidator::handleKeyEvent(QKeyEvent *keyEvent) else if (key == Qt::Key_Left) toPreviousToken(); - m_lastSectionMove = m_currentToken->validator->handleKey(key); + m_lastSectionMove = m_tokens[m_currentToken].validator->handleKey(key); applyToDate(); if (m_lastSectionMove == QCalendarDateSectionValidator::NextSection) @@ -821,6 +816,41 @@ void QCalendarTextNavigator::setDateEditAcceptDelay(int delay) class QCalendarView; +// a small helper class that replaces a QMap<Qt::DayOfWeek, T>, +// but requires T to have a member-swap and a default constructor +// which should be cheap (no memory allocations) + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4351) // "new behavior: elements of array ... will be default initialized" + +template <typename T> +class StaticDayOfWeekAssociativeArray { + bool contained[7]; + T data[7]; + + static Q_DECL_CONSTEXPR int day2idx(Qt::DayOfWeek day) Q_DECL_NOTHROW { return int(day) - 1; } // alt: day % 7 +public: + Q_DECL_CONSTEXPR StaticDayOfWeekAssociativeArray() Q_DECL_NOEXCEPT_EXPR(noexcept(T())) + : contained(), data() {} + + Q_DECL_CONSTEXPR bool contains(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return contained[day2idx(day)]; } + Q_DECL_CONSTEXPR const T &value(Qt::DayOfWeek day) const Q_DECL_NOTHROW { return data[day2idx(day)]; } + + Q_DECL_RELAXED_CONSTEXPR T &operator[](Qt::DayOfWeek day) Q_DECL_NOTHROW + { + const int idx = day2idx(day); + contained[idx] = true; + return data[idx]; + } + + Q_DECL_RELAXED_CONSTEXPR void insert(Qt::DayOfWeek day, T v) Q_DECL_NOTHROW + { + operator[](day).swap(v); + } +}; + +QT_WARNING_POP + class QCalendarModel : public QAbstractTableModel { Q_OBJECT @@ -899,7 +929,7 @@ public: Qt::DayOfWeek m_firstDay; QCalendarWidget::HorizontalHeaderFormat m_horizontalHeaderFormat; bool m_weekNumbersShown; - QMap<Qt::DayOfWeek, QTextCharFormat> m_dayFormats; + StaticDayOfWeekAssociativeArray<QTextCharFormat> m_dayFormats; QMap<QDate, QTextCharFormat> m_dateFormats; QTextCharFormat m_headerFormat; QCalendarView *m_view; @@ -2887,7 +2917,7 @@ void QCalendarWidget::setDateEditAcceptDelay(int delay) */ void QCalendarWidget::updateCell(const QDate &date) { - if (!date.isValid()) { + if (Q_UNLIKELY(!date.isValid())) { qWarning("QCalendarWidget::updateCell: Invalid date"); return; } |