aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-16 06:52:27 +0200
committerMontel Laurent <[email protected]>2017-06-16 06:52:27 +0200
commit5ae567f6e6b1f069c5d61237817f7c71f16caf5c (patch)
tree21dd944c0926179a7502bd393d30a023a4cc7a53
parented9fc630aff055bd6669b87ebc95ca26a4ac8a1e (diff)
Optimization
-rw-r--r--src/dndfactory.cpp6
-rw-r--r--src/grantleeki18nlocalizer.cpp3
-rw-r--r--src/htmlexport.cpp14
-rw-r--r--src/incidenceformatter.cpp41
4 files changed, 39 insertions, 25 deletions
diff --git a/src/dndfactory.cpp b/src/dndfactory.cpp
index 8685ac2..99dcf14 100644
--- a/src/dndfactory.cpp
+++ b/src/dndfactory.cpp
@@ -306,7 +306,8 @@ bool DndFactory::copyIncidences(const Incidence::List &incidences)
MemoryCalendar::Ptr calendar(new MemoryCalendar(d->mCalendar->timeSpec()));
Incidence::List::ConstIterator it;
- for (it = incidences.constBegin(); it != incidences.constEnd(); ++it) {
+ const Incidence::List::ConstIterator end(incidences.constEnd());
+ for (it = incidences.constBegin(); it != end; ++it) {
if (*it) {
calendar->addIncidence(Incidence::Ptr((*it)->clone()));
}
@@ -351,8 +352,9 @@ Incidence::List DndFactory::pasteIncidences(const KDateTime &newDateTime,
Incidence::List::ConstIterator it;
const Incidence::List incidences = calendar->incidences();
+ const Incidence::List::ConstIterator end(incidences.constEnd());
for (it = incidences.constBegin();
- it != incidences.constEnd(); ++it) {
+ it != end; ++it) {
Incidence::Ptr incidence = d->pasteIncidence(*it, newDateTime, pasteOptions);
if (incidence) {
list.append(incidence);
diff --git a/src/grantleeki18nlocalizer.cpp b/src/grantleeki18nlocalizer.cpp
index 9d66ea5..c0d2571 100644
--- a/src/grantleeki18nlocalizer.cpp
+++ b/src/grantleeki18nlocalizer.cpp
@@ -69,6 +69,9 @@ QString GrantleeKi18nLocalizer::processArguments(const KLocalizedString &kstr,
break;
}
// fall-through
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+ Q_FALLTHROUGH();
+#endif
default:
qCWarning(KCALUTILS_LOG) << "Unknown type" << iter->typeName() << "(" << iter->type() << ")";
break;
diff --git a/src/htmlexport.cpp b/src/htmlexport.cpp
index 7d2c848..a73ca48 100644
--- a/src/htmlexport.cpp
+++ b/src/htmlexport.cpp
@@ -221,7 +221,8 @@ void HtmlExport::createMonthView(QTextStream *ts)
if (events.count()) {
*ts << "<table>";
Event::List::ConstIterator it;
- for (it = events.constBegin(); it != events.constEnd(); ++it) {
+ Event::List::ConstIterator end(events.constEnd());
+ for (it = events.constBegin(); it != end; ++it) {
if (checkSecrecy(*it)) {
createEvent(ts, *it, start, false);
}
@@ -289,7 +290,8 @@ void HtmlExport::createEventList(QTextStream *ts)
<< "</i></td></tr>" << endl;
Event::List::ConstIterator it;
- for (it = events.constBegin(); it != events.constEnd(); ++it) {
+ const Event::List::ConstIterator end(events.constEnd());
+ for (it = events.constBegin(); it != end; ++it) {
if (checkSecrecy(*it)) {
createEvent(ts, *it, dt);
}
@@ -381,14 +383,15 @@ void HtmlExport::createTodoList(QTextStream *ts)
// replaced by a real sorting algorithm.
Todo::List todoList;
Todo::List::ConstIterator it;
+ const Todo::List::ConstIterator end(rawTodoList.constEnd());
for (int i = 1; i <= 9; ++i) {
- for (it = rawTodoList.constBegin(); it != rawTodoList.constEnd(); ++it) {
+ for (it = rawTodoList.constBegin(); it != end; ++it) {
if ((*it)->priority() == i && checkSecrecy(*it)) {
todoList.append(*it);
}
}
}
- for (it = rawTodoList.constBegin(); it != rawTodoList.constEnd(); ++it) {
+ for (it = rawTodoList.constBegin(); it != end; ++it) {
if ((*it)->priority() == 0 && checkSecrecy(*it)) {
todoList.append(*it);
}
@@ -627,7 +630,8 @@ void HtmlExport::formatAttendees(QTextStream *ts,
*ts << incidence->organizer()->fullName();
*ts << "</em><br />";
Attendee::List::ConstIterator it;
- for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) {
+ const Attendee::List::ConstIterator end(attendees.constEnd());
+ for (it = attendees.constBegin(); it != end; ++it) {
Attendee::Ptr a(*it);
if (!a->email().isEmpty()) {
*ts << "<a href=\"mailto:" << a->email();
diff --git a/src/incidenceformatter.cpp b/src/incidenceformatter.cpp
index 99a5d2d..540812d 100644
--- a/src/incidenceformatter.cpp
+++ b/src/incidenceformatter.cpp
@@ -78,7 +78,6 @@ static QVariantHash inviteButton(const QString &id, const QString &text, const Q
//@cond PRIVATE
static QString string2HTML(const QString &str)
{
-// return Qt::convertFromPlainText( str, Qt::WhiteSpaceNormal );
// use convertToHtml so we get clickable links and other goodies
return KTextToHTML::convertToHtml(str, KTextToHTML::HighlightText | KTextToHTML::ReplaceSmileys);
}
@@ -215,7 +214,7 @@ static QString firstAttendeeName(const Incidence::Ptr &incidence, const QString
QString name;
if (incidence) {
Attendee::List attendees = incidence->attendees();
- if (attendees.count() > 0) {
+ if (!attendees.isEmpty()) {
Attendee::Ptr attendee = *attendees.begin();
name = attendee->name();
if (name.isEmpty()) {
@@ -336,8 +335,8 @@ static QVariantList displayViewFormatAttendeeRoleList(const Incidence::Ptr &inci
Attendee::List::ConstIterator it;
Attendee::List attendees = incidence->attendees();
-
- for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) {
+ const Attendee::List::ConstIterator end(attendees.constEnd());
+ for (it = attendees.constBegin(); it != end; ++it) {
Attendee::Ptr a = *it;
if (a->role() != role) {
// skip this role
@@ -874,7 +873,8 @@ static Attendee::Ptr findDelegatedFromMyAttendee(const Incidence::Ptr &incidence
QString delegatorName, delegatorEmail;
Attendee::List attendees = incidence->attendees();
Attendee::List::ConstIterator it;
- for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) {
+ const Attendee::List::ConstIterator end(attendees.constEnd());
+ for (it = attendees.constBegin(); it != end; ++it) {
Attendee::Ptr a = *it;
KEmailAddress::extractEmailAddressAndName(a->delegator(), delegatorEmail, delegatorName);
if (thatIsMe(delegatorEmail)) {
@@ -897,7 +897,8 @@ static Attendee::Ptr findMyAttendee(const Incidence::Ptr &incidence)
Attendee::List attendees = incidence->attendees();
Attendee::List::ConstIterator it;
- for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) {
+ const Attendee::List::ConstIterator end(attendees.constEnd());
+ for (it = attendees.constBegin(); it != end; ++it) {
Attendee::Ptr a = *it;
if (iamAttendee(a)) {
attendee = a;
@@ -920,7 +921,8 @@ static Attendee::Ptr findAttendee(const Incidence::Ptr &incidence,
Attendee::List attendees = incidence->attendees();
Attendee::List::ConstIterator it;
- for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) {
+ const Attendee::List::ConstIterator end(attendees.constEnd());
+ for (it = attendees.constBegin(); it != end; ++it) {
Attendee::Ptr a = *it;
if (email == a->email()) {
attendee = a;
@@ -941,7 +943,8 @@ static bool rsvpRequested(const Incidence::Ptr &incidence)
bool rsvp = true; // better send superfluously than not at all
Attendee::List attendees = incidence->attendees();
Attendee::List::ConstIterator it;
- for (it = attendees.constBegin(); it != attendees.constEnd(); ++it) {
+ const Attendee::List::ConstIterator end(attendees.constEnd());
+ for (it = attendees.constBegin(); it != end; ++it) {
if (it == attendees.constBegin()) {
rsvp = (*it)->RSVP(); // use what the first one has
} else {
@@ -1582,7 +1585,7 @@ static QString invitationHeaderTodo(const Todo::Ptr &todo,
}
Attendee::List attendees = todo->attendees();
- if (attendees.count() == 0) {
+ if (attendees.isEmpty()) {
qCDebug(KCALUTILS_LOG) << "No attendees in the iCal reply!";
return QString();
}
@@ -1973,12 +1976,12 @@ QString InvitationFormatterHelper::generateLinkURL(const QString &id)
QString InvitationFormatterHelper::makeLink(const QString &id, const QString &text)
{
if (!id.startsWith(QLatin1String("ATTACH:"))) {
- QString res = QStringLiteral("<a href=\"%1\"><font size=\"-1\"><b>%2</b></font></a>").
+ const QString res = QStringLiteral("<a href=\"%1\"><font size=\"-1\"><b>%2</b></font></a>").
arg(generateLinkURL(id), text);
return res;
} else {
// draw the attachment links in non-bold face
- QString res = QStringLiteral("<a href=\"%1\">%2</a>").
+ const QString res = QStringLiteral("<a href=\"%1\">%2</a>").
arg(generateLinkURL(id), text);
return res;
}
@@ -2631,8 +2634,7 @@ QString IncidenceFormatter::ToolTipVisitor::dateRangeText(const Journal::Ptr &jo
QString IncidenceFormatter::ToolTipVisitor::dateRangeText(const FreeBusy::Ptr &fb)
{
//FIXME: support mRichText==false
- QString ret;
- ret = QLatin1String("<br>") +
+ QString ret = QLatin1String("<br>") +
i18n("<i>Period start:</i> %1",
QLocale().toString(fb->dtStart().dateTime(), QLocale::ShortFormat));
ret += QLatin1String("<br>") +
@@ -2720,7 +2722,7 @@ static QString tooltipFormatAttendeeRoleList(const Incidence::Ptr &incidence,
Attendee::List::ConstIterator it;
Attendee::List attendees = incidence->attendees();
- Attendee::List::ConstIterator end(attendees.constEnd());
+ const Attendee::List::ConstIterator end(attendees.constEnd());
for (it = attendees.constBegin(); it != end; ++it) {
Attendee::Ptr a = *it;
if (a->role() != role) {
@@ -2870,7 +2872,7 @@ QString IncidenceFormatter::ToolTipVisitor::generateToolTip(const Incidence::Ptr
tmp += QLatin1String("<hr>");
}
- int reminderCount = incidence->alarms().count();
+ const int reminderCount = incidence->alarms().count();
if (reminderCount > 0 && incidence->hasEnabledAlarms()) {
tmp += QLatin1String("<br>");
tmp += QLatin1String("<i>") + i18np("Reminder:", "Reminders:", reminderCount) + QLatin1String("</i>") + QLatin1String("&nbsp;");
@@ -3417,8 +3419,9 @@ QString IncidenceFormatter::recurrenceString(const Incidence::Ptr &incidence)
// Now, append the EXDATEs
DateTimeList l = recur->exDateTimes();
DateTimeList::ConstIterator il;
+ const DateTimeList::ConstIterator end(l.constEnd());
QStringList exStr;
- for (il = l.constBegin(); il != l.constEnd(); ++il) {
+ for (il = l.constBegin(); il != end; ++il) {
switch (recur->recurrenceType()) {
case Recurrence::rMinutely:
exStr << i18n("minute %1", (*il).time().minute());
@@ -3452,7 +3455,8 @@ QString IncidenceFormatter::recurrenceString(const Incidence::Ptr &incidence)
DateList d = recur->exDates();
DateList::ConstIterator dl;
- for (dl = d.constBegin(); dl != d.constEnd(); ++dl) {
+ const DateList::ConstIterator dlEdnd(d.constEnd());
+ for (dl = d.constBegin(); dl != dlEdnd; ++dl) {
switch (recur->recurrenceType()) {
case Recurrence::rDaily:
exStr << QLocale().toString((*dl), QLocale::ShortFormat);
@@ -3624,7 +3628,8 @@ QStringList IncidenceFormatter::reminderStringList(const Incidence::Ptr &inciden
if (incidence) {
Alarm::List alarms = incidence->alarms();
Alarm::List::ConstIterator it;
- for (it = alarms.constBegin(); it != alarms.constEnd(); ++it) {
+ const Alarm::List::ConstIterator end(alarms.constEnd());
+ for (it = alarms.constBegin(); it != end; ++it) {
Alarm::Ptr alarm = *it;
int offset = 0;
QString remStr, atStr, offsetStr;