ref:file path

Core/UpdateController.cpp

@@ -4,7 +4,7 @@ UpdateController::UpdateController(DataParser *parser, QObject *parent) :
     QObject(parent)
 {
     this->dataParser = parser;
-    localPath = QDir::currentPath() + "/Application";
+    localPath = QDir::currentPath() + applicationFolderName;
 }
 
 
@@ -18,8 +18,8 @@ void UpdateController::calculateHash()
     QList<FileData> *files = new QList<FileData>;
     QList<FileData> * folders = new QList<FileData>;
 
-    if(!QDir("Application").exists()){  //проверка на наличие папки
-        QDir().mkdir("Application");
+    if(!QDir(applicationFolderName).exists()){  //проверка на наличие папки
+        QDir().mkdir(applicationFolderName);
     }
 
     QDir dir(localPath);

Core/dataparser.cpp

@@ -8,8 +8,8 @@
 DataParser::DataParser(QObject *parent) :
     QObject(parent)
 {
-    if(!QDir("StaticData").exists()){
-        QDir().mkdir("StaticData");
+    if(!QDir(staticDataFolderName).exists()){
+        QDir().mkdir(staticDataFolderName);
     }
 }
 
@@ -217,7 +217,7 @@ void DataParser::saveClientSettrings(QString language, bool isAutoStart)
 QByteArray DataParser::xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1, QString elemUp2)
 {
     /* Открываем файл для Записи*/
-    QFile file("save.xml");
+    QFile file(tempName);
     file.open(QIODevice::WriteOnly);
 
     /* Создаем объект, с помощью которого осуществляется запись в файл */
@@ -259,7 +259,7 @@ QByteArray DataParser::xmlAnswer(QList<SXmlAnswerTag> listTag, QString elemUp1,
     QByteArray array;
 
     /* Открываем файл для Чтения*/
-    QFile fileR("save.xml");
+    QFile fileR(tempName);
     if (!fileR.open(QFile::ReadOnly | QFile::Text))
     {
         QString str = "Не удалось открыть файл";

Core/externalexecuter.cpp

@@ -26,13 +26,13 @@ void ExternalExecuter::callApp()
 
 bool ExternalExecuter::findApp()
 {
-    QString localPath = QDir::currentPath() + "/Application";
+    QString localPath = QDir::currentPath() + applicationFolderName;
     QDirIterator iterator(localPath,QDirIterator::Subdirectories);
 
     while(iterator.hasNext()){
         iterator.next();
 
-        if(iterator.fileInfo().fileName() == "RRJ.exe"){
+        if(iterator.fileInfo().fileName() == applicationEXEName){
             programPath = iterator.fileInfo().absoluteFilePath();
             return true;
         }

Core/externalexecuter.h

@@ -7,6 +7,7 @@
 #include <QDirIterator>
 #include <QProcess>
 #include <QDebug>
+#include "tools.h"
 
 class ExternalExecuter : public QObject
 {

Core/tcpclient.cpp

@@ -15,7 +15,7 @@ void TCPClient::initialize(RecognizeSystem *recognize,ExternalExecuter *external
     this->recognizeSystem = recognize;
     this->externalExecuter = externalExecuter;
 
-    emit sigSendDebugLog(Tools::GetTime() + " Client started");
+    emit sigSendDebugLog(Tools::getTime() + " Client started");
 }
 
 void TCPClient::setConnect(ServerSettings *serverSettings)
@@ -88,7 +88,7 @@ void TCPClient::sendFile()
             countSend++;
         }
 
-        qDebug() << Tools::GetTime() << "count end Final: " << countSend;
+        qDebug() << Tools::getTime() << "count end Final: " << countSend;
     }
 
     file.close();
@@ -113,15 +113,15 @@ void TCPClient::setDisconnect()
 
 void TCPClient::sendDisable()
 {
-    QDataStream stream(socket);
-    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
+//    QDataStream stream(socket);
+//    stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
 
-    QByteArray data;
-    data = emit sigGetXmlAnswer("END");
+//    QByteArray data;
+//    data = emit sigGetXmlAnswer("END");
 
-    stream << PacketType::TYPE_XMLANSWER;
-    stream << data;
-    socket->waitForBytesWritten();
+//    stream << PacketType::TYPE_XMLANSWER;
+//    stream << data;
+//    socket->waitForBytesWritten();
 }
 
 void TCPClient::waitRead(int time)
@@ -149,7 +149,7 @@ void TCPClient::slotMessageEntered(QString message)
             socket->waitForBytesWritten();
 
             sendFile();
-            emit sigSendDebugLog(Tools::GetTime() + " Local checkFile sended");
+            emit sigSendDebugLog(Tools::getTime() + " Local checkFile sended");
 
             socket->waitForReadyRead(1000);
         }

Core/tools.h

@@ -7,11 +7,14 @@
 
 #define TCP_READ_TIMEOUT 1000
 
-static QString hashFilename = "StaticData/hash.xml";
-static QString settingsName = "StaticData/settings.xml";
-static QString tempName = "StaticData/temp.xml";
-static QString authTempName = "StaticData/authData.xml";
-static QString displayTemp = "StaticData/displayData.xml";
+static QString applicationEXEName = "RRJ.exe";
+static QString applicationFolderName = "/Application";
+static QString staticDataFolderName = "StaticData";
+static QString hashFilename = staticDataFolderName + "/hash.xml";
+static QString settingsName = staticDataFolderName + "/settings.xml";
+static QString tempName = staticDataFolderName + "/temp.xml";
+static QString authTempName = staticDataFolderName + "/authData.xml";
+static QString displayTemp = staticDataFolderName + "/displayData.xml";
 
 enum PacketType{
     TYPE_NONE = 0,