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

QmlJS: Rename variable called "interface"

Browse Source 
Easily conflicts with a macro of the same name in windows.h.

Change-Id: Ia6dfb294092497c48816e71ff901e9c3b2c8359f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Christian Kandeler
2017-08-17 11:31:31 +02:00
parent ef1b0f999d
commit a4aa79a4f8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -1295,13 +1295,13 @@ bool rescanExports(const QString &fileName, FindExportedCppTypes &finder,
return hasNewInfo; return hasNewInfo;
} }
void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &interface, void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &futureInterface,
ModelManagerInterface *qmlModelManager, ModelManagerInterface *qmlModelManager,
CPlusPlus::Snapshot snapshot, CPlusPlus::Snapshot snapshot,
QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > documents) QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > documents)
{ {
interface.setProgressRange(0, documents.size()); futureInterface.setProgressRange(0, documents.size());
interface.setProgressValue(0); futureInterface.setProgressValue(0);
CppDataHash newData; CppDataHash newData;
QHash<QString, QList<CPlusPlus::Document::Ptr> > newDeclarations; QHash<QString, QList<CPlusPlus::Document::Ptr> > newDeclarations;
@@ -1316,9 +1316,9 @@ void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &interface,
bool hasNewInfo = false; bool hasNewInfo = false;
typedef QPair<CPlusPlus::Document::Ptr, bool> DocScanPair; typedef QPair<CPlusPlus::Document::Ptr, bool> DocScanPair;
foreach (const DocScanPair &pair, documents) { foreach (const DocScanPair &pair, documents) {
if (interface.isCanceled()) if (futureInterface.isCanceled())
return; return;
interface.setProgressValue(interface.progressValue() + 1); futureInterface.setProgressValue(futureInterface.progressValue() + 1);
CPlusPlus::Document::Ptr doc = pair.first; CPlusPlus::Document::Ptr doc = pair.first;
const bool scan = pair.second; const bool scan = pair.second;

2
src/libs/qmljs/qmljsmodelmanagerinterface.h
View File

@@ -242,7 +242,7 @@ protected:
ModelManagerInterface *modelManager, ModelManagerInterface *modelManager,
QmlJS::Dialect mainLanguage, QmlJS::Dialect mainLanguage,
bool emitDocChangedOnDisk); bool emitDocChangedOnDisk);
static void updateCppQmlTypes(QFutureInterface<void> &interface, static void updateCppQmlTypes(QFutureInterface<void> &futureInterface,
ModelManagerInterface *qmlModelManager, ModelManagerInterface *qmlModelManager,
CPlusPlus::Snapshot snapshot, CPlusPlus::Snapshot snapshot,
QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > documents); QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > documents);