realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-14 20:33:05 +02:00
Code Packages Releases 1 Activity

Fix GCC 6 warnings, thanks Remi Collet

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4442 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810 2016-04-16 17:45:56 +00:00
parent f7f75be332
commit b6886defbd
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sources/qetgraphicsitem/qetshapeitem.cpp
View File

@ -220,13 +220,25 @@ QPainterPath QetShapeItem::shape() const
switch (m_shapeType) switch (m_shapeType)
{ {
case Line: path.moveTo(m_P1); case Line:
path.lineTo(m_P2); break; path.moveTo(m_P1);
case Rectangle: path.addRect(QRectF(m_P1, m_P2)); break; path.lineTo(m_P2);
case Ellipse: path.addEllipse(QRectF(m_P1, m_P2)); break; break;
case Polygon: path.addPolygon(m_polygon); case Rectangle:
if (m_close) path.closeSubpath(); break; path.addRect(QRectF(m_P1, m_P2));
default: Q_ASSERT(false); break; break;
case Ellipse:
path.addEllipse(QRectF(m_P1, m_P2));
break;
case Polygon:
path.addPolygon(m_polygon);
if (m_close) {
path.closeSubpath();
}
break;
default:
Q_ASSERT(false);
break;
} }
QPainterPathStroker pps; QPainterPathStroker pps;

11
sources/ui/elementpropertieswidget.cpp
View File

@ -172,12 +172,15 @@ void ElementPropertiesWidget::updateUi()
//Purge the tab widget and delete all widget //Purge the tab widget and delete all widget
m_tab->clear(); m_tab->clear();
qDeleteAll(m_list_editor); m_list_editor.clear(); qDeleteAll(m_list_editor);
if(m_general_widget) delete m_general_widget; m_general_widget = nullptr; m_list_editor.clear();
if(m_general_widget) {
delete m_general_widget;
m_general_widget = nullptr;
}
//Create editor according to the type of element //Create editor according to the type of element
switch (m_element -> linkType()) switch (m_element -> linkType()) {
{
case Element::Simple: case Element::Simple:
m_list_editor << new ElementInfoWidget(m_element, this); m_list_editor << new ElementInfoWidget(m_element, this);
break; break;