Hello community, here is the log from the commit of package kimap for openSUSE:Factory checked in at 2016-01-10 13:05:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimap (Old) and /work/SRC/openSUSE:Factory/.kimap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kimap" Changes: -------- --- /work/SRC/openSUSE:Factory/kimap/kimap.changes 2015-11-15 12:35:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kimap.new/kimap.changes 2016-01-10 13:05:32.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 13 13:20:22 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:28:52 UTC 2015 - [email protected] + +- Remove superfluous libpth-devel dependency + +------------------------------------------------------------------- Old: ---- kimap-15.08.3.tar.xz New: ---- kimap-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimap.spec ++++++ --- /var/tmp/diff_new_pack.v4E4HO/_old 2016-01-10 13:05:33.000000000 +0100 +++ /var/tmp/diff_new_pack.v4E4HO/_new 2016-01-10 13:05:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: kimap -Version: 15.08.3 +Version: 15.12.0 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries: IMAP library @@ -51,7 +51,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 ++++++ kimap-15.08.3.tar.xz -> kimap-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/CMakeLists.txt new/kimap-15.12.0/CMakeLists.txt --- old/kimap-15.08.3/CMakeLists.txt 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/CMakeLists.txt 2015-11-14 11:20:56.000000000 +0100 @@ -3,7 +3,7 @@ project(KIMAP) # 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} ${KIMAP_SOURCE_DIR}/cmake) include(GenerateExportHeader) @@ -15,10 +15,11 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings) +include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.12.0") -set(KIMAP_LIB_VERSION "4.80.0") -set(KMIME_LIBS_VERSION "4.79.0") +set(KIMAP_LIB_VERSION "4.82.0") +set(KMIME_LIBS_VERSION "4.83.0") ecm_setup_version(${KIMAP_LIB_VERSION} VARIABLE_PREFIX KIMAP VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kimap_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IMAPConfigVersion.cmake" @@ -27,18 +28,11 @@ ########### Find packages ########### find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIBS_VERSION} CONFIG REQUIRED) -set(Boost_MINIMUM_VERSION "1.34.0") -find_package(Boost ${Boost_MINIMUM_VERSION}) -set_package_properties(Boost PROPERTIES - DESCRIPTION "Boost C++ Libraries" - URL "http://www.boost.org"; - TYPE REQUIRED -) - find_package(Sasl2) set_package_properties(Sasl2 PROPERTIES DESCRIPTION "The Cyrus-sasl library" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/KF5IMAPConfig.cmake.in new/kimap-15.12.0/KF5IMAPConfig.cmake.in --- old/kimap-15.08.3/KF5IMAPConfig.cmake.in 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/KF5IMAPConfig.cmake.in 2015-11-14 11:20:56.000000000 +0100 @@ -4,16 +4,10 @@ find_dependency(KF5CoreAddons "@KF5_VERSION@") find_dependency(KF5Mime "@KMIME_LIBS_VERSION@") -find_dependency(Boost "@Boost_MINIMUM_VERSION@") find_dependency(Sasl2) include(FeatureSummary) -set_package_properties(Boost PROPERTIES - DESCRIPTION "Boost C++ Libraries" - URL "http://www.boost.org"; -) - set_package_properties(Sasl2 PROPERTIES DESCRIPTION "The Cyrus-sasl library" URL "http://www.cyrussasl.org"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/appendjobtest.cpp new/kimap-15.12.0/autotests/appendjobtest.cpp --- old/kimap-15.08.3/autotests/appendjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/appendjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -54,7 +54,7 @@ scenario << FakeServer::preauth() << "C: A000001 APPEND \"INBOX\" (\\Seen) \"26-Feb-2014 12:38:00 +0000\" {7}\r\ncontent" << "S: A000001 OK APPEND completed. [ APPENDUID 493 2672 ]"; - QTest::newRow("good, with internalDate set") << "INBOX" << scenario << flags << QDateTime::fromString(QLatin1String("2014-02-26T12:38:00Z"), Qt::ISODate) << QByteArray("content") << qint64(2672); + QTest::newRow("good, with internalDate set") << "INBOX" << scenario << flags << QDateTime::fromString(QStringLiteral("2014-02-26T12:38:00Z"), Qt::ISODate) << QByteArray("content") << qint64(2672); } { @@ -87,7 +87,7 @@ FakeServer fakeServer; fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::AppendJob *job = new KIMAP::AppendJob(&session); job->setContent(content); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/capabilitiesjobtest.cpp new/kimap-15.12.0/autotests/capabilitiesjobtest.cpp --- old/kimap-15.08.3/autotests/capabilitiesjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/capabilitiesjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -44,7 +44,7 @@ << "S: A000001 OK CAPABILITY completed"; QStringList capabilities; - capabilities << QLatin1String("IMAP4REV1") << QLatin1String("STARTTLS") << QLatin1String("AUTH=GSSAPI"); + capabilities << QStringLiteral("IMAP4REV1") << QStringLiteral("STARTTLS") << QStringLiteral("AUTH=GSSAPI"); QTest::newRow("good") << scenario << capabilities; scenario.clear(); @@ -62,7 +62,7 @@ << "S: * some response" << "S: A000001 OK CAPABILITY completed"; - capabilities << QLatin1String("IMAP4REV1") << QLatin1String("STARTTLS") << QLatin1String("AUTH=PLAIN"); + capabilities << QStringLiteral("IMAP4REV1") << QStringLiteral("STARTTLS") << QStringLiteral("AUTH=PLAIN"); QTest::newRow("extra-untagged") << scenario << capabilities;; } @@ -74,7 +74,7 @@ FakeServer fakeServer; fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::CapabilitiesJob *job = new KIMAP::CapabilitiesJob(&session); bool result = job->exec(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/createjobtest.cpp new/kimap-15.12.0/autotests/createjobtest.cpp --- old/kimap-15.08.3/autotests/createjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/createjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -65,7 +65,7 @@ FakeServer fakeServer; fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::CreateJob *job = new KIMAP::CreateJob(&session); job->setMailBox(mailbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/deletejobtest.cpp new/kimap-15.12.0/autotests/deletejobtest.cpp --- old/kimap-15.08.3/autotests/deletejobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/deletejobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -72,7 +72,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::DeleteJob *job = new KIMAP::DeleteJob(&session); job->setMailBox(mailbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/fakeservertest.cpp new/kimap-15.12.0/autotests/fakeservertest.cpp --- old/kimap-15.08.3/autotests/fakeservertest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/fakeservertest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -37,23 +37,23 @@ QList<KIMAP::MailBoxDescriptor> listresult; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); descriptor.name = QString::fromUtf8("INBOX/ä ö ü @ €"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found"); + descriptor.name = QStringLiteral("INBOX/lost+found"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found/Calendar Public-20080128"); + descriptor.name = QStringLiteral("INBOX/lost+found/Calendar Public-20080128"); listresult << descriptor; FakeServer fakeServer; - fakeServer.addScenarioFromFile(QString(QLatin1String(TEST_DATA) + QLatin1String("/fakeserverscenario.log"))); + fakeServer.addScenarioFromFile(QStringLiteral(TEST_DATA) + QStringLiteral("/fakeserverscenario.log")); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::ListJob *job = new KIMAP::ListJob(&session); job->setIncludeUnsubscribed(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/fetchjobtest.cpp new/kimap-15.12.0/autotests/fetchjobtest.cpp --- old/kimap-15.08.3/autotests/fetchjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/fetchjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -49,7 +49,7 @@ const QMap<qint64, KIMAP::MessageFlags> &flags, const QMap<qint64, KIMAP::MessagePtr> &messages) { - m_signals << QLatin1String("headersReceived"); + m_signals << QStringLiteral("headersReceived"); m_uids.unite(uids); m_sizes.unite(sizes); m_flags.unite(flags); @@ -62,7 +62,7 @@ const QMap<qint64, KIMAP::MessageAttribute> &attrs, const QMap<qint64, KIMAP::MessagePtr> &messages) { - m_signals << QLatin1String("messagesReceived"); + m_signals << QStringLiteral("messagesReceived"); m_uids.unite(uids); m_messages.unite(messages); m_attrs.unite(attrs); @@ -73,7 +73,7 @@ const QMap<qint64, KIMAP::MessageAttribute> &attrs, const QMap<qint64, KIMAP::MessageParts> &parts) { - m_signals << QLatin1String("partsReceived"); + m_signals << QStringLiteral("partsReceived"); m_attrs.unite(attrs); m_parts.unite(parts); } @@ -175,7 +175,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::FetchJob *job = new KIMAP::FetchJob(&session); job->setUidBased(uidBased); @@ -233,7 +233,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::FetchJob *job = new KIMAP::FetchJob(&session); job->setUidBased(false); @@ -254,8 +254,10 @@ QVERIFY(m_signals.count() > 0); QCOMPARE(m_uids.count(), 2); QCOMPARE(m_messages[1]->attachments().count(), 0); - QCOMPARE(m_messages[2]->attachments().count(), 3); - QCOMPARE(m_messages[2]->attachments().at(2)->contentDisposition()->filename(), QLatin1String("photo.jpg")); + QCOMPARE(m_messages[2]->attachments().count(), 1); + QCOMPARE(m_messages[2]->contents().size(), 2); + QCOMPARE(m_messages[2]->contents()[0]->contents().size(), 2); + QCOMPARE(m_messages[2]->attachments().at(0)->contentDisposition()->filename(), QStringLiteral("photo.jpg")); fakeServer.quit(); @@ -285,7 +287,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::FetchJob *job = new KIMAP::FetchJob(&session); job->setUidBased(false); @@ -337,7 +339,7 @@ QByteArray partId = m_parts[2].keys().first(); QString text = m_parts[2].value(partId)->decodedText(true, true); QCOMPARE(partId, QByteArray("1.1.1")); - QCOMPARE(text, QLatin1String("Hi Jane, nice to meet you!")) ; + QCOMPARE(text, QStringLiteral("Hi Jane, nice to meet you!")) ; fakeServer.quit(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/idlejobtest.cpp new/kimap-15.12.0/autotests/idlejobtest.cpp --- old/kimap-15.08.3/autotests/idlejobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/idlejobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -68,7 +68,7 @@ << "S: * 2 EXISTS" << "S: A000002 OK done idling"; - expectedMailBox = QLatin1String("INBOX/Foo"); + expectedMailBox = QStringLiteral("INBOX/Foo"); expectedMessageCounts.clear(); expectedRecentCounts.clear(); @@ -88,7 +88,7 @@ << "S: * 1 RECENT" << "S: A000002 OK done idling"; - expectedMailBox = QLatin1String("INBOX/Foo"); + expectedMailBox = QStringLiteral("INBOX/Foo"); expectedMessageCounts.clear(); expectedRecentCounts.clear(); @@ -108,7 +108,7 @@ << "S: * 2 EXISTS" << "S: A000002 OK done idling"; - expectedMailBox = QLatin1String("INBOX/Foo"); + expectedMailBox = QStringLiteral("INBOX/Foo"); expectedMessageCounts.clear(); expectedRecentCounts.clear(); @@ -129,7 +129,7 @@ << "S: * 1 RECENT" << "S: A000002 OK done idling"; - expectedMailBox = QLatin1String("INBOX/Foo"); + expectedMailBox = QStringLiteral("INBOX/Foo"); expectedMessageCounts.clear(); expectedRecentCounts.clear(); @@ -150,7 +150,7 @@ << "S: * 1 RECENT" << "S: A000002 OK done idling"; - expectedMailBox = QLatin1String("INBOX/Foo"); + expectedMailBox = QStringLiteral("INBOX/Foo"); expectedMessageCounts.clear(); expectedRecentCounts.clear(); @@ -171,7 +171,7 @@ << "S: * 2 FETCH (FLAGS (\\Seen))" << "S: A000002 OK done idling"; - expectedMailBox = QLatin1String("INBOX/Foo"); + expectedMailBox = QStringLiteral("INBOX/Foo"); expectedMessageCounts.clear(); expectedRecentCounts.clear(); @@ -194,7 +194,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::SelectJob *select = new KIMAP::SelectJob(&session); select->setMailBox(expectedMailBox); @@ -271,11 +271,11 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); const int originalTimeout = session.timeout(); KIMAP::SelectJob *select = new KIMAP::SelectJob(&session); - select->setMailBox(QLatin1String("INBOX")); + select->setMailBox(QStringLiteral("INBOX")); QVERIFY(select->exec()); KIMAP::IdleJob *idle = new KIMAP::IdleJob(&session); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/imapsettest.cpp new/kimap-15.12.0/autotests/imapsettest.cpp --- old/kimap-15.08.3/autotests/imapsettest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/imapsettest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -55,7 +55,7 @@ QTest::newRow("one interval and a value") << set << QByteArray("7:10,5"); set = ImapSet(7, 10); - set.add(QList<ImapSet::Id>() << 5 << 3); + set.add(QVector<ImapSet::Id>() << 5 << 3); QTest::newRow("one interval and two values") << set << QByteArray("7:10,3,5"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/kimaptest/fakeserver.h new/kimap-15.12.0/autotests/kimaptest/fakeserver.h --- old/kimap-15.08.3/autotests/kimaptest/fakeserver.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/kimaptest/fakeserver.h 2015-11-14 11:20:56.000000000 +0100 @@ -90,7 +90,7 @@ * fakeServer.setScenario( scenario ); * fakeServer.startAndWait(); * - * KIMAP::Session session( QLatin1String("127.0.0.1"), 5989 ); + * KIMAP::Session session( QStringLiteral("127.0.0.1"), 5989 ); * KIMAP::CapabilitiesJob *job = new KIMAP::CapabilitiesJob(&session); * QVERIFY( job->exec() ); * // check the returned capabilities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/kimaptest/sslserver.cpp new/kimap-15.12.0/autotests/kimaptest/sslserver.cpp --- old/kimap-15.08.3/autotests/kimaptest/sslserver.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/kimaptest/sslserver.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -77,7 +77,9 @@ QSslKey ssl_key(staticKey(), QSsl::Rsa); QSslCertificate ssl_cert(staticCert()); - Q_ASSERT(ssl_cert.isValid()); + Q_ASSERT(QDateTime::currentDateTime() >= ssl_cert.effectiveDate()); + Q_ASSERT(QDateTime::currentDateTime() <= ssl_cert.expiryDate()); + Q_ASSERT(!ssl_cert.isBlacklisted()); socket->setPrivateKey(ssl_key); socket->setLocalCertificate(ssl_cert); @@ -86,7 +88,7 @@ socket->ignoreSslErrors(); connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(sslErrors(QList<QSslError>))); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(error(QAbstractSocket::SocketError))); - if (mProtocol != QSsl::TlsV1) { + if (mProtocol != QSsl::TlsV1_0) { socket->startServerEncryption(); } addPendingConnection(socket); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/kimaptest/sslserver.h new/kimap-15.12.0/autotests/kimaptest/sslserver.h --- old/kimap-15.08.3/autotests/kimaptest/sslserver.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/kimaptest/sslserver.h 2015-11-14 11:20:56.000000000 +0100 @@ -29,7 +29,7 @@ SslServer(QSsl::SslProtocol); virtual void incomingConnection(qintptr handle) Q_DECL_OVERRIDE; -private slots: +private Q_SLOTS: void sslErrors(const QList<QSslError> &errors); void error(QAbstractSocket::SocketError); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/listjobtest.cpp new/kimap-15.12.0/autotests/listjobtest.cpp --- old/kimap-15.08.3/autotests/listjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/listjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -55,16 +55,16 @@ QList<KIMAP::MailBoxDescriptor> listresult; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); descriptor.name = QString::fromUtf8("INBOX/ä ö ü @ €"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found"); + descriptor.name = QStringLiteral("INBOX/lost+found"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found/Calendar Public-20080128"); + descriptor.name = QStringLiteral("INBOX/lost+found/Calendar Public-20080128"); listresult << descriptor; QTest::newRow("normal") << true << scenario << listresult; @@ -80,16 +80,16 @@ listresult.clear(); descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); descriptor.name = QString::fromUtf8("INBOX/ä ö ü @ €"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found"); + descriptor.name = QStringLiteral("INBOX/lost+found"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found/Calendar Public-20080128"); + descriptor.name = QStringLiteral("INBOX/lost+found/Calendar Public-20080128"); listresult << descriptor; QTest::newRow("lowercase Inbox") << true << scenario << listresult; @@ -106,19 +106,19 @@ listresult.clear(); descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/Calendar/3196"); + descriptor.name = QStringLiteral("INBOX/Calendar/3196"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/Calendar/ff"); + descriptor.name = QStringLiteral("INBOX/Calendar/ff"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/Calendar/ff/hgh"); + descriptor.name = QStringLiteral("INBOX/Calendar/ff/hgh"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("user/test2/Calendar"); + descriptor.name = QStringLiteral("user/test2/Calendar"); listresult << descriptor; QTest::newRow("subscribed") << false << scenario << listresult; @@ -135,19 +135,19 @@ listresult.clear(); descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/Calendar/3196"); + descriptor.name = QStringLiteral("INBOX/Calendar/3196"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/Calendar/ff"); + descriptor.name = QStringLiteral("INBOX/Calendar/ff"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/Calendar/ff/hgh"); + descriptor.name = QStringLiteral("INBOX/Calendar/ff/hgh"); listresult << descriptor; descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("user/test2/Calendar"); + descriptor.name = QStringLiteral("user/test2/Calendar"); listresult << descriptor; QTest::newRow("subscribed, lowercase Inbox") << false << scenario << listresult; @@ -159,7 +159,7 @@ << "S: A000001 OK LIST completed"; listresult.clear(); descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX/lost+found/Calendar Public-20080128"); + descriptor.name = QStringLiteral("INBOX/lost+found/Calendar Public-20080128"); listresult << descriptor; QTest::newRow("unquoted-space") << true << scenario << listresult; @@ -171,7 +171,7 @@ << "S: A000001 OK LIST completed"; listresult.clear(); descriptor.separator = QLatin1Char('/'); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); listresult << descriptor; QTest::newRow("separator is empty list") << true << scenario << listresult; @@ -200,7 +200,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::ListJob *job = new KIMAP::ListJob(&session); job->setIncludeUnsubscribed(unsubscribed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/logoutjobtest.cpp new/kimap-15.12.0/autotests/logoutjobtest.cpp --- old/kimap-15.08.3/autotests/logoutjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/logoutjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -44,7 +44,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session *session = new KIMAP::Session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session *session = new KIMAP::Session(QStringLiteral("127.0.0.1"), 5989); KIMAP::LogoutJob *logout = new KIMAP::LogoutJob(session); QVERIFY(logout->exec()); @@ -64,7 +64,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session *session = new KIMAP::Session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session *session = new KIMAP::Session(QStringLiteral("127.0.0.1"), 5989); KIMAP::LogoutJob *logout = new KIMAP::LogoutJob(session); QVERIFY(logout->exec()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/quotarootjobtest.cpp new/kimap-15.12.0/autotests/quotarootjobtest.cpp --- old/kimap-15.08.3/autotests/quotarootjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/quotarootjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -24,7 +24,7 @@ #include <QtTest> -Q_DECLARE_METATYPE(QList<qint64>); +Q_DECLARE_METATYPE(QList<qint64>) class QuotaRootJobTest: public QObject { @@ -156,7 +156,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::GetQuotaRootJob *job = new KIMAP::GetQuotaRootJob(&session); job->setMailBox(mailbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/renamejobtest.cpp new/kimap-15.12.0/autotests/renamejobtest.cpp --- old/kimap-15.08.3/autotests/renamejobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/renamejobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -68,7 +68,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::RenameJob *job = new KIMAP::RenameJob(&session); job->setSourceMailBox(mailbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/searchjobtest.cpp new/kimap-15.12.0/autotests/searchjobtest.cpp --- old/kimap-15.08.3/autotests/searchjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/searchjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -116,7 +116,7 @@ bool result = job->exec(); QVERIFY(result); if (result) { - QList<qint64> foundItems = job->results(); + QVector<qint64> foundItems = job->results(); QCOMPARE(foundItems.size(), expectedResultsCount); } @@ -186,7 +186,7 @@ bool result = job->exec(); QVERIFY(result); if (result) { - QList<qint64> foundItems = job->results(); + QVector<qint64> foundItems = job->results(); QCOMPARE(foundItems.size(), expectedResultsCount); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/selectjobtest.cpp new/kimap-15.12.0/autotests/selectjobtest.cpp --- old/kimap-15.08.3/autotests/selectjobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/selectjobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -100,11 +100,11 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::SelectJob *job = new KIMAP::SelectJob(&session); job->setCondstoreEnabled(condstoreEnabled); - job->setMailBox(QLatin1String("INBOX")); + job->setMailBox(QStringLiteral("INBOX")); bool result = job->exec(); QEXPECT_FAIL("bad" , "Expected failure on BAD scenario", Continue); QEXPECT_FAIL("no" , "Expected failure on NO scenario", Continue); @@ -135,14 +135,14 @@ ); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::SelectJob *job = new KIMAP::SelectJob(&session); - job->setMailBox(QLatin1String("INBOX")); + job->setMailBox(QStringLiteral("INBOX")); QVERIFY(job->exec()); job = new KIMAP::SelectJob(&session); - job->setMailBox(QLatin1String("INBOX/Foo")); + job->setMailBox(QStringLiteral("INBOX/Foo")); QVERIFY(job->exec()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/setmetadatajobtest.cpp new/kimap-15.12.0/autotests/setmetadatajobtest.cpp --- old/kimap-15.08.3/autotests/setmetadatajobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/setmetadatajobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -100,7 +100,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::SetMetaDataJob *setMetadataJob = new KIMAP::SetMetaDataJob(&session); setMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Metadata); @@ -145,7 +145,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::SetMetaDataJob *setMetadataJob = new KIMAP::SetMetaDataJob(&session); setMetadataJob->setServerCapability(KIMAP::MetaDataJobBase::Annotatemore); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/storejobtest.cpp new/kimap-15.12.0/autotests/storejobtest.cpp --- old/kimap-15.08.3/autotests/storejobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/storejobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -74,7 +74,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::StoreJob *job = new KIMAP::StoreJob(&session); job->setUidBased(uidBased); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/subscribejobtest.cpp new/kimap-15.12.0/autotests/subscribejobtest.cpp --- old/kimap-15.08.3/autotests/subscribejobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/subscribejobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -66,7 +66,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::SubscribeJob *job = new KIMAP::SubscribeJob(&session); job->setMailBox(mailbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/testrfccodecs.cpp new/kimap-15.12.0/autotests/testrfccodecs.cpp --- old/kimap-15.08.3/autotests/testrfccodecs.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/testrfccodecs.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -69,10 +69,10 @@ void RFCCodecsTest::testQuotes() { - QString test(QLatin1String("tom\"allen")); + QString test(QStringLiteral("tom\"allen")); QCOMPARE(quoteIMAP(test), QString::fromLatin1("tom\\\"allen")); - test = QLatin1String("tom\'allen"); + test = QStringLiteral("tom\'allen"); QCOMPARE(quoteIMAP(test), QString::fromLatin1("tom\'allen")); - test = QLatin1String("tom\\allen"); + test = QStringLiteral("tom\\allen"); QCOMPARE(quoteIMAP(test), QString::fromLatin1("tom\\\\allen")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/testsession.cpp new/kimap-15.12.0/autotests/testsession.cpp --- old/kimap-15.08.3/autotests/testsession.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/testsession.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -51,7 +51,7 @@ << FakeServer::greeting() ); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); QSignalSpy spy(&s, SIGNAL(stateChanged(KIMAP::Session::State,KIMAP::Session::State))); QCOMPARE((int)s.state(), (int)KIMAP::Session::Disconnected); QTest::qWait(600); @@ -64,7 +64,7 @@ void shouldFailForInvalidHosts() { - KIMAP::Session s(QLatin1String("0.0.0.0"), 1234); + KIMAP::Session s(QStringLiteral("0.0.0.0"), 1234); s.setTimeout(1); // 1 second timout QSignalSpy spyFail(&s, SIGNAL(connectionFailed())); @@ -96,7 +96,7 @@ fakeServer.setScenario(QList<QByteArray>()); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); s.setTimeout(2); QSignalSpy spyFail(&s, SIGNAL(connectionFailed())); QSignalSpy spyLost(&s, SIGNAL(connectionLost())); @@ -128,7 +128,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); QSignalSpy spy(&s, SIGNAL(stateChanged(KIMAP::Session::State,KIMAP::Session::State))); QCOMPARE((int)s.state(), (int)KIMAP::Session::Disconnected); QTest::qWait(500); @@ -147,7 +147,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); MockJob *j1 = new MockJob(&s); connect(j1, SIGNAL(result(KJob*)), this, SLOT(jobDone(KJob*))); MockJob *j2 = new MockJob(&s); @@ -180,7 +180,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); QSignalSpy queueSpy(&s, SIGNAL(jobQueueSizeChanged(int))); @@ -248,7 +248,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); QSignalSpy spyFail(&s, SIGNAL(connectionFailed())); QSignalSpy spyLost(&s, SIGNAL(connectionLost())); @@ -273,7 +273,7 @@ fakeServer.setScenario(QList<QByteArray>()); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); s.setTimeout(1); MockJob *j1 = new MockJob(&s); @@ -321,7 +321,7 @@ ); fakeServer.startAndWait(); - KIMAP::Session s(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session s(QStringLiteral("127.0.0.1"), 5989); QSignalSpy spyFail(&s, SIGNAL(connectionFailed())); QSignalSpy spyLost(&s, SIGNAL(connectionLost())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/autotests/unsubscribejobtest.cpp new/kimap-15.12.0/autotests/unsubscribejobtest.cpp --- old/kimap-15.08.3/autotests/unsubscribejobtest.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/autotests/unsubscribejobtest.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -66,7 +66,7 @@ fakeServer.setScenario(scenario); fakeServer.startAndWait(); - KIMAP::Session session(QLatin1String("127.0.0.1"), 5989); + KIMAP::Session session(QStringLiteral("127.0.0.1"), 5989); KIMAP::UnsubscribeJob *job = new KIMAP::UnsubscribeJob(&session); job->setMailBox(mailbox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/CMakeLists.txt new/kimap-15.12.0/src/CMakeLists.txt --- old/kimap-15.08.3/src/CMakeLists.txt 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/CMakeLists.txt 2015-11-14 11:20:56.000000000 +0100 @@ -5,7 +5,6 @@ kde_enable_exceptions() set(kimap_SRCS - kimap_debug.cpp acl.cpp acljobbase.cpp appendjob.cpp @@ -49,13 +48,15 @@ unsubscribejob.cpp ) +ecm_qt_declare_logging_category(kimap_SRCS HEADER kimap_debug.h IDENTIFIER KIMAP_LOG CATEGORY_NAME log_kimap) + add_library(KF5IMAP ${kimap_SRCS}) generate_export_header(KF5IMAP BASE_NAME kimap) add_library(KF5::IMAP ALIAS KF5IMAP) -target_include_directories(KF5IMAP INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIMAP;${Boost_INCLUDE_DIR};${Sasl2_INCLUDE_DIR}>") +target_include_directories(KF5IMAP INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIMAP;${Sasl2_INCLUDE_DIR}>") target_include_directories(KF5IMAP PUBLIC "$<BUILD_INTERFACE:${KIMAP_SOURCE_DIR}/src;${KIMAP_BINARY_DIR}/src>") target_link_libraries(KF5IMAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/appendjob.cpp new/kimap-15.12.0/src/appendjob.cpp --- old/kimap-15.08.3/src/appendjob.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/appendjob.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -124,7 +124,7 @@ if (!d->internalDate.isNull()) { const QDateTime utcDateTime = d->internalDate.toUTC(); - parameters += " \"" + QLocale::c().toString(utcDateTime, QString::fromAscii("dd-MMM-yyyy hh:mm:ss")).toLatin1() + " +0000" + '\"'; + parameters += " \"" + QLocale::c().toString(utcDateTime, QStringLiteral("dd-MMM-yyyy hh:mm:ss")).toLatin1() + " +0000" + '\"'; } parameters += " {" + QByteArray::number(d->content.size()) + '}'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/fetchjob.cpp new/kimap-15.12.0/src/fetchjob.cpp --- old/kimap-15.08.3/src/fetchjob.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/fetchjob.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -332,7 +332,7 @@ d->pendingAttributes.insert(id, qMakePair<QByteArray, QVariant>("X-GM-MSGID", *it)); } else if (str == "BODYSTRUCTURE") { int pos = 0; - d->parseBodyStructure(*it, pos, message.get()); + d->parseBodyStructure(*it, pos, message.data()); message->assemble(); d->pendingMessages[id] = message; } else if (str.startsWith("BODY[")) { //krazy:exclude=strings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/fetchjob.h new/kimap-15.12.0/src/fetchjob.h --- old/kimap-15.08.3/src/fetchjob.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/fetchjob.h 2015-11-14 11:20:56.000000000 +0100 @@ -26,9 +26,7 @@ #include "job.h" #include <kmime/kmime_content.h> -#include "kmime/kmime_message.h" - -#include <boost/shared_ptr.hpp> +#include <kmime/kmime_message.h> namespace KIMAP { @@ -37,10 +35,10 @@ struct Message; class FetchJobPrivate; -typedef boost::shared_ptr<KMime::Content> ContentPtr; +typedef QSharedPointer<KMime::Content> ContentPtr; typedef QMap<QByteArray, ContentPtr> MessageParts; -typedef boost::shared_ptr<KMime::Message> MessagePtr; +typedef QSharedPointer<KMime::Message> MessagePtr; typedef QList<QByteArray> MessageFlags; typedef QPair<QByteArray, QVariant> MessageAttribute; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/idlejob.h new/kimap-15.12.0/src/idlejob.h --- old/kimap-15.08.3/src/idlejob.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/idlejob.h 2015-11-14 11:20:56.000000000 +0100 @@ -25,10 +25,8 @@ #include "imapset.h" #include "job.h" -#include "kmime/kmime_content.h" -#include "kmime/kmime_message.h" - -#include <boost/shared_ptr.hpp> +#include <kmime/kmime_content.h> +#include <kmime/kmime_message.h> namespace KIMAP { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/imapset.cpp new/kimap-15.12.0/src/imapset.cpp --- old/kimap-15.08.3/src/imapset.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/imapset.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -201,7 +201,7 @@ ImapSet::ImapSet(Id value) : d(new Private) { - add(QList<Id>() << value); + add(QVector<Id>() << value); } ImapSet::ImapSet(const ImapSet &other) : @@ -238,12 +238,12 @@ void ImapSet::add(Id value) { - add(QList<Id>() << value); + add(QVector<Id>() << value); } -void ImapSet::add(const QList<Id> &values) +void ImapSet::add(const QVector<Id> &values) { - QList<Id> vals = values; + QVector<Id> vals = values; qSort(vals); for (int i = 0; i < vals.count(); ++i) { const int begin = vals[i]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/imapset.h new/kimap-15.12.0/src/imapset.h --- old/kimap-15.08.3/src/imapset.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/imapset.h 2015-11-14 11:20:56.000000000 +0100 @@ -195,7 +195,7 @@ No interval merging is performed. @param values List of positive integer numbers in arbitrary order */ - void add(const QList<Id> &values); + void add(const QVector<Id> &values); /** Adds the given ImapInterval to this set. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/imapstreamparser.cpp new/kimap-15.12.0/src/imapstreamparser.cpp --- old/kimap-15.08.3/src/imapstreamparser.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/imapstreamparser.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -36,10 +36,6 @@ m_literalSize = 0; } -ImapStreamParser::~ImapStreamParser() -{ -} - QString ImapStreamParser::readUtf8String() { QByteArray tmp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/imapstreamparser.h new/kimap-15.12.0/src/imapstreamparser.h --- old/kimap-15.08.3/src/imapstreamparser.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/imapstreamparser.h 2015-11-14 11:20:56.000000000 +0100 @@ -69,11 +69,6 @@ explicit ImapStreamParser(QIODevice *socket, bool serverModeEnabled = false); /** - * Destructor. - */ - ~ImapStreamParser(); - - /** * Get a string from the message. If the upcoming data is not a quoted string, unquoted string or a literal, * the behavior is undefined. Use @ref hasString to be sure a string comes. This call might block. * @return the next string from the message as an utf8 string diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/kimap_debug.cpp new/kimap-15.12.0/src/kimap_debug.cpp --- old/kimap-15.08.3/src/kimap_debug.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/kimap_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 "kimap_debug.h" -Q_LOGGING_CATEGORY(KIMAP_LOG, "log_kimap") - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/kimap_debug.h new/kimap-15.12.0/src/kimap_debug.h --- old/kimap-15.08.3/src/kimap_debug.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/kimap_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 KIMAP_DEBUG_H -#define KIMAP_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(KIMAP_LOG) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/listjob.cpp new/kimap-15.12.0/src/listjob.cpp --- old/kimap-15.08.3/src/listjob.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/listjob.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -19,7 +19,6 @@ #include "listjob.h" -#include <boost/bind.hpp> #include <QtCore/QTimer> #include <KLocalizedString> @@ -215,7 +214,7 @@ if (!pathParts.isEmpty() && pathParts[0].compare(QLatin1String("INBOX"), Qt::CaseInsensitive) == 0) { pathParts.removeAt(0); - descriptor.name = QLatin1String("INBOX"); + descriptor.name = QStringLiteral("INBOX"); if (!pathParts.isEmpty()) { descriptor.name += descriptor.separator + pathParts.join(descriptor.separator); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/loginjob.cpp new/kimap-15.12.0/src/loginjob.cpp --- old/kimap-15.08.3/src/loginjob.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/loginjob.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -573,7 +573,7 @@ break; case Anonymous: d->authMode = QStringLiteral("ANONYMOUS"); break; - case XOAuth2: d->authMode = QLatin1String("XOAUTH2"); + case XOAuth2: d->authMode = QStringLiteral("XOAUTH2"); break; default: d->authMode = QStringLiteral(""); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/metadatajobbase.cpp new/kimap-15.12.0/src/metadatajobbase.cpp --- old/kimap-15.08.3/src/metadatajobbase.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/metadatajobbase.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -89,7 +89,7 @@ return d->mailBox; } -void MetaDataJobBase::setServerCapability(const ServerCapability &capability) +void MetaDataJobBase::setServerCapability(ServerCapability capability) { Q_D(MetaDataJobBase); d->serverCapability = capability; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/metadatajobbase.h new/kimap-15.12.0/src/metadatajobbase.h --- old/kimap-15.08.3/src/metadatajobbase.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/metadatajobbase.h 2015-11-14 11:20:56.000000000 +0100 @@ -111,7 +111,7 @@ * * @param capability the version of the extension implemented by the server */ - void setServerCapability(const ServerCapability &capability); + void setServerCapability(ServerCapability capability); /** * The version of the metadata extension that will be used. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/rfccodecs.cpp new/kimap-15.12.0/src/rfccodecs.cpp --- old/kimap-15.08.3/src/rfccodecs.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/rfccodecs.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -40,7 +40,6 @@ #include <QtCore/QTextCodec> #include <QtCore/QBuffer> -#include <QtCore/QRegExp> #include <QtCore/QByteArray> #include <QtCore/QLatin1Char> #include <kcodecs.h> @@ -154,7 +153,7 @@ QString KIMAP::decodeImapFolderName(const QString &inSrc) { - return QString::fromUtf8(decodeImapFolderName(inSrc.toUtf8()).data()); + return QString::fromUtf8(decodeImapFolderName(inSrc.toUtf8()).constData()); } //----------------------------------------------------------------------------- @@ -192,7 +191,7 @@ //----------------------------------------------------------------------------- QString KIMAP::encodeImapFolderName(const QString &inSrc) { - return QString::fromUtf8(encodeImapFolderName(inSrc.toUtf8()).data()); + return QString::fromUtf8(encodeImapFolderName(inSrc.toUtf8()).constData()); } QByteArray KIMAP::encodeImapFolderName(const QByteArray &inSrc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/searchjob.cpp new/kimap-15.12.0/src/searchjob.cpp --- old/kimap-15.08.3/src/searchjob.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/searchjob.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -35,7 +35,7 @@ class Term::Private { public: - Private(): isFuzzy(false), isNegated(false), isNull(false) {}; + Private(): isFuzzy(false), isNegated(false), isNull(false) {} QByteArray command; bool isFuzzy; bool isNegated; @@ -154,27 +154,12 @@ } } -QMap<int, QByteArray> initializeMonths() +static QByteArray monthName(int month) { - QMap<int, QByteArray> months; - //don't use QDate::shortMonthName(), it returns a localized month name - months[1] = "Jan"; - months[2] = "Feb"; - months[3] = "Mar"; - months[4] = "Apr"; - months[5] = "May"; - months[6] = "Jun"; - months[7] = "Jul"; - months[8] = "Aug"; - months[9] = "Sep"; - months[10] = "Oct"; - months[11] = "Nov"; - months[12] = "Dec"; - return months; + static const char* names[12] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; + return (month >= 1 && month <= 12) ? QByteArray(names[month - 1]) : QByteArray(); } -static QMap<int, QByteArray> months = initializeMonths(); - Term::Term(Term::DateSearchKey key, const QDate &date) : d(new Term::Private) { @@ -200,7 +185,7 @@ } d->command += " \""; d->command += QByteArray::number(date.day()) + '-'; - d->command += months[date.month()] + '-'; + d->command += monthName(date.month()) + '-'; d->command += QByteArray::number(date.year()); d->command += '\"'; } @@ -346,7 +331,7 @@ QMap<int, QByteArray> months; SearchJob::SearchLogic logic; QList<QByteArray> contents; - QList<qint64> results; + QVector<qint64> results; uint nextContent; bool uidBased; Term term; @@ -427,14 +412,14 @@ Q_D(SearchJob); if (handleErrorReplies(response) == NotHandled) { - if (response.content[0].toString() == "+") { + if (response.content.size() >= 1 && response.content[0].toString() == "+") { if (d->term.isNull()) { d->sessionInternal()->sendData(d->contents[d->nextContent]); } else { qCWarning(KIMAP_LOG) << "The term API only supports inline strings."; } d->nextContent++; - } else if (response.content[1].toString() == "SEARCH") { + } else if (response.content.size() >= 2 && response.content[1].toString() == "SEARCH") { for (int i = 2; i < response.content.size(); i++) { d->results.append(response.content[i].toString().toInt()); } @@ -570,18 +555,8 @@ return d->uidBased; } -QList<qint64> SearchJob::results() const +QVector<qint64> SearchJob::results() const { Q_D(const SearchJob); return d->results; } - -QList<int> SearchJob::foundItems() -{ - Q_D(const SearchJob); - - QList<int> results; - qCopy(d->results.begin(), d->results.end(), results.begin()); - - return results; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/searchjob.h new/kimap-15.12.0/src/searchjob.h --- old/kimap-15.08.3/src/searchjob.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/searchjob.h 2015-11-14 11:20:56.000000000 +0100 @@ -90,6 +90,7 @@ }; Term(); + ~Term() = default; // silence clazy rule of three warning Term(Relation relation, const QVector<Term> &subterms); Term(SearchKey key, const QString &value); Term(BooleanSearchKey key); @@ -177,16 +178,9 @@ /** * Get the search result, as a list of sequence numbers or UIDs, based on the isUidBased status * @return the found items - * @deprecated use results() instead - */ - KIMAP_DEPRECATED QList<int> foundItems(); - - /** - * Get the search result, as a list of sequence numbers or UIDs, based on the isUidBased status - * @return the found items * @since 4.6 */ - QList<qint64> results() const; + QVector<qint64> results() const; /** * Add a search criteria that doesn't have an argument. Passing a criteria that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/session.cpp new/kimap-15.12.0/src/session.cpp --- old/kimap-15.08.3/src/session.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/session.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -45,7 +45,7 @@ Session::Session(const QString &hostName, quint16 port, QObject *parent) : QObject(parent), d(new SessionPrivate(this)) { - if (!qgetenv("KIMAP_LOGFILE").isEmpty()) { + if (!qEnvironmentVariableIsEmpty("KIMAP_LOGFILE")) { d->logger = new SessionLogger; } @@ -63,8 +63,8 @@ connect(d->thread, &SessionThread::socketError, d, &SessionPrivate::socketError); d->socketTimer.setSingleShot(true); - connect(&d->socketTimer, SIGNAL(timeout()), - d, SLOT(onSocketTimeout())); + connect(&d->socketTimer, &QTimer::timeout, + d, &SessionPrivate::onSocketTimeout); d->startSocketTimer(); } @@ -153,8 +153,8 @@ queue.append(job); emit q->jobQueueSizeChanged(q->jobQueueSize()); - QObject::connect(job, SIGNAL(result(KJob*)), this, SLOT(jobDone(KJob*))); - QObject::connect(job, SIGNAL(destroyed(QObject*)), this, SLOT(jobDestroyed(QObject*))); + QObject::connect(job, &KJob::result, this, &SessionPrivate::jobDone); + QObject::connect(job, &QObject::destroyed, this, &SessionPrivate::jobDestroyed); if (state != Session::Disconnected) { startNext(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/sessionlogger_p.h new/kimap-15.12.0/src/sessionlogger_p.h --- old/kimap-15.08.3/src/sessionlogger_p.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/sessionlogger_p.h 2015-11-14 11:20:56.000000000 +0100 @@ -40,6 +40,7 @@ void disconnectionOccured(); private: + Q_DISABLE_COPY(SessionLogger) qint64 m_id; QFile m_file; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/sessionthread.cpp new/kimap-15.12.0/src/sessionthread.cpp --- old/kimap-15.08.3/src/sessionthread.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/sessionthread.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -178,24 +178,24 @@ Q_ASSERT(QThread::currentThread() == thread()); m_socket = new SessionSocket; m_stream = new ImapStreamParser(m_socket); - connect(m_socket, SIGNAL(readyRead()), - this, SLOT(readMessage()), Qt::QueuedConnection); + connect(m_socket, &QIODevice::readyRead, + this, &SessionThread::readMessage, Qt::QueuedConnection); // Delay the call to slotSocketDisconnected so that it finishes disconnecting before we call reconnect() - connect(m_socket, SIGNAL(disconnected()), - this, SLOT(slotSocketDisconnected()), Qt::QueuedConnection); - connect(m_socket, SIGNAL(connected()), - this, SIGNAL(socketConnected())); + connect(m_socket, &KTcpSocket::disconnected, + this, &SessionThread::slotSocketDisconnected, Qt::QueuedConnection); + connect(m_socket, &KTcpSocket::connected, + this, &SessionThread::socketConnected); connect(m_socket, SIGNAL(error(KTcpSocket::Error)), this, SLOT(slotSocketError(KTcpSocket::Error))); - connect(m_socket, SIGNAL(bytesWritten(qint64)), - this, SIGNAL(socketActivity())); + connect(m_socket, &QIODevice::bytesWritten, + this, &SessionThread::socketActivity); if (m_socket->metaObject()->indexOfSignal("encryptedBytesWritten(qint64)") > -1) { - connect(m_socket, SIGNAL(encryptedBytesWritten(qint64)), // needs kdelibs > 4.8 - this, SIGNAL(socketActivity())); + connect(m_socket, &KTcpSocket::encryptedBytesWritten, // needs kdelibs > 4.8 + this, &SessionThread::socketActivity); } - connect(m_socket, SIGNAL(readyRead()), - this, SIGNAL(socketActivity())); + connect(m_socket, &QIODevice::readyRead, + this, &SessionThread::socketActivity); QMetaObject::invokeMethod(this, "reconnect", Qt::QueuedConnection); } @@ -227,7 +227,7 @@ m_socket->setAdvertisedSslVersion(version); m_socket->ignoreSslErrors(); - connect(m_socket, SIGNAL(encrypted()), this, SLOT(sslConnected())); + connect(m_socket, &KTcpSocket::encrypted, this, &SessionThread::sslConnected); m_socket->startClientEncryption(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/src/sessionuiproxy.h new/kimap-15.12.0/src/sessionuiproxy.h --- old/kimap-15.08.3/src/sessionuiproxy.h 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/src/sessionuiproxy.h 2015-11-14 11:20:56.000000000 +0100 @@ -20,12 +20,12 @@ #ifndef KIMAP_SESSIONUIPROXY_H #define KIMAP_SESSIONUIPROXY_H -#include <boost/shared_ptr.hpp> - #include "kimap_export.h" #include "job.h" +#include <QSharedPointer> + class KSslErrorUiData; namespace KIMAP @@ -35,7 +35,7 @@ class KIMAP_EXPORT SessionUiProxy { public: - typedef boost::shared_ptr<SessionUiProxy> Ptr; + typedef QSharedPointer<SessionUiProxy> Ptr; virtual ~SessionUiProxy(); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/tests/CMakeLists.txt new/kimap-15.12.0/tests/CMakeLists.txt --- old/kimap-15.08.3/tests/CMakeLists.txt 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/tests/CMakeLists.txt 2015-11-14 11:20:56.000000000 +0100 @@ -3,7 +3,7 @@ find_package(Qt5Test CONFIG REQUIRED) #for qsignalspy.h add_executable(testimapidle testimapidle.cpp) -target_link_libraries(testimapidle KF5IMAP Qt5::Test KF5::KDELibs4Support Qt5::Network) +target_link_libraries(testimapidle KF5IMAP Qt5::Test KF5::KIOCore Qt5::Network) add_executable(testimapserver testimapserver.cpp) -target_link_libraries(testimapserver KF5IMAP Qt5::Test KF5::KDELibs4Support Qt5::Network) +target_link_libraries(testimapserver KF5IMAP Qt5::Test KF5::KIOCore Qt5::Network) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/tests/testimapidle.cpp new/kimap-15.12.0/tests/testimapidle.cpp --- old/kimap-15.08.3/tests/testimapidle.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/tests/testimapidle.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -18,11 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kcomponentdata.h> -#include <k4aboutdata.h> -#include <klocalizedstring.h> #include <qdebug.h> -#include <ktcpsocket.h> // declares KSslErrorUiData #include <QCoreApplication> #include <qsignalspy.h> @@ -49,8 +45,7 @@ int main(int argc, char **argv) { - K4AboutData about("TestImapIdle", 0, ki18n("TestImapIdle"), "version"); - KComponentData cData(&about); + QCoreApplication::setApplicationName(QStringLiteral("TestImapIdle")); if (argc < 4) { qCritical() << "Not enough parameters, expecting: <server> <user> <password>"; @@ -90,11 +85,11 @@ qDebug() << capabilities->capabilities(); qDebug(); - Q_ASSERT(capabilities->capabilities().contains(QLatin1String("IDLE"))); + Q_ASSERT(capabilities->capabilities().contains(QStringLiteral("IDLE"))); qDebug() << "Selecting INBOX:"; SelectJob *select = new SelectJob(&session); - select->setMailBox(QLatin1String("INBOX")); + select->setMailBox(QStringLiteral("INBOX")); select->exec(); Q_ASSERT_X(select->error() == 0, "SelectJob", select->errorString().toLocal8Bit().constData()); Q_ASSERT(session.state() == Session::Selected); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimap-15.08.3/tests/testimapserver.cpp new/kimap-15.12.0/tests/testimapserver.cpp --- old/kimap-15.08.3/tests/testimapserver.cpp 2015-09-23 18:42:05.000000000 +0200 +++ new/kimap-15.12.0/tests/testimapserver.cpp 2015-11-14 11:20:56.000000000 +0100 @@ -19,10 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kcomponentdata.h> -#include <k4aboutdata.h> #include <qdebug.h> -#include <klocalizedstring.h> #include <qtcpsocket.h> #include <QCoreApplication> #include <qsignalspy.h> @@ -61,6 +58,7 @@ public: bool ignoreSslError(const KSslErrorUiData &errorData) { + Q_UNUSED(errorData); return true; } }; @@ -106,25 +104,25 @@ { qDebug() << "TESTING: METADATA commands"; CreateJob *create = new CreateJob(session); - create->setMailBox(QLatin1String("INBOX/TestFolder")); + create->setMailBox(QStringLiteral("INBOX/TestFolder")); create->exec(); SetMetaDataJob *setmetadata = new SetMetaDataJob(session); - setmetadata->setMailBox(QLatin1String("INBOX/TestFolder")); + setmetadata->setMailBox(QStringLiteral("INBOX/TestFolder")); setmetadata->setServerCapability(SetMetaDataJob::Annotatemore); setmetadata->setEntry("/comment"); setmetadata->addMetaData("value.priv", "My new comment"); setmetadata->exec(); setmetadata = new SetMetaDataJob(session); - setmetadata->setMailBox(QLatin1String("INBOX/TestFolder")); + setmetadata->setMailBox(QStringLiteral("INBOX/TestFolder")); setmetadata->setServerCapability(SetMetaDataJob::Annotatemore); setmetadata->setEntry("/check"); setmetadata->addMetaData("value.priv", "true"); setmetadata->exec(); GetMetaDataJob *getmetadata = new GetMetaDataJob(session); - getmetadata->setMailBox(QLatin1String("INBOX/TestFolder")); + getmetadata->setMailBox(QStringLiteral("INBOX/TestFolder")); getmetadata->setServerCapability(SetMetaDataJob::Annotatemore); getmetadata->addEntry("/*", "value.priv"); getmetadata->exec(); @@ -278,15 +276,15 @@ Q_ASSERT(expectedFlags == resultingFlags); select = new SelectJob(session); - select->setMailBox(QLatin1String("INBOX")); + select->setMailBox(QStringLiteral("INBOX")); select->exec(); //cleanup DeleteJob *deletejob = new DeleteJob(session); - deletejob->setMailBox(QLatin1String("INBOX/TestFolder")); + deletejob->setMailBox(QStringLiteral("INBOX/TestFolder")); deletejob->exec(); deletejob = new DeleteJob(session); - deletejob->setMailBox(QLatin1String("INBOX/RenamedTestFolder")); + deletejob->setMailBox(QStringLiteral("INBOX/RenamedTestFolder")); deletejob->exec(); } @@ -378,8 +376,7 @@ int main(int argc, char **argv) { - K4AboutData about("TestImapServer", 0, ki18n("TestImapServer"), "version"); - KComponentData cData(&about); + QCoreApplication::setApplicationName(QStringLiteral("TestImapServer")); if (argc < 4) { qCritical() << "Not enough parameters, expecting: <server> <user> <password>"; @@ -523,7 +520,7 @@ Q_ASSERT_X(fetch->error() == 0, "FetchJob", fetch->errorString().toLocal8Bit().constData()); Q_ASSERT(session.state() == Session::Selected); MessagePtr message = fetch->messages()[1]; - dumpContentHelper(message.get()); + dumpContentHelper(message.data()); qDebug(); qDebug() << "Fetching first message second part headers:";
