forked from qt-creator/qt-creator
Use QMetaObject::invokeMethod instead of signal-slot hack.
This commit is contained in:
@@ -71,8 +71,5 @@ void AllProjectsFilter::updateFiles()
|
|||||||
void AllProjectsFilter::refresh(QFutureInterface<void> &future)
|
void AllProjectsFilter::refresh(QFutureInterface<void> &future)
|
||||||
{
|
{
|
||||||
Q_UNUSED(future);
|
Q_UNUSED(future);
|
||||||
// invokeAsyncronouslyOnGuiThread
|
QMetaObject::invokeMethod(this, "markFilesAsOutOfDate", Qt::BlockingQueuedConnection);
|
||||||
connect(this, SIGNAL(invokeRefresh()), this, SLOT(markFilesAsOutOfDate()));
|
|
||||||
emit invokeRefresh();
|
|
||||||
disconnect(this, SIGNAL(invokeRefresh()), this, SLOT(markFilesAsOutOfDate()));
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,8 +58,6 @@ protected:
|
|||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void markFilesAsOutOfDate();
|
void markFilesAsOutOfDate();
|
||||||
signals:
|
|
||||||
void invokeRefresh();
|
|
||||||
private:
|
private:
|
||||||
ProjectExplorerPlugin *m_projectExplorer;
|
ProjectExplorerPlugin *m_projectExplorer;
|
||||||
bool m_filesUpToDate;
|
bool m_filesUpToDate;
|
||||||
|
|||||||
@@ -88,8 +88,5 @@ void CurrentProjectFilter::currentProjectChanged(ProjectExplorer::Project *proje
|
|||||||
void CurrentProjectFilter::refresh(QFutureInterface<void> &future)
|
void CurrentProjectFilter::refresh(QFutureInterface<void> &future)
|
||||||
{
|
{
|
||||||
Q_UNUSED(future);
|
Q_UNUSED(future);
|
||||||
// invokeAsyncronouslyOnGuiThread
|
QMetaObject::invokeMethod(this, "markFilesAsOutOfDate", Qt::BlockingQueuedConnection);
|
||||||
connect(this, SIGNAL(invokeRefresh()), this, SLOT(markFilesAsOutOfDate()));
|
|
||||||
emit invokeRefresh();
|
|
||||||
disconnect(this, SIGNAL(invokeRefresh()), this, SLOT(markFilesAsOutOfDate()));
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,9 +63,6 @@ private slots:
|
|||||||
void currentProjectChanged(ProjectExplorer::Project *project);
|
void currentProjectChanged(ProjectExplorer::Project *project);
|
||||||
void markFilesAsOutOfDate();
|
void markFilesAsOutOfDate();
|
||||||
|
|
||||||
signals:
|
|
||||||
void invokeRefresh();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
ProjectExplorerPlugin *m_projectExplorer;
|
ProjectExplorerPlugin *m_projectExplorer;
|
||||||
|
|||||||
@@ -83,10 +83,7 @@ void OpenDocumentsFilter::refreshInternally()
|
|||||||
void OpenDocumentsFilter::refresh(QFutureInterface<void> &future)
|
void OpenDocumentsFilter::refresh(QFutureInterface<void> &future)
|
||||||
{
|
{
|
||||||
Q_UNUSED(future);
|
Q_UNUSED(future);
|
||||||
// invokeAsyncronouslyOnGuiThread
|
QMetaObject::invokeMethod(this, "refreshInternally", Qt::BlockingQueuedConnection);
|
||||||
connect(this, SIGNAL(invokeRefresh()), this, SLOT(refreshInternally()));
|
|
||||||
emit invokeRefresh();
|
|
||||||
disconnect(this, SIGNAL(invokeRefresh()), this, SLOT(refreshInternally()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenDocumentsFilter::accept(FilterEntry selection) const
|
void OpenDocumentsFilter::accept(FilterEntry selection) const
|
||||||
|
|||||||
@@ -59,8 +59,7 @@ public:
|
|||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void refreshInternally();
|
void refreshInternally();
|
||||||
signals:
|
|
||||||
void invokeRefresh();
|
|
||||||
private:
|
private:
|
||||||
Core::EditorManager *m_editorManager;
|
Core::EditorManager *m_editorManager;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user