@@ -337,8 +337,7 @@ std::string IdentifierNamingCheck::HungarianNotation::getDeclTypeName(
337
337
338
338
// Remove keywords
339
339
for (StringRef Kw : Keywords) {
340
- for (size_t Pos = 0 ;
341
- (Pos = Type.find (Kw.data (), Pos)) != std::string::npos;) {
340
+ for (size_t Pos = 0 ; (Pos = Type.find (Kw, Pos)) != std::string::npos;) {
342
341
Type.replace (Pos, Kw.size (), " " );
343
342
}
344
343
}
@@ -373,7 +372,7 @@ std::string IdentifierNamingCheck::HungarianNotation::getDeclTypeName(
373
372
" int" , " char" , " double" , " long" , " short" };
374
373
bool RedundantRemoved = false ;
375
374
for (auto Kw : TailsOfMultiWordType) {
376
- size_t Pos = Type.rfind (Kw. data () );
375
+ size_t Pos = Type.rfind (Kw);
377
376
if (Pos != std::string::npos) {
378
377
const size_t PtrCount = getAsteriskCount (Type, ND);
379
378
Type = Type.substr (0 , Pos + Kw.size () + PtrCount);
@@ -602,9 +601,8 @@ std::string IdentifierNamingCheck::HungarianNotation::getDataTypePrefix(
602
601
if (PtrCount > 0 ) {
603
602
ModifiedTypeName = [&](std::string Str, StringRef From, StringRef To) {
604
603
size_t StartPos = 0 ;
605
- while ((StartPos = Str.find (From.data (), StartPos)) !=
606
- std::string::npos) {
607
- Str.replace (StartPos, From.size (), To.data ());
604
+ while ((StartPos = Str.find (From, StartPos)) != std::string::npos) {
605
+ Str.replace (StartPos, From.size (), To);
608
606
StartPos += To.size ();
609
607
}
610
608
return Str;
0 commit comments