walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

astyle formatting

This commit is contained in:
Daniel Marjamäki 2013-02-10 23:53:01 +01:00
parent ea574b0a38
commit b660cf89ef
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/mainwindow.cpp
View File

@ -207,9 +207,7 @@ void MainWindow::HandleCLIParams(const QStringList &params)
checkedDir = params[ind + 1]; checkedDir = params[ind + 1];
LoadResults(logFile, checkedDir); LoadResults(logFile, checkedDir);
} } else {
else
{
LoadResults(logFile); LoadResults(logFile);
} }
} else } else

2
gui/mainwindow.h
View File

@ -404,7 +404,7 @@ private:
* @param params List of string given to command line. * @param params List of string given to command line.
*/ */
void HandleCLIParams(const QStringList &params); void HandleCLIParams(const QStringList &params);
/** /**
* @brief Load XML file to the GUI. * @brief Load XML file to the GUI.
* @param file Filename (inc. path) of XML file to load. * @param file Filename (inc. path) of XML file to load.

8
gui/resultstree.cpp
View File

@ -535,7 +535,7 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
QAction *copymessageid = new QAction(tr("Copy message id"), &menu); QAction *copymessageid = new QAction(tr("Copy message id"), &menu);
QAction *hide = new QAction(tr("Hide"), &menu); QAction *hide = new QAction(tr("Hide"), &menu);
QAction *hideallid = new QAction(tr("Hide all with id"), &menu); QAction *hideallid = new QAction(tr("Hide all with id"), &menu);
if (multipleSelection) { if (multipleSelection) {
copyfilename->setDisabled(true); copyfilename->setDisabled(true);
copypath->setDisabled(true); copypath->setDisabled(true);
@ -784,7 +784,7 @@ void ResultsTree::HideAllIdResult()
if (!file) { if (!file) {
continue; continue;
} }
//Get the amount of errors this file contains //Get the amount of errors this file contains
int errorcount = file->rowCount(); int errorcount = file->rowCount();
@ -792,9 +792,9 @@ void ResultsTree::HideAllIdResult()
//Get the error itself //Get the error itself
QStandardItem *child = file->child(j, 0); QStandardItem *child = file->child(j, 0);
if (!child) { if (!child) {
continue; continue;
} }
QVariantMap userdata = child->data().toMap(); QVariantMap userdata = child->data().toMap();
if (userdata["id"].toString() == messageId) { if (userdata["id"].toString() == messageId) {
userdata["hide"] = true; userdata["hide"] = true;

5
lib/checkuninitvar.cpp
View File

@ -278,12 +278,11 @@ private:
CheckUninitVar *checkUninitVar = dynamic_cast<CheckUninitVar *>(c->owner); CheckUninitVar *checkUninitVar = dynamic_cast<CheckUninitVar *>(c->owner);
if (checkUninitVar) { if (checkUninitVar) {
if (c->strncpy_ || c->memset_nonzero) { if (c->strncpy_ || c->memset_nonzero) {
if(!Token::Match(c->var->typeStartToken(), "char|wchar_t")) { if (!Token::Match(c->var->typeStartToken(), "char|wchar_t")) {
continue; continue;
} }
checkUninitVar->uninitstringError(tok, c->var->name(), c->strncpy_); checkUninitVar->uninitstringError(tok, c->var->name(), c->strncpy_);
} } else if (c->var->isPointer() && !c->var->isArray() && c->alloc)
else if (c->var->isPointer() && !c->var->isArray() && c->alloc)
checkUninitVar->uninitdataError(tok, c->var->name()); checkUninitVar->uninitdataError(tok, c->var->name());
else else
checkUninitVar->uninitvarError(tok, c->var->name()); checkUninitVar->uninitvarError(tok, c->var->name());