Merge branch 'DEV' into CFI-Update

# Conflicts:
#	LibServer/serverlmswidget.cpp
This commit is contained in:
semenov
2026-01-28 17:06:20 +03:00
24 changed files with 694 additions and 39 deletions

View File

@@ -11,6 +11,7 @@
#include "chatsystem.h"
#include "providerdblms.h"
#include "docsupdater.h"
#include "cficontroller.h"
class SendSystem;
class ServerLMSWidget;
@@ -20,12 +21,13 @@ class DataParser;
class ClientHandler;
class CommonClientHandler;
class MultiThreadServer;
class CfiController;
class ProcessingSystem : public QObject
{
Q_OBJECT
public:
explicit ProcessingSystem(ProviderDBLMS* providerDBLMS, UpdateController* updateController, DocsUpdater* docsUpdater, QObject *parent = nullptr);
explicit ProcessingSystem(ProviderDBLMS* providerDBLMS, UpdateController* updateController, DocsUpdater* docsUpdater, CfiController* cfiController, QObject *parent = nullptr);
void initialize(MultiThreadServer *server,
DataParser* dataParser,
@@ -75,6 +77,7 @@ private:
DataParser *dataParser;
UpdateController *updateController;
DocsUpdater* docsUpdater;
CfiController* cfiController;
ProviderDBLMS* providerDBLMS;
ChatSystem *chatSystem;
void sendTaskListToUnity(ClientHandler *client);