refactoring

2026-03-28 05:25:39 +03:00 · 2024-08-30 14:51:01 +03:00
parent 0c1ec67d4e
commit d805fc190a
45 changed files with 592 additions and 410 deletions
--- a/Core/UpdateController.cpp
+++ b/Core/UpdateController.cpp
@@ -8,7 +8,7 @@ UpdateController::UpdateController(DataParser *parser, QObject *parent) :
 }


-void UpdateController::CalculateHash()
+void UpdateController::calculateHash()
 {
    qDebug() << "Try calculate";

@@ -51,13 +51,13 @@ void UpdateController::CalculateHash()
                readSize = qMin(fileSize,bufferSize);
            }
            hashString = QString(hash.result().toHex());
-            currentFile.path = Tools::CreateLocalPath(fileInfo.absoluteFilePath());
+            currentFile.path = Tools::createLocalPath(fileInfo.absoluteFilePath());
            currentFile.hash = hashString;
            files->push_back(currentFile);
        }
        else if (fileInfo.isDir() && !fileInfo.isRoot() && fileInfo.fileName() != "..")
        {
-            currentFile.path = Tools::CreateLocalPath(fileInfo.path());
+            currentFile.path = Tools::createLocalPath(fileInfo.path());
            currentFile.hash = "FOLDER";

            if(!folders->contains(currentFile)){
@@ -70,7 +70,7 @@ void UpdateController::CalculateHash()
    fileDataList.append(*folders);
    fileDataList.append(*files);

-    dataParser->CreateXML(fileDataList);
+    dataParser->createXML(fileDataList);

    delete folders;
    delete files;
--- a/Core/UpdateController.h
+++ b/Core/UpdateController.h
@@ -24,7 +24,7 @@ class UpdateController : public QObject

 public:
    explicit UpdateController(DataParser *parser,QObject *parent = 0);
-    void CalculateHash();
+    void calculateHash();
    ~UpdateController();

 private:
--- a/Core/dataparser.cpp
+++ b/Core/dataparser.cpp
@@ -20,7 +20,7 @@ QByteArray DataParser::slotGetXmlAnswer(QString answerCode)
    }
 }

-void DataParser::CreateXML(QList<FileData> fileDataList)
+void DataParser::createXML(QList<FileData> fileDataList)
 {

    QFile file(hashFilename);
@@ -47,7 +47,7 @@ void DataParser::CreateXML(QList<FileData> fileDataList)
    file.close();
 }

-void DataParser::CreateAuthMessage(ClientAutorization *auth)
+void DataParser::createAuthMessage(ClientAutorization *auth)
 {
    authPassCache = auth; //кэширование даных авторизации, для сохранения при успешном заходе

@@ -71,7 +71,7 @@ void DataParser::CreateAuthMessage(ClientAutorization *auth)



-void DataParser::CreateServerSettings(QString address, QString port)
+void DataParser::createServerSettings(QString address, QString port)
 {
    QFile file(settingsName);

@@ -99,7 +99,7 @@ void DataParser::CreateServerSettings(QString address, QString port)

 }

-void DataParser::CreateAuthData(ServerAuthorization *serverAuth)
+void DataParser::createAuthData(ServerAuthorization *serverAuth)
 {
    QFile file(authTempName);
    file.open(QIODevice::WriteOnly);
@@ -134,7 +134,7 @@ QByteArray DataParser::xmlAnswer_notify(QString code)
    return xmlAnswer(listTag);
 }

-void DataParser::AddRunData(QList<int> displays)
+void DataParser::addRunData(QList<int> displays)
 {
    QFile file(displayTemp);
    file.open(QIODevice::ReadWrite);
@@ -148,7 +148,7 @@ void DataParser::AddRunData(QList<int> displays)

 }

-ServerSettings *DataParser::GetServerSettings()
+ServerSettings *DataParser::getServerSettings()
 {
    ServerSettings *settings = new ServerSettings;
    QFile file(settingsName);
--- a/Core/dataparser.h
+++ b/Core/dataparser.h
@@ -16,13 +16,13 @@ class DataParser : public QObject
 public:
    explicit DataParser(QObject *parent = 0);
    ~DataParser();
-    ServerSettings* GetServerSettings();
-    void CreateServerSettings(QString server,QString port);
+    ServerSettings* getServerSettings();
+    void createServerSettings(QString server,QString port);
    void saveClientSettrings(QString language,bool isAutoStart);
-    void CreateXML(QList<FileData> fileDataList);
-    void CreateAuthMessage(ClientAutorization *auth);
-    void CreateAuthData(ServerAuthorization *serverAuth);
-    void AddRunData(QList<int> displays);
+    void createXML(QList<FileData> fileDataList);
+    void createAuthMessage(ClientAutorization *auth);
+    void createAuthData(ServerAuthorization *serverAuth);
+    void addRunData(QList<int> displays);
    QByteArray xmlAnswer_notify(QString code);
    QByteArray xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1 = "", QString elemUp2 = "");

--- a/Core/externalexecuter.cpp
+++ b/Core/externalexecuter.cpp
@@ -13,7 +13,7 @@ ExternalExecuter::~ExternalExecuter()

 }

-void ExternalExecuter::CallApp()
+void ExternalExecuter::callApp()
 {
    QProcess *myProcess = new QProcess(this);
    QStringList args;
@@ -24,7 +24,7 @@ void ExternalExecuter::CallApp()
    QCoreApplication::exit();
 }

-bool ExternalExecuter::FindApp()
+bool ExternalExecuter::findApp()
 {
    QString localPath = QDir::currentPath() + "/Application";
    QDirIterator iterator(localPath,QDirIterator::Subdirectories);
--- a/Core/externalexecuter.h
+++ b/Core/externalexecuter.h
@@ -14,8 +14,8 @@ class ExternalExecuter : public QObject

 public:
    ExternalExecuter();
-    void CallApp();
-    bool FindApp();
+    void callApp();
+    bool findApp();
    ~ExternalExecuter();

 private:
--- a/Core/recognizesystem.cpp
+++ b/Core/recognizesystem.cpp
@@ -17,14 +17,14 @@ RecognizeSystem::~RecognizeSystem()

 }

-void RecognizeSystem::Initialize(UpdateController *updateController,DataParser *dataParser)
+void RecognizeSystem::initialize(UpdateController *updateController,DataParser *dataParser)
 {
    this->updateController = updateController;
    this->dataParser = dataParser;
-    connect(this,&RecognizeSystem::SaveLoginData,dataParser,&DataParser::CreateAuthData);
+    connect(this,&RecognizeSystem::sigSaveLoginData,dataParser,&DataParser::createAuthData);
 }

-void RecognizeSystem::Recognize(QTcpSocket *socket)
+void RecognizeSystem::recognize(QTcpSocket *socket)
 {
    QDataStream stream(socket);
    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
@@ -37,10 +37,10 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
            stream >> packetType;

            if(!stream.commitTransaction()){
-                emit onSendDebugLog(Tools::GetTime() + " CLIENT: packetType - FAIL commitTransaction");
+                emit sigSendDebugLog(Tools::getTime() + " CLIENT: packetType - FAIL commitTransaction");

                if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
-                    emit onSendDebugLog("ERROR: PACKET TYPE READ TIMEOUT");
+                    emit sigSendDebugLog("ERROR: PACKET TYPE READ TIMEOUT");
                    return;
                }
                continue;
@@ -58,7 +58,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                continue;
            }

-            filePath = Tools::CreateFullPath(filePath);
+            filePath = Tools::createFullPath(filePath);

            QDir dir(filePath);
            if(!dir.exists()){
@@ -83,28 +83,28 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                stream >> fileSize;

                if(!stream.commitTransaction()){
-                    emit onSendDebugLog(Tools::GetTime() + "CLIENT: filePath, fileSize - FAIL commitTransaction");
+                    emit sigSendDebugLog(Tools::getTime() + "CLIENT: filePath, fileSize - FAIL commitTransaction");

                    if (!socket->waitForReadyRead(TCP_READ_TIMEOUT)) {
-                        emit onSendDebugLog(Tools::GetTime() + "CLIENT: ERROR! readyRead timeout - filePath, fileSize!!!");
+                        emit sigSendDebugLog(Tools::getTime() + "CLIENT: ERROR! readyRead timeout - filePath, fileSize!!!");
                        return;
                    }
                    continue;

                }

-                filePath = Tools::CreateFullPath(filePath);
+                filePath = Tools::createFullPath(filePath);

-                emit onSendDebugLog("CLIENT: filesize: " + QString::number(fileSize));
-                emit onSendDebugLog("CLIENT: filePath: " + filePath);
+                emit sigSendDebugLog("CLIENT: filesize: " + QString::number(fileSize));
+                emit sigSendDebugLog("CLIENT: filePath: " + filePath);

-                emit SocketWaitForReadyRead(100);
+                emit sigSocketWaitForReadyRead(100);
                break;
            }


            //ПОЛУЧЕНИЕ САМОГО ФАЙЛА
