Fix static analyzer issues (#1727)

* Fix `barsGroup` memory leak

* Remove unused values
This commit is contained in:
Iulian Onofrei
2019-02-09 21:37:55 +02:00
committed by mgrojo
parent 3eebffd7c6
commit 1ebd9955ca
2 changed files with 13 additions and 8 deletions

View File

@@ -776,10 +776,15 @@ void PlotDock::toggleLegendVisible(bool visible)
void PlotDock::adjustBars()
{
const double padding = 0.15;
const double groupedWidth = ui->plotWidget->plottableCount()? 1.0 / ui->plotWidget->plottableCount() : 0.0;
int plottableCount = ui->plotWidget->plottableCount();
if (plottableCount == 0)
return;
const double groupedWidth = 1.0 / plottableCount;
QCPBars* previousBar = nullptr;
QCPBarsGroup* barsGroup = m_stackedBars? nullptr : new QCPBarsGroup(ui->plotWidget);
for (int i = 0, ie = ui->plotWidget->plottableCount(); i < ie; ++i)
QCPBarsGroup* barsGroup = m_stackedBars ? nullptr : new QCPBarsGroup(ui->plotWidget);
for (int i = 0, ie = plottableCount; i < ie; ++i)
{
QCPBars* bar = qobject_cast<QCPBars*>(ui->plotWidget->plottable(i));
if (bar) {

View File

@@ -189,7 +189,7 @@ CSVParser::ParserResult CSVParser::parse(csvRowFunction insertFunction, QTextStr
// no linefeed, so assume that CR represents a newline
if(nit != sBufferEnd && *nit != '\n')
{
field = addColumn(record, field, m_bTrimFields);
addColumn(record, field, m_bTrimFields);
if(!(field = addRow(insertFunction, record, parsedRows)))
return ParserResult::ParserResultError;
@@ -197,7 +197,7 @@ CSVParser::ParserResult CSVParser::parse(csvRowFunction insertFunction, QTextStr
}
else if(c == '\n')
{
field = addColumn(record, field, m_bTrimFields);
addColumn(record, field, m_bTrimFields);
if(!(field = addRow(insertFunction, record, parsedRows)))
return ParserResult::ParserResultError;
@@ -235,7 +235,7 @@ CSVParser::ParserResult CSVParser::parse(csvRowFunction insertFunction, QTextStr
else if(c == '\n')
{
state = StateNormal;
field = addColumn(record, field, m_bTrimFields);
addColumn(record, field, m_bTrimFields);
if(!(field = addRow(insertFunction, record, parsedRows)))
return ParserResult::ParserResultError;
@@ -257,7 +257,7 @@ CSVParser::ParserResult CSVParser::parse(csvRowFunction insertFunction, QTextStr
// no linefeed, so assume that CR represents a newline
if(nit != sBufferEnd && *nit != '\n')
{
field = addColumn(record, field, m_bTrimFields);
addColumn(record, field, m_bTrimFields);
if(!(field = addRow(insertFunction, record, parsedRows)))
return ParserResult::ParserResultError;
@@ -285,7 +285,7 @@ CSVParser::ParserResult CSVParser::parse(csvRowFunction insertFunction, QTextStr
if(record.num_fields)
{
field = addColumn(record, field, m_bTrimFields);
addColumn(record, field, m_bTrimFields);
if(!(field = addRow(insertFunction, record, parsedRows)))
return ParserResult::ParserResultError;