diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogentry.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogentry.o index a0a9c50a..3e8e2703 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogentry.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogentry.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogsview.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogsview.o index 11d60359..8ff7afd0 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogsview.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogsview.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/lab1 b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/lab1 index 4f4d90a1..e9b0a32f 100755 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/lab1 and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/lab1 differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.cpp b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.cpp index 808d99fc..65a852c2 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.cpp +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_blogEntry_t { - const uint offsetsAndSize[24]; - char stringdata0[132]; + const uint offsetsAndSize[30]; + char stringdata0[185]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(offsetof(qt_meta_stringdata_blogEntry_t, stringdata0) + ofs), len @@ -40,13 +40,17 @@ QT_MOC_LITERAL(74, 12), // "QJsonObject&" QT_MOC_LITERAL(87, 5), // "users" QT_MOC_LITERAL(93, 4), // "name" QT_MOC_LITERAL(98, 11), // "removeEntry" -QT_MOC_LITERAL(110, 21) // "on_pushButton_clicked" +QT_MOC_LITERAL(110, 21), // "on_pushButton_clicked" +QT_MOC_LITERAL(132, 26), // "on_editEntryButton_clicked" +QT_MOC_LITERAL(159, 9), // "editEntry" +QT_MOC_LITERAL(169, 15) // "saveEditedEntry" }, "blogEntry\0on_saveEntry_clicked\0\0" "saveEntry\0readJsonFile\0title\0saveJsonFile\0" "QJsonObject&\0users\0name\0removeEntry\0" - "on_pushButton_clicked" + "on_pushButton_clicked\0on_editEntryButton_clicked\0" + "editEntry\0saveEditedEntry" }; #undef QT_MOC_LITERAL @@ -56,7 +60,7 @@ static const uint qt_meta_data_blogEntry[] = { 10, // revision 0, // classname 0, 0, // classinfo - 6, 14, // methods + 9, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -64,12 +68,15 @@ static const uint qt_meta_data_blogEntry[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 1, 0, 50, 2, 0x08, 1 /* Private */, - 3, 0, 51, 2, 0x08, 2 /* Private */, - 4, 1, 52, 2, 0x08, 3 /* Private */, - 6, 2, 55, 2, 0x108, 5 /* Private | MethodIsConst */, - 10, 0, 60, 2, 0x08, 8 /* Private */, - 11, 0, 61, 2, 0x08, 9 /* Private */, + 1, 0, 68, 2, 0x08, 1 /* Private */, + 3, 0, 69, 2, 0x08, 2 /* Private */, + 4, 1, 70, 2, 0x08, 3 /* Private */, + 6, 2, 73, 2, 0x108, 5 /* Private | MethodIsConst */, + 10, 0, 78, 2, 0x08, 8 /* Private */, + 11, 0, 79, 2, 0x08, 9 /* Private */, + 12, 0, 80, 2, 0x08, 10 /* Private */, + 13, 0, 81, 2, 0x08, 11 /* Private */, + 14, 0, 82, 2, 0x08, 12 /* Private */, // slots: parameters QMetaType::Void, @@ -77,6 +84,9 @@ static const uint qt_meta_data_blogEntry[] = { QMetaType::QJsonObject, QMetaType::QString, 5, QMetaType::Void, 0x80000000 | 7, QMetaType::QString, 8, 9, QMetaType::Void, + QMetaType::Void, + QMetaType::Void, + QMetaType::Void, QMetaType::Void, 0 // eod @@ -95,6 +105,9 @@ void blogEntry::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v case 3: _t->saveJsonFile((*reinterpret_cast< std::add_pointer_t>(_a[1])),(*reinterpret_cast< std::add_pointer_t>(_a[2]))); break; case 4: _t->removeEntry(); break; case 5: _t->on_pushButton_clicked(); break; + case 6: _t->on_editEntryButton_clicked(); break; + case 7: _t->editEntry(); break; + case 8: _t->saveEditedEntry(); break; default: ; } } @@ -108,7 +121,7 @@ const QMetaObject blogEntry::staticMetaObject = { { nullptr, qt_incomplete_metaTypeArray -, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete +, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete >, @@ -135,13 +148,13 @@ int blogEntry::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) + if (_id < 9) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 9; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 6) + if (_id < 9) *reinterpret_cast(_a[0]) = QMetaType(); - _id -= 6; + _id -= 9; } return _id; } diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.o index 54b19277..4afb993a 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogentry.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h index c8121481..b3dcc4c3 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h @@ -30,6 +30,7 @@ public: QTextEdit *textEdit; QPushButton *saveEntry; QPushButton *pushButton; + QPushButton *editEntryButton; void setupUi(QWidget *blogEntry) { @@ -61,6 +62,7 @@ public: saveEntry = new QPushButton(blogEntry); saveEntry->setObjectName(QString::fromUtf8("saveEntry")); + saveEntry->setFlat(false); formLayout->setWidget(4, QFormLayout::FieldRole, saveEntry); @@ -69,6 +71,11 @@ public: formLayout->setWidget(5, QFormLayout::FieldRole, pushButton); + editEntryButton = new QPushButton(blogEntry); + editEntryButton->setObjectName(QString::fromUtf8("editEntryButton")); + + formLayout->setWidget(6, QFormLayout::FieldRole, editEntryButton); + retranslateUi(blogEntry); @@ -83,6 +90,7 @@ public: dateTime->setText(QCoreApplication::translate("blogEntry", "Date Time", nullptr)); saveEntry->setText(QCoreApplication::translate("blogEntry", "Save Entry", nullptr)); pushButton->setText(QCoreApplication::translate("blogEntry", "Remove Entry", nullptr)); + editEntryButton->setText(QCoreApplication::translate("blogEntry", "Edit Entry", nullptr)); } // retranslateUi };