Commit aea9f864 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix clazy warning

parent 67cbcfed
...@@ -31,7 +31,7 @@ class Q_DECL_HIDDEN CompatibilityAttribute::Private ...@@ -31,7 +31,7 @@ class Q_DECL_HIDDEN CompatibilityAttribute::Private
{ {
public: public:
Private() {} Private() {}
bool operator==(const Private& other) const bool operator==(KAlarmCal::CompatibilityAttribute::Private other) const
{ {
return mCompatibility == other.mCompatibility return mCompatibility == other.mCompatibility
&& mVersion == other.mVersion; && mVersion == other.mVersion;
......
...@@ -1811,13 +1811,9 @@ QString KADateTime::toString(TimeFormat format) const ...@@ -1811,13 +1811,9 @@ QString KADateTime::toString(TimeFormat format) const
result += QLatin1Char('-'); result += QLatin1Char('-');
year = -year; year = -year;
} }
result += QStringLiteral("%1-%2-%3").arg(numString(year, 4)) result += QStringLiteral("%1-%2-%3").arg(numString(year, 4), numString(d->date().month(), 2), numString(d->date().day(), 2));
.arg(numString(d->date().month(), 2))
.arg(numString(d->date().day(), 2));
if (!d->dateOnly() || d->specType != LocalZone) { if (!d->dateOnly() || d->specType != LocalZone) {
result += QStringLiteral("T%1:%2:%3").arg(numString(d->time().hour(), 2)) result += QStringLiteral("T%1:%2:%3").arg(numString(d->time().hour(), 2), numString(d->time().minute(), 2), numString(d->time().second(), 2));
.arg(numString(d->time().minute(), 2))
.arg(numString(d->time().second(), 2));
if (d->time().msec()) { if (d->time().msec()) {
// Comma is preferred by ISO8601 as the decimal point symbol, // Comma is preferred by ISO8601 as the decimal point symbol,
// so use it unless '.' is the symbol used in this locale. // so use it unless '.' is the symbol used in this locale.
......
...@@ -3857,7 +3857,7 @@ void KAEventPrivate::dumpDebug() const ...@@ -3857,7 +3857,7 @@ void KAEventPrivate::dumpDebug() const
qCDebug(KALARMCAL_LOG) << "-- mLogFile:" << mLogFile; qCDebug(KALARMCAL_LOG) << "-- mLogFile:" << mLogFile;
} else if (mActionSubType == KAEvent::EMAIL) { } else if (mActionSubType == KAEvent::EMAIL) {
qCDebug(KALARMCAL_LOG) << "-- mEmail: FromKMail:" << mEmailFromIdentity; qCDebug(KALARMCAL_LOG) << "-- mEmail: FromKMail:" << mEmailFromIdentity;
qCDebug(KALARMCAL_LOG) << "-- Addresses:" << mEmailAddresses.join(QLatin1String(",")); qCDebug(KALARMCAL_LOG) << "-- Addresses:" << mEmailAddresses.join(QStringLiteral(","));
qCDebug(KALARMCAL_LOG) << "-- Subject:" << mEmailSubject; qCDebug(KALARMCAL_LOG) << "-- Subject:" << mEmailSubject;
qCDebug(KALARMCAL_LOG) << "-- Attachments:" << mEmailAttachments.join(QLatin1Char(',')); qCDebug(KALARMCAL_LOG) << "-- Attachments:" << mEmailAttachments.join(QLatin1Char(','));
qCDebug(KALARMCAL_LOG) << "-- Bcc:" << mEmailBcc; qCDebug(KALARMCAL_LOG) << "-- Bcc:" << mEmailBcc;
...@@ -4014,7 +4014,7 @@ void KAEventPrivate::readAlarms(const Event::Ptr &event, AlarmMap *alarmMap, boo ...@@ -4014,7 +4014,7 @@ void KAEventPrivate::readAlarms(const Event::Ptr &event, AlarmMap *alarmMap, boo
} }
} }
for (Alarm::Ptr alarm : alarms) { for (const Alarm::Ptr &alarm : alarms) {
// Parse the next alarm's text // Parse the next alarm's text
AlarmData data; AlarmData data;
readAlarm(alarm, data, audioOnly, cmdDisplay); readAlarm(alarm, data, audioOnly, cmdDisplay);
...@@ -5287,7 +5287,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi ...@@ -5287,7 +5287,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
int i; int i;
while ((i = cats.indexOf(TEMPL_DEF_TIME_CAT)) >= 0) { while ((i = cats.indexOf(TEMPL_DEF_TIME_CAT)) >= 0) {
cats.removeAt(i); cats.removeAt(i);
(flags += KAEventPrivate::TEMPL_AFTER_TIME_FLAG) += QLatin1String("0"); (flags += KAEventPrivate::TEMPL_AFTER_TIME_FLAG) += QStringLiteral("0");
} }
} }
...@@ -5354,7 +5354,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi ...@@ -5354,7 +5354,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
} }
if (addLateCancel) { if (addLateCancel) {
(flags += KAEventPrivate::LATE_CANCEL_FLAG) += QLatin1String("1"); (flags += KAEventPrivate::LATE_CANCEL_FLAG) += QStringLiteral("1");
} }
if (!flags.isEmpty()) { if (!flags.isEmpty()) {
event->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::FLAGS_PROPERTY, flags.join(KAEventPrivate::SC)); event->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::FLAGS_PROPERTY, flags.join(KAEventPrivate::SC));
...@@ -5469,7 +5469,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi ...@@ -5469,7 +5469,7 @@ bool KAEvent::convertKCalEvents(const Calendar::Ptr &calendar, int calendarVersi
* It's a KAlarm pre-1.5.0 or KAlarm 1.9 series pre-1.9.9 calendar file. * It's a KAlarm pre-1.5.0 or KAlarm 1.9 series pre-1.9.9 calendar file.
* Convert email identity names to uoids. * Convert email identity names to uoids.
*/ */
for (Alarm::Ptr alarm : alarms) { for (const Alarm::Ptr &alarm : alarms) {
const QString name = alarm->customProperty(KACalendar::APPNAME, KMAIL_ID_PROPERTY); const QString name = alarm->customProperty(KACalendar::APPNAME, KMAIL_ID_PROPERTY);
if (name.isEmpty()) { if (name.isEmpty()) {
continue; continue;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment