diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-03-14 16:30:27 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-05-02 13:56:19 +0000 |
| commit | 63bee398b5db72fdb40d039d8e01223992655403 (patch) | |
| tree | d353a259514f35c95a793fb68e41f3c84268fca2 /src/assistant/help/qhelpsearchengine.cpp | |
| parent | 07ebe565913f8cdc531c862fed62d0398c83ecc4 (diff) | |
Refactor connect to use Qt5 style
Change-Id: I9fed1b82d5afd0458b772475d303d2c0179ac73e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/assistant/help/qhelpsearchengine.cpp')
| -rw-r--r-- | src/assistant/help/qhelpsearchengine.cpp | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/assistant/help/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp index 5f9edb265..a62d4e977 100644 --- a/src/assistant/help/qhelpsearchengine.cpp +++ b/src/assistant/help/qhelpsearchengine.cpp @@ -201,8 +201,10 @@ private: if (!indexWriter) { indexWriter = new QHelpSearchIndexWriter(); - connect(indexWriter, SIGNAL(indexingStarted()), this, SIGNAL(indexingStarted())); - connect(indexWriter, SIGNAL(indexingFinished()), this, SIGNAL(indexingFinished())); + connect(indexWriter, &QHelpSearchIndexWriter::indexingStarted, + this, &QHelpSearchEnginePrivate::indexingStarted); + connect(indexWriter, &QHelpSearchIndexWriter::indexingFinished, + this, &QHelpSearchEnginePrivate::indexingFinished); } indexWriter->cancelIndexing(); @@ -226,8 +228,10 @@ private: if (!indexReader) { indexReader = new QHelpSearchIndexReaderDefault(); - connect(indexReader, SIGNAL(searchingStarted()), this, SIGNAL(searchingStarted())); - connect(indexReader, SIGNAL(searchingFinished(int)), this, SIGNAL(searchingFinished(int))); + connect(indexReader, &fulltextsearch::QHelpSearchIndexReader::searchingStarted, + this, &QHelpSearchEnginePrivate::searchingStarted); + connect(indexReader, &fulltextsearch::QHelpSearchIndexReader::searchingFinished, + this, &QHelpSearchEnginePrivate::searchingFinished); } m_searchInput = searchInput; @@ -389,12 +393,17 @@ QHelpSearchEngine::QHelpSearchEngine(QHelpEngineCore *helpEngine, QObject *paren { d = new QHelpSearchEnginePrivate(helpEngine); - connect(helpEngine, SIGNAL(setupFinished()), this, SLOT(scheduleIndexDocumentation())); - - connect(d, SIGNAL(indexingStarted()), this, SIGNAL(indexingStarted())); - connect(d, SIGNAL(indexingFinished()), this, SIGNAL(indexingFinished())); - connect(d, SIGNAL(searchingStarted()), this, SIGNAL(searchingStarted())); - connect(d, SIGNAL(searchingFinished(int)), this, SIGNAL(searchingFinished(int))); + connect(helpEngine, &QHelpEngineCore::setupFinished, + this, &QHelpSearchEngine::scheduleIndexDocumentation); + + connect(d, &QHelpSearchEnginePrivate::indexingStarted, + this, &QHelpSearchEngine::indexingStarted); + connect(d, &QHelpSearchEnginePrivate::indexingFinished, + this, &QHelpSearchEngine::indexingFinished); + connect(d, &QHelpSearchEnginePrivate::searchingStarted, + this, &QHelpSearchEngine::searchingStarted); + connect(d, &QHelpSearchEnginePrivate::searchingFinished, + this, &QHelpSearchEngine::searchingFinished); } /*! |