forked from qt-creator/qt-creator
C++: remove reserved names.
See [global.names] (17.6.4.3.2 in the C++11 spec.) Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
committed by
Nikolai Kosjar
parent
12642cc49a
commit
703f36a4b8
@@ -391,14 +391,14 @@ private:
|
||||
|
||||
class CPLUSPLUS_EXPORT Snapshot
|
||||
{
|
||||
typedef QHash<QString, Document::Ptr> _Base;
|
||||
typedef QHash<QString, Document::Ptr> Base;
|
||||
|
||||
public:
|
||||
Snapshot();
|
||||
~Snapshot();
|
||||
|
||||
typedef _Base::const_iterator iterator;
|
||||
typedef _Base::const_iterator const_iterator;
|
||||
typedef Base::const_iterator iterator;
|
||||
typedef Base::const_iterator const_iterator;
|
||||
|
||||
int size() const; // ### remove
|
||||
bool isEmpty() const;
|
||||
@@ -428,7 +428,7 @@ private:
|
||||
void allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const;
|
||||
|
||||
private:
|
||||
_Base _documents;
|
||||
Base _documents;
|
||||
};
|
||||
|
||||
} // namespace CPlusPlus
|
||||
|
||||
Reference in New Issue
Block a user