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

QML: remove reserved names.

Browse Source 
See [global.names] (17.6.4.3.2 in the C++11 spec.)

Change-Id: Iee0972f2eac0c48ac9ca62bf6ced7cb2db669f05
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Erik Verbruggen
2014-08-28 14:56:23 +02:00
parent 6775e623ee
commit 4beb3bd912
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljsdocument.h
View File

@@ -212,7 +212,7 @@ public:
class QMLJS_EXPORT Snapshot class QMLJS_EXPORT Snapshot
{ {
typedef QHash<QString, Document::Ptr> _Base; typedef QHash<QString, Document::Ptr> Base;
QHash<QString, Document::Ptr> _documents; QHash<QString, Document::Ptr> _documents;
QHash<QString, QList<Document::Ptr> > _documentsByPath; QHash<QString, QList<Document::Ptr> > _documentsByPath;
QHash<QString, LibraryInfo> _libraries; QHash<QString, LibraryInfo> _libraries;
@@ -223,8 +223,8 @@ public:
Snapshot(const Snapshot &o); Snapshot(const Snapshot &o);
~Snapshot(); ~Snapshot();
typedef _Base::iterator iterator; typedef Base::iterator iterator;
typedef _Base::const_iterator const_iterator; typedef Base::const_iterator const_iterator;
const_iterator begin() const { return _documents.begin(); } const_iterator begin() const { return _documents.begin(); }
const_iterator end() const { return _documents.end(); } const_iterator end() const { return _documents.end(); }

4
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -156,10 +156,10 @@ public:
virtual bool getSourceLocation(QString *fileName, int *line, int *column) const; virtual bool getSourceLocation(QString *fileName, int *line, int *column) const;
}; };
template <typename _RetTy> const _RetTy *value_cast(const Value *) template <typename RetTy> const RetTy *value_cast(const Value *)
{ {
// Produce a good error message if a specialization is missing. // Produce a good error message if a specialization is missing.
_RetTy::ERROR_MissingValueCastSpecialization(); RetTy::ERROR_MissingValueCastSpecialization();
return 0; return 0;
} }