diff --git a/src/filemetadataprovider.h b/src/filemetadataprovider.h --- a/src/filemetadataprovider.h +++ b/src/filemetadataprovider.h @@ -109,11 +109,6 @@ * 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/filemetadataprovider.cpp b/src/filemetadataprovider.cpp --- a/src/filemetadataprovider.cpp +++ b/src/filemetadataprovider.cpp @@ -319,7 +319,6 @@ insertBasicData(); insertEditableData(); - emit dataAvailable(); IndexedDataRetriever *ret = new IndexedDataRetriever(filePath, this); connect(ret, SIGNAL(finished(KJob*)), this, SLOT(slotLoadingFinished(KJob*))); @@ -350,7 +349,6 @@ 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/filemetadatawidget.h b/src/filemetadatawidget.h --- a/src/filemetadatawidget.h +++ b/src/filemetadatawidget.h @@ -80,7 +80,6 @@ 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()) diff --git a/src/filemetadatawidget.cpp b/src/filemetadatawidget.cpp --- a/src/filemetadatawidget.cpp +++ b/src/filemetadatawidget.cpp @@ -63,7 +63,6 @@ void deleteRows(); void slotLoadingFinished(); - void slotDataAvailable(); void slotLinkActivated(const QString& link); void slotDataChangeStarted(); void slotDataChangeFinished(); @@ -95,7 +94,6 @@ // 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())); } @@ -114,12 +112,6 @@ } void FileMetaDataWidget::Private::slotLoadingFinished() -{ - slotDataAvailable(); - emit q->metaDataRequestFinished(m_provider->items()); -} - -void FileMetaDataWidget::Private::slotDataAvailable() { deleteRows(); @@ -169,6 +161,7 @@ } q->updateGeometry(); + emit q->metaDataRequestFinished(m_provider->items()); }