Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2015-05-11 19:36:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2015-04-13 20:26:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2015-05-11 19:48:12.000000000 +0200 @@ -1,0 +2,7 @@ +Sun May 3 19:48:24 UTC 2015 - [email protected] + +- Update to 5.10.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.10.0.php + +------------------------------------------------------------------- Old: ---- karchive-5.9.0.tar.xz New: ---- karchive-5.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.DwjjSZ/_old 2015-05-11 19:48:13.000000000 +0200 +++ /var/tmp/diff_new_pack.DwjjSZ/_new 2015-05-11 19:48:13.000000000 +0200 @@ -17,9 +17,9 @@ %define lname libKF5Archive5 -%define _tar_path 5.9 +%define _tar_path 5.10 Name: karchive -Version: 5.9.0 +Version: 5.10.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ karchive-5.9.0.tar.xz -> karchive-5.10.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.9.0/CMakeLists.txt new/karchive-5.10.0/CMakeLists.txt --- old/karchive-5.9.0/CMakeLists.txt 2015-04-04 13:46:49.000000000 +0200 +++ new/karchive-5.10.0/CMakeLists.txt 2015-05-01 17:10:29.000000000 +0200 @@ -2,7 +2,7 @@ project(KArchive) -find_package(ECM 5.9.0 REQUIRED NO_MODULE) +find_package(ECM 5.10.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -45,7 +45,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_VERSION "5.10.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KARCHIVE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.9.0/autotests/karchivetest.cpp new/karchive-5.10.0/autotests/karchivetest.cpp --- old/karchive-5.9.0/autotests/karchivetest.cpp 2015-04-04 13:46:49.000000000 +0200 +++ new/karchive-5.10.0/autotests/karchivetest.cpp 2015-05-01 17:10:29.000000000 +0200 @@ -70,7 +70,7 @@ QVERIFY(archive->writeFile("my/dir/test3", "I do not speak German\nDavid.", 0100644, "dfaure", "hackers")); // Now a medium file : 100 null bytes - char medium[ SIZE1 ]; + char medium[SIZE1]; memset(medium, 0, SIZE1); QVERIFY(archive->writeFile("mediumfile", QByteArray(medium, SIZE1))); // Another one, with an absolute path @@ -78,7 +78,7 @@ // Now a huge file : 20000 null bytes int n = 20000; - char *huge = new char[ n ]; + char *huge = new char[n]; memset(huge, 0, n); QVERIFY(archive->writeFile("hugefile", QByteArray(huge, n))); delete [] huge; @@ -122,7 +122,10 @@ #endif } -enum { WithUserGroup = 1, WithTime = 0x02 }; // ListingFlags +enum ListingFlags { + WithUserGroup = 1, + WithTime = 0x02 +}; // ListingFlags static QStringList recursiveListEntries(const KArchiveDirectory *dir, const QString &path, int listingFlags) { @@ -463,14 +466,14 @@ compareEntryWithTimestamp(listing[0], QString("mode=40755 user= group= path=aaaemptydir type=dir"), creationTime); - QCOMPARE(listing[ 1], QString("mode=40777 user=%1 group=%2 path=dir type=dir time=%3").arg(owner).arg(group).arg(emptyTime)); - QCOMPARE(listing[ 2], QString("mode=40777 user=%1 group=%2 path=dir/subdir type=dir time=%3").arg(owner).arg(group).arg(emptyTime)); + QCOMPARE(listing[1], QString("mode=40777 user=%1 group=%2 path=dir type=dir time=%3").arg(owner).arg(group).arg(emptyTime)); + QCOMPARE(listing[2], QString("mode=40777 user=%1 group=%2 path=dir/subdir type=dir time=%3").arg(owner).arg(group).arg(emptyTime)); compareEntryWithTimestamp(listing[3], QString("mode=100644 user= group= path=dir/subdir/mediumfile2 type=file size=100"), creationTime); compareEntryWithTimestamp(listing[4], QString("mode=100644 user=weis group=users path=empty type=file size=0"), creationTime); compareEntryWithTimestamp(listing[5], QString("mode=100644 user= group= path=hugefile type=file size=20000"), creationTime); compareEntryWithTimestamp(listing[6], QString("mode=100644 user= group= path=mediumfile type=file size=100"), creationTime); - QCOMPARE(listing[ 7], QString("mode=40777 user=%1 group=%2 path=my type=dir time=").arg(owner).arg(group)); - QCOMPARE(listing[ 8], QString("mode=40777 user=%1 group=%2 path=my/dir type=dir time=").arg(owner).arg(group)); + QCOMPARE(listing[7], QString("mode=40777 user=%1 group=%2 path=my type=dir time=").arg(owner).arg(group)); + QCOMPARE(listing[8], QString("mode=40777 user=%1 group=%2 path=my/dir type=dir time=").arg(owner).arg(group)); compareEntryWithTimestamp(listing[9], QString("mode=100644 user=dfaure group=hackers path=my/dir/test3 type=file size=28"), creationTime); compareEntryWithTimestamp(listing[10], QString("mode=100440 user=weis group=users path=test1 type=file size=5"), creationTime); compareEntryWithTimestamp(listing[11], QString("mode=100644 user=weis group=users path=test2 type=file size=8"), creationTime); @@ -626,9 +629,9 @@ QVERIFY(dir != 0); const QStringList listing = recursiveListEntries(dir, "", WithUserGroup); - QCOMPARE(listing[ 0], QString("mode=100644 user= group= path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000098 type=file size=3")); - QCOMPARE(listing[ 3], QString("mode=100644 user= group= path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000101 type=file size=3")); - QCOMPARE(listing[ 4], QString("mode=100644 user= group= path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000102 type=file size=3")); + QCOMPARE(listing[0], QString("mode=100644 user= group= path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000098 type=file size=3")); + QCOMPARE(listing[3], QString("mode=100644 user= group= path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000101 type=file size=3")); + QCOMPARE(listing[4], QString("mode=100644 user= group= path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000102 type=file size=3")); QCOMPARE(listing.count(), 416); @@ -650,8 +653,8 @@ QCOMPARE(listing.count(), 2); - QCOMPARE(listing[ 0], QString("mode=40775 user=root group=root path=Test type=dir")); - QCOMPARE(listing[ 1], QString("mode=664 user=root group=root path=Test/test.txt type=file size=0")); + QCOMPARE(listing[0], QString("mode=40775 user=root group=root path=Test type=dir")); + QCOMPARE(listing[1], QString("mode=664 user=root group=root path=Test/test.txt type=file size=0")); QVERIFY(tar.close()); } @@ -666,16 +669,16 @@ const QStringList listing = recursiveListEntries(dir, "", WithUserGroup); - QCOMPARE(listing[ 0], QString("mode=40775 user=root group=root path=Test type=dir")); - QCOMPARE(listing[ 1], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7 type=dir")); - QCOMPARE(listing[ 2], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples type=dir")); - QCOMPARE(listing[ 3], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator type=dir")); - QCOMPARE(listing[ 4], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original type=dir")); - QCOMPARE(listing[ 5], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java type=dir")); - QCOMPARE(listing[ 6], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com type=dir")); - QCOMPARE(listing[ 7], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com/trolltech type=dir")); - QCOMPARE(listing[ 8], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com/trolltech/examples type=dir")); - QCOMPARE(listing[ 9], QString("mode=664 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com/trolltech/examples/GeneratorExample.html type=file size=43086")); + QCOMPARE(listing[0], QString("mode=40775 user=root group=root path=Test type=dir")); + QCOMPARE(listing[1], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7 type=dir")); + QCOMPARE(listing[2], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples type=dir")); + QCOMPARE(listing[3], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator type=dir")); + QCOMPARE(listing[4], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original type=dir")); + QCOMPARE(listing[5], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java type=dir")); + QCOMPARE(listing[6], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com type=dir")); + QCOMPARE(listing[7], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com/trolltech type=dir")); + QCOMPARE(listing[8], QString("mode=40775 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com/trolltech/examples type=dir")); + QCOMPARE(listing[9], QString("mode=664 user=root group=root path=Test/qt-jambi-qtjambi-4_7/examples/generator/trolltech_original/java/com/trolltech/examples/GeneratorExample.html type=file size=43086")); QCOMPARE(listing.count(), 10); @@ -841,16 +844,16 @@ #else QCOMPARE(listing.count(), 15); #endif - QCOMPARE(listing[ 0], QString("mode=40755 path=aaaemptydir type=dir")); - QCOMPARE(listing[ 1], QString("mode=40777 path=dir type=dir")); - QCOMPARE(listing[ 2], QString("mode=40777 path=dir/subdir type=dir")); - QCOMPARE(listing[ 3], QString("mode=100644 path=dir/subdir/mediumfile2 type=file size=100")); - QCOMPARE(listing[ 4], QString("mode=100644 path=empty type=file size=0")); - QCOMPARE(listing[ 5], QString("mode=100644 path=hugefile type=file size=20000")); - QCOMPARE(listing[ 6], QString("mode=100644 path=mediumfile type=file size=100")); - QCOMPARE(listing[ 7], QString("mode=100644 path=mimetype type=file size=%1").arg(strlen(s_zipMimeType))); - QCOMPARE(listing[ 8], QString("mode=40777 path=my type=dir")); - QCOMPARE(listing[ 9], QString("mode=40777 path=my/dir type=dir")); + QCOMPARE(listing[0], QString("mode=40755 path=aaaemptydir type=dir")); + QCOMPARE(listing[1], QString("mode=40777 path=dir type=dir")); + QCOMPARE(listing[2], QString("mode=40777 path=dir/subdir type=dir")); + QCOMPARE(listing[3], QString("mode=100644 path=dir/subdir/mediumfile2 type=file size=100")); + QCOMPARE(listing[4], QString("mode=100644 path=empty type=file size=0")); + QCOMPARE(listing[5], QString("mode=100644 path=hugefile type=file size=20000")); + QCOMPARE(listing[6], QString("mode=100644 path=mediumfile type=file size=100")); + QCOMPARE(listing[7], QString("mode=100644 path=mimetype type=file size=%1").arg(strlen(s_zipMimeType))); + QCOMPARE(listing[8], QString("mode=40777 path=my type=dir")); + QCOMPARE(listing[9], QString("mode=40777 path=my/dir type=dir")); QCOMPARE(listing[10], QString("mode=100644 path=my/dir/test3 type=file size=28")); QCOMPARE(listing[11], QString("mode=100440 path=test1 type=file size=5")); QCOMPARE(listing[12], QString("mode=100644 path=test2 type=file size=8")); @@ -913,9 +916,9 @@ QVERIFY(dir != 0); const QStringList listing = recursiveListEntries(dir, "", 0); - QCOMPARE(listing[ 0], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000098 type=file size=3")); - QCOMPARE(listing[ 3], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000101 type=file size=3")); - QCOMPARE(listing[ 4], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000102 type=file size=3")); + QCOMPARE(listing[0], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000098 type=file size=3")); + QCOMPARE(listing[3], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000101 type=file size=3")); + QCOMPARE(listing[4], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000102 type=file size=3")); QCOMPARE(listing.count(), 514 - 98); @@ -944,7 +947,7 @@ QCOMPARE(listing.count(), 1); QCOMPARE(listing[0], QString::fromUtf8("mode=100644 path=%1 type=file size=%2").arg(recodedFileName).arg(fileData.size())); - const KArchiveFile *fileEntry = static_cast< const KArchiveFile * >(dir->entry(dir->entries()[0])); + const KArchiveFile *fileEntry = static_cast< const KArchiveFile *>(dir->entry(dir->entries()[0])); QCOMPARE(fileEntry->data(), fileData); } @@ -973,7 +976,7 @@ QCOMPARE(listing.count(), 1); QCOMPARE(listing[0], QString::fromUtf8("mode=100644 path=%1 type=file size=%2").arg(fileName).arg(fileData2.size())); - const KArchiveFile *fileEntry = static_cast< const KArchiveFile * >(dir->entry(dir->entries()[0])); + const KArchiveFile *fileEntry = static_cast< const KArchiveFile *>(dir->entry(dir->entries()[0])); QCOMPARE(fileEntry->data(), fileData2); } @@ -1053,9 +1056,9 @@ QCOMPARE(listing[0], QString::fromUtf8("mode=100644 path=compressed type=file size=%2").arg(fileData.size())); QCOMPARE(listing[1], QString::fromUtf8("mode=100644 path=uncompressed type=file size=%2").arg(fileData.size())); - const KArchiveFile *fileEntry = static_cast< const KArchiveFile * >(dir->entry(dir->entries()[0])); + const KArchiveFile *fileEntry = static_cast< const KArchiveFile *>(dir->entry(dir->entries()[0])); QCOMPARE(fileEntry->data(), fileData); - fileEntry = static_cast< const KArchiveFile * >(dir->entry(dir->entries()[1])); + fileEntry = static_cast< const KArchiveFile *>(dir->entry(dir->entries()[1])); QCOMPARE(fileEntry->data(), fileData); } @@ -1152,16 +1155,16 @@ #else QCOMPARE(listing.count(), 14); #endif - QCOMPARE(listing[ 0], QString("mode=40755 path=aaaemptydir type=dir")); - QCOMPARE(listing[ 1], QString("mode=40777 path=dir type=dir")); - QCOMPARE(listing[ 2], QString("mode=40777 path=dir/subdir type=dir")); - QCOMPARE(listing[ 3], QString("mode=100644 path=dir/subdir/mediumfile2 type=file size=100")); - QCOMPARE(listing[ 4], QString("mode=100644 path=empty type=file size=0")); - QCOMPARE(listing[ 5], QString("mode=100644 path=hugefile type=file size=20000")); - QCOMPARE(listing[ 6], QString("mode=100644 path=mediumfile type=file size=100")); - QCOMPARE(listing[ 7], QString("mode=40777 path=my type=dir")); - QCOMPARE(listing[ 8], QString("mode=40777 path=my/dir type=dir")); - QCOMPARE(listing[ 9], QString("mode=100644 path=my/dir/test3 type=file size=28")); + QCOMPARE(listing[0], QString("mode=40755 path=aaaemptydir type=dir")); + QCOMPARE(listing[1], QString("mode=40777 path=dir type=dir")); + QCOMPARE(listing[2], QString("mode=40777 path=dir/subdir type=dir")); + QCOMPARE(listing[3], QString("mode=100644 path=dir/subdir/mediumfile2 type=file size=100")); + QCOMPARE(listing[4], QString("mode=100644 path=empty type=file size=0")); + QCOMPARE(listing[5], QString("mode=100644 path=hugefile type=file size=20000")); + QCOMPARE(listing[6], QString("mode=100644 path=mediumfile type=file size=100")); + QCOMPARE(listing[7], QString("mode=40777 path=my type=dir")); + QCOMPARE(listing[8], QString("mode=40777 path=my/dir type=dir")); + QCOMPARE(listing[9], QString("mode=100644 path=my/dir/test3 type=file size=28")); QCOMPARE(listing[10], QString("mode=100440 path=test1 type=file size=5")); QCOMPARE(listing[11], QString("mode=100644 path=test2 type=file size=8")); QCOMPARE(listing[12], QString("mode=40777 path=z type=dir")); @@ -1271,9 +1274,9 @@ QVERIFY(dir != 0); const QStringList listing = recursiveListEntries(dir, "", 0); - QCOMPARE(listing[ 0], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000098 type=file size=3")); - QCOMPARE(listing[ 3], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000101 type=file size=3")); - QCOMPARE(listing[ 4], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000102 type=file size=3")); + QCOMPARE(listing[0], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000098 type=file size=3")); + QCOMPARE(listing[3], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000101 type=file size=3")); + QCOMPARE(listing[4], QString("mode=100644 path=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0000000102 type=file size=3")); QCOMPARE(listing.count(), 416); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.9.0/autotests/kfiltertest.cpp new/karchive-5.10.0/autotests/kfiltertest.cpp --- old/karchive-5.9.0/autotests/kfiltertest.cpp 2015-04-04 13:46:49.000000000 +0200 +++ new/karchive-5.10.0/autotests/kfiltertest.cpp 2015-05-01 17:10:29.000000000 +0200 @@ -330,10 +330,10 @@ mFilterDevice->setInBuffer(deflatedData.constData(), deflatedData.size()); char buf[8192]; - mFilterDevice->setOutBuffer(buf, sizeof(buf)); + mFilterDevice->setOutBuffer(buf, sizeof (buf)); KFilterBase::Result result = mFilterDevice->uncompress(); QCOMPARE(result, KFilterBase::End); - const int bytesOut = sizeof(buf) - mFilterDevice->outBufferAvailable(); + const int bytesOut = sizeof (buf) - mFilterDevice->outBufferAvailable(); QVERIFY(bytesOut); QByteArray read(buf, bytesOut); mFilterDevice->terminate(); @@ -395,8 +395,8 @@ KCompressionDevice device(&file, false, compressionType); QVERIFY(device.open(QIODevice::WriteOnly)); QTextStream stream(&device); - stream.setCodec (QTextCodec::codecForName("UTF-8")); - for( int i = 0 ; i < numLines ; ++i ) { + stream.setCodec(QTextCodec::codecForName("UTF-8")); + for (int i = 0 ; i < numLines ; ++i) { stream << lineTemplate.arg(i); stream << QString("\n"); } @@ -410,7 +410,7 @@ KCompressionDevice reader(outFile, compressionType); QVERIFY(reader.open(QIODevice::ReadOnly)); QString expectedFullData; - for( int i = 0 ; i < numLines ; ++i ) { + for (int i = 0 ; i < numLines ; ++i) { QCOMPARE(QString::fromUtf8(reader.readLine()), QString(lineTemplate.arg(i) + '\n')); expectedFullData += QString(lineTemplate.arg(i) + '\n'); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.9.0/autotests/klimitediodevicetest.h new/karchive-5.10.0/autotests/klimitediodevicetest.h --- old/karchive-5.9.0/autotests/klimitediodevicetest.h 2015-04-04 13:46:49.000000000 +0200 +++ new/karchive-5.10.0/autotests/klimitediodevicetest.h 2015-05-01 17:10:29.000000000 +0200 @@ -25,7 +25,8 @@ #include <QList> #include <QObject> -struct ChunkData { +struct ChunkData +{ QByteArray data; int offset; };
