┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/panels/places/placesitemmodel.cpp1
-rw-r--r--src/panels/places/placesitemmodel.h1
-rw-r--r--src/tests/placesitemmodeltest.cpp10
3 files changed, 6 insertions, 6 deletions
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index f7fe5587c..e21c25a0e 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -68,6 +68,7 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
connect(m_sourceModel, &KFilePlacesModel::rowsInserted, this, &PlacesItemModel::onSourceModelRowsInserted);
connect(m_sourceModel, &KFilePlacesModel::rowsAboutToBeRemoved, this, &PlacesItemModel::onSourceModelRowsAboutToBeRemoved);
+ connect(m_sourceModel, &KFilePlacesModel::dataChanged, this, &PlacesItemModel::sourceModelDataChanged);
connect(m_sourceModel, &KFilePlacesModel::dataChanged, this, &PlacesItemModel::onSourceModelDataChanged);
connect(m_sourceModel, &KFilePlacesModel::rowsAboutToBeMoved, this, &PlacesItemModel::onSourceModelRowsAboutToBeMoved);
connect(m_sourceModel, &KFilePlacesModel::rowsMoved, this, &PlacesItemModel::onSourceModelRowsMoved);
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index c4ff7e2dd..33760f217 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -145,6 +145,7 @@ signals:
void storageSetupDone(int index, bool success);
void storageTearDownRequested(const QString& mountPath);
void storageTearDownExternallyRequested(const QString& mountPath);
+ void sourceModelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>());
protected:
void onItemInserted(int index) override;
diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index c05ce6882..73204954b 100644
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -43,11 +43,6 @@ Q_DECLARE_METATYPE(KItemRange)
#define KDE_ROOT_PATH "/"
#endif
-namespace
-{
- constexpr int TIMEOUT = 10000;
-}
-
static QString bookmarksFile()
{
return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel";
@@ -740,10 +735,13 @@ void PlacesItemModelTest::testRefresh()
QVERIFY(item->text() != sameItem->text());
// propagate change
+ QEventLoop eventLoop;
+ connect(m_model, &PlacesItemModel::sourceModelDataChanged, &eventLoop, &QEventLoop::quit);
m_model->refresh();
+ eventLoop.exec();
// item must be equal
- QTRY_COMPARE_WITH_TIMEOUT(item->text(), sameItem->text(), TIMEOUT);
+ QCOMPARE(item->text(), sameItem->text());
}
void PlacesItemModelTest::testIcons_data()