diff --git a/app/fileopscontextmanageritem.cpp b/app/fileopscontextmanageritem.cpp --- a/app/fileopscontextmanageritem.cpp +++ b/app/fileopscontextmanageritem.cpp @@ -409,7 +409,7 @@ } Q_ASSERT(service); - KRun::run(*service, list, mGroup); + KRun::runService(*service, list, mGroup); } } // namespace diff --git a/app/kipiinterface.cpp b/app/kipiinterface.cpp --- a/app/kipiinterface.cpp +++ b/app/kipiinterface.cpp @@ -78,7 +78,7 @@ KIPIImageInfo(KIPI::Interface* interface, const QUrl &url) : KIPI::ImageInfoShared(interface, url) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); mAttributes.insert("name", url.fileName()); mAttributes.insert("comment", comment()); diff --git a/app/mainwindow.h b/app/mainwindow.h --- a/app/mainwindow.h +++ b/app/mainwindow.h @@ -78,7 +78,7 @@ virtual void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; virtual void saveProperties(KConfigGroup&) Q_DECL_OVERRIDE; virtual void readProperties(const KConfigGroup&) Q_DECL_OVERRIDE; - bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; private Q_SLOTS: void setActiveViewModeAction(QAction* action); diff --git a/importer/importdialog.cpp b/importer/importdialog.cpp --- a/importer/importdialog.cpp +++ b/importer/importdialog.cpp @@ -146,7 +146,7 @@ if (!service) { qCritical() << "Could not find gwenview"; } else { - KRun::run(*service, {mThumbnailPage->destinationUrl()}, 0 /* window */); + KRun::runService(*service, {mThumbnailPage->destinationUrl()}, 0 /* window */); } } diff --git a/importer/importer.cpp b/importer/importer.cpp --- a/importer/importer.cpp +++ b/importer/importer.cpp @@ -51,7 +51,7 @@ { Importer* q; QWidget* mAuthWindow; - std::auto_ptr mFileNameFormater; + std::unique_ptr mFileNameFormater; QUrl mTempImportDirUrl; /* @defgroup reset Should be reset in start() @@ -112,7 +112,8 @@ QUrl dst = src.resolved(QUrl("..")); QString fileName; if (mFileNameFormater.get()) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, src, true /* delayedMimeTypes */); + KFileItem item(src); + item.setDelayedMimeTypes(true); // Get the document time, but do not cache the result because the // 'src' url is temporary: if we import "foo/image.jpg" and // "bar/image.jpg", both images will be temporarily saved in the diff --git a/tests/auto/importertest.h b/tests/auto/importertest.h --- a/tests/auto/importertest.h +++ b/tests/auto/importertest.h @@ -46,7 +46,7 @@ void testRenamedCount(); private: - std::auto_ptr mTempDir; + std::unique_ptr mTempDir; QList mDocumentList; }; diff --git a/tests/auto/thumbnailprovidertest.cpp b/tests/auto/thumbnailprovidertest.cpp --- a/tests/auto/thumbnailprovidertest.cpp +++ b/tests/auto/thumbnailprovidertest.cpp @@ -122,7 +122,7 @@ KFileItemList list; Q_FOREACH(const QFileInfo & info, dir.entryInfoList(QDir::Files)) { QUrl url("file://" + info.absoluteFilePath()); - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); list << item; } @@ -198,7 +198,7 @@ KFileItemList list; QUrl url("file://" + QDir(sandBox.mPath).absoluteFilePath("embedded-thumbnail.jpg")); - list << KFileItem(KFileItem::Unknown, KFileItem::Unknown, url); + list << KFileItem(url); // Loading a normal thumbnail should bring the white one { @@ -239,7 +239,7 @@ url.setPath(url.path() + '/' + "test.png"); KFileItemList list; - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); list << item; ThumbnailProvider provider; @@ -263,7 +263,7 @@ KFileItemList list; Q_FOREACH(const QFileInfo & info, dir.entryInfoList(QDir::Files)) { QUrl url("file://" + info.absoluteFilePath()); - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); list << item; } diff --git a/tests/auto/timeutilstest.cpp b/tests/auto/timeutilstest.cpp --- a/tests/auto/timeutilstest.cpp +++ b/tests/auto/timeutilstest.cpp @@ -52,7 +52,7 @@ NEW_ROW("date/exif-datetime-only.jpg", QDateTime::fromString("2003-03-25T02:02:21", Qt::ISODate)); QUrl url = urlForTestFile("test.png"); - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); NEW_ROW("test.png", item.time(KFileItem::ModificationTime)); } @@ -62,7 +62,7 @@ QFETCH(QDateTime, expectedDateTime); QDateTime dateTime; QUrl url = urlForTestFile(fileName); - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item(url); dateTime = TimeUtils::dateTimeForFileItem(item); QCOMPARE(dateTime, expectedDateTime); @@ -76,14 +76,14 @@ QTemporaryFile tempFile; QVERIFY(tempFile.open()); QUrl url = QUrl::fromLocalFile(tempFile.fileName()); - KFileItem item1(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item1(url); QDateTime dateTime1 = TimeUtils::dateTimeForFileItem(item1); QCOMPARE(dateTime1, item1.time(KFileItem::ModificationTime)); QTest::qWait(1200); touchFile(url.toLocalFile()); - KFileItem item2(KFileItem::Unknown, KFileItem::Unknown, url); + KFileItem item2(url); QDateTime dateTime2 = TimeUtils::dateTimeForFileItem(item2); QVERIFY(dateTime1 != dateTime2);