From e237d08296fce2ced508259390a08c4a9ce777c7 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Mon, 6 Nov 2023 21:41:53 +0100 Subject: [PATCH] Revert "Auxiliary commit to revert individual files from 0d9a8b8a3a4a09609a339f54c7d8a9384c561282" This reverts commit 80737d926ad151a07b2493dd1685ed502975cb2e. --- cmake/Dependencies.cmake | 48 +++++++++------------ help/db/hyperion.db | Bin 36864 -> 0 bytes libsrc/jsonserver/JsonClientConnection.cpp | 4 -- 3 files changed, 20 insertions(+), 32 deletions(-) delete mode 100644 help/db/hyperion.db diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 5ef615d5..40ada3e1 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -231,34 +231,26 @@ macro(DeployLinux TARGET) if (EXISTS ${QT_PLUGINS_DIR}/${PLUGIN}) file(GLOB files "${QT_PLUGINS_DIR}/${PLUGIN}/*.so") foreach(file ${files}) - if ("${file}" STREQUAL "libqsqlmimer.so") - continue() - else() - get_prerequisites(${file} PLUGINS 0 1 "" "") - foreach(DEPENDENCY ${PLUGINS}) - get_filename_component(resolved ${DEPENDENCY} NAME_WE) - list(FIND SYSTEM_LIBS_SKIP ${resolved} _index) - if (${_index} GREATER -1) - continue() # Skip system libraries - else() - gp_resolve_item("${file}" "${DEPENDENCY}" "" "" resolved_file) - get_filename_component(resolved_file ${resolved_file} ABSOLUTE) - gp_append_unique(PREREQUISITE_LIBS ${resolved_file}) - get_filename_component(file_canonical ${resolved_file} REALPATH) - gp_append_unique(PREREQUISITE_LIBS ${file_canonical}) - endif() - endforeach() - endif() - if ("${file}" STREQUAL "libqsqlmimer.so") - continue() - else() - install( - FILES ${file} - DESTINATION "share/hyperion/lib/${PLUGIN}" - COMPONENT "Hyperion" - ) - endif() - + get_prerequisites(${file} PLUGINS 0 1 "" "") + foreach(DEPENDENCY ${PLUGINS}) + get_filename_component(resolved ${DEPENDENCY} NAME_WE) + list(FIND SYSTEM_LIBS_SKIP ${resolved} _index) + if (${_index} GREATER -1) + continue() # Skip system libraries + else() + gp_resolve_item("${file}" "${DEPENDENCY}" "" "" resolved_file) + get_filename_component(resolved_file ${resolved_file} ABSOLUTE) + gp_append_unique(PREREQUISITE_LIBS ${resolved_file}) + get_filename_component(file_canonical ${resolved_file} REALPATH) + gp_append_unique(PREREQUISITE_LIBS ${file_canonical}) + endif() + endforeach() + + install( + FILES ${file} + DESTINATION "share/hyperion/lib/${PLUGIN}" + COMPONENT "Hyperion" + ) endforeach() endif() endforeach() diff --git a/help/db/hyperion.db b/help/db/hyperion.db deleted file mode 100644 index b7ce72cd6c4b4c9671a1678601ddc73231460987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36864 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 Jzzk% z@j*U>7lh;@SfH}lQ{+mZlaJs=Q~3~X%$5(~MuzziUig`d;D)&Q2o?t~8dkDOB_#9Y<~AZ!&Kxh}0C)-#k0uhUhP=2+ zn2Qj(nw}5g?k9W*ch}-W==ND`C)uty_jm(`<-F~e+XjD+=R>%b1Rp}}6`1+U{{vFE B;uin_ diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp index 6c04574e..8af1346a 100644 --- a/libsrc/jsonserver/JsonClientConnection.cpp +++ b/libsrc/jsonserver/JsonClientConnection.cpp @@ -36,8 +36,6 @@ void JsonClientConnection::readRequest() // remove message data from buffer _receiveBuffer = _receiveBuffer.mid(bytes); - std::cout << "JsonClientConnection::readRequest | [" << _socket->peerAddress().toString().toStdString() << "] Received: [" << message.toStdString() << "]" << std::endl; - // handle message _jsonAPI->handleMessage(message); @@ -51,8 +49,6 @@ qint64 JsonClientConnection::sendMessage(QJsonObject message) QJsonDocument writer(message); QByteArray data = writer.toJson(QJsonDocument::Compact) + "\n"; - std::cout << "JsonClientConnection::sendMessage | [" << _socket->peerAddress().toString().toStdString() << "] Send: [" << data.constData() << "]" << std::endl; - if (!_socket || (_socket->state() != QAbstractSocket::ConnectedState)) return 0; return _socket->write(data.data(), data.size()); }