Skip to content

Commit 265dabb

Browse files
grodansparadisgrodansparadis
committed
Renamed bit and value edit files and fialogs
1 parent c84453d commit 265dabb

25 files changed

+3041
-903
lines changed

‎CMakeLists.txt

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ qt5_wrap_ui(UI src/mainwindow.ui
237237
src/cdlgactionparam.ui
238238
srd/cdlgdatepicker.ui
239239
src/cfrmmdf.ui
240-
src/cdlgmdfmodule.ui
241-
src/cdlgmdfdm.ui
240+
src/cdlgmdfmodule.ui
242241
src/cdlgmdffilepicture.ui
243242
src/cdlgmdfmodule.ui
244243
src/cdlgmdfevent.ui
@@ -261,19 +260,24 @@ qt5_wrap_ui(UI src/mainwindow.ui
261260

262261
src/cdlgmdfregister.ui
263262
src/cdlgmdfregisterlist.ui
264-
src/cdlgmdfregisterbit.ui
265-
src/cdlgmdfregisterbitlist.ui
266-
src/cdlgmdfregistervalue.ui
267-
src/cdlgmdfregistervaluelist.ui
263+
264+
src/cdlgmdfbit.ui
265+
src/cdlgmdfbitlist.ui
266+
src/cdlgmdfvalue.ui
267+
src/cdlgmdfvaluelist.ui
268268

269269
src/cdlgmdfregistermapping.ui
270270

271271
src/cdlgmdfremotevar.ui
272272
src/cdlgmdfremotevarlist.ui
273-
src/cdlgmdfremotevarbitlist.ui
274-
src/cdlgmdfremotevarbit.ui
275-
src/cdlgmdfremotevarvaluelist.ui
276-
src/cdlgmdfremotevarvalue.ui
273+
# src/cdlgmdfremotevarbitlist.ui
274+
# src/cdlgmdfremotevarbit.ui
275+
# src/cdlgmdfremotevarvaluelist.ui
276+
# src/cdlgmdfremotevarvalue.ui
277+
278+
src/cdlgmdfdm.ui
279+
src/cdlgmdfdmaction.ui
280+
str/cdlgmdfdmactionparam.ui
277281
)
278282

279283
add_executable(${PROJECT_NAME}
@@ -584,25 +588,25 @@ add_executable(${PROJECT_NAME}
584588
src/cdlgmdfregisterlist.cpp
585589
src/cdlgmdfregisterlist.h
586590

587-
build/ui_cdlgmdfregisterbit.h
588-
src/cdlgmdfregisterbit.ui
589-
src/cdlgmdfregisterbit.cpp
590-
src/cdlgmdfregisterbit.h
591+
build/ui_cdlgmdfbit.h
592+
src/cdlgmdfbit.ui
593+
src/cdlgmdfbit.cpp
594+
src/cdlgmdfbit.h
591595

592-
build/ui_cdlgmdfregisterbitlist.h
593-
src/cdlgmdfregisterbitlist.ui
594-
src/cdlgmdfregisterbitlist.cpp
595-
src/cdlgmdfregisterbitlist.h
596+
build/ui_cdlgmdfbitlist.h
597+
src/cdlgmdfbitlist.ui
598+
src/cdlgmdfbitlist.cpp
599+
src/cdlgmdfbitlist.h
596600

597-
build/ui_cdlgmdfregistervalue.h
598-
src/cdlgmdfregistervalue.ui
599-
src/cdlgmdfregistervalue.cpp
600-
src/cdlgmdfregistervalue.h
601+
build/ui_cdlgmdfvalue.h
602+
src/cdlgmdfvalue.ui
603+
src/cdlgmdfvalue.cpp
604+
src/cdlgmdfvalue.h
601605

602-
build/ui_cdlgmdfregistervaluelist.h
603-
src/cdlgmdfregistervaluelist.ui
604-
src/cdlgmdfregistervaluelist.cpp
605-
src/cdlgmdfregistervaluelist.h
606+
build/ui_cdlgmdfvaluelist.h
607+
src/cdlgmdfvaluelist.ui
608+
src/cdlgmdfvaluelist.cpp
609+
src/cdlgmdfvaluelist.h
606610

607611
build/ui_cdlgmdfremotevar.h
608612
src/cdlgmdfremotevar.ui
@@ -614,6 +618,21 @@ add_executable(${PROJECT_NAME}
614618
src/cdlgmdfremotevarlist.cpp
615619
src/cdlgmdfremotevarlist.h
616620

621+
build/ui_cdlgmdfdm.h
622+
src/cdlgmdfdm.ui
623+
src/cdlgmdfdm.cpp
624+
src/cdlgmdfdm.h
625+
626+
build/ui_cdlgmdfdmaction.h
627+
src/cdlgmdfdmaction.ui
628+
src/cdlgmdfdmaction.cpp
629+
src/cdlgmdfdmaction.h
630+
631+
build/ui_cdlgmdfdmactionparam.h
632+
src/cdlgmdfdmactionparam.ui
633+
src/cdlgmdfdmactionparam.cpp
634+
src/cdlgmdfdmactionparam.h
635+
617636
${VSCP_PATH}/src/vscp/common/version.h
618637
${VSCP_PATH}/src/vscp/common/vscp.h
619638
${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h

‎src/cdlgmdfregisterbit.cpp renamed to ‎src/cdlgmdfbit.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
#include <vscpworks.h>
3737

38-
#include "cdlgmdfregisterbit.h"
39-
#include "ui_cdlgmdfregisterbit.h"
38+
#include "cdlgmdfbit.h"
39+
#include "ui_cdlgmdfbit.h"
4040

4141
#include <QColorDialog>
4242
#include <QDate>
@@ -49,15 +49,15 @@
4949
#include <spdlog/sinks/stdout_color_sinks.h>
5050
#include <spdlog/spdlog.h>
5151

52-
const char CDlgMdfRegisterBit::pre_str_registerbit[] = "Register bit: ";
52+
const char CDlgMdfBit::pre_str_registerbit[] = "Register bit: ";
5353

5454
///////////////////////////////////////////////////////////////////////////////
5555
// CTor
5656
//
5757

58-
CDlgMdfRegisterBit::CDlgMdfRegisterBit(QWidget* parent)
58+
CDlgMdfBit::CDlgMdfBit(QWidget* parent)
5959
: QDialog(parent)
60-
, ui(new Ui::CDlgMdfRegisterBit)
60+
, ui(new Ui::CDlgMdfBit)
6161
{
6262
ui->setupUi(this);
6363

@@ -75,7 +75,7 @@ CDlgMdfRegisterBit::CDlgMdfRegisterBit(QWidget* parent)
7575
// DTor
7676
//
7777

78-
CDlgMdfRegisterBit::~CDlgMdfRegisterBit()
78+
CDlgMdfBit::~CDlgMdfBit()
7979
{
8080
delete ui;
8181
}
@@ -85,7 +85,7 @@ CDlgMdfRegisterBit::~CDlgMdfRegisterBit()
8585
//
8686

8787
void
88-
CDlgMdfRegisterBit::initDialogData(CMDF_Bit* pbit, int index, mdf_record_type type)
88+
CDlgMdfBit::initDialogData(CMDF_Bit* pbit, int index, mdf_record_type type)
8989
{
9090
QString str;
9191

@@ -167,7 +167,7 @@ CDlgMdfRegisterBit::initDialogData(CMDF_Bit* pbit, int index, mdf_record_type ty
167167
//
168168

169169
void
170-
CDlgMdfRegisterBit::setInitialFocus(void)
170+
CDlgMdfBit::setInitialFocus(void)
171171
{
172172
// ui->editName->setFocus();
173173
}
@@ -177,27 +177,27 @@ CDlgMdfRegisterBit::setInitialFocus(void)
177177
// ----------------------------------------------------------------------------
178178

179179
QString
180-
CDlgMdfRegisterBit::getName(void)
180+
CDlgMdfBit::getName(void)
181181
{
182182
return ui->editName->text();
183183
};
184184

185185
void
186-
CDlgMdfRegisterBit::setName(const QString& name)
186+
CDlgMdfBit::setName(const QString& name)
187187
{
188188
ui->editName->setText(name);
189189
};
190190

191191
// -----------------------------------------------------------------------
192192

193193
uint8_t
194-
CDlgMdfRegisterBit::getPos(void)
194+
CDlgMdfBit::getPos(void)
195195
{
196196
return ui->spinPos->value();
197197
}
198198

199199
void
200-
CDlgMdfRegisterBit::setPos(uint8_t span)
200+
CDlgMdfBit::setPos(uint8_t span)
201201
{
202202
ui->spinPos->setValue(span);
203203
}
@@ -206,69 +206,69 @@ CDlgMdfRegisterBit::setPos(uint8_t span)
206206
// -----------------------------------------------------------------------
207207

208208
uint8_t
209-
CDlgMdfRegisterBit::getWidth(void)
209+
CDlgMdfBit::getWidth(void)
210210
{
211211
return ui->spinWidth->value();
212212
}
213213

214214
void
215-
CDlgMdfRegisterBit::setWidth(uint8_t span)
215+
CDlgMdfBit::setWidth(uint8_t span)
216216
{
217217
ui->spinWidth->setValue(span);
218218
}
219219

220220
// -----------------------------------------------------------------------
221221

222222
uint8_t
223-
CDlgMdfRegisterBit::getDefault(void)
223+
CDlgMdfBit::getDefault(void)
224224
{
225225
return ui->spinDefault->value();
226226
}
227227

228228
void
229-
CDlgMdfRegisterBit::setDefault(uint8_t span)
229+
CDlgMdfBit::setDefault(uint8_t span)
230230
{
231231
ui->spinDefault->setValue(span);
232232
}
233233

234234
// -----------------------------------------------------------------------
235235

236236
uint8_t
237-
CDlgMdfRegisterBit::getMin(void)
237+
CDlgMdfBit::getMin(void)
238238
{
239239
return ui->spinMin->value();
240240
}
241241

242242
void
243-
CDlgMdfRegisterBit::setMin(uint8_t min)
243+
CDlgMdfBit::setMin(uint8_t min)
244244
{
245245
ui->spinMin->setValue(min);
246246
}
247247

248248
// -----------------------------------------------------------------------
249249

250250
uint8_t
251-
CDlgMdfRegisterBit::getMax(void)
251+
CDlgMdfBit::getMax(void)
252252
{
253253
return ui->spinMax->value();
254254
}
255255

256256
void
257-
CDlgMdfRegisterBit::setMax(uint8_t span)
257+
CDlgMdfBit::setMax(uint8_t span)
258258
{
259259
ui->spinMax->setValue(span);
260260
}
261261

262262
// -----------------------------------------------------------------------
263263

264264
mdf_access_mode
265-
CDlgMdfRegisterBit::getAccess(void)
265+
CDlgMdfBit::getAccess(void)
266266
{
267267
return static_cast<mdf_access_mode>(ui->comboAccess->currentIndex());
268268
}
269269

270270
void
271-
CDlgMdfRegisterBit::setAccess(uint8_t access)
271+
CDlgMdfBit::setAccess(uint8_t access)
272272
{
273273
if (access <= MDF_REG_ACCESS_READ_WRITE) {
274274
ui->comboAccess->setCurrentIndex(access);
@@ -282,7 +282,7 @@ CDlgMdfRegisterBit::setAccess(uint8_t access)
282282
//
283283

284284
void
285-
CDlgMdfRegisterBit::accept()
285+
CDlgMdfBit::accept()
286286
{
287287
std::string str;
288288
if (nullptr != m_pbit) {

‎src/cdlgmdfregisterbit.h renamed to ‎src/cdlgmdfbit.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@
2626
// SOFTWARE.
2727
//
2828

29-
#ifndef CDLGMDFREGISTERBIT_H
30-
#define CDLGMDFREGISTERBIT_H
29+
#ifndef CDLGMDFBIT_H
30+
#define CDLGMDFBIT_H
3131

3232
#include <mdf.h>
3333
#include <vscpworks.h>
3434

3535
#include <QDialog>
3636

3737
namespace Ui {
38-
class CDlgMdfRegisterBit;
38+
class CDlgMdfBit;
3939
}
4040

41-
class CDlgMdfRegisterBit : public QDialog {
41+
class CDlgMdfBit : public QDialog {
4242
Q_OBJECT
4343

4444
public:
4545
public:
46-
explicit CDlgMdfRegisterBit(QWidget* parent = nullptr);
47-
~CDlgMdfRegisterBit();
46+
explicit CDlgMdfBit(QWidget* parent = nullptr);
47+
~CDlgMdfBit();
4848

4949
static const int index_name = 0;
5050
static const int index_pos = 1;
@@ -110,7 +110,7 @@ public slots:
110110
void accept(void);
111111

112112
private:
113-
Ui::CDlgMdfRegisterBit* ui;
113+
Ui::CDlgMdfBit* ui;
114114

115115
/// Pointer to MDF
116116
CMDF* m_pmdf;

‎src/cdlgmdfregisterbit.ui renamed to ‎src/cdlgmdfbit.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>CDlgMdfRegisterBit</class>
4-
<widget class="QDialog" name="CDlgMdfRegisterBit">
3+
<class>CDlgMdfBit</class>
4+
<widget class="QDialog" name="CDlgMdfBit">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -163,7 +163,7 @@
163163
<connection>
164164
<sender>buttonBox</sender>
165165
<signal>accepted()</signal>
166-
<receiver>CDlgMdfRegisterBit</receiver>
166+
<receiver>CDlgMdfBit</receiver>
167167
<slot>accept()</slot>
168168
<hints>
169169
<hint type="sourcelabel">
@@ -179,7 +179,7 @@
179179
<connection>
180180
<sender>buttonBox</sender>
181181
<signal>rejected()</signal>
182-
<receiver>CDlgMdfRegisterBit</receiver>
182+
<receiver>CDlgMdfBit</receiver>
183183
<slot>reject()</slot>
184184
<hints>
185185
<hint type="sourcelabel">

0 commit comments

Comments
 (0)