cfiController ID -> GUID

This commit is contained in:
2026-01-29 16:55:58 +03:00
parent b4d796d8be
commit 406769da27
4 changed files with 27 additions and 29 deletions

View File

@@ -18,7 +18,7 @@ public:
void unLockAccessToCfiXML();
//Распарсивание файла CfiList.xml
bool parsingCfiXML(QMap<int, CfiObject>& mapCfiObjects);
bool parsingCfiXML(QMap<QString, CfiObject>& mapCfiObjects);
//Слияние (обновление) с новыми данными
bool updateCfiXML(const QByteArray& array);
@@ -34,19 +34,17 @@ private:
double roundDoubleVal(double value, int cntNumAfterPoint);
bool parsingCfiXML_DOM(QDomDocument& domDoc, QMap<int, CfiObject>& mapCfiObjects);
bool parsingCfiXML_DOM(QDomDocument& domDoc, QMap<QString, CfiObject>& mapCfiObjects);
bool merge2map(QMap<int, CfiObject>& mapCfiObjects_orig, QMap<int, CfiObject>& mapCfiObjects_new);
bool merge2map(QMap<QString, CfiObject>& mapCfiObjects_orig, QMap<QString, CfiObject>& mapCfiObjects_new);
bool saveNewCfiListFile(QMap<int, CfiObject>& mapCfiObjects);
bool saveNewCfiListFile(QMap<QString, CfiObject>& mapCfiObjects);
private:
UpdateController* updateController;
QMutex mtxAccess;
//QList<CfiObject> listCfiObjects;
QLocale* germanLocale;
};