Skip to content

Commit 8f22e49

Browse files
PKEuSPKEuS
committed
Updated AStyle to version 2.05.1
Tweaked runastyle.bat a little bit.
1 parent bc6ae49 commit 8f22e49

20 files changed

Lines changed: 84 additions & 84 deletions

‎gui/cppchecklibrarydata.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString n
232232
else if (name == "size")
233233
xmlWriter.writeAttribute("templateParameter", QString::number(extra));
234234
}
235-
foreach(const CppcheckLibraryData::Container::Function &function, functions) {
235+
foreach (const CppcheckLibraryData::Container::Function &function, functions) {
236236
xmlWriter.writeStartElement("function");
237237
xmlWriter.writeAttribute("name", function.name);
238238
if (!function.action.isEmpty())
@@ -275,7 +275,7 @@ static void writeFunction(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData
275275
comments = comments.mid(1);
276276
while (comments.endsWith("\n"))
277277
comments.chop(1);
278-
foreach(const QString &comment, comments.split('\n')) {
278+
foreach (const QString &comment, comments.split('\n')) {
279279
if (comment.length() >= 1)
280280
xmlWriter.writeComment(comment);
281281
}
@@ -294,7 +294,7 @@ static void writeFunction(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData
294294
if (function.leakignore)
295295
xmlWriter.writeEmptyElement("leak-ignore");
296296
// Argument info..
297-
foreach(const CppcheckLibraryData::Function::Arg &arg, function.args) {
297+
foreach (const CppcheckLibraryData::Function::Arg &arg, function.args) {
298298
if (arg.formatstr) {
299299
xmlWriter.writeStartElement("formatstr");
300300
if (!function.formatstr.scan.isNull())
@@ -323,7 +323,7 @@ static void writeFunction(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData
323323
if (!arg.valid.isEmpty())
324324
xmlWriter.writeTextElement("valid",arg.valid);
325325

326-
foreach(const CppcheckLibraryData::Function::Arg::MinSize &minsize, arg.minsizes) {
326+
foreach (const CppcheckLibraryData::Function::Arg::MinSize &minsize, arg.minsizes) {
327327
xmlWriter.writeStartElement("minsize");
328328
xmlWriter.writeAttribute("type", minsize.type);
329329
xmlWriter.writeAttribute("arg", minsize.arg);
@@ -359,16 +359,16 @@ static void writeFunction(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData
359359
static void writeMemoryResource(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData::MemoryResource &mr)
360360
{
361361
xmlWriter.writeStartElement(mr.type);
362-
foreach(const CppcheckLibraryData::MemoryResource::Alloc &alloc, mr.alloc) {
362+
foreach (const CppcheckLibraryData::MemoryResource::Alloc &alloc, mr.alloc) {
363363
xmlWriter.writeStartElement("alloc");
364364
xmlWriter.writeAttribute("init", alloc.init ? "true" : "false");
365365
xmlWriter.writeCharacters(alloc.name);
366366
xmlWriter.writeEndElement();
367367
}
368-
foreach(const QString &dealloc, mr.dealloc) {
368+
foreach (const QString &dealloc, mr.dealloc) {
369369
xmlWriter.writeTextElement("dealloc", dealloc);
370370
}
371-
foreach(const QString &use, mr.use) {
371+
foreach (const QString &use, mr.use) {
372372
xmlWriter.writeTextElement("use", use);
373373
}
374374
xmlWriter.writeEndElement();
@@ -384,26 +384,26 @@ QString CppcheckLibraryData::toString() const
384384
xmlWriter.writeStartElement("def");
385385
xmlWriter.writeAttribute("format","2");
386386

387-
foreach(const Define &define, defines) {
387+
foreach (const Define &define, defines) {
388388
xmlWriter.writeStartElement("define");
389389
xmlWriter.writeAttribute("name", define.name);
390390
xmlWriter.writeAttribute("value", define.value);
391391
xmlWriter.writeEndElement();
392392
}
393393

394-
foreach(const Function &function, functions) {
394+
foreach (const Function &function, functions) {
395395
writeFunction(xmlWriter, function);
396396
}
397397

398-
foreach(const MemoryResource &mr, memoryresource) {
398+
foreach (const MemoryResource &mr, memoryresource) {
399399
writeMemoryResource(xmlWriter, mr);
400400
}
401401

402-
foreach(const Container &container, containers) {
402+
foreach (const Container &container, containers) {
403403
writeContainer(xmlWriter, container);
404404
}
405405

406-
foreach(const PodType &podtype, podtypes) {
406+
foreach (const PodType &podtype, podtypes) {
407407
xmlWriter.writeStartElement("podtype");
408408
xmlWriter.writeAttribute("name", podtype.name);
409409
if (!podtype.sign.isEmpty())

‎gui/filelist.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void FileList::AddDirectory(const QString &directory, bool recursive)
6868
dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
6969
QFileInfoList list = dir.entryInfoList();
7070
QFileInfo item;
71-
foreach(item, list) {
71+
foreach (item, list) {
7272
const QString path = item.canonicalFilePath();
7373
AddDirectory(path, recursive);
7474
}
@@ -78,7 +78,7 @@ void FileList::AddDirectory(const QString &directory, bool recursive)
7878
void FileList::AddPathList(const QStringList &paths)
7979
{
8080
QString path;
81-
foreach(path, paths) {
81+
foreach (path, paths) {
8282
QFileInfo inf(path);
8383
if (inf.isFile())
8484
AddFile(path);
@@ -91,7 +91,7 @@ QStringList FileList::GetFileList() const
9191
{
9292
if (mExcludedPaths.empty()) {
9393
QStringList names;
94-
foreach(QFileInfo item, mFileList) {
94+
foreach (QFileInfo item, mFileList) {
9595
QString name = QDir::fromNativeSeparators(item.canonicalFilePath());
9696
names << name;
9797
}
@@ -109,7 +109,7 @@ void FileList::AddExcludeList(const QStringList &paths)
109109
QStringList FileList::ApplyExcludeList() const
110110
{
111111
QStringList paths;
112-
foreach(QFileInfo item, mFileList) {
112+
foreach (QFileInfo item, mFileList) {
113113
QString name = QDir::fromNativeSeparators(item.canonicalFilePath());
114114
if (!Match(name))
115115
paths << name;

‎gui/librarydialog.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,11 @@ void LibraryDialog::filterFunctions(QString filter)
262262
QList<QListWidgetItem *> allItems = ui->functions->findItems(QString(), Qt::MatchContains);
263263

264264
if (filter.isEmpty()) {
265-
foreach(QListWidgetItem *item, allItems) {
265+
foreach (QListWidgetItem *item, allItems) {
266266
item->setHidden(false);
267267
}
268268
} else {
269-
foreach(QListWidgetItem *item, allItems) {
269+
foreach (QListWidgetItem *item, allItems) {
270270
item->setHidden(!item->text().startsWith(filter));
271271
}
272272
}
@@ -323,7 +323,7 @@ QString LibraryDialog::getArgText(const CppcheckLibraryData::Function::Arg &arg)
323323
s += "\n format string: " + QString(arg.formatstr ? "true" : "false");
324324
s += "\n strz: " + QString(arg.strz ? "true" : "false");
325325
s += "\n valid: " + QString(arg.valid.isEmpty() ? "any" : arg.valid);
326-
foreach(const CppcheckLibraryData::Function::Arg::MinSize &minsize, arg.minsizes) {
326+
foreach (const CppcheckLibraryData::Function::Arg::MinSize &minsize, arg.minsizes) {
327327
s += "\n minsize: " + minsize.type + " " + minsize.arg + " " + minsize.arg2;
328328
}
329329
return s;
@@ -332,7 +332,7 @@ QString LibraryDialog::getArgText(const CppcheckLibraryData::Function::Arg &arg)
332332
void LibraryDialog::updateArguments(const CppcheckLibraryData::Function &function)
333333
{
334334
ui->arguments->clear();
335-
foreach(const CppcheckLibraryData::Function::Arg &arg, function.args) {
335+
foreach (const CppcheckLibraryData::Function::Arg &arg, function.args) {
336336
ui->arguments->addItem(getArgText(arg));
337337
}
338338
}

‎gui/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
5757
QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
5858

5959
// Set data dir..
60-
foreach(const QString arg, app.arguments()) {
60+
foreach (const QString arg, app.arguments()) {
6161
if (arg.startsWith("--data-dir=")) {
6262
settings->setValue("DATADIR", arg.mid(11));
6363
return 0;

‎gui/mainwindow.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ void MainWindow::CheckDirectory()
530530
void MainWindow::AddIncludeDirs(const QStringList &includeDirs, Settings &result)
531531
{
532532
QString dir;
533-
foreach(dir, includeDirs) {
533+
foreach (dir, includeDirs) {
534534
QString incdir;
535535
if (!QDir::isAbsolutePath(dir))
536536
incdir = mCurrentDirectory + "/";
@@ -642,20 +642,20 @@ Settings MainWindow::GetCppcheckSettings()
642642

643643
const QStringList defines = pfile->GetDefines();
644644
QString define;
645-
foreach(define, defines) {
645+
foreach (define, defines) {
646646
if (!result.userDefines.empty())
647647
result.userDefines += ";";
648648
result.userDefines += define.toStdString();
649649
}
650650

651651
const QStringList libraries = pfile->GetLibraries();
652-
foreach(QString library, libraries) {
652+
foreach (QString library, libraries) {
653653
const QString filename = library + ".cfg";
654654
TryLoadLibrary(&result.library, filename);
655655
}
656656

657657
const QStringList suppressions = pfile->GetSuppressions();
658-
foreach(QString suppression, suppressions) {
658+
foreach (QString suppression, suppressions) {
659659
result.nomsg.addSuppressionLine(suppression.toStdString());
660660
}
661661

‎gui/projectfile.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ bool ProjectFile::Read(const QString &filename)
119119
insideProject = false;
120120
break;
121121

122-
// Not handled
122+
// Not handled
123123
case QXmlStreamReader::NoToken:
124124
case QXmlStreamReader::Invalid:
125125
case QXmlStreamReader::StartDocument:
@@ -143,7 +143,7 @@ bool ProjectFile::Read(const QString &filename)
143143
QStringList ProjectFile::GetIncludeDirs() const
144144
{
145145
QStringList dirs;
146-
foreach(QString path, mIncludeDirs) {
146+
foreach (QString path, mIncludeDirs) {
147147
dirs << QDir::fromNativeSeparators(path);
148148
}
149149
return dirs;
@@ -157,7 +157,7 @@ QStringList ProjectFile::GetDefines() const
157157
QStringList ProjectFile::GetCheckPaths() const
158158
{
159159
QStringList paths;
160-
foreach(QString path, mPaths) {
160+
foreach (QString path, mPaths) {
161161
paths << QDir::fromNativeSeparators(path);
162162
}
163163
return paths;
@@ -166,7 +166,7 @@ QStringList ProjectFile::GetCheckPaths() const
166166
QStringList ProjectFile::GetExcludedPaths() const
167167
{
168168
QStringList paths;
169-
foreach(QString path, mExcludedPaths) {
169+
foreach (QString path, mExcludedPaths) {
170170
paths << QDir::fromNativeSeparators(path);
171171
}
172172
return paths;
@@ -175,7 +175,7 @@ QStringList ProjectFile::GetExcludedPaths() const
175175
QStringList ProjectFile::GetLibraries() const
176176
{
177177
QStringList libraries;
178-
foreach(QString library, mLibraries) {
178+
foreach (QString library, mLibraries) {
179179
libraries << library;
180180
}
181181
return libraries;
@@ -184,7 +184,7 @@ QStringList ProjectFile::GetLibraries() const
184184
QStringList ProjectFile::GetSuppressions() const
185185
{
186186
QStringList suppressions;
187-
foreach(QString suppression, mSuppressions) {
187+
foreach (QString suppression, mSuppressions) {
188188
suppressions << suppression;
189189
}
190190
return suppressions;
@@ -221,7 +221,7 @@ void ProjectFile::ReadIncludeDirs(QXmlStreamReader &reader)
221221
allRead = true;
222222
break;
223223

224-
// Not handled
224+
// Not handled
225225
case QXmlStreamReader::NoToken:
226226
case QXmlStreamReader::Invalid:
227227
case QXmlStreamReader::StartDocument:
@@ -258,7 +258,7 @@ void ProjectFile::ReadDefines(QXmlStreamReader &reader)
258258
allRead = true;
259259
break;
260260

261-
// Not handled
261+
// Not handled
262262
case QXmlStreamReader::NoToken:
263263
case QXmlStreamReader::Invalid:
264264
case QXmlStreamReader::StartDocument:
@@ -296,7 +296,7 @@ void ProjectFile::ReadCheckPaths(QXmlStreamReader &reader)
296296
allRead = true;
297297
break;
298298

299-
// Not handled
299+
// Not handled
300300
case QXmlStreamReader::NoToken:
301301
case QXmlStreamReader::Invalid:
302302
case QXmlStreamReader::StartDocument:
@@ -342,7 +342,7 @@ void ProjectFile::ReadExcludes(QXmlStreamReader &reader)
342342
allRead = true;
343343
break;
344344

345-
// Not handled
345+
// Not handled
346346
case QXmlStreamReader::NoToken:
347347
case QXmlStreamReader::Invalid:
348348
case QXmlStreamReader::StartDocument:
@@ -381,7 +381,7 @@ void ProjectFile::ReadStringList(QStringList &stringlist, QXmlStreamReader &read
381381
allRead = true;
382382
break;
383383

384-
// Not handled
384+
// Not handled
385385
case QXmlStreamReader::NoToken:
386386
case QXmlStreamReader::Invalid:
387387
case QXmlStreamReader::StartDocument:
@@ -449,7 +449,7 @@ bool ProjectFile::Write(const QString &filename)
449449

450450
if (!mIncludeDirs.isEmpty()) {
451451
xmlWriter.writeStartElement(IncludeDirElementName);
452-
foreach(QString incdir, mIncludeDirs) {
452+
foreach (QString incdir, mIncludeDirs) {
453453
xmlWriter.writeStartElement(DirElementName);
454454
xmlWriter.writeAttribute(DirNameAttrib, incdir);
455455
xmlWriter.writeEndElement();
@@ -459,7 +459,7 @@ bool ProjectFile::Write(const QString &filename)
459459

460460
if (!mDefines.isEmpty()) {
461461
xmlWriter.writeStartElement(DefinesElementName);
462-
foreach(QString define, mDefines) {
462+
foreach (QString define, mDefines) {
463463
xmlWriter.writeStartElement(DefineName);
464464
xmlWriter.writeAttribute(DefineNameAttrib, define);
465465
xmlWriter.writeEndElement();
@@ -469,7 +469,7 @@ bool ProjectFile::Write(const QString &filename)
469469

470470
if (!mPaths.isEmpty()) {
471471
xmlWriter.writeStartElement(PathsElementName);
472-
foreach(QString path, mPaths) {
472+
foreach (QString path, mPaths) {
473473
xmlWriter.writeStartElement(PathName);
474474
xmlWriter.writeAttribute(PathNameAttrib, path);
475475
xmlWriter.writeEndElement();
@@ -479,7 +479,7 @@ bool ProjectFile::Write(const QString &filename)
479479

480480
if (!mExcludedPaths.isEmpty()) {
481481
xmlWriter.writeStartElement(ExcludeElementName);
482-
foreach(QString path, mExcludedPaths) {
482+
foreach (QString path, mExcludedPaths) {
483483
xmlWriter.writeStartElement(ExcludePathName);
484484
xmlWriter.writeAttribute(ExcludePathNameAttrib, path);
485485
xmlWriter.writeEndElement();
@@ -508,7 +508,7 @@ void ProjectFile::WriteStringList(QXmlStreamWriter &xmlWriter, const QStringList
508508
return;
509509

510510
xmlWriter.writeStartElement(startelementname);
511-
foreach(QString str, stringlist) {
511+
foreach (QString str, stringlist) {
512512
xmlWriter.writeStartElement(stringelementname);
513513
xmlWriter.writeCharacters(str);
514514
xmlWriter.writeEndElement();

0 commit comments

Comments
 (0)