Hello community, here is the log from the commit of package ktnef for openSUSE:Factory checked in at 2016-01-10 13:06:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktnef (Old) and /work/SRC/openSUSE:Factory/.ktnef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktnef" Changes: -------- --- /work/SRC/openSUSE:Factory/ktnef/ktnef.changes 2015-11-15 12:40:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktnef.new/ktnef.changes 2016-01-10 13:06:25.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 13 13:28:02 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:36:43 UTC 2015 - [email protected] + +- Remove superfluous libpth-devel dependency + +------------------------------------------------------------------- Old: ---- ktnef-15.08.3.tar.xz New: ---- ktnef-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktnef.spec ++++++ --- /var/tmp/diff_new_pack.hirwrm/_old 2016-01-10 13:06:26.000000000 +0100 +++ /var/tmp/diff_new_pack.hirwrm/_new 2016-01-10 13:06:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: ktnef -Version: 15.08.3 +Version: 15.12.0 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries: TNEF support @@ -53,7 +53,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 ++++++ ktnef-15.08.3.tar.xz -> ktnef-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/CMakeLists.txt new/ktnef-15.12.0/CMakeLists.txt --- old/ktnef-15.08.3/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/CMakeLists.txt 2015-11-07 13:29:20.000000000 +0100 @@ -3,7 +3,7 @@ project(KTnef) # 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) # FIXME: Do we want the same versions in kdepimlibs and kf5? -set(KF5_VERSION "5.12.0") +set(KF5_VERSION "5.14.0") set(KTNEF_LIB_VERSION "4.79.0") set(CALENDARCORE_LIB_VERSION "4.79.0") set(CALENDARUTILS_LIB_VERSION "4.79.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/CMakeLists.txt new/ktnef-15.12.0/src/CMakeLists.txt --- old/ktnef-15.08.3/src/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/CMakeLists.txt 2015-11-07 13:29:20.000000000 +0100 @@ -1,7 +1,6 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) set(ktnef_SRCS - ktnef_debug.cpp ktnefparser.cpp ktnefproperty.cpp ktnefattach.cpp @@ -13,6 +12,8 @@ formatter.cpp ) +ecm_qt_declare_logging_category(ktnef_SRCS HEADER ktnef_debug.h IDENTIFIER KTNEF_LOG CATEGORY_NAME log_ktnef) + add_library(KF5Tnef ${ktnef_SRCS}) generate_export_header(KF5Tnef BASE_NAME ktnef) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/formatter.cpp new/ktnef-15.12.0/src/formatter.cpp --- old/ktnef-15.08.3/src/formatter.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/formatter.cpp 2015-11-07 13:29:20.000000000 +0100 @@ -90,8 +90,9 @@ //qCDebug(KTNEF_LOG) << "set_tz(), timezone before =" << timezone; char *tz_env = 0; - if (!qgetenv("TZ").isEmpty()) { - tz_env = qstrdup(qgetenv("TZ")); + const QByteArray tzEnv = qgetenv("TZ"); + if (!tzEnv.isEmpty()) { + tz_env = qstrdup(tzEnv); rv.old_tz = tz_env; } char *tmp_env = (char *)malloc(strlen(tc) + 4); @@ -152,19 +153,19 @@ int year, month, day, hour, minute, second; if (bDateOnly) { - year = dtStr.left(4).toInt(); - month = dtStr.mid(4, 2).toInt(); - day = dtStr.mid(6, 2).toInt(); + year = dtStr.leftRef(4).toInt(); + month = dtStr.midRef(4, 2).toInt(); + day = dtStr.midRef(6, 2).toInt(); hour = 0; minute = 0; second = 0; } else { - year = dtStr.left(4).toInt(); - month = dtStr.mid(4, 2).toInt(); - day = dtStr.mid(6, 2).toInt(); - hour = dtStr.mid(9, 2).toInt(); - minute = dtStr.mid(11, 2).toInt(); - second = dtStr.mid(13, 2).toInt(); + year = dtStr.leftRef(4).toInt(); + month = dtStr.midRef(4, 2).toInt(); + day = dtStr.midRef(6, 2).toInt(); + hour = dtStr.midRef(9, 2).toInt(); + minute = dtStr.midRef(11, 2).toInt(); + second = dtStr.midRef(13, 2).toInt(); } tmpDate.setYMD(year, month, day); tmpTime.setHMS(hour, minute, second); @@ -238,11 +239,11 @@ if (bCompatClassAppointment || QLatin1String("IPM.APPOINTMENT") == msgClass) { // Compose a vCal bool bIsReply = false; - QString prodID = QLatin1String("-//Microsoft Corporation//Outlook "); - prodID += tnefMsg->findNamedProp(QLatin1String("0x8554"), QLatin1String("9.0")); + QString prodID = QStringLiteral("-//Microsoft Corporation//Outlook "); + prodID += tnefMsg->findNamedProp(QStringLiteral("0x8554"), QStringLiteral("9.0")); prodID += QLatin1String("MIMEDIR/EN\n"); prodID += QLatin1String("VERSION:2.0\n"); - calFormat.setApplication(QLatin1String("Outlook"), prodID); + calFormat.setApplication(QStringLiteral("Outlook"), prodID); iTIPMethod method; if (bCompatMethodRequest) { @@ -364,7 +365,7 @@ // ### kcal always uses currentDateTime() // event->setDtStamp( QDateTime::fromString( s ) ); - s = tnefMsg->findNamedProp(QLatin1String("Keywords")); + s = tnefMsg->findNamedProp(QStringLiteral("Keywords")); event->setCategories(s); s = tnefMsg->findProp(0x1000); @@ -408,32 +409,32 @@ } else if (bCompatClassNote || QLatin1String("IPM.CONTACT") == msgClass) { addressee.setUid(stringProp(tnefMsg, attMSGID)); addressee.setFormattedName(stringProp(tnefMsg, MAPI_TAG_PR_DISPLAY_NAME)); - addressee.insertEmail(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_EMAIL1EMAILADDRESS)), true); - addressee.insertEmail(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_EMAIL2EMAILADDRESS)), false); - addressee.insertEmail(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_EMAIL3EMAILADDRESS)), false); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-IMAddress"), - sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_IMADDRESS))); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-SpousesName"), + addressee.insertEmail(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_EMAIL1EMAILADDRESS)), true); + addressee.insertEmail(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_EMAIL2EMAILADDRESS)), false); + addressee.insertEmail(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_EMAIL3EMAILADDRESS)), false); + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-IMAddress"), + sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_IMADDRESS))); + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-SpousesName"), stringProp(tnefMsg, MAPI_TAG_PR_SPOUSE_NAME)); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-ManagersName"), + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-ManagersName"), stringProp(tnefMsg, MAPI_TAG_PR_MANAGER_NAME)); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-AssistantsName"), + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-AssistantsName"), stringProp(tnefMsg, MAPI_TAG_PR_ASSISTANT)); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Department"), + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Department"), stringProp(tnefMsg, MAPI_TAG_PR_DEPARTMENT_NAME)); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Office"), + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Office"), stringProp(tnefMsg, MAPI_TAG_PR_OFFICE_LOCATION)); - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Profession"), + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Profession"), stringProp(tnefMsg, MAPI_TAG_PR_PROFESSION)); QString s = tnefMsg->findProp(MAPI_TAG_PR_WEDDING_ANNIVERSARY). remove(QLatin1Char('-')).remove(QLatin1Char(':')); if (!s.isEmpty()) { - addressee.insertCustom(QLatin1String("KADDRESSBOOK"), QLatin1String("X-Anniversary"), s); + addressee.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Anniversary"), s); } KContacts::ResourceLocatorUrl url; - url.setUrl(QUrl(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_WEBPAGE)))); + url.setUrl(QUrl(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_WEBPAGE)))); addressee.setUrl(url); @@ -462,12 +463,12 @@ adr.setType(KContacts::Address::Home); addressee.insertAddress(adr); - adr.setPostOfficeBox(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_BUSINESSADDRESSPOBOX))); - adr.setStreet(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_BUSINESSADDRESSSTREET))); - adr.setLocality(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_BUSINESSADDRESSCITY))); - adr.setRegion(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_BUSINESSADDRESSSTATE))); - adr.setPostalCode(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_BUSINESSADDRESSPOSTALCODE))); - adr.setCountry(sNamedProp(tnefMsg, QLatin1String(MAPI_TAG_CONTACT_BUSINESSADDRESSCOUNTRY))); + adr.setPostOfficeBox(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_BUSINESSADDRESSPOBOX))); + adr.setStreet(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_BUSINESSADDRESSSTREET))); + adr.setLocality(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_BUSINESSADDRESSCITY))); + adr.setRegion(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_BUSINESSADDRESSSTATE))); + adr.setPostalCode(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_BUSINESSADDRESSPOSTALCODE))); + adr.setCountry(sNamedProp(tnefMsg, QStringLiteral(MAPI_TAG_CONTACT_BUSINESSADDRESSCOUNTRY))); adr.setType(KContacts::Address::Work); addressee.insertAddress(adr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnef_debug.cpp new/ktnef-15.12.0/src/ktnef_debug.cpp --- old/ktnef-15.08.3/src/ktnef_debug.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnef_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 "ktnef_debug.h" -Q_LOGGING_CATEGORY(KTNEF_LOG, "log_ktnef") - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnef_debug.h new/ktnef-15.12.0/src/ktnef_debug.h --- old/ktnef-15.08.3/src/ktnef_debug.h 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnef_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 KTNEF_DEBUG_H -#define KTNEF_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(KTNEF_LOG) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefparser.cpp new/ktnef-15.12.0/src/ktnefparser.cpp --- old/ktnef-15.08.3/src/ktnefparser.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefparser.cpp 2015-11-07 13:29:20.000000000 +0100 @@ -85,7 +85,7 @@ public: ParserPrivate() { - defaultdir_ = QLatin1String("/tmp/"); + defaultdir_ = QStringLiteral("/tmp/"); current_ = 0; deleteDevice_ = false; device_ = 0; @@ -193,7 +193,7 @@ readMAPIProperties(message_->properties(), 0); device_->seek(i2); qCDebug(KTNEF_LOG) << "Properties:" << message_->properties().count(); - value = QString::fromLatin1("< %1 properties >"). + value = QStringLiteral("< %1 properties >"). arg(message_->properties().count() - nProps); } break; @@ -318,7 +318,7 @@ current_->setSize(i); current_->setOffset(device_->pos()); device_->seek(device_->pos() + i); - value = QString::fromLatin1("< size=%1 >").arg(i); + value = QStringLiteral("< size=%1 >").arg(i); qCDebug(KTNEF_LOG) << "Attachment Data: size=" << i; break; case attATTACHMENT: // try to get attachment info @@ -339,7 +339,7 @@ } current_->setExtension(current_->property(MAPI_TAG_EXTENSION). toString()); - value = QString::fromLatin1("< %1 properties >"). + value = QStringLiteral("< %1 properties >"). arg(current_->properties().count()); break; case attATTACHMODDATE: @@ -535,7 +535,7 @@ if (current_->attributes().contains(key)) { if (current_->offset() >= 0) { if (current_->name().isEmpty()) { - current_->setName(QLatin1String("Unnamed")); + current_->setName(QStringLiteral("Unnamed")); } if (current_->mimeTag().isEmpty()) { // No mime type defined in the TNEF structure, @@ -624,16 +624,16 @@ if ((it = props.find(0x0C15)) != props.end()) { switch ((*it)->value().toInt()) { case 0: - t = QLatin1String("From:"); + t = QStringLiteral("From:"); break; case 1: - t = QLatin1String("To:"); + t = QStringLiteral("To:"); break; case 2: - t = QLatin1String("Cc:"); + t = QStringLiteral("Cc:"); break; case 3: - t = QLatin1String("Bcc:"); + t = QStringLiteral("Bcc:"); break; } } @@ -882,8 +882,8 @@ attach->unsetDataParser(); attach->setOffset(device_->pos() + 12); attach->setSize(data.size() - 16); - attach->setMimeTag(QLatin1String("application/vnd.ms-tnef")); - attach->setDisplayName(QLatin1String("Embedded Message")); + attach->setMimeTag(QStringLiteral("application/vnd.ms-tnef")); + attach->setDisplayName(QStringLiteral("Embedded Message")); qCDebug(KTNEF_LOG) << "MAPI Embedded Message: size=" << data.size(); } device_->seek(device_->pos() + (len - 4)); @@ -894,7 +894,7 @@ ALIGN(len, 4); attach->setSize(len); attach->setOffset(device_->pos() - len); - attach->addAttribute(attATTACHDATA, atpBYTE, QString::fromLatin1("< size=%1 >").arg(len), false); + attach->addAttribute(attATTACHDATA, atpBYTE, QStringLiteral("< size=%1 >").arg(len), false); } } qCDebug(KTNEF_LOG) << "MAPI data: size=" << mapi.value.toByteArray().size(); @@ -905,7 +905,7 @@ if (mapi.name.type == 0) { mapiname = QString().sprintf(" [name = 0x%04x]", mapi.name.value.toUInt()); } else { - mapiname = QString::fromLatin1(" [name = %1]").arg(mapi.name.value.toString()); + mapiname = QStringLiteral(" [name = %1]").arg(mapi.name.value.toString()); } } switch (mapi.type & 0x0FFF) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefproperty.cpp new/ktnef-15.12.0/src/ktnefproperty.cpp --- old/ktnef-15.08.3/src/ktnefproperty.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefproperty.cpp 2015-11-07 13:29:20.000000000 +0100 @@ -37,7 +37,7 @@ using namespace KTnef; -class KTNEFProperty::Private +class KTNEFPropertyPrivate { public: int _key; @@ -47,13 +47,13 @@ }; KTNEFProperty::KTNEFProperty() - : d(new Private) + : d(new KTNEFPropertyPrivate) { } KTNEFProperty::KTNEFProperty(int key_, int type_, const QVariant &value_, const QVariant &name_) - : d(new Private) + : d(new KTNEFPropertyPrivate) { d->_key = key_; d->_type = type_; @@ -62,7 +62,7 @@ } KTNEFProperty::KTNEFProperty(const KTNEFProperty &p) - : d(new Private) + : d(new KTNEFPropertyPrivate) { *d = *p.d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefproperty.h new/ktnef-15.12.0/src/ktnefproperty.h --- old/ktnef-15.08.3/src/ktnefproperty.h 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefproperty.h 2015-11-07 13:29:20.000000000 +0100 @@ -33,6 +33,7 @@ #include <QtCore/QVariant> #include <QtCore/QString> +class KTNEFPropertyPrivate; #include "ktnef_export.h" namespace KTnef @@ -152,8 +153,7 @@ private: //@cond PRIVATE - class Private; - Private *const d; + KTNEFPropertyPrivate *const d; //@endcond }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefpropertyset.cpp new/ktnef-15.12.0/src/ktnefpropertyset.cpp --- old/ktnef-15.08.3/src/ktnefpropertyset.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefpropertyset.cpp 2015-11-07 13:29:20.000000000 +0100 @@ -37,7 +37,7 @@ using namespace KTnef; -class KTNEFPropertySet::Private +class KTNEFPropertySetPrivate { public: QMap<int, KTNEFProperty *> properties_; // used to store MAPI properties @@ -45,7 +45,7 @@ }; KTNEFPropertySet::KTNEFPropertySet() - : d(new Private) + : d(new KTNEFPropertySetPrivate) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefpropertyset.h new/ktnef-15.12.0/src/ktnefpropertyset.h --- old/ktnef-15.08.3/src/ktnefpropertyset.h 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefpropertyset.h 2015-11-07 13:29:20.000000000 +0100 @@ -33,6 +33,7 @@ #include <QtCore/QMap> #include <QtCore/QVariant> +class KTNEFPropertySetPrivate; #include "ktnef_export.h" namespace KTnef @@ -159,8 +160,7 @@ private: //@cond PRIVATE - class Private; - Private *const d; + KTNEFPropertySetPrivate *const d; //@endcond Q_DISABLE_COPY(KTNEFPropertySet) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefwriter.cpp new/ktnef-15.12.0/src/ktnefwriter.cpp --- old/ktnef-15.08.3/src/ktnefwriter.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefwriter.cpp 2015-11-07 13:29:20.000000000 +0100 @@ -46,23 +46,23 @@ using namespace KTnef; /** - * Private class that helps to provide binary compatibility between releases. + * KTNEFWriterPrivate class that helps to provide binary compatibility between releases. * @internal */ //@cond PRIVATE -class KTnef::KTNEFWriter::PrivateData +class KTnef::KTNEFWriterPrivateData { public: - PrivateData() + KTNEFWriterPrivateData() : mFirstAttachNum(QDateTime::currentDateTimeUtc().toTime_t()) { - mFirstAttachNum = QDateTime::currentDateTime().toTime_t(); } + KTNEFPropertySet properties; - quint16 mFirstAttachNum; + const quint16 mFirstAttachNum; }; //@endcond -KTNEFWriter::KTNEFWriter() : d(new KTnef::KTNEFWriter::PrivateData) +KTNEFWriter::KTNEFWriter() : d(new KTnef::KTNEFWriterPrivateData) { // This is not something the user should fiddle with // First set the TNEF version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/ktnefwriter.h new/ktnef-15.12.0/src/ktnefwriter.h --- old/ktnef-15.08.3/src/ktnefwriter.h 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/ktnefwriter.h 2015-11-07 13:29:20.000000000 +0100 @@ -43,7 +43,7 @@ namespace KTnef { - +class KTNEFWriterPrivateData; /** * @brief * Manages the writing of @acronym TNEF attachments. @@ -289,8 +289,7 @@ private: //@cond PRIVATE - class PrivateData; - PrivateData *const d; + KTNEFWriterPrivateData *const d; //@endcond Q_DISABLE_COPY(KTNEFWriter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktnef-15.08.3/src/mapi.cpp new/ktnef-15.12.0/src/mapi.cpp --- old/ktnef-15.08.3/src/mapi.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/ktnef-15.12.0/src/mapi.cpp 2015-11-07 13:29:20.000000000 +0100 @@ -197,20 +197,23 @@ { 0x8560, I18N_NOOP("Reminder Next Time") }, { 0, 0 } }; -static QMap<int, QString> MAPI_TagMap; -static QMap<int, QString> MAPI_NamedTagMap; + +typedef QMap<int, QString> TagMap; +Q_GLOBAL_STATIC(TagMap, MAPI_TagMap) +Q_GLOBAL_STATIC(TagMap, MAPI_NamedTagMap) + //@endcond QString KTnef::mapiTagString(int key) { - if (MAPI_TagMap.count() == 0) { + if (MAPI_TagMap()->isEmpty()) { for (int i = 0; MAPI_TagStrings[ i ].str; i++) { - MAPI_TagMap[ MAPI_TagStrings[ i ].tag ] = + (*MAPI_TagMap())[ MAPI_TagStrings[ i ].tag ] = i18n(MAPI_TagStrings[ i ].str); } } - QMap<int, QString>::ConstIterator it = MAPI_TagMap.constFind(key); - if (it == MAPI_TagMap.constEnd()) { + auto it = MAPI_TagMap()->constFind(key); + if (it == MAPI_TagMap()->constEnd()) { return QString().sprintf("0x%04X", key); } else { return QString().sprintf("0x%04X ________: ", key) + *it; @@ -219,14 +222,14 @@ QString KTnef::mapiNamedTagString(int key, int tag) { - if (MAPI_NamedTagMap.count() == 0) { + if (MAPI_NamedTagMap()->isEmpty()) { for (int i = 0; MAPI_NamedTagStrings[ i ].str; ++i) { - MAPI_NamedTagMap[ MAPI_NamedTagStrings[ i ].tag ] = + (*MAPI_NamedTagMap())[ MAPI_NamedTagStrings[ i ].tag ] = i18n(MAPI_NamedTagStrings[ i ].str); } } - QMap<int, QString>::ConstIterator it = MAPI_NamedTagMap.constFind(key); - if (it != MAPI_NamedTagMap.constEnd()) { + auto it = MAPI_NamedTagMap()->constFind(key); + if (it != MAPI_NamedTagMap()->constEnd()) { if (tag >= 0) { return QString().sprintf("0x%04X [0x%04X]: ", tag, key) + *it; } else {
