diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ endif() if(UNIX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") endif() kde_enable_exceptions() diff --git a/tests/units/presentation/taskinboxpagemodeltest.cpp b/tests/units/presentation/taskinboxpagemodeltest.cpp --- a/tests/units/presentation/taskinboxpagemodeltest.cpp +++ b/tests/units/presentation/taskinboxpagemodeltest.cpp @@ -23,6 +23,10 @@ #include +#include + +#include + #include "utils/mockobject.h" #include "domain/taskqueries.h" @@ -131,7 +135,7 @@ QCOMPARE(childTask->isDone(), false); // WHEN - QMimeData *data = model->mimeData(QModelIndexList() << childTaskIndex); + auto data = std::unique_ptr(model->mimeData(QModelIndexList() << childTaskIndex)); // THEN QVERIFY(data->hasFormat(QStringLiteral("application/x-zanshin-object"))); @@ -141,10 +145,10 @@ // WHEN auto childTask2 = Domain::Task::Ptr::create(); taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask2).thenReturn(new FakeJob(this)); - data = new QMimeData; + data.reset(new QMimeData); data->setData(QStringLiteral("application/x-zanshin-object"), "object"); data->setProperty("objects", QVariant::fromValue(Domain::Artifact::List() << childTask2)); - model->dropMimeData(data, Qt::MoveAction, -1, -1, rootTaskIndex); + model->dropMimeData(data.get(), Qt::MoveAction, -1, -1, rootTaskIndex); // THEN QVERIFY(taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask2).exactly(1)); @@ -155,10 +159,10 @@ auto childTask4 = Domain::Task::Ptr::create(); taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask3).thenReturn(new FakeJob(this)); taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask4).thenReturn(new FakeJob(this)); - data = new QMimeData; + data.reset(new QMimeData); data->setData(QStringLiteral("application/x-zanshin-object"), "object"); data->setProperty("objects", QVariant::fromValue(Domain::Artifact::List() << childTask3 << childTask4)); - model->dropMimeData(data, Qt::MoveAction, -1, -1, rootTaskIndex); + model->dropMimeData(data.get(), Qt::MoveAction, -1, -1, rootTaskIndex); // THEN QVERIFY(taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask3).exactly(1)); @@ -462,10 +466,10 @@ job->setExpectedError(KJob::KilledJobError, QStringLiteral("Foo")); taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask3).thenReturn(job); taskRepositoryMock(&Domain::TaskRepository::associate).when(rootTask, childTask4).thenReturn(new FakeJob(this)); - auto data = new QMimeData; + auto data = std::make_unique(); data->setData(QStringLiteral("application/x-zanshin-object"), "object"); data->setProperty("objects", QVariant::fromValue(Domain::Artifact::List() << childTask3 << childTask4)); - model->dropMimeData(data, Qt::MoveAction, -1, -1, rootTaskIndex); + model->dropMimeData(data.get(), Qt::MoveAction, -1, -1, rootTaskIndex); // THEN QTest::qWait(150); @@ -519,10 +523,10 @@ taskRepositoryMock(&Domain::TaskRepository::dissociate).when(childTask).thenReturn(job); taskRepositoryMock(&Domain::TaskRepository::dissociate).when(childTask2).thenReturn(new FakeJob(this)); - auto data = new QMimeData; + auto data = std::make_unique(); data->setData(QStringLiteral("application/x-zanshin-object"), "object"); data->setProperty("objects", QVariant::fromValue(Domain::Artifact::List() << childTask << childTask2)); // both will be DnD on the empty part - model->dropMimeData(data, Qt::MoveAction, -1, -1, emptyPartModel); + model->dropMimeData(data.get(), Qt::MoveAction, -1, -1, emptyPartModel); // THEN QTest::qWait(150);