aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-11-17 09:09:05 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-11-17 11:30:23 +0000
commit3998e30684bb8f7e81c7f51be38aa77fd351ff3d (patch)
tree3f0943be490d42564798fcdbdc8246048d36505d /src
parenta05a0a61d0760fb35730737618989c513dc7926d (diff)
Fix a warning about const signal
Fix a [clazy-const-signal-or-slot] warning. Instead of defining a signal for internal usage, use directly QMetaObject::invokeMethod(). Don't declare scanDirectoryForQuickTestQmlFiles() a const method anymore. Change-Id: I036afc6124dfb877ced7d9e798920c8a8fde1892 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/autotest/quick/quicktestparser.cpp7
-rw-r--r--src/plugins/autotest/quick/quicktestparser.h4
2 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp
index 1c481a2857..06fbb53ad3 100644
--- a/src/plugins/autotest/quick/quicktestparser.cpp
+++ b/src/plugins/autotest/quick/quicktestparser.cpp
@@ -139,7 +139,7 @@ static QString quickTestName(const CPlusPlus::Document::Ptr &doc,
return astVisitor.testBaseName();
}
-QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir) const
+QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir)
{
QStringList dirs(srcDir);
ModelManagerInterface *qmlJsMM = QmlJSTools::Internal::ModelManager::instance();
@@ -157,7 +157,8 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS
QFileInfo fi(it.fileInfo().canonicalFilePath());
dirs.append(fi.filePath());
}
- emit updateWatchPaths(dirs);
+ QMetaObject::invokeMethod(this, [this, dirs] { QuickTestParser::doUpdateWatchPaths(dirs); },
+ Qt::QueuedConnection);
QList<Document::Ptr> foundDocs;
@@ -310,8 +311,6 @@ QuickTestParser::QuickTestParser(ITestFramework *framework)
});
connect(&m_directoryWatcher, &QFileSystemWatcher::directoryChanged,
this, &QuickTestParser::handleDirectoryChanged);
- connect(this, &QuickTestParser::updateWatchPaths,
- this, &QuickTestParser::doUpdateWatchPaths, Qt::QueuedConnection);
}
void QuickTestParser::init(const QStringList &filesToParse, bool fullParse)
diff --git a/src/plugins/autotest/quick/quicktestparser.h b/src/plugins/autotest/quick/quicktestparser.h
index 21e7667832..fbccc4e829 100644
--- a/src/plugins/autotest/quick/quicktestparser.h
+++ b/src/plugins/autotest/quick/quicktestparser.h
@@ -51,14 +51,12 @@ public:
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
const QString &fileName) override;
QString projectFileForMainCppFile(const QString &fileName) const;
-signals:
- void updateWatchPaths(const QStringList &directories) const;
private:
bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface,
CPlusPlus::Document::Ptr document, ITestFramework *framework);
void handleDirectoryChanged(const QString &directory);
void doUpdateWatchPaths(const QStringList &directories);
- QList<QmlJS::Document::Ptr> scanDirectoryForQuickTestQmlFiles(const QString &srcDir) const;
+ QList<QmlJS::Document::Ptr> scanDirectoryForQuickTestQmlFiles(const QString &srcDir);
QmlJS::Snapshot m_qmlSnapshot;
QHash<QString, QString> m_proFilesForQmlFiles;
QFileSystemWatcher m_directoryWatcher;