diff --git a/autotests/epubextractortest.cpp b/autotests/epubextractortest.cpp --- a/autotests/epubextractortest.cpp +++ b/autotests/epubextractortest.cpp @@ -51,7 +51,7 @@ QCOMPARE(result.properties().value(Property::Publisher), QVariant(QStringLiteral("Happy Publisher"))); QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("The Big Brown Bear"))); QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("Baloo KFileMetaData"))); - QCOMPARE(result.properties().value(Property::Comment), QVariant(QStringLiteral("Honey"))); + QCOMPARE(result.properties().value(Property::Description), QVariant(QStringLiteral("Honey"))); QDateTime dt(QDate(2014, 1, 1), QTime(1, 1, 1)); dt.setTimeSpec(Qt::UTC); diff --git a/autotests/odfextractortest.cpp b/autotests/odfextractortest.cpp --- a/autotests/odfextractortest.cpp +++ b/autotests/odfextractortest.cpp @@ -49,7 +49,7 @@ QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("KFileMetaData Title"))); QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("KFileMetaData Subject"))); QCOMPARE(result.properties().value(Property::Keywords), QVariant(QStringLiteral("KFileMetaData keyword"))); - QCOMPARE(result.properties().value(Property::Comment), QVariant(QStringLiteral("KFileMetaData comment"))); + QCOMPARE(result.properties().value(Property::Description), QVariant(QStringLiteral("KFileMetaData description"))); QVERIFY(result.properties().value(Property::Generator).toString().contains(QStringLiteral("LibreOffice"))); QDateTime dt(QDate(2014, 07, 01), QTime(17, 37, 40, 690)); diff --git a/autotests/office2007extractortest.cpp b/autotests/office2007extractortest.cpp --- a/autotests/office2007extractortest.cpp +++ b/autotests/office2007extractortest.cpp @@ -47,7 +47,7 @@ QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("KFileMetaData Title"))); QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("KFileMetaData Subject"))); QCOMPARE(result.properties().value(Property::Keywords), QVariant(QStringLiteral("KFileMetaData keyword"))); - QCOMPARE(result.properties().value(Property::Comment), QVariant(QStringLiteral("KFileMetaData comment"))); + QCOMPARE(result.properties().value(Property::Description), QVariant(QStringLiteral("KFileMetaData comment"))); QCOMPARE(result.properties().value(Property::Language), QVariant(QStringLiteral("en-US"))); QVERIFY(result.properties().value(Property::Generator).toString().contains(QStringLiteral("LibreOffice"))); diff --git a/autotests/samplefiles/test.odt b/autotests/samplefiles/test.odt index c51da6699cd51f402a0bec2eb563cf24c2fd16d2..41a2129a53bf38500b9973a8a5274d62e2840fce GIT binary patch literal 8646 zc%0RFbzGEP*X~f#B_Wd1NOyO)fP~WF&@sSJQqtWijdTkPodVL`p|r>#-6eeRp6@-6 zJfDx}{r)_Ae*1Ud_sqVox%b*@?O2zJ0vtRp0DuGle2Lao((h(RqXhr}_x0{8fQ^L> z5bOp58i7F87A8hu3p-mDXWKW-c1DgCj?8u-pzRww6DJ#>EtnY$bOozCAUg_5Cr^e2 z0PZWn9hthhlZ~;hk%hG*3;5r+%phB{5EW$^bQD6AyC&#zvXW|d*KPm+27m;2cemts z;c$0ZS5Z`#vIBdDM@0pO$412`X2gXh#K*@brX;4MB`3tBC xr3FTRNKG$D$t=vw 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 R`v%x|AJ834l;r;DzW`GYHzfc7 literal 9400 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 literal 3889 zc$|$_2T)V%)=elONKgnxq&Jl!p-59fse&RHdPk}Pk`Q{A9w{mW5`t1hdZhO*AXSt= z0O3+aK)iUVSDHw9!8h;y$n*ETbLKlUXU?qe%wBu%wbuvNqNHL5fWcsZwfT%1;K)Ts zUU%FbTs*{KhtHw}Z7oV=2zq6YMRj@7MKr3LxXG{L%D+Jq@pN&ypGb4jspw!z`9wWD zCZns-@9Qe(0D`!mp_3XLtK9a|N!d+;R4?J|JFY0sV?8KdZ+ta==;l)kk(W~unKsZH zaZw$&775alZuu#EcW>);DcJH?t^fdSBicfmW{+@6ybU1?Q_rBEnq6Y$kS}nfEv*nL;AIx zIFBL))%8-h2A=9*{3hLDjNb2`6y=a3=m-2RM$Ui5_|MeayV`jn9FU%ek^Zv`Fxn?x zOE5%krSrd=$~9!b2J7zi*$%WR$zEXy+<|lRo zufnc<&kID*Esb-XPL^Wc4|uFuH?Wh^m(XziW~#_Z`k;XF z;wz*!r6_aTgZ*mF`%?ejF7{JV@fCX`?l?WD2NFF{x~=a355PyKsV# zdkNL~WW+gnPCrXd*Jor0(Aq+psmp1|G{AidaLrd2&3Fe>=B~iONZEzXB zA-JT8VRnpRvsjp^B#lMqWP#SOog)WB3tGPrpe>CR4rJQiy_Hu+uGfUIud1|%x z%Of&U*><-=EQZ;7hQF?(vPLRpQhgnXOn8GH^V#Ui^EtoHH`ukIZF2;W z;teFCFg+*<NJJ5P3EeXOh=2Lb&y$ViY~ygQmDYlnEZK~ zI>RlFw9E-7J8dg^Gq)SgI62x+W=KARwdA*d$U327b!6J*cSwRwSedcn_CojlU05^@ zo=fb^+pFu<-|;Wr+5+!e$h|9BE2>vY-o@sztIqg;e*bPS*!azShJ#U*|4bC3m3Yl+ zSWd%-E1$}D`t0&EqTf6{#D{iKY`o(%&*x=Yjd~tN@AI8y<>}x}sXf*4o8e84 zVOoJb)JB$ud{+ly0a**7nIn13O_ljHI@P*x+Vq#7)UNI3DWEfo0#extL)&#dMqBU0 z_1zNgd2G$?mCW zT_N!Qq}WGw?6JNwa#jM;xFQOfWI8*F)MfMXr}a0j1oy84W39-q z3UyfS+{btE*!Aso8*Oh8k956CAzl;{Dq1#BEZqM6qu&~Dxl)f|Pe!5ovm!t1Uq zYr}Hx8H)+{i9(~TfpFdS4YZMujlq?Jx!~%%@BVUiTOt{!bwO38l}#>go8?RjR#;8; zqlTWcO^Ok5#(SsVu0$?^;4Xf<8ig=P?~%T#J8c}65c{A9M!5_ny2Iczj66(poJ_3; z4>v9$PB91-$cVZ*jDEOh)dV1<@mD>Hmd-wKJcb<DA$ito@WE(xhRAfR$0sK5i+TbB5u6zC5=8d= zP3v-h#nCpnGs5&$nBMJ*n69!dO*@_{DLxtHi2#zHHZtST+bP%Wj=)S-BD+`lpA=Nye;m$8lGtJLw+>I zVwYyf(K`bFTiO4cA3Im~A43b5py*1T+~}?SnC^fXDn~*g1DZdHl>p5!nzZ-~hLzck zqFb6v5WLjw103ZkHbo zx?t#U1Z#p8jGwrEY2p=bmFUHJ6^K~nHKL!UOtfpmY#*;ytU4HD?+k)YBC@nR^xaQ< z-iEF<4;dJl*Q8R|H>T3Ofelrioro;lzP7_|Kj-F48ZqTH87iIK2gF*H4k|WrRqX8p z@48O(#gV3$Z~2b7o43(7td=QpSA2~7YgX*RkE*8rc4OX$oH6iktD1?t%vH%ggRE0` z4E#_I9+p4mCAODrHW(sSf?~RjvGOP-@Yy9`w7@z8vHOpdcK&_L2zGPHv_@Jbgk6~q zubFgjKBcP2AhzmEISbVgad@#&$P{FBIR{}}@o-+Y**5lDp|dQvgg{Zpvkl3e`$XMM zYbsV^cuv|dwE(}EYFATyUnb=P-6XulWscTPgPb;>M8b8oxn=VW@?k~!(9Z=ktfN{mZ`|cv}OI~XXnO6fr0_OFrvG+=YectThkt12j{7u@ak0m;nj|VkIM7UEVP4uF=>y(kE$2LPw*7*e=7QM s^wBQ*`R5I^ztFqm@S|nH^b_2T?w5@R*P;d;ex@bg3S`DUKn~yj0W9A`*8l(j diff --git a/src/extractors/dublincoreextractor.cpp b/src/extractors/dublincoreextractor.cpp --- a/src/extractors/dublincoreextractor.cpp +++ b/src/extractors/dublincoreextractor.cpp @@ -45,7 +45,7 @@ // used in the legacy DCES or DCMI-TERMS variant if (namespaceURI == dcNS() || namespaceURI == dctermsNS()) { if (localName == QLatin1String("description")) { - result->add(Property::Comment, e.text()); + result->add(Property::Description, e.text()); } else if (localName == QLatin1String("subject")) { result->add(Property::Subject, e.text()); } else if (localName == QLatin1String("title")) { diff --git a/src/extractors/epubextractor.cpp b/src/extractors/epubextractor.cpp --- a/src/extractors/epubextractor.cpp +++ b/src/extractors/epubextractor.cpp @@ -123,7 +123,7 @@ value = fetchMetadata(ePubDoc, EPUB_DESCRIPTION); if (!value.isEmpty()) { - result->add(Property::Comment, value); + result->add(Property::Description, value); } value = fetchMetadata(ePubDoc, EPUB_DATE); diff --git a/src/extractors/odfextractor.cpp b/src/extractors/odfextractor.cpp --- a/src/extractors/odfextractor.cpp +++ b/src/extractors/odfextractor.cpp @@ -105,7 +105,7 @@ // Dublin Core if (namespaceURI == dcNS()) { if (localName == QLatin1String("description")) { - result->add(Property::Comment, e.text()); + result->add(Property::Description, e.text()); } else if (localName == QLatin1String("subject")) { result->add(Property::Subject, e.text()); } else if (localName == QLatin1String("title")) { diff --git a/src/extractors/office2007extractor.cpp b/src/extractors/office2007extractor.cpp --- a/src/extractors/office2007extractor.cpp +++ b/src/extractors/office2007extractor.cpp @@ -85,7 +85,7 @@ if (!elem.isNull()) { QString str = elem.text(); if (!str.isEmpty()) { - result->add(Property::Comment, str); + result->add(Property::Description, str); } }