Skip to content

Commit e346427

Browse files
sanny32sanny32
committed
Refactoring for qt5
1 parent 3e4efdc commit e346427

12 files changed

Lines changed: 53 additions & 37 deletions

‎omodsim/controls/modbuslogwidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,11 @@ void ModbusLogWidget::setState(LogViewState state)
387387
{
388388
_state = state;
389389
switch (state) {
390-
case Paused:
390+
case LogViewState::Paused:
391391
((ModbusLogModel*)model())->setBufferingMode(true);
392392
break;
393393

394-
case Running:
394+
case LogViewState::Running:
395395
((ModbusLogModel*)model())->setBufferingMode(false);
396396
break;
397397

‎omodsim/controls/modbuslogwidget.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private slots:
8888
bool _autoscroll;
8989
QAction* _copyAct;
9090
QAction* _copyBytesAct;
91-
LogViewState _state = Running;
91+
LogViewState _state = LogViewState::Running;
9292
DataDisplayMode _dataDisplayMode;
9393
};
9494

‎omodsim/controls/outputwidget.ui‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,43 +64,43 @@
6464
<item>
6565
<widget class="QListView" name="listView">
6666
<property name="focusPolicy">
67-
<enum>Qt::FocusPolicy::NoFocus</enum>
67+
<enum>Qt::NoFocus</enum>
6868
</property>
6969
<property name="contextMenuPolicy">
70-
<enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
70+
<enum>Qt::CustomContextMenu</enum>
7171
</property>
7272
<property name="frameShape">
73-
<enum>QFrame::Shape::NoFrame</enum>
73+
<enum>QFrame::NoFrame</enum>
7474
</property>
7575
<property name="verticalScrollBarPolicy">
76-
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
76+
<enum>Qt::ScrollBarAlwaysOff</enum>
7777
</property>
7878
<property name="horizontalScrollBarPolicy">
79-
<enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
79+
<enum>Qt::ScrollBarAlwaysOff</enum>
8080
</property>
8181
<property name="autoScroll">
8282
<bool>false</bool>
8383
</property>
8484
<property name="editTriggers">
85-
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
85+
<set>QAbstractItemView::NoEditTriggers</set>
8686
</property>
8787
<property name="showDropIndicator" stdset="0">
8888
<bool>false</bool>
8989
</property>
9090
<property name="dragDropMode">
91-
<enum>QAbstractItemView::DragDropMode::DragOnly</enum>
91+
<enum>QAbstractItemView::DragOnly</enum>
9292
</property>
9393
<property name="selectionMode">
94-
<enum>QAbstractItemView::SelectionMode::NoSelection</enum>
94+
<enum>QAbstractItemView::NoSelection</enum>
9595
</property>
9696
<property name="movement">
97-
<enum>QListView::Movement::Free</enum>
97+
<enum>QListView::Free</enum>
9898
</property>
9999
<property name="isWrapping" stdset="0">
100100
<bool>true</bool>
101101
</property>
102102
<property name="resizeMode">
103-
<enum>QListView::ResizeMode::Adjust</enum>
103+
<enum>QListView::Adjust</enum>
104104
</property>
105105
<property name="modelColumn">
106106
<number>0</number>
@@ -129,7 +129,7 @@
129129
<item>
130130
<widget class="QSplitter" name="splitter">
131131
<property name="orientation">
132-
<enum>Qt::Orientation::Horizontal</enum>
132+
<enum>Qt::Horizontal</enum>
133133
</property>
134134
<widget class="ModbusLogWidget" name="logView">
135135
<property name="sizePolicy">
@@ -139,13 +139,13 @@
139139
</sizepolicy>
140140
</property>
141141
<property name="frameShape">
142-
<enum>QFrame::Shape::NoFrame</enum>
142+
<enum>QFrame::NoFrame</enum>
143143
</property>
144144
<property name="autoScroll">
145145
<bool>true</bool>
146146
</property>
147147
<property name="editTriggers">
148-
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
148+
<set>QAbstractItemView::NoEditTriggers</set>
149149
</property>
150150
<property name="tabKeyNavigation">
151151
<bool>true</bool>
@@ -154,16 +154,16 @@
154154
<bool>false</bool>
155155
</property>
156156
<property name="defaultDropAction">
157-
<enum>Qt::DropAction::IgnoreAction</enum>
157+
<enum>Qt::IgnoreAction</enum>
158158
</property>
159159
<property name="alternatingRowColors">
160160
<bool>true</bool>
161161
</property>
162162
<property name="selectionMode">
163-
<enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
163+
<enum>QAbstractItemView::SingleSelection</enum>
164164
</property>
165165
<property name="selectionBehavior">
166-
<enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
166+
<enum>QAbstractItemView::SelectRows</enum>
167167
</property>
168168
<property name="wordWrap">
169169
<bool>true</bool>
@@ -172,15 +172,15 @@
172172
<bool>true</bool>
173173
</property>
174174
</widget>
175-
<widget class="QWidget" name="">
175+
<widget class="QWidget" name="layoutWidget">
176176
<layout class="QHBoxLayout" name="horizontalLayout">
177177
<property name="spacing">
178178
<number>2</number>
179179
</property>
180180
<item>
181181
<widget class="Line" name="line">
182182
<property name="orientation">
183-
<enum>Qt::Orientation::Vertical</enum>
183+
<enum>Qt::Vertical</enum>
184184
</property>
185185
</widget>
186186
</item>
@@ -199,13 +199,13 @@
199199
</size>
200200
</property>
201201
<property name="frameShape">
202-
<enum>QFrame::Shape::NoFrame</enum>
202+
<enum>QFrame::NoFrame</enum>
203203
</property>
204204
<property name="editTriggers">
205-
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
205+
<set>QAbstractItemView::NoEditTriggers</set>
206206
</property>
207207
<property name="selectionMode">
208-
<enum>QAbstractItemView::SelectionMode::NoSelection</enum>
208+
<enum>QAbstractItemView::NoSelection</enum>
209209
</property>
210210
<property name="wordWrap">
211211
<bool>true</bool>

‎omodsim/controls/statisticwidget.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ void StatisticWidget::setLogState(LogViewState state)
9292
_logState = state;
9393
switch (state)
9494
{
95-
case Unknown:
95+
case LogViewState::Unknown:
9696
ui->pushButtonPause->setEnabled(false);
9797
ui->pushButtonPause->setText(tr("Pause Logging"));
9898
break;
99-
case Running:
99+
case LogViewState::Running:
100100
ui->pushButtonPause->setEnabled(true);
101101
ui->pushButtonPause->setText(tr("Pause Logging"));
102102
break;
103-
case Paused:
103+
case LogViewState::Paused:
104104
ui->pushButtonPause->setEnabled(true);
105105
ui->pushButtonPause->setText(tr("Resume Logging"));
106106
break;
@@ -122,9 +122,9 @@ void StatisticWidget::on_pushButtonResetCtrs_clicked()
122122
void StatisticWidget::on_pushButtonPause_clicked()
123123
{
124124
switch (_logState) {
125-
case Unknown: break;
126-
case Running: setLogState(Paused); break;
127-
case Paused: setLogState(Running); break;
125+
case LogViewState::Unknown: break;
126+
case LogViewState::Running: setLogState(LogViewState::Paused); break;
127+
case LogViewState::Paused: setLogState(LogViewState::Running); break;
128128
}
129129

130130
emit logStateChanged(_logState);

‎omodsim/enums.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Q_DECLARE_METATYPE(RunMode)
212212
///
213213
/// \brief The LogViewState enum
214214
///
215-
enum LogViewState {
215+
enum class LogViewState {
216216
Unknown,
217217
Running,
218218
Paused

‎omodsim/formmodsim.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim
5353
onDefinitionChanged();
5454
ui->outputWidget->setFocus();
5555

56-
setLogViewState(Unknown);
56+
setLogViewState(LogViewState::Unknown);
5757
connect(ui->statisticWidget, &StatisticWidget::ctrsReseted, ui->outputWidget, &OutputWidget::clearLogView);
5858
connect(ui->statisticWidget, &StatisticWidget::logStateChanged, ui->outputWidget, &OutputWidget::setLogViewState);
5959

@@ -857,8 +857,8 @@ void FormModSim::on_mbConnected(const ConnectionDetails&)
857857
updateStatus();
858858
ui->outputWidget->clearLogView();
859859

860-
if(logViewState() == Unknown) {
861-
setLogViewState(Running);
860+
if(logViewState() == LogViewState::Unknown) {
861+
setLogViewState(LogViewState::Running);
862862
}
863863
}
864864

@@ -869,7 +869,7 @@ void FormModSim::on_mbDisconnected(const ConnectionDetails&)
869869
{
870870
updateStatus();
871871
if(!_mbMultiServer.isConnected()) {
872-
setLogViewState(Unknown);
872+
setLogViewState(LogViewState::Unknown);
873873
}
874874
}
875875

‎omodsim/modbusmessages/modbusmessage.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#include "modbusmessages.h"
22

3+
namespace {
4+
static const int reg = qRegisterMetaType<ModbusMessage::ProtocolType>();
5+
}
36

47
///
58
/// \brief ModbusMessage::create

‎omodsim/modbusmessages/modbusmessage.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ class ModbusMessage
244244
const bool _request;
245245
const QDateTime _timestamp;
246246
};
247+
Q_DECLARE_METATYPE(ModbusMessage::ProtocolType)
247248
Q_DECLARE_METATYPE(QSharedPointer<const ModbusMessage>)
248249

249250
#endif // MODBUSMESSAGE_H

‎omodsim/modbusmultiserver.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ ModbusMultiServer::ModbusMultiServer(QObject *parent)
1010
,_deviceId(1)
1111
,_workerThread(new QThread(this))
1212
{
13+
{
14+
static int reg = qRegisterMetaType<QModbusRequest>();
15+
Q_UNUSED(reg);
16+
}
17+
18+
{
19+
static int reg = qRegisterMetaType<QModbusResponse>();
20+
Q_UNUSED(reg);
21+
}
22+
1323
moveToThread(_workerThread);
1424
_workerThread->start();
1525

‎omodsim/modbusmultiserver.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,7 @@ private slots:
178178
ModbusDataUnitMap _modbusDataUnitMap;
179179
QList<QSharedPointer<QModbusServer>> _modbusServerList;
180180
};
181+
Q_DECLARE_METATYPE(QModbusRequest)
182+
Q_DECLARE_METATYPE(QModbusResponse)
181183

182184
#endif // MODBUSMULTISERVER_H

0 commit comments

Comments
 (0)