diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-11 14:24:28 +0200 |
---|---|---|
committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-11 15:25:19 +0200 |
commit | 41b4af05010ef9ae564fcff00b904f22c5f617e0 (patch) | |
tree | 915171245238821c9b3559ae269d3d8e4b4081e1 /src/shared/cplusplus/Control.cpp | |
parent | f74ba9daef50a0b267056c8753819d59621fc000 (diff) | |
download | qt-creator-41b4af05010ef9ae564fcff00b904f22c5f617e0.tar.gz |
Get rid of the prefix findOrInsert for the functions in CPlusPlus::Control.
Diffstat (limited to 'src/shared/cplusplus/Control.cpp')
-rw-r--r-- | src/shared/cplusplus/Control.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/shared/cplusplus/Control.cpp b/src/shared/cplusplus/Control.cpp index 5bdadabba1..050171eb6a 100644 --- a/src/shared/cplusplus/Control.cpp +++ b/src/shared/cplusplus/Control.cpp @@ -536,17 +536,17 @@ Control::Control() { d = new Data(this); - d->deprecatedId = findOrInsertIdentifier("deprecated"); - d->unavailableId = findOrInsertIdentifier("unavailable"); - - d->objcGetterId = findOrInsertIdentifier("getter"); - d->objcSetterId = findOrInsertIdentifier("setter"); - d->objcReadwriteId = findOrInsertIdentifier("readwrite"); - d->objcReadonlyId = findOrInsertIdentifier("readonly"); - d->objcAssignId = findOrInsertIdentifier("assign"); - d->objcRetainId = findOrInsertIdentifier("retain"); - d->objcCopyId = findOrInsertIdentifier("copy"); - d->objcNonatomicId = findOrInsertIdentifier("nonatomic"); + d->deprecatedId = identifier("deprecated"); + d->unavailableId = identifier("unavailable"); + + d->objcGetterId = identifier("getter"); + d->objcSetterId = identifier("setter"); + d->objcReadwriteId = identifier("readwrite"); + d->objcReadonlyId = identifier("readonly"); + d->objcAssignId = identifier("assign"); + d->objcRetainId = identifier("retain"); + d->objcCopyId = identifier("copy"); + d->objcNonatomicId = identifier("nonatomic"); } Control::~Control() @@ -571,13 +571,13 @@ void Control::setDiagnosticClient(DiagnosticClient *diagnosticClient) const Identifier *Control::findIdentifier(const char *chars, unsigned size) const { return d->identifiers.findLiteral(chars, size); } -const Identifier *Control::findOrInsertIdentifier(const char *chars, unsigned size) +const Identifier *Control::identifier(const char *chars, unsigned size) { return d->identifiers.findOrInsertLiteral(chars, size); } -const Identifier *Control::findOrInsertIdentifier(const char *chars) +const Identifier *Control::identifier(const char *chars) { unsigned length = std::strlen(chars); - return findOrInsertIdentifier(chars, length); + return identifier(chars, length); } Control::IdentifierIterator Control::firstIdentifier() const @@ -598,22 +598,22 @@ Control::NumericLiteralIterator Control::firstNumericLiteral() const Control::NumericLiteralIterator Control::lastNumericLiteral() const { return d->numericLiterals.end(); } -const StringLiteral *Control::findOrInsertStringLiteral(const char *chars, unsigned size) +const StringLiteral *Control::stringLiteral(const char *chars, unsigned size) { return d->stringLiterals.findOrInsertLiteral(chars, size); } -const StringLiteral *Control::findOrInsertStringLiteral(const char *chars) +const StringLiteral *Control::stringLiteral(const char *chars) { unsigned length = std::strlen(chars); - return findOrInsertStringLiteral(chars, length); + return stringLiteral(chars, length); } -const NumericLiteral *Control::findOrInsertNumericLiteral(const char *chars, unsigned size) +const NumericLiteral *Control::numericLiteral(const char *chars, unsigned size) { return d->numericLiterals.findOrInsertLiteral(chars, size); } -const NumericLiteral *Control::findOrInsertNumericLiteral(const char *chars) +const NumericLiteral *Control::numericLiteral(const char *chars) { unsigned length = std::strlen(chars); - return findOrInsertNumericLiteral(chars, length); + return numericLiteral(chars, length); } const NameId *Control::nameId(const Identifier *id) |