creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-17 13:50:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Automated Merge Preparation

Browse Source
This commit is contained in:
Conrad
2020-01-16 11:35:58 +01:00
parent 7109948969
commit a099b2e916
9 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cppcheck_config.txt
View File

@@ -1,3 +1,9 @@
src/GUI/IntelliInputDialog.h:4:0: information: Include file: <QtWidgets> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]
^
src/GUI/IntelliInputDialog.cpp:2:0: information: Include file: <QFile> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]
^
src/GUI/IntelliPhotoGui.h:4:0: information: Include file: <QtWidgets> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] src/GUI/IntelliPhotoGui.h:4:0: information: Include file: <QtWidgets> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]
^ ^

18
cppcheck_errors.txt
View File

@@ -7,7 +7,7 @@ src/IntelliHelper/IntelliColorPicker.cpp:5:3: performance: Variable 'secondColor
src/IntelliHelper/IntelliTriangulation.cpp:116:63: style: Parameter 'triangles' can be declared with const [constParameter] src/IntelliHelper/IntelliTriangulation.cpp:116:63: style: Parameter 'triangles' can be declared with const [constParameter]
bool IntelliTriangulation::isInPolygon(std::vector<Triangle> &triangles, QPoint &point){ bool IntelliTriangulation::isInPolygon(std::vector<Triangle> &triangles, QPoint &point){
^ ^
src/Layer/PaintingArea.cpp:334:22: style: Redundant condition: If 'activeLayer > 0', the comparison 'activeLayer != -1' is always true. [redundantCondition] src/Layer/PaintingArea.cpp:344:22: style: Redundant condition: If 'activeLayer > 0', the comparison 'activeLayer != -1' is always true. [redundantCondition]
if(activeLayer!=-1 && activeLayer>0) { if(activeLayer!=-1 && activeLayer>0) {
^ ^
src/Tool/IntelliTool.cpp:4:14: warning: Member variable 'IntelliTool::ActiveType' is not initialized in the constructor. [uninitMemberVar] src/Tool/IntelliTool.cpp:4:14: warning: Member variable 'IntelliTool::ActiveType' is not initialized in the constructor. [uninitMemberVar]
@@ -49,31 +49,31 @@ bool isDrawing;
src/GUI/IntelliPhotoGui.cpp:23:0: style: The function 'closeEvent' is never used. [unusedFunction] src/GUI/IntelliPhotoGui.cpp:23:0: style: The function 'closeEvent' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:261:0: style: The function 'mouseMoveEvent' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:271:0: style: The function 'mouseMoveEvent' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:242:0: style: The function 'mousePressEvent' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:252:0: style: The function 'mousePressEvent' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:274:0: style: The function 'mouseReleaseEvent' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:284:0: style: The function 'mouseReleaseEvent' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:304:0: style: The function 'paintEvent' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:314:0: style: The function 'paintEvent' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:315:0: style: The function 'resizeEvent' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:325:0: style: The function 'resizeEvent' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:320:0: style: The function 'resizeLayer' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:330:0: style: The function 'resizeLayer' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:168:0: style: The function 'slotActivateLayer' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:170:0: style: The function 'slotActivateLayer' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:88:0: style: The function 'slotDeleteActiveLayer' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:88:0: style: The function 'slotDeleteActiveLayer' is never used. [unusedFunction]
^ ^
src/Layer/PaintingArea.cpp:289:0: style: The function 'wheelEvent' is never used. [unusedFunction] src/Layer/PaintingArea.cpp:299:0: style: The function 'wheelEvent' is never used. [unusedFunction]
^ ^
nofile:0:0: information: Cppcheck cannot find all the include files (use --check-config for details) [missingInclude] nofile:0:0: information: Cppcheck cannot find all the include files (use --check-config for details) [missingInclude]

4
releaseprep.sh
View File

@@ -11,10 +11,6 @@ echo "CPPCheck finished"
echo "Running Uncrustify..." echo "Running Uncrustify..."
find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} + find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec uncrustify -c conf/uncrustify.cfg --no-backup {} +
echo "Uncrustify finished." echo "Uncrustify finished."
# Run Unit Tests
echo "Running unit tests..."
echo "Finished unit testing."
# Remove Overhead Folders/ Files # Remove Overhead Folders/ Files
echo "Cleaning directory..." echo "Cleaning directory..."
rm -r src/build-* rm -r src/build-*

4
src/GUI/IntelliInputDialog.cpp
View File

@@ -6,7 +6,7 @@ IntelliInputDialog::IntelliInputDialog(QString Title, QString Label, int value,
{ {
this->valueInt = value; this->valueInt = value;
this->notClosed = ok; this->notClosed = ok;
if(notClosed != nullptr){ if(notClosed != nullptr) {
*notClosed = false; *notClosed = false;
} }
createInputBox(Title, Label, value, minValue, maxValue, step); createInputBox(Title, Label, value, minValue, maxValue, step);
@@ -79,7 +79,7 @@ void IntelliInputDialog::slotCloseEvent(){
void IntelliInputDialog::slotEingabe(){ void IntelliInputDialog::slotEingabe(){
valueInt = QString("%1").arg(Input->value()).toInt(); valueInt = QString("%1").arg(Input->value()).toInt();
if(notClosed != nullptr){ if(notClosed != nullptr) {
*notClosed = true; *notClosed = true;
} }
this->close(); this->close();

8
src/IntelliHelper/IntelliToolsettings.cpp
View File

@@ -16,10 +16,10 @@ int IntelliToolsettings::getLineWidth(){
} }
void IntelliToolsettings::setLineWidth(int LineWidth){ void IntelliToolsettings::setLineWidth(int LineWidth){
if(LineWidth < 1){ if(LineWidth < 1) {
LineWidth = 1; LineWidth = 1;
} }
else if(LineWidth > 50){ else if(LineWidth > 50) {
LineWidth = 50; LineWidth = 50;
} }
lineWidth = LineWidth; lineWidth = LineWidth;
@@ -30,10 +30,10 @@ int IntelliToolsettings::getInnerAlpha(){
} }
void IntelliToolsettings::setInnerAlpha(int innerAlpha){ void IntelliToolsettings::setInnerAlpha(int innerAlpha){
if(innerAlpha < 0){ if(innerAlpha < 0) {
innerAlpha = 0; innerAlpha = 0;
} }
else if(innerAlpha > 255){ else if(innerAlpha > 255) {
innerAlpha = 255; innerAlpha = 255;
} }
this->innerAlpha = innerAlpha; this->innerAlpha = innerAlpha;

2
src/Tool/IntelliTool.cpp
View File

@@ -47,7 +47,7 @@ void IntelliTool::onMouseMoved(int x, int y){
void IntelliTool::onWheelScrolled(int value){ void IntelliTool::onWheelScrolled(int value){
//if needed for future general tasks implement in here //if needed for future general tasks implement in here
Area->DummyGui->setToolWidth(value+Toolsettings->getLineWidth()); Area->DummyGui->setToolWidth(value + Toolsettings->getLineWidth());
} }
bool IntelliTool::createToolLayer(){ bool IntelliTool::createToolLayer(){

6
src/Tool/IntelliToolPolygon.cpp
View File

@@ -10,7 +10,7 @@ IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* c
isDrawing = false; isDrawing = false;
isInside = false; isInside = false;
this->isSettingPolygon = isSettingPolygon; this->isSettingPolygon = isSettingPolygon;
if(isSettingPolygon){ if(isSettingPolygon) {
Toolsettings->setLineWidth(5); Toolsettings->setLineWidth(5);
} }
this->ActiveType = Tooltype::POLYGON; this->ActiveType = Tooltype::POLYGON;
@@ -124,7 +124,7 @@ void IntelliToolPolygon::onMouseRightReleased(int x, int y){
} }
void IntelliToolPolygon::onWheelScrolled(int value){ void IntelliToolPolygon::onWheelScrolled(int value){
if(!isSettingPolygon){ if(!isSettingPolygon) {
IntelliTool::onWheelScrolled(value); IntelliTool::onWheelScrolled(value);
if(!isDrawing) { if(!isDrawing) {
Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value); Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
@@ -133,7 +133,7 @@ void IntelliToolPolygon::onWheelScrolled(int value){
} }
void IntelliToolPolygon::onMouseMoved(int x, int y){ void IntelliToolPolygon::onMouseMoved(int x, int y){
if(!isSettingPolygon){ if(!isSettingPolygon) {
IntelliTool::onMouseMoved(x,y); IntelliTool::onMouseMoved(x,y);
} }
} }