[qet] [3765] Conductor properties widget : Fix wrong use of qvariant ( related to QPen::style).

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 3765
Author:   blacksun
Date:     2015-02-25 10:17:14 +0100 (Wed, 25 Feb 2015)
Log Message:
-----------
Conductor properties widget : Fix wrong use of qvariant (related to QPen::style).

Modified Paths:
--------------
    branches/Qt5/sources/ui/conductorpropertieswidget.cpp

Modified: branches/Qt5/sources/ui/conductorpropertieswidget.cpp
===================================================================
--- branches/Qt5/sources/ui/conductorpropertieswidget.cpp	2015-02-24 22:39:53 UTC (rev 3764)
+++ branches/Qt5/sources/ui/conductorpropertieswidget.cpp	2015-02-25 09:17:14 UTC (rev 3765)
@@ -97,8 +97,8 @@
 	if (ui -> m_multi_rb  -> isChecked()) properties_.type = ConductorProperties::Multi;
 	else if (ui -> m_single_rb -> isChecked()) properties_.type = ConductorProperties::Single;
 
-	properties_.color                   = ui->m_color_pb->palette().color(QPalette::Button);
-	properties_.style                   = static_cast<Qt::PenStyle>(ui->m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).toInt());
+	properties_.color                   = ui -> m_color_pb->palette().color(QPalette::Button);
+	properties_.style                   = ui -> m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value<QPen>().style();
 	properties_.text                    = ui -> m_text_le -> text();
 	properties_.text_size               = ui -> m_text_size_sb -> value();
 	properties_.m_show_text             = ui -> m_show_text_cb -> isChecked();


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/