-            emit onSendDebugLog(Tools::GetTime() + "AfterRead size and path BytesAvailable: " + socket->bytesAvailable());
+            emit sigSendDebugLog(Tools::getTime() + "AfterRead size and path BytesAvailable: " + socket->bytesAvailable());

            //УКАЗАНИЕ ПУТИ ФАЙЛА
            QFile file(filePath);
@@ -112,7 +112,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
            if (file.exists())
            {
                file.remove();  //удаление файла, если он уже есть, но необходимо обновить
-                emit onSendDebugLog(Tools::GetTime() + "Delete exist file: " + filePath);
+                emit sigSendDebugLog(Tools::getTime() + "Delete exist file: " + filePath);
            }


@@ -127,7 +127,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                if(!stream.commitTransaction()){

                    if(socket->state() == QAbstractSocket::UnconnectedState){
-                        emit SockedDisabled();
+                        emit sigSocketDisabled();
                        return;
                    }
                    if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
@@ -138,7 +138,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                }

                quint64 toFile = file.write(tmpBlock);
-                emit onSendDebugLog(Tools::GetTime() + "CLIENT: toFile :" + toFile);
+                emit sigSendDebugLog(Tools::getTime() + "CLIENT: toFile :" + toFile);

                sizeReceiveData += toFile;
                countSend++;
@@ -146,16 +146,16 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                tmpBlock.clear();

                if(sizeReceiveData == fileSize){
-                    emit onSendDebugLog(Tools::GetTime() + "FINAL Count send: " + QString::number(countSend));
-                    emit onSendDebugLog(Tools::GetTime() + "FINAL Size received: " + QString::number(sizeReceiveData));
-                    emit onSendDebugLog(Tools::GetTime() + "FINAL File size" + QString::number(fileSize));
-                    emit UpdateBytesAvailable(fileSize,sizeReceiveData);
+                    emit sigSendDebugLog(Tools::getTime() + "FINAL Count send: " + QString::number(countSend));
+                    emit sigSendDebugLog(Tools::getTime() + "FINAL Size received: " + QString::number(sizeReceiveData));
+                    emit sigSendDebugLog(Tools::getTime() + "FINAL File size" + QString::number(fileSize));
+                    emit sigUpdateBytesAvailable(fileSize,sizeReceiveData);
                    break;
                }
            }

            file.close();
-            emit onSendDebugLog(Tools::GetTime() + "File loaded");
+            emit sigSendDebugLog(Tools::getTime() + "File loaded");

            //ОЧИСТКА ПОСЛЕ ПЕРЕДАЧИ

@@ -175,7 +175,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                continue;
            }

-            filePath = Tools::CreateFullPath(filePath);
+            filePath = Tools::createFullPath(filePath);

            QFileInfo fileInfo(filePath);

@@ -192,7 +192,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                    dir.removeRecursively();
                }

-                qDebug() << Tools::GetTime() << "Deleted: " << filePath;
+                qDebug() << Tools::getTime() << "Deleted: " << filePath;
            }

            packetType = PacketType::TYPE_NONE;
@@ -201,8 +201,8 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
        }

        if(packetType ==PacketType::TYPE_FINISH){   //для повторного создания хэша после загрузки
-            updateController->CalculateHash();
-            emit LoadComplete();
+            updateController->calculateHash();
+            emit sigLoadComplete();
            packetType = PacketType::TYPE_NONE;
        }

@@ -217,7 +217,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
            stream >> size;
            stream >> fileCount;

-            emit onNeedUpdate(flag,size,fileCount);
+            emit sigNeedUpdate(flag,size,fileCount);
            packetType = PacketType::TYPE_NONE;
        }

@@ -230,7 +230,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
                continue;
            }

-            XMLParser(array);
+            xmlParser(array);

            packetType = PacketType::TYPE_NONE;
        }
@@ -239,7 +239,7 @@ void RecognizeSystem::Recognize(QTcpSocket *socket)
    }
 }

