From 0bb4e0442646ef42ffd55d65eea652f37e60bff9 Mon Sep 17 00:00:00 2001 From: hoshinohikari Date: Thu, 11 Aug 2022 00:19:44 +0900 Subject: [PATCH 1/2] add cmake. build for qt6.2.4 --- .gitignore | 2 + CMakeLists.txt | 23 ++++++ src/sokit/baseform.cpp | 54 ++++++------ src/sokit/baseform.h | 18 ++-- src/sokit/clientform.cpp | 55 +++++++------ src/sokit/clientform.h | 17 ++-- src/sokit/clientskt.cpp | 48 ++++++----- src/sokit/clientskt.h | 29 ++++--- src/sokit/helpform.cpp | 8 +- src/sokit/helpform.h | 8 +- src/sokit/logger.cpp | 53 ++++++------ src/sokit/logger.h | 12 +-- src/sokit/main.cpp | 38 +++++---- src/sokit/main.h | 4 +- src/sokit/notepadform.cpp | 45 +++++----- src/sokit/notepadform.h | 10 +-- src/sokit/serverform.cpp | 57 +++++++------ src/sokit/serverform.h | 19 ++--- src/sokit/serverskt.cpp | 92 ++++++++++----------- src/sokit/serverskt.h | 45 +++++----- src/sokit/setting.cpp | 19 ++--- src/sokit/setting.h | 8 +- src/sokit/toolkit.cpp | 144 ++++++++++++++++---------------- src/sokit/toolkit.h | 11 ++- src/sokit/transferform.cpp | 58 ++++++------- src/sokit/transferform.h | 20 ++--- src/sokit/transferskt.cpp | 163 +++++++++++++++++++------------------ src/sokit/transferskt.h | 48 +++++------ 28 files changed, 560 insertions(+), 548 deletions(-) create mode 100644 CMakeLists.txt diff --git a/.gitignore b/.gitignore index 6e30767..834a932 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /bin /out /tmp +/.vs +CMakePresets.json \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..e3d9fce --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.12) + +project(sokit LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +find_package(Qt6 REQUIRED COMPONENTS Widgets Network) +find_package(Qt6LinguistTools) + +file(GLOB SRC_FILES "src/sokit/*.cpp" "src/sokit/*.qrc" "src/sokit/*.rc" "src/sokit/*.ui") +file(GLOB HEAD_FILES "src/sokit/*.h") + +add_executable(${PROJECT_NAME} ${SRC_FILES} ${HEAD_FILES} ) + +qt_add_translations(${PROJECT_NAME} TS_FILES "src/sokit/sokit.ts") + +target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Network ) \ No newline at end of file diff --git a/src/sokit/baseform.cpp b/src/sokit/baseform.cpp index 264b648..89195e1 100644 --- a/src/sokit/baseform.cpp +++ b/src/sokit/baseform.cpp @@ -17,7 +17,7 @@ #define PROP_TARG "targ" BaseForm::BaseForm(QWidget* p, Qt::WindowFlags f) -:QWidget(p, f),m_cntRecv(0),m_cntSend(0),m_labRecv(0),m_labSend(0),m_cnlist(0) + : QWidget(p, f), m_cntRecv(0), m_cntSend(0), m_labRecv(nullptr), m_labSend(nullptr), m_cnlist(nullptr) { } @@ -52,26 +52,27 @@ void BaseForm::initLogger(QCheckBox* w, QToolButton* c, QTreeWidget* o, QPlainTe bindFocus(o, Qt::Key_F3); - QShortcut* wr = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this); - QShortcut* cl = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_D), this); - QShortcut* sl = new QShortcut(QKeySequence(Qt::Key_F4), this); + auto wr = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_W), this); + auto cl = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_D), this); + auto sl = new QShortcut(QKeySequence(Qt::Key_F4), this); - sl->setProperty(PROP_TARG, qVariantFromValue((void*)d)); + sl->setProperty(PROP_TARG, QVariant::fromValue(static_cast(d))); connect(wr, SIGNAL(activated()), w, SLOT(click())); connect(sl, SIGNAL(activated()), this, SLOT(hotOutput())); connect(cl, SIGNAL(activated()), this, SLOT(clear())); connect(this, SIGNAL(output(const QString&)), &m_logger, SLOT(output(const QString&))); - connect(this, SIGNAL(output(const QString&, const char*, quint32)), &m_logger, SLOT(output(const QString&, const char*, quint32))); + connect(this, SIGNAL(output(const QString&, const char*, quint32)), &m_logger, + SLOT(output(const QString&, const char*, quint32))); } void BaseForm::initLister(QToolButton* a, QToolButton* k, QListWidget* l) { m_cnlist = l; - QShortcut* sk = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_K), this); - QShortcut* sa = new QShortcut(QKeySequence(Qt::ALT + Qt::Key_A), this); + auto sk = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_K), this); + auto sa = new QShortcut(QKeySequence(Qt::ALT | Qt::Key_A), this); connect(sk, SIGNAL(activated()), this, SLOT(kill())); connect(sa, SIGNAL(activated()), m_cnlist, SLOT(selectAll())); @@ -84,33 +85,33 @@ void BaseForm::initLister(QToolButton* a, QToolButton* k, QListWidget* l) void BaseForm::bindBuffer(qint32 id, QLineEdit* e, QToolButton* s, QComboBox* d) { - s->setProperty(PROP_EDIT, qVariantFromValue((void*)e)); - s->setProperty(PROP_DIRT, qVariantFromValue((void*)d)); + s->setProperty(PROP_EDIT, QVariant::fromValue(static_cast(e))); + s->setProperty(PROP_DIRT, QVariant::fromValue(static_cast(d))); connect(s, SIGNAL(released()), this, SLOT(send())); - bindClick(s, Qt::Key_0 + id + Qt::CTRL); - bindFocus(e, Qt::Key_0 + id + Qt::ALT); - bindFocus(d, Qt::Key_0 + id + Qt::CTRL + Qt::SHIFT); + bindClick(s, Qt::Key_0 + id | Qt::CTRL); + bindFocus(e, Qt::Key_0 + id | Qt::ALT); + bindFocus(d, Qt::Key_0 + id | Qt::CTRL | Qt::SHIFT); } void BaseForm::bindFocus(QWidget* w, qint32 k) { - QShortcut* s = new QShortcut(QKeySequence(k), this); - s->setProperty(PROP_TARG, qVariantFromValue((void*)w)); + auto s = new QShortcut(QKeySequence(k), this); + s->setProperty(PROP_TARG, QVariant::fromValue(static_cast(w))); connect(s, SIGNAL(activated()), this, SLOT(focus())); } void BaseForm::bindClick(QAbstractButton* b, qint32 k) { - QShortcut* s = new QShortcut(QKeySequence(k), this); + auto s = new QShortcut(QKeySequence(k), this); connect(s, SIGNAL(activated()), b, SLOT(click())); } void BaseForm::bindSelect(QComboBox* b, qint32 i, qint32 k) { - QShortcut* s = new QShortcut(QKeySequence(k), this); - s->setProperty(PROP_TARG, qVariantFromValue((void*)b)); + auto s = new QShortcut(QKeySequence(k), this); + s->setProperty(PROP_TARG, QVariant::fromValue(static_cast(b))); s->setObjectName(QString::number(i)); connect(s, SIGNAL(activated()), this, SLOT(select())); @@ -118,13 +119,13 @@ void BaseForm::bindSelect(QComboBox* b, qint32 i, qint32 k) void BaseForm::focus() { - QWidget* w = (QWidget*)sender()->property(PROP_TARG).value(); + auto w = static_cast(sender()->property(PROP_TARG).value()); if (w) w->setFocus(Qt::TabFocusReason); } void BaseForm::hotOutput() { - QPlainTextEdit* t = (QPlainTextEdit*)sender()->property(PROP_TARG).value(); + auto t = static_cast(sender()->property(PROP_TARG).value()); if (t) { t->setFocus(Qt::TabFocusReason); @@ -134,7 +135,7 @@ void BaseForm::hotOutput() void BaseForm::select() { - QComboBox* b = (QComboBox*)sender()->property(PROP_TARG).value(); + auto b = static_cast(sender()->property(PROP_TARG).value()); if (b && b->isEnabled()) { qint32 i = sender()->objectName().toInt(); @@ -153,7 +154,7 @@ void BaseForm::countRecv(qint32 bytes) if (bytes < 0) m_cntRecv = 0; else - m_cntRecv += bytes; + m_cntRecv += bytes; m_labRecv->setText(QString::number(m_cntRecv)); } @@ -170,10 +171,10 @@ void BaseForm::countSend(qint32 bytes) void BaseForm::send() { - QLineEdit* e = (QLineEdit*)sender()->property(PROP_EDIT).value(); - QComboBox* d = (QComboBox*)sender()->property(PROP_DIRT).value(); + auto e = static_cast(sender()->property(PROP_EDIT).value()); + auto d = static_cast(sender()->property(PROP_DIRT).value()); if (e) - send(e->text(), (d?d->currentText():"")); + send(e->text(), (d ? d->currentText() : "")); } void BaseForm::clear() @@ -222,8 +223,7 @@ void BaseForm::listerRemove(const QString& caption) while (i--) { QListWidgetItem* itm = m_cnlist->item(i); - if (itm && itm->text()==caption) + if (itm && itm->text() == caption) delete m_cnlist->takeItem(i); } } - diff --git a/src/sokit/baseform.h b/src/sokit/baseform.h index 90f5b50..c53ca2e 100644 --- a/src/sokit/baseform.h +++ b/src/sokit/baseform.h @@ -8,18 +8,23 @@ class QLabel; class QListWidget; + class BaseForm : public QWidget { Q_OBJECT public: - BaseForm(QWidget* p=0, Qt::WindowFlags f=0); - virtual ~BaseForm(); + BaseForm(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags(0)); + ~BaseForm() override; bool init(); protected: - bool lock() { m_door.lock(); return true; }; + bool lock() + { + m_door.lock(); + return true; + }; bool lock(qint32 w) { return m_door.tryLock(w); }; void unlock() { m_door.unlock(); }; @@ -37,7 +42,10 @@ class BaseForm : public QWidget virtual bool initHotkeys() =0; virtual void initConfig() =0; virtual void saveConfig() =0; - virtual void kill(QStringList& /*list*/) {}; + + virtual void kill(QStringList& /*list*/) + { + }; virtual void send(const QString& data, const QString& dir) =0; signals: @@ -72,5 +80,3 @@ protected slots: }; #endif // __BASEFORM_H__ - - diff --git a/src/sokit/clientform.cpp b/src/sokit/clientform.cpp index f0e02a9..f01e550 100644 --- a/src/sokit/clientform.cpp +++ b/src/sokit/clientform.cpp @@ -12,7 +12,7 @@ #define SET_VAL_LGCLT "log_client" ClientForm::ClientForm(QWidget* p, Qt::WindowFlags f) -:BaseForm(p, f),m_client(0) + : BaseForm(p, f), m_client(nullptr) { m_ui.setupUi(this); } @@ -28,10 +28,10 @@ bool ClientForm::initForm() initCounter(m_ui.labRecv, m_ui.labSend); initLogger(m_ui.chkLog, m_ui.btnClear, m_ui.treeOutput, m_ui.txtOutput); - bindBuffer(0, m_ui.edtBuf0, m_ui.btnSend0, 0); - bindBuffer(1, m_ui.edtBuf1, m_ui.btnSend1, 0); - bindBuffer(2, m_ui.edtBuf2, m_ui.btnSend2, 0); - bindBuffer(3, m_ui.edtBuf3, m_ui.btnSend3, 0); + bindBuffer(0, m_ui.edtBuf0, m_ui.btnSend0, nullptr); + bindBuffer(1, m_ui.edtBuf1, m_ui.btnSend1, nullptr); + bindBuffer(2, m_ui.edtBuf2, m_ui.btnSend2, nullptr); + bindBuffer(3, m_ui.edtBuf3, m_ui.btnSend3, nullptr); connect(m_ui.btnTcp, SIGNAL(clicked(bool)), this, SLOT(trigger(bool))); connect(m_ui.btnUdp, SIGNAL(clicked(bool)), this, SLOT(trigger(bool))); @@ -42,10 +42,11 @@ bool ClientForm::initForm() void ClientForm::initConfig() { QString ssc(SET_SEC_CLT); - Setting::lord(ssc+SET_KEY_CMBIP, SET_PFX_CMBITM, *m_ui.cmbAddr); - Setting::lord(ssc+SET_KEY_CMBPT, SET_PFX_CMBITM, *m_ui.cmbPort); + Setting::lord(ssc + SET_KEY_CMBIP, SET_PFX_CMBITM, *m_ui.cmbAddr); + Setting::lord(ssc + SET_KEY_CMBPT, SET_PFX_CMBITM, *m_ui.cmbPort); - QString skl(SET_SEC_DIR); skl += SET_KEY_LOG; + QString skl(SET_SEC_DIR); + skl += SET_KEY_LOG; skl = Setting::get(skl, SET_KEY_CLT, SET_VAL_LGCLT); setProperty(SET_SEC_DIR, skl); @@ -55,29 +56,30 @@ void ClientForm::initConfig() void ClientForm::saveConfig() { QString ssc(SET_SEC_CLT); - Setting::save(ssc+SET_KEY_CMBIP, SET_PFX_CMBITM, *m_ui.cmbAddr); - Setting::save(ssc+SET_KEY_CMBPT, SET_PFX_CMBITM, *m_ui.cmbPort); + Setting::save(ssc + SET_KEY_CMBIP, SET_PFX_CMBITM, *m_ui.cmbAddr); + Setting::save(ssc + SET_KEY_CMBPT, SET_PFX_CMBITM, *m_ui.cmbPort); - QString skl(SET_SEC_DIR); skl += SET_KEY_LOG; + QString skl(SET_SEC_DIR); + skl += SET_KEY_LOG; Setting::set(skl, SET_KEY_CLT, property(SET_SEC_DIR).toString()); } bool ClientForm::initHotkeys() { bindFocus(m_ui.cmbAddr, Qt::Key_Escape); - bindClick(m_ui.btnTcp, Qt::CTRL + Qt::Key_T); - bindClick(m_ui.btnUdp, Qt::CTRL + Qt::Key_U); + bindClick(m_ui.btnTcp, Qt::CTRL | Qt::Key_T); + bindClick(m_ui.btnUdp, Qt::CTRL | Qt::Key_U); return true; } void ClientForm::unplug() { - ClientSkt* client = 0; + ClientSkt* client = nullptr; if (lock()) { client = m_client; - m_client = NULL; + m_client = nullptr; unlock(); } @@ -87,13 +89,13 @@ void ClientForm::unplug() void ClientForm::unpluged() { - ClientSkt* c = qobject_cast(sender()); + auto c = qobject_cast(sender()); if (!c) return; if (lock()) { - if (c==m_client) - m_client = NULL; + if (c == m_client) + m_client = nullptr; unlock(); } @@ -114,14 +116,14 @@ void ClientForm::trigger(bool checked) m_ui.cmbAddr->setDisabled(checked); m_ui.cmbPort->setDisabled(checked); - QToolButton* btn = qobject_cast(sender()); - if (checked && !plug(btn==m_ui.btnTcp)) + auto btn = qobject_cast(sender()); + if (checked && !plug(btn == m_ui.btnTcp)) btn->click(); } bool ClientForm::plug(bool istcp) { - ClientSkt* skt = 0; + ClientSkt* skt = nullptr; lock(); @@ -129,11 +131,11 @@ bool ClientForm::plug(bool istcp) { m_client->disconnect(this); m_client->deleteLater(); - m_client = NULL; + m_client = nullptr; } IPAddr addr; - bool res = TK::popIPAddr(m_ui.cmbAddr, m_ui.cmbPort, addr); + bool res = TK::popIPAddr(m_ui.cmbAddr, m_ui.cmbPort, addr); if (res) { @@ -150,10 +152,11 @@ bool ClientForm::plug(bool istcp) { connect(m_client, SIGNAL(unpluged()), this, SLOT(unpluged())); connect(m_client, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); - connect(m_client, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); + connect(m_client, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, + SIGNAL(output(const QString&,const char*,quint32))); connect(m_client, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); connect(m_client, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); - + skt = m_client; } } @@ -179,5 +182,3 @@ void ClientForm::send(const QString& data, const QString&) unlock(); } } - - diff --git a/src/sokit/clientform.h b/src/sokit/clientform.h index e4fc918..00d1953 100644 --- a/src/sokit/clientform.h +++ b/src/sokit/clientform.h @@ -5,20 +5,21 @@ #include "baseform.h" class ClientSkt; + class ClientForm : public BaseForm { Q_OBJECT public: - ClientForm(QWidget* p=0, Qt::WindowFlags f=0); - virtual ~ClientForm(); + ClientForm(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags(0)); + ~ClientForm() override; protected: - virtual bool initForm(); - virtual bool initHotkeys(); - virtual void initConfig(); - virtual void saveConfig(); - virtual void send(const QString& data, const QString& dir); + bool initForm() override; + bool initHotkeys() override; + void initConfig() override; + void saveConfig() override; + void send(const QString& data, const QString& dir) override; private: bool plug(bool istcp); @@ -34,5 +35,3 @@ private slots: }; #endif // __CLIENTFORM_H__ - - diff --git a/src/sokit/clientskt.cpp b/src/sokit/clientskt.cpp index 2d9625a..a83c990 100644 --- a/src/sokit/clientskt.cpp +++ b/src/sokit/clientskt.cpp @@ -4,8 +4,8 @@ #define MAXBUFFER 1024*1024 -ClientSkt::ClientSkt(QObject *parent) -: QObject(parent),m_port(0) +ClientSkt::ClientSkt(QObject* parent) + : QObject(parent), m_port(0) { } @@ -15,7 +15,7 @@ ClientSkt::~ClientSkt() bool ClientSkt::plug(const QHostAddress& ip, quint16 port) { - m_ip = ip; + m_ip = ip; m_port = port; m_error.clear(); @@ -52,7 +52,7 @@ void ClientSkt::send(const QString& data) if (!TK::ascii2bin(data, bin, err)) { - show("bad data format to send: "+err); + show("bad data format to send: " + err); return; } @@ -61,7 +61,7 @@ void ClientSkt::send(const QString& data) void ClientSkt::dump(const char* buf, qint32 len, bool isSend) { - emit dumpbin(QString("DAT %1").arg(isSend?"<---":"--->"), buf, (quint32)len); + emit dumpbin(QString("DAT %1").arg(isSend ? "<---" : "--->"), buf, static_cast(len)); } void ClientSkt::show(const QString& msg) @@ -69,8 +69,8 @@ void ClientSkt::show(const QString& msg) emit message(msg); } -ClientSktTcp::ClientSktTcp(QObject *parent) -:ClientSkt(parent) +ClientSktTcp::ClientSktTcp(QObject* parent) + : ClientSkt(parent) { } @@ -98,7 +98,7 @@ void ClientSktTcp::close() void ClientSktTcp::error() { - QTcpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); show(QString("TCP socket error %1, %2").arg(s->error()).arg(s->errorString())); @@ -108,7 +108,7 @@ void ClientSktTcp::error() void ClientSktTcp::asynConn() { show(QString("TCP connection to %1:%2 opened!") - .arg(addr().toString()).arg(port())); + .arg(addr().toString()).arg(port())); } void ClientSktTcp::closed() @@ -118,7 +118,7 @@ void ClientSktTcp::closed() void ClientSktTcp::newData() { - QTcpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); if (!s) return; qint64 bufLen = s->bytesAvailable(); @@ -131,7 +131,7 @@ void ClientSktTcp::newData() while (ioLen > 0) { readLen += ioLen; - ioLen = s->read(buf+readLen, bufLen-readLen); + ioLen = s->read(buf + readLen, bufLen - readLen); } if (ioLen >= 0) @@ -145,7 +145,7 @@ void ClientSktTcp::newData() void ClientSktTcp::send(const QByteArray& bin) { - const char * src = bin.constData(); + const char* src = bin.constData(); qint64 srcLen = bin.length(); qint64 writeLen = 0; @@ -154,13 +154,13 @@ void ClientSktTcp::send(const QByteArray& bin) while (ioLen > 0) { writeLen += ioLen; - ioLen = m_socket.write(src+writeLen, srcLen-writeLen); + ioLen = m_socket.write(src + writeLen, srcLen - writeLen); } if (writeLen != srcLen) { show(QString("failed to send data to %1:%2 [%3]") - .arg(addr().toString()).arg(port()).arg(writeLen)); + .arg(addr().toString()).arg(port()).arg(writeLen)); return; } @@ -168,8 +168,8 @@ void ClientSktTcp::send(const QByteArray& bin) dump(src, srcLen, true); } -ClientSktUdp::ClientSktUdp(QObject *parent) -:ClientSkt(parent) +ClientSktUdp::ClientSktUdp(QObject* parent) + : ClientSkt(parent) { } @@ -180,7 +180,7 @@ ClientSktUdp::~ClientSktUdp() void ClientSktUdp::asynConn() { show(QString("UDP channel to %1:%2 opened!") - .arg(addr().toString()).arg(port())); + .arg(addr().toString()).arg(port())); } void ClientSktUdp::closed() @@ -196,7 +196,7 @@ void ClientSktUdp::close() void ClientSktUdp::error() { - QUdpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); show(QString("UDP socket error %1, %2").arg(s->error()).arg(s->errorString())); @@ -217,7 +217,7 @@ bool ClientSktUdp::open() void ClientSktUdp::newData() { - QUdpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); if (!s) return; qint64 bufLen = s->bytesAvailable(); @@ -230,7 +230,7 @@ void ClientSktUdp::newData() while (ioLen > 0) { readLen += ioLen; - ioLen = s->read(buf+readLen, bufLen-readLen); + ioLen = s->read(buf + readLen, bufLen - readLen); } if (ioLen >= 0) @@ -244,7 +244,7 @@ void ClientSktUdp::newData() void ClientSktUdp::send(const QByteArray& bin) { - const char * src = bin.constData(); + const char* src = bin.constData(); qint64 srcLen = bin.length(); qint64 writeLen = 0; @@ -253,18 +253,16 @@ void ClientSktUdp::send(const QByteArray& bin) while (ioLen > 0) { writeLen += ioLen; - ioLen = (writeLen >= srcLen) ? 0 : - m_socket.write(src+writeLen, srcLen-writeLen); + ioLen = (writeLen >= srcLen) ? 0 : m_socket.write(src + writeLen, srcLen - writeLen); } if (writeLen != srcLen) { show(QString("failed to send data to %1:%2 [%3]") - .arg(addr().toString()).arg(port()).arg(writeLen)); + .arg(addr().toString()).arg(port()).arg(writeLen)); return; } recordSend(writeLen); dump(src, srcLen, true); } - diff --git a/src/sokit/clientskt.h b/src/sokit/clientskt.h index d3f14c9..c8e0515 100644 --- a/src/sokit/clientskt.h +++ b/src/sokit/clientskt.h @@ -9,8 +9,8 @@ class ClientSkt : public QObject Q_OBJECT public: - ClientSkt(QObject *parent=0); - virtual ~ClientSkt(); + ClientSkt(QObject* parent = nullptr); + ~ClientSkt() override; virtual QString name() const { return "General"; }; @@ -54,15 +54,15 @@ class ClientSktTcp : public ClientSkt Q_OBJECT public: - ClientSktTcp(QObject *parent=0); - ~ClientSktTcp(); + ClientSktTcp(QObject* parent = nullptr); + ~ClientSktTcp() override; - virtual QString name() const { return "TCP"; }; + QString name() const override { return "TCP"; }; protected: - virtual bool open(); - virtual void close(); - virtual void send(const QByteArray& bin); + bool open() override; + void close() override; + void send(const QByteArray& bin) override; private slots: void asynConn(); @@ -79,15 +79,15 @@ class ClientSktUdp : public ClientSkt Q_OBJECT public: - ClientSktUdp(QObject *parent=0); - ~ClientSktUdp(); + ClientSktUdp(QObject* parent = nullptr); + ~ClientSktUdp() override; - virtual QString name() const { return "UDP"; }; + QString name() const override { return "UDP"; }; protected: - virtual bool open(); - virtual void close(); - virtual void send(const QByteArray& bin); + bool open() override; + void close() override; + void send(const QByteArray& bin) override; private slots: void asynConn(); @@ -100,4 +100,3 @@ private slots: }; #endif // __CLIENTSKT_H__ - diff --git a/src/sokit/helpform.cpp b/src/sokit/helpform.cpp index 0526f7e..bf67664 100644 --- a/src/sokit/helpform.cpp +++ b/src/sokit/helpform.cpp @@ -5,7 +5,7 @@ #include #include -HelpForm::HelpForm(QWidget* p, Qt::WindowFlags f):QDialog(p, f) +HelpForm::HelpForm(QWidget* p, Qt::WindowFlags f): QDialog(p, f) { m_ui.setupUi(this); init(); @@ -17,10 +17,6 @@ HelpForm::~HelpForm() void HelpForm::init() { - QShortcut* k = new QShortcut(QKeySequence(Qt::Key_F1), this); + auto k = new QShortcut(QKeySequence(Qt::Key_F1), this); connect(k, SIGNAL(activated()), this, SLOT(close())); - } - - - diff --git a/src/sokit/helpform.h b/src/sokit/helpform.h index 693a71e..2225c35 100644 --- a/src/sokit/helpform.h +++ b/src/sokit/helpform.h @@ -8,8 +8,8 @@ class HelpForm : public QDialog Q_OBJECT public: - HelpForm(QWidget* p=0, Qt::WindowFlags f=0); - virtual ~HelpForm(); + HelpForm(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags(0)); + ~HelpForm() override; private: void init(); @@ -19,7 +19,3 @@ class HelpForm : public QDialog }; #endif // __HELPFORM_H__ - - - - diff --git a/src/sokit/logger.cpp b/src/sokit/logger.cpp index d976802..e6cc74e 100644 --- a/src/sokit/logger.cpp +++ b/src/sokit/logger.cpp @@ -13,8 +13,8 @@ #define SET_MAX_LOGITM 100 #define SET_MAX_LOGTRM 30 -Logger::Logger(QObject *parent) -: QObject(parent),m_chkWrite(0),m_treeOut(0),m_textOut(0) +Logger::Logger(QObject* parent) + : QObject(parent), m_chkWrite(nullptr), m_treeOut(nullptr), m_textOut(nullptr) { } @@ -37,26 +37,26 @@ void Logger::init(QTreeWidget* o, QCheckBox* w, QPlainTextEdit* d) if (m_chkWrite) m_chkWrite->disconnect(this); - m_treeOut = o; + m_treeOut = o; m_textOut = d; - m_chkWrite = w; + m_chkWrite = w; if (m_treeOut && m_textOut && m_chkWrite) { QList ks; - ks << QKeySequence(Qt::CTRL + Qt::Key_D); + ks << QKeySequence(Qt::CTRL | Qt::Key_D); - QAction* copy = new QAction(tr("Copy"), this); + auto copy = new QAction(tr("Copy"), this); copy->setShortcuts(QKeySequence::Copy); connect(copy, SIGNAL(triggered()), this, SLOT(copy())); - QAction* clear = new QAction(tr("Clear"), this); + auto clear = new QAction(tr("Clear"), this); clear->setShortcuts(ks); connect(clear, SIGNAL(triggered()), this, SIGNAL(clearLog())); - QAction* all = new QAction(tr("Select All"), this); + auto all = new QAction(tr("Select All"), this); all->setShortcuts(QKeySequence::SelectAll); - connect(all, SIGNAL(triggered()), m_textOut, SLOT(selectAll())); + connect(all, SIGNAL(triggered()), m_textOut, SLOT(selectAll())); m_cmlog.addAction(copy); m_cmlog.addSeparator(); @@ -90,7 +90,7 @@ void Logger::syncOutput() void Logger::ctxmenu(const QPoint& pos) { - if (sender() == (QObject*)m_treeOut) + if (sender() == static_cast(m_treeOut)) m_cmlog.exec(m_treeOut->mapToGlobal(pos)); else m_cmtxt.exec(m_textOut->mapToGlobal(pos)); @@ -98,7 +98,7 @@ void Logger::ctxmenu(const QPoint& pos) void Logger::copy() { - if (sender() == (QObject*)m_treeOut) + if (sender() == static_cast(m_treeOut)) { QList list = m_treeOut->selectedItems(); if (!list.isEmpty()) @@ -118,17 +118,20 @@ const QString Logger::getLogFileName() if (!m_dir.isEmpty()) { QDir d; - if (d.exists(m_dir) || d.mkpath(m_dir)) { + if (d.exists(m_dir) || d.mkpath(m_dir)) + { i = 0; break; } } - m_dir = Setting::path() + "/" + property(SET_SEC_DIR).toString(); + m_dir = Setting::path() + "/" + property(SET_SEC_DIR).toString(); } - return (i==2) ? QString() : m_dir + QDir::separator() + - QDate::currentDate().toString("yyyyMMdd.log"); + return (i == 2) + ? QString() + : m_dir + QDir::separator() + + QDate::currentDate().toString("yyyyMMdd.log"); } void Logger::writeLogFile(const QString& info) @@ -139,14 +142,14 @@ void Logger::writeLogFile(const QString& info) m_file.close(); m_file.setFileName(getLogFileName()); - if (m_file.open(QIODevice::Append| - QIODevice::WriteOnly| - QIODevice::Text)) + if (m_file.open(QIODevice::Append | + QIODevice::WriteOnly | + QIODevice::Text)) { QByteArray a(info.toUtf8()); const char* d = a.data(); - for (int n=a.size(); n>0;) + for (int n = a.size(); n > 0;) { int w = m_file.write(d, n); @@ -184,7 +187,7 @@ void Logger::pack() QTreeWidgetItem* Logger::appendLogEntry(QTreeWidgetItem* p, const QString& t) { - QTreeWidgetItem* res = new QTreeWidgetItem(p); + auto res = new QTreeWidgetItem(p); if (res) { res->setText(0, t); @@ -204,16 +207,16 @@ QTreeWidgetItem* Logger::appendLogEntry(QTreeWidgetItem* p, const QString& t) void Logger::output(const QString& title, const QString& info) { - QTreeWidgetItem* it = new QTreeWidgetItem(0); + auto it = new QTreeWidgetItem(0); if (!it) return; QString lab(QTime::currentTime().toString("HH:mm:ss ")); - + lab += title; lab += ' '; lab += info; - appendLogEntry(0, lab); + appendLogEntry(nullptr, lab); pack(); @@ -226,7 +229,7 @@ void Logger::output(const QString& title, const QString& info) void Logger::output(const QString& title, const char* buf, quint32 len) { QString lab(QTime::currentTime().toString("HH:mm:ss ")); - + QTextStream out(&lab); out << title @@ -235,7 +238,7 @@ void Logger::output(const QString& title, const char* buf, quint32 len) QString hex = TK::bin2hex(buf, len); - QTreeWidgetItem* it = appendLogEntry(0, lab); + QTreeWidgetItem* it = appendLogEntry(nullptr, lab); if (it) { appendLogEntry(it, hex); diff --git a/src/sokit/logger.h b/src/sokit/logger.h index 5120203..59685fa 100644 --- a/src/sokit/logger.h +++ b/src/sokit/logger.h @@ -9,13 +9,14 @@ class QTreeWidget; class QTreeWidgetItem; class QPlainTextEdit; + class Logger : public QObject { Q_OBJECT public: - Logger(QObject *parent = 0); - ~Logger(); + Logger(QObject* parent = nullptr); + ~Logger() override; void init(QTreeWidget* o, QCheckBox* w, QPlainTextEdit* d); @@ -46,10 +47,9 @@ private slots: QFile m_file; QMenu m_cmlog, m_cmtxt; - QCheckBox* m_chkWrite; - QTreeWidget* m_treeOut; - QPlainTextEdit* m_textOut; + QCheckBox* m_chkWrite; + QTreeWidget* m_treeOut; + QPlainTextEdit* m_textOut; }; #endif // __LOGGER_H__ - diff --git a/src/sokit/main.cpp b/src/sokit/main.cpp index bbda7b0..6232abe 100644 --- a/src/sokit/main.cpp +++ b/src/sokit/main.cpp @@ -19,7 +19,7 @@ #define SET_VAL_LANX ".lan" Sokit::Sokit(int& argc, char** argv) -:QApplication(argc,argv) + : QApplication(argc, argv) { } @@ -62,11 +62,11 @@ bool Sokit::initTranslator() QStringList paths; paths << "." - << "../share/" SET_APP_NAME - << "../share/apps/" SET_APP_NAME + << "../share/" SET_APP_NAME + << "../share/apps/" SET_APP_NAME << Setting::path(); - foreach (QString p, paths) + foreach(QString p, paths) { if (m_trans.load(file, p, "", SET_VAL_LANX)) { @@ -89,15 +89,15 @@ void Sokit::initFont() int match = 0; QString family = Setting::get(SET_SEC_CFG, SET_KEY_FTNM, "").trimmed(); - QString size = Setting::get(SET_SEC_CFG, SET_KEY_FTSZ, "").trimmed(); + QString size = Setting::get(SET_SEC_CFG, SET_KEY_FTSZ, "").trimmed(); if (family.isEmpty() || fs.filter(family).isEmpty()) { - QStringList defs = translate("Sokit", "font").split(";", QString::SkipEmptyParts); - foreach (QString d, defs) + QStringList defs = translate("Sokit", "font").split(";", Qt::SkipEmptyParts); + foreach(QString d, defs) { family = d.section(',', 0, 0).trimmed(); - size = d.section(',', 1, 1).trimmed(); + size = d.section(',', 1, 1).trimmed(); if (!family.isEmpty() && !fs.filter(family).isEmpty()) { @@ -116,7 +116,9 @@ void Sokit::initFont() font.setFamily(family); if (db.isSmoothlyScalable(family)) - font.setStyleStrategy((QFont::StyleStrategy)(QFont::PreferAntialias|QFont::PreferOutline|QFont::PreferQuality)); + font.setStyleStrategy( + static_cast(QFont::PreferAntialias | QFont::PreferOutline | + QFont::PreferQuality)); int nsize = size.toInt(); if (nsize > 0 && nsize < 20) @@ -137,25 +139,25 @@ bool Sokit::initUI() initTranslator(); initFont(); - HelpForm* h = new HelpForm(&m_wnd, Qt::WindowCloseButtonHint); + auto h = new HelpForm(&m_wnd, Qt::WindowCloseButtonHint); - QShortcut* k = new QShortcut(QKeySequence(Qt::Key_F1), &m_wnd); - QShortcut* t = new QShortcut(QKeySequence(Qt::Key_F10), &m_wnd); - connect(k, SIGNAL(activated()), h, SLOT(exec())); + auto k = new QShortcut(QKeySequence(Qt::Key_F1), &m_wnd); + auto t = new QShortcut(QKeySequence(Qt::Key_F10), &m_wnd); + connect(k, SIGNAL(activated()), h, SLOT(exec())); connect(t, SIGNAL(activated()), this, SLOT(ontop())); m_wnd.setWindowTitle(translate("Sokit", "sokit -- F1 for help")); m_wnd.setWindowIcon(QIcon(":/sokit.png")); - QWidget* pnl = new QWidget(&m_wnd); + auto pnl = new QWidget(&m_wnd); m_wnd.setCentralWidget(pnl); BaseForm* server = new ServerForm(); BaseForm* transf = new TransferForm(); BaseForm* client = new ClientForm(); - NotepadForm* npd = new NotepadForm(); + auto npd = new NotepadForm(); - QTabWidget* tab = new QTabWidget(pnl); + auto tab = new QTabWidget(pnl); tab->addTab(server, server->windowTitle()); tab->addTab(transf, transf->windowTitle()); tab->addTab(client, client->windowTitle()); @@ -183,7 +185,7 @@ void Sokit::ontop() m_wnd.show(); } -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { Sokit a(argc, argv); @@ -191,6 +193,6 @@ int main(int argc, char *argv[]) a.show(); else a.close(); - + return a.exec(); } diff --git a/src/sokit/main.h b/src/sokit/main.h index 0aa6a87..f8b2292 100644 --- a/src/sokit/main.h +++ b/src/sokit/main.h @@ -5,13 +5,13 @@ #include #include -class Sokit :public QApplication +class Sokit : public QApplication { Q_OBJECT public: Sokit(int& argc, char** argv); - ~Sokit(); + ~Sokit() override; bool initTranslator(); bool initUI(); diff --git a/src/sokit/notepadform.cpp b/src/sokit/notepadform.cpp index d576f3d..f57db91 100644 --- a/src/sokit/notepadform.cpp +++ b/src/sokit/notepadform.cpp @@ -11,7 +11,7 @@ #define SET_NP_FILE "sokit.txt" NotepadForm::NotepadForm(QWidget* p, Qt::WindowFlags f) -:QWidget(p, f) + : QWidget(p, f) { setupUi(); } @@ -23,27 +23,27 @@ NotepadForm::~NotepadForm() void NotepadForm::setupUi() { - resize(680, 450); + resize(680, 450); - QVBoxLayout* lay = new QVBoxLayout(this); - lay->setSpacing(5); - lay->setContentsMargins(5, 5, 5, 5); + auto lay = new QVBoxLayout(this); + lay->setSpacing(5); + lay->setContentsMargins(5, 5, 5, 5); - m_board = new QPlainTextEdit(this); - m_board->setAcceptDrops(false); - m_board->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_board->setTabChangesFocus(false); - m_board->setUndoRedoEnabled(true); - m_board->setTextInteractionFlags(Qt::TextEditorInteraction); + m_board = new QPlainTextEdit(this); + m_board->setAcceptDrops(false); + m_board->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_board->setTabChangesFocus(false); + m_board->setUndoRedoEnabled(true); + m_board->setTextInteractionFlags(Qt::TextEditorInteraction); - lay->addWidget(m_board); + lay->addWidget(m_board); setWindowTitle(tr("Notepad")); - QMetaObject::connectSlotsByName(this); + QMetaObject::connectSlotsByName(this); - QShortcut* n = new QShortcut(QKeySequence(Qt::Key_Tab+Qt::CTRL), this); - QShortcut* l = new QShortcut(QKeySequence(Qt::Key_Tab+Qt::CTRL+Qt::SHIFT), this); + auto n = new QShortcut(QKeySequence(Qt::Key_Tab | Qt::CTRL), this); + auto l = new QShortcut(QKeySequence(Qt::Key_Tab | Qt::CTRL | Qt::SHIFT), this); n->setObjectName("n"); l->setObjectName("l"); @@ -55,7 +55,7 @@ bool NotepadForm::init() { QFile file(Setting::path() + "/" + SET_NP_FILE); - if (file.open(QIODevice::ReadOnly|QIODevice::Text)) + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { QTextStream str(&file); m_board->setPlainText(str.readAll()); @@ -70,7 +70,7 @@ void NotepadForm::uninit() { QFile file(Setting::path() + "/" + SET_NP_FILE); - if (file.open(QIODevice::WriteOnly|QIODevice::Text|QIODevice::Truncate)) + if (file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { QTextStream str(&file); str << m_board->toPlainText(); @@ -84,16 +84,19 @@ void NotepadForm::jumptab() { if (parent()) { - QTabWidget* p = qobject_cast(parent()->parent()); + auto p = qobject_cast(parent()->parent()); if (p) { qint32 max = p->count(); qint32 cur = p->indexOf(this); - if (sender()->objectName().startsWith('n')) { + if (sender()->objectName().startsWith('n')) + { if (++cur >= max) cur = 0; - } else { - if (--cur < 0) cur = (max>0) ? (max-1) : 0; + } + else + { + if (--cur < 0) cur = (max > 0) ? (max - 1) : 0; } p->setCurrentIndex(cur); diff --git a/src/sokit/notepadform.h b/src/sokit/notepadform.h index 6ff8122..1a00fc7 100644 --- a/src/sokit/notepadform.h +++ b/src/sokit/notepadform.h @@ -8,8 +8,8 @@ class NotepadForm : public QWidget Q_OBJECT public: - NotepadForm(QWidget* p=0, Qt::WindowFlags f=0); - virtual ~NotepadForm(); + NotepadForm(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags(0)); + ~NotepadForm() override; public: bool init(); @@ -22,11 +22,7 @@ private slots: void uninit(); private: - QPlainTextEdit* m_board; + QPlainTextEdit* m_board; }; #endif // __NOTEPADFORM_H__ - - - - diff --git a/src/sokit/serverform.cpp b/src/sokit/serverform.cpp index 8588bfe..06047db 100644 --- a/src/sokit/serverform.cpp +++ b/src/sokit/serverform.cpp @@ -14,8 +14,8 @@ #define SET_VAL_LGSVR "log_server" -ServerForm::ServerForm(QWidget *parent, Qt::WindowFlags flags) -: BaseForm(parent, flags) +ServerForm::ServerForm(QWidget* parent, Qt::WindowFlags flags) + : BaseForm(parent, flags) { m_ui.setupUi(this); } @@ -39,12 +39,13 @@ ServerForm::~ServerForm() void ServerForm::initConfig() { QString sss(SET_SEC_SVR); - Setting::lord(sss+SET_KEY_CMBTA, SET_PFX_CMBITM, *m_ui.cmbTcpAddr, false); - Setting::lord(sss+SET_KEY_CMBUA, SET_PFX_CMBITM, *m_ui.cmbUdpAddr, false); - Setting::lord(sss+SET_KEY_CMBTP, SET_PFX_CMBITM, *m_ui.cmbTcpPort); - Setting::lord(sss+SET_KEY_CMBUP, SET_PFX_CMBITM, *m_ui.cmbUdpPort); + Setting::lord(sss + SET_KEY_CMBTA, SET_PFX_CMBITM, *m_ui.cmbTcpAddr, false); + Setting::lord(sss + SET_KEY_CMBUA, SET_PFX_CMBITM, *m_ui.cmbUdpAddr, false); + Setting::lord(sss + SET_KEY_CMBTP, SET_PFX_CMBITM, *m_ui.cmbTcpPort); + Setting::lord(sss + SET_KEY_CMBUP, SET_PFX_CMBITM, *m_ui.cmbUdpPort); - QString skl(SET_SEC_DIR); skl += SET_KEY_LOG; + QString skl(SET_SEC_DIR); + skl += SET_KEY_LOG; skl = Setting::get(skl, SET_KEY_SVR, SET_VAL_LGSVR); setProperty(SET_SEC_DIR, skl); @@ -55,12 +56,13 @@ void ServerForm::initConfig() void ServerForm::saveConfig() { QString sss(SET_SEC_SVR); - Setting::save(sss+SET_KEY_CMBTA, SET_PFX_CMBITM, *m_ui.cmbTcpAddr, false); - Setting::save(sss+SET_KEY_CMBUA, SET_PFX_CMBITM, *m_ui.cmbUdpAddr, false); - Setting::save(sss+SET_KEY_CMBTP, SET_PFX_CMBITM, *m_ui.cmbTcpPort); - Setting::save(sss+SET_KEY_CMBUP, SET_PFX_CMBITM, *m_ui.cmbUdpPort); + Setting::save(sss + SET_KEY_CMBTA, SET_PFX_CMBITM, *m_ui.cmbTcpAddr, false); + Setting::save(sss + SET_KEY_CMBUA, SET_PFX_CMBITM, *m_ui.cmbUdpAddr, false); + Setting::save(sss + SET_KEY_CMBTP, SET_PFX_CMBITM, *m_ui.cmbTcpPort); + Setting::save(sss + SET_KEY_CMBUP, SET_PFX_CMBITM, *m_ui.cmbUdpPort); - QString skl(SET_SEC_DIR); skl += SET_KEY_LOG; + QString skl(SET_SEC_DIR); + skl += SET_KEY_LOG; Setting::set(skl, SET_KEY_SVR, property(SET_SEC_DIR).toString()); } @@ -70,9 +72,9 @@ bool ServerForm::initForm() initLogger(m_ui.chkLog, m_ui.btnClear, m_ui.treeOutput, m_ui.txtOutput); initLister(m_ui.btnConnAll, m_ui.btnConnDel, m_ui.lstConn); - bindBuffer(1, m_ui.edtBuf1, m_ui.btnSend1, 0); - bindBuffer(2, m_ui.edtBuf2, m_ui.btnSend2, 0); - bindBuffer(3, m_ui.edtBuf3, m_ui.btnSend3, 0); + bindBuffer(1, m_ui.edtBuf1, m_ui.btnSend1, nullptr); + bindBuffer(2, m_ui.edtBuf2, m_ui.btnSend2, nullptr); + bindBuffer(3, m_ui.edtBuf3, m_ui.btnSend3, nullptr); connect(m_ui.btnTcp, SIGNAL(clicked(bool)), this, SLOT(trigger(bool))); connect(m_ui.btnUdp, SIGNAL(clicked(bool)), this, SLOT(trigger(bool))); @@ -80,14 +82,16 @@ bool ServerForm::initForm() connect(&m_tcp, SIGNAL(connOpen(const QString&)), this, SLOT(listerAdd(const QString&))); connect(&m_tcp, SIGNAL(connClose(const QString&)), this, SLOT(listerRemove(const QString&))); connect(&m_tcp, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); - connect(&m_tcp, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); + connect(&m_tcp, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, + SIGNAL(output(const QString&,const char*,quint32))); connect(&m_tcp, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); connect(&m_tcp, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); connect(&m_udp, SIGNAL(connOpen(const QString&)), this, SLOT(listerAdd(const QString&))); connect(&m_udp, SIGNAL(connClose(const QString&)), this, SLOT(listerRemove(const QString&))); connect(&m_udp, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); - connect(&m_udp, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); + connect(&m_udp, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, + SIGNAL(output(const QString&,const char*,quint32))); connect(&m_udp, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); connect(&m_udp, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); @@ -97,8 +101,8 @@ bool ServerForm::initForm() bool ServerForm::initHotkeys() { bindFocus(m_ui.cmbTcpAddr, Qt::Key_Escape); - bindClick(m_ui.btnTcp, Qt::CTRL + Qt::Key_T); - bindClick(m_ui.btnUdp, Qt::CTRL + Qt::Key_U); + bindClick(m_ui.btnTcp, Qt::CTRL + Qt::Key_T); + bindClick(m_ui.btnUdp, Qt::CTRL + Qt::Key_U); return true; } @@ -119,13 +123,13 @@ void ServerForm::kill(QStringList& list) void ServerForm::trigger(bool start) { - QToolButton* btnTrigger = qobject_cast(sender()); + auto btnTrigger = qobject_cast(sender()); if (!btnTrigger) return; - bool istcp = (btnTrigger==m_ui.btnTcp); + bool istcp = (btnTrigger == m_ui.btnTcp); QComboBox* cbAddr = istcp ? m_ui.cmbTcpAddr : m_ui.cmbUdpAddr; - QComboBox* cbPort = istcp ? m_ui.cmbTcpPort : m_ui.cmbUdpPort; - ServerSkt* server = istcp ? (ServerSkt*)&m_tcp : (ServerSkt*)&m_udp; + QComboBox* cbPort = istcp ? m_ui.cmbTcpPort : m_ui.cmbUdpPort; + ServerSkt* server = istcp ? static_cast(&m_tcp) : static_cast(&m_udp); IPAddr addr; if (start) @@ -137,14 +141,14 @@ void ServerForm::trigger(bool start) start = server->start(addr.ip, addr.port); else server->stop(); - + unlock(); cbAddr->setDisabled(start); cbPort->setDisabled(start); if (start) - TK::pushIPAddr(0, cbPort); + TK::pushIPAddr(nullptr, cbPort); else TK::resetPushBox(btnTrigger); } @@ -164,7 +168,8 @@ void ServerForm::send(const QString& data, const QString&) QString key = list.takeFirst(); ServerSkt* server = key.contains(tcpname) - ? (ServerSkt*)&m_tcp : (ServerSkt*)&m_udp; + ? static_cast(&m_tcp) + : static_cast(&m_udp); server->send(key, data); } diff --git a/src/sokit/serverform.h b/src/sokit/serverform.h index cafc519..8e261a6 100644 --- a/src/sokit/serverform.h +++ b/src/sokit/serverform.h @@ -10,16 +10,16 @@ class ServerForm : public BaseForm Q_OBJECT public: - ServerForm(QWidget* p=0, Qt::WindowFlags f=0); - virtual ~ServerForm(); + ServerForm(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags(0)); + ~ServerForm() override; protected: - virtual bool initForm(); - virtual bool initHotkeys(); - virtual void initConfig(); - virtual void saveConfig(); - virtual void send(const QString& data, const QString& dir); - virtual void kill(QStringList& list); + bool initForm() override; + bool initHotkeys() override; + void initConfig() override; + void saveConfig() override; + void send(const QString& data, const QString& dir) override; + void kill(QStringList& list) override; private slots: void trigger(bool start); @@ -31,6 +31,3 @@ private slots: }; #endif // __SERVERFORM_H__ - - - diff --git a/src/sokit/serverskt.cpp b/src/sokit/serverskt.cpp index 78e0e36..a64b0e8 100644 --- a/src/sokit/serverskt.cpp +++ b/src/sokit/serverskt.cpp @@ -7,8 +7,8 @@ #define MAXBUFFER 1024*1024 -ServerSkt::ServerSkt(QObject *parent) -: QObject(parent),m_port(0) +ServerSkt::ServerSkt(QObject* parent) + : QObject(parent), m_port(0) { m_started = false; } @@ -30,16 +30,17 @@ bool ServerSkt::start(const QHostAddress& ip, quint16 port) QString msg("start %1 server %2!"); if (!m_started) { - msg = msg.arg(name(),"failed"); + msg = msg.arg(name(), "failed"); if (!m_error.isEmpty()) - { msg += " error:["; + { + msg += " error:["; msg += m_error; msg += "]."; } } else { - msg = msg.arg(name(),"successfully"); + msg = msg.arg(name(), "successfully"); } show(msg); @@ -138,7 +139,7 @@ void ServerSkt::send(const QString& key, const QString& data) QByteArray bin; if (!TK::ascii2bin(data, bin, err)) - show("bad data format to send: "+err); + show("bad data format to send: " + err); else send(v, bin); } @@ -146,7 +147,7 @@ void ServerSkt::send(const QString& key, const QString& data) void ServerSkt::dump(const char* buf, qint32 len, bool isSend, const QString& key) { - emit dumpbin(QString("DAT %1 %2").arg(isSend?"<---":"--->",key), buf, (quint32)len); + emit dumpbin(QString("DAT %1 %2").arg(isSend ? "<---" : "--->", key), buf, static_cast(len)); } void ServerSkt::show(const QString& msg) @@ -154,8 +155,8 @@ void ServerSkt::show(const QString& msg) emit message(msg); } -ServerSktTcp::ServerSktTcp(QObject *parent) -:ServerSkt(parent) +ServerSktTcp::ServerSktTcp(QObject* parent) + : ServerSkt(parent) { } @@ -172,18 +173,15 @@ bool ServerSktTcp::open() connect(&m_server, SIGNAL(newConnection()), this, SLOT(newConnection())); return true; } - else - { - setError(QString("%1, %2").arg(m_server.serverError()).arg(m_server.errorString())); - } + setError(QString("%1, %2").arg(m_server.serverError()).arg(m_server.errorString())); return false; } bool ServerSktTcp::close(void* cookie) { - Conn* conn = (Conn*)cookie; - + auto conn = static_cast(cookie); + if (conn->client) conn->client->disconnect(this); @@ -195,7 +193,7 @@ bool ServerSktTcp::close(void* cookie) void ServerSktTcp::close(QObject* obj) { - Conn* conn = (Conn*)obj->property(PROP_CONN).value(); + auto conn = static_cast(obj->property(PROP_CONN).value()); if (!conn) return; unsetCookie(conn->key); @@ -204,7 +202,7 @@ void ServerSktTcp::close(QObject* obj) void ServerSktTcp::error() { - QTcpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); show(QString("TCP socket error %1, %2").arg(s->error()).arg(s->errorString())); @@ -219,23 +217,23 @@ void ServerSktTcp::close() void ServerSktTcp::newConnection() { - QTcpServer* server = qobject_cast(sender()); + auto server = qobject_cast(sender()); if (!server) return; QTcpSocket* client = server->nextPendingConnection(); while (client) { - Conn* conn = new Conn; + auto conn = new Conn; if (!conn) { client->deleteLater(); } else { - client->setProperty(PROP_CONN, qVariantFromValue((void*)conn)); + client->setProperty(PROP_CONN, QVariant::fromValue(static_cast(conn))); conn->client = client; - conn->key = TK::ipstr(client->peerAddress(),client->peerPort(), true); + conn->key = TK::ipstr(client->peerAddress(), client->peerPort(), true); connect(client, SIGNAL(readyRead()), this, SLOT(newData())); connect(client, SIGNAL(destroyed(QObject*)), this, SLOT(close(QObject*))); @@ -250,10 +248,10 @@ void ServerSktTcp::newConnection() void ServerSktTcp::newData() { - QTcpSocket* client = qobject_cast(sender()); + auto client = qobject_cast(sender()); if (!client) return; - Conn* conn = (Conn*)client->property(PROP_CONN).value(); + auto conn = static_cast(client->property(PROP_CONN).value()); if (!conn) return; qint64 bufLen = client->bytesAvailable(); @@ -266,7 +264,7 @@ void ServerSktTcp::newData() while (ioLen > 0) { readLen += ioLen; - ioLen = client->read(buf+readLen, bufLen-readLen); + ioLen = client->read(buf + readLen, bufLen - readLen); } if (ioLen >= 0) @@ -280,9 +278,9 @@ void ServerSktTcp::newData() void ServerSktTcp::send(void* cookie, const QByteArray& bin) { - Conn* conn = (Conn*)cookie; + auto conn = static_cast(cookie); - const char * src = bin.constData(); + const char* src = bin.constData(); qint64 srcLen = bin.length(); qint64 writeLen = 0; @@ -291,13 +289,13 @@ void ServerSktTcp::send(void* cookie, const QByteArray& bin) while (ioLen > 0) { writeLen += ioLen; - ioLen = conn->client->write(src+writeLen, srcLen-writeLen); + ioLen = conn->client->write(src + writeLen, srcLen - writeLen); } if (writeLen != srcLen) { show(QString("failed to send data to %1:%2 [%3]") - .arg(addr().toString()).arg(port()).arg(writeLen)); + .arg(addr().toString()).arg(port()).arg(writeLen)); return; } @@ -305,8 +303,8 @@ void ServerSktTcp::send(void* cookie, const QByteArray& bin) dump(src, srcLen, true, conn->key); } -ServerSktUdp::ServerSktUdp(QObject *parent) -:ServerSkt(parent) +ServerSktUdp::ServerSktUdp(QObject* parent) + : ServerSkt(parent) { } @@ -318,7 +316,7 @@ ServerSktUdp::~ServerSktUdp() void ServerSktUdp::error() { - QUdpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); show(QString("UDP socket error %1, %2").arg(s->error()).arg(s->errorString())); } @@ -334,17 +332,14 @@ bool ServerSktUdp::open() m_timer.start(2000); return true; } - else - { - setError(QString("%1, %2").arg(m_server.error()).arg(m_server.errorString())); - } + setError(QString("%1, %2").arg(m_server.error()).arg(m_server.errorString())); return false; } bool ServerSktUdp::close(void* cookie) { - delete (Conn*)cookie; + delete static_cast(cookie); return true; } @@ -358,33 +353,34 @@ void ServerSktUdp::close() void ServerSktUdp::newData() { - QUdpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); if (!s) return; qint64 bufLen = s->pendingDatagramSize(); char* buf = TK::createBuffer(bufLen, MAXBUFFER); if (!buf) return; - QHostAddress addr; quint16 port(0); + QHostAddress addr; + quint16 port(0); qint64 readLen = 0; qint64 ioLen = s->readDatagram(buf, bufLen, &addr, &port); //while (ioLen > 0) //{ - readLen += ioLen; + readLen += ioLen; // ioLen = s->readDatagram(buf+readLen, bufLen-readLen, &addr, &port); //} if (ioLen >= 0) { - Conn* conn = (Conn*)getCookie(TK::ipstr(addr, port, false)); + auto conn = static_cast(getCookie(TK::ipstr(addr, port, false))); if (!conn) { conn = new Conn; if (conn) { - conn->key = TK::ipstr(addr, port, false); + conn->key = TK::ipstr(addr, port, false); conn->addr = addr; conn->port = port; setCookie(conn->key, conn); @@ -405,9 +401,9 @@ void ServerSktUdp::newData() void ServerSktUdp::send(void* cookie, const QByteArray& bin) { - Conn* conn = (Conn*)cookie; + auto conn = static_cast(cookie); - const char* src = bin.constData(); + const char* src = bin.constData(); qint64 srcLen = bin.length(); qint64 writeLen = 0; @@ -417,14 +413,15 @@ void ServerSktUdp::send(void* cookie, const QByteArray& bin) { writeLen += ioLen; - ioLen = (writeLen >= srcLen) ? 0 : - m_server.writeDatagram(src+writeLen, srcLen-writeLen, conn->addr, conn->port); + ioLen = (writeLen >= srcLen) + ? 0 + : m_server.writeDatagram(src + writeLen, srcLen - writeLen, conn->addr, conn->port); } if (writeLen != srcLen) { show(QString("failed to send data to %1:%2 [%3]") - .arg(conn->addr.toString()).arg(conn->port).arg(writeLen)); + .arg(conn->addr.toString()).arg(conn->port).arg(writeLen)); return; } @@ -443,11 +440,10 @@ void ServerSktUdp::check() void* c = getCookie(k); - if (c && (((Conn*)c)->stamp.addSecs(120) < QDateTime::currentDateTime())) + if (c && (static_cast(c)->stamp.addSecs(120) < QDateTime::currentDateTime())) { close(c); unsetCookie(k); } } } - diff --git a/src/sokit/serverskt.h b/src/sokit/serverskt.h index 9b5f81d..fc265ce 100644 --- a/src/sokit/serverskt.h +++ b/src/sokit/serverskt.h @@ -9,13 +9,13 @@ class ServerSkt : public QObject { - typedef QHash OBJMAP; + using OBJMAP = QHash; Q_OBJECT public: - ServerSkt(QObject *parent=0); - virtual ~ServerSkt(); + ServerSkt(QObject* parent = nullptr); + ~ServerSkt() override; virtual QString name() const { return "General"; }; @@ -50,7 +50,7 @@ class ServerSkt : public QObject void setCookie(const QString& k, void* v); void unsetCookie(const QString& k); void* getCookie(const QString& k); - + virtual bool open() =0; virtual bool close(void* cookie) =0; @@ -68,25 +68,25 @@ class ServerSkt : public QObject class ServerSktTcp : public ServerSkt { - typedef struct _Conn + using Conn = struct _Conn { QTcpSocket* client; QString key; - } Conn; + }; Q_OBJECT public: - ServerSktTcp(QObject *parent=0); - virtual ~ServerSktTcp(); + ServerSktTcp(QObject* parent = nullptr); + ~ServerSktTcp() override; - virtual QString name() const { return "TCP"; }; + QString name() const override { return "TCP"; }; protected: - virtual bool open(); - virtual bool close(void* cookie); - virtual void send(void* cookie, const QByteArray& bin); - virtual void close(); + bool open() override; + bool close(void* cookie) override; + void send(void* cookie, const QByteArray& bin) override; + void close() override; private slots: void newConnection(); @@ -100,27 +100,27 @@ private slots: class ServerSktUdp : public ServerSkt { - typedef struct _Conn + using Conn = struct _Conn { QHostAddress addr; quint16 port; QDateTime stamp; QString key; - } Conn; + }; Q_OBJECT public: - ServerSktUdp(QObject *parent=0); - virtual ~ServerSktUdp(); + ServerSktUdp(QObject* parent = nullptr); + ~ServerSktUdp() override; - virtual QString name() const { return "UDP"; }; + QString name() const override { return "UDP"; }; protected: - virtual bool open(); - virtual bool close(void* cookie); - virtual void send(void* cookie, const QByteArray& bin); - virtual void close(); + bool open() override; + bool close(void* cookie) override; + void send(void* cookie, const QByteArray& bin) override; + void close() override; private slots: void newData(); @@ -133,4 +133,3 @@ private slots: }; #endif // __SERVERSKT_H__ - diff --git a/src/sokit/setting.cpp b/src/sokit/setting.cpp index 8352fc3..ea74ab0 100644 --- a/src/sokit/setting.cpp +++ b/src/sokit/setting.cpp @@ -8,8 +8,8 @@ Setting::Setting() { QString path(QDir::currentPath()); - if (!QFileInfo(path).isWritable() || - path == QDir::homePath ()) + if (!QFileInfo(path).isWritable() || + path == QDir::homePath()) { QDir dir(QDir::home()); dir.mkdir("." SET_APP_NAME); @@ -39,12 +39,12 @@ void Setting::flush() void Setting::set(const QString& section, const QString& key, const QString& val) { - storage().setValue(section+key, val); + storage().setValue(section + key, val); } QString Setting::get(const QString& section, const QString& key, const QString& def) { - return storage().value(section+key, def).toString(); + return storage().value(section + key, def).toString(); } void Setting::save(const QString& section, const QString& prefix, const QComboBox& cmb, bool all) @@ -72,7 +72,7 @@ void Setting::save(const QString& section, const QString& prefix, const QComboBo while (n--) { QString k = keys[n]; - if ((k!=tkey) && k.startsWith(prefix)) + if ((k != tkey) && k.startsWith(prefix)) { QString v = store.value(k).toString().trimmed(); if (!v.isEmpty() && (-1 == cmb.findText(v))) @@ -88,12 +88,12 @@ void Setting::save(const QString& section, const QString& prefix, const QComboBo n = SET_MAX_CMBITM; qint32 i = 0; - for (i=0; i SET_MAX_CMBITM) ? SET_MAX_CMBITM : vals.count(); - for (qint32 j=0; isocketType()==QAbstractSocket::TcpSocket) ? "TCP" : "UDP"; + return (skt->socketType() == QAbstractSocket::TcpSocket) ? "TCP" : "UDP"; } void TK::initNetworkInterfaces(QComboBox* box, bool testDef) { QString def; - + if (testDef) { def = box->currentText(); @@ -28,7 +28,7 @@ void TK::initNetworkInterfaces(QComboBox* box, bool testDef) } QList lst = QNetworkInterface::allAddresses(); - foreach (QHostAddress a, lst) + foreach(QHostAddress a, lst) { if (QAbstractSocket::IPv4Protocol == a.protocol()) pushComboBox(box, a.toString()); @@ -40,8 +40,8 @@ void TK::initNetworkInterfaces(QComboBox* box, bool testDef) void TK::pushComboBox(QComboBox* box, const QString& item) { - if (-1==box->findText(item)) - box->insertItem(0,item); + if (-1 == box->findText(item)) + box->insertItem(0, item); } void TK::resetPushBox(QToolButton* btn) @@ -57,7 +57,7 @@ QString TK::ipstr(const QHostAddress& addr, quint16 port) QString TK::ipstr(const QHostAddress& addr, quint16 port, bool tcp) { - return QString("%1 %2").arg((tcp?"[TCP]":"[UDP]"),ipstr(addr,port)); + return QString("%1 %2").arg((tcp ? "[TCP]" : "[UDP]"), ipstr(addr, port)); } bool TK::popIPAddr(QComboBox* ip, QComboBox* port, IPAddr& addr) @@ -99,11 +99,11 @@ QString TK::ascii2hex(const QString& src, QVector& posmap, uint& count) PARSE_STA status = OUT; - int bound = 0; + int bound = 0; int hexpos = 0; int len = posmap.count(); - for (int i=0; i& posmap, uint& count) uint& ov = posmap[i]; val = ov; - ov = hexpos; + ov = hexpos; if ('[' == val) { switch (status) { - case OUT: status = OUT2IN; break; - case OUT2IN: status = OUT; break; - case IN: status = ERR; break; - case ERR: break; + case OUT: status = OUT2IN; + break; + case OUT2IN: status = OUT; + break; + case IN: status = ERR; + break; + case ERR: break; } if (OUT2IN == status) continue; } - else - if (']' == val) + else if (']' == val) { if (OUT != status) { - if (bound & 1) { + if (bound & 1) + { status = ERR; - } else { + } + else + { status = OUT; continue; } } } - else - if (OUT != status) + else if (OUT != status) { - if ((val >= '0' && val <='9')|| - (val >= 'A' && val <='F')) + if ((val >= '0' && val <= '9') || + (val >= 'A' && val <= 'F')) { status = IN; } - else - if (val >= 'a' && val <='f') + else if (val >= 'a' && val <= 'f') { val = 'A' + (val - 'a'); status = IN; } - else - if (val == ' ') + else if (val == ' ') { status = IN; continue; @@ -174,24 +176,23 @@ QString TK::ascii2hex(const QString& src, QVector& posmap, uint& count) else { t = val >> 24 & 0xFF; - TOHEXSTR(t,c,hextab) + TOHEXSTR(t, c, hextab) t = val >> 16 & 0xFF; - TOHEXSTR(t,c,hextab) + TOHEXSTR(t, c, hextab) t = val >> 8 & 0xFF; - TOHEXSTR(t,c,hextab) + TOHEXSTR(t, c, hextab) t = val & 0xFF; - TOHEXSTR(t,c,hextab) + TOHEXSTR(t, c, hextab) } - bound = 0; + bound = 0; } - else - if (IN == status) + else if (IN == status) { bound += 1; - *c++ = (char)val; + *c++ = static_cast(val); } if (ERR == status) @@ -205,9 +206,9 @@ QString TK::ascii2hex(const QString& src, QVector& posmap, uint& count) break; } - count += (c-ch); + count += (c - ch); - if (0 == (bound&1)) + if (0 == (bound & 1)) *c++ = ' '; *c = 0; @@ -225,7 +226,7 @@ QString TK::ascii2hex(const QString& src, QVector& posmap, uint& count) QString TK::bin2hex(const char* buf, uint len) { - char* tmp = new char[len * 3 + 3]; + auto tmp = new char[len * 3 + 3]; const char* s = buf; const char* e = buf + len; @@ -238,7 +239,7 @@ QString TK::bin2hex(const char* buf, uint len) while (s < e) { char c = *s++; - *d++ = hextab[(c>>4)&0xF]; + *d++ = hextab[(c >> 4) & 0xF]; *d++ = hextab[c & 0xF]; *d++ = ' '; } @@ -256,7 +257,7 @@ QString TK::bin2hex(const char* buf, uint len) QString TK::bin2ascii(const char* buf, uint len) { - char* tmp = new char[len + 1]; + auto tmp = new char[len + 1]; const char* s = buf; const char* e = buf + len; @@ -267,7 +268,7 @@ QString TK::bin2ascii(const char* buf, uint len) while (s < e) { char c = *s++; - *d++ = isprint((uchar)c) ? c : '.'; + *d++ = isprint(static_cast(c)) ? c : '.'; } *d = 0; @@ -292,11 +293,11 @@ bool TK::ascii2bin(const QString& src, QByteArray& dst, QString& err) PARSE_STA status = OUT; - int bound = 0; + int bound = 0; quint8 hexval = 0; int len = lst.count(); - for (int i=0; i= '0' && val <='9') + if (val >= '0' && val <= '9') { val -= '0'; status = IN; } - else - if (val >= 'A' && val <='F') + else if (val >= 'A' && val <= 'F') { val -= 'A'; val += 10; status = IN; } - else - if (val >= 'a' && val <='f') + else if (val >= 'a' && val <= 'f') { val -= 'a'; val += 10; status = IN; } - else - if (val == ' ') + else if (val == ' ') { status = IN; continue; @@ -369,24 +371,22 @@ bool TK::ascii2bin(const QString& src, QByteArray& dst, QString& err) else { if (val >> 16) - os << (quint32)val; - else - if (val >> 8) - os << (quint16)val; + os << val; + else if (val >> 8) + os << static_cast(val); else - os << (quint8)val; + os << static_cast(val); } - bound = 0; + bound = 0; hexval = 0; } - else - if (IN == status) + else if (IN == status) { if (bound & 1) - os << (quint8)(((quint8)(val&0xF)) | (hexval<<4)); + os << static_cast(static_cast(val & 0xF) | (hexval << 4)); else - hexval = (quint8)(val & 0xF); + hexval = static_cast(val & 0xF); ++bound; } @@ -405,7 +405,7 @@ bool TK::ascii2bin(const QString& src, QByteArray& dst, QString& err) char* TK::createBuffer(qint64& cap, qint64 limit) { if (cap < 0 || cap > limit) - return 0; + return nullptr; if (0 == cap) cap = 1; @@ -413,8 +413,8 @@ char* TK::createBuffer(qint64& cap, qint64 limit) return new char[cap]; } -void TK::releaseBuffer(char*& buf) +void TK::releaseBuffer(char*& buf) { delete buf; - buf = 0; + buf = nullptr; } diff --git a/src/sokit/toolkit.h b/src/sokit/toolkit.h index 0fabdae..8e779d5 100644 --- a/src/sokit/toolkit.h +++ b/src/sokit/toolkit.h @@ -9,16 +9,16 @@ class QComboBox; class QAbstractSocket; class QToolButton; -typedef struct _IPAddr +using IPAddr = struct _IPAddr { QHostAddress ip; quint16 port; -} IPAddr; +}; class TK { public: - typedef enum { OUT=0, OUT2IN, IN, ERR } PARSE_STA; + using PARSE_STA = enum { OUT=0, OUT2IN, IN, ERR }; static const char* hextab; static QString ascii2hex(const QString& src, QVector& posmap, uint& count); @@ -27,12 +27,12 @@ class TK static bool ascii2bin(const QString& src, QByteArray& dst, QString& err); static char* createBuffer(qint64& cap, qint64 limit); - static void releaseBuffer(char*& buf); + static void releaseBuffer(char*& buf); static const char* socketTypeName(bool tcp); static const char* socketTypeName(QAbstractSocket* skt); - static void initNetworkInterfaces(QComboBox* box, bool testDef=false); + static void initNetworkInterfaces(QComboBox* box, bool testDef = false); static QString ipstr(const QHostAddress& addr, quint16 port); static QString ipstr(const QHostAddress& addr, quint16 port, bool tcp); @@ -44,4 +44,3 @@ class TK }; #endif // __TOOLKIT_H__ - diff --git a/src/sokit/transferform.cpp b/src/sokit/transferform.cpp index 4ba691e..2f8b65d 100644 --- a/src/sokit/transferform.cpp +++ b/src/sokit/transferform.cpp @@ -17,8 +17,8 @@ #define PROP_EDIT "edit" #define PROP_DIRT "dirt" -TransferForm::TransferForm(QWidget *parent, Qt::WindowFlags flags) -: BaseForm(parent, flags),m_server(0) +TransferForm::TransferForm(QWidget* parent, Qt::WindowFlags flags) + : BaseForm(parent, flags), m_server(nullptr) { m_ui.setupUi(this); } @@ -29,7 +29,7 @@ TransferForm::~TransferForm() { m_server->disconnect(this); delete m_server; - m_server = NULL; + m_server = nullptr; unlock(); } @@ -40,12 +40,13 @@ TransferForm::~TransferForm() void TransferForm::initConfig() { QString sst(SET_SEC_TRANS); - Setting::lord(sst+SET_KEY_CMBSA, SET_PFX_CMBITM, *m_ui.cmbSrcAddr, false); - Setting::lord(sst+SET_KEY_CMBDA, SET_PFX_CMBITM, *m_ui.cmbDstAddr); - Setting::lord(sst+SET_KEY_CMBSP, SET_PFX_CMBITM, *m_ui.cmbSrcPort); - Setting::lord(sst+SET_KEY_CMBDP, SET_PFX_CMBITM, *m_ui.cmbDstPort); + Setting::lord(sst + SET_KEY_CMBSA, SET_PFX_CMBITM, *m_ui.cmbSrcAddr, false); + Setting::lord(sst + SET_KEY_CMBDA, SET_PFX_CMBITM, *m_ui.cmbDstAddr); + Setting::lord(sst + SET_KEY_CMBSP, SET_PFX_CMBITM, *m_ui.cmbSrcPort); + Setting::lord(sst + SET_KEY_CMBDP, SET_PFX_CMBITM, *m_ui.cmbDstPort); - QString skl(SET_SEC_DIR); skl += SET_KEY_LOG; + QString skl(SET_SEC_DIR); + skl += SET_KEY_LOG; skl = Setting::get(skl, SET_KEY_TRANS, SET_VAL_LGTAN); setProperty(SET_SEC_DIR, skl); @@ -56,12 +57,13 @@ void TransferForm::initConfig() void TransferForm::saveConfig() { QString sst(SET_SEC_TRANS); - Setting::save(sst+SET_KEY_CMBSA, SET_PFX_CMBITM, *m_ui.cmbSrcAddr, false); - Setting::save(sst+SET_KEY_CMBDA, SET_PFX_CMBITM, *m_ui.cmbDstAddr); - Setting::save(sst+SET_KEY_CMBSP, SET_PFX_CMBITM, *m_ui.cmbSrcPort); - Setting::save(sst+SET_KEY_CMBDP, SET_PFX_CMBITM, *m_ui.cmbDstPort); + Setting::save(sst + SET_KEY_CMBSA, SET_PFX_CMBITM, *m_ui.cmbSrcAddr, false); + Setting::save(sst + SET_KEY_CMBDA, SET_PFX_CMBITM, *m_ui.cmbDstAddr); + Setting::save(sst + SET_KEY_CMBSP, SET_PFX_CMBITM, *m_ui.cmbSrcPort); + Setting::save(sst + SET_KEY_CMBDP, SET_PFX_CMBITM, *m_ui.cmbDstPort); - QString skl(SET_SEC_DIR); skl += SET_KEY_LOG; + QString skl(SET_SEC_DIR); + skl += SET_KEY_LOG; Setting::set(skl, SET_KEY_TRANS, property(SET_SEC_DIR).toString()); } @@ -87,9 +89,9 @@ bool TransferForm::initForm() bool TransferForm::initHotkeys() { bindFocus(m_ui.cmbSrcAddr, Qt::Key_Escape); - bindClick(m_ui.btnTrigger, Qt::CTRL + Qt::Key_S); - bindSelect(m_ui.cmbType, 0, Qt::CTRL + Qt::Key_T); - bindSelect(m_ui.cmbType, 1, Qt::CTRL + Qt::Key_U); + bindClick(m_ui.btnTrigger, Qt::CTRL | Qt::Key_S); + bindSelect(m_ui.cmbType, 0, Qt::CTRL | Qt::Key_T); + bindSelect(m_ui.cmbType, 1, Qt::CTRL | Qt::Key_U); return true; } @@ -112,14 +114,14 @@ void TransferForm::trigger(bool start) m_server->stop(); m_server->disconnect(this); delete m_server; - m_server = NULL; + m_server = nullptr; } IPAddr sa, da; if (start) { start = TK::popIPAddr(m_ui.cmbSrcAddr, m_ui.cmbSrcPort, sa) && - TK::popIPAddr(m_ui.cmbDstAddr, m_ui.cmbDstPort, da); + TK::popIPAddr(m_ui.cmbDstAddr, m_ui.cmbDstPort, da); } if (start) @@ -135,17 +137,18 @@ void TransferForm::trigger(bool start) connect(m_server, SIGNAL(connOpen(const QString&)), this, SLOT(listerAdd(const QString&))); connect(m_server, SIGNAL(connClose(const QString&)), this, SLOT(listerRemove(const QString&))); connect(m_server, SIGNAL(message(const QString&)), this, SIGNAL(output(const QString&))); - connect(m_server, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, SIGNAL(output(const QString&,const char*,quint32))); + connect(m_server, SIGNAL(dumpbin(const QString&,const char*,quint32)), this, + SIGNAL(output(const QString&,const char*,quint32))); connect(m_server, SIGNAL(countRecv(qint32)), this, SLOT(countRecv(qint32))); connect(m_server, SIGNAL(countSend(qint32)), this, SLOT(countSend(qint32))); connect(m_server, SIGNAL(stopped()), this, SLOT(stop())); - + start = m_server->start(sa.ip, sa.port, da.ip, da.port); if (!start) { m_server->disconnect(this); delete m_server; - m_server = NULL; + m_server = nullptr; } } else @@ -166,7 +169,7 @@ void TransferForm::trigger(bool start) if (start) { TK::pushIPAddr(m_ui.cmbSrcPort, m_ui.cmbSrcAddr); - TK::pushIPAddr(0, m_ui.cmbDstPort); + TK::pushIPAddr(nullptr, m_ui.cmbDstPort); } else { @@ -183,7 +186,7 @@ void TransferForm::send(const QString& data, const QString& dir) { bool s2d = dir.startsWith('S'); - if (m_server &&lock(1000)) + if (m_server && lock(1000)) { QStringList list; listerSelected(list); @@ -194,12 +197,3 @@ void TransferForm::send(const QString& data, const QString& dir) unlock(); } } - - - - - - - - - diff --git a/src/sokit/transferform.h b/src/sokit/transferform.h index 3587634..9cb7c47 100644 --- a/src/sokit/transferform.h +++ b/src/sokit/transferform.h @@ -5,21 +5,22 @@ #include "baseform.h" class TransferSkt; + class TransferForm : public BaseForm { Q_OBJECT public: - TransferForm(QWidget* p=0, Qt::WindowFlags f=0); - ~TransferForm(); + TransferForm(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags(0)); + ~TransferForm() override; protected: - virtual bool initForm(); - virtual bool initHotkeys(); - virtual void initConfig(); - virtual void saveConfig(); - virtual void send(const QString& data, const QString& dir); - virtual void kill(QStringList& list); + bool initForm() override; + bool initHotkeys() override; + void initConfig() override; + void saveConfig() override; + void send(const QString& data, const QString& dir) override; + void kill(QStringList& list) override; private slots: void trigger(bool start); @@ -31,6 +32,3 @@ private slots: }; #endif // __TRANSFERFORM_H__ - - - diff --git a/src/sokit/transferskt.cpp b/src/sokit/transferskt.cpp index e3a01cd..608ad03 100644 --- a/src/sokit/transferskt.cpp +++ b/src/sokit/transferskt.cpp @@ -8,8 +8,8 @@ #define MAXBUFFER 1024*1024 -TransferSkt::TransferSkt(QObject *parent) -: QObject(parent),m_spt(0),m_dpt(0) +TransferSkt::TransferSkt(QObject* parent) + : QObject(parent), m_spt(0), m_dpt(0) { } @@ -32,16 +32,17 @@ bool TransferSkt::start(const QHostAddress& sip, quint16 spt, const QHostAddress QString msg("start %1 transfer server %2!"); if (!res) { - msg = msg.arg(name(),"failed"); + msg = msg.arg(name(), "failed"); if (!m_error.isEmpty()) - { msg += " error:["; + { + msg += " error:["; msg += m_error; msg += "]."; } } else { - msg = msg.arg(name(),"successfully"); + msg = msg.arg(name(), "successfully"); } show(msg); @@ -135,26 +136,31 @@ void TransferSkt::send(const QString& key, bool s2d, const QString& data) QByteArray bin; if (!TK::ascii2bin(data, bin, err)) - show("bad data format to send: "+err); + show("bad data format to send: " + err); else send(v, s2d, bin); } } -void TransferSkt::dump(const char* buf, qint32 len, TransferSkt::DIR dir, const QString& key) +void TransferSkt::dump(const char* buf, qint32 len, DIR dir, const QString& key) { QString title("TRN"); switch (dir) { - case TS2D: title += " -->> "; break; - case TD2S: title += " <<-- "; break; - case SS2D: title += " --+> "; break; - case SD2S: title += " <+-- "; break; - default: title += " ???? "; break; + case TS2D: title += " -->> "; + break; + case TD2S: title += " <<-- "; + break; + case SS2D: title += " --+> "; + break; + case SD2S: title += " <+-- "; + break; + default: title += " ???? "; + break; } title += key; - emit dumpbin(title, buf, (quint32)len); + emit dumpbin(title, buf, static_cast(len)); } void TransferSkt::show(const QString& msg) @@ -162,8 +168,8 @@ void TransferSkt::show(const QString& msg) emit message(msg); } -TransferSktTcp::TransferSktTcp(QObject *parent) -:TransferSkt(parent) +TransferSktTcp::TransferSktTcp(QObject* parent) + : TransferSkt(parent) { } @@ -180,18 +186,15 @@ bool TransferSktTcp::open() return true; } - else - { - setError(QString("%1, %2").arg(m_server.serverError()).arg(m_server.errorString())); - } + setError(QString("%1, %2").arg(m_server.serverError()).arg(m_server.errorString())); return false; } bool TransferSktTcp::close(void* cookie) { - Conn* conn = (Conn*)cookie; - + auto conn = static_cast(cookie); + if (conn->src) conn->src->disconnect(this); @@ -209,7 +212,7 @@ void TransferSktTcp::close(QObject* obj) { QMutexLocker locker(&m_door); - Conn* conn = (Conn*)obj->property(PROP_CONN).value(); + auto conn = static_cast(obj->property(PROP_CONN).value()); if (!conn) return; if (conn->src) @@ -234,7 +237,7 @@ void TransferSktTcp::close(QObject* obj) void TransferSktTcp::error() { - QTcpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); show(QString("TCP socket error %1, %2").arg(s->error()).arg(s->errorString())); @@ -249,20 +252,20 @@ void TransferSktTcp::close() void TransferSktTcp::newConnection() { - QTcpServer* svr = qobject_cast(sender()); + auto svr = qobject_cast(sender()); if (!svr) return; QTcpSocket* src = svr->nextPendingConnection(); while (src) { - Conn* conn = new Conn; + auto conn = new Conn; if (!conn) { src->deleteLater(); } else { - QTcpSocket* dst = new QTcpSocket(); + auto dst = new QTcpSocket(); if (!dst) { delete conn; @@ -270,12 +273,12 @@ void TransferSktTcp::newConnection() } else { - src->setProperty(PROP_CONN, qVariantFromValue((void*)conn)); - dst->setProperty(PROP_CONN, qVariantFromValue((void*)conn)); + src->setProperty(PROP_CONN, QVariant::fromValue(static_cast(conn))); + dst->setProperty(PROP_CONN, QVariant::fromValue(static_cast(conn))); conn->src = src; conn->dst = dst; - conn->key = TK::ipstr(src->peerAddress(),src->peerPort()); + conn->key = TK::ipstr(src->peerAddress(), src->peerPort()); connect(src, SIGNAL(readyRead()), this, SLOT(newData())); connect(src, SIGNAL(destroyed(QObject*)), this, SLOT(close(QObject*))); @@ -299,24 +302,24 @@ void TransferSktTcp::newConnection() void TransferSktTcp::asynConnection() { - QTcpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); if (!s) return; - Conn* conn = (Conn*)s->property(PROP_CONN).value(); + auto conn = static_cast(s->property(PROP_CONN).value()); if (!conn) return; show(QString("connection %1 to %2:%3 opened!") - .arg(conn->key, s->peerName()).arg(s->peerPort())); + .arg(conn->key, s->peerName()).arg(s->peerPort())); } void TransferSktTcp::newData() { QMutexLocker locker(&m_door); - QTcpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); if (!s) return; - Conn* conn = (Conn*)s->property(PROP_CONN).value(); + auto conn = static_cast(s->property(PROP_CONN).value()); if (!conn) return; QTcpSocket* d = (s == conn->src) ? conn->dst : conn->src; @@ -326,13 +329,13 @@ void TransferSktTcp::newData() if (!buf) return; qint64 readLen, writeLen, ioLen; - + readLen = 0; ioLen = s->read(buf, bufLen); while (ioLen > 0) { readLen += ioLen; - ioLen = s->read(buf+readLen, bufLen-readLen); + ioLen = s->read(buf + readLen, bufLen - readLen); } if (ioLen >= 0) @@ -344,13 +347,13 @@ void TransferSktTcp::newData() while (ioLen > 0) { writeLen += ioLen; - ioLen = d->write(buf+writeLen, readLen-writeLen); + ioLen = d->write(buf + writeLen, readLen - writeLen); } if (ioLen >= 0) { recordSend(writeLen); - dump(buf, readLen, ((s==conn->src) ? TS2D:TD2S), conn->key); + dump(buf, readLen, ((s == conn->src) ? TS2D : TD2S), conn->key); } } @@ -359,13 +362,13 @@ void TransferSktTcp::newData() void TransferSktTcp::send(void* cookie, bool s2d, const QByteArray& bin) { - Conn* conn = (Conn*)cookie; + auto conn = static_cast(cookie); - QTcpSocket* d = s2d ? conn->dst : conn->src; + QTcpSocket* d = s2d ? conn->dst : conn->src; QHostAddress a = s2d ? dstAddr() : conn->src->peerAddress(); - quint16 p = s2d ? dstPort() : conn->src->peerPort(); - - const char * src = bin.constData(); + quint16 p = s2d ? dstPort() : conn->src->peerPort(); + + const char* src = bin.constData(); qint64 srcLen = bin.length(); qint64 writeLen = 0; @@ -374,22 +377,22 @@ void TransferSktTcp::send(void* cookie, bool s2d, const QByteArray& bin) while (ioLen > 0) { writeLen += ioLen; - ioLen = d->write(src+writeLen, srcLen-writeLen); + ioLen = d->write(src + writeLen, srcLen - writeLen); } if (writeLen != srcLen) { show(QString("failed to send data to %1:%2 [%3]") - .arg(a.toString()).arg(p).arg(writeLen)); + .arg(a.toString()).arg(p).arg(writeLen)); return; } recordSend(writeLen); - dump(src, srcLen, (s2d?SS2D:SD2S), conn->key); + dump(src, srcLen, (s2d ? SS2D : SD2S), conn->key); } -TransferSktUdp::TransferSktUdp(QObject *parent) -:TransferSkt(parent) +TransferSktUdp::TransferSktUdp(QObject* parent) + : TransferSkt(parent) { } @@ -400,7 +403,7 @@ TransferSktUdp::~TransferSktUdp() void TransferSktUdp::error() { - QUdpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); show(QString("UDP socket error %1, %2").arg(s->error()).arg(s->errorString())); @@ -419,18 +422,15 @@ bool TransferSktUdp::open() m_timer.start(2000); return true; } - else - { - setError(QString("%1, %2").arg(m_server.error()).arg(m_server.errorString())); - } + setError(QString("%1, %2").arg(m_server.error()).arg(m_server.errorString())); return false; } bool TransferSktUdp::close(void* cookie) { - Conn* conn = (Conn*)cookie; - + auto conn = static_cast(cookie); + if (conn->dst) conn->dst->disconnect(this); @@ -442,7 +442,7 @@ bool TransferSktUdp::close(void* cookie) void TransferSktUdp::close(QObject* obj) { - Conn* conn = (Conn*)obj->property(PROP_CONN).value(); + auto conn = static_cast(obj->property(PROP_CONN).value()); if (!conn) return; unsetCookie(conn->key); @@ -459,47 +459,48 @@ void TransferSktUdp::close() void TransferSktUdp::newData() { - QUdpSocket* s = qobject_cast(sender()); + auto s = qobject_cast(sender()); if (!s) return; qint64 bufLen = s->pendingDatagramSize(); char* buf = TK::createBuffer(bufLen, MAXBUFFER); if (!buf) return; - QHostAddress addr; quint16 port(0); + QHostAddress addr; + quint16 port(0); qint64 readLen = 0; qint64 ioLen = s->readDatagram(buf, bufLen, &addr, &port); //while (ioLen > 0) //{ - readLen += ioLen; + readLen += ioLen; // ioLen = s->readDatagram(buf+readLen, bufLen-readLen, &addr, &port); //} if (ioLen >= 0) { - Conn* conn = NULL; + Conn* conn = nullptr; if (s == &m_server) { - conn = (Conn*)getCookie(TK::ipstr(addr, port)); + conn = static_cast(getCookie(TK::ipstr(addr, port))); if (!conn) { conn = new Conn; if (conn) { - QUdpSocket* dst = new QUdpSocket(); + auto dst = new QUdpSocket(); if (!dst) { delete conn; - conn = NULL; + conn = nullptr; } else { - dst->setProperty(PROP_CONN, qVariantFromValue((void*)conn)); + dst->setProperty(PROP_CONN, QVariant::fromValue(static_cast(conn))); - conn->dst = dst; - conn->key = TK::ipstr(addr, port); + conn->dst = dst; + conn->key = TK::ipstr(addr, port); conn->addr = addr; conn->port = port; @@ -516,7 +517,7 @@ void TransferSktUdp::newData() } else { - conn = (Conn*)s->property(PROP_CONN).value(); + conn = static_cast(s->property(PROP_CONN).value()); if (!conn) { s->disconnect(this); @@ -537,8 +538,7 @@ void TransferSktUdp::newData() while (ioLen > 0) { writeLen += ioLen; - ioLen = (writeLen >= readLen) ? 0 : - conn->dst->write(buf+writeLen, readLen-writeLen); + ioLen = (writeLen >= readLen) ? 0 : conn->dst->write(buf + writeLen, readLen - writeLen); } dump(buf, readLen, TS2D, conn->key); @@ -549,8 +549,9 @@ void TransferSktUdp::newData() while (ioLen > 0) { writeLen += ioLen; - ioLen = (writeLen >= readLen) ? 0 : - m_server.writeDatagram(buf+writeLen, readLen-writeLen, conn->addr, conn->port); + ioLen = (writeLen >= readLen) + ? 0 + : m_server.writeDatagram(buf + writeLen, readLen - writeLen, conn->addr, conn->port); } dump(buf, readLen, TD2S, conn->key); @@ -565,12 +566,12 @@ void TransferSktUdp::newData() void TransferSktUdp::send(void* cookie, bool s2d, const QByteArray& bin) { - Conn* conn = (Conn*)cookie; + auto conn = static_cast(cookie); QHostAddress a = s2d ? dstAddr() : conn->addr; - quint16 p = s2d ? dstPort() : conn->port; - - const char * src = bin.constData(); + quint16 p = s2d ? dstPort() : conn->port; + + const char* src = bin.constData(); qint64 srcLen = bin.length(); qint64 writeLen = 0; @@ -583,19 +584,20 @@ void TransferSktUdp::send(void* cookie, bool s2d, const QByteArray& bin) if (writeLen >= srcLen) break; - ioLen = s2d ? conn->dst->write(src+writeLen, srcLen-writeLen) : - m_server.writeDatagram(src+writeLen, srcLen-writeLen, a, p); + ioLen = s2d + ? conn->dst->write(src + writeLen, srcLen - writeLen) + : m_server.writeDatagram(src + writeLen, srcLen - writeLen, a, p); } if (writeLen != srcLen) { show(QString("failed to send data to %1:%2 [%3]") - .arg(a.toString()).arg(p).arg(writeLen)); + .arg(a.toString()).arg(p).arg(writeLen)); return; } recordSend(writeLen); - dump(src, srcLen, (s2d?SS2D:SD2S), conn->key); + dump(src, srcLen, (s2d ? SS2D : SD2S), conn->key); } void TransferSktUdp::check() @@ -609,11 +611,10 @@ void TransferSktUdp::check() void* c = getCookie(k); - if (c && (((Conn*)c)->stamp.addSecs(120) < QDateTime::currentDateTime())) + if (c && (static_cast(c)->stamp.addSecs(120) < QDateTime::currentDateTime())) { close(c); unsetCookie(k); } } } - diff --git a/src/sokit/transferskt.h b/src/sokit/transferskt.h index 901e7fe..8c5ec3d 100644 --- a/src/sokit/transferskt.h +++ b/src/sokit/transferskt.h @@ -10,13 +10,13 @@ class TransferSkt : public QObject { - typedef QHash OBJMAP; + using OBJMAP = QHash; Q_OBJECT public: - TransferSkt(QObject *parent=0); - virtual ~TransferSkt(); + TransferSkt(QObject* parent = nullptr); + ~TransferSkt() override; virtual QString name() const { return "General"; }; @@ -43,7 +43,8 @@ class TransferSkt : public QObject void countSend(qint32 bytes); protected: - enum DIR { TS2D, TD2S, SS2D, SD2S, }; + enum DIR { TS2D, TD2S, SS2D, SD2S, }; + void dump(const char* buf, qint32 len, DIR dir, const QString& key); void show(const QString& msg); @@ -56,7 +57,7 @@ class TransferSkt : public QObject void setCookie(const QString& k, void* v); void unsetCookie(const QString& k); void* getCookie(const QString& k); - + virtual bool open() =0; virtual bool close(void* cookie) =0; @@ -76,26 +77,26 @@ class TransferSkt : public QObject class TransferSktTcp : public TransferSkt { - typedef struct _Conn + using Conn = struct _Conn { QTcpSocket* src; QTcpSocket* dst; QString key; - } Conn; + }; Q_OBJECT public: - TransferSktTcp(QObject *parent=0); - virtual ~TransferSktTcp(); + TransferSktTcp(QObject* parent = nullptr); + ~TransferSktTcp() override; - virtual QString name() const { return "TCP"; }; + QString name() const override { return "TCP"; }; protected: - virtual bool open(); - virtual bool close(void* cookie); - virtual void send(void* cookie, bool s2d, const QByteArray& bin); - virtual void close(); + bool open() override; + bool close(void* cookie) override; + void send(void* cookie, bool s2d, const QByteArray& bin) override; + void close() override; private slots: void newConnection(); @@ -111,28 +112,28 @@ private slots: class TransferSktUdp : public TransferSkt { - typedef struct _Conn + using Conn = struct _Conn { QUdpSocket* dst; QHostAddress addr; quint16 port; QDateTime stamp; QString key; - } Conn; + }; Q_OBJECT public: - TransferSktUdp(QObject *parent=0); - virtual ~TransferSktUdp(); + TransferSktUdp(QObject* parent = nullptr); + ~TransferSktUdp() override; - virtual QString name() const { return "UDP"; }; + QString name() const override { return "UDP"; }; protected: - virtual bool open(); - virtual bool close(void* cookie); - virtual void send(void* cookie, bool s2d, const QByteArray& bin); - virtual void close(); + bool open() override; + bool close(void* cookie) override; + void send(void* cookie, bool s2d, const QByteArray& bin) override; + void close() override; private slots: void newData(); @@ -146,4 +147,3 @@ private slots: }; #endif // __TRANSFERSKT_H__ - From 87d0de88142fe89be23fe1274bc3fa8c833948d5 Mon Sep 17 00:00:00 2001 From: hoshinohikari Date: Thu, 11 Aug 2022 00:41:52 +0900 Subject: [PATCH 2/2] fix cmake --- CMakeLists.txt | 15 +++++++++++++-- src/sokit/main.cpp | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3d9fce..907328b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,19 @@ find_package(Qt6LinguistTools) file(GLOB SRC_FILES "src/sokit/*.cpp" "src/sokit/*.qrc" "src/sokit/*.rc" "src/sokit/*.ui") file(GLOB HEAD_FILES "src/sokit/*.h") -add_executable(${PROJECT_NAME} ${SRC_FILES} ${HEAD_FILES} ) +if(CMAKE_HOST_WIN32) + enable_language("RC") + if(CMAKE_BUILD_TYPE STREQUAL "Release") + add_executable(${PROJECT_NAME} WIN32 ${SRC_FILES} ${HEAD_FILES} ) + else() + add_executable(${PROJECT_NAME} ${SRC_FILES} ${HEAD_FILES} ) + endif() +else() + add_executable(${PROJECT_NAME} ${SRC_FILES} ${HEAD_FILES} "qml.qrc" ) +endif() qt_add_translations(${PROJECT_NAME} TS_FILES "src/sokit/sokit.ts") -target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Network ) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Network ) + +set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}/) \ No newline at end of file diff --git a/src/sokit/main.cpp b/src/sokit/main.cpp index 6232abe..0f80b47 100644 --- a/src/sokit/main.cpp +++ b/src/sokit/main.cpp @@ -16,7 +16,7 @@ #define SET_KEY_LANG "/lang" #define SET_VAL_LANG "sokit" -#define SET_VAL_LANX ".lan" +#define SET_VAL_LANX ".qm" Sokit::Sokit(int& argc, char** argv) : QApplication(argc, argv)