From kde-commits Fri Mar 31 21:56:22 2017 From: Thomas Fischer Date: Fri, 31 Mar 2017 21:56:22 +0000 To: kde-commits Subject: [kbibtex] src: Prefer 'const QSharedPointer &' over raw pointer 'const Entry *' Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=149099740015499 Git commit 1eb5a767289751acf2aae885e93fa9e4d3829423 by Thomas Fischer. Committed on 31/03/2017 at 19:47. Pushed by thomasfischer into branch 'master'. Prefer 'const QSharedPointer &' over raw pointer 'const Entry = *' M +1 -1 src/gui/field/fieldlistedit.cpp M +1 -1 src/gui/file/sortfilterfilemodel.cpp M +1 -1 src/io/fileexporterpdf.cpp M +2 -2 src/io/fileinfo.cpp M +3 -2 src/io/fileinfo.h M +1 -1 src/parts/part.cpp M +1 -1 src/program/docklets/documentpreview.cpp https://commits.kde.org/kbibtex/1eb5a767289751acf2aae885e93fa9e4d3829423 diff --git a/src/gui/field/fieldlistedit.cpp b/src/gui/field/fieldlistedit.= cpp index 2b7b90c9..354df7c1 100644 --- a/src/gui/field/fieldlistedit.cpp +++ b/src/gui/field/fieldlistedit.cpp @@ -332,7 +332,7 @@ void FieldListEdit::dropEvent(QDropEvent *event) = if (file !=3D nullptr && !entry.isNull() && d->fieldKey =3D=3D QSt= ringLiteral("^external")) { /// handle "external" list differently - const QList urlList =3D FileInfo::entryUrls(entry.data()= , QUrl(file->property(File::Url).toUrl()), FileInfo::TestExistenceNo); + const QList urlList =3D FileInfo::entryUrls(entry, QUrl(= file->property(File::Url).toUrl()), FileInfo::TestExistenceNo); Value v; for (const QUrl &url : urlList) { v.append(QSharedPointer(new VerbatimText(url= .url(QUrl::PreferLocalFile)))); diff --git a/src/gui/file/sortfilterfilemodel.cpp b/src/gui/file/sortfilter= filemodel.cpp index fad845a4..f738357d 100644 --- a/src/gui/file/sortfilterfilemodel.cpp +++ b/src/gui/file/sortfilterfilemodel.cpp @@ -196,7 +196,7 @@ bool SortFilterFileModel::filterAcceptsRow(int source_r= ow, const QModelIndex &so = /// Test associated PDF files if (m_filterQuery.searchPDFfiles && m_filterQuery.field.isEmpty())= {///< not filtering for any specific field - const auto entryUrlList =3D FileInfo::entryUrls(entry.data(), = fileSourceModel()->bibliographyFile()->property(File::Url, QUrl()).toUrl(),= FileInfo::TestExistenceYes); + const auto entryUrlList =3D FileInfo::entryUrls(entry, fileSou= rceModel()->bibliographyFile()->property(File::Url, QUrl()).toUrl(), FileIn= fo::TestExistenceYes); for (const QUrl &url : entryUrlList) { if (url.isLocalFile() && url.fileName().endsWith(QStringLi= teral(".pdf"))) { // FIXME if you have a large collection of PDF files a= nd the text version diff --git a/src/io/fileexporterpdf.cpp b/src/io/fileexporterpdf.cpp index 340f2104..dafd556c 100644 --- a/src/io/fileexporterpdf.cpp +++ b/src/io/fileexporterpdf.cpp @@ -208,7 +208,7 @@ void FileExporterPDF::fillEmbeddedFileList(const QShare= dPointer e const QSharedPointer entry =3D element.dynamicCast(); if (!entry.isNull()) { const QString title =3D PlainTextValue::text(entry->value(Entry::f= tTitle)); - const QList urlList =3D FileInfo::entryUrls(entry.data(), bi= btexfile->property(File::Url).toUrl(), FileInfo::TestExistenceYes); + const QList urlList =3D FileInfo::entryUrls(entry, bibtexfil= e->property(File::Url).toUrl(), FileInfo::TestExistenceYes); for (const QUrl &url : urlList) { if (!url.isLocalFile()) continue; const QString filename =3D url.url(QUrl::PreferLocalFile); diff --git a/src/io/fileinfo.cpp b/src/io/fileinfo.cpp index 4a507ae9..41ded3ab 100644 --- a/src/io/fileinfo.cpp +++ b/src/io/fileinfo.cpp @@ -181,10 +181,10 @@ void FileInfo::urlsInText(const QString &text, TestEx= istence testExistence, cons } } = -QList FileInfo::entryUrls(const Entry *entry, const QUrl &bibTeXUrl,= TestExistence testExistence) +QList FileInfo::entryUrls(const QSharedPointer &entry, = const QUrl &bibTeXUrl, TestExistence testExistence) { QList result; - if (entry =3D=3D nullptr || entry->isEmpty()) + if (entry.isNull() || entry->isEmpty()) return result; = if (entry->contains(Entry::ftDOI)) { diff --git a/src/io/fileinfo.h b/src/io/fileinfo.h index 1e73cbb5..7128f2b7 100644 --- a/src/io/fileinfo.h +++ b/src/io/fileinfo.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -24,6 +24,7 @@ #include #include #include +#include = class Entry; = @@ -82,7 +83,7 @@ public: * @param testExistence shall be tested for file existence? * @return list of found URLs/filenames (duplicates are avoided) */ - static QList entryUrls(const Entry *entry, const QUrl &bibTeXUrl= , TestExistence testExistence); + static QList entryUrls(const QSharedPointer &entry,= const QUrl &bibTeXUrl, TestExistence testExistence); = /** * Load the given PDF file and return the contained plain text. diff --git a/src/parts/part.cpp b/src/parts/part.cpp index acb0f28d..1d311295 100644 --- a/src/parts/part.cpp +++ b/src/parts/part.cpp @@ -664,7 +664,7 @@ public: /// Test and continue if there was an Entry to retrieve if (!entry.isNull()) { /// Get list of URLs associated with this entry - const QList urlList =3D FileInfo::entryUrls(entry.data()= , partWidget->fileView()->fileModel()->bibliographyFile()->property(File::U= rl).toUrl(), FileInfo::TestExistenceYes); + const QList urlList =3D FileInfo::entryUrls(entry, partW= idget->fileView()->fileModel()->bibliographyFile()->property(File::Url).toU= rl(), FileInfo::TestExistenceYes); if (!urlList.isEmpty()) { /// Memorize first action, necessary to set menu title QAction *firstAction =3D nullptr; diff --git a/src/program/docklets/documentpreview.cpp b/src/program/docklet= s/documentpreview.cpp index 39c4d02a..9b28c2ac 100644 --- a/src/program/docklets/documentpreview.cpp +++ b/src/program/docklets/documentpreview.cpp @@ -321,7 +321,7 @@ public: = /// do not load external reference if widget is hidden if (isVisible()) { - const QList urlList =3D FileInfo::entryUrls(entry.data()= , baseUrl, FileInfo::TestExistenceYes); + const QList urlList =3D FileInfo::entryUrls(entry, baseU= rl, FileInfo::TestExistenceYes); for (const QUrl &url : urlList) { bool isLocal =3D KBibTeX::isLocalOrRelative(url); anyRemote |=3D !isLocal;