diff options
| author | Andrew O'Doherty <andrew.odoherty@qt.io> | 2018-03-19 10:02:54 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-03-20 15:47:41 +0000 |
| commit | cafc667278c30659011c8e317ba42375fac073e9 (patch) | |
| tree | 6b4bc6a90cfa240bb9cab9cbb596a6c2560d14c1 /examples | |
| parent | 9463d7e9d9d86669fb2017afbdec1bd8ab5d0615 (diff) | |
Rename QKnxControlField::FrameType to QKnxControlField::FrameFormat
Align name types with the knx data link layer pdf terminology
Change-Id: Ic10e320651840390b0b399241890f9983c972cb3
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/knx/knxeditor/tunneling.cpp | 6 | ||||
| -rw-r--r-- | examples/knx/knxeditor/tunneling.ui | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/knx/knxeditor/tunneling.cpp b/examples/knx/knxeditor/tunneling.cpp index e9b73e9..9fc5c4e 100644 --- a/examples/knx/knxeditor/tunneling.cpp +++ b/examples/knx/knxeditor/tunneling.cpp @@ -137,7 +137,7 @@ Tunneling::Tunneling(QWidget* parent) updateControlField(); updateExtendedControlField(); - connect(ui->frameType, &QComboBox::currentTextChanged, this, [&](const QString &text) { + connect(ui->frameFormat, &QComboBox::currentTextChanged, this, [&](const QString &text) { if (text == "Extended") { for (int i = 0; i < ui->additionalInfosList->count(); ++i) { auto b = ui->additionalInfosList->item(i)->text().toLatin1(); @@ -210,7 +210,7 @@ Tunneling::Tunneling(QWidget* parent) connect(ui->manualInput, &QCheckBox::clicked, this, [&](bool checked) { bool disable = checked; if (!checked) - disable = ui->frameType->currentText() == "Standard"; + disable = ui->frameFormat->currentText() == "Standard"; ui->additionalInfo->setDisabled(disable); if (!checked) { @@ -289,7 +289,7 @@ void Tunneling::updateFrame() void Tunneling::updateControlField() { - m_ctrl.setFrameType(QKnxControlField::FrameType(ui->frameType->currentIndex())); + m_ctrl.setFrameFormat(QKnxControlField::FrameFormat(ui->frameFormat->currentIndex())); m_ctrl.setRepeat(QKnxControlField::Repeat(ui->repeat->currentIndex())); m_ctrl.setBroadcast(QKnxControlField::Broadcast(ui->broadcast->currentIndex())); m_ctrl.setPriority(QKnxControlField::Priority(ui->priority->currentIndex())); diff --git a/examples/knx/knxeditor/tunneling.ui b/examples/knx/knxeditor/tunneling.ui index 699d741..102fbb3 100644 --- a/examples/knx/knxeditor/tunneling.ui +++ b/examples/knx/knxeditor/tunneling.ui @@ -108,7 +108,7 @@ </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="2"> - <widget class="QComboBox" name="frameType"> + <widget class="QComboBox" name="frameFormat"> <property name="currentIndex"> <number>1</number> </property> @@ -722,7 +722,7 @@ <tabstop>mc</tabstop> <tabstop>sourceAddress</tabstop> <tabstop>destAddress</tabstop> - <tabstop>frameType</tabstop> + <tabstop>frameFormat</tabstop> <tabstop>repeat</tabstop> <tabstop>broadcast</tabstop> <tabstop>priority</tabstop> |