refactoring

This commit is contained in:
semenov
2024-08-30 14:51:01 +03:00
parent 6a71f421fd
commit f333afe2b4
45 changed files with 592 additions and 410 deletions

View File

@@ -23,7 +23,7 @@ QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_MainWindow_t {
QByteArrayData data[25];
char stringdata0[426];
char stringdata0[439];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -33,44 +33,46 @@ struct qt_meta_stringdata_MainWindow_t {
static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = {
{
QT_MOC_LITERAL(0, 0, 10), // "MainWindow"
QT_MOC_LITERAL(1, 11, 18), // "onInitializeClient"
QT_MOC_LITERAL(2, 30, 0), // ""
QT_MOC_LITERAL(3, 31, 16), // "RecognizeSystem*"
QT_MOC_LITERAL(4, 48, 15), // "recognizeSystem"
QT_MOC_LITERAL(5, 64, 17), // "ExternalExecuter*"
QT_MOC_LITERAL(6, 82, 16), // "externalExecuter"
QT_MOC_LITERAL(7, 99, 12), // "onSetConnect"
QT_MOC_LITERAL(8, 112, 15), // "ServerSettings*"
QT_MOC_LITERAL(9, 128, 14), // "serverSettings"
QT_MOC_LITERAL(10, 143, 15), // "onCalculateHash"
QT_MOC_LITERAL(11, 159, 23), // "SendClientAuthorization"
QT_MOC_LITERAL(12, 183, 13), // "onSendMessage"
QT_MOC_LITERAL(13, 197, 7), // "message"
QT_MOC_LITERAL(14, 205, 22), // "on_loginButton_clicked"
QT_MOC_LITERAL(15, 228, 23), // "on_updateButton_clicked"
QT_MOC_LITERAL(16, 252, 22), // "on_startButton_clicked"
QT_MOC_LITERAL(17, 275, 27), // "on_saveServerButton_clicked"
QT_MOC_LITERAL(18, 303, 25), // "on_settingsButton_clicked"
QT_MOC_LITERAL(19, 329, 13), // "disableNotify"
QT_MOC_LITERAL(20, 343, 17), // "onConnectionState"
QT_MOC_LITERAL(21, 361, 4), // "flag"
QT_MOC_LITERAL(22, 366, 24), // "on_connectButton_clicked"
QT_MOC_LITERAL(23, 391, 29), // "on_languageComboBox_activated"
QT_MOC_LITERAL(24, 421, 4) // "arg1"
QT_MOC_LITERAL(1, 11, 19), // "sigInitializeClient"
QT_MOC_LITERAL(2, 31, 0), // ""
QT_MOC_LITERAL(3, 32, 16), // "RecognizeSystem*"
QT_MOC_LITERAL(4, 49, 15), // "recognizeSystem"
QT_MOC_LITERAL(5, 65, 17), // "ExternalExecuter*"
QT_MOC_LITERAL(6, 83, 16), // "externalExecuter"
QT_MOC_LITERAL(7, 100, 13), // "sigSetConnect"
QT_MOC_LITERAL(8, 114, 15), // "ServerSettings*"
QT_MOC_LITERAL(9, 130, 14), // "serverSettings"
QT_MOC_LITERAL(10, 145, 16), // "sigCalculateHash"
QT_MOC_LITERAL(11, 162, 26), // "sigSendClientAuthorization"
QT_MOC_LITERAL(12, 189, 14), // "sigSendMessage"
QT_MOC_LITERAL(13, 204, 7), // "message"
QT_MOC_LITERAL(14, 212, 22), // "on_loginButton_clicked"
QT_MOC_LITERAL(15, 235, 23), // "on_updateButton_clicked"
QT_MOC_LITERAL(16, 259, 22), // "on_startButton_clicked"
QT_MOC_LITERAL(17, 282, 27), // "on_saveServerButton_clicked"
QT_MOC_LITERAL(18, 310, 25), // "on_settingsButton_clicked"
QT_MOC_LITERAL(19, 336, 24), // "on_connectButton_clicked"
QT_MOC_LITERAL(20, 361, 29), // "on_languageComboBox_activated"
QT_MOC_LITERAL(21, 391, 4), // "arg1"
QT_MOC_LITERAL(22, 396, 17), // "slotDisableNotify"
QT_MOC_LITERAL(23, 414, 19), // "slotConnectionState"
QT_MOC_LITERAL(24, 434, 4) // "flag"
},
"MainWindow\0onInitializeClient\0\0"
"MainWindow\0sigInitializeClient\0\0"
"RecognizeSystem*\0recognizeSystem\0"
"ExternalExecuter*\0externalExecuter\0"
"onSetConnect\0ServerSettings*\0"
"serverSettings\0onCalculateHash\0"
"SendClientAuthorization\0onSendMessage\0"
"sigSetConnect\0ServerSettings*\0"
"serverSettings\0sigCalculateHash\0"
"sigSendClientAuthorization\0sigSendMessage\0"
"message\0on_loginButton_clicked\0"
"on_updateButton_clicked\0on_startButton_clicked\0"
"on_saveServerButton_clicked\0"
"on_settingsButton_clicked\0disableNotify\0"
"onConnectionState\0flag\0on_connectButton_clicked\0"
"on_languageComboBox_activated\0arg1"
"on_settingsButton_clicked\0"
"on_connectButton_clicked\0"
"on_languageComboBox_activated\0arg1\0"
"slotDisableNotify\0slotConnectionState\0"
"flag"
};
#undef QT_MOC_LITERAL
@@ -119,9 +121,9 @@ static const uint qt_meta_data_MainWindow[] = {
QMetaType::Void,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void, QMetaType::Bool, 21,
QMetaType::Void, QMetaType::QString, 21,
QMetaType::Void,
QMetaType::Void, QMetaType::QString, 24,
QMetaType::Void, QMetaType::Bool, 24,
0 // eod
};
@@ -132,20 +134,20 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
auto *_t = static_cast<MainWindow *>(_o);
Q_UNUSED(_t)
switch (_id) {
case 0: _t->onInitializeClient((*reinterpret_cast< RecognizeSystem*(*)>(_a[1])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[2]))); break;
case 1: _t->onSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1]))); break;
case 2: _t->onCalculateHash(); break;
case 3: _t->SendClientAuthorization(); break;
case 4: _t->onSendMessage((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 0: _t->sigInitializeClient((*reinterpret_cast< RecognizeSystem*(*)>(_a[1])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[2]))); break;
case 1: _t->sigSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1]))); break;
case 2: _t->sigCalculateHash(); break;
case 3: _t->sigSendClientAuthorization(); break;
case 4: _t->sigSendMessage((*reinterpret_cast< QString(*)>(_a[1]))); break;
case 5: _t->on_loginButton_clicked(); break;
case 6: _t->on_updateButton_clicked(); break;
case 7: _t->on_startButton_clicked(); break;
case 8: _t->on_saveServerButton_clicked(); break;
case 9: _t->on_settingsButton_clicked(); break;
case 10: _t->disableNotify(); break;
case 11: _t->onConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
case 12: _t->on_connectButton_clicked(); break;
case 13: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 10: _t->on_connectButton_clicked(); break;
case 11: _t->on_languageComboBox_activated((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 12: _t->slotDisableNotify(); break;
case 13: _t->slotConnectionState((*reinterpret_cast< bool(*)>(_a[1]))); break;
default: ;
}
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
@@ -165,35 +167,35 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
int *result = reinterpret_cast<int *>(_a[0]);
{
using _t = void (MainWindow::*)(RecognizeSystem * , ExternalExecuter * );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onInitializeClient)) {
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigInitializeClient)) {
*result = 0;
return;
}
}
{
using _t = void (MainWindow::*)(ServerSettings * );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onSetConnect)) {
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSetConnect)) {
*result = 1;
return;
}
}
{
using _t = void (MainWindow::*)();
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onCalculateHash)) {
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigCalculateHash)) {
*result = 2;
return;
}
}
{
using _t = void (MainWindow::*)();
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::SendClientAuthorization)) {
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendClientAuthorization)) {
*result = 3;
return;
}
}
{
using _t = void (MainWindow::*)(QString );
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onSendMessage)) {
if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::sigSendMessage)) {
*result = 4;
return;
}
@@ -242,33 +244,33 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
}
// SIGNAL 0
void MainWindow::onInitializeClient(RecognizeSystem * _t1, ExternalExecuter * _t2)
void MainWindow::sigInitializeClient(RecognizeSystem * _t1, ExternalExecuter * _t2)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))), const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t2))) };
QMetaObject::activate(this, &staticMetaObject, 0, _a);
}
// SIGNAL 1
void MainWindow::onSetConnect(ServerSettings * _t1)
void MainWindow::sigSetConnect(ServerSettings * _t1)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 1, _a);
}
// SIGNAL 2
void MainWindow::onCalculateHash()
void MainWindow::sigCalculateHash()
{
QMetaObject::activate(this, &staticMetaObject, 2, nullptr);
}
// SIGNAL 3
void MainWindow::SendClientAuthorization()
void MainWindow::sigSendClientAuthorization()
{
QMetaObject::activate(this, &staticMetaObject, 3, nullptr);
}
// SIGNAL 4
void MainWindow::onSendMessage(QString _t1)
void MainWindow::sigSendMessage(QString _t1)
{
void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) };
QMetaObject::activate(this, &staticMetaObject, 4, _a);