Hello community, here is the log from the commit of package kalarmcal for openSUSE:Factory checked in at 2016-01-10 13:04:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalarmcal (Old) and /work/SRC/openSUSE:Factory/.kalarmcal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalarmcal" Changes: -------- --- /work/SRC/openSUSE:Factory/kalarmcal/kalarmcal.changes 2015-11-15 12:30:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kalarmcal.new/kalarmcal.changes 2016-01-10 13:04:21.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 13 13:06:47 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- +Fri Dec 11 01:16:05 UTC 2015 - [email protected] + +- Remove superfluous libpth-devel dependency + +------------------------------------------------------------------- Old: ---- kalarmcal-15.08.3.tar.xz New: ---- kalarmcal-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalarmcal.spec ++++++ --- /var/tmp/diff_new_pack.gUXzW3/_old 2016-01-10 13:04:21.000000000 +0100 +++ /var/tmp/diff_new_pack.gUXzW3/_new 2016-01-10 13:04:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: kalarmcal -Version: 15.08.3 +Version: 15.12.0 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Library kalarmcal @@ -54,7 +54,6 @@ BuildRequires: libKF5AkonadiPrivate-devel >= 1.72.43 BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 -BuildRequires: libpth-devel BuildRequires: libxslt-devel BuildRequires: openldap2-devel BuildRequires: phonon4qt5-devel ++++++ kalarmcal-15.08.3.tar.xz -> kalarmcal-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/CMakeLists.txt new/kalarmcal-15.12.0/CMakeLists.txt --- old/kalarmcal-15.08.3/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/CMakeLists.txt 2015-10-28 13:57:16.000000000 +0100 @@ -3,7 +3,7 @@ project(KAlarmCal) # ECM setup -find_package(ECM 5.12.0 CONFIG REQUIRED) +find_package(ECM 5.14.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -15,11 +15,12 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings) +include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.12.0") set(KALARM_LIB_VERSION "4.79.0") set(CALENDARCORE_LIB_VERSION "4.82.0") -set(HOLIDAY_LIB_VERSION "4.79.0") +set(HOLIDAY_LIB_VERSION "4.80.0") set(IDENTITYMANAGER_LIB_VERSION "4.79.0") set(AKONADI_LIB_VERSION "4.79.0") ecm_setup_version(${KALARM_LIB_VERSION} VARIABLE_PREFIX KALARMCAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/CMakeLists.txt new/kalarmcal-15.12.0/src/CMakeLists.txt --- old/kalarmcal-15.08.3/src/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/CMakeLists.txt 2015-10-28 13:57:16.000000000 +0100 @@ -4,7 +4,6 @@ ########### next target ############### set(kalarmcal_LIB_SRCS - kalarmcal_debug.cpp kacalendar.cpp karecurrence.cpp alarmtext.cpp @@ -18,6 +17,7 @@ eventattribute.cpp ) +ecm_qt_declare_logging_category(kalarmcal_LIB_SRCS HEADER kalarmcal_debug.h IDENTIFIER KALARMCAL_LOG CATEGORY_NAME log_kalarmcal) add_library(KF5AlarmCalendar ${kalarmcal_LIB_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/alarmtext.cpp new/kalarmcal-15.12.0/src/alarmtext.cpp --- old/kalarmcal-15.08.3/src/alarmtext.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/alarmtext.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -41,7 +41,7 @@ namespace KAlarmCal { -class AlarmText::Private +class Q_DECL_HIDDEN AlarmText::Private { public: enum Type { None, Email, Script, Todo }; @@ -92,11 +92,11 @@ { if (!mInitialised) { mInitialised = true; - mFromPrefixEn = QLatin1String("From:"); - mToPrefixEn = QLatin1String("To:"); - mCcPrefixEn = QLatin1String("Cc:"); - mDatePrefixEn = QLatin1String("Date:"); - mSubjectPrefixEn = QLatin1String("Subject:"); + mFromPrefixEn = QStringLiteral("From:"); + mToPrefixEn = QStringLiteral("To:"); + mCcPrefixEn = QStringLiteral("Cc:"); + mDatePrefixEn = QStringLiteral("Date:"); + mSubjectPrefixEn = QStringLiteral("Subject:"); } } @@ -316,7 +316,7 @@ */ QString AlarmText::summary(const KAEvent &event, int maxLines, bool *truncated) { - static const QRegExp localfile(QLatin1String("^file:/+")); + static const QRegExp localfile(QStringLiteral("^file:/+")); QString text; switch (event.actionSubType()) { case KAEvent::AUDIO: @@ -448,7 +448,7 @@ int i = text.indexOf(Private::mSubjectPrefixEn); i = text.indexOf(QLatin1Char('\n'), i); if (i > 0) { - dispText += text.mid(i); + dispText += text.midRef(i); } email = true; return dispText; @@ -489,7 +489,7 @@ int i = text.indexOf(Private::mSubjectPrefix); i = text.indexOf(QLatin1Char('\n'), i); if (i > 0) { - calText += text.mid(i); + calText += text.midRef(i); } return calText; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/collectionattribute.cpp new/kalarmcal-15.12.0/src/collectionattribute.cpp --- old/kalarmcal-15.08.3/src/collectionattribute.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/collectionattribute.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -27,7 +27,7 @@ namespace KAlarmCal { -class CollectionAttribute::Private +class Q_DECL_HIDDEN CollectionAttribute::Private { public: Private() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/compatibilityattribute.cpp new/kalarmcal-15.12.0/src/compatibilityattribute.cpp --- old/kalarmcal-15.08.3/src/compatibilityattribute.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/compatibilityattribute.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -27,7 +27,7 @@ namespace KAlarmCal { -class CompatibilityAttribute::Private +class Q_DECL_HIDDEN CompatibilityAttribute::Private { public: Private() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/datetime.cpp new/kalarmcal-15.12.0/src/datetime.cpp --- old/kalarmcal-15.08.3/src/datetime.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/datetime.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -30,7 +30,7 @@ namespace KAlarmCal { -class DateTime::Private +class Q_DECL_HIDDEN DateTime::Private { public: Private() {} @@ -321,7 +321,7 @@ qint64 DateTime::secsTo_long(const DateTime &dt) const { - return d->mDateTime.secsTo_long(dt.d->mDateTime); + return d->mDateTime.secsTo(dt.d->mDateTime); } QString DateTime::toString(Qt::DateFormat f) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/eventattribute.cpp new/kalarmcal-15.12.0/src/eventattribute.cpp --- old/kalarmcal-15.08.3/src/eventattribute.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/eventattribute.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -28,7 +28,7 @@ namespace KAlarmCal { -class EventAttribute::Private +class Q_DECL_HIDDEN EventAttribute::Private { public: Private() : mCommandError(KAEvent::CMD_NO_ERROR) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/kacalendar.cpp new/kalarmcal-15.12.0/src/kacalendar.cpp --- old/kalarmcal-15.08.3/src/kacalendar.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/kacalendar.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -158,7 +158,7 @@ } // Find the KAlarm identifier - QString progname = QLatin1String(" KAlarm "); + QString progname = QStringLiteral(" KAlarm "); int i = prodid.indexOf(progname, 0, Qt::CaseInsensitive); if (i < 0) { // Older versions used KAlarm's translated name in the product ID, which @@ -242,13 +242,13 @@ struct StaticStrings { StaticStrings() : STATUS_PROPERTY("TYPE"), - ACTIVE_STATUS(QLatin1String("ACTIVE")), - TEMPLATE_STATUS(QLatin1String("TEMPLATE")), - ARCHIVED_STATUS(QLatin1String("ARCHIVED")), - DISPLAYING_STATUS(QLatin1String("DISPLAYING")), - ARCHIVED_UID(QLatin1String("-exp-")), - DISPLAYING_UID(QLatin1String("-disp-")), - TEMPLATE_UID(QLatin1String("-tmpl-")) + ACTIVE_STATUS(QStringLiteral("ACTIVE")), + TEMPLATE_STATUS(QStringLiteral("TEMPLATE")), + ARCHIVED_STATUS(QStringLiteral("ARCHIVED")), + DISPLAYING_STATUS(QStringLiteral("DISPLAYING")), + ARCHIVED_UID(QStringLiteral("-exp-")), + DISPLAYING_UID(QStringLiteral("-disp-")), + TEMPLATE_UID(QStringLiteral("-tmpl-")) {} // Event custom properties. // Note that all custom property names are prefixed with X-KDE-KALARM- in the calendar file. @@ -300,7 +300,7 @@ case ACTIVE: case TEMPLATE: case EMPTY: - default: part = QLatin1String("-"); break; + default: part = QStringLiteral("-"); break; } result.replace(i, len, part); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/kaevent.cpp new/kalarmcal-15.12.0/src/kaevent.cpp --- old/kalarmcal-15.08.3/src/kaevent.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/kaevent.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -25,9 +25,9 @@ #include "alarmtext.h" #include "identities.h" #include "version.h" - +#include <kholidays/holidayregion.h> #include <kcalcore/memorycalendar.h> -#include <kholidays/holidays.h> +#include <kholidays/holiday.h> using namespace KHolidays; #include <ksystemtimezone.h> @@ -63,7 +63,7 @@ //============================================================================= -class KAAlarm::Private +class Q_DECL_HIDDEN KAAlarm::Private { public: Private(); @@ -81,7 +81,7 @@ //============================================================================= -class KAEventPrivate : public QSharedData +class Q_DECL_HIDDEN KAEventPrivate : public QSharedData { public: // Read-only internal flags additional to KAEvent::Flags enum values. @@ -392,64 +392,64 @@ // Event properties const QByteArray KAEventPrivate::FLAGS_PROPERTY("FLAGS"); // X-KDE-KALARM-FLAGS property -const QString KAEventPrivate::DATE_ONLY_FLAG = QLatin1String("DATE"); -const QString KAEventPrivate::EMAIL_BCC_FLAG = QLatin1String("BCC"); -const QString KAEventPrivate::CONFIRM_ACK_FLAG = QLatin1String("ACKCONF"); -const QString KAEventPrivate::KORGANIZER_FLAG = QLatin1String("KORG"); -const QString KAEventPrivate::EXCLUDE_HOLIDAYS_FLAG = QLatin1String("EXHOLIDAYS"); -const QString KAEventPrivate::WORK_TIME_ONLY_FLAG = QLatin1String("WORKTIME"); -const QString KAEventPrivate::REMINDER_ONCE_FLAG = QLatin1String("ONCE"); -const QString KAEventPrivate::DEFER_FLAG = QLatin1String("DEFER"); // default defer interval for this alarm -const QString KAEventPrivate::LATE_CANCEL_FLAG = QLatin1String("LATECANCEL"); -const QString KAEventPrivate::AUTO_CLOSE_FLAG = QLatin1String("LATECLOSE"); -const QString KAEventPrivate::TEMPL_AFTER_TIME_FLAG = QLatin1String("TMPLAFTTIME"); -const QString KAEventPrivate::KMAIL_SERNUM_FLAG = QLatin1String("KMAIL"); -const QString KAEventPrivate::ARCHIVE_FLAG = QLatin1String("ARCHIVE"); +const QString KAEventPrivate::DATE_ONLY_FLAG = QStringLiteral("DATE"); +const QString KAEventPrivate::EMAIL_BCC_FLAG = QStringLiteral("BCC"); +const QString KAEventPrivate::CONFIRM_ACK_FLAG = QStringLiteral("ACKCONF"); +const QString KAEventPrivate::KORGANIZER_FLAG = QStringLiteral("KORG"); +const QString KAEventPrivate::EXCLUDE_HOLIDAYS_FLAG = QStringLiteral("EXHOLIDAYS"); +const QString KAEventPrivate::WORK_TIME_ONLY_FLAG = QStringLiteral("WORKTIME"); +const QString KAEventPrivate::REMINDER_ONCE_FLAG = QStringLiteral("ONCE"); +const QString KAEventPrivate::DEFER_FLAG = QStringLiteral("DEFER"); // default defer interval for this alarm +const QString KAEventPrivate::LATE_CANCEL_FLAG = QStringLiteral("LATECANCEL"); +const QString KAEventPrivate::AUTO_CLOSE_FLAG = QStringLiteral("LATECLOSE"); +const QString KAEventPrivate::TEMPL_AFTER_TIME_FLAG = QStringLiteral("TMPLAFTTIME"); +const QString KAEventPrivate::KMAIL_SERNUM_FLAG = QStringLiteral("KMAIL"); +const QString KAEventPrivate::ARCHIVE_FLAG = QStringLiteral("ARCHIVE"); const QByteArray KAEventPrivate::NEXT_RECUR_PROPERTY("NEXTRECUR"); // X-KDE-KALARM-NEXTRECUR property const QByteArray KAEventPrivate::REPEAT_PROPERTY("REPEAT"); // X-KDE-KALARM-REPEAT property const QByteArray KAEventPrivate::LOG_PROPERTY("LOG"); // X-KDE-KALARM-LOG property -const QString KAEventPrivate::xtermURL = QLatin1String("xterm:"); -const QString KAEventPrivate::displayURL = QLatin1String("display:"); +const QString KAEventPrivate::xtermURL = QStringLiteral("xterm:"); +const QString KAEventPrivate::displayURL = QStringLiteral("display:"); // - General alarm properties const QByteArray KAEventPrivate::TYPE_PROPERTY("TYPE"); // X-KDE-KALARM-TYPE property -const QString KAEventPrivate::FILE_TYPE = QLatin1String("FILE"); -const QString KAEventPrivate::AT_LOGIN_TYPE = QLatin1String("LOGIN"); -const QString KAEventPrivate::REMINDER_TYPE = QLatin1String("REMINDER"); -const QString KAEventPrivate::TIME_DEFERRAL_TYPE = QLatin1String("DEFERRAL"); -const QString KAEventPrivate::DATE_DEFERRAL_TYPE = QLatin1String("DATE_DEFERRAL"); -const QString KAEventPrivate::DISPLAYING_TYPE = QLatin1String("DISPLAYING"); // used only in displaying calendar -const QString KAEventPrivate::PRE_ACTION_TYPE = QLatin1String("PRE"); -const QString KAEventPrivate::POST_ACTION_TYPE = QLatin1String("POST"); -const QString KAEventPrivate::SOUND_REPEAT_TYPE = QLatin1String("SOUNDREPEAT"); +const QString KAEventPrivate::FILE_TYPE = QStringLiteral("FILE"); +const QString KAEventPrivate::AT_LOGIN_TYPE = QStringLiteral("LOGIN"); +const QString KAEventPrivate::REMINDER_TYPE = QStringLiteral("REMINDER"); +const QString KAEventPrivate::TIME_DEFERRAL_TYPE = QStringLiteral("DEFERRAL"); +const QString KAEventPrivate::DATE_DEFERRAL_TYPE = QStringLiteral("DATE_DEFERRAL"); +const QString KAEventPrivate::DISPLAYING_TYPE = QStringLiteral("DISPLAYING"); // used only in displaying calendar +const QString KAEventPrivate::PRE_ACTION_TYPE = QStringLiteral("PRE"); +const QString KAEventPrivate::POST_ACTION_TYPE = QStringLiteral("POST"); +const QString KAEventPrivate::SOUND_REPEAT_TYPE = QStringLiteral("SOUNDREPEAT"); const QByteArray KAEventPrivate::NEXT_REPEAT_PROPERTY("NEXTREPEAT"); // X-KDE-KALARM-NEXTREPEAT property -const QString KAEventPrivate::HIDDEN_REMINDER_FLAG = QLatin1String("HIDE"); +const QString KAEventPrivate::HIDDEN_REMINDER_FLAG = QStringLiteral("HIDE"); // - Display alarm properties const QByteArray KAEventPrivate::FONT_COLOUR_PROPERTY("FONTCOLOR"); // X-KDE-KALARM-FONTCOLOR property // - Email alarm properties -const QString KAEventPrivate::EMAIL_ID_FLAG = QLatin1String("EMAILID"); +const QString KAEventPrivate::EMAIL_ID_FLAG = QStringLiteral("EMAILID"); // - Audio alarm properties const QByteArray KAEventPrivate::VOLUME_PROPERTY("VOLUME"); // X-KDE-KALARM-VOLUME property -const QString KAEventPrivate::SPEAK_FLAG = QLatin1String("SPEAK"); +const QString KAEventPrivate::SPEAK_FLAG = QStringLiteral("SPEAK"); // - Command alarm properties -const QString KAEventPrivate::EXEC_ON_DEFERRAL_FLAG = QLatin1String("EXECDEFER"); -const QString KAEventPrivate::CANCEL_ON_ERROR_FLAG = QLatin1String("ERRCANCEL"); -const QString KAEventPrivate::DONT_SHOW_ERROR_FLAG = QLatin1String("ERRNOSHOW"); +const QString KAEventPrivate::EXEC_ON_DEFERRAL_FLAG = QStringLiteral("EXECDEFER"); +const QString KAEventPrivate::CANCEL_ON_ERROR_FLAG = QStringLiteral("ERRCANCEL"); +const QString KAEventPrivate::DONT_SHOW_ERROR_FLAG = QStringLiteral("ERRNOSHOW"); // Event status strings -const QString KAEventPrivate::DISABLED_STATUS = QLatin1String("DISABLED"); +const QString KAEventPrivate::DISABLED_STATUS = QStringLiteral("DISABLED"); // Displaying event ID identifier -const QString KAEventPrivate::DISP_DEFER = QLatin1String("DEFER"); -const QString KAEventPrivate::DISP_EDIT = QLatin1String("EDIT"); +const QString KAEventPrivate::DISP_DEFER = QStringLiteral("DEFER"); +const QString KAEventPrivate::DISP_EDIT = QStringLiteral("EDIT"); // Command error strings -const QString KAEventPrivate::CMD_ERROR_VALUE = QLatin1String("MAIN"); -const QString KAEventPrivate::CMD_ERROR_PRE_VALUE = QLatin1String("PRE"); -const QString KAEventPrivate::CMD_ERROR_POST_VALUE = QLatin1String("POST"); +const QString KAEventPrivate::CMD_ERROR_VALUE = QStringLiteral("MAIN"); +const QString KAEventPrivate::CMD_ERROR_PRE_VALUE = QStringLiteral("PRE"); +const QString KAEventPrivate::CMD_ERROR_POST_VALUE = QStringLiteral("POST"); -const QString KAEventPrivate::SC = QLatin1String(";"); +const QString KAEventPrivate::SC = QStringLiteral(";"); QFont KAEventPrivate::mDefaultFont; const KHolidays::HolidayRegion *KAEventPrivate::mHolidays = Q_NULLPTR; @@ -780,7 +780,7 @@ ++i; } const int len = flag.length() - 1; - mReminderMinutes = -flag.left(len).toInt(); // -> 0 if conversion fails + mReminderMinutes = -flag.leftRef(len).toInt(); // -> 0 if conversion fails switch (flag.at(len).toLatin1()) { case 'M': break; case 'H': mReminderMinutes *= 60; break; @@ -1337,7 +1337,7 @@ if (!archived && checkRecur() != KARecurrence::NO_RECUR) { QDateTime dt = mNextMainDateTime.kDateTime().toTimeSpec(mStartDateTime.timeSpec()).dateTime(); ev->setCustomProperty(KACalendar::APPNAME, NEXT_RECUR_PROPERTY, - dt.toString(mNextMainDateTime.isDateOnly() ? QLatin1String("yyyyMMdd") : QLatin1String("yyyyMMddThhmmss"))); + dt.toString(mNextMainDateTime.isDateOnly() ? QStringLiteral("yyyyMMdd") : QStringLiteral("yyyyMMddThhmmss"))); } // Add the main alarm initKCalAlarm(ev, 0, QStringList(), MAIN_ALARM); @@ -1346,7 +1346,7 @@ } else if (mRepetition) { // Alarm repetition is normally held in the main alarm, but since // the main alarm has expired, store in a custom property. - const QString param = QString::fromLatin1("%1:%2").arg(mRepetition.intervalMinutes()).arg(mRepetition.count()); + const QString param = QStringLiteral("%1:%2").arg(mRepetition.intervalMinutes()).arg(mRepetition.count()); ev->setCustomProperty(KACalendar::APPNAME, REPEAT_PROPERTY, param); } @@ -1585,7 +1585,7 @@ } if (display) alarm->setCustomProperty(KACalendar::APPNAME, FONT_COLOUR_PROPERTY, - QString::fromLatin1("%1;%2;%3").arg(mBgColour.name()) + QStringLiteral("%1;%2;%3").arg(mBgColour.name()) .arg(mFgColour.name()) .arg(mUseDefaultFont ? QString() : mFont.toString())); break; @@ -1598,7 +1598,7 @@ } alltypes += types; if (!alltypes.isEmpty()) { - alarm->setCustomProperty(KACalendar::APPNAME, TYPE_PROPERTY, alltypes.join(QLatin1String(","))); + alarm->setCustomProperty(KACalendar::APPNAME, TYPE_PROPERTY, alltypes.join(QStringLiteral(","))); } if (!flags.isEmpty()) { alarm->setCustomProperty(KACalendar::APPNAME, FLAGS_PROPERTY, flags.join(SC)); @@ -3746,9 +3746,9 @@ qCDebug(KALARMCAL_LOG) << "-- mLogFile:" << mLogFile; } else if (mActionSubType == KAEvent::EMAIL) { 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) << "-- Attachments:" << mEmailAttachments.join(QLatin1String(",")); + qCDebug(KALARMCAL_LOG) << "-- Attachments:" << mEmailAttachments.join(QStringLiteral(",")); qCDebug(KALARMCAL_LOG) << "-- Bcc:" << mEmailBcc; } else if (mActionSubType == KAEvent::AUDIO) { qCDebug(KALARMCAL_LOG) << "-- mAudioFile:" << mAudioFile; @@ -3844,16 +3844,16 @@ const QString prop = event->customProperty(KACalendar::APPNAME, KAEventPrivate::NEXT_RECUR_PROPERTY); if (prop.length() >= SZ_DATE) { // The next due recurrence time is specified - const QDate d(prop.left(SZ_YEAR).toInt(), - prop.mid(SZ_YEAR, SZ_MONTH).toInt(), - prop.mid(SZ_YEAR + SZ_MONTH, SZ_DAY).toInt()); + const QDate d(prop.leftRef(SZ_YEAR).toInt(), + prop.midRef(SZ_YEAR, SZ_MONTH).toInt(), + prop.midRef(SZ_YEAR + SZ_MONTH, SZ_DAY).toInt()); if (d.isValid()) { if (dateOnly && prop.length() == SZ_DATE) { next.setDate(d); } else if (!dateOnly && prop.length() == IX_TIME + SZ_TIME && prop[SZ_DATE] == QLatin1Char('T')) { - const QTime t(prop.mid(IX_TIME, SZ_HOUR).toInt(), - prop.mid(IX_TIME + SZ_HOUR, SZ_MIN).toInt(), - prop.mid(IX_TIME + SZ_HOUR + SZ_MIN, SZ_SEC).toInt()); + const QTime t(prop.midRef(IX_TIME, SZ_HOUR).toInt(), + prop.midRef(IX_TIME + SZ_HOUR, SZ_MIN).toInt(), + prop.midRef(IX_TIME + SZ_HOUR + SZ_MIN, SZ_SEC).toInt()); if (t.isValid()) { next.setDate(d); next.setTime(t); @@ -4759,7 +4759,7 @@ alarm->setAudioAlarm(mAudioFile); // empty for a beep or for speaking if (mSoundVolume >= 0) alarm->setCustomProperty(KACalendar::APPNAME, VOLUME_PROPERTY, - QString::fromLatin1("%1;%2;%3;%4").arg(QString::number(mSoundVolume, 'f', 2)) + QStringLiteral("%1;%2;%3;%4").arg(QString::number(mSoundVolume, 'f', 2)) .arg(QString::number(mFadeVolume, 'f', 2)) .arg(mFadeSeconds)); } @@ -4836,43 +4836,43 @@ static const QChar LATE_CANCEL_CODE = QLatin1Char('C'); static const QChar AT_LOGIN_CODE = QLatin1Char('L'); // subsidiary alarm at every login static const QChar DEFERRAL_CODE = QLatin1Char('D'); // extra deferred alarm - static const QString TEXT_PREFIX = QLatin1String("TEXT:"); - static const QString FILE_PREFIX = QLatin1String("FILE:"); - static const QString COMMAND_PREFIX = QLatin1String("CMD:"); + static const QString TEXT_PREFIX = QStringLiteral("TEXT:"); + static const QString FILE_PREFIX = QStringLiteral("FILE:"); + static const QString COMMAND_PREFIX = QStringLiteral("CMD:"); // KAlarm pre-0.9.2 codes held in the event's CATEGORY property - static const QString BEEP_CATEGORY = QLatin1String("BEEP"); + static const QString BEEP_CATEGORY = QStringLiteral("BEEP"); // KAlarm pre-1.1.1 LATECANCEL category with no parameter - static const QString LATE_CANCEL_CAT = QLatin1String("LATECANCEL"); + static const QString LATE_CANCEL_CAT = QStringLiteral("LATECANCEL"); // KAlarm pre-1.3.0 TMPLDEFTIME category with no parameter - static const QString TEMPL_DEF_TIME_CAT = QLatin1String("TMPLDEFTIME"); + static const QString TEMPL_DEF_TIME_CAT = QStringLiteral("TMPLDEFTIME"); // KAlarm pre-1.3.1 XTERM category - static const QString EXEC_IN_XTERM_CAT = QLatin1String("XTERM"); + static const QString EXEC_IN_XTERM_CAT = QStringLiteral("XTERM"); // KAlarm pre-1.9.0 categories - static const QString DATE_ONLY_CATEGORY = QLatin1String("DATE"); - static const QString EMAIL_BCC_CATEGORY = QLatin1String("BCC"); - static const QString CONFIRM_ACK_CATEGORY = QLatin1String("ACKCONF"); - static const QString KORGANIZER_CATEGORY = QLatin1String("KORG"); - static const QString DEFER_CATEGORY = QLatin1String("DEFER;"); - static const QString ARCHIVE_CATEGORY = QLatin1String("SAVE"); - static const QString ARCHIVE_CATEGORIES = QLatin1String("SAVE:"); - static const QString LATE_CANCEL_CATEGORY = QLatin1String("LATECANCEL;"); - static const QString AUTO_CLOSE_CATEGORY = QLatin1String("LATECLOSE;"); - static const QString TEMPL_AFTER_TIME_CATEGORY = QLatin1String("TMPLAFTTIME;"); - static const QString KMAIL_SERNUM_CATEGORY = QLatin1String("KMAIL:"); - static const QString LOG_CATEGORY = QLatin1String("LOG:"); + static const QString DATE_ONLY_CATEGORY = QStringLiteral("DATE"); + static const QString EMAIL_BCC_CATEGORY = QStringLiteral("BCC"); + static const QString CONFIRM_ACK_CATEGORY = QStringLiteral("ACKCONF"); + static const QString KORGANIZER_CATEGORY = QStringLiteral("KORG"); + static const QString DEFER_CATEGORY = QStringLiteral("DEFER;"); + static const QString ARCHIVE_CATEGORY = QStringLiteral("SAVE"); + static const QString ARCHIVE_CATEGORIES = QStringLiteral("SAVE:"); + static const QString LATE_CANCEL_CATEGORY = QStringLiteral("LATECANCEL;"); + static const QString AUTO_CLOSE_CATEGORY = QStringLiteral("LATECLOSE;"); + static const QString TEMPL_AFTER_TIME_CATEGORY = QStringLiteral("TMPLAFTTIME;"); + static const QString KMAIL_SERNUM_CATEGORY = QStringLiteral("KMAIL:"); + static const QString LOG_CATEGORY = QStringLiteral("LOG:"); // KAlarm pre-1.5.0/1.9.9 properties static const QByteArray KMAIL_ID_PROPERTY("KMAILID"); // X-KDE-KALARM-KMAILID property // KAlarm pre-2.6.0 properties static const QByteArray ARCHIVE_PROPERTY("ARCHIVE"); // X-KDE-KALARM-ARCHIVE property - static const QString ARCHIVE_REMINDER_ONCE_TYPE = QLatin1String("ONCE"); - static const QString REMINDER_ONCE_TYPE = QLatin1String("REMINDER_ONCE"); + static const QString ARCHIVE_REMINDER_ONCE_TYPE = QStringLiteral("ONCE"); + static const QString REMINDER_ONCE_TYPE = QStringLiteral("REMINDER_ONCE"); static const QByteArray EMAIL_ID_PROPERTY("EMAILID"); // X-KDE-KALARM-EMAILID property static const QByteArray SPEAK_PROPERTY("SPEAK"); // X-KDE-KALARM-SPEAK property static const QByteArray CANCEL_ON_ERROR_PROPERTY("ERRCANCEL");// X-KDE-KALARM-ERRCANCEL property @@ -5019,7 +5019,7 @@ addLateCancel = true; } if (types.count() > 0) { - alarm->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::TYPE_PROPERTY, types.join(QLatin1String(","))); + alarm->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::TYPE_PROPERTY, types.join(QStringLiteral(","))); } if (pre_0_7 && alarm->repeatCount() > 0 && alarm->snoozeTime().value() > 0) { @@ -5080,7 +5080,7 @@ Alarm::Ptr alarm = alarms[ai]; if (alarm->type() == Alarm::Display) alarm->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::FONT_COLOUR_PROPERTY, - QString::fromLatin1("%1;;").arg(cats.at(0))); + QStringLiteral("%1;;").arg(cats.at(0))); } cats.removeAt(0); } @@ -5145,7 +5145,7 @@ int i; while ((i = cats.indexOf(TEMPL_DEF_TIME_CAT)) >= 0) { cats.removeAt(i); - (flags += KAEventPrivate::TEMPL_AFTER_TIME_FLAG) += QLatin1String("0"); + (flags += KAEventPrivate::TEMPL_AFTER_TIME_FLAG) += QStringLiteral("0"); } } @@ -5189,7 +5189,7 @@ } else if (cat.startsWith(KMAIL_SERNUM_CATEGORY)) { (flags += KAEventPrivate::KMAIL_SERNUM_FLAG) += cat.mid(KMAIL_SERNUM_CATEGORY.length()); } else if (cat == ARCHIVE_CATEGORY) { - event->setCustomProperty(KACalendar::APPNAME, ARCHIVE_PROPERTY, QLatin1String("0")); + event->setCustomProperty(KACalendar::APPNAME, ARCHIVE_PROPERTY, QStringLiteral("0")); } else if (cat.startsWith(ARCHIVE_CATEGORIES)) { event->setCustomProperty(KACalendar::APPNAME, ARCHIVE_PROPERTY, cat.mid(ARCHIVE_CATEGORIES.length())); } else if (cat.startsWith(LOG_CATEGORY)) { @@ -5212,7 +5212,7 @@ } if (addLateCancel) { - (flags += KAEventPrivate::LATE_CANCEL_FLAG) += QLatin1String("1"); + (flags += KAEventPrivate::LATE_CANCEL_FLAG) += QStringLiteral("1"); } if (!flags.isEmpty()) { event->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::FLAGS_PROPERTY, flags.join(KAEventPrivate::SC)); @@ -5274,7 +5274,7 @@ if (nextMainDateTime != startDateTime) { QDateTime dt = nextMainDateTime.dateTime(); event->setCustomProperty(KACalendar::APPNAME, KAEventPrivate::NEXT_RECUR_PROPERTY, - dt.toString(dateOnly ? QLatin1String("yyyyMMdd") : QLatin1String("yyyyMMddThhmmss"))); + dt.toString(dateOnly ? QStringLiteral("yyyyMMdd") : QStringLiteral("yyyyMMddThhmmss"))); } } alarm->setStartOffset(0); @@ -5893,7 +5893,7 @@ if (minutes < 0) { count = -count; } - return QString::fromLatin1("%1%2").arg(count).arg(unit); + return QStringLiteral("%1%2").arg(count).arg(unit); } } // namespace KAlarmCal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/kalarmcal_debug.cpp new/kalarmcal-15.12.0/src/kalarmcal_debug.cpp --- old/kalarmcal-15.08.3/src/kalarmcal_debug.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/kalarmcal_debug.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kalarmcal_debug.h" -Q_LOGGING_CATEGORY(KALARMCAL_LOG, "log_kalarmcal") - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/kalarmcal_debug.h new/kalarmcal-15.12.0/src/kalarmcal_debug.h --- old/kalarmcal-15.08.3/src/kalarmcal_debug.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/kalarmcal_debug.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KALARMCAL_DEBUG_H -#define KALARMCAL_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(KALARMCAL_LOG) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/karecurrence.cpp new/kalarmcal-15.12.0/src/karecurrence.cpp --- old/kalarmcal-15.08.3/src/karecurrence.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/karecurrence.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -45,7 +45,7 @@ Recurrence_p(const Recurrence_p &r) : Recurrence(r) {} }; -class KARecurrence::Private +class Q_DECL_HIDDEN KARecurrence::Private { public: Private() @@ -266,7 +266,7 @@ */ bool KARecurrence::set(const QString &icalRRULE) { - static const QString RRULE = QLatin1String("RRULE:"); + static const QString RRULE = QStringLiteral("RRULE:"); d->clear(); if (icalRRULE.isEmpty()) { return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/repetition.cpp new/kalarmcal-15.12.0/src/repetition.cpp --- old/kalarmcal-15.08.3/src/repetition.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/repetition.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -27,7 +27,7 @@ namespace KAlarmCal { -class Repetition::Private +class Q_DECL_HIDDEN Repetition::Private { public: Private() : mInterval(0), mCount(0) {} @@ -147,14 +147,14 @@ { return d->mInterval.isDaily() ? from.daysTo(preDateTime) / d->mInterval.asDays() + 1 - : static_cast<int>(from.secsTo_long(preDateTime) / d->mInterval.asSeconds()) + 1; + : static_cast<int>(from.secsTo(preDateTime) / d->mInterval.asSeconds()) + 1; } int Repetition::previousRepeatCount(const KDateTime &from, const KDateTime &afterDateTime) const { return d->mInterval.isDaily() ? from.daysTo(afterDateTime.addSecs(-1)) / d->mInterval.asDays() - : static_cast<int>((from.secsTo_long(afterDateTime) - 1) / d->mInterval.asSeconds()); + : static_cast<int>((from.secsTo(afterDateTime) - 1) / d->mInterval.asSeconds()); } } // namespace KAlarmCal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarmcal-15.08.3/src/version.cpp new/kalarmcal-15.12.0/src/version.cpp --- old/kalarmcal-15.08.3/src/version.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kalarmcal-15.12.0/src/version.cpp 2015-10-28 13:57:16.000000000 +0100 @@ -69,7 +69,7 @@ if (subVersion) { *subVersion = issue.mid(i); } - v = issue.left(i).toUInt(); // issue number + v = issue.leftRef(i).toUInt(); // issue number vernum += (v < 99 ? v : 99); } return vernum; @@ -77,7 +77,7 @@ QString getVersionString(int version) { - return QString::fromLatin1("%1.%2.%3").arg(version / 10000).arg((version % 10000) / 100).arg(version % 100); + return QStringLiteral("%1.%2.%3").arg(version / 10000).arg((version % 10000) / 100).arg(version % 100); } } // namespace KAlarmCal
