feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix a warning about const signal

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2020-11-17 09:09:05 +01:00
parent a05a0a61d0
commit 3998e30684
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/autotest/quick/quicktestparser.cpp
View File

@@ -139,7 +139,7 @@ static QString quickTestName(const CPlusPlus::Document::Ptr &doc,
return astVisitor.testBaseName(); return astVisitor.testBaseName();
} }
QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir) const QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir)
{ {
QStringList dirs(srcDir); QStringList dirs(srcDir);
ModelManagerInterface *qmlJsMM = QmlJSTools::Internal::ModelManager::instance(); ModelManagerInterface *qmlJsMM = QmlJSTools::Internal::ModelManager::instance();
@@ -157,7 +157,8 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS
QFileInfo fi(it.fileInfo().canonicalFilePath()); QFileInfo fi(it.fileInfo().canonicalFilePath());
dirs.append(fi.filePath()); dirs.append(fi.filePath());
} }
emit updateWatchPaths(dirs); QMetaObject::invokeMethod(this, [this, dirs] { QuickTestParser::doUpdateWatchPaths(dirs); },
Qt::QueuedConnection);
QList<Document::Ptr> foundDocs; QList<Document::Ptr> foundDocs;
@@ -310,8 +311,6 @@ QuickTestParser::QuickTestParser(ITestFramework *framework)
}); });
connect(&m_directoryWatcher, &QFileSystemWatcher::directoryChanged, connect(&m_directoryWatcher, &QFileSystemWatcher::directoryChanged,
this, &QuickTestParser::handleDirectoryChanged); this, &QuickTestParser::handleDirectoryChanged);
connect(this, &QuickTestParser::updateWatchPaths,
this, &QuickTestParser::doUpdateWatchPaths, Qt::QueuedConnection);
} }
void QuickTestParser::init(const QStringList &filesToParse, bool fullParse) void QuickTestParser::init(const QStringList &filesToParse, bool fullParse)

4
src/plugins/autotest/quick/quicktestparser.h
View File

@@ -51,14 +51,12 @@ public:
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
const QString &fileName) override; const QString &fileName) override;
QString projectFileForMainCppFile(const QString &fileName) const; QString projectFileForMainCppFile(const QString &fileName) const;
signals:
void updateWatchPaths(const QStringList &directories) const;
private: private:
bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface, bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface,
CPlusPlus::Document::Ptr document, ITestFramework *framework); CPlusPlus::Document::Ptr document, ITestFramework *framework);
void handleDirectoryChanged(const QString &directory); void handleDirectoryChanged(const QString &directory);
void doUpdateWatchPaths(const QStringList &directories); 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; QmlJS::Snapshot m_qmlSnapshot;
QHash<QString, QString> m_proFilesForQmlFiles; QHash<QString, QString> m_proFilesForQmlFiles;
QFileSystemWatcher m_directoryWatcher; QFileSystemWatcher m_directoryWatcher;