-void RecognizeSystem::XMLParser(QByteArray array)
+void RecognizeSystem::xmlParser(QByteArray array)
 {
    QXmlStreamReader xmlReader(array);

@@ -262,7 +262,7 @@ void RecognizeSystem::XMLParser(QByteArray array)
                if(name == "Code"){
                    if (value == "END"){

-                        emit SockedDisabled();
+                        emit sigSocketDisabled();

                    }
                }
@@ -295,7 +295,7 @@ void RecognizeSystem::XMLParser(QByteArray array)
                }
            }

-            emit SaveLoginData(serverAuth);
+            emit sigSaveLoginData(serverAuth);
        }

        xmlReader.readNext();
--- a/Core/recognizesystem.h
+++ b/Core/recognizesystem.h
@@ -18,17 +18,17 @@ class RecognizeSystem : public QObject
 public:
    explicit RecognizeSystem(QObject *parent = 0);
    ~RecognizeSystem();
-    void Initialize(UpdateController* updateController,DataParser *dataParser);
-    void Recognize(QTcpSocket *socket);
+    void initialize(UpdateController* updateController,DataParser *dataParser);
+    void recognize(QTcpSocket *socket);

 signals:
-    void UpdateBytesAvailable(qint64 size,quint64 sended);
-    void LoadComplete();
-    void onNeedUpdate(bool flag,qint64 size,quint64 fileCount);
-    void onSendDebugLog(QString message);
-    void SockedDisabled();
-    void SaveLoginData(ServerAuthorization *serverAuth);
-    void SocketWaitForReadyRead(int waitTime);
+    void sigUpdateBytesAvailable(qint64 size,quint64 sended);
+    void sigLoadComplete();
+    void sigNeedUpdate(bool flag,qint64 size,quint64 fileCount);
+    void sigSendDebugLog(QString message);
+    void sigSocketDisabled();
+    void sigSaveLoginData(ServerAuthorization *serverAuth);
+    void sigSocketWaitForReadyRead(int waitTime);

 private:
    UpdateController *updateController;
@@ -42,7 +42,7 @@ private:
    qint64 fileSize;
    int countSend;

-    void XMLParser(QByteArray array);
+    void xmlParser(QByteArray array);

 };

--- a/Core/screenchecker.cpp
+++ b/Core/screenchecker.cpp
@@ -2,8 +2,6 @@

 #include <QLabel>

-
-
 ScreenChecker::ScreenChecker(DataParser *dataParser, QHBoxLayout *layout, QObject *parent) :
    QObject(parent)
 {
@@ -12,7 +10,7 @@ ScreenChecker::ScreenChecker(DataParser *dataParser, QHBoxLayout *layout, QObjec
    this->dataParser = dataParser;
 }

-void ScreenChecker::Check()
+void ScreenChecker::check()
 {
    screens = QGuiApplication::screens();

@@ -45,7 +43,7 @@ void ScreenChecker::Check()
        button->setMaximumSize(*sizeResult);
        button->setCheckable(true);

-        connect(button,&QPushButton::clicked,this,&ScreenChecker::UpdateDisplayData);
+        connect(button,&QPushButton::clicked,this,&ScreenChecker::updateDisplayData);

        if(i == 0){
            button->setChecked(true);
@@ -59,10 +57,10 @@ void ScreenChecker::Check()

    }

-    UpdateDisplayData();
+    updateDisplayData();
 }

-void ScreenChecker::UpdateDisplayData()
+void ScreenChecker::updateDisplayData()
 {
    QList<int> *displays = new QList<int>;

@@ -73,24 +71,7 @@ void ScreenChecker::UpdateDisplayData()
        }
    }

-    dataParser->AddRunData(*displays);
-}
-
-void ScreenChecker::hide()
-{
-    for (int i = 0; i <buttons.count();i++)
-    {
-        buttons[i]->hide();
-    }
-}
-
-void ScreenChecker::show()
-{
-
-    for (int i = 0; i <buttons.count();i++)
-    {
-        buttons[i]->show();
-    }
+    dataParser->addRunData(*displays);
 }

 QString ScreenChecker::getScreenCount() const
--- a/Core/screenchecker.h
+++ b/Core/screenchecker.h
@@ -17,10 +17,7 @@ class ScreenChecker : public QObject
 public:
    explicit ScreenChecker(DataParser *dataParser, QHBoxLayout *layout,QObject *parent = nullptr);
    ~ScreenChecker();
-    void Check();
-    void UpdateDisplayData();
-    void hide();
-    void show();
+    void check();
    QString getScreenCount() const;


@@ -31,6 +28,8 @@ private:
    qint64 screenCount;
    QList<QScreen *> screens;
    QList<QPushButton *> buttons;
