software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

refactor: rename data member

Browse Source
This commit is contained in:
x-tools-author 2024-03-30 13:20:25 +08:00
parent 5e2f9f624d
commit 8fa75ffd95
9 changed files with 72 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Tools/ToolsUI/xToolsBaseToolUi.cpp
View File

@ -14,10 +14,10 @@ xToolsBaseToolUi::xToolsBaseToolUi(QWidget *parent)
{} {}
void xToolsBaseToolUi::initialize(xToolsBaseTool *tool, void xToolsBaseToolUi::initialize(xToolsBaseTool *tool,
const QString &settingsGroup, const QString &settingsGroup,
const char *loggingCategory) const char *loggingCategory)
{ {
mTool = tool; m_tool = tool;
if (mLoggingCategory) { if (mLoggingCategory) {
delete mLoggingCategory; delete mLoggingCategory;
mLoggingCategory = nullptr; mLoggingCategory = nullptr;

2
Source/Tools/ToolsUI/xToolsBaseToolUi.h
View File

@ -28,5 +28,5 @@ protected:
protected: protected:
QLoggingCategory *mLoggingCategory{nullptr}; QLoggingCategory *mLoggingCategory{nullptr};
xToolsBaseTool *mTool{nullptr}; xToolsBaseTool *m_tool{nullptr};
}; };

31
Source/Tools/ToolsUI/xToolsSerialPortToolUi.cpp
View File

@ -23,20 +23,21 @@ xToolsSerialPortToolUi::~xToolsSerialPortToolUi()
delete ui; delete ui;
} }
void xToolsSerialPortToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) void xToolsSerialPortToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
const QString &settingsGroup)
{ {
if (!(tool && tool->inherits("xToolsSerialPortTool"))) { if (!(tool && tool->inherits("xToolsSerialPortTool"))) {
qWarning() << "Invalid type of communication tool!"; qWarning() << "Invalid type of communication tool!";
return; return;
} }
mTool = qobject_cast<xToolsSerialPortTool *>(tool); m_tool = qobject_cast<xToolsSerialPortTool *>(tool);
mTool->setPortName(ui->comboBoxPortNames->currentText()); m_tool->setPortName(ui->comboBoxPortNames->currentText());
mTool->setBaudRate(ui->comboBoxBaudRate->currentData().toInt()); m_tool->setBaudRate(ui->comboBoxBaudRate->currentData().toInt());
mTool->setDataBits(ui->comboBoxDataBits->currentData().toInt()); m_tool->setDataBits(ui->comboBoxDataBits->currentData().toInt());
mTool->setStopBits(ui->comboBoxStopBits->currentData().toInt()); m_tool->setStopBits(ui->comboBoxStopBits->currentData().toInt());
mTool->setParity(ui->comboBoxParity->currentData().toInt()); m_tool->setParity(ui->comboBoxParity->currentData().toInt());
mTool->setFlowControl(ui->comboBoxFlowControl->currentData().toInt()); m_tool->setFlowControl(ui->comboBoxFlowControl->currentData().toInt());
connect(ui->comboBoxPortNames, connect(ui->comboBoxPortNames,
&QComboBox::currentTextChanged, &QComboBox::currentTextChanged,
@ -73,40 +74,40 @@ void xToolsSerialPortToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const
void xToolsSerialPortToolUi::checkInitializingStatus() void xToolsSerialPortToolUi::checkInitializingStatus()
{ {
Q_ASSERT_X(mTool, __FUNCTION__, "Please call initialze() first!"); Q_ASSERT_X(m_tool, __FUNCTION__, "Please call initialze() first!");
} }
void xToolsSerialPortToolUi::onComboBoxPortNamesCurrentTextChanged() void xToolsSerialPortToolUi::onComboBoxPortNamesCurrentTextChanged()
{ {
checkInitializingStatus(); checkInitializingStatus();
mTool->setPortName(ui->comboBoxPortNames->currentText()); m_tool->setPortName(ui->comboBoxPortNames->currentText());
} }
void xToolsSerialPortToolUi::onComboBoxBaudRateCurrentIndexChanged() void xToolsSerialPortToolUi::onComboBoxBaudRateCurrentIndexChanged()
{ {
checkInitializingStatus(); checkInitializingStatus();
mTool->setBaudRate(ui->comboBoxBaudRate->currentData().toInt()); m_tool->setBaudRate(ui->comboBoxBaudRate->currentData().toInt());
} }
void xToolsSerialPortToolUi::onComboBoxDataBitsCurrentIndexChanged() void xToolsSerialPortToolUi::onComboBoxDataBitsCurrentIndexChanged()
{ {
checkInitializingStatus(); checkInitializingStatus();
mTool->setDataBits(ui->comboBoxDataBits->currentData().toInt()); m_tool->setDataBits(ui->comboBoxDataBits->currentData().toInt());
} }
void xToolsSerialPortToolUi::onComboBoxStopBitsCurrentIndexChanged() void xToolsSerialPortToolUi::onComboBoxStopBitsCurrentIndexChanged()
{ {
mTool->setStopBits(ui->comboBoxStopBits->currentData().toInt()); m_tool->setStopBits(ui->comboBoxStopBits->currentData().toInt());
} }
void xToolsSerialPortToolUi::onComboBoxParityCurrentIndexChanged() void xToolsSerialPortToolUi::onComboBoxParityCurrentIndexChanged()
{ {
checkInitializingStatus(); checkInitializingStatus();
mTool->setParity(ui->comboBoxParity->currentData().toInt()); m_tool->setParity(ui->comboBoxParity->currentData().toInt());
} }
void xToolsSerialPortToolUi::onComboBoxFlowControlCurrentIndexChanged() void xToolsSerialPortToolUi::onComboBoxFlowControlCurrentIndexChanged()
{ {
checkInitializingStatus(); checkInitializingStatus();
mTool->setFlowControl(ui->comboBoxFlowControl->currentData().toInt()); m_tool->setFlowControl(ui->comboBoxFlowControl->currentData().toInt());
} }

2
Source/Tools/ToolsUI/xToolsSerialPortToolUi.h
View File

@ -25,7 +25,7 @@ public:
virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final; virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final;
private: private:
xToolsSerialPortTool *mTool{nullptr}; xToolsSerialPortTool *m_tool{nullptr};
const QLoggingCategory mLoggingCategory{"sak.serialporttoolui"}; const QLoggingCategory mLoggingCategory{"sak.serialporttoolui"};
private: private:

58
Source/Tools/ToolsUI/xToolsSocketClientToolUi.cpp
View File

@ -18,7 +18,6 @@ xToolsSocketClientToolUi::xToolsSocketClientToolUi(QWidget *parent)
, ui(new Ui::xToolsSocketClientToolUi) , ui(new Ui::xToolsSocketClientToolUi)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->widgetAuthentication->hide();
connect(ui->comboBoxClientAddress, connect(ui->comboBoxClientAddress,
static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
@ -82,13 +81,12 @@ void xToolsSocketClientToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
if (!tool->inherits("xToolsWebSocketClientTool")) { if (!tool->inherits("xToolsWebSocketClientTool")) {
ui->labelMessageType->hide(); ui->labelMessageType->hide();
ui->comboBoxMessageType->hide(); ui->comboBoxMessageType->hide();
} else { ui->widgetAuthentication->hide();
ui->widgetAuthentication->show();
} }
mTool = qobject_cast<xToolsSocketClientTool *>(tool); m_tool = qobject_cast<xToolsSocketClientTool *>(tool);
if (!mTool) { if (!m_tool) {
qWarning() << "qobject_cast<>() return nullptr"; Q_ASSERT_X(m_tool, __FUNCTION__, "Invalid xToolsSocketClientTool object!");
return; return;
} }
@ -102,77 +100,77 @@ void xToolsSocketClientToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
ui->lineEditUserName->setGroupKey(settingsGroup, "username"); ui->lineEditUserName->setGroupKey(settingsGroup, "username");
ui->lineEditPassword->setGroupKey(settingsGroup, "password"); ui->lineEditPassword->setGroupKey(settingsGroup, "password");
mTool->setClientIp(ui->comboBoxClientAddress->currentText().trimmed()); m_tool->setClientIp(ui->comboBoxClientAddress->currentText().trimmed());
mTool->setClientPort(ui->spinBoxClientPort->value()); m_tool->setClientPort(ui->spinBoxClientPort->value());
mTool->setServerIp(ui->comboBoxServerAddress->currentText().trimmed()); m_tool->setServerIp(ui->comboBoxServerAddress->currentText().trimmed());
mTool->setServerPort(ui->spinBoxServerPort->value()); m_tool->setServerPort(ui->spinBoxServerPort->value());
mTool->setSpecifyClientIpPort(ui->checkBoxSpecifyIpAndPort->isChecked()); m_tool->setSpecifyClientIpPort(ui->checkBoxSpecifyIpAndPort->isChecked());
connect(mTool, &xToolsSocketClientTool::bindingIpPortChanged, this, [=]() { connect(m_tool, &xToolsSocketClientTool::bindingIpPortChanged, this, [=]() {
QString ipport = mTool->bindingIpPort(); QString ipport = m_tool->bindingIpPort();
ui->labelContext->setText(ipport); ui->labelContext->setText(ipport);
}); });
connect(mTool, &xToolsSocketClientTool::finished, this, [=]() { connect(m_tool, &xToolsSocketClientTool::finished, this, [=]() {
ui->labelContext->setText(tr("Closed")); ui->labelContext->setText(tr("Closed"));
}); });
} }
void xToolsSocketClientToolUi::onComboBoxClientAddressActivated() void xToolsSocketClientToolUi::onComboBoxClientAddressActivated()
{ {
if (mTool) { if (m_tool) {
QString ip = ui->comboBoxClientAddress->currentText().trimmed(); QString ip = ui->comboBoxClientAddress->currentText().trimmed();
mTool->setClientIp(ip); m_tool->setClientIp(ip);
} }
} }
void xToolsSocketClientToolUi::onSpinBoxClientPortValueChanged(int value) void xToolsSocketClientToolUi::onSpinBoxClientPortValueChanged(int value)
{ {
if (mTool) { if (m_tool) {
mTool->setClientPort(value); m_tool->setClientPort(value);
} }
} }
void xToolsSocketClientToolUi::onComboBoxServerAddressCurrentTextChanged() void xToolsSocketClientToolUi::onComboBoxServerAddressCurrentTextChanged()
{ {
if (mTool) { if (m_tool) {
QString ip = ui->comboBoxServerAddress->currentText().trimmed(); QString ip = ui->comboBoxServerAddress->currentText().trimmed();
mTool->setServerIp(ip); m_tool->setServerIp(ip);
} }
} }
void xToolsSocketClientToolUi::onSpinBoxServerPortValueChanged(int value) void xToolsSocketClientToolUi::onSpinBoxServerPortValueChanged(int value)
{ {
if (mTool) { if (m_tool) {
mTool->setServerPort(value); m_tool->setServerPort(value);
} }
} }
void xToolsSocketClientToolUi::onCheckBoxSpecifyIpAndPortClicked() void xToolsSocketClientToolUi::onCheckBoxSpecifyIpAndPortClicked()
{ {
if (mTool) { if (m_tool) {
bool checked = ui->checkBoxSpecifyIpAndPort->isChecked(); bool checked = ui->checkBoxSpecifyIpAndPort->isChecked();
mTool->setSpecifyClientIpPort(checked); m_tool->setSpecifyClientIpPort(checked);
} }
} }
void xToolsSocketClientToolUi::onAuthenticationCheckBoxClicked() void xToolsSocketClientToolUi::onAuthenticationCheckBoxClicked()
{ {
if (mTool) { if (m_tool) {
bool checked = ui->checkBoxAuthentication->isChecked(); bool checked = ui->checkBoxAuthentication->isChecked();
mTool->setAuthentication(checked); m_tool->setAuthentication(checked);
} }
} }
void xToolsSocketClientToolUi::onUserNameLineEditTextChanged(const QString &text) void xToolsSocketClientToolUi::onUserNameLineEditTextChanged(const QString &text)
{ {
if (mTool) { if (m_tool) {
mTool->setUserName(text); m_tool->setUserName(text);
} }
} }
void xToolsSocketClientToolUi::onPasswordLineEditTextChanged(const QString &text) void xToolsSocketClientToolUi::onPasswordLineEditTextChanged(const QString &text)
{ {
if (mTool) { if (m_tool) {
mTool->setPassword(text); m_tool->setPassword(text);
} }
} }

5
Source/Tools/ToolsUI/xToolsSocketClientToolUi.h
View File

@ -25,12 +25,9 @@ public:
virtual void onIsWorkingChanged(bool isWorking) final; virtual void onIsWorkingChanged(bool isWorking) final;
virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final; virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final;
private:
const QLoggingCategory mLoggingCategory{"sak.socketclienttoolui"};
xToolsSocketClientTool *mTool{nullptr};
private: private:
Ui::xToolsSocketClientToolUi *ui{nullptr}; Ui::xToolsSocketClientToolUi *ui{nullptr};
xToolsSocketClientTool *m_tool{nullptr};
public slots: public slots:
void onComboBoxClientAddressActivated(); void onComboBoxClientAddressActivated();

39
Source/Tools/ToolsUI/xToolsSocketServerToolUi.cpp
View File

@ -52,7 +52,8 @@ void xToolsSocketServerToolUi::onIsWorkingChanged(bool isWorking)
ui->checkBoxSpecifyIpAndPort->setEnabled(!isWorking); ui->checkBoxSpecifyIpAndPort->setEnabled(!isWorking);
} }
void xToolsSocketServerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) void xToolsSocketServerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
const QString &settingsGroup)
{ {
if (!tool) { if (!tool) {
return; return;
@ -74,8 +75,8 @@ void xToolsSocketServerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, con
ui->checkBoxSpecifyIpAndPort->hide(); ui->checkBoxSpecifyIpAndPort->hide();
} }
mTool = qobject_cast<xToolsSocketServerTool *>(tool); m_tool = qobject_cast<xToolsSocketServerTool *>(tool);
if (!mTool) { if (!m_tool) {
qWarning() << "qobject_cast<>() return nullptr"; qWarning() << "qobject_cast<>() return nullptr";
return; return;
} }
@ -89,23 +90,23 @@ void xToolsSocketServerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, con
int port = ui->spinBoxServerPort->value(); int port = ui->spinBoxServerPort->value();
bool specified = ui->checkBoxSpecifyIpAndPort->isChecked(); bool specified = ui->checkBoxSpecifyIpAndPort->isChecked();
int messageType = ui->comboBoxMessageType->currentData().toInt(); int messageType = ui->comboBoxMessageType->currentData().toInt();
mTool->setServerIp(ip); m_tool->setServerIp(ip);
; ;
mTool->setServerPort(port); m_tool->setServerPort(port);
mTool->setSpecifyIpAndPort(specified); m_tool->setSpecifyIpAndPort(specified);
mTool->setMessageType(messageType); m_tool->setMessageType(messageType);
connect(mTool, &xToolsSocketServerTool::bindingIpPortChanged, this, [=]() { connect(m_tool, &xToolsSocketServerTool::bindingIpPortChanged, this, [=]() {
QString ipport = mTool->bindingIpPort(); QString ipport = m_tool->bindingIpPort();
ui->labelBindingInfo->setText(ipport); ui->labelBindingInfo->setText(ipport);
}); });
connect(mTool, &xToolsSocketServerTool::finished, this, [=]() { connect(m_tool, &xToolsSocketServerTool::finished, this, [=]() {
ui->labelBindingInfo->setText(tr("Closed")); ui->labelBindingInfo->setText(tr("Closed"));
}); });
connect(mTool, &xToolsSocketServerTool::clientsChanged, this, [=]() { connect(m_tool, &xToolsSocketServerTool::clientsChanged, this, [=]() {
int index = ui->comboBoxClientList->currentIndex(); int index = ui->comboBoxClientList->currentIndex();
QString first = ui->comboBoxClientList->itemText(0); QString first = ui->comboBoxClientList->itemText(0);
QStringList clients = mTool->clients(); QStringList clients = m_tool->clients();
int count = ui->comboBoxClientList->count(); int count = ui->comboBoxClientList->count();
ui->comboBoxClientList->clear(); ui->comboBoxClientList->clear();
@ -119,32 +120,32 @@ void xToolsSocketServerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, con
void xToolsSocketServerToolUi::onComboBoxServerIpActived() void xToolsSocketServerToolUi::onComboBoxServerIpActived()
{ {
if (mTool) { if (m_tool) {
mTool->setServerIp(ui->comboBoxServerIp->currentText().trimmed()); m_tool->setServerIp(ui->comboBoxServerIp->currentText().trimmed());
} }
} }
void xToolsSocketServerToolUi::onSpinBoxServerPortValueChanged(int value) void xToolsSocketServerToolUi::onSpinBoxServerPortValueChanged(int value)
{ {
if (mTool) { if (m_tool) {
mTool->setServerPort(value); m_tool->setServerPort(value);
} }
} }
void xToolsSocketServerToolUi::onComboBoxClientsIndexChanged() void xToolsSocketServerToolUi::onComboBoxClientsIndexChanged()
{ {
int index = ui->comboBoxClientList->currentIndex(); int index = ui->comboBoxClientList->currentIndex();
mTool->setClientIndex(index - 1); m_tool->setClientIndex(index - 1);
} }
void xToolsSocketServerToolUi::onComboBoxMessageTypeIndexChanged() void xToolsSocketServerToolUi::onComboBoxMessageTypeIndexChanged()
{ {
int messageType = ui->comboBoxMessageType->currentData().toInt(); int messageType = ui->comboBoxMessageType->currentData().toInt();
mTool->setMessageType(messageType); m_tool->setMessageType(messageType);
} }
void xToolsSocketServerToolUi::onCheckBoxSpecifyIpAndPortClicked() void xToolsSocketServerToolUi::onCheckBoxSpecifyIpAndPortClicked()
{ {
bool specified = ui->checkBoxSpecifyIpAndPort->isChecked(); bool specified = ui->checkBoxSpecifyIpAndPort->isChecked();
mTool->setSpecifyIpAndPort(specified); m_tool->setSpecifyIpAndPort(specified);
} }

2
Source/Tools/ToolsUI/xToolsSocketServerToolUi.h
View File

@ -26,7 +26,7 @@ public:
virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final; virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final;
private: private:
xToolsSocketServerTool *mTool{nullptr}; xToolsSocketServerTool *m_tool{nullptr};
const QLoggingCategory mLoggingCategory{"sak.socketservertoolui"}; const QLoggingCategory mLoggingCategory{"sak.socketservertoolui"};
private: private:

2
Source/Tools/ToolsUI/xToolsTransmitterToolUi.cpp
View File

@ -17,7 +17,7 @@ xToolsTransmitterToolUi::xToolsTransmitterToolUi(const char *lg, QWidget *parent
void xToolsTransmitterToolUi::afterRowEdited(int row) void xToolsTransmitterToolUi::afterRowEdited(int row)
{ {
xToolsTransmitterTool *cookedTool = Q_NULLPTR; xToolsTransmitterTool *cookedTool = Q_NULLPTR;
cookedTool = qobject_cast<xToolsTransmitterTool *>(mTool); cookedTool = qobject_cast<xToolsTransmitterTool *>(m_tool);
if (!cookedTool) { if (!cookedTool) {
return; return;
} }