From 126f7daea3b5ad705c5bca0b5a69f143beb9a96c Mon Sep 17 00:00:00 2001 From: Konstantin Tesker Date: Wed, 23 Nov 2016 14:03:29 +0300 Subject: [PATCH 1/2] FIX: build errors, removed unused parameters --- mainwindow.cpp | 7 +- me_shocked.pro.user | 302 +++++++++++++++++++++++++++++++----- me_shocked.pro.user.2.7pre1 | 255 ++++++++++++++++++++++++++++++ qtrectangle.h | 1 + 4 files changed, 524 insertions(+), 41 deletions(-) create mode 100644 me_shocked.pro.user.2.7pre1 diff --git a/mainwindow.cpp b/mainwindow.cpp index 0b2d9cc..acde9d4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -19,6 +19,7 @@ #include #include +#include #include "colordialogbutton.h" @@ -66,7 +67,7 @@ MainWindow::~MainWindow() { delete ui; } -void MainWindow::keyReleaseEvent(QKeyEvent * event) { +void MainWindow::keyReleaseEvent(QKeyEvent * /*event*/) { canvas->pressedKeyCode = 0; } @@ -273,7 +274,7 @@ bool MainWindow::saveFileByText(QString fileName, QString text) { QTextStream out(&file); out <shapes.data(); } - + return true; } diff --git a/me_shocked.pro.user b/me_shocked.pro.user index a4dc6f7..81e20bb 100644 --- a/me_shocked.pro.user +++ b/me_shocked.pro.user @@ -1,10 +1,14 @@ - + + + EnvironmentId + {efbfbf83-7953-4261-bb81-39cdd6b9061f} + ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -13,15 +17,15 @@ false true - Cpp + Cpp - CppGlobal + CppGlobal - QmlJS + QmlJS - QmlJSGlobal + QmlJSGlobal 2 @@ -29,10 +33,14 @@ false 4 false + 80 + true true 1 true + false 0 + true true 0 8 @@ -51,29 +59,31 @@ ProjectExplorer.Project.Target.0 - Desktop - Desktop - {ebdc50d0-f89e-47d0-b3f8-75d0e90f2b99} + Qt 4.8.7 (clang) + Qt 4.8.7 (clang) + {d01d548f-5531-4067-b45d-2624c7e3a3e2} 0 0 0 + /home/konstantin.tesker/usr/etc/study/20161123/build-me_shocked-Qt_4_8_7_clang-Debug true qmake - QtProjectManager.QMakeBuildStep + QtProjectManager.QMakeBuildStep false - true false + false + false true Make - Qt4ProjectManager.MakeStep + Qt4ProjectManager.MakeStep -w -r @@ -85,14 +95,14 @@ 2 Build - ProjectExplorer.BuildSteps.Build + ProjectExplorer.BuildSteps.Build true Make - Qt4ProjectManager.MakeStep + Qt4ProjectManager.MakeStep -w -r @@ -104,35 +114,36 @@ 1 Clean - ProjectExplorer.BuildSteps.Clean + ProjectExplorer.BuildSteps.Clean 2 false Debug - Qt4ProjectManager.Qt4BuildConfiguration + Qt4ProjectManager.Qt4BuildConfiguration 2 - /home/tilast/QTProjects/build-me_shocked-Desktop-Debug true + /home/konstantin.tesker/usr/etc/study/20161123/build-me_shocked-Qt_4_8_7_clang-Release true qmake - QtProjectManager.QMakeBuildStep + QtProjectManager.QMakeBuildStep false - true false + false + false true Make - Qt4ProjectManager.MakeStep + Qt4ProjectManager.MakeStep -w -r @@ -144,14 +155,14 @@ 2 Build - ProjectExplorer.BuildSteps.Build + ProjectExplorer.BuildSteps.Build true Make - Qt4ProjectManager.MakeStep + Qt4ProjectManager.MakeStep -w -r @@ -163,16 +174,15 @@ 1 Clean - ProjectExplorer.BuildSteps.Clean + ProjectExplorer.BuildSteps.Clean 2 false Release - Qt4ProjectManager.Qt4BuildConfiguration + Qt4ProjectManager.Qt4BuildConfiguration 0 - /home/tilast/QTProjects/build-me_shocked-Desktop-Release true 2 @@ -181,16 +191,21 @@ 0 Deploy - ProjectExplorer.BuildSteps.Deploy + ProjectExplorer.BuildSteps.Deploy 1 Deploy locally - ProjectExplorer.DefaultDeployConfiguration + ProjectExplorer.DefaultDeployConfiguration 1 + - true + false + false + 1000 + + true false false @@ -200,8 +215,12 @@ 0.01 10 true + 1 25 + 1 + true + false true valgrind @@ -221,18 +240,20 @@ 13 14 + 2 + me_shocked - Qt4ProjectManager.Qt4RunConfiguration:/home/tilast/QTProjects/me_shocked/me_shocked.pro - 2 + Qt4ProjectManager.Qt4RunConfiguration:/home/konstantin.tesker/usr/etc/study/20161123/my_folder/me_shocked.pro + true me_shocked.pro false - false - + /home/konstantin.tesker/usr/etc/study/20161123/build-me_shocked-Qt_4_8_7_clang-Debug 3768 - true + false + true false false true @@ -241,15 +262,220 @@ - ProjectExplorer.Project.TargetCount - 1 + ProjectExplorer.Project.Target.1 + + Qt5 kit + Qt5 kit + {4b3c474b-bd2f-4e30-9718-d44cefe06aee} + 0 + 0 + 0 + + /home/konstantin.tesker/usr/etc/study/20161123/build-me_shocked-Qt_4_8_7_clang-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/konstantin.tesker/usr/etc/study/20161123/build-me_shocked-Qt_4_8_7_clang-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + me_shocked + + Qt4ProjectManager.Qt4RunConfiguration:/home/konstantin.tesker/usr/etc/study/20161123/my_folder/me_shocked.pro + true + + me_shocked.pro + false + + /home/konstantin.tesker/usr/etc/study/20161123/build-me_shocked-Qt_4_8_7_clang-Debug + 3768 + false + true + false + false + true + + 1 + - ProjectExplorer.Project.Updater.EnvironmentId - {cdcf6495-0033-47c2-bc12-3e093dc01b2f} + ProjectExplorer.Project.TargetCount + 2 ProjectExplorer.Project.Updater.FileVersion - 12 + 18 + + + Version + 18 diff --git a/me_shocked.pro.user.2.7pre1 b/me_shocked.pro.user.2.7pre1 new file mode 100644 index 0000000..a4dc6f7 --- /dev/null +++ b/me_shocked.pro.user.2.7pre1 @@ -0,0 +1,255 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {ebdc50d0-f89e-47d0-b3f8-75d0e90f2b99} + 0 + 0 + 0 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /home/tilast/QTProjects/build-me_shocked-Desktop-Debug + true + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /home/tilast/QTProjects/build-me_shocked-Desktop-Release + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + me_shocked + + Qt4ProjectManager.Qt4RunConfiguration:/home/tilast/QTProjects/me_shocked/me_shocked.pro + 2 + + me_shocked.pro + false + false + + + 3768 + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {cdcf6495-0033-47c2-bc12-3e093dc01b2f} + + + ProjectExplorer.Project.Updater.FileVersion + 12 + + diff --git a/qtrectangle.h b/qtrectangle.h index c2fbd2d..d9cf991 100644 --- a/qtrectangle.h +++ b/qtrectangle.h @@ -4,6 +4,7 @@ #include "rectangle.h" #include "qtshape.h" #include +#include class QtRectangle : public Rectangle, public QtShape2D { public: From 340808713c30307f6a9e6071f57133f7314014a5 Mon Sep 17 00:00:00 2001 From: Konstantin Tesker Date: Wed, 23 Nov 2016 14:15:20 +0300 Subject: [PATCH 2/2] FIX: errors, found with the help of clang analyzer --- canvaswidget.cpp | 10 ++++++++-- me_shocked.pro.user | 2 +- svgfigureparser.cpp | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/canvaswidget.cpp b/canvaswidget.cpp index 7673d37..e7320b7 100644 --- a/canvaswidget.cpp +++ b/canvaswidget.cpp @@ -130,12 +130,16 @@ void CanvasWidget::mousePressEvent(QMouseEvent *event) { selected = NULL; transformation = NONE; + if (!shapes.size ()) + return; for(unsigned i = shapes.size(); i > 0; i--) { if(shapes[i - 1]->belongs(pressedPoint)) { //Нажали на фигуру toFront(i - 1); //переместилю фигуру вперед selected = shapes[shapes.size() - 1]; //Запоминаем последню выбранную фигуры - if (selected != NULL && selectedShapes.size() == 1) + if (!selected) + continue; + if (selectedShapes.size() == 1) emit shapeSelected(selected->getType()); //Проверяем нажатие на контроллер масштабирования (левый верхний) if(selected->isTopLeft(pressedPoint, epsilon)) { @@ -169,6 +173,8 @@ void CanvasWidget::mousePressEvent(QMouseEvent *event) { void CanvasWidget::mouseMoveEvent(QMouseEvent *event) { + if (!transformation) + return; if((event->buttons()) & Qt::LeftButton) { Point2D currentPoint; currentPoint.x = event->localPos().x(); @@ -221,7 +227,7 @@ void CanvasWidget::mouseMoveEvent(QMouseEvent *event) { selected->select(true); setModified(true); - } + } update(); } diff --git a/me_shocked.pro.user b/me_shocked.pro.user index 81e20bb..c146f68 100644 --- a/me_shocked.pro.user +++ b/me_shocked.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/svgfigureparser.cpp b/svgfigureparser.cpp index 3ea73a0..33955aa 100644 --- a/svgfigureparser.cpp +++ b/svgfigureparser.cpp @@ -121,9 +121,9 @@ QtArrow *SVGFigureParser::parseArrow(const QDomElement &e) Point2D tl(x1, y3); Point2D br(x2, y5); float delta = x2 - x3; - float length = x2 - x1; + //float length = x2 - x1; - unused variable - float c = delta / length; + //float c = delta / length; - unused variable qDebug() << delta << " delta";