+
+    void updateDisplayData();
 };

 #endif // SCREENCHECKER_H
--- a/Core/tcpclient.cpp
+++ b/Core/tcpclient.cpp
@@ -10,50 +10,50 @@ TCPClient::TCPClient(QObject *parent) :
    socket = NULL;
 }

-void TCPClient::Initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter)
+void TCPClient::initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter)
 {
    this->recognizeSystem = recognize;
    this->externalExecuter = externalExecuter;

-    emit onSendDebugLog(Tools::GetTime() + " Client started");
+    emit sigSendDebugLog(Tools::GetTime() + " Client started");
 }

-void TCPClient::SetConnect(ServerSettings *serverSettings)
+void TCPClient::setConnect(ServerSettings *serverSettings)
 {
    if (socket != NULL && socket->state() == QTcpSocket::ConnectedState)
    {
-        emit onSendDebugLog("already connected");
+        emit sigSendDebugLog("already connected");
        return;
    }

    socket = new QTcpSocket(this);

-    connect(socket,&QTcpSocket::readyRead,this,&TCPClient::onReadyRead,Qt::DirectConnection);
-    connect(socket,&QTcpSocket::disconnected,this,&TCPClient::SetDisconnect);
-    connect(this,&TCPClient::Recognize,recognizeSystem,&RecognizeSystem::Recognize,Qt::DirectConnection);
+    connect(socket,&QTcpSocket::readyRead,this,&TCPClient::slotReadyRead,Qt::DirectConnection);
+    connect(socket,&QTcpSocket::disconnected,this,&TCPClient::setDisconnect);
+    connect(this,&TCPClient::sigRecognize,recognizeSystem,&RecognizeSystem::recognize,Qt::DirectConnection);

    socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort());
-    emit onSendDebugLog("Try connect...");
+    emit sigSendDebugLog("Try connect...");

    socket->waitForReadyRead();

    if(socket->state() != QTcpSocket::ConnectedState){
-        emit onSendDebugLog("Connect invalid");
-        emit ConnectionState(false);
+        emit sigSendDebugLog("Connect invalid");
+        emit sigConnectionState(false);
        return;
    }else{
-        emit onSendDebugLog("Connect complete");
-        emit ConnectionState(true);
+        emit sigSendDebugLog("Connect complete");
+        emit sigConnectionState(true);
    }
 }

-void TCPClient::SendClientAutorization()
+void TCPClient::sendClientAutorization()
 {
    QDataStream stream(socket);
    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);

    if(socket->state() != QTcpSocket::ConnectedState){
-        emit ConnectionState(false);
+        emit sigConnectionState(false);
        return;
    }

@@ -66,7 +66,7 @@ void TCPClient::SendClientAutorization()
    socket->waitForBytesWritten();
 }

-void TCPClient::SendFile()
+void TCPClient::sendFile()
 {
    QDataStream stream(socket);
    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
@@ -97,7 +97,7 @@ void TCPClient::SendFile()
    countSend = 0;
 }

-void TCPClient::SendUnityConnect()
+void TCPClient::sendUnityConnect()
 {
    QDataStream stream(socket);
    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
@@ -105,10 +105,10 @@ void TCPClient::SendUnityConnect()
    socket->waitForBytesWritten();
 }

-void TCPClient::SetDisconnect()
+void TCPClient::setDisconnect()
 {
    socket->disconnect();
-    emit onSendDebugLog("Server disabled");
+    emit sigSendDebugLog("Server disabled");
 }

 void TCPClient::sendDisable()
@@ -117,29 +117,24 @@ void TCPClient::sendDisable()
    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);

    QByteArray data;
-    data = emit signalGetXmlAnswer("END");
+    data = emit sigGetXmlAnswer("END");

    stream << PacketType::TYPE_XMLANSWER;
    stream << data;
-    waitWrites();
-}
-
-void TCPClient::waitWrites()
-{
    socket->waitForBytesWritten();
 }

-void TCPClient::WaitRead(int time)
+void TCPClient::waitRead(int time)
 {
    socket->waitForReadyRead(time);
 }

-QTcpSocket *TCPClient::GetSocket()
+QTcpSocket *TCPClient::getSocket()
 {
    return socket;
 }

