From 7ecb7f6c19d07348c1de7331da311c2790b9ada1 Mon Sep 17 00:00:00 2001 From: mmhguo <604881159@qq.com> Date: 星期二, 29 七月 2025 09:12:43 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719 7.28 --- Server/付林涛/code/build-tianKai-Desktop_Qt_5_9_4_MinGW_32bit-Debug/debug/moc_vcsmainwindow.cpp | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git "a/Server/\344\273\230\346\236\227\346\266\233/code/build-tianKai-Desktop_Qt_5_9_4_MinGW_32bit-Debug/debug/moc_vcsmainwindow.cpp" "b/Server/\344\273\230\346\236\227\346\266\233/code/build-tianKai-Desktop_Qt_5_9_4_MinGW_32bit-Debug/debug/moc_vcsmainwindow.cpp" index 3af581b..4a5d45a 100644 --- "a/Server/\344\273\230\346\236\227\346\266\233/code/build-tianKai-Desktop_Qt_5_9_4_MinGW_32bit-Debug/debug/moc_vcsmainwindow.cpp" +++ "b/Server/\344\273\230\346\236\227\346\266\233/code/build-tianKai-Desktop_Qt_5_9_4_MinGW_32bit-Debug/debug/moc_vcsmainwindow.cpp" @@ -21,8 +21,8 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_VCSMainWindow_t { - QByteArrayData data[6]; - char stringdata0[109]; + QByteArrayData data[7]; + char stringdata0[121]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -36,12 +36,14 @@ QT_MOC_LITERAL(2, 36, 0), // "" QT_MOC_LITERAL(3, 37, 23), // "on_pushButton_2_clicked" QT_MOC_LITERAL(4, 61, 23), // "on_pushButton_4_clicked" -QT_MOC_LITERAL(5, 85, 23) // "on_pushButton_3_clicked" +QT_MOC_LITERAL(5, 85, 23), // "on_pushButton_3_clicked" +QT_MOC_LITERAL(6, 109, 11) // "addFileSlot" }, "VCSMainWindow\0on_pushButton_clicked\0" "\0on_pushButton_2_clicked\0" - "on_pushButton_4_clicked\0on_pushButton_3_clicked" + "on_pushButton_4_clicked\0on_pushButton_3_clicked\0" + "addFileSlot" }; #undef QT_MOC_LITERAL @@ -51,7 +53,7 @@ 7, // revision 0, // classname 0, 0, // classinfo - 4, 14, // methods + 5, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -59,16 +61,18 @@ 0, // signalCount // slots: name, argc, parameters, tag, flags - 1, 0, 34, 2, 0x08 /* Private */, - 3, 0, 35, 2, 0x08 /* Private */, - 4, 0, 36, 2, 0x08 /* Private */, - 5, 0, 37, 2, 0x08 /* Private */, + 1, 0, 39, 2, 0x08 /* Private */, + 3, 0, 40, 2, 0x08 /* Private */, + 4, 0, 41, 2, 0x08 /* Private */, + 5, 0, 42, 2, 0x08 /* Private */, + 6, 2, 43, 2, 0x08 /* Private */, // slots: parameters QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 2, 2, 0 // eod }; @@ -83,10 +87,10 @@ case 1: _t->on_pushButton_2_clicked(); break; case 2: _t->on_pushButton_4_clicked(); break; case 3: _t->on_pushButton_3_clicked(); break; + case 4: _t->addFileSlot((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; default: ; } } - Q_UNUSED(_a); } const QMetaObject VCSMainWindow::staticMetaObject = { @@ -114,13 +118,13 @@ if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) + if (_id < 5) qt_static_metacall(this, _c, _id, _a); - _id -= 4; + _id -= 5; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 4) + if (_id < 5) *reinterpret_cast<int*>(_a[0]) = -1; - _id -= 4; + _id -= 5; } return _id; } -- Gitblit v1.8.0