Рефакт TaskAMMFIMTreePreparation

InstructorsAndTrainees/tasks/tasktreepreparation.h

@@ -4,6 +4,7 @@
 #include <QObject>
 #include <QTreeWidgetItem>
 #include <QDomElement>
+#include <QMutex>
 #include "module.h"
 #include "tasksAmmFim.h"
 
@@ -38,40 +39,45 @@ public:
     ~TaskAMMFIMTreePreparation();
 
 public:
-    void stopParser();
+    TaskAmmFim getTaskFIMbyID(int id);
+    TaskAmmFim getTaskAMMbyID(int id);
 
-    TaskAmmFim* getTaskFIMbyID(int id);
-    Module* getModuleAMMbyID(int id);
+    ModuleType getTypeModuleAMMbyID(int id);
 
 private:
     QTreeWidgetItem* addModuleToTreeWidgetAMM(Module* module, bool flOnlyActive = false, QTreeWidgetItem* parentItem = nullptr);
+
     void loadAMMtasksFromXML(QByteArray array);
     void domElementParserAMM(QDomElement element, Module* moduleParent);
     void deleteAllModulsAMM();
 
     void loadFIMtasksFromXML(QByteArray array);
-    void deleteAllTaskFIM();
 
 public Q_SLOTS:
     void slot_prepareAMMListItems(QByteArray array, bool flOnlyActive);
-    void slot_prepareAMMListItemsForTrainee(QList<TaskAmmFim> listTask);
+    void slot_prepareAMMListItemsForTrainee(QList<TaskAmmFim> listTasks);
 
     void slot_prepareFIMListItems(QByteArray array);
-    void slot_prepareFIMListItemsForTrainee(QList<TaskAmmFim> listTask);
+    void slot_prepareFIMListItemsForTrainee(QList<TaskAmmFim> listTasks);
+
+    void slot_stopParserPreparation();
 
 Q_SIGNALS:
     void signal_listAMMItemsReady(QList<QTreeWidgetItem*> listItemsAMM);
-
     void signal_listFIMItemsReady(QList<QTreeWidgetItem*> listItemsFIM);
 
 private:
     QList<QTreeWidgetItem*> listItems;
 
     QList<Module*> listAllModulesAMM;
-    QList<TaskAmmFim*> listTaskFIM;
+
+    QList<TaskAmmFim> listTasksFIM;
+    QList<TaskAmmFim> listTasksAMM;
 
     bool flagStop;
     TypeListTreeAMMFIM type;
+
+    QMutex mtxAccess;
 };
 
 #endif // TASKTREEPREPARATION_H