Differential D6513 Diff 41815 src/core/entryinternal.cpp

Changeset View

Standalone View

View Options

src/core/entryinternal.cpp

Context not available.
79 QString mProviderId; 79​ QString mProviderId;
80 QStringList mUnInstalledFiles; 80​ QStringList mUnInstalledFiles;
81 QString mDonationLink; 81​ QString mDonationLink;
82​ QStringList mTags;
82 83​
83 QString mChecksum; 84​ QString mChecksum;
84 QString mSignature; 85​ QString mSignature;
Context not available.
156 d->mProviderId = id; 157​ d->mProviderId = id;
157} 158​}
158 159​
160​QStringList KNSCore::EntryInternal::tags() const
161​{
162​ return d->mTags;
163​}
164​
165​void KNSCore::EntryInternal::setTags(const QStringList &tags)
ahiemstraUnsubmitted
Done

Nitpick, but this doesn't match with the coding style of the declaration (const QStringList& tags vs const QStringList &tags)

ahiemstra: Nitpick, but this doesn't match with the coding style of the declaration (`const QStringList&…
166​{
167​ d->mTags = tags;
168​}
169​
159QString EntryInternal::category() const 170​QString EntryInternal::category() const
160{ 171​{
161 return d->mCategory; 172​ return d->mCategory;
Context not available.
481bool KNSCore::EntryInternal::setEntryXML(QXmlStreamReader& reader) 492​bool KNSCore::EntryInternal::setEntryXML(QXmlStreamReader& reader)
482{ 493​{
483 if (reader.name() != QLatin1String("stuff")) { 494​ if (reader.name() != QLatin1String("stuff")) {
484 qWarning() << "Parsing Entry from invalid XML"; 495​ qCWarning(KNEWSTUFFCORE) << "Parsing Entry from invalid XML. Reader tag name was expected to be \"stuff\", but was found as:" << reader.name();
mlaurentUnsubmitted
Done

qCWarning(KNEWSTUFF_CORE) ?

mlaurent: qCWarning(KNEWSTUFF_CORE) ?
leinirAuthorUnsubmitted
Done

I was just adding in a bit of verbosity to the output... but yes, makes sense to fix that while i'm there anyway :)

leinir: I was just adding in a bit of verbosity to the output... but yes, makes sense to fix that while…
485 return false; 496​ return false;
486 } 497​ }
487 498​
Context not available.
540 d->mInstalledFiles.append(reader.readElementText(QXmlStreamReader::SkipChildElements)); 551​ d->mInstalledFiles.append(reader.readElementText(QXmlStreamReader::SkipChildElements));
541 } else if (reader.name() == QLatin1String("id")) { 552​ } else if (reader.name() == QLatin1String("id")) {
542 d->mUniqueId = reader.readElementText(QXmlStreamReader::SkipChildElements); 553​ d->mUniqueId = reader.readElementText(QXmlStreamReader::SkipChildElements);
554​ } else if (reader.name() == QLatin1String("tags")) {
555​ d->mTags = reader.readElementText(QXmlStreamReader::SkipChildElements).split(QChar(','));
543 } else if (reader.name() == QLatin1String("status")) { 556​ } else if (reader.name() == QLatin1String("status")) {
544 const auto statusText = readText(&reader); 557​ const auto statusText = readText(&reader);
545 if (statusText == QLatin1String("installed")) { 558​ if (statusText == QLatin1String("installed")) {
Context not available.
551 if (reader.tokenType() == QXmlStreamReader::Characters) 564​ if (reader.tokenType() == QXmlStreamReader::Characters)
552 readNextSkipComments(&reader); 565​ readNextSkipComments(&reader);
553 } 566​ }
554 Q_ASSERT(reader.tokenType() == QXmlStreamReader::EndElement); 567​ Q_ASSERT_X(reader.tokenType() == QXmlStreamReader::EndElement, Q_FUNC_INFO, QString("token name was %1 and the type was %2").arg(reader.name().toString()).arg(reader.tokenString()).toLocal8Bit().data());
555 } 568​ }
556 569​
557 // Validation 570​ // Validation
Context not available.
633 d->mInstalledFiles.append(e.text()); 646​ d->mInstalledFiles.append(e.text());
634 } else if (e.tagName() == QLatin1String("id")) { 647​ } else if (e.tagName() == QLatin1String("id")) {
635 d->mUniqueId = e.text(); 648​ d->mUniqueId = e.text();
649​ } else if (e.tagName() == QLatin1String("tags")) {
650​ d->mTags = e.text().split(QChar(','));
636 } else if (e.tagName() == QLatin1String("status")) { 651​ } else if (e.tagName() == QLatin1String("status")) {
637 QString statusText = e.text(); 652​ QString statusText = e.text();
638 if (statusText == QLatin1String("installed")) { 653​ if (statusText == QLatin1String("installed")) {
Context not available.
724 e = addElement(doc, el, QStringLiteral("preview"), d->mPreviewUrl[PreviewSmall1]); 739​ e = addElement(doc, el, QStringLiteral("preview"), d->mPreviewUrl[PreviewSmall1]);
725 e = addElement(doc, el, QStringLiteral("previewBig"), d->mPreviewUrl[PreviewBig1]); 740​ e = addElement(doc, el, QStringLiteral("previewBig"), d->mPreviewUrl[PreviewBig1]);
726 e = addElement(doc, el, QStringLiteral("payload"), d->mPayload); 741​ e = addElement(doc, el, QStringLiteral("payload"), d->mPayload);
742​ e = addElement(doc, el, QStringLiteral("tags"), d->mTags.join(QChar(',')));
727 743​
728 if (d->mStatus == KNS3::Entry::Installed) { 744​ if (d->mStatus == KNS3::Entry::Installed) {
729 (void)addElement(doc, el, QStringLiteral("status"), QStringLiteral("installed")); 745​ (void)addElement(doc, el, QStringLiteral("status"), QStringLiteral("installed"));
Context not available.