aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coverity scan warnings.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2017-04-19 12:48:13 +03:00
parent ef9f9c6af4
commit a0262e260b
13 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/valentina/core/vapplication.cpp
View File

@ -472,13 +472,14 @@ QString VApplication::LogPath() const
}
//---------------------------------------------------------------------------------------------------------------------
void VApplication::CreateLogDir() const
bool VApplication::CreateLogDir() const
{
QDir logDir(LogDirPath());
if (logDir.exists() == false)
{
logDir.mkpath("."); // Create directory for log if need
return logDir.mkpath("."); // Create directory for log if need
}
return true;
}
//---------------------------------------------------------------------------------------------------------------------
@ -600,12 +601,14 @@ QStringList VApplication::LabelLanguages()
//---------------------------------------------------------------------------------------------------------------------
void VApplication::StartLogging()
{
CreateLogDir();
BeginLogging();
ClearOldLogs();
if (CreateLogDir())
{
BeginLogging();
ClearOldLogs();
#if defined(Q_OS_WIN) && defined(Q_CC_GNU)
ClearOldReports();
ClearOldReports();
#endif // defined(Q_OS_WIN) && defined(Q_CC_GNU)
}
}
//---------------------------------------------------------------------------------------------------------------------

2
src/app/valentina/core/vapplication.h
View File

@ -109,7 +109,7 @@ private:
QString LogDirPath()const;
QString LogPath()const;
void CreateLogDir()const;
bool CreateLogDir()const;
void BeginLogging();
void ClearOldLogs()const;

2
src/app/valentina/dialogs/vwidgetdetails.cpp
View File

@ -170,7 +170,7 @@ void VWidgetDetails::ToggleSectionDetails(bool select)
const quint32 id = item->data(Qt::UserRole).toUInt();
if (allDetails->contains(id))
{
if (not select == allDetails->value(id).IsInLayout())
if (not (select == allDetails->value(id).IsInLayout()))
{
TogglePieceInLayout *togglePrint = new TogglePieceInLayout(id, select, m_data, m_doc);
connect(togglePrint, &TogglePieceInLayout::UpdateList, this, &VWidgetDetails::UpdateList);

2
src/app/valentina/mainwindow.cpp
View File

@ -1498,7 +1498,7 @@ void MainWindow::LoadStandard()
if (qApp->patternType() == MeasurementsType::Standard)
{
if (not hText.isEmpty() && not gradationSizes.isNull())
if (not hText.isEmpty() && not gradationHeights.isNull())
{
gradationHeights->setCurrentText(hText);
}

38
src/libs/ifc/xml/vabstractpattern.cpp
View File

@ -41,6 +41,7 @@
#include "../exception/vexceptionemptyparameter.h"
#include "../exception/vexceptionobjecterror.h"
#include "../exception/vexceptionconversionerror.h"
#include "../qmuparser/qmutokenparser.h"
#include "../ifc/exception/vexceptionbadid.h"
#include "../ifc/ifcdef.h"
@ -2263,33 +2264,40 @@ QMap<quint32, QPair<QString, bool> > VAbstractPattern::GetGroups()
{
QMap<quint32, QPair<QString, bool> > data;
QDomElement groups = CreateGroups();
if (not groups.isNull())
try
{
QDomNode domNode = groups.firstChild();
while (domNode.isNull() == false)
QDomElement groups = CreateGroups();
if (not groups.isNull())
{
if (domNode.isElement())
QDomNode domNode = groups.firstChild();
while (domNode.isNull() == false)
{
const QDomElement group = domNode.toElement();
if (group.isNull() == false)
if (domNode.isElement())
{
if (group.tagName() == TagGroup)
const QDomElement group = domNode.toElement();
if (group.isNull() == false)
{
const quint32 id = GetParametrUInt(group, AttrId, "0");
const bool visible = GetParametrBool(group, AttrVisible, trueStr);
const QString name = GetParametrString(group, AttrName, tr("New group"));
if (group.tagName() == TagGroup)
{
const quint32 id = GetParametrUInt(group, AttrId, "0");
const bool visible = GetParametrBool(group, AttrVisible, trueStr);
const QString name = GetParametrString(group, AttrName, tr("New group"));
data.insert(id, qMakePair(name, visible));
data.insert(id, qMakePair(name, visible));
}
}
}
domNode = domNode.nextSibling();
}
domNode = domNode.nextSibling();
}
else
{
qDebug("Can't get tag Groups.");
}
}
else
catch (const VExceptionConversionError &)
{
qDebug("Can't get tag Groups.");
return QMap<quint32, QPair<QString, bool> >();
}
return data;

28
src/libs/vdxf/dxflib/dl_dxf.cpp
View File

@ -2556,7 +2556,7 @@ DL_WriterA* DL_Dxf::out(const char* file, DL_Codes::version version)
{
const size_t size = strlen(file)+1;
char* f = new char[size];
strlcpy(f, file, size); // Strange thing the sizeof(f) doesn't return correct value
strlcpy(f, file, size);
this->version = version;
DL_WriterA* dw = new DL_WriterA(f, version);
@ -5925,19 +5925,21 @@ int DL_Dxf::getLibVersion(const std::string& str)
*/
void DL_Dxf::test()
{
char* buf1 = new char[10];
char* buf2 = new char[10];
char* buf3 = new char[10];
char* buf4 = new char[10];
char* buf5 = new char[10];
char* buf6 = new char[10];
const size_t bufSize = 10;
strlcpy(buf1, " 10\n", sizeof(buf1));
strlcpy(buf2, "10", sizeof(buf2));
strlcpy(buf3, "10\n", sizeof(buf3));
strlcpy(buf4, " 10 \n", sizeof(buf4));
strlcpy(buf5, " 10 \r", sizeof(buf5));
strlcpy(buf6, "\t10 \n", sizeof(buf6));
char* buf1 = new char[bufSize];
char* buf2 = new char[bufSize];
char* buf3 = new char[bufSize];
char* buf4 = new char[bufSize];
char* buf5 = new char[bufSize];
char* buf6 = new char[bufSize];
strlcpy(buf1, " 10\n", bufSize);
strlcpy(buf2, "10", bufSize);
strlcpy(buf3, "10\n", bufSize);
strlcpy(buf4, " 10 \n", bufSize);
strlcpy(buf5, " 10 \r", bufSize);
strlcpy(buf6, "\t10 \n", bufSize);
// Try to avoid deleting array from an offset
char* buf1Copy = buf1;

2
src/libs/vpropertyexplorer/vpropertyformwidget.cpp
View File

@ -233,7 +233,7 @@ void VPE::VPropertyFormWidget::commitData(int row)
}
else if (parent->propertyType() == Property::Complex)
{
tmpProperty->UpdateParent(newValue);
parent->UpdateParent(newValue);
emit propertyDataSubmitted(parent);
}
}

4
src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
View File

@ -67,7 +67,7 @@ void VAbstractOperation::GroupVisibility(quint32 object, bool visible)
if (operatedObjects.contains(object))
{
VAbstractSimple *obj = operatedObjects.value(object);
if (obj->GetType() == GOType::Point)
if (obj && obj->GetType() == GOType::Point)
{
VSimplePoint *item = qobject_cast<VSimplePoint *>(obj);
SCASSERT(item != nullptr)
@ -392,7 +392,7 @@ void VAbstractOperation::LabelChangePosition(const QPointF &pos, quint32 labelId
if (operatedObjects.contains(labelId))
{
VAbstractSimple *obj = operatedObjects.value(labelId);
if (obj->GetType() == GOType::Point)
if (obj && obj->GetType() == GOType::Point)
{
VSimplePoint *item = qobject_cast<VSimplePoint *>(obj);
SCASSERT(item != nullptr)

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp
View File

@ -210,7 +210,7 @@ QPointF VToolPointFromArcAndTangent::FindPoint(const QPointF &p, const VArc *arc
case 3:
case 0:
default:
return QPointF();
break;
}
return QPointF();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
View File

@ -151,7 +151,7 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF &cente
}
default:
qDebug() << "Unxpected value" << res;
return QPointF();
break;
}
return QPointF();
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp
View File

@ -217,7 +217,7 @@ QPointF VToolPointOfIntersectionArcs::FindPoint(const VArc *arc1, const VArc *ar
case 3:
case 0:
default:
return QPointF();
break;
}
return QPointF();
}

7
src/libs/vwidgets/vmaingraphicsview.cpp
View File

@ -131,7 +131,8 @@ void GraphicsViewZoom::VerticalScrollingTime(qreal x)
// Try to adapt scrolling to speed of rotating mouse wheel and scale factor
// Value of _numScheduledScrollings is too short, so we scale the value
qreal scroll = (qAbs(_numScheduledVerticalScrollings)*(10 + 10/_view->transform().m22()))/(duration/updateInterval);
qreal scroll = static_cast<qreal>(qAbs(_numScheduledVerticalScrollings))*(10. + 10./_view->transform().m22())
/(static_cast<qreal>(duration)/static_cast<qreal>(updateInterval));
if (qAbs(scroll) < 1)
{
@ -152,8 +153,8 @@ void GraphicsViewZoom::HorizontalScrollingTime(qreal x)
// Try to adapt scrolling to speed of rotating mouse wheel and scale factor
// Value of _numScheduledScrollings is too short, so we scale the value
qreal scroll = (qAbs(_numScheduledHorizontalScrollings)*(10 + 10/_view->transform().m11()))/
(duration/updateInterval);
qreal scroll = static_cast<qreal>(qAbs(_numScheduledHorizontalScrollings))*(10. + 10./_view->transform().m11())
/(static_cast<qreal>(duration)/static_cast<qreal>(updateInterval));
if (qAbs(scroll) < 1)
{

8
src/test/ValentinaTest/tst_vpiece.cpp
View File

@ -49,7 +49,7 @@ void TST_VPiece::ClearLoop()
// See file <root>/src/app/share/collection/jacketМ6_30-110.val
// Check correct seam allowance
const Unit unit = Unit::Mm;
VContainer *data = new VContainer(nullptr, &unit);
QScopedPointer<VContainer> data(new VContainer(nullptr, &unit));
qApp->setPatternUnit(unit);
data->UpdateGObject(304, new VPointF(61.866708661417327, 446.92270866141735, "Ф1", 5.0000125984251973,
@ -103,7 +103,7 @@ void TST_VPiece::ClearLoop()
detail.GetPath()[0].SetFormulaSABefore("0");
detail.GetPath()[detail.GetPath().CountNodes()-1].SetFormulaSAAfter("0");
const QVector<QPointF> pointsEkv = detail.SeamAllowancePoints(data);
const QVector<QPointF> pointsEkv = detail.SeamAllowancePoints(data.data());
QVector<QPointF> origPoints;
origPoints.append(QPointF(42.46405659601932, 415.2845470563871));
@ -152,7 +152,7 @@ void TST_VPiece::Issue620()
// See file <root>/src/app/share/collection/bugs/Issue_#620.vit
// Check main path
const Unit unit = Unit::Cm;
VContainer *data = new VContainer(nullptr, &unit);
QScopedPointer<VContainer> data(new VContainer(nullptr, &unit));
qApp->setPatternUnit(unit);
data->UpdateGObject(1, new VPointF(30, 39.999874015748034, "A", 5.0000125984251973, 9.9999874015748045));
@ -208,7 +208,7 @@ void TST_VPiece::Issue620()
detail.GetPath().Append(VPieceNode(8, Tool::NodeSpline));
detail.GetPath().Append(VPieceNode(7, Tool::NodeSplinePath));
const QVector<QPointF> pointsEkv = detail.MainPathPoints(data);
const QVector<QPointF> pointsEkv = detail.MainPathPoints(data.data());
QVector<QPointF> origPoints;