diff --git a/sources/editor/graphicspart/customelementgraphicpart.cpp b/sources/editor/graphicspart/customelementgraphicpart.cpp
index abfa6317e..50bb4a9c5 100644
--- a/sources/editor/graphicspart/customelementgraphicpart.cpp
+++ b/sources/editor/graphicspart/customelementgraphicpart.cpp
@@ -217,8 +217,7 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
 		{HTMLYellowYellowFilling, "HTMLYellowYellow"},
 		{HTMLYellowLightYellowFilling, "HTMLYellowLightYellow"},
 		{HTMLYellowLemonChiffonFilling, "HTMLYellowLemonChiffon"},
-		{HTMLYellowLightGoldenrodYellowFilling,
-		 "HTMLYellowLightGoldenrodYellow"},
+		{HTMLYellowLightGoldenrodYellowFilling, "HTMLYellowLightGoldenrodYellow"},
 		{HTMLYellowPapayaWhipFilling, "HTMLYellowPapayaWhip"},
 		{HTMLYellowMoccasinFilling, "HTMLYellowMoccasin"},
 		{HTMLYellowPeachPuffFilling, "HTMLYellowPeachPuff"},
@@ -595,8 +594,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 				{"HTMLYellowYellow", HTMLYellowYellowFilling},
 				{"HTMLYellowLightYellow", HTMLYellowLightYellowFilling},
 				{"HTMLYellowLemonChiffon", HTMLYellowLemonChiffonFilling},
-				{"HTMLYellowLightGoldenrodYellow",
-				 HTMLYellowLightGoldenrodYellowFilling},
+				{"HTMLYellowLightGoldenrodYellow", HTMLYellowLightGoldenrodYellowFilling},
 				{"HTMLYellowPapayaWhip", HTMLYellowPapayaWhipFilling},
 				{"HTMLYellowMoccasin", HTMLYellowMoccasinFilling},
 				{"HTMLYellowPeachPuff", HTMLYellowPeachPuffFilling},
@@ -631,8 +629,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 				{"HTMLGreenChartreuse", HTMLGreenChartreuseFilling},
 				{"HTMLGreenGreenYellow", HTMLGreenGreenYellowFilling},
 				{"HTMLGreenSpringGreen", HTMLGreenSpringGreenFilling},
-				{"HTMLGreenMediumSpringGreen",
-				 HTMLGreenMediumSpringGreenFilling},
+				{"HTMLGreenMediumSpringGreen", HTMLGreenMediumSpringGreenFilling},
 				{"HTMLGreenLightGreen", HTMLGreenLightGreenFilling},
 				{"HTMLGreenPaleGreen", HTMLGreenPaleGreenFilling},
 				{"HTMLGreenDarkSeaGreen", HTMLGreenDarkSeaGreenFilling},
@@ -762,8 +759,7 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 				{"HTMLYellowYellow", HTMLYellowYellowColor},
 				{"HTMLYellowLightYellow", HTMLYellowLightYellowColor},
 				{"HTMLYellowLemonChiffon", HTMLYellowLemonChiffonColor},
-				{"HTMLYellowLightGoldenrodYellow",
-				 HTMLYellowLightGoldenrodYellowColor},
+				{"HTMLYellowLightGoldenrodYellow", HTMLYellowLightGoldenrodYellowColor},
 				{"HTMLYellowPapayaWhip", HTMLYellowPapayaWhipColor},
 				{"HTMLYellowMoccasin", HTMLYellowMoccasinColor},
 				{"HTMLYellowPeachPuff", HTMLYellowPeachPuffColor},
diff --git a/sources/editor/graphicspart/partterminal.cpp b/sources/editor/graphicspart/partterminal.cpp
index c46c2dc96..dc1a68101 100644
--- a/sources/editor/graphicspart/partterminal.cpp
+++ b/sources/editor/graphicspart/partterminal.cpp
@@ -176,7 +176,6 @@ qreal PartTerminal::rotation() const {
 		case Qet::South : return 180;
 		case Qet::West  : return 270;
 	}
