┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Reininghaus <[email protected]>2014-11-04 22:42:45 +0100
committerFrank Reininghaus <[email protected]>2014-11-04 22:42:45 +0100
commitcc299154f455cd580772439033adb2782814e515 (patch)
tree7ce61b30c1612ff96b9b5ddf026906ddf6743ca9
parent66a1b33e5ab3b23fd82e625391c9cca7553f8277 (diff)
Fix more unit test failures
This commit is analogous to 5cf8941ac789e47da70fe466033f45df9af1a3fa, but the problem existed since the frameworks port was started and was not obvious because the QString -> KUrl/QUrl port was done implicitly when calling KIO::rename(oldPath, newPath, KIO::HideProgressInfo). REVIEW: 120941
-rw-r--r--src/tests/kfileitemmodeltest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index 6a8c4f084..ec13a8b2a 100644
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -736,10 +736,10 @@ void KFileItemModelTest::testMakeExpandedItemHidden()
QCOMPARE(m_model->count(), 6);
// Rename "1a/2" and make it hidden.
- const QString oldPath = m_model->fileItem(0).url().path() + "/2a";
- const QString newPath = m_model->fileItem(0).url().path() + "/.2a";
+ const QUrl oldUrl = QUrl::fromLocalFile(m_model->fileItem(0).url().path() + "/2a");
+ const QUrl newUrl = QUrl::fromLocalFile(m_model->fileItem(0).url().path() + "/.2a");
- KIO::SimpleJob* job = KIO::rename(oldPath, newPath, KIO::HideProgressInfo);
+ KIO::SimpleJob* job = KIO::rename(oldUrl, newUrl, KIO::HideProgressInfo);
bool ok = job->exec();
QVERIFY(ok);
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));