Skip to content

Commit 5e2e3b1

Browse files
doxygendoxygen
committed
Refactoring: reducing unneeded string conversions
std::string -> raw_c_string -> QCString
1 parent f1ec8b7 commit 5e2e3b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+441
-458
lines changed

‎src/cite.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ QCString CitationManager::replaceFormulas(const QCString &s)
316316
QCString t;
317317
int pos=0;
318318
int i = -1;
319-
while ((i=s.find(g_formulaMarker.c_str(),pos))!=-1)
319+
while ((i=s.find(g_formulaMarker,pos))!=-1)
320320
{
321321
t += s.mid(pos,i-pos);
322322
int markerSize = static_cast<int>( g_formulaMarker.length());
@@ -343,7 +343,7 @@ void CitationManager::generatePage()
343343
const StringVector &citeDataList = Config_getList(CITE_BIB_FILES);
344344
for (const auto &bibdata : citeDataList)
345345
{
346-
QCString bibFile = getBibFile(QCString(bibdata));
346+
QCString bibFile = getBibFile(bibdata);
347347
insertCrossReferencesForBibFile(bibFile);
348348
}
349349

@@ -392,7 +392,7 @@ void CitationManager::generatePage()
392392
int i = 0;
393393
for (const auto &bibdata : citeDataList)
394394
{
395-
QCString bibFile = getBibFile(QCString(bibdata));
395+
QCString bibFile = getBibFile(bibdata);
396396
FileInfo fi(bibFile.str());
397397
if (fi.exists())
398398
{
@@ -474,12 +474,12 @@ void CitationManager::generatePage()
474474
size_t uk=static_cast<size_t>(k1);
475475
QCString label = line.mid(ui+14,uj0-ui-14);
476476
StringVector optList = split(line.mid(uj+5,uk-uj-5).str(),",");
477-
QCString number = optList[0].c_str();
478-
QCString shortAuthor = optList[1].c_str();
477+
QCString number = optList[0];
478+
QCString shortAuthor = optList[1];
479479
QCString year;
480480
if (optList.size() == 3)
481481
{
482-
year = optList[2].c_str();
482+
year = optList[2];
483483
}
484484
line = line.left(ui+14) + label + line.right(line.length()-uj0);
485485
auto it = p->entries.find(label.lower().str());
@@ -537,7 +537,7 @@ void CitationManager::generatePage()
537537
i = 0;
538538
for (const auto &bibdata : citeDataList)
539539
{
540-
QCString bibFile = getBibFile(QCString(bibdata));
540+
QCString bibFile = getBibFile(bibdata);
541541
FileInfo fi(bibFile.str());
542542
if (fi.exists())
543543
{
@@ -581,7 +581,7 @@ QCString CitationManager::latexBibFiles()
581581
int i = 0;
582582
for (const auto &bibdata : citeDataList)
583583
{
584-
QCString bibFile = getBibFile(QCString(bibdata));
584+
QCString bibFile = getBibFile(bibdata);
585585
FileInfo fi(bibFile.str());
586586
if (fi.exists())
587587
{

‎src/clangparser.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void ClangTUParser::parse()
181181
// add external include paths
182182
for (size_t i=0;i<includePath.size();i++)
183183
{
184-
QCString inc = QCString("-I")+includePath[i].c_str();
184+
QCString inc = "-I"+includePath[i];
185185
argv.push_back(qstrdup(inc.data()));
186186
}
187187
// user specified options
@@ -246,8 +246,8 @@ void ClangTUParser::parse()
246246
it != p->filesInSameTU.end() && i<numUnsavedFiles;
247247
++it, i++)
248248
{
249-
p->fileMapping.emplace(it->c_str(),static_cast<uint32_t>(i));
250-
p->sources[i] = detab(fileToString(it->c_str(),filterSourceFiles,TRUE),refIndent);
249+
p->fileMapping.emplace(std::make_pair(*it,static_cast<uint32_t>(i)));
250+
p->sources[i] = detab(fileToString(QCString(*it),filterSourceFiles,TRUE),refIndent);
251251
p->ufs[i].Filename = qstrdup(it->c_str());
252252
p->ufs[i].Contents = p->sources[i].data();
253253
p->ufs[i].Length = p->sources[i].length();
@@ -587,8 +587,7 @@ void ClangTUParser::codifyLines(OutputCodeList &ol,const FileDef *fd,const char
587587
line++;
588588
size_t l = static_cast<size_t>(p-sp-1);
589589
column=l+1;
590-
std::string tmp(sp,l);
591-
ol.codify(tmp.c_str());
590+
ol.codify(QCString(sp,l));
592591
if (fontClass) ol.endFontClass();
593592
ol.endCodeLine();
594593
writeLineNumber(ol,fd,line,inlineCodeFragment);

‎src/classdef.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,7 @@ void ClassDefImpl::internalInsertMember(MemberDef *md,
11751175
addMemberToList(MemberListType::PubTypes(),md,TRUE);
11761176
isSimple=!md->isEnumerate() &&
11771177
!md->isEnumValue() &&
1178-
QCString(md->typeString()).find(")(")==-1; // func ptr typedef
1178+
md->typeString().find(")(")==-1; // func ptr typedef
11791179
break;
11801180
case Protection::Private:
11811181
addMemberToList(MemberListType::PriTypes(),md,TRUE);
@@ -1311,9 +1311,9 @@ void ClassDefImpl::internalInsertMember(MemberDef *md,
13111311
if (addToAllList &&
13121312
!(Config_getBool(HIDE_FRIEND_COMPOUNDS) &&
13131313
md->isFriend() &&
1314-
(QCString(md->typeString())=="friend class" ||
1315-
QCString(md->typeString())=="friend struct" ||
1316-
QCString(md->typeString())=="friend union")))
1314+
(md->typeString()=="friend class" ||
1315+
md->typeString()=="friend struct" ||
1316+
md->typeString()=="friend union")))
13171317
{
13181318
//printf("=======> adding member %s to class %s\n",qPrint(md->name()),qPrint(name()));
13191319

@@ -1417,7 +1417,7 @@ static void writeInheritanceSpecifier(OutputList &ol,const BaseClassDef &bcd)
14171417
for (const auto &s : sl)
14181418
{
14191419
if (!first) ol.docify(", ");
1420-
ol.docify(s.c_str());
1420+
ol.docify(s);
14211421
first=false;
14221422
}
14231423
ol.docify("]");
@@ -2298,7 +2298,7 @@ void ClassDefImpl::writeSummaryLinks(OutputList &ol) const
22982298
{
22992299
for (const auto &s : m_vhdlSummaryTitles)
23002300
{
2301-
ol.writeSummaryLink(QCString(),convertToId(QCString(s)),QCString(s),first);
2301+
ol.writeSummaryLink(QCString(),convertToId(s),s,first);
23022302
first=FALSE;
23032303
}
23042304
}
@@ -2736,7 +2736,7 @@ void ClassDefImpl::addClassAttributes(OutputList &ol) const
27362736
for (const auto &s : sl)
27372737
{
27382738
i++;
2739-
ol.writeLabel(s.c_str(),i==sl.size());
2739+
ol.writeLabel(s,i==sl.size());
27402740
}
27412741
ol.endLabels();
27422742
}
@@ -3371,7 +3371,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
33713371
ol.writeString("<span class=\"mlabel\">");
33723372
firstSpan=false;
33733373
}
3374-
ol.docify(s.c_str());
3374+
ol.docify(s);
33753375
}
33763376
if (!firstSpan) ol.writeString("</span>");
33773377
}

‎src/cmdmapper.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,18 @@ class Mapper
260260

261261
QCString find(const T n) const
262262
{
263+
QCString result;
263264
for (const auto &[name,id] : m_map)
264265
{
265266
T curVal = id;
266267
// https://stackoverflow.com/a/15889501/1657886
267-
if (curVal == n || (curVal == (static_cast<T>(static_cast<int>(n) | static_cast<int>(T::SIMPLESECT_BIT))))) return name.c_str();
268+
if (curVal == n || (curVal == (static_cast<T>(static_cast<int>(n) | static_cast<int>(T::SIMPLESECT_BIT)))))
269+
{
270+
result = name;
271+
break;
272+
}
268273
}
269-
return QCString();
274+
return result;
270275
}
271276

272277
Mapper(const CommandMap<T> &cm,bool caseSensitive) : m_map(cm), m_cs(caseSensitive)

0 commit comments

Comments
 (0)