-void TCPClient::MessageEntered(QString message)
+void TCPClient::slotMessageEntered(QString message)
 {
    QDataStream stream(socket);
    QByteArray data;
@@ -153,36 +148,36 @@ void TCPClient::MessageEntered(QString message)
            stream << message;
            socket->waitForBytesWritten();

-            SendFile();
-            emit onSendDebugLog(Tools::GetTime() + " Local checkFile sended");
+            sendFile();
+            emit sigSendDebugLog(Tools::GetTime() + " Local checkFile sended");

            socket->waitForReadyRead(1000);
        }
        else if(message == "update"){
-            emit onSendDebugLog("Update started");
+            emit sigSendDebugLog("Update started");
            stream << PacketType::TYPE_COMMAND;
            stream << message;
            socket->waitForBytesWritten();
        }
        else if(message == "run"){
-            externalExecuter->CallApp();
+            externalExecuter->callApp();
        }
    }else{
-        emit onSendDebugLog("WRONG SOCKET AFTER ENTERED");
+        emit sigSendDebugLog("WRONG SOCKET AFTER ENTERED");
    }
 }

-void TCPClient::onReadyRead()
+void TCPClient::slotReadyRead()
 {
    if(!socket){
-        emit onSendDebugLog("WRONG SOCKET");
+        emit sigSendDebugLog("WRONG SOCKET");
        return;
    }
 //    qDebug() << "Transaction before recognize: " << socket->isTransactionStarted();

 //    if(socket->isTransactionStarted()) return;

-    emit Recognize(socket);
+    emit sigRecognize(socket);
 }

 TCPClient::~TCPClient()
--- a/Core/tcpclient.h
+++ b/Core/tcpclient.h
@@ -23,34 +23,35 @@ class TCPClient : public QObject

 public:
    explicit TCPClient(QObject *parent = 0);
-    void Initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter);
-    void SetConnect(ServerSettings *serverSettings);
-    void SendClientAutorization();
-    void SendFile();
-    void SendUnityConnect();
-    void SetDisconnect();
+    void initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter);
+    void setConnect(ServerSettings *serverSettings);
+    void sendClientAutorization();
+    void sendUnityConnect();
+
    void sendDisable();
-    void waitWrites();
-    void WaitRead(int time);
-    QTcpSocket* GetSocket();
+    void waitRead(int time);
+    QTcpSocket* getSocket();
    ~TCPClient();

 signals:
-    void onSendDebugLog(QString message);
-    void Recognize(QTcpSocket *socket);
-    void ConnectionState(bool flag);
-    QByteArray signalGetXmlAnswer(QString);
+    void sigSendDebugLog(QString message);
+    void sigRecognize(QTcpSocket *socket);
+    void sigConnectionState(bool flag);
+    QByteArray sigGetXmlAnswer(QString);

 public slots:
-    void MessageEntered(QString message);
+    void slotMessageEntered(QString message);

 private slots:
-    void onReadyRead();
+    void slotReadyRead();

 private:
    QTcpSocket *socket;
    RecognizeSystem *recognizeSystem;
    ExternalExecuter * externalExecuter;
+
+    void sendFile();
+    void setDisconnect();
 };

 #endif // TCPCLIENT_H
--- a/Core/tools.cpp
+++ b/Core/tools.cpp
@@ -3,17 +3,17 @@
 #include <qdir.h>


-void Tools::PrintTime()
+void Tools::printTime()
 {
    qDebug() << QTime::currentTime().toString("hh:mm:ss");
 }

-QString Tools::GetTime()
+QString Tools::getTime()
 {
    return QTime::currentTime().toString(("hh:mm:ss"));
 }

-QString Tools::CreateLocalPath(QString path)
+QString Tools::createLocalPath(QString path)
 {
    qDebug() << "Full path: " << path;
    qint8 pos = path.indexOf("Application");
@@ -24,7 +24,7 @@ QString Tools::CreateLocalPath(QString path)
    return localPath;
 }

-QString Tools::CreateFullPath(QString path)
+QString Tools::createFullPath(QString path)
 {
    QString fullPath;
    qint8 pos = path.indexOf("Application");
--- a/Core/tools.h
+++ b/Core/tools.h
@@ -29,10 +29,10 @@ enum PacketType{
 class Tools {
 public:

-    static void PrintTime();
-    static QString GetTime();
-    static QString CreateLocalPath(QString path);
-    static QString CreateFullPath(QString path);
+    static void printTime();
+    static QString getTime();
+    static QString createLocalPath(QString path);
+    static QString createFullPath(QString path);
    static QString convertFileSize(quint64 fileSize);
 };