-    return 0;
 }
 
 /**
diff --git a/sources/properties/elementdata.cpp b/sources/properties/elementdata.cpp
index 6209fb85d..309e98593 100644
--- a/sources/properties/elementdata.cpp
+++ b/sources/properties/elementdata.cpp
@@ -362,7 +362,6 @@ QString ElementData::masterTypeToString(ElementData::MasterType type)
 		case ElementData::Commutator:
 			return QStringLiteral("commutator");
 	}
-    return QStringLiteral("coil");
 }
 
 ElementData::MasterType ElementData::masterTypeFromString(const QString &string)
@@ -395,7 +394,6 @@ QString ElementData::slaveTypeToString(ElementData::SlaveType type)
 		case ElementData::delayOnOff:
 			return QStringLiteral("delayOnOff");
 	}
-    return QStringLiteral("simple");
 }
 
 ElementData::SlaveType ElementData::slaveTypeFromString(const QString &string)
@@ -430,7 +428,6 @@ QString ElementData::slaveStateToString(ElementData::SlaveState type)
 		case Other:
 			return QStringLiteral("Other");
 	}
-    return QStringLiteral("Other");
 }
 
 ElementData::SlaveState ElementData::slaveStateFromString(const QString &string)
@@ -465,7 +462,6 @@ QString ElementData::terminalTypeToString(ElementData::TerminalType type)
 		case ElementData::TTGround:
 			return QStringLiteral("ground");
 	}
-    return QStringLiteral("generic");
 }
 
 ElementData::TerminalType ElementData::terminalTypeFromString(const QString &string)
@@ -502,7 +498,6 @@ QString ElementData::translatedTerminalType(ElementData::TerminalType type)
 		case ElementData::TTGround:
 			return QObject::tr("Terre", "ground terminal element type");
 	}
-    return QObject::tr("Générique", "generic terminal element type");
 }
 
 QString ElementData::terminalFunctionToString(ElementData::TerminalFunction function)
@@ -515,7 +510,6 @@ QString ElementData::terminalFunctionToString(ElementData::TerminalFunction func
 		case ElementData::TFNeutral:
 			return QStringLiteral("neutral");
 	}
-    return QStringLiteral("generic");
 }
 
 ElementData::TerminalFunction ElementData::terminalFunctionFromString(const QString &string)
@@ -541,7 +535,6 @@ QString ElementData::translatedTerminalFunction(ElementData::TerminalFunction fu
 		case TFPhase :   return QObject::tr("Phase", "phase terminal element function" );
 		case TFNeutral : return QObject::tr("Neutre", "neutral terminal element function");
 	}
-    return QObject::tr("Générique", "generic terminal element function");
 }
 
 void ElementData::kindInfoFromXml(const QDomElement &xml_element)
diff --git a/sources/qetgraphicsitem/qetshapeitem.cpp b/sources/qetgraphicsitem/qetshapeitem.cpp
index 11ca96b66..ff563d262 100644
--- a/sources/qetgraphicsitem/qetshapeitem.cpp
+++ b/sources/qetgraphicsitem/qetshapeitem.cpp
@@ -970,12 +970,10 @@ bool QetShapeItem::toDXF(const QString &filepath,const QPen &pen)
 				Createdxf::dxfColor(pen));
 	    return true;
 	case Polygon:
-        if(m_polygon.isClosed()) {
+        if(m_polygon.isClosed())
             Createdxf::drawPolygon(filepath,m_polygon,Createdxf::dxfColor(pen));
-        }
-        else {
+        else
             Createdxf::drawPolyline(filepath,m_polygon,Createdxf::dxfColor(pen));
-        }
 	    return true;
 	default:
 	    return false;
diff --git a/sources/utils/macosxopenevent.cpp b/sources/utils/macosxopenevent.cpp
index c98693fc4..e3a6e34d0 100644
--- a/sources/utils/macosxopenevent.cpp
+++ b/sources/utils/macosxopenevent.cpp
@@ -17,7 +17,7 @@
 */
 #include "macosxopenevent.h"
 
-#include "../singleapplication.h"
+#include "singleapplication.h"
 
 #include <QFileOpenEvent>