Changeset View
Changeset View
Standalone View
Standalone View
src/recurrencerule.cpp
Show First 20 Lines • Show All 2065 Lines • ▼ Show 20 Line(s) | 2061 | if ( !list.isEmpty() ) {\ | |||
---|---|---|---|---|---|
2066 | qCDebug(KCALCORE_LOG) << " " << label << lst.join( QStringLiteral(", ") );\ | 2066 | qCDebug(KCALCORE_LOG) << " " << label << lst.join( QStringLiteral(", ") );\ | ||
2067 | } | 2067 | } | ||
2068 | dumpByIntList(d->mBySeconds, QStringLiteral("BySeconds: ")); | 2068 | dumpByIntList(d->mBySeconds, QStringLiteral("BySeconds: ")); | ||
2069 | dumpByIntList(d->mByMinutes, QStringLiteral("ByMinutes: ")); | 2069 | dumpByIntList(d->mByMinutes, QStringLiteral("ByMinutes: ")); | ||
2070 | dumpByIntList(d->mByHours, QStringLiteral("ByHours: ")); | 2070 | dumpByIntList(d->mByHours, QStringLiteral("ByHours: ")); | ||
2071 | if (!d->mByDays.isEmpty()) { | 2071 | if (!d->mByDays.isEmpty()) { | ||
2072 | QStringList lst; | 2072 | QStringList lst; | ||
2073 | for (int i = 0, iend = d->mByDays.count(); i < iend; ++i) { | 2073 | for (int i = 0, iend = d->mByDays.count(); i < iend; ++i) { | ||
2074 | \ | 2074 | lst.append((d->mByDays[i].pos() ? QString::number(d->mByDays[i].pos()) : QLatin1String("")) + | ||
2075 | lst.append((d->mByDays[i].pos() ? QString::number(d->mByDays[i].pos()) : QStringLiteral("")) + | | |||
2076 | DateHelper::dayName(d->mByDays[i].day())); | 2075 | DateHelper::dayName(d->mByDays[i].day())); | ||
2077 | } | 2076 | } | ||
2078 | qCDebug(KCALCORE_LOG) << " ByDays: " << lst.join(QStringLiteral(", ")); | 2077 | qCDebug(KCALCORE_LOG) << " ByDays: " << lst.join(QStringLiteral(", ")); | ||
2079 | } | 2078 | } | ||
dvratil: Should this be in an `else` branch? Otherwise `bydays` will be appended twice if the condition… | |||||
winterz: I'm not seeing what you're seeing. I'll revert the logic back
| |||||
2080 | dumpByIntList(d->mByMonthDays, QStringLiteral("ByMonthDays:")); | 2079 | dumpByIntList(d->mByMonthDays, QStringLiteral("ByMonthDays:")); | ||
2081 | dumpByIntList(d->mByYearDays, QStringLiteral("ByYearDays: ")); | 2080 | dumpByIntList(d->mByYearDays, QStringLiteral("ByYearDays: ")); | ||
2082 | dumpByIntList(d->mByWeekNumbers, QStringLiteral("ByWeekNr: ")); | 2081 | dumpByIntList(d->mByWeekNumbers, QStringLiteral("ByWeekNr: ")); | ||
2083 | dumpByIntList(d->mByMonths, QStringLiteral("ByMonths: ")); | 2082 | dumpByIntList(d->mByMonths, QStringLiteral("ByMonths: ")); | ||
2084 | dumpByIntList(d->mBySetPos, QStringLiteral("BySetPos: ")); | 2083 | dumpByIntList(d->mBySetPos, QStringLiteral("BySetPos: ")); | ||
2085 | #undef dumpByIntList | 2084 | #undef dumpByIntList | ||
2086 | 2085 | | |||
2087 | qCDebug(KCALCORE_LOG) << " Week start:" << DateHelper::dayName(d->mWeekStart); | 2086 | qCDebug(KCALCORE_LOG) << " Week start:" << DateHelper::dayName(d->mWeekStart); | ||
▲ Show 20 Lines • Show All 246 Lines • Show Last 20 Lines |
Should this be in an else branch? Otherwise bydays will be appended twice if the condition above is true