From dc741d998621b9d55bd3a82fefde7d727f7b092d Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Sun, 7 Oct 2018 23:03:01 +0200 Subject: [PATCH] Added zeiterfassungnetworklib --- CMakeLists.txt | 1 + DbZeiterfassung.pro | 9 +- plugins/absenceplugin | 2 +- plugins/advancedviewplugin | 2 +- plugins/devtoolsplugin | 2 +- plugins/lunchmealplugin | 2 +- plugins/presenceplugin | 2 +- plugins/profileplugin | 2 +- plugins/reportsplugin | 2 +- plugins/sketchplugin | 2 +- plugins/updaterplugin | 2 +- plugins/weatherplugin | 2 +- plugins/webradioplugin | 2 +- zeiterfassung/CMakeLists.txt | 2 +- zeiterfassung/zeiterfassung.pro | 2 +- zeiterfassungcorelib/CMakeLists.txt | 38 +-- .../translations/zeiterfassungcorelib_de.ts | 291 ------------------ .../translations/zeiterfassungcorelib_en.ts | 291 ------------------ zeiterfassungcorelib/zeiterfassungcorelib.pro | 44 +-- zeiterfassungguilib/CMakeLists.txt | 2 +- zeiterfassungguilib/zeiterfassungguilib.pro | 2 +- zeiterfassungnetworklib/CMakeLists.txt | 50 +++ .../replies/createbookingreply.cpp | 0 .../replies/createbookingreply.h | 4 +- .../replies/createtimeassignmentreply.cpp | 0 .../replies/createtimeassignmentreply.h | 4 +- .../replies/deletebookingreply.cpp | 0 .../replies/deletebookingreply.h | 4 +- .../replies/deletetimeassignmentreply.cpp | 0 .../replies/deletetimeassignmentreply.h | 4 +- .../replies/getabsencesreply.cpp | 0 .../replies/getabsencesreply.h | 4 +- .../replies/getbookingsreply.cpp | 0 .../replies/getbookingsreply.h | 4 +- .../replies/getdayinforeply.cpp | 0 .../replies/getdayinforeply.h | 4 +- .../replies/getpresencestatusreply.cpp | 0 .../replies/getpresencestatusreply.h | 4 +- .../replies/getprojectsreply.cpp | 0 .../replies/getprojectsreply.h | 4 +- .../replies/getreportreply.cpp | 0 .../replies/getreportreply.h | 4 +- .../replies/gettimeassignmentsreply.cpp | 0 .../replies/gettimeassignmentsreply.h | 4 +- .../replies/getuserinforeply.cpp | 0 .../replies/getuserinforeply.h | 4 +- .../replies/loginpagereply.cpp | 0 .../replies/loginpagereply.h | 4 +- .../replies/loginreply.cpp | 0 .../replies/loginreply.h | 4 +- .../replies/updatebookingreply.cpp | 0 .../replies/updatebookingreply.h | 4 +- .../replies/updatetimeassignmentreply.cpp | 0 .../replies/updatetimeassignmentreply.h | 4 +- .../replies/zeiterfassungreply.cpp | 0 .../replies/zeiterfassungreply.h | 4 +- .../zeiterfassungnetworklib_de.ts | 4 + .../zeiterfassungnetworklib_en.ts | 4 + .../zeiterfassungapi.cpp | 0 .../zeiterfassungapi.h | 4 +- .../zeiterfassungnetworklib.pro | 59 ++++ .../zeiterfassungnetworklib_global.h | 9 + 62 files changed, 188 insertions(+), 714 deletions(-) create mode 100644 zeiterfassungnetworklib/CMakeLists.txt rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/createbookingreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/createbookingreply.h (71%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/createtimeassignmentreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/createtimeassignmentreply.h (74%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/deletebookingreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/deletebookingreply.h (71%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/deletetimeassignmentreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/deletetimeassignmentreply.h (71%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getabsencesreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getabsencesreply.h (85%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getbookingsreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getbookingsreply.h (83%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getdayinforeply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getdayinforeply.h (83%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getpresencestatusreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getpresencestatusreply.h (82%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getprojectsreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getprojectsreply.h (80%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getreportreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getreportreply.h (77%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/gettimeassignmentsreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/gettimeassignmentsreply.h (84%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getuserinforeply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/getuserinforeply.h (89%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/loginpagereply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/loginpagereply.h (72%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/loginreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/loginreply.h (72%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/updatebookingreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/updatebookingreply.h (72%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/updatetimeassignmentreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/updatetimeassignmentreply.h (74%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/zeiterfassungreply.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/replies/zeiterfassungreply.h (84%) create mode 100644 zeiterfassungnetworklib/translations/zeiterfassungnetworklib_de.ts create mode 100644 zeiterfassungnetworklib/translations/zeiterfassungnetworklib_en.ts rename {zeiterfassungcorelib => zeiterfassungnetworklib}/zeiterfassungapi.cpp (100%) rename {zeiterfassungcorelib => zeiterfassungnetworklib}/zeiterfassungapi.h (96%) create mode 100644 zeiterfassungnetworklib/zeiterfassungnetworklib.pro create mode 100644 zeiterfassungnetworklib/zeiterfassungnetworklib_global.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d33a15a..9308c6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,3 +2,4 @@ add_subdirectory(plugins) add_subdirectory(zeiterfassung) add_subdirectory(zeiterfassungcorelib) add_subdirectory(zeiterfassungguilib) +add_subdirectory(zeiterfassungnetworklib) diff --git a/DbZeiterfassung.pro b/DbZeiterfassung.pro index 549a7d4..4c293b8 100644 --- a/DbZeiterfassung.pro +++ b/DbZeiterfassung.pro @@ -3,8 +3,9 @@ TEMPLATE = subdirs SUBDIRS += plugins \ zeiterfassung \ zeiterfassungcorelib \ - zeiterfassungguilib + zeiterfassungguilib \ + zeiterfassungnetworklib -plugins.depends += zeiterfassungcorelib zeiterfassungguilib -zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib -zeiterfassungguilib.depends += zeiterfassungcorelib +plugins.depends += zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib +zeiterfassung.depends += zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib +zeiterfassungguilib.depends += zeiterfassungcorelib zeiterfassungnetworklib diff --git a/plugins/absenceplugin b/plugins/absenceplugin index 65a00cd..19df075 160000 --- a/plugins/absenceplugin +++ b/plugins/absenceplugin @@ -1 +1 @@ -Subproject commit 65a00cd3c75f09ede7c432d7397d5dec6f6681bc +Subproject commit 19df07591aa2372c0d44e634351d43d958c914bc diff --git a/plugins/advancedviewplugin b/plugins/advancedviewplugin index cf78369..ebf2bb2 160000 --- a/plugins/advancedviewplugin +++ b/plugins/advancedviewplugin @@ -1 +1 @@ -Subproject commit cf78369e79cd7f26e6f3865d3c1940ef1e629ba1 +Subproject commit ebf2bb2b57032fcef3f6ad88083d971c01ad3571 diff --git a/plugins/devtoolsplugin b/plugins/devtoolsplugin index f0808ef..563ca2b 160000 --- a/plugins/devtoolsplugin +++ b/plugins/devtoolsplugin @@ -1 +1 @@ -Subproject commit f0808efd4b675d9912b028b1ffdc279e213ee157 +Subproject commit 563ca2bf729d41e18a3e72bd198d62a708f494f8 diff --git a/plugins/lunchmealplugin b/plugins/lunchmealplugin index faf5d83..4940a6a 160000 --- a/plugins/lunchmealplugin +++ b/plugins/lunchmealplugin @@ -1 +1 @@ -Subproject commit faf5d83ec867528fb166c23e0deb1452d5c663b1 +Subproject commit 4940a6a78a61bc180f86a2e40866afad3132cff5 diff --git a/plugins/presenceplugin b/plugins/presenceplugin index 89e292b..a75dc13 160000 --- a/plugins/presenceplugin +++ b/plugins/presenceplugin @@ -1 +1 @@ -Subproject commit 89e292b4080430532088eade56af1e6b4ccdc4e2 +Subproject commit a75dc1300cba255a0b03877a817a0051182a1b76 diff --git a/plugins/profileplugin b/plugins/profileplugin index 66563d6..b3f8d8a 160000 --- a/plugins/profileplugin +++ b/plugins/profileplugin @@ -1 +1 @@ -Subproject commit 66563d661a4a27042706fa1f7af63d3f89c311d2 +Subproject commit b3f8d8ab867db274c7639a828cd49b7df78bdf81 diff --git a/plugins/reportsplugin b/plugins/reportsplugin index 9e9b9e2..a6ca514 160000 --- a/plugins/reportsplugin +++ b/plugins/reportsplugin @@ -1 +1 @@ -Subproject commit 9e9b9e21a898be9bc472dd07120cea92f54c1ec6 +Subproject commit a6ca514345f49d7bfb577da4aaec60f3b984b020 diff --git a/plugins/sketchplugin b/plugins/sketchplugin index a37377a..a720284 160000 --- a/plugins/sketchplugin +++ b/plugins/sketchplugin @@ -1 +1 @@ -Subproject commit a37377a930414ff8d75d5d490f538cdbc1281b53 +Subproject commit a7202849d31f7f3b354bbc5e708fc08c2de5dacf diff --git a/plugins/updaterplugin b/plugins/updaterplugin index 74c8ecb..d216fb1 160000 --- a/plugins/updaterplugin +++ b/plugins/updaterplugin @@ -1 +1 @@ -Subproject commit 74c8ecb9aab516c2c9ebf38d606d355417adc848 +Subproject commit d216fb171b57f34dacd5dfa9fbe7211334d47762 diff --git a/plugins/weatherplugin b/plugins/weatherplugin index 137fa9b..4dda1d4 160000 --- a/plugins/weatherplugin +++ b/plugins/weatherplugin @@ -1 +1 @@ -Subproject commit 137fa9bb2b968069d33b134bbbb02220a41ba14d +Subproject commit 4dda1d43d3e0492b501d414427c87d1fdcebf55d diff --git a/plugins/webradioplugin b/plugins/webradioplugin index 7b59a5f..a36604a 160000 --- a/plugins/webradioplugin +++ b/plugins/webradioplugin @@ -1 +1 @@ -Subproject commit 7b59a5f77ec1cb4ffb09758dc80a2b43413b58e2 +Subproject commit a36604add08d655efc691af3f1bc216a8cf9b7ba diff --git a/zeiterfassung/CMakeLists.txt b/zeiterfassung/CMakeLists.txt index 5cba606..e0743cb 100644 --- a/zeiterfassung/CMakeLists.txt +++ b/zeiterfassung/CMakeLists.txt @@ -13,4 +13,4 @@ set(FORMS add_executable(zeiterfassung ${HEADERS} ${SOURCES} ${FORMS}) -target_link_libraries(zeiterfassung Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network zeiterfassungcorelib zeiterfassungguilib) +target_link_libraries(zeiterfassung Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network zeiterfassungcorelib zeiterfassungguilib zeiterfassungnetworklib) diff --git a/zeiterfassung/zeiterfassung.pro b/zeiterfassung/zeiterfassung.pro index bb31fd8..07eaec3 100755 --- a/zeiterfassung/zeiterfassung.pro +++ b/zeiterfassung/zeiterfassung.pro @@ -1,6 +1,6 @@ QT += core network gui widgets -DBLIBS += zeiterfassungcore zeiterfassunggui +DBLIBS += zeiterfassungcore zeiterfassunggui zeiterfassungnetwork TARGET = zeiterfassung diff --git a/zeiterfassungcorelib/CMakeLists.txt b/zeiterfassungcorelib/CMakeLists.txt index a4fee7c..94f47e3 100644 --- a/zeiterfassungcorelib/CMakeLists.txt +++ b/zeiterfassungcorelib/CMakeLists.txt @@ -1,52 +1,16 @@ set(HEADERS - zeiterfassungapi.h zeiterfassungcorelib_global.h zeiterfassungsettings.h - replies/createbookingreply.h - replies/createtimeassignmentreply.h - replies/deletebookingreply.h - replies/deletetimeassignmentreply.h - replies/getabsencesreply.h - replies/getbookingsreply.h - replies/getdayinforeply.h - replies/getpresencestatusreply.h - replies/getprojectsreply.h - replies/getreportreply.h - replies/gettimeassignmentsreply.h - replies/getuserinforeply.h - replies/loginpagereply.h - replies/loginreply.h - replies/updatebookingreply.h - replies/updatetimeassignmentreply.h - replies/zeiterfassungreply.h ) set(SOURCES - zeiterfassungapi.cpp zeiterfassungsettings.cpp - replies/createbookingreply.cpp - replies/createtimeassignmentreply.cpp - replies/deletebookingreply.cpp - replies/deletetimeassignmentreply.cpp - replies/getabsencesreply.cpp - replies/getbookingsreply.cpp - replies/getdayinforeply.cpp - replies/getpresencestatusreply.cpp - replies/getprojectsreply.cpp - replies/getreportreply.cpp - replies/gettimeassignmentsreply.cpp - replies/getuserinforeply.cpp - replies/loginpagereply.cpp - replies/loginreply.cpp - replies/updatebookingreply.cpp - replies/updatetimeassignmentreply.cpp - replies/zeiterfassungreply.cpp ) add_library(zeiterfassungcorelib SHARED ${HEADERS} ${SOURCES}) target_compile_definitions(zeiterfassungcorelib PRIVATE ZEITERFASSUNGCORELIB_LIBRARY) -target_link_libraries(zeiterfassungcorelib Qt5::Core Qt5::Network dbcorelib) +target_link_libraries(zeiterfassungcorelib Qt5::Core dbcorelib) target_include_directories(zeiterfassungcorelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts b/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts index 8a1a595..1552582 100644 --- a/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts +++ b/zeiterfassungcorelib/translations/zeiterfassungcorelib_de.ts @@ -1,295 +1,4 @@ - - CreateBookingReply - - - Request error occured: %0 - - - - - CreateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - DeleteBookingReply - - - Request error occured: %0 - - - - - DeleteTimeAssignmentReply - - - Request error occured: %0 - - - - - GetAbsencesReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetBookingsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetPresenceStatusReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetProjectsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain elements! - - - - - elements is not an array! - - - - - GetReportReply - - - - Request error occured: %0 - - - - - GetTimeAssignmentsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetUserInfoReply - - - Request 0 error occured: %0 - - - - - Parsing JSON 0 failed: %0 - - - - - JSON document 0 is not an object! - - - - - JSON 0 does not contain evoAppsUser! - - - - - evoAppsUser is not an object! - - - - - Request 1 error occured: %0 - - - - - Parsing JSON 1 failed: %0 - - - - - JSON document 1 is not an array! - - - - - JSON array 1 is empty! - - - - - JSON array value is not an object! - - - - - LoginPageReply - - - Request error occured: %0 - - - - - Could not find necessary keywords in login page! - - - - - LoginReply - - - Request error occured: %0 - - - - - Response did not contain a Location header. - - - - - Authentication failure. Please check username and password. - - - - - An unknown authentication failure occured. Redirected to: %0 - - - - - UpdateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - UpdateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - diff --git a/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts b/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts index 402d10b..bc6d6e7 100644 --- a/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts +++ b/zeiterfassungcorelib/translations/zeiterfassungcorelib_en.ts @@ -1,295 +1,4 @@ - - CreateBookingReply - - - Request error occured: %0 - - - - - CreateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - DeleteBookingReply - - - Request error occured: %0 - - - - - DeleteTimeAssignmentReply - - - Request error occured: %0 - - - - - GetAbsencesReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetBookingsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetPresenceStatusReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetProjectsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain elements! - - - - - elements is not an array! - - - - - GetReportReply - - - - Request error occured: %0 - - - - - GetTimeAssignmentsReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an array! - - - - - GetUserInfoReply - - - Request 0 error occured: %0 - - - - - Parsing JSON 0 failed: %0 - - - - - JSON document 0 is not an object! - - - - - JSON 0 does not contain evoAppsUser! - - - - - evoAppsUser is not an object! - - - - - Request 1 error occured: %0 - - - - - Parsing JSON 1 failed: %0 - - - - - JSON document 1 is not an array! - - - - - JSON array 1 is empty! - - - - - JSON array value is not an object! - - - - - LoginPageReply - - - Request error occured: %0 - - - - - Could not find necessary keywords in login page! - - - - - LoginReply - - - Request error occured: %0 - - - - - Response did not contain a Location header. - - - - - Authentication failure. Please check username and password. - - - - - An unknown authentication failure occured. Redirected to: %0 - - - - - UpdateBookingReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - - - UpdateTimeAssignmentReply - - - Request error occured: %0 - - - - - Parsing JSON failed: %0 - - - - - JSON document is not an object! - - - - - JSON does not contain bookingNr! - - - diff --git a/zeiterfassungcorelib/zeiterfassungcorelib.pro b/zeiterfassungcorelib/zeiterfassungcorelib.pro index 0e928e7..c32bdb6 100644 --- a/zeiterfassungcorelib/zeiterfassungcorelib.pro +++ b/zeiterfassungcorelib/zeiterfassungcorelib.pro @@ -1,4 +1,4 @@ -QT += core network +QT += core QT -= gui widgets DBLIBS += dbcore @@ -10,46 +10,10 @@ PROJECT_ROOT = ../.. DEFINES += ZEITERFASSUNGCORELIB_LIBRARY SOURCES += \ - zeiterfassungapi.cpp \ - zeiterfassungsettings.cpp \ - replies/createbookingreply.cpp \ - replies/createtimeassignmentreply.cpp \ - replies/deletebookingreply.cpp \ - replies/deletetimeassignmentreply.cpp \ - replies/getabsencesreply.cpp \ - replies/getbookingsreply.cpp \ - replies/getdayinforeply.cpp \ - replies/getpresencestatusreply.cpp \ - replies/getprojectsreply.cpp \ - replies/getreportreply.cpp \ - replies/gettimeassignmentsreply.cpp \ - replies/getuserinforeply.cpp \ - replies/loginpagereply.cpp \ - replies/loginreply.cpp \ - replies/updatebookingreply.cpp \ - replies/updatetimeassignmentreply.cpp \ - replies/zeiterfassungreply.cpp + zeiterfassungsettings.cpp -HEADERS += zeiterfassungapi.h \ - zeiterfassungcorelib_global.h \ - zeiterfassungsettings.h \ - replies/createbookingreply.h \ - replies/createtimeassignmentreply.h \ - replies/deletebookingreply.h \ - replies/deletetimeassignmentreply.h \ - replies/getabsencesreply.h \ - replies/getbookingsreply.h \ - replies/getdayinforeply.h \ - replies/getpresencestatusreply.h \ - replies/getprojectsreply.h \ - replies/getreportreply.h \ - replies/gettimeassignmentsreply.h \ - replies/getuserinforeply.h \ - replies/loginpagereply.h \ - replies/loginreply.h \ - replies/updatebookingreply.h \ - replies/updatetimeassignmentreply.h \ - replies/zeiterfassungreply.h +HEADERS += zeiterfassungcorelib_global.h \ + zeiterfassungsettings.h FORMS += diff --git a/zeiterfassungguilib/CMakeLists.txt b/zeiterfassungguilib/CMakeLists.txt index d03bd0e..cf1d559 100644 --- a/zeiterfassungguilib/CMakeLists.txt +++ b/zeiterfassungguilib/CMakeLists.txt @@ -34,6 +34,6 @@ add_library(zeiterfassungguilib SHARED ${HEADERS} ${SOURCES} ${FORMS}) target_compile_definitions(zeiterfassungguilib PRIVATE ZEITERFASSUNGGUILIB_LIBRARY) -target_link_libraries(zeiterfassungguilib Qt5::Core Qt5::Gui Qt5::Widgets Qt5::UiTools zeiterfassungcorelib) +target_link_libraries(zeiterfassungguilib Qt5::Core Qt5::Gui Qt5::Widgets Qt5::UiTools zeiterfassungcorelib zeiterfassungnetworklib) target_include_directories(zeiterfassungguilib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/zeiterfassungguilib/zeiterfassungguilib.pro b/zeiterfassungguilib/zeiterfassungguilib.pro index bbd4e5f..7c30578 100644 --- a/zeiterfassungguilib/zeiterfassungguilib.pro +++ b/zeiterfassungguilib/zeiterfassungguilib.pro @@ -1,6 +1,6 @@ QT += core network gui widgets uitools -DBLIBS += dbcore zeiterfassungcore +DBLIBS += dbcore zeiterfassungcore zeiterfassungnetwork TARGET = zeiterfassunggui diff --git a/zeiterfassungnetworklib/CMakeLists.txt b/zeiterfassungnetworklib/CMakeLists.txt new file mode 100644 index 0000000..760b3f6 --- /dev/null +++ b/zeiterfassungnetworklib/CMakeLists.txt @@ -0,0 +1,50 @@ +set(HEADERS + zeiterfassungapi.h + zeiterfassungnetworklib_global.h + replies/createbookingreply.h + replies/createtimeassignmentreply.h + replies/deletebookingreply.h + replies/deletetimeassignmentreply.h + replies/getabsencesreply.h + replies/getbookingsreply.h + replies/getdayinforeply.h + replies/getpresencestatusreply.h + replies/getprojectsreply.h + replies/getreportreply.h + replies/gettimeassignmentsreply.h + replies/getuserinforeply.h + replies/loginpagereply.h + replies/loginreply.h + replies/updatebookingreply.h + replies/updatetimeassignmentreply.h + replies/zeiterfassungreply.h +) + +set(SOURCES + zeiterfassungapi.cpp + replies/createbookingreply.cpp + replies/createtimeassignmentreply.cpp + replies/deletebookingreply.cpp + replies/deletetimeassignmentreply.cpp + replies/getabsencesreply.cpp + replies/getbookingsreply.cpp + replies/getdayinforeply.cpp + replies/getpresencestatusreply.cpp + replies/getprojectsreply.cpp + replies/getreportreply.cpp + replies/gettimeassignmentsreply.cpp + replies/getuserinforeply.cpp + replies/loginpagereply.cpp + replies/loginreply.cpp + replies/updatebookingreply.cpp + replies/updatetimeassignmentreply.cpp + replies/zeiterfassungreply.cpp +) + +add_library(zeiterfassungnetworklib SHARED ${HEADERS} ${SOURCES}) + +target_compile_definitions(zeiterfassungnetworklib PRIVATE ZEITERFASSUNGNETWORKLIB_LIBRARY) + +target_link_libraries(zeiterfassungnetworklib Qt5::Core Qt5::Network dbcorelib) + +target_include_directories(zeiterfassungnetworklib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/zeiterfassungcorelib/replies/createbookingreply.cpp b/zeiterfassungnetworklib/replies/createbookingreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/createbookingreply.cpp rename to zeiterfassungnetworklib/replies/createbookingreply.cpp diff --git a/zeiterfassungcorelib/replies/createbookingreply.h b/zeiterfassungnetworklib/replies/createbookingreply.h similarity index 71% rename from zeiterfassungcorelib/replies/createbookingreply.h rename to zeiterfassungnetworklib/replies/createbookingreply.h index 1fa6e1f..8ea9e03 100644 --- a/zeiterfassungcorelib/replies/createbookingreply.h +++ b/zeiterfassungnetworklib/replies/createbookingreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT CreateBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT CreateBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/createtimeassignmentreply.cpp b/zeiterfassungnetworklib/replies/createtimeassignmentreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/createtimeassignmentreply.cpp rename to zeiterfassungnetworklib/replies/createtimeassignmentreply.cpp diff --git a/zeiterfassungcorelib/replies/createtimeassignmentreply.h b/zeiterfassungnetworklib/replies/createtimeassignmentreply.h similarity index 74% rename from zeiterfassungcorelib/replies/createtimeassignmentreply.h rename to zeiterfassungnetworklib/replies/createtimeassignmentreply.h index 451bb68..acf7dc5 100644 --- a/zeiterfassungcorelib/replies/createtimeassignmentreply.h +++ b/zeiterfassungnetworklib/replies/createtimeassignmentreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT CreateTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/deletebookingreply.cpp b/zeiterfassungnetworklib/replies/deletebookingreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/deletebookingreply.cpp rename to zeiterfassungnetworklib/replies/deletebookingreply.cpp diff --git a/zeiterfassungcorelib/replies/deletebookingreply.h b/zeiterfassungnetworklib/replies/deletebookingreply.h similarity index 71% rename from zeiterfassungcorelib/replies/deletebookingreply.h rename to zeiterfassungnetworklib/replies/deletebookingreply.h index 9a32f29..7d25499 100644 --- a/zeiterfassungcorelib/replies/deletebookingreply.h +++ b/zeiterfassungnetworklib/replies/deletebookingreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT DeleteBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT DeleteBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/deletetimeassignmentreply.cpp b/zeiterfassungnetworklib/replies/deletetimeassignmentreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/deletetimeassignmentreply.cpp rename to zeiterfassungnetworklib/replies/deletetimeassignmentreply.cpp diff --git a/zeiterfassungcorelib/replies/deletetimeassignmentreply.h b/zeiterfassungnetworklib/replies/deletetimeassignmentreply.h similarity index 71% rename from zeiterfassungcorelib/replies/deletetimeassignmentreply.h rename to zeiterfassungnetworklib/replies/deletetimeassignmentreply.h index 13c6b37..7cb1641 100644 --- a/zeiterfassungcorelib/replies/deletetimeassignmentreply.h +++ b/zeiterfassungnetworklib/replies/deletetimeassignmentreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT DeleteTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getabsencesreply.cpp b/zeiterfassungnetworklib/replies/getabsencesreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getabsencesreply.cpp rename to zeiterfassungnetworklib/replies/getabsencesreply.cpp diff --git a/zeiterfassungcorelib/replies/getabsencesreply.h b/zeiterfassungnetworklib/replies/getabsencesreply.h similarity index 85% rename from zeiterfassungcorelib/replies/getabsencesreply.h rename to zeiterfassungnetworklib/replies/getabsencesreply.h index 57ed691..833831b 100644 --- a/zeiterfassungcorelib/replies/getabsencesreply.h +++ b/zeiterfassungnetworklib/replies/getabsencesreply.h @@ -7,12 +7,12 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetAbsencesReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetAbsencesReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getbookingsreply.cpp b/zeiterfassungnetworklib/replies/getbookingsreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getbookingsreply.cpp rename to zeiterfassungnetworklib/replies/getbookingsreply.cpp diff --git a/zeiterfassungcorelib/replies/getbookingsreply.h b/zeiterfassungnetworklib/replies/getbookingsreply.h similarity index 83% rename from zeiterfassungcorelib/replies/getbookingsreply.h rename to zeiterfassungnetworklib/replies/getbookingsreply.h index cf200ab..85fe199 100644 --- a/zeiterfassungcorelib/replies/getbookingsreply.h +++ b/zeiterfassungnetworklib/replies/getbookingsreply.h @@ -6,12 +6,12 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetBookingsReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetBookingsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getdayinforeply.cpp b/zeiterfassungnetworklib/replies/getdayinforeply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getdayinforeply.cpp rename to zeiterfassungnetworklib/replies/getdayinforeply.cpp diff --git a/zeiterfassungcorelib/replies/getdayinforeply.h b/zeiterfassungnetworklib/replies/getdayinforeply.h similarity index 83% rename from zeiterfassungcorelib/replies/getdayinforeply.h rename to zeiterfassungnetworklib/replies/getdayinforeply.h index 855b216..6ece0ac 100644 --- a/zeiterfassungcorelib/replies/getdayinforeply.h +++ b/zeiterfassungnetworklib/replies/getdayinforeply.h @@ -7,12 +7,12 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetDayinfoReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetDayinfoReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getpresencestatusreply.cpp b/zeiterfassungnetworklib/replies/getpresencestatusreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getpresencestatusreply.cpp rename to zeiterfassungnetworklib/replies/getpresencestatusreply.cpp diff --git a/zeiterfassungcorelib/replies/getpresencestatusreply.h b/zeiterfassungnetworklib/replies/getpresencestatusreply.h similarity index 82% rename from zeiterfassungcorelib/replies/getpresencestatusreply.h rename to zeiterfassungnetworklib/replies/getpresencestatusreply.h index 7360ba3..b22ce68 100644 --- a/zeiterfassungcorelib/replies/getpresencestatusreply.h +++ b/zeiterfassungnetworklib/replies/getpresencestatusreply.h @@ -4,12 +4,12 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetPresenceStatusReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetPresenceStatusReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getprojectsreply.cpp b/zeiterfassungnetworklib/replies/getprojectsreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getprojectsreply.cpp rename to zeiterfassungnetworklib/replies/getprojectsreply.cpp diff --git a/zeiterfassungcorelib/replies/getprojectsreply.h b/zeiterfassungnetworklib/replies/getprojectsreply.h similarity index 80% rename from zeiterfassungcorelib/replies/getprojectsreply.h rename to zeiterfassungnetworklib/replies/getprojectsreply.h index 4f0d923..3151b42 100644 --- a/zeiterfassungcorelib/replies/getprojectsreply.h +++ b/zeiterfassungnetworklib/replies/getprojectsreply.h @@ -5,12 +5,12 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetProjectsReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetProjectsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getreportreply.cpp b/zeiterfassungnetworklib/replies/getreportreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getreportreply.cpp rename to zeiterfassungnetworklib/replies/getreportreply.cpp diff --git a/zeiterfassungcorelib/replies/getreportreply.h b/zeiterfassungnetworklib/replies/getreportreply.h similarity index 77% rename from zeiterfassungcorelib/replies/getreportreply.h rename to zeiterfassungnetworklib/replies/getreportreply.h index 5721314..61b4272 100644 --- a/zeiterfassungcorelib/replies/getreportreply.h +++ b/zeiterfassungnetworklib/replies/getreportreply.h @@ -5,10 +5,10 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT GetReportReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetReportReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/gettimeassignmentsreply.cpp b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/gettimeassignmentsreply.cpp rename to zeiterfassungnetworklib/replies/gettimeassignmentsreply.cpp diff --git a/zeiterfassungcorelib/replies/gettimeassignmentsreply.h b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.h similarity index 84% rename from zeiterfassungcorelib/replies/gettimeassignmentsreply.h rename to zeiterfassungnetworklib/replies/gettimeassignmentsreply.h index 63493a6..a1e70cf 100644 --- a/zeiterfassungcorelib/replies/gettimeassignmentsreply.h +++ b/zeiterfassungnetworklib/replies/gettimeassignmentsreply.h @@ -7,12 +7,12 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetTimeAssignmentsReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/getuserinforeply.cpp b/zeiterfassungnetworklib/replies/getuserinforeply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/getuserinforeply.cpp rename to zeiterfassungnetworklib/replies/getuserinforeply.cpp diff --git a/zeiterfassungcorelib/replies/getuserinforeply.h b/zeiterfassungnetworklib/replies/getuserinforeply.h similarity index 89% rename from zeiterfassungcorelib/replies/getuserinforeply.h rename to zeiterfassungnetworklib/replies/getuserinforeply.h index ef20ff6..b42c4d7 100644 --- a/zeiterfassungcorelib/replies/getuserinforeply.h +++ b/zeiterfassungnetworklib/replies/getuserinforeply.h @@ -6,12 +6,12 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT GetUserInfoReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT GetUserInfoReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/loginpagereply.cpp b/zeiterfassungnetworklib/replies/loginpagereply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/loginpagereply.cpp rename to zeiterfassungnetworklib/replies/loginpagereply.cpp diff --git a/zeiterfassungcorelib/replies/loginpagereply.h b/zeiterfassungnetworklib/replies/loginpagereply.h similarity index 72% rename from zeiterfassungcorelib/replies/loginpagereply.h rename to zeiterfassungnetworklib/replies/loginpagereply.h index 50342dd..2d4037b 100644 --- a/zeiterfassungcorelib/replies/loginpagereply.h +++ b/zeiterfassungnetworklib/replies/loginpagereply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT LoginPageReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT LoginPageReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/loginreply.cpp b/zeiterfassungnetworklib/replies/loginreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/loginreply.cpp rename to zeiterfassungnetworklib/replies/loginreply.cpp diff --git a/zeiterfassungcorelib/replies/loginreply.h b/zeiterfassungnetworklib/replies/loginreply.h similarity index 72% rename from zeiterfassungcorelib/replies/loginreply.h rename to zeiterfassungnetworklib/replies/loginreply.h index 3a6ec29..c404ffe 100644 --- a/zeiterfassungcorelib/replies/loginreply.h +++ b/zeiterfassungnetworklib/replies/loginreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT LoginReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT LoginReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/updatebookingreply.cpp b/zeiterfassungnetworklib/replies/updatebookingreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/updatebookingreply.cpp rename to zeiterfassungnetworklib/replies/updatebookingreply.cpp diff --git a/zeiterfassungcorelib/replies/updatebookingreply.h b/zeiterfassungnetworklib/replies/updatebookingreply.h similarity index 72% rename from zeiterfassungcorelib/replies/updatebookingreply.h rename to zeiterfassungnetworklib/replies/updatebookingreply.h index 0741045..9708f4a 100644 --- a/zeiterfassungcorelib/replies/updatebookingreply.h +++ b/zeiterfassungnetworklib/replies/updatebookingreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT UpdateBookingReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT UpdateBookingReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/updatetimeassignmentreply.cpp b/zeiterfassungnetworklib/replies/updatetimeassignmentreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/updatetimeassignmentreply.cpp rename to zeiterfassungnetworklib/replies/updatetimeassignmentreply.cpp diff --git a/zeiterfassungcorelib/replies/updatetimeassignmentreply.h b/zeiterfassungnetworklib/replies/updatetimeassignmentreply.h similarity index 74% rename from zeiterfassungcorelib/replies/updatetimeassignmentreply.h rename to zeiterfassungnetworklib/replies/updatetimeassignmentreply.h index f13a4d6..05567f0 100644 --- a/zeiterfassungcorelib/replies/updatetimeassignmentreply.h +++ b/zeiterfassungnetworklib/replies/updatetimeassignmentreply.h @@ -4,10 +4,10 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" #include "zeiterfassungreply.h" -class ZEITERFASSUNGCORELIB_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply +class ZEITERFASSUNGNETWORKLIB_EXPORT UpdateTimeAssignmentReply : public ZeiterfassungReply { Q_OBJECT diff --git a/zeiterfassungcorelib/replies/zeiterfassungreply.cpp b/zeiterfassungnetworklib/replies/zeiterfassungreply.cpp similarity index 100% rename from zeiterfassungcorelib/replies/zeiterfassungreply.cpp rename to zeiterfassungnetworklib/replies/zeiterfassungreply.cpp diff --git a/zeiterfassungcorelib/replies/zeiterfassungreply.h b/zeiterfassungnetworklib/replies/zeiterfassungreply.h similarity index 84% rename from zeiterfassungcorelib/replies/zeiterfassungreply.h rename to zeiterfassungnetworklib/replies/zeiterfassungreply.h index 8a46aa5..8b9b5b3 100644 --- a/zeiterfassungcorelib/replies/zeiterfassungreply.h +++ b/zeiterfassungnetworklib/replies/zeiterfassungreply.h @@ -2,13 +2,13 @@ #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" class QJsonValue; class ZeiterfassungApi; -class ZEITERFASSUNGCORELIB_EXPORT ZeiterfassungReply : public QObject +class ZEITERFASSUNGNETWORKLIB_EXPORT ZeiterfassungReply : public QObject { Q_OBJECT diff --git a/zeiterfassungnetworklib/translations/zeiterfassungnetworklib_de.ts b/zeiterfassungnetworklib/translations/zeiterfassungnetworklib_de.ts new file mode 100644 index 0000000..1552582 --- /dev/null +++ b/zeiterfassungnetworklib/translations/zeiterfassungnetworklib_de.ts @@ -0,0 +1,4 @@ + + + + diff --git a/zeiterfassungnetworklib/translations/zeiterfassungnetworklib_en.ts b/zeiterfassungnetworklib/translations/zeiterfassungnetworklib_en.ts new file mode 100644 index 0000000..bc6d6e7 --- /dev/null +++ b/zeiterfassungnetworklib/translations/zeiterfassungnetworklib_en.ts @@ -0,0 +1,4 @@ + + + + diff --git a/zeiterfassungcorelib/zeiterfassungapi.cpp b/zeiterfassungnetworklib/zeiterfassungapi.cpp similarity index 100% rename from zeiterfassungcorelib/zeiterfassungapi.cpp rename to zeiterfassungnetworklib/zeiterfassungapi.cpp diff --git a/zeiterfassungcorelib/zeiterfassungapi.h b/zeiterfassungnetworklib/zeiterfassungapi.h similarity index 96% rename from zeiterfassungcorelib/zeiterfassungapi.h rename to zeiterfassungnetworklib/zeiterfassungapi.h index edd4bc6..a86d104 100644 --- a/zeiterfassungcorelib/zeiterfassungapi.h +++ b/zeiterfassungnetworklib/zeiterfassungapi.h @@ -8,7 +8,7 @@ #include #include -#include "zeiterfassungcorelib_global.h" +#include "zeiterfassungnetworklib_global.h" class QNetworkAccessManager; @@ -29,7 +29,7 @@ class GetPresenceStatusReply; class GetAbsencesReply; class GetDayinfoReply; -class ZEITERFASSUNGCORELIB_EXPORT ZeiterfassungApi : public QObject +class ZEITERFASSUNGNETWORKLIB_EXPORT ZeiterfassungApi : public QObject { Q_OBJECT diff --git a/zeiterfassungnetworklib/zeiterfassungnetworklib.pro b/zeiterfassungnetworklib/zeiterfassungnetworklib.pro new file mode 100644 index 0000000..d74f3b5 --- /dev/null +++ b/zeiterfassungnetworklib/zeiterfassungnetworklib.pro @@ -0,0 +1,59 @@ +QT += core network +QT -= gui widgets + +DBLIBS += dbcore + +TARGET = zeiterfassungnetwork + +PROJECT_ROOT = ../.. + +DEFINES += ZEITERFASSUNGNETWORKLIB_LIBRARY + +SOURCES += \ + zeiterfassungapi.cpp \ + replies/createbookingreply.cpp \ + replies/createtimeassignmentreply.cpp \ + replies/deletebookingreply.cpp \ + replies/deletetimeassignmentreply.cpp \ + replies/getabsencesreply.cpp \ + replies/getbookingsreply.cpp \ + replies/getdayinforeply.cpp \ + replies/getpresencestatusreply.cpp \ + replies/getprojectsreply.cpp \ + replies/getreportreply.cpp \ + replies/gettimeassignmentsreply.cpp \ + replies/getuserinforeply.cpp \ + replies/loginpagereply.cpp \ + replies/loginreply.cpp \ + replies/updatebookingreply.cpp \ + replies/updatetimeassignmentreply.cpp \ + replies/zeiterfassungreply.cpp + +HEADERS += zeiterfassungnetworklib_global.h \ + zeiterfassungapi.h \ + replies/createbookingreply.h \ + replies/createtimeassignmentreply.h \ + replies/deletebookingreply.h \ + replies/deletetimeassignmentreply.h \ + replies/getabsencesreply.h \ + replies/getbookingsreply.h \ + replies/getdayinforeply.h \ + replies/getpresencestatusreply.h \ + replies/getprojectsreply.h \ + replies/getreportreply.h \ + replies/gettimeassignmentsreply.h \ + replies/getuserinforeply.h \ + replies/loginpagereply.h \ + replies/loginreply.h \ + replies/updatebookingreply.h \ + replies/updatetimeassignmentreply.h \ + replies/zeiterfassungreply.h + +FORMS += + +RESOURCES += + +TRANSLATIONS += translations/zeiterfassungnetworklib_en.ts \ + translations/zeiterfassungnetworklib_de.ts + +include($${PROJECT_ROOT}/lib.pri) diff --git a/zeiterfassungnetworklib/zeiterfassungnetworklib_global.h b/zeiterfassungnetworklib/zeiterfassungnetworklib_global.h new file mode 100644 index 0000000..e68d31a --- /dev/null +++ b/zeiterfassungnetworklib/zeiterfassungnetworklib_global.h @@ -0,0 +1,9 @@ +#pragma once + +#include + +#if defined(ZEITERFASSUNGNETWORKLIB_LIBRARY) +# define ZEITERFASSUNGNETWORKLIB_EXPORT Q_DECL_EXPORT +#else +# define ZEITERFASSUNGNETWORKLIB_EXPORT Q_DECL_IMPORT +#endif