aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <[email protected]>2017-08-17 11:31:31 +0200
committerChristian Kandeler <[email protected]>2017-08-17 09:53:39 +0000
commita4aa79a4f8da10256e923bca8fa4403436ea64dc (patch)
tree3b801ecb0094a0a9a8a9a90139e2f91cc26ca5f4 /src/libs/qmljs/qmljsmodelmanagerinterface.cpp
parentef1b0f999df0c7e817f30f1d80406b1d4471c6a6 (diff)
QmlJS: Rename variable called "interface"
Easily conflicts with a macro of the same name in windows.h. Change-Id: Ia6dfb294092497c48816e71ff901e9c3b2c8359f Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
-rw-r--r--src/libs/qmljs/qmljsmodelmanagerinterface.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index e5506224bf3..fbd2339105c 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -1295,13 +1295,13 @@ bool rescanExports(const QString &fileName, FindExportedCppTypes &finder,
return hasNewInfo;
}
-void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &interface,
+void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &futureInterface,
ModelManagerInterface *qmlModelManager,
CPlusPlus::Snapshot snapshot,
QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > documents)
{
- interface.setProgressRange(0, documents.size());
- interface.setProgressValue(0);
+ futureInterface.setProgressRange(0, documents.size());
+ futureInterface.setProgressValue(0);
CppDataHash newData;
QHash<QString, QList<CPlusPlus::Document::Ptr> > newDeclarations;
@@ -1316,9 +1316,9 @@ void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &interface,
bool hasNewInfo = false;
typedef QPair<CPlusPlus::Document::Ptr, bool> DocScanPair;
foreach (const DocScanPair &pair, documents) {
- if (interface.isCanceled())
+ if (futureInterface.isCanceled())
return;
- interface.setProgressValue(interface.progressValue() + 1);
+ futureInterface.setProgressValue(futureInterface.progressValue() + 1);
CPlusPlus::Document::Ptr doc = pair.first;
const bool scan = pair.second;