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

New gcc warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2013-11-12 20:29:03 +02:00
parent 2621e70645
commit fab9fa4bfb
14 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Valentina.pro
View File

@ -76,9 +76,16 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \
-isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \
-isystem "/usr/include/qt5/QtCore" -isystem "$$OUT_PWD/uic" -isystem "$$OUT_PWD/moc/" \
-isystem "$$OUT_PWD/rcc/" \
-Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \
-Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \
-Wunreachable-code -gdwarf-3
-Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \
-Wformat -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k\
-Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \
-Wmissing-include-dirs -Wpacked -Wredundant-decls \
-Wswitch-default -Wswitch-enum -Wuninitialized -Wunused-parameter -Wvariadic-macros \
-Wlogical-op -Wnoexcept \
-Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3
}else{
# Release
TARGET = $$RELEASE_TARGET

2
container/calculator.cpp
View File

@ -195,6 +195,8 @@ void Calculator::arith(QChar o, qreal *r, qreal *h)
// for(t=*h-1; t>0; --t)
// *r = (*r) * ex;
break;
default:
break;
}
}

2
container/vcontainer.cpp
View File

@ -424,6 +424,8 @@ QVector<QPointF> VContainer::EkvPoint(const QLineF &line1, const QLineF &line2,
points.append(bigLine1.p2());
return points;
break;
default:
break;
}
return points;
}

2
dialogs/dialogheight.cpp
View File

@ -125,6 +125,8 @@ void DialogHeight::ChoosedObject(qint64 id, const Scene::Scenes &type)
this->show();
}
break;
default:
break;
}
}
}

2
dialogs/dialogincrements.cpp
View File

@ -499,6 +499,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column )
emit haveLiteChange();
}
break;
default:
break;
}
}

2
dialogs/dialogtriangle.cpp
View File

@ -100,6 +100,8 @@ void DialogTriangle::ChoosedObject(qint64 id, const Scene::Scenes &type)
this->show();
}
break;
default:
break;
}
}
}

10
geometry/vspline.cpp
View File

@ -364,7 +364,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2,
// All collinear OR p1==p4
//----------------------
k = dx*dx + dy*dy;
if (k == 0)
if (k < 0.000000001)
{
d2 = CalcSqDistance(x1, y1, x2, y2);
d3 = CalcSqDistance(x4, y4, x3, y3);
@ -468,7 +468,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2,
return;
}
if (m_cusp_limit != 0.0)
if (m_cusp_limit > 0.0 || m_cusp_limit < 0.0)
{
if (da1 > m_cusp_limit)
{
@ -517,7 +517,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2,
return;
}
if (m_cusp_limit != 0.0)
if (m_cusp_limit > 0.0 || m_cusp_limit < 0.0)
{
if (da1 > m_cusp_limit)
{
@ -573,7 +573,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2,
return;
}
if (m_cusp_limit != 0.0)
if (m_cusp_limit > 0.0 || m_cusp_limit < 0.0)
{
if (da1 > m_cusp_limit)
{
@ -591,6 +591,8 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2,
}
}
break;
default:
break;
}
// Continue subdivision

2
main.cpp
View File

@ -45,6 +45,8 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line,
context.function);
abort();
default:
break;
}
}

2
mainwindow.cpp
View File

@ -775,6 +775,8 @@ void MainWindow::keyPressEvent ( QKeyEvent * event )
case Qt::Key_Escape:
ArrowTool();
break;
default:
break;
}
QMainWindow::keyPressEvent ( event );
}

2
tablewindow.cpp
View File

@ -341,7 +341,7 @@ void TableWindow::RemoveLength()
rect = paper->rect();
rect.setHeight(rect.height()-toPixel(279));
paper->setRect(rect);
if (sceneRect.height()==currentScene->sceneRect().height())
if (fabs(sceneRect.height() - currentScene->sceneRect().height()) < 0.01)
{
ui->actionRemove->setDisabled(true);
}

2
tools/drawTools/vtoolpointofcontact.cpp
View File

@ -58,7 +58,7 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF &cente
s_x = secondPoint.x()-(qAbs(secondPoint.x()-firstPoint.x()))*s;
s_y = secondPoint.y()-(qAbs(secondPoint.y()-firstPoint.y()))*s;
distans = QLineF(center.x(), center.y(), s_x, s_y).length();
if (ceil(distans*10) == ceil(radius*10))
if (fabs(distans*10 - radius*10) < 0.1)
{
pArc.rx() = s_x;
pArc.ry() = s_y;

2
tools/drawTools/vtoolshoulderpoint.cpp
View File

@ -59,7 +59,7 @@ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Li
qDebug()<<"A3П2="<<toMM(length)<<"А30П ="<<toMM(dist);
throw "Не можу знайти точку плеча. Довжина А3П2 < А3П.";
}
if (dist==length)
if (fabs(dist - length) < 0.1)
{
return line.p2();
}

6
tools/drawTools/vtooltriangle.cpp
View File

@ -107,11 +107,11 @@ QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, c
qreal c = QLineF(firstPoint, secondPoint).length();
qreal a = QLineF(axisP2, firstPoint).length();
qreal b = QLineF(axisP2, secondPoint).length();
if (c*c == a*a + b*b)
if (fabs(c*c - (a*a + b*b)) < 0.0001)
{
QLineF l1(axisP2, firstPoint);
QLineF l2(axisP2, secondPoint);
if (l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90)
if (fabs(l1.angleTo(l2) - 90) < 0.1 || fabs(l2.angleTo(l1) - 90) < 0.1)
{
return axisP2;
}
@ -128,7 +128,7 @@ QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, c
{
QLineF l1(axisP2, firstPoint);
QLineF l2(axisP2, secondPoint);
if (l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90)
if (fabs(l1.angleTo(l2) - 90) < 0.1 || fabs(l2.angleTo(l1) - 90) < 0.1)
{
return line.p2();
}

4
widgets/vtablegraphicsview.cpp
View File

@ -145,6 +145,8 @@ void VTableGraphicsView::keyPressEvent(QKeyEvent *event)
case Qt::Key_Down:
MoveItem(VTableGraphicsView::Down);
break;
default:
break;
}
QGraphicsView::keyPressEvent ( event );
}
@ -185,6 +187,8 @@ void VTableGraphicsView::MoveItem(VTableGraphicsView::typeMove_e move)
dx = 0;
dy = 3;
break;
default:
break;
}
QList<QGraphicsItem *> listSelectedItems = scene()->selectedItems();
if (listSelectedItems.size()>0)