diff --git a/autotests/epubextractortest.cpp b/autotests/epubextractortest.cpp --- a/autotests/epubextractortest.cpp +++ b/autotests/epubextractortest.cpp @@ -36,10 +36,10 @@ void EPubExtractorTest::test() { - QScopedPointer plugin(new EPubExtractor(this)); + EPubExtractor plugin{this}; SimpleExtractionResult result(testFilePath("test.epub"), "application/epub+zip"); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().constFirst(), Type::Document); @@ -61,10 +61,10 @@ void EPubExtractorTest::testMetaDataOnly() { - QScopedPointer plugin(new EPubExtractor(this)); + EPubExtractor plugin{this}; SimpleExtractionResult result(testFilePath("test.epub"), "application/epub+zip", ExtractionResult::ExtractMetaData); - plugin->extract(&result); + plugin.extract(&result); QVERIFY(!result.types().isEmpty()); QVERIFY(!result.properties().isEmpty()); diff --git a/autotests/exiv2extractortest.cpp b/autotests/exiv2extractortest.cpp --- a/autotests/exiv2extractortest.cpp +++ b/autotests/exiv2extractortest.cpp @@ -36,10 +36,10 @@ void Exiv2ExtractorTest::test() { - QScopedPointer plugin(new Exiv2Extractor(this)); + Exiv2Extractor plugin{this}; SimpleExtractionResult result(testFilePath("test.jpg"), "image/jpeg"); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().constFirst(), Type::Image); diff --git a/autotests/externalextractortest.cpp b/autotests/externalextractortest.cpp --- a/autotests/externalextractortest.cpp +++ b/autotests/externalextractortest.cpp @@ -42,12 +42,10 @@ file.open(); file.write("Hello"); file.close(); - QScopedPointer plugin(new ExternalExtractor( - testFilePath("testexternalextractor") - )); + ExternalExtractor plugin{testFilePath("testexternalextractor")}; SimpleExtractionResult result(file.fileName(), "application/text"); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.text(), QStringLiteral("Hello ")); } diff --git a/autotests/externalwritertest.cpp b/autotests/externalwritertest.cpp --- a/autotests/externalwritertest.cpp +++ b/autotests/externalwritertest.cpp @@ -39,13 +39,10 @@ void ExternalWriterTest::test() { QTemporaryFile file; - QScopedPointer plugin( - new ExternalWriter(testFilePath("testexternalwriter") - )); - + ExternalWriter plugin{testFilePath("testexternalwriter")}; file.open(); WriteData data(file.fileName(), "application/text"); - plugin->write(data); + plugin.write(data); QCOMPARE(QString(file.readAll()), QStringLiteral("{}")); } diff --git a/autotests/indexerextractortests.cpp b/autotests/indexerextractortests.cpp --- a/autotests/indexerextractortests.cpp +++ b/autotests/indexerextractortests.cpp @@ -64,10 +64,10 @@ void IndexerExtractorTests::testPlainTextExtractor() { - QScopedPointer plugin(new PlainTextExtractor(this)); + PlainTextExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("plain_text_file.txt")), QStringLiteral("text/plain")); - plugin->extract(&result); + plugin.extract(&result); QString content; QTextStream(&content) << "This is a text file\n" @@ -87,10 +87,10 @@ void IndexerExtractorTests::testPlainTextExtractorNoPlainText() { - QScopedPointer plugin(new PlainTextExtractor(this)); + PlainTextExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("plain_text_file.txt")), QStringLiteral("text/plain"), ExtractionResult::ExtractMetaData); - plugin->extract(&result); + plugin.extract(&result); QString content; QTextStream(&content) << "This is a text file\n" diff --git a/autotests/mobiextractortest.cpp b/autotests/mobiextractortest.cpp --- a/autotests/mobiextractortest.cpp +++ b/autotests/mobiextractortest.cpp @@ -36,10 +36,10 @@ void MobiExtractorTest::test() { - QScopedPointer plugin(new EPubExtractor(this, QVariantList())); + EPubExtractor plugin{this}; SimpleExtractionResult result(testFilePath("test.mobi"), "application/epub+zip"); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().first(), Type::Document); diff --git a/autotests/odfextractortest.cpp b/autotests/odfextractortest.cpp --- a/autotests/odfextractortest.cpp +++ b/autotests/odfextractortest.cpp @@ -38,10 +38,10 @@ void OdfExtractorTest::testText() { - QScopedPointer plugin(new OdfExtractor()); + OdfExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test.odt")), QStringLiteral("application/vnd.oasis.opendocument.text")); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().at(0), Type::Document); @@ -63,22 +63,22 @@ void OdfExtractorTest::testTextMetaDataOnly() { - QScopedPointer plugin(new OdfExtractor()); + OdfExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test.odt")), QStringLiteral("application/vnd.oasis.opendocument.text"), ExtractionResult::ExtractMetaData); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.properties().size(), 8); QVERIFY(result.text().isEmpty()); } void OdfExtractorTest::testPresentation() { - QScopedPointer plugin(new OdfExtractor()); + OdfExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test.odp")), QStringLiteral("application/vnd.oasis.opendocument.presentation")); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 2); QCOMPARE(result.types().at(0), Type::Document); @@ -93,18 +93,18 @@ void OdfExtractorTest::testTextMissingMetaNoCrash() { - QScopedPointer plugin(new OdfExtractor()); + OdfExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test_missing_meta.odt")), QStringLiteral("application/vnd.oasis.opendocument.text")); - plugin->extract(&result); + plugin.extract(&result); } void OdfExtractorTest::testTextMissingContentNoCrash() { - QScopedPointer plugin(new OdfExtractor()); + OdfExtractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test_missing_content.odt")), QStringLiteral("application/vnd.oasis.opendocument.text")); - plugin->extract(&result); + plugin.extract(&result); } QTEST_GUILESS_MAIN(OdfExtractorTest) diff --git a/autotests/office2007extractortest.cpp b/autotests/office2007extractortest.cpp --- a/autotests/office2007extractortest.cpp +++ b/autotests/office2007extractortest.cpp @@ -36,10 +36,10 @@ void Office2007ExtractorTest::test() { - QScopedPointer plugin(new Office2007Extractor(this)); + Office2007Extractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test_libreoffice.docx")), QStringLiteral("application/vnd.openxmlformats-officedocument.wordprocessingml.document")); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().at(0), Type::Document); @@ -61,13 +61,13 @@ void Office2007ExtractorTest::testMetaDataOnly() { - QScopedPointer plugin(new Office2007Extractor(this)); + Office2007Extractor plugin{this}; SimpleExtractionResult result(testFilePath(QStringLiteral("test_libreoffice.docx")), QStringLiteral("application/vnd.openxmlformats-officedocument.wordprocessingml.document"), ExtractionResult::ExtractMetaData); - plugin->extract(&result); + plugin.extract(&result); QVERIFY(!result.types().isEmpty()); QVERIFY(!result.properties().isEmpty()); diff --git a/autotests/popplerextractortest.cpp b/autotests/popplerextractortest.cpp --- a/autotests/popplerextractortest.cpp +++ b/autotests/popplerextractortest.cpp @@ -36,10 +36,10 @@ void PopplerExtractorTest::test() { - QScopedPointer plugin(new PopplerExtractor(this)); + PopplerExtractor plugin{this}; SimpleExtractionResult result(testFilePath("test.pdf"), "application/pdf"); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QCOMPARE(result.types().constFirst(), Type::Document); @@ -59,10 +59,10 @@ void PopplerExtractorTest::testMetaDataOnly() { - QScopedPointer plugin(new PopplerExtractor(this)); + PopplerExtractor plugin{this}; SimpleExtractionResult result(testFilePath("test.pdf"), "application/pdf", ExtractionResult::ExtractMetaData); - plugin->extract(&result); + plugin.extract(&result); QCOMPARE(result.types().size(), 1); QVERIFY(result.text().isEmpty()); diff --git a/autotests/taglibextractortest.cpp b/autotests/taglibextractortest.cpp --- a/autotests/taglibextractortest.cpp +++ b/autotests/taglibextractortest.cpp @@ -50,10 +50,10 @@ void TagLibExtractorTest::test() { - QScopedPointer plugin(new TagLibExtractor(this)); + TagLibExtractor plugin{this}; SimpleExtractionResult resultOpus(testFilePath("test.opus"), "audio/opus"); - plugin->extract(&resultOpus); + plugin.extract(&resultOpus); QCOMPARE(resultOpus.types().size(), 1); QCOMPARE(resultOpus.types().constFirst(), Type::Audio); @@ -85,7 +85,7 @@ QCOMPARE(resultOpus.properties().value(Property::DiscNumber).toInt(), 1); SimpleExtractionResult resultFlac(testFilePath("test.flac"), "audio/flac"); - plugin->extract(&resultFlac); + plugin.extract(&resultFlac); QCOMPARE(resultFlac.types().size(), 1); QCOMPARE(resultFlac.types().constFirst(), Type::Audio); @@ -117,7 +117,7 @@ QCOMPARE(resultFlac.properties().value(Property::DiscNumber).toInt(), 1); SimpleExtractionResult resultOgg(testFilePath("test.ogg"), "audio/ogg"); - plugin->extract(&resultOgg); + plugin.extract(&resultOgg); QCOMPARE(resultOgg.types().size(), 1); QCOMPARE(resultOgg.types().constFirst(), Type::Audio); @@ -149,7 +149,7 @@ QCOMPARE(resultOgg.properties().value(Property::DiscNumber).toInt(), 1); SimpleExtractionResult resultMp3(testFilePath("test.mp3"), "audio/mpeg"); - plugin->extract(&resultMp3); + plugin.extract(&resultMp3); QCOMPARE(resultMp3.types().size(), 1); QCOMPARE(resultMp3.types().constFirst(), Type::Audio); @@ -172,7 +172,7 @@ QCOMPARE(resultMp3.properties().value(Property::DiscNumber).toInt(), 1); SimpleExtractionResult resultMpc(testFilePath("test.mpc"), "audio/x-musepack"); - plugin->extract(&resultMpc); + plugin.extract(&resultMpc); QCOMPARE(resultMpc.types().size(), 1); QCOMPARE(resultMpc.types().constFirst(), Type::Audio); @@ -202,7 +202,7 @@ QCOMPARE(resultMpc.properties().value(Property::DiscNumber).isValid(), false); SimpleExtractionResult resultMp4(testFilePath("test.m4a"), "audio/mp4"); - plugin->extract(&resultMp4); + plugin.extract(&resultMp4); QCOMPARE(resultMp4.types().size(), 1); QCOMPARE(resultMp4.types().constFirst(), Type::Audio); diff --git a/autotests/taglibwritertest.cpp b/autotests/taglibwritertest.cpp --- a/autotests/taglibwritertest.cpp +++ b/autotests/taglibwritertest.cpp @@ -34,12 +34,12 @@ void TagLibWriterTest::test() { - QScopedPointer writerPlugin(new TagLibWriter(this)); + TagLibWriter writerPlugin{this}; WriteData data(testFilePath(TEST_FILENAME), "audio/opus"); data.add(Property::Title, "Title1"); data.add(Property::Artist, "Artist1"); - writerPlugin->write(data); + writerPlugin.write(data); TagLib::FileRef file(testFilePath(TEST_FILENAME).toUtf8().constData(), true); TagLib::Tag* tags = file.tag();