diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/QJsonArray.D1F93AE849B76CCE.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/QJsonArray.D1F93AE849B76CCE.idx new file mode 100644 index 00000000..d27fe263 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/QJsonArray.D1F93AE849B76CCE.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/QString.8342D5DEEF7795FE.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/QString.8342D5DEEF7795FE.idx new file mode 100644 index 00000000..d23ec9bf Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/QString.8342D5DEEF7795FE.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.cpp.9B1922A890691BFB.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.cpp.9B1922A890691BFB.idx index 60217a3a..27475805 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.cpp.9B1922A890691BFB.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.cpp.9B1922A890691BFB.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.h.DA34EB23676CB848.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.h.DA34EB23676CB848.idx index b0b9702a..42882202 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.h.DA34EB23676CB848.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogentry.h.DA34EB23676CB848.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.cpp.42C3FA7D2A2C01E4.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.cpp.42C3FA7D2A2C01E4.idx index cf0a11df..46356072 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.cpp.42C3FA7D2A2C01E4.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.cpp.42C3FA7D2A2C01E4.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.h.3B8FA4C481C6EC19.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.h.3B8FA4C481C6EC19.idx index 8bf2e209..9435c740 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.h.3B8FA4C481C6EC19.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/blogsview.h.3B8FA4C481C6EC19.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/login.cpp.2B676BE4A08ED8DA.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/login.cpp.2B676BE4A08ED8DA.idx index e008e21b..6c11b344 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/login.cpp.2B676BE4A08ED8DA.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/login.cpp.2B676BE4A08ED8DA.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.C285C1D221BB30CE.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.C285C1D221BB30CE.idx index 5c583951..74f4c433 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.C285C1D221BB30CE.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/main.cpp.C285C1D221BB30CE.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.A1B8B5810BC4F3BB.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.A1B8B5810BC4F3BB.idx index 9ecd01d4..5e2d8e21 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.A1B8B5810BC4F3BB.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.A1B8B5810BC4F3BB.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.0E0E1D0A90899B62.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.0E0E1D0A90899B62.idx index 2951cf47..05bd129a 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.0E0E1D0A90899B62.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/mainwindow.h.0E0E1D0A90899B62.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/qjsonarray.h.B13F2FA18FCCF5CD.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/qjsonarray.h.B13F2FA18FCCF5CD.idx new file mode 100644 index 00000000..16ff68c5 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/qjsonarray.h.B13F2FA18FCCF5CD.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.41016A1474D439E1.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.41016A1474D439E1.idx new file mode 100644 index 00000000..eac0646f Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.41016A1474D439E1.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.4951ABA4763FA343.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.4951ABA4763FA343.idx index edd1dce3..bfec272f 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.4951ABA4763FA343.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogentry.h.4951ABA4763FA343.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.51499D62D1BAC9B1.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.51499D62D1BAC9B1.idx new file mode 100644 index 00000000..376426d2 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.51499D62D1BAC9B1.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.5D4CC5C51274847E.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.5D4CC5C51274847E.idx index 4fbfa60b..b5ba5624 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.5D4CC5C51274847E.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_blogsview.h.5D4CC5C51274847E.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.2EB235397DFE4D2D.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.2EB235397DFE4D2D.idx new file mode 100644 index 00000000..6707ef84 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.2EB235397DFE4D2D.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.B0B39648D5FBCE69.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.B0B39648D5FBCE69.idx index 85ab71f2..49ada8f3 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.B0B39648D5FBCE69.idx and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_login.h.B0B39648D5FBCE69.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.753DDB061F2F7786.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.753DDB061F2F7786.idx new file mode 100644 index 00000000..7481b89b Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/ui_mainwindow.h.753DDB061F2F7786.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunction.cpp.BCEB6B1ABCA695DE.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunction.cpp.BCEB6B1ABCA695DE.idx new file mode 100644 index 00000000..fedfe68e Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunction.cpp.BCEB6B1ABCA695DE.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunctions.cpp.83502FEC10209D73.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunctions.cpp.83502FEC10209D73.idx new file mode 100644 index 00000000..b4796e62 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunctions.cpp.83502FEC10209D73.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunctions.h.C48555969B9FC02D.idx b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunctions.h.C48555969B9FC02D.idx new file mode 100644 index 00000000..5e8f6f62 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/.cache/clangd/index/universalFunctions.h.C48555969B9FC02D.idx differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/compile_commands.json b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/compile_commands.json index 8a43623d..ef1def6a 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/compile_commands.json +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd/compile_commands.json @@ -7,7 +7,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -76,7 +76,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -145,7 +145,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -214,7 +214,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -283,7 +283,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -352,7 +352,76 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++1z", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-linux-gnu", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtWidgets", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtGui", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtCore", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/9", + "-isystem", + "/usr/include/x86_64-linux-gnu/c++/9", + "-isystem", + "/usr/include/c++/9/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/libexec/qtcreator/clang/lib/clang/14.0.0/include", + "-isystem", + "/usr/include/x86_64-linux-gnu", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1/universalFunctions.cpp" + ], + "directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd", + "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1/universalFunctions.cpp" +}, +{ + "arguments": [ + "clang", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -421,7 +490,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -490,7 +559,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -559,7 +628,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -628,7 +697,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -684,10 +753,10 @@ "-Wno-unknown-pragmas", "-Wno-unknown-warning-option", "-Wno-documentation-unknown-command", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h" + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1/universalFunctions.h" ], "directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd", - "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h" + "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1/universalFunctions.h" }, { "arguments": [ @@ -697,76 +766,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", - "-nostdinc", - "-nostdinc++", - "-pipe", - "-g", - "-std=gnu++1z", - "-Wall", - "-Wextra", - "-D_REENTRANT", - "-fPIC", - "-fsyntax-only", - "-m64", - "--target=x86_64-linux-gnu", - "-DQ_CREATOR_RUN", - "-DQT_QML_DEBUG", - "-DQT_WIDGETS_LIB", - "-DQT_GUI_LIB", - "-DQT_CORE_LIB", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtWidgets", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtGui", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtCore", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/mkspecs/linux-g++", - "-isystem", - "/usr/include/c++/9", - "-isystem", - "/usr/include/x86_64-linux-gnu/c++/9", - "-isystem", - "/usr/include/c++/9/backward", - "-isystem", - "/usr/local/include", - "-isystem", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/libexec/qtcreator/clang/lib/clang/14.0.0/include", - "-isystem", - "/usr/include/x86_64-linux-gnu", - "-isystem", - "/usr/include", - "-fmessage-length=0", - "-fdiagnostics-show-note-include-stack", - "-fretain-comments-from-system-headers", - "-fmacro-backtrace-limit=0", - "-ferror-limit=1000", - "-x", - "c++-header", - "-Wno-unknown-pragmas", - "-Wno-unknown-warning-option", - "-Wno-documentation-unknown-command", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h" - ], - "directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd", - "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h" -}, -{ - "arguments": [ - "clang", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders", - "-I", - "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", - "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -835,7 +835,7 @@ "-I", "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", "-I", - "/tmp/QtCreator-siSRAd/clang-uiheader-rbzCFB", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", "-nostdinc", "-nostdinc++", "-pipe", @@ -895,5 +895,143 @@ ], "directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd", "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_mainwindow.h" +}, +{ + "arguments": [ + "clang", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++1z", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-linux-gnu", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtWidgets", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtGui", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtCore", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/9", + "-isystem", + "/usr/include/x86_64-linux-gnu/c++/9", + "-isystem", + "/usr/include/c++/9/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/libexec/qtcreator/clang/lib/clang/14.0.0/include", + "-isystem", + "/usr/include/x86_64-linux-gnu", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++-header", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h" + ], + "directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd", + "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h" +}, +{ + "arguments": [ + "clang", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/QtCreator-FWwSsm/clang-uiheader-ipXBHT", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++1z", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-linux-gnu", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_WIDGETS_LIB", + "-DQT_GUI_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtWidgets", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtGui", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtCore", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug", + "-I", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/9", + "-isystem", + "/usr/include/x86_64-linux-gnu/c++/9", + "-isystem", + "/usr/include/c++/9/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/libexec/qtcreator/clang/lib/clang/14.0.0/include", + "-isystem", + "/usr/include/x86_64-linux-gnu", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++-header", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h" + ], + "directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd", + "file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h" } ] \ No newline at end of file diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/Makefile b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/Makefile index 45867d4a..9e8824c2 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/Makefile +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/Makefile @@ -56,7 +56,8 @@ SOURCES = ../lab1/blogentry.cpp \ ../lab1/blogsview.cpp \ ../lab1/login.cpp \ ../lab1/main.cpp \ - ../lab1/mainwindow.cpp qrc_qmake_qmake_qm_files.cpp \ + ../lab1/mainwindow.cpp \ + ../lab1/universalFunctions.cpp qrc_qmake_qmake_qm_files.cpp \ moc_blogentry.cpp \ moc_blogsview.cpp \ moc_login.cpp \ @@ -66,6 +67,7 @@ OBJECTS = blogentry.o \ login.o \ main.o \ mainwindow.o \ + universalFunctions.o \ qrc_qmake_qmake_qm_files.o \ moc_blogentry.o \ moc_blogsview.o \ @@ -213,11 +215,13 @@ DIST = ../../QT/6.2.4/gcc_64/mkspecs/features/spec_pre.prf \ ../lab1/lab1.pro ../lab1/blogentry.h \ ../lab1/blogsview.h \ ../lab1/login.h \ - ../lab1/mainwindow.h ../lab1/blogentry.cpp \ + ../lab1/mainwindow.h \ + ../lab1/universalFunctions.h ../lab1/blogentry.cpp \ ../lab1/blogsview.cpp \ ../lab1/login.cpp \ ../lab1/main.cpp \ - ../lab1/mainwindow.cpp + ../lab1/mainwindow.cpp \ + ../lab1/universalFunctions.cpp QMAKE_TARGET = lab1 DESTDIR = TARGET = lab1 @@ -535,8 +539,8 @@ distdir: FORCE $(COPY_FILE) --parents ../lab1/lab1_pl_PL.ts $(DISTDIR)/ $(COPY_FILE) --parents qmake_qmake_qm_files.qrc $(DISTDIR)/ $(COPY_FILE) --parents ../../QT/6.2.4/gcc_64/mkspecs/features/data/dummy.cpp $(DISTDIR)/ - $(COPY_FILE) --parents ../lab1/blogentry.h ../lab1/blogsview.h ../lab1/login.h ../lab1/mainwindow.h $(DISTDIR)/ - $(COPY_FILE) --parents ../lab1/blogentry.cpp ../lab1/blogsview.cpp ../lab1/login.cpp ../lab1/main.cpp ../lab1/mainwindow.cpp $(DISTDIR)/ + $(COPY_FILE) --parents ../lab1/blogentry.h ../lab1/blogsview.h ../lab1/login.h ../lab1/mainwindow.h ../lab1/universalFunctions.h $(DISTDIR)/ + $(COPY_FILE) --parents ../lab1/blogentry.cpp ../lab1/blogsview.cpp ../lab1/login.cpp ../lab1/main.cpp ../lab1/mainwindow.cpp ../lab1/universalFunctions.cpp $(DISTDIR)/ $(COPY_FILE) --parents ../lab1/blogentry.ui ../lab1/blogsview.ui ../lab1/login.ui ../lab1/mainwindow.ui $(DISTDIR)/ $(COPY_FILE) --parents ../lab1/lab1_pl_PL.ts $(DISTDIR)/ @@ -1340,10 +1344,6 @@ blogentry.o: ../lab1/blogentry.cpp ../lab1/blogentry.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qguiapplication.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qinputmethod.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qguiapplication_platform.h \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/QCheckBox \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/qcheckbox.h \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractbutton.h \ - ../../QT/6.2.4/gcc_64/include/QtGui/qicon.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QFormLayout \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qformlayout.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QLayout \ @@ -1364,10 +1364,14 @@ blogentry.o: ../lab1/blogentry.cpp ../lab1/blogentry.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qtextoption.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QPushButton \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qpushbutton.h \ + ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractbutton.h \ + ../../QT/6.2.4/gcc_64/include/QtGui/qicon.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QTextEdit \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qtextedit.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractscrollarea.h \ - ../../QT/6.2.4/gcc_64/include/QtCore/QDateTime + ../../QT/6.2.4/gcc_64/include/QtCore/QDateTime \ + ../../QT/6.2.4/gcc_64/include/QtCore/QJsonArray \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsonarray.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o blogentry.o ../lab1/blogentry.cpp blogsview.o: ../lab1/blogsview.cpp ../lab1/blogsview.h \ @@ -1554,9 +1558,6 @@ blogsview.o: ../lab1/blogsview.cpp ../lab1/blogsview.h \ ../../QT/6.2.4/gcc_64/include/QtCore/QJsonDocument \ ../../QT/6.2.4/gcc_64/include/QtCore/qjsondocument.h \ ui_blogentry.h \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/QCheckBox \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/qcheckbox.h \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractbutton.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QFormLayout \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qformlayout.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QLayout \ @@ -1573,9 +1574,12 @@ blogsview.o: ../lab1/blogsview.cpp ../lab1/blogsview.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qtextoption.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QPushButton \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qpushbutton.h \ + ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractbutton.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QTextEdit \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qtextedit.h \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractscrollarea.h + ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractscrollarea.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/QJsonArray \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsonarray.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o blogsview.o ../lab1/blogsview.cpp login.o: ../lab1/login.cpp ../lab1/login.h \ @@ -1731,11 +1735,13 @@ login.o: ../lab1/login.cpp ../lab1/login.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qinputmethod.h \ ../../QT/6.2.4/gcc_64/include/QtCore/qlocale.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qguiapplication_platform.h \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/QGridLayout \ - ../../QT/6.2.4/gcc_64/include/QtWidgets/qgridlayout.h \ + ../../QT/6.2.4/gcc_64/include/QtWidgets/QFormLayout \ + ../../QT/6.2.4/gcc_64/include/QtWidgets/qformlayout.h \ + ../../QT/6.2.4/gcc_64/include/QtWidgets/QLayout \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qlayout.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qlayoutitem.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qboxlayout.h \ + ../../QT/6.2.4/gcc_64/include/QtWidgets/qgridlayout.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QLabel \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qlabel.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qframe.h \ @@ -1921,6 +1927,7 @@ main.o: ../lab1/main.cpp ../lab1/mainwindow.h \ ../../QT/6.2.4/gcc_64/include/QtCore/qcborcommon.h \ ../../QT/6.2.4/gcc_64/include/QtCore/qregularexpression.h \ ../../QT/6.2.4/gcc_64/include/QtCore/quuid.h \ + ../lab1/universalFunctions.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QApplication \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qapplication.h \ ../../QT/6.2.4/gcc_64/include/QtCore/qcoreapplication.h \ @@ -1943,7 +1950,12 @@ main.o: ../lab1/main.cpp ../lab1/mainwindow.h \ ../../QT/6.2.4/gcc_64/include/QtGui/qguiapplication_platform.h \ ../../QT/6.2.4/gcc_64/include/QtCore/QLocale \ ../../QT/6.2.4/gcc_64/include/QtCore/QTranslator \ - ../../QT/6.2.4/gcc_64/include/QtCore/qtranslator.h + ../../QT/6.2.4/gcc_64/include/QtCore/qtranslator.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/QFile \ + ../../QT/6.2.4/gcc_64/include/QtCore/qfile.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qfiledevice.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/QJsonDocument \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsondocument.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../lab1/main.cpp mainwindow.o: ../lab1/mainwindow.cpp ../lab1/mainwindow.h \ @@ -2135,6 +2147,7 @@ mainwindow.o: ../lab1/mainwindow.cpp ../lab1/mainwindow.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qabstractbutton.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QWidget \ ../lab1/login.h \ + ../lab1/universalFunctions.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/QFileDialog \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qfiledialog.h \ ../../QT/6.2.4/gcc_64/include/QtCore/qdir.h \ @@ -2146,9 +2159,108 @@ mainwindow.o: ../lab1/mainwindow.cpp ../lab1/mainwindow.h \ ../../QT/6.2.4/gcc_64/include/QtWidgets/qmessagebox.h \ ../../QT/6.2.4/gcc_64/include/QtCore/QJsonDocument \ ../../QT/6.2.4/gcc_64/include/QtCore/qjsondocument.h \ - ../../QT/6.2.4/gcc_64/include/QtCore/QTextStream + ../../QT/6.2.4/gcc_64/include/QtCore/QTextStream \ + ../../QT/6.2.4/gcc_64/include/QtCore/QJsonArray \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsonarray.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o ../lab1/mainwindow.cpp +universalFunctions.o: ../lab1/universalFunctions.cpp ../../QT/6.2.4/gcc_64/include/QtCore/QJsonObject \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsonobject.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsonvalue.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qglobal.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qconfig-bootstrapped.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qconfig.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qtcore-config.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qsystemdetection.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qprocessordetection.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcompilerdetection.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qtypeinfo.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcontainerfwd.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qsysinfo.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qlogging.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qflags.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qatomic.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qbasicatomic.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qatomic_bootstrap.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qgenericatomic.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qatomic_cxx11.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qglobalstatic.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qnumeric.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qversiontagging.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstring.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qchar.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringview.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qbytearray.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qrefcount.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qnamespace.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qtmetamacros.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qarraydata.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qpair.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qarraydatapointer.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qarraydataops.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcontainertools_impl.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qbytearrayalgorithms.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qbytearrayview.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringliteral.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringalgorithms.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qanystringview.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qutf8stringview.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringtokenizer.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringbuilder.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qshareddata.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qhashfunctions.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcborvalue.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qdatetime.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcalendar.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qlocale.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qvariant.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qlist.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qiterator.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qbytearraylist.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringlist.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qalgorithms.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringmatcher.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qmetatype.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcompare.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qvarlengtharray.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qscopeguard.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qdatastream.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qscopedpointer.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qiodevicebase.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qiterable.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qmetacontainer.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcontainerinfo.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qtaggedpointer.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qmath.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qobjectdefs.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qobjectdefs_impl.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qmap.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qshareddata_impl.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qhash.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qobject.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcoreevent.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qobject_impl.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qbindingstorage.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qdebug.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qtextstream.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qstringconverter.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qset.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcontiguouscache.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qsharedpointer.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qsharedpointer_impl.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qcborcommon.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qregularexpression.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qurl.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/quuid.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/QString \ + ../../QT/6.2.4/gcc_64/include/QtCore/QJsonDocument \ + ../../QT/6.2.4/gcc_64/include/QtCore/qjsondocument.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/QFile \ + ../../QT/6.2.4/gcc_64/include/QtCore/qfile.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qfiledevice.h \ + ../../QT/6.2.4/gcc_64/include/QtCore/qiodevice.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o universalFunctions.o ../lab1/universalFunctions.cpp + qrc_qmake_qmake_qm_files.o: qrc_qmake_qmake_qm_files.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_qmake_qmake_qm_files.o qrc_qmake_qmake_qm_files.cpp diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogs.json b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogs.json index 1069ce60..846a2fcc 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogs.json +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/blogs.json @@ -5,5 +5,26 @@ ], "ownerId": "1", "title": "" + }, + "2": { + "blogId": "2", + "items": [ + ], + "ownerId": "2", + "title": "" + }, + "5": { + "blogId": "5", + "items": [ + ], + "ownerId": "65", + "title": "SAD" + }, + "77": { + "blogId": "77", + "items": [ + ], + "ownerId": "77", + "title": "" } } 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 8ff7afd0..a9b99e11 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 e9b0a32f..2efc6cb1 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/login.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/login.o index 90a7fe12..b9ff5f9d 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/login.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/login.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/main.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/main.o index 26f5f41e..2e215fd6 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/main.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/main.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/mainwindow.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/mainwindow.o index 1c3cdda9..ff678546 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/mainwindow.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/mainwindow.o differ 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 4afb993a..0af33ac3 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/moc_blogsview.cpp b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.cpp index 7e1ac8c5..8b836907 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.cpp +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_blogsView_t { - const uint offsetsAndSize[8]; - char stringdata0[71]; + const uint offsetsAndSize[12]; + char stringdata0[100]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(offsetof(qt_meta_stringdata_blogsView_t, stringdata0) + ofs), len @@ -32,11 +32,14 @@ static const qt_meta_stringdata_blogsView_t qt_meta_stringdata_blogsView = { QT_MOC_LITERAL(0, 9), // "blogsView" QT_MOC_LITERAL(10, 40), // "on_actionCreate_new_Blog_entr..." QT_MOC_LITERAL(51, 0), // "" -QT_MOC_LITERAL(52, 18) // "displayBlogEntries" +QT_MOC_LITERAL(52, 18), // "displayBlogEntries" +QT_MOC_LITERAL(71, 23), // "on_actionExit_triggered" +QT_MOC_LITERAL(95, 4) // "exit" }, "blogsView\0on_actionCreate_new_Blog_entry_triggered\0" - "\0displayBlogEntries" + "\0displayBlogEntries\0on_actionExit_triggered\0" + "exit" }; #undef QT_MOC_LITERAL @@ -46,7 +49,7 @@ static const uint qt_meta_data_blogsView[] = { 10, // revision 0, // classname 0, 0, // classinfo - 2, 14, // methods + 4, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -54,10 +57,14 @@ static const uint qt_meta_data_blogsView[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 1, 0, 26, 2, 0x08, 1 /* Private */, - 3, 0, 27, 2, 0x08, 2 /* Private */, + 1, 0, 38, 2, 0x08, 1 /* Private */, + 3, 0, 39, 2, 0x08, 2 /* Private */, + 4, 0, 40, 2, 0x08, 3 /* Private */, + 5, 0, 41, 2, 0x08, 4 /* Private */, // slots: parameters + QMetaType::Void, + QMetaType::Void, QMetaType::Void, QMetaType::Void, @@ -72,6 +79,8 @@ void blogsView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v switch (_id) { case 0: _t->on_actionCreate_new_Blog_entry_triggered(); break; case 1: _t->displayBlogEntries(); break; + case 2: _t->on_actionExit_triggered(); break; + case 3: _t->exit(); break; default: ; } } @@ -86,7 +95,7 @@ const QMetaObject blogsView::staticMetaObject = { { nullptr, qt_incomplete_metaTypeArray -, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete +, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete >, @@ -113,13 +122,13 @@ int blogsView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) + if (_id < 4) qt_static_metacall(this, _c, _id, _a); - _id -= 2; + _id -= 4; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 2) + if (_id < 4) *reinterpret_cast(_a[0]) = QMetaType(); - _id -= 2; + _id -= 4; } return _id; } diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.o index 47c59866..669ac4f2 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_blogsview.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.cpp b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.cpp index 60596d46..11a4cb54 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.cpp +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.cpp @@ -22,37 +22,17 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MainWindow_t { - const uint offsetsAndSize[32]; - char stringdata0[194]; + const uint offsetsAndSize[2]; + char stringdata0[11]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(offsetof(qt_meta_stringdata_MainWindow_t, stringdata0) + ofs), len static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { { -QT_MOC_LITERAL(0, 10), // "MainWindow" -QT_MOC_LITERAL(11, 18), // "saveRegisteredUser" -QT_MOC_LITERAL(30, 0), // "" -QT_MOC_LITERAL(31, 12), // "QJsonObject&" -QT_MOC_LITERAL(44, 5), // "users" -QT_MOC_LITERAL(50, 5), // "blogs" -QT_MOC_LITERAL(56, 21), // "on_pushButton_clicked" -QT_MOC_LITERAL(78, 12), // "saveJsonFile" -QT_MOC_LITERAL(91, 4), // "name" -QT_MOC_LITERAL(96, 12), // "readJsonFile" -QT_MOC_LITERAL(109, 5), // "title" -QT_MOC_LITERAL(115, 13), // "thisIdIsTaken" -QT_MOC_LITERAL(129, 13), // "thisIdIsEmpty" -QT_MOC_LITERAL(143, 17), // "thisBlogIdIsTaken" -QT_MOC_LITERAL(161, 22), // "on_loginButton_clicked" -QT_MOC_LITERAL(184, 9) // "goToLogin" +QT_MOC_LITERAL(0, 10) // "MainWindow" }, - "MainWindow\0saveRegisteredUser\0\0" - "QJsonObject&\0users\0blogs\0on_pushButton_clicked\0" - "saveJsonFile\0name\0readJsonFile\0title\0" - "thisIdIsTaken\0thisIdIsEmpty\0" - "thisBlogIdIsTaken\0on_loginButton_clicked\0" - "goToLogin" + "MainWindow" }; #undef QT_MOC_LITERAL @@ -62,57 +42,22 @@ static const uint qt_meta_data_MainWindow[] = { 10, // revision 0, // classname 0, 0, // classinfo - 9, 14, // methods + 0, 0, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags 0, // signalCount - // slots: name, argc, parameters, tag, flags, initial metatype offsets - 1, 2, 68, 2, 0x108, 1 /* Private | MethodIsConst */, - 6, 0, 73, 2, 0x08, 4 /* Private */, - 7, 2, 74, 2, 0x108, 5 /* Private | MethodIsConst */, - 9, 1, 79, 2, 0x08, 8 /* Private */, - 11, 0, 82, 2, 0x108, 10 /* Private | MethodIsConst */, - 12, 0, 83, 2, 0x108, 11 /* Private | MethodIsConst */, - 13, 0, 84, 2, 0x108, 12 /* Private | MethodIsConst */, - 14, 0, 85, 2, 0x08, 13 /* Private */, - 15, 0, 86, 2, 0x08, 14 /* Private */, - - // slots: parameters - QMetaType::Void, 0x80000000 | 3, 0x80000000 | 3, 4, 5, - QMetaType::Void, - QMetaType::Void, 0x80000000 | 3, QMetaType::QString, 4, 8, - QMetaType::QJsonObject, QMetaType::QString, 10, - QMetaType::Void, - QMetaType::Void, - QMetaType::Void, - QMetaType::Void, - QMetaType::Void, - 0 // eod }; void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { - if (_c == QMetaObject::InvokeMetaMethod) { - auto *_t = static_cast(_o); - (void)_t; - switch (_id) { - case 0: _t->saveRegisteredUser((*reinterpret_cast< std::add_pointer_t>(_a[1])),(*reinterpret_cast< std::add_pointer_t>(_a[2]))); break; - case 1: _t->on_pushButton_clicked(); break; - case 2: _t->saveJsonFile((*reinterpret_cast< std::add_pointer_t>(_a[1])),(*reinterpret_cast< std::add_pointer_t>(_a[2]))); break; - case 3: { QJsonObject _r = _t->readJsonFile((*reinterpret_cast< std::add_pointer_t>(_a[1]))); - if (_a[0]) *reinterpret_cast< QJsonObject*>(_a[0]) = std::move(_r); } break; - case 4: _t->thisIdIsTaken(); break; - case 5: _t->thisIdIsEmpty(); break; - case 6: _t->thisBlogIdIsTaken(); break; - case 7: _t->on_loginButton_clicked(); break; - case 8: _t->goToLogin(); break; - default: ; - } - } + (void)_o; + (void)_id; + (void)_c; + (void)_a; } const QMetaObject MainWindow::staticMetaObject = { { @@ -123,7 +68,7 @@ const QMetaObject MainWindow::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 + >, @@ -147,17 +92,6 @@ void *MainWindow::qt_metacast(const char *_clname) int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QMainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 9) - qt_static_metacall(this, _c, _id, _a); - _id -= 9; - } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 9) - *reinterpret_cast(_a[0]) = QMetaType(); - _id -= 9; - } return _id; } QT_WARNING_POP diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.o index dfa4d102..85da6b7d 100644 Binary files a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.o and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/moc_mainwindow.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h index 97e8979c..db197a40 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogsview.h @@ -26,14 +26,14 @@ class Ui_blogsView { public: QAction *actionCreate_new_Blog_entry; - QAction *actionDelete_blog_entry; - QAction *actionEdit_blog_entry; + QAction *actionExit; QWidget *centralwidget; QGridLayout *gridLayout; QVBoxLayout *blogsLayout; + QStatusBar *statusbar; QMenuBar *menubar; QMenu *menuManageBlogEntires; - QStatusBar *statusbar; + QMenu *menuExit; void setupUi(QMainWindow *blogsView) { @@ -42,10 +42,8 @@ public: blogsView->resize(800, 600); actionCreate_new_Blog_entry = new QAction(blogsView); actionCreate_new_Blog_entry->setObjectName(QString::fromUtf8("actionCreate_new_Blog_entry")); - actionDelete_blog_entry = new QAction(blogsView); - actionDelete_blog_entry->setObjectName(QString::fromUtf8("actionDelete_blog_entry")); - actionEdit_blog_entry = new QAction(blogsView); - actionEdit_blog_entry->setObjectName(QString::fromUtf8("actionEdit_blog_entry")); + actionExit = new QAction(blogsView); + actionExit->setObjectName(QString::fromUtf8("actionExit")); centralwidget = new QWidget(blogsView); centralwidget->setObjectName(QString::fromUtf8("centralwidget")); gridLayout = new QGridLayout(centralwidget); @@ -56,20 +54,22 @@ public: gridLayout->addLayout(blogsLayout, 0, 0, 1, 1); blogsView->setCentralWidget(centralwidget); + statusbar = new QStatusBar(blogsView); + statusbar->setObjectName(QString::fromUtf8("statusbar")); + blogsView->setStatusBar(statusbar); menubar = new QMenuBar(blogsView); menubar->setObjectName(QString::fromUtf8("menubar")); menubar->setGeometry(QRect(0, 0, 800, 19)); menuManageBlogEntires = new QMenu(menubar); menuManageBlogEntires->setObjectName(QString::fromUtf8("menuManageBlogEntires")); + menuExit = new QMenu(menubar); + menuExit->setObjectName(QString::fromUtf8("menuExit")); blogsView->setMenuBar(menubar); - statusbar = new QStatusBar(blogsView); - statusbar->setObjectName(QString::fromUtf8("statusbar")); - blogsView->setStatusBar(statusbar); menubar->addAction(menuManageBlogEntires->menuAction()); + menubar->addAction(menuExit->menuAction()); menuManageBlogEntires->addAction(actionCreate_new_Blog_entry); - menuManageBlogEntires->addAction(actionDelete_blog_entry); - menuManageBlogEntires->addAction(actionEdit_blog_entry); + menuExit->addAction(actionExit); retranslateUi(blogsView); @@ -80,9 +80,9 @@ public: { blogsView->setWindowTitle(QCoreApplication::translate("blogsView", "MainWindow", nullptr)); actionCreate_new_Blog_entry->setText(QCoreApplication::translate("blogsView", "Create blog entry", nullptr)); - actionDelete_blog_entry->setText(QCoreApplication::translate("blogsView", "Delete blog entry", nullptr)); - actionEdit_blog_entry->setText(QCoreApplication::translate("blogsView", "Edit blog entry", nullptr)); + actionExit->setText(QCoreApplication::translate("blogsView", "Exit", nullptr)); menuManageBlogEntires->setTitle(QCoreApplication::translate("blogsView", "Blogs", nullptr)); + menuExit->setTitle(QCoreApplication::translate("blogsView", "App", nullptr)); } // retranslateUi }; diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_login.h b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_login.h index da1229b6..abab138b 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_login.h +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_login.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ class Ui_login { public: QWidget *centralwidget; - QGridLayout *gridLayout; + QFormLayout *formLayout; QLabel *label; QLabel *label_2; QLineEdit *inputLoginID_2; @@ -43,38 +43,38 @@ public: login->resize(800, 600); centralwidget = new QWidget(login); centralwidget->setObjectName(QString::fromUtf8("centralwidget")); - gridLayout = new QGridLayout(centralwidget); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + formLayout = new QFormLayout(centralwidget); + formLayout->setObjectName(QString::fromUtf8("formLayout")); label = new QLabel(centralwidget); label->setObjectName(QString::fromUtf8("label")); - gridLayout->addWidget(label, 0, 0, 1, 1); + formLayout->setWidget(0, QFormLayout::SpanningRole, label); label_2 = new QLabel(centralwidget); label_2->setObjectName(QString::fromUtf8("label_2")); - gridLayout->addWidget(label_2, 1, 0, 1, 1); + formLayout->setWidget(1, QFormLayout::SpanningRole, label_2); inputLoginID_2 = new QLineEdit(centralwidget); inputLoginID_2->setObjectName(QString::fromUtf8("inputLoginID_2")); - gridLayout->addWidget(inputLoginID_2, 2, 0, 1, 1); + formLayout->setWidget(2, QFormLayout::SpanningRole, inputLoginID_2); label_3 = new QLabel(centralwidget); label_3->setObjectName(QString::fromUtf8("label_3")); - gridLayout->addWidget(label_3, 3, 0, 1, 1); + formLayout->setWidget(3, QFormLayout::SpanningRole, label_3); inputPassword = new QLineEdit(centralwidget); inputPassword->setObjectName(QString::fromUtf8("inputPassword")); inputPassword->setEchoMode(QLineEdit::Password); - gridLayout->addWidget(inputPassword, 4, 0, 1, 1); + formLayout->setWidget(4, QFormLayout::SpanningRole, inputPassword); loginButton = new QPushButton(centralwidget); loginButton->setObjectName(QString::fromUtf8("loginButton")); - gridLayout->addWidget(loginButton, 5, 0, 1, 1); + formLayout->setWidget(5, QFormLayout::SpanningRole, loginButton); login->setCentralWidget(centralwidget); menubar = new QMenuBar(login); diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_mainwindow.h b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_mainwindow.h index 405b5f40..7a94d3eb 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_mainwindow.h +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_mainwindow.h @@ -10,11 +10,13 @@ #define UI_MAINWINDOW_H #include +#include #include #include #include #include #include +#include #include #include #include @@ -24,6 +26,8 @@ QT_BEGIN_NAMESPACE class Ui_MainWindow { public: + QAction *actionExit; + QAction *actionLogin; QWidget *centralwidget; QFormLayout *formLayout; QLabel *label; @@ -40,12 +44,17 @@ public: QLineEdit *inputBlogID; QLabel *label_6; QMenuBar *menubar; + QMenu *menuApp; void setupUi(QMainWindow *MainWindow) { if (MainWindow->objectName().isEmpty()) MainWindow->setObjectName(QString::fromUtf8("MainWindow")); MainWindow->resize(800, 600); + actionExit = new QAction(MainWindow); + actionExit->setObjectName(QString::fromUtf8("actionExit")); + actionLogin = new QAction(MainWindow); + actionLogin->setObjectName(QString::fromUtf8("actionLogin")); centralwidget = new QWidget(MainWindow); centralwidget->setObjectName(QString::fromUtf8("centralwidget")); formLayout = new QFormLayout(centralwidget); @@ -120,8 +129,14 @@ public: menubar = new QMenuBar(MainWindow); menubar->setObjectName(QString::fromUtf8("menubar")); menubar->setGeometry(QRect(0, 0, 800, 19)); + menuApp = new QMenu(menubar); + menuApp->setObjectName(QString::fromUtf8("menuApp")); MainWindow->setMenuBar(menubar); + menubar->addAction(menuApp->menuAction()); + menuApp->addAction(actionExit); + menuApp->addAction(actionLogin); + retranslateUi(MainWindow); QMetaObject::connectSlotsByName(MainWindow); @@ -130,6 +145,8 @@ public: void retranslateUi(QMainWindow *MainWindow) { MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "MainWindow", nullptr)); + actionExit->setText(QCoreApplication::translate("MainWindow", "Exit", nullptr)); + actionLogin->setText(QCoreApplication::translate("MainWindow", "Login", nullptr)); label->setText(QCoreApplication::translate("MainWindow", "

Register

", nullptr)); #if QT_CONFIG(tooltip) inputId->setToolTip(QCoreApplication::translate("MainWindow", "

Input ID

", nullptr)); @@ -154,6 +171,7 @@ public: loginButton->setText(QCoreApplication::translate("MainWindow", "Already Registered? Click here to Login!", nullptr)); label_5->setText(QCoreApplication::translate("MainWindow", "

Blog Title

", nullptr)); label_6->setText(QCoreApplication::translate("MainWindow", "

Blog ID

", nullptr)); + menuApp->setTitle(QCoreApplication::translate("MainWindow", "App", nullptr)); } // retranslateUi }; diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/universalFunction.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/universalFunction.o new file mode 100644 index 00000000..8fd61f91 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/universalFunction.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/universalFunctions.o b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/universalFunctions.o new file mode 100644 index 00000000..d6badb77 Binary files /dev/null and b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/universalFunctions.o differ diff --git a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/user.json b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/user.json index 1d5c537b..5608335f 100644 --- a/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/user.json +++ b/EGUI/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/user.json @@ -3,5 +3,20 @@ "email": "", "password": "", "userId": "1" + }, + "2": { + "email": "", + "password": "", + "userId": "2" + }, + "65": { + "email": "", + "password": "", + "userId": "65" + }, + "77": { + "email": "", + "password": "", + "userId": "77" } } diff --git a/EGUI/lab1/blogentry.h b/EGUI/lab1/blogentry.h index eb5516ef..bdbdc304 100644 --- a/EGUI/lab1/blogentry.h +++ b/EGUI/lab1/blogentry.h @@ -33,6 +33,7 @@ private slots: void editEntry(); void saveEditedEntry(); + private: Ui::blogEntry *ui; QString userId; diff --git a/EGUI/lab1/blogsview.cpp b/EGUI/lab1/blogsview.cpp index 5da89b33..0525b9b2 100644 --- a/EGUI/lab1/blogsview.cpp +++ b/EGUI/lab1/blogsview.cpp @@ -90,3 +90,13 @@ void blogsView::on_actionCreate_new_Blog_entry_triggered() createNewBlogEntry(); } +void blogsView::exit() +{ + QApplication::quit(); +} + +void blogsView::on_actionExit_triggered() +{ + exit(); +} + diff --git a/EGUI/lab1/blogsview.h b/EGUI/lab1/blogsview.h index 6bba4701..50606220 100644 --- a/EGUI/lab1/blogsview.h +++ b/EGUI/lab1/blogsview.h @@ -25,6 +25,9 @@ private slots: void displayBlogEntries(); + void on_actionExit_triggered(); + void exit(); + private: Ui::blogsView *ui; QString userId; diff --git a/EGUI/lab1/blogsview.ui b/EGUI/lab1/blogsview.ui index b86cd297..eadeaf70 100644 --- a/EGUI/lab1/blogsview.ui +++ b/EGUI/lab1/blogsview.ui @@ -20,6 +20,7 @@ + @@ -34,25 +35,24 @@ Blogs - - + + + + App + + + - Create blog entry - + - Delete blog entry - - - - - Edit blog entry + Exit diff --git a/EGUI/lab1/lab1.pro b/EGUI/lab1/lab1.pro index f7ca57ed..c5e45b92 100644 --- a/EGUI/lab1/lab1.pro +++ b/EGUI/lab1/lab1.pro @@ -13,13 +13,15 @@ SOURCES += \ blogsview.cpp \ login.cpp \ main.cpp \ - mainwindow.cpp + mainwindow.cpp \ + universalFunctions.cpp HEADERS += \ blogentry.h \ blogsview.h \ login.h \ - mainwindow.h + mainwindow.h \ + universalFunctions.h FORMS += \ blogentry.ui \ diff --git a/EGUI/lab1/login.ui b/EGUI/lab1/login.ui index 55a875d5..227038cc 100644 --- a/EGUI/lab1/login.ui +++ b/EGUI/lab1/login.ui @@ -14,39 +14,39 @@ MainWindow - - + + <html><head/><body><p align="center"><span style=" font-size:72pt;">Login</span></p></body></html> - + <html><head/><body><p align="center"><span style=" font-size:36pt;">ID</span></p></body></html> - + - + <html><head/><body><p align="center"><span style=" font-size:36pt;">Password</span></p></body></html> - + QLineEdit::Password - + Login diff --git a/EGUI/lab1/main.cpp b/EGUI/lab1/main.cpp index f5ae20d6..ebb6ea53 100644 --- a/EGUI/lab1/main.cpp +++ b/EGUI/lab1/main.cpp @@ -1,9 +1,14 @@ -#include "mainwindow.h" // header file included, header files for the Notepad widget +#include "mainwindow.h" // header file included, header files for the Notepad widget +#include "universalFunctions.h" #include // handle widgets, events, mouse movement, feel of window, // header files for QApplication #include #include +#include +#include + + // main function that is the entry point for all C and C++ based applications: int main(int argc, char *argv[]) // all exectution begins here diff --git a/EGUI/lab1/mainwindow.cpp b/EGUI/lab1/mainwindow.cpp index 6bf4ba1d..c223aa64 100644 --- a/EGUI/lab1/mainwindow.cpp +++ b/EGUI/lab1/mainwindow.cpp @@ -1,6 +1,7 @@ #include "mainwindow.h" // Notepad class header file that was generated by the wizard #include "ui_mainwindow.h"// UI header file that was generated by the uic tool #include "login.h" +#include "universalFunctions.h" #include #include #include @@ -16,6 +17,20 @@ MainWindow::MainWindow(QWidget *parent) // class definition, constructor // creates the UI class instance and assigns it to the ui member: { ui->setupUi(this); // setup user interface + defineConnections(); +} + +void MainWindow::defineConnections() const +{ + connect(ui -> loginButton, &QPushButton::clicked, this, &MainWindow::goToLogin); + connect(ui -> pushButton, &QPushButton::clicked, this, &MainWindow::saveRegisteredUser); + connect(ui -> actionExit, &QAction::triggered, this, &MainWindow::exit); + connect(ui -> actionLogin, &QAction::triggered, this, &MainWindow::goToLogin); +} + +void MainWindow::exit() +{ + QApplication::quit(); } MainWindow::~MainWindow() @@ -23,60 +38,14 @@ MainWindow::~MainWindow() delete ui; // in the destructor, we delete the ui } -QJsonObject MainWindow::readJsonFile(const QString title) -{ - - QFile file(title); - file.open(QIODevice::ReadWrite); - QByteArray bytes = file.readAll(); - file.close(); - QJsonDocument document = QJsonDocument::fromJson( bytes ); - return document.object(); -} - -void MainWindow::saveJsonFile(QJsonObject &users, const QString name) const -{ - - QFile jsonFile(name); - QJsonDocument document; - document.setObject( users ); - QByteArray bytes = document.toJson( QJsonDocument::Indented ); - jsonFile.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ); - QTextStream iStream( &jsonFile ); - // iStream.setCodec( "utf-8" ); - iStream << bytes; - jsonFile.close(); -} - -// You cannot create a user without an id -void MainWindow::thisIdIsEmpty() const -{ - QMessageBox idEmpty; - idEmpty.setText("THIS ID IS EMPTY!"); - idEmpty.exec(); -} - -// You cannot create a user with id similar to an existing one -void MainWindow::thisIdIsTaken() const -{ - QMessageBox idTaken; - idTaken.setText("THIS ID IS ALREADY TAKEN!"); - idTaken.exec(); -} - -void MainWindow::thisBlogIdIsTaken() const -{ - QMessageBox idTaken; - idTaken.setText("THIS BLOG ID IS ALREADY TAKEN!"); - idTaken.exec(); -} - -void MainWindow::saveRegisteredUser(QJsonObject &users, QJsonObject &blogs) const +void MainWindow::saveRegisteredUser() const { + QJsonObject blogs = readJsonFile("blogs.json"); + QJsonObject users = readJsonFile("user.json"); QString id = ui->inputId->text(); if(id == "") { - thisIdIsEmpty(); + outputMessageBox("THIS ID IS EMPTY!"); return; } if(users.find(id) == users.end()) @@ -107,19 +76,10 @@ void MainWindow::saveRegisteredUser(QJsonObject &users, QJsonObject &blogs) cons blogs.insert(blogId, blog); saveJsonFile(blogs, "blogs.json"); saveJsonFile(users, "user.json"); - }else thisBlogIdIsTaken(); - }else thisIdIsTaken(); + }else outputMessageBox("THIS BLOG ID IS ALREADY TAKEN!"); + }else outputMessageBox("THIS ID IS ALREADY TAKEN!"); } - -void MainWindow::on_pushButton_clicked() -{ - QJsonObject blogs = readJsonFile("blogs.json"); - QJsonObject users = readJsonFile("user.json"); - saveRegisteredUser(users, blogs); -} - - void MainWindow::goToLogin() { login *l = new login(); @@ -127,8 +87,9 @@ void MainWindow::goToLogin() hide(); } -void MainWindow::on_loginButton_clicked() +void MainWindow::test() { - goToLogin(); + qDebug() << "pls work"; } + diff --git a/EGUI/lab1/mainwindow.h b/EGUI/lab1/mainwindow.h index 522d98bf..56431edf 100644 --- a/EGUI/lab1/mainwindow.h +++ b/EGUI/lab1/mainwindow.h @@ -5,6 +5,7 @@ // We can add more functionality using #include #include + QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } // we are saying that we want to use standard ui namespace // tied to our UI file "mainwindow.ui" @@ -24,24 +25,18 @@ public: MainWindow(QWidget *parent = nullptr); // constructor, we pass nullptr so no parents // (top-level widget) ~MainWindow(); // destructor, free resources - void newDocument(); - void open(); private slots: - void saveRegisteredUser(QJsonObject &users, QJsonObject &blogs) const; - - void on_pushButton_clicked(); - void saveJsonFile(QJsonObject &users, const QString name) const; - QJsonObject readJsonFile(const QString title); - void thisIdIsTaken() const; - void thisIdIsEmpty() const; - void thisBlogIdIsTaken() const; - - void on_loginButton_clicked(); - void goToLogin(); private: + void newDocument(); + void open(); + void saveRegisteredUser() const; + void goToLogin(); + void defineConnections() const; + void test(); + void exit(); Ui::MainWindow *ui; // we point to ui class "mainwindow.ui" QString currentFile = ""; // current file we work with }; diff --git a/EGUI/lab1/mainwindow.ui b/EGUI/lab1/mainwindow.ui index b243ac60..98af7437 100644 --- a/EGUI/lab1/mainwindow.ui +++ b/EGUI/lab1/mainwindow.ui @@ -121,7 +121,25 @@ 19 + + + App + + + + + + + + Exit + + + + + Login + + diff --git a/EGUI/lab1/universalFunction.cpp b/EGUI/lab1/universalFunction.cpp new file mode 100644 index 00000000..e69de29b diff --git a/EGUI/lab1/universalFunctions.cpp b/EGUI/lab1/universalFunctions.cpp new file mode 100644 index 00000000..801a56a1 --- /dev/null +++ b/EGUI/lab1/universalFunctions.cpp @@ -0,0 +1,46 @@ +#ifndef UNIVERSAL_FUNCTIONS_CPP +#define UNIVERSAL_FUNCTIONS_CPP +#include +#include +#include +#include +#include +#include + +QJsonObject readJsonFile(const QString title) +{ + QFile file(title); + file.open(QIODevice::ReadWrite); + QByteArray bytes = file.readAll(); + file.close(); + QJsonDocument document = QJsonDocument::fromJson( bytes ); + return document.object(); +} + +void saveJsonFile(QJsonObject &users, const QString name) +{ + QFile jsonFile(name); + QJsonDocument document; + document.setObject( users ); + QByteArray bytes = document.toJson( QJsonDocument::Indented ); + jsonFile.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ); + QTextStream iStream( &jsonFile ); + // iStream.setCodec( "utf-8" ); + iStream << bytes; + jsonFile.close(); +} + +void outputMessageBox(const QString messageBoxText) +{ + QMessageBox idEmpty; + idEmpty.setText(messageBoxText); + idEmpty.exec(); +} + +void exit() +{ + QApplication::quit(); +} + + +#endif diff --git a/EGUI/lab1/universalFunctions.h b/EGUI/lab1/universalFunctions.h new file mode 100644 index 00000000..28377476 --- /dev/null +++ b/EGUI/lab1/universalFunctions.h @@ -0,0 +1,12 @@ +#ifndef UNIVERSALFUNCTIONS_H +#define UNIVERSALFUNCTIONS_H + +#include + +QJsonObject readJsonFile(const QString title); +void saveJsonFile(QJsonObject &users, const QString name); +void outputMessageBox(const QString messageBoxText); +void exit(); + + +#endif // UNIVERSALFUNCTIONS_H