summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Heidelbach <[email protected]>2018-02-25 13:45:45 +0100
committerMichael Heidelbach <[email protected]>2018-02-25 15:14:53 +0100
commit4b929f160bfb1f65f0019a73e0dde85090c7176d (patch)
tree7cdc597d9c55388bca0b8a28f22d08d4223ab9b6
parentef8e7ad27284c7664bab0bd6c70eaffdf7105e50 (diff)
Remove dataavailable signal
Summary: The dataavailable signal is not needed Reviewers: elvisangelaccio, #dolphin, #baloo Reviewed By: elvisangelaccio Tags: #baloo Differential Revision: https://phabricator.kde.org/D10833
-rw-r--r--src/filemetadataprovider.cpp2
-rw-r--r--src/filemetadataprovider.h5
-rw-r--r--src/filemetadatawidget.cpp9
-rw-r--r--src/filemetadatawidget.h1
4 files changed, 1 insertions, 16 deletions
diff --git a/src/filemetadataprovider.cpp b/src/filemetadataprovider.cpp
index 61cf906..c9113cf 100644
--- a/src/filemetadataprovider.cpp
+++ b/src/filemetadataprovider.cpp
@@ -319,7 +319,6 @@ void FileMetaDataProvider::setFileItem()
insertBasicData();
insertEditableData();
- emit dataAvailable();
IndexedDataRetriever *ret = new IndexedDataRetriever(filePath, this);
connect(ret, SIGNAL(finished(KJob*)), this, SLOT(slotLoadingFinished(KJob*)));
@@ -350,7 +349,6 @@ void FileMetaDataProvider::setFileItems()
if (!urls.isEmpty()) {
insertBasicData();
- emit dataAvailable();
FileFetchJob* job = new FileFetchJob(urls, this);
connect(job, SIGNAL(finished(KJob*)), this, SLOT(slotFileFetchFinished(KJob*)));
diff --git a/src/filemetadataprovider.h b/src/filemetadataprovider.h
index 4609093..6cd88e3 100644
--- a/src/filemetadataprovider.h
+++ b/src/filemetadataprovider.h
@@ -109,11 +109,6 @@ Q_SIGNALS:
* after data loading is finished.
*/
void loadingFinished();
- /**
- * Indicates data changes.
- * Can be emitted zero or more times
- */
- void dataAvailable();
private Q_SLOTS:
void slotLoadingFinished(KJob* job);
diff --git a/src/filemetadatawidget.cpp b/src/filemetadatawidget.cpp
index e16e45f..398f4ff 100644
--- a/src/filemetadatawidget.cpp
+++ b/src/filemetadatawidget.cpp
@@ -63,7 +63,6 @@ public:
void deleteRows();
void slotLoadingFinished();
- void slotDataAvailable();
void slotLinkActivated(const QString& link);
void slotDataChangeStarted();
void slotDataChangeFinished();
@@ -95,7 +94,6 @@ FileMetaDataWidget::Private::Private(FileMetaDataWidget* parent)
// TODO: If KFileMetaDataProvider might get a public class in future KDE releases,
// the following code should be moved into KFileMetaDataWidget::setModel():
m_provider = new FileMetaDataProvider(q);
- connect(m_provider, SIGNAL(dataAvailable()), q, SLOT(slotDataAvailable()));
connect(m_provider, SIGNAL(loadingFinished()), q, SLOT(slotLoadingFinished()));
}
@@ -115,12 +113,6 @@ void FileMetaDataWidget::Private::deleteRows()
void FileMetaDataWidget::Private::slotLoadingFinished()
{
- slotDataAvailable();
- emit q->metaDataRequestFinished(m_provider->items());
-}
-
-void FileMetaDataWidget::Private::slotDataAvailable()
-{
deleteRows();
if (m_gridLayout == 0) {
@@ -169,6 +161,7 @@ void FileMetaDataWidget::Private::slotDataAvailable()
}
q->updateGeometry();
+ emit q->metaDataRequestFinished(m_provider->items());
}
diff --git a/src/filemetadatawidget.h b/src/filemetadatawidget.h
index 1aa2293..b60efd0 100644
--- a/src/filemetadatawidget.h
+++ b/src/filemetadatawidget.h
@@ -80,7 +80,6 @@ private:
Private* d;
Q_PRIVATE_SLOT(d, void slotLoadingFinished())
- Q_PRIVATE_SLOT(d, void slotDataAvailable())
Q_PRIVATE_SLOT(d, void slotLinkActivated(QString))
Q_PRIVATE_SLOT(d, void slotDataChangeStarted())
Q_PRIVATE_SLOT(d, void slotDataChangeFinished())