Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix-update-diff' into merge-test

Browse Source 
# Conflicts:
#	ServerLMS/Systems/tools.h
#	ServerLMS/Systems/updatecontroller.h
This commit is contained in:
semenov
2025-01-20 09:31:15 +03:00
parent 1950690f82 91a4b04f05
commit 364a0d6217
20 changed files with 247 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ServerLMS/Systems/updatecontroller.h
View File

@@ -51,13 +51,13 @@ public:
DataInfo *getCurrentDataInfo();
void clearCurrentDataInfo();
QList<FileData> *getDatas() const;
void createVersionListXmlAnswer(QList<StreamingVersionData *> version);
void saveVersionToFile(StreamingVersionData *streamingVersion);
void xmlFileDataParse(QByteArray array);
QByteArray getAdditionalFile(QString name);
StreamingVersionData *getCurrentVersion();
public slots:
void changeAssetVersion(QString versionName);
void createCopyVersion(QString versionName,QString newVersionName);
@@ -74,7 +74,6 @@ private:
QList<FileData> fileSendList;
QList<FileData> fileDeleteList;
QList<FileData> *datas;
DataInfo *dataInfo;
QString buildPath;