refact

InstructorsAndTrainees/instructorsandtraineeswidget.h

@@ -13,6 +13,7 @@
 #include "dialogtaskscommon.h"
 #include "dialogsettings.h"
 #include "dialogauthorization.h"
+#include "instructor.h"
 
 
 namespace Ui {
@@ -86,13 +87,11 @@ private:
     bool authorizationInstructorDialog(QWidget* parent = nullptr);
     bool deAuthorizationInstructor(QString login);
     bool authorizationIsCompleted();
-    void updateLabelLoggedInInstructor(QString login, QString name);
+    void updateLabelLoggedInInstructor(Instructor& instructor);
     void updateLabelServer();
     void setLanguageInterfase();
 
 private:
-    WaitAnimationWidget *waitAnimationWidget;
-
     ConnectorToServer* connectorToServer;
 
     ViewerTrainees* viewerTrainees;
@@ -104,16 +103,10 @@ private:
     DialogSettings* dlgSettings;
     DialogAuthorization* dlgAuthorization;
 
-    bool adminMode;
-    QString loginInstructorLoggedInLocal;
-    QString nameInstructorLoggedInLocal;
-    QString idInstructorLoggedInLocal;
+    WaitAnimationWidget *waitAnimationWidget;
 
     Instructor instructorLoggedInLocal;
 
-    QTranslator qtLanguageTranslator;
-    QString language;
-
     bool flSettingsServerIsChanged;
 
     bool flTryConnectToServer;
@@ -121,6 +114,9 @@ private:
 
     bool flTryLogin;
 
+    QTranslator qtLanguageTranslator;
+    QString language;
+
     Ui::InstructorsAndTraineesWidget *ui;
 };