diff --git a/Core/UpdateController.cpp b/Core/UpdateController.cpp index e2bc07e..19a9fca 100644 --- a/Core/UpdateController.cpp +++ b/Core/UpdateController.cpp @@ -5,33 +5,8 @@ UpdateController::UpdateController(DataParser *parser, QObject *parent) : { this->dataParser = parser; localPath = QDir::currentPath() + "/Application"; - countSend = 0; } -void UpdateController::SendFile(QDataStream &stream) -{ - /* Открываем файл для Чтения*/ - QFile file(hashFilename); - - stream << PacketType::TYPE_FILE; //Отправляем тип блока - QFileInfo fileInfo(file); - fileSize = fileInfo.size(); - - stream << fileSize; - - if(file.open(QFile::ReadOnly | QFile::Text)){ - while(!file.atEnd()){ - QByteArray data = file.readAll();//file.read(1025*250); - stream << data; - countSend++; - } - - qDebug() << Tools::GetTime() << "count end Final: " << countSend; - } - - file.close(); - countSend = 0; -} void UpdateController::CalculateHash() { diff --git a/Core/UpdateController.h b/Core/UpdateController.h index 22276a4..5dda89f 100644 --- a/Core/UpdateController.h +++ b/Core/UpdateController.h @@ -24,7 +24,6 @@ class UpdateController : public QObject public: explicit UpdateController(DataParser *parser,QObject *parent = 0); - void SendFile(QDataStream &stream); void CalculateHash(); ~UpdateController(); @@ -32,9 +31,6 @@ private: DataParser *dataParser; QString localPath; QList fileDataList; - quint64 fileSize; - int countSend; - }; diff --git a/Core/dataparser.cpp b/Core/dataparser.cpp index 79847c2..0e1681b 100644 --- a/Core/dataparser.cpp +++ b/Core/dataparser.cpp @@ -1,10 +1,15 @@ +#include "Core/dataparser.h" + #include "FileData.h" -#include "dataparser.h" #include "tools.h" +DataParser::DataParser(QObject *parent) : + QObject(parent) +{ +} -DataParser::DataParser() +DataParser::~DataParser() { } @@ -38,6 +43,8 @@ void DataParser::CreateXML(QList fileDataList) void DataParser::CreateAuthMessage(ClientAutorization *auth) { + authPassCache = auth; //кэширование даных авторизации, для сохранения при успешном заходе + QFile file(tempName); file.open(QIODevice::WriteOnly); QXmlStreamWriter xmlWriter(&file); @@ -68,9 +75,10 @@ void DataParser::CreateServerSettings(QString address, QString port) xmlWriter.setAutoFormatting(true); xmlWriter.writeStartDocument(); - xmlWriter.writeStartElement("ServerSettingsContainer"); + xmlWriter.writeStartElement("ServerSettingsContainer"); xmlWriter.writeStartElement("ServerSettings"); + xmlWriter.writeAttribute("Address",address); xmlWriter.writeAttribute("Port",port); @@ -83,6 +91,27 @@ void DataParser::CreateServerSettings(QString address, QString port) } +void DataParser::CreateAuthData(ServerAuthorization *serverAuth) +{ + QFile file(authTempName); + file.open(QIODevice::WriteOnly); + + QXmlStreamWriter xmlWriter(&file); + + xmlWriter.setAutoFormatting(true); + xmlWriter.writeStartDocument(); + xmlWriter.writeStartElement("AuthData"); + xmlWriter.writeAttribute("Login",authPassCache->Login); + xmlWriter.writeAttribute("Password",authPassCache->Password); + xmlWriter.writeAttribute("InstructorName",serverAuth->InstructorName); + xmlWriter.writeAttribute("ClientName",serverAuth->ClientName); + xmlWriter.writeAttribute("AccessType",serverAuth->AccessType); + + xmlWriter.writeEndElement(); + file.close(); + +} + ServerSettings *DataParser::GetServerSettings() { ServerSettings *settings = new ServerSettings; @@ -102,10 +131,6 @@ ServerSettings *DataParser::GetServerSettings() if(name == "Address"){ settings->Address = value; - - - - } if(name == "Port"){ diff --git a/Core/dataparser.h b/Core/dataparser.h index f9987ce..57ebf17 100644 --- a/Core/dataparser.h +++ b/Core/dataparser.h @@ -3,20 +3,29 @@ #include "FileData.h" +#include #include #include #include -class DataParser +class DataParser : public QObject { + + Q_OBJECT + public: - DataParser(); + explicit DataParser(QObject *parent = 0); ~DataParser(); ServerSettings* GetServerSettings(); void CreateServerSettings(QString server,QString port); void CreateXML(QList fileDataList); void CreateAuthMessage(ClientAutorization *auth); + void CreateAuthData(ServerAuthorization *serverAuth); + +private: + ClientAutorization *authPassCache; + }; #endif // DATAPARSER_H diff --git a/Core/externalexecuter.cpp b/Core/externalexecuter.cpp index 61d20b8..62d2b55 100644 --- a/Core/externalexecuter.cpp +++ b/Core/externalexecuter.cpp @@ -21,7 +21,7 @@ void ExternalExecuter::CallApp() myProcess.waitForFinished(-1); } -void ExternalExecuter::FindApp() +bool ExternalExecuter::FindApp() { QString localPath = QDir::currentPath() + "/Application"; QDirIterator iterator(localPath,QDirIterator::Subdirectories); @@ -31,7 +31,9 @@ void ExternalExecuter::FindApp() if(iterator.fileInfo().fileName() == "RRJ.exe"){ programPath = iterator.fileInfo().absoluteFilePath(); - qDebug() << "Bin found: " << programPath; + return true; } } + + return false; } diff --git a/Core/externalexecuter.h b/Core/externalexecuter.h index 4527e77..577d30d 100644 --- a/Core/externalexecuter.h +++ b/Core/externalexecuter.h @@ -15,7 +15,7 @@ class ExternalExecuter : public QObject public: ExternalExecuter(); void CallApp(); - void FindApp(); + bool FindApp(); ~ExternalExecuter(); private: diff --git a/Core/recognizesystem.cpp b/Core/recognizesystem.cpp index 8e38281..8919768 100644 --- a/Core/recognizesystem.cpp +++ b/Core/recognizesystem.cpp @@ -21,20 +21,21 @@ void RecognizeSystem::Initialize(UpdateController *updateController,DataParser * { this->updateController = updateController; this->dataParser = dataParser; + connect(this,&RecognizeSystem::SaveLoginData,dataParser,&DataParser::CreateAuthData); } -void RecognizeSystem::SetSocket(QTcpSocket *socket) -{ - this->socket = socket; -} - -void RecognizeSystem::Recognize() +void RecognizeSystem::Recognize(QTcpSocket *socket) { QDataStream stream(socket); stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); while(socket->bytesAvailable()) { + + if(!stream.commitTransaction()){ + qDebug() << "BUSY, WAIT"; + } + if(packetType == PacketType::TYPE_NONE){ //определение первичного пакета stream.startTransaction(); @@ -109,19 +110,19 @@ void RecognizeSystem::Recognize() emit onSendDebugLog(Tools::GetTime() + "CLIENT: filePath, fileSize - FAIL commitTransaction"); if (!socket->waitForReadyRead(TCP_READ_TIMEOUT)) { - emit onSendDebugLog(Tools::GetTime() + "CLIENT: ERROR! readyRead timeout - filePath, fileSize!!!"); - return; - } + emit onSendDebugLog(Tools::GetTime() + "CLIENT: ERROR! readyRead timeout - filePath, fileSize!!!"); + return; + } continue; - } + } filePath = Tools::CreateFullPath(filePath); - emit onSendDebugLog("CLIENT: filesize: " + QString::number(fileSize)); - emit onSendDebugLog("CLIENT: filePath: " + filePath); + emit onSendDebugLog("CLIENT: filesize: " + QString::number(fileSize)); + emit onSendDebugLog("CLIENT: filePath: " + filePath); - socket->waitForReadyRead(100); + emit SocketWaitForReadyRead(100); break; } @@ -247,6 +248,10 @@ void RecognizeSystem::Recognize() stream.startTransaction(); stream >> array; + if(!stream.commitTransaction()){ + continue; + } + XMLParser(array); packetType = PacketType::TYPE_NONE; @@ -260,33 +265,62 @@ void RecognizeSystem::XMLParser(QByteArray array) { QXmlStreamReader xmlReader(array); - xmlReader.readNext(); + xmlReader.readNext(); - while(!xmlReader.atEnd()) + while(!xmlReader.atEnd()) + { + if(!xmlReader.isStartElement()) { + xmlReader.readNext(); + continue; + } + + if(xmlReader.name() == "ServerNotify") { - if(!xmlReader.isStartElement()) { - xmlReader.readNext(); - continue; - } - - if(xmlReader.name() == "ServerNotify") + foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()) { - foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()) - { - QString name = attr.name().toString(); - QString value = attr.value().toString(); + QString name = attr.name().toString(); + QString value = attr.value().toString(); - if(name == "Code"){ - if (value == "END"){ + if(name == "Code"){ + if (value == "END"){ - emit SockedDisabled(); + emit SockedDisabled(); - } } } } - - xmlReader.readNext(); } + if(xmlReader.name() == "ServerAuthorization"){ + + ServerAuthorization *serverAuth = new ServerAuthorization; + + foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()) + { + QString name = attr.name().toString(); + QString value = attr.value().toString(); + + if (name == "Result"){ + serverAuth->Result = value == "true" ? true : false; + } + + if (name == "InstructorName"){ + serverAuth->InstructorName = value; + } + + if (name == "ClientName"){ + serverAuth->ClientName = value; + } + + if (name == "AccessType"){ + serverAuth->AccessType = value; + } + } + + emit SaveLoginData(serverAuth); + } + + xmlReader.readNext(); + } + } diff --git a/Core/recognizesystem.h b/Core/recognizesystem.h index a07684c..7119407 100644 --- a/Core/recognizesystem.h +++ b/Core/recognizesystem.h @@ -19,8 +19,7 @@ public: explicit RecognizeSystem(QObject *parent = 0); ~RecognizeSystem(); void Initialize(UpdateController* updateController,DataParser *dataParser); - void SetSocket(QTcpSocket *socket); - void Recognize(); + void Recognize(QTcpSocket *socket); signals: void UpdateBytesAvailable(qint64 size,quint64 sended); @@ -28,11 +27,12 @@ signals: void onNeedUpdate(bool flag); void onSendDebugLog(QString message); void SockedDisabled(); + void SaveLoginData(ServerAuthorization *serverAuth); + void SocketWaitForReadyRead(int waitTime); private: UpdateController *updateController; DataParser *dataParser; - QTcpSocket *socket; PacketType packetType; QString message; QString filePath; diff --git a/Core/tcpclient.cpp b/Core/tcpclient.cpp index 5b275d7..5fcded6 100644 --- a/Core/tcpclient.cpp +++ b/Core/tcpclient.cpp @@ -10,11 +10,8 @@ TCPClient::TCPClient(QObject *parent) : } -void TCPClient::Initialize(UpdateController *updateController, - RecognizeSystem *recognize, - ExternalExecuter *externalExecuter) +void TCPClient::Initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter) { - this->updateController = updateController; this->recognizeSystem = recognize; this->externalExecuter = externalExecuter; @@ -27,11 +24,11 @@ void TCPClient::SetConnect(ServerSettings *serverSettings) connect(socket,&QTcpSocket::readyRead,this,&TCPClient::onReadyRead); connect(socket,&QTcpSocket::disconnected,this,&TCPClient::SetDisconnect); + connect(this,&TCPClient::Recognize,recognizeSystem,&RecognizeSystem::Recognize); socket->connectToHost(serverSettings->Address,serverSettings->Port.toShort()); emit onSendDebugLog("Try connect..."); - recognizeSystem->SetSocket(socket); socket->waitForReadyRead(); if(socket->state() != QTcpSocket::ConnectedState){ @@ -56,6 +53,37 @@ void TCPClient::SendClientAutorization() socket->waitForBytesWritten(); } +void TCPClient::SendFile() +{ + QDataStream stream(socket); + stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); + quint64 fileSize = 0; + int countSend = 0; + + QFile file(hashFilename); //Открываем файл для чтения + + stream << PacketType::TYPE_FILE; //Отправляем тип блока + QFileInfo fileInfo(file); + + fileSize = fileInfo.size(); + stream << fileSize; + + if(file.open(QFile::ReadOnly | QFile::Text)){ + while(!file.atEnd()){ + QByteArray data = file.readAll();//file.read(1025*250); + stream << data; + countSend++; + } + + qDebug() << Tools::GetTime() << "count end Final: " << countSend; + } + + file.close(); + + qDebug() << "Transaction after send file: " << socket->isTransactionStarted(); + countSend = 0; +} + void TCPClient::SetDisconnect() { socket->disconnect(); @@ -67,6 +95,11 @@ void TCPClient::WaitWrites() socket->waitForBytesWritten(); } +void TCPClient::WaitRead(int time) +{ + socket->waitForReadyRead(time); +} + QTcpSocket *TCPClient::GetSocket() { return socket; @@ -80,18 +113,16 @@ void TCPClient::MessageEntered(QString message) if(!message.isEmpty() && socket->state() == QTcpSocket::ConnectedState){ - socket->waitForBytesWritten(); - if(message == "check") { stream << PacketType::TYPE_COMMAND; stream << message; socket->waitForBytesWritten(); - updateController->SendFile(stream); + SendFile(); emit onSendDebugLog(Tools::GetTime() + " Local checkFile sended"); - WaitWrites(); - socket->readyRead(); + + socket->waitForReadyRead(1000); } else if(message == "update"){ emit onSendDebugLog("Update started"); @@ -113,8 +144,11 @@ void TCPClient::onReadyRead() emit onSendDebugLog("WRONG SOCKET"); return; } +// qDebug() << "Transaction before recognize: " << socket->isTransactionStarted(); - recognizeSystem->Recognize(); +// if(socket->isTransactionStarted()) return; + + emit Recognize(socket); } TCPClient::~TCPClient() diff --git a/Core/tcpclient.h b/Core/tcpclient.h index 7c8de5f..b716bd1 100644 --- a/Core/tcpclient.h +++ b/Core/tcpclient.h @@ -19,19 +19,24 @@ class RecognizeSystem; class TCPClient : public QObject { Q_OBJECT + + public: explicit TCPClient(QObject *parent = 0); - void Initialize(UpdateController *updateController,RecognizeSystem *recognize,ExternalExecuter *externalExecuter); + void Initialize(RecognizeSystem *recognize,ExternalExecuter *externalExecuter); void SetConnect(ServerSettings *serverSettings); void SendClientAutorization(); + void SendFile(); void SetDisconnect(); void WaitWrites(); + void WaitRead(int time); QTcpSocket* GetSocket(); ~TCPClient(); signals: void onSendDebugLog(QString message); - + void Recognize(QTcpSocket *socket); + public slots: void MessageEntered(QString message); @@ -40,7 +45,6 @@ private slots: private: QTcpSocket *socket; - UpdateController *updateController; RecognizeSystem *recognizeSystem; ExternalExecuter * externalExecuter; }; diff --git a/Core/tools.h b/Core/tools.h index 37ae8ec..b711df4 100644 --- a/Core/tools.h +++ b/Core/tools.h @@ -10,6 +10,7 @@ static QString hashFilename = "hash.xml"; static QString settingsName = "settings.xml"; static QString tempName = "temp.xml"; +static QString authTempName = "authData.xml"; enum PacketType{ TYPE_NONE = 0, diff --git a/Datas.h b/Datas.h index b994fce..29e369b 100644 --- a/Datas.h +++ b/Datas.h @@ -9,6 +9,14 @@ public: QString Port; }; +class ServerAuthorization{ +public: + QString InstructorName; + QString ClientName; + bool Result; + QString AccessType; +}; + class ClientAutorization{ public: QString Login; diff --git a/Makefile.Debug b/Makefile.Debug index f65b5d5..5d4ae8a 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -60,6 +60,7 @@ SOURCES = Core\updatecontroller.cpp \ main.cpp \ mainwindow.cpp debug\moc_updatecontroller.cpp \ debug\moc_externalexecuter.cpp \ + debug\moc_dataparser.cpp \ debug\moc_recognizesystem.cpp \ debug\moc_tcpclient.cpp \ debug\moc_mainwindow.cpp @@ -74,6 +75,7 @@ OBJECTS = debug/updatecontroller.o \ debug/mainwindow.o \ debug/moc_updatecontroller.o \ debug/moc_externalexecuter.o \ + debug/moc_dataparser.o \ debug/moc_recognizesystem.o \ debug/moc_tcpclient.o \ debug/moc_mainwindow.o @@ -118,7 +120,7 @@ dist: $(ZIP) RRJClient.zip $(SOURCES) $(DIST) RRJClient.pro D:\QT\5.14.2\mingw73_64\mkspecs\features\spec_pre.prf D:\QT\5.14.2\mingw73_64\mkspecs\qdevice.pri D:\QT\5.14.2\mingw73_64\mkspecs\features\device_config.prf D:\QT\5.14.2\mingw73_64\mkspecs\common\sanitize.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\gcc-base.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\g++-base.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\angle.conf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\windows_vulkan_sdk.prf D:\QT\5.14.2\mingw73_64\mkspecs\common\windows-vulkan.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\g++-win32.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\windows-desktop.conf D:\QT\5.14.2\mingw73_64\mkspecs\qconfig.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_accessibility_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bodymovin_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bootstrap_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_charts.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_charts_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_datavisualization.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_datavisualization_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designercomponents_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_devicediscovery_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_edid_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_egl_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_eventdispatcher_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fb_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fontdatabase_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_networkauth.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_networkauth_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_packetprotocol_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_platformcompositor_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_purchasing.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_purchasing_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldebug_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldevtools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qtmultimediaquicktools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3d.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3d_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dassetimport.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dassetimport_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3drender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3drender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3druntimerender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3druntimerender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dutils.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dutils_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickparticles_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickshapes_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_script.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_script_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scripttools.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scripttools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_theme_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uiplugin.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_virtualkeyboard.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_virtualkeyboard_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_vulkan_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_windowsuiautomation_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_zlib_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\features\qt_functions.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qt_config.prf D:\QT\5.14.2\mingw73_64\mkspecs\win32-g++\qmake.conf D:\QT\5.14.2\mingw73_64\mkspecs\features\spec_post.prf .qmake.stash D:\QT\5.14.2\mingw73_64\mkspecs\features\exclusive_builds.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\toolchain.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\default_pre.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\default_pre.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\resolve_config.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\exclusive_builds_post.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\default_post.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\build_pass.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qml_debug.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\precompile_header.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\warn_on.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qt.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\resources_functions.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\resources.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\moc.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\opengl.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\uic.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qmake_use.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\file_copies.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\windows.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\testcase_targets.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\exceptions.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\yacc.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\lex.prf RRJClient.pro D:\QT\5.14.2\mingw73_64\lib\Qt5Widgets.prl D:\QT\5.14.2\mingw73_64\lib\Qt5Gui.prl D:\QT\5.14.2\mingw73_64\lib\Qt5Network.prl D:\QT\5.14.2\mingw73_64\lib\Qt5Core.prl D:\QT\5.14.2\mingw73_64\lib\qtmain.prl D:\QT\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp Core\updatecontroller.h Core\externalexecuter.h Core\dataparser.h Core\FileData.h Core\recognizesystem.h Core\screenchecker.h Core\tcpclient.h Core\tools.h Datas.h mainwindow.h Core\updatecontroller.cpp Core\externalexecuter.cpp Core\dataparser.cpp Core\recognizesystem.cpp Core\screenchecker.cpp Core\tcpclient.cpp Core\tools.cpp main.cpp mainwindow.cpp mainwindow.ui clean: compiler_clean - -$(DEL_FILE) debug\updatecontroller.o debug\externalexecuter.o debug\dataparser.o debug\recognizesystem.o debug\screenchecker.o debug\tcpclient.o debug\tools.o debug\main.o debug\mainwindow.o debug\moc_updatecontroller.o debug\moc_externalexecuter.o debug\moc_recognizesystem.o debug\moc_tcpclient.o debug\moc_mainwindow.o + -$(DEL_FILE) debug\updatecontroller.o debug\externalexecuter.o debug\dataparser.o debug\recognizesystem.o debug\screenchecker.o debug\tcpclient.o debug\tools.o debug\main.o debug\mainwindow.o debug\moc_updatecontroller.o debug\moc_externalexecuter.o debug\moc_dataparser.o debug\moc_recognizesystem.o debug\moc_tcpclient.o debug\moc_mainwindow.o distclean: clean -$(DEL_FILE) .qmake.stash @@ -143,9 +145,9 @@ compiler_moc_predefs_clean: debug/moc_predefs.h: D:/QT/5.14.2/mingw73_64/mkspecs/features/data/dummy.cpp g++ -fno-keep-inline-dllexport -g -std=gnu++11 -Wall -Wextra -Wextra -dM -E -o debug\moc_predefs.h D:\QT\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp -compiler_moc_header_make_all: debug/moc_updatecontroller.cpp debug/moc_externalexecuter.cpp debug/moc_recognizesystem.cpp debug/moc_tcpclient.cpp debug/moc_mainwindow.cpp +compiler_moc_header_make_all: debug/moc_updatecontroller.cpp debug/moc_externalexecuter.cpp debug/moc_dataparser.cpp debug/moc_recognizesystem.cpp debug/moc_tcpclient.cpp debug/moc_mainwindow.cpp compiler_moc_header_clean: - -$(DEL_FILE) debug\moc_updatecontroller.cpp debug\moc_externalexecuter.cpp debug\moc_recognizesystem.cpp debug\moc_tcpclient.cpp debug\moc_mainwindow.cpp + -$(DEL_FILE) debug\moc_updatecontroller.cpp debug\moc_externalexecuter.cpp debug\moc_dataparser.cpp debug\moc_recognizesystem.cpp debug\moc_tcpclient.cpp debug\moc_mainwindow.cpp debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ @@ -194,11 +196,7 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Core/dataparser.h \ - Datas.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ @@ -208,10 +206,14 @@ debug/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -395,6 +397,74 @@ debug/moc_externalexecuter.cpp: Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/bin/moc.exe D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\externalexecuter.h -o debug\moc_externalexecuter.cpp +debug/moc_dataparser.cpp: Core/dataparser.h \ + Core/FileData.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qalgorithms.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qglobal.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qconfig.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qtcore-config.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qsystemdetection.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qprocessordetection.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcompilerdetection.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qtypeinfo.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qsysinfo.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qlogging.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qflags.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qbasicatomic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic_bootstrap.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qgenericatomic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic_cxx11.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic_msvc.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qglobalstatic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qmutex.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiterator.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qrefcount.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qarraydata.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qhashfunctions.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstring.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qchar.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qbytearray.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringliteral.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringalgorithms.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringview.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringbuilder.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qpair.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qvector.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainertools_impl.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qpoint.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qbytearraylist.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringlist.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qregexp.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreevent.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qscopedpointer.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qmetatype.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ + debug/moc_predefs.h \ + D:/QT/5.14.2/mingw73_64/bin/moc.exe + D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/debug/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\dataparser.h -o debug\moc_dataparser.cpp + debug/moc_recognizesystem.cpp: Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ @@ -846,12 +916,12 @@ debug/moc_mainwindow.cpp: mainwindow.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ Datas.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -970,11 +1040,7 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Core/dataparser.h \ - Datas.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ @@ -984,10 +1050,14 @@ debug/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -1166,7 +1236,8 @@ debug/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\externalexecuter.o Core\externalexecuter.cpp -debug/dataparser.o: Core/dataparser.cpp Core/FileData.h \ +debug/dataparser.o: Core/dataparser.cpp Core/dataparser.h \ + Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qalgorithms.h \ @@ -1212,12 +1283,7 @@ debug/dataparser.o: Core/dataparser.cpp Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qregexp.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ - Core/dataparser.h \ - Datas.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ @@ -1227,6 +1293,11 @@ debug/dataparser.o: Core/dataparser.cpp Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tools.h \ @@ -1861,12 +1932,12 @@ debug/main.o: main.cpp mainwindow.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ Datas.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -2029,12 +2100,12 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ Datas.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -2077,42 +2148,7 @@ debug/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtGui/QGuiApplication \ D:/QT/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - ui_mainwindow.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QHBoxLayout \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QMenuBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qmenubar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qmenu.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qaction.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qactiongroup.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QStatusBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstatusbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget + ui_mainwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\mainwindow.o mainwindow.cpp debug/moc_updatecontroller.o: debug/moc_updatecontroller.cpp @@ -2121,6 +2157,9 @@ debug/moc_updatecontroller.o: debug/moc_updatecontroller.cpp debug/moc_externalexecuter.o: debug/moc_externalexecuter.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_externalexecuter.o debug\moc_externalexecuter.cpp +debug/moc_dataparser.o: debug/moc_dataparser.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_dataparser.o debug\moc_dataparser.cpp + debug/moc_recognizesystem.o: debug/moc_recognizesystem.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_recognizesystem.o debug\moc_recognizesystem.cpp diff --git a/Makefile.Release b/Makefile.Release index a1c6c19..819453b 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -60,6 +60,7 @@ SOURCES = Core\updatecontroller.cpp \ main.cpp \ mainwindow.cpp release\moc_updatecontroller.cpp \ release\moc_externalexecuter.cpp \ + release\moc_dataparser.cpp \ release\moc_recognizesystem.cpp \ release\moc_tcpclient.cpp \ release\moc_mainwindow.cpp @@ -74,6 +75,7 @@ OBJECTS = release/updatecontroller.o \ release/mainwindow.o \ release/moc_updatecontroller.o \ release/moc_externalexecuter.o \ + release/moc_dataparser.o \ release/moc_recognizesystem.o \ release/moc_tcpclient.o \ release/moc_mainwindow.o @@ -118,7 +120,7 @@ dist: $(ZIP) RRJClient.zip $(SOURCES) $(DIST) RRJClient.pro D:\QT\5.14.2\mingw73_64\mkspecs\features\spec_pre.prf D:\QT\5.14.2\mingw73_64\mkspecs\qdevice.pri D:\QT\5.14.2\mingw73_64\mkspecs\features\device_config.prf D:\QT\5.14.2\mingw73_64\mkspecs\common\sanitize.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\gcc-base.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\g++-base.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\angle.conf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\windows_vulkan_sdk.prf D:\QT\5.14.2\mingw73_64\mkspecs\common\windows-vulkan.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\g++-win32.conf D:\QT\5.14.2\mingw73_64\mkspecs\common\windows-desktop.conf D:\QT\5.14.2\mingw73_64\mkspecs\qconfig.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_accessibility_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bodymovin_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bootstrap_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_charts.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_charts_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_datavisualization.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_datavisualization_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designercomponents_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_devicediscovery_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_edid_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_egl_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_eventdispatcher_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fb_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fontdatabase_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_networkauth.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_networkauth_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_packetprotocol_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_platformcompositor_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_purchasing.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_purchasing_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldebug_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldevtools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qtmultimediaquicktools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3d.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3d_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dassetimport.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dassetimport_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3drender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3drender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3druntimerender.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3druntimerender_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dutils.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick3dutils_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickparticles_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickshapes_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_script.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_script_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scripttools.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scripttools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_theme_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uiplugin.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_virtualkeyboard.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_virtualkeyboard_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_vulkan_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_windowsuiautomation_support_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\modules\qt_lib_zlib_private.pri D:\QT\5.14.2\mingw73_64\mkspecs\features\qt_functions.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qt_config.prf D:\QT\5.14.2\mingw73_64\mkspecs\win32-g++\qmake.conf D:\QT\5.14.2\mingw73_64\mkspecs\features\spec_post.prf .qmake.stash D:\QT\5.14.2\mingw73_64\mkspecs\features\exclusive_builds.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\toolchain.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\default_pre.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\default_pre.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\resolve_config.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\exclusive_builds_post.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\default_post.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\build_pass.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qml_debug.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\precompile_header.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\warn_on.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qt.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\resources_functions.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\resources.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\moc.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\opengl.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\uic.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\qmake_use.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\file_copies.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\win32\windows.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\testcase_targets.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\exceptions.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\yacc.prf D:\QT\5.14.2\mingw73_64\mkspecs\features\lex.prf RRJClient.pro D:\QT\5.14.2\mingw73_64\lib\Qt5Widgets.prl D:\QT\5.14.2\mingw73_64\lib\Qt5Gui.prl D:\QT\5.14.2\mingw73_64\lib\Qt5Network.prl D:\QT\5.14.2\mingw73_64\lib\Qt5Core.prl D:\QT\5.14.2\mingw73_64\lib\qtmain.prl D:\QT\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp Core\updatecontroller.h Core\externalexecuter.h Core\dataparser.h Core\FileData.h Core\recognizesystem.h Core\screenchecker.h Core\tcpclient.h Core\tools.h Datas.h mainwindow.h Core\updatecontroller.cpp Core\externalexecuter.cpp Core\dataparser.cpp Core\recognizesystem.cpp Core\screenchecker.cpp Core\tcpclient.cpp Core\tools.cpp main.cpp mainwindow.cpp mainwindow.ui clean: compiler_clean - -$(DEL_FILE) release\updatecontroller.o release\externalexecuter.o release\dataparser.o release\recognizesystem.o release\screenchecker.o release\tcpclient.o release\tools.o release\main.o release\mainwindow.o release\moc_updatecontroller.o release\moc_externalexecuter.o release\moc_recognizesystem.o release\moc_tcpclient.o release\moc_mainwindow.o + -$(DEL_FILE) release\updatecontroller.o release\externalexecuter.o release\dataparser.o release\recognizesystem.o release\screenchecker.o release\tcpclient.o release\tools.o release\main.o release\mainwindow.o release\moc_updatecontroller.o release\moc_externalexecuter.o release\moc_dataparser.o release\moc_recognizesystem.o release\moc_tcpclient.o release\moc_mainwindow.o distclean: clean -$(DEL_FILE) .qmake.stash @@ -143,9 +145,9 @@ compiler_moc_predefs_clean: release/moc_predefs.h: D:/QT/5.14.2/mingw73_64/mkspecs/features/data/dummy.cpp g++ -fno-keep-inline-dllexport -O2 -std=gnu++11 -Wall -Wextra -Wextra -dM -E -o release\moc_predefs.h D:\QT\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp -compiler_moc_header_make_all: release/moc_updatecontroller.cpp release/moc_externalexecuter.cpp release/moc_recognizesystem.cpp release/moc_tcpclient.cpp release/moc_mainwindow.cpp +compiler_moc_header_make_all: release/moc_updatecontroller.cpp release/moc_externalexecuter.cpp release/moc_dataparser.cpp release/moc_recognizesystem.cpp release/moc_tcpclient.cpp release/moc_mainwindow.cpp compiler_moc_header_clean: - -$(DEL_FILE) release\moc_updatecontroller.cpp release\moc_externalexecuter.cpp release\moc_recognizesystem.cpp release\moc_tcpclient.cpp release\moc_mainwindow.cpp + -$(DEL_FILE) release\moc_updatecontroller.cpp release\moc_externalexecuter.cpp release\moc_dataparser.cpp release\moc_recognizesystem.cpp release\moc_tcpclient.cpp release\moc_mainwindow.cpp release/moc_updatecontroller.cpp: Core/updatecontroller.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ @@ -194,11 +196,7 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Core/dataparser.h \ - Datas.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ @@ -208,10 +206,14 @@ release/moc_updatecontroller.cpp: Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -395,6 +397,74 @@ release/moc_externalexecuter.cpp: Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/bin/moc.exe D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\externalexecuter.h -o release\moc_externalexecuter.cpp +release/moc_dataparser.cpp: Core/dataparser.h \ + Core/FileData.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qalgorithms.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qglobal.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qconfig.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qtcore-config.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qsystemdetection.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qprocessordetection.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcompilerdetection.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qtypeinfo.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qsysinfo.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qlogging.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qflags.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qbasicatomic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic_bootstrap.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qgenericatomic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic_cxx11.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qatomic_msvc.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qglobalstatic.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qmutex.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiterator.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qrefcount.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qarraydata.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qhashfunctions.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstring.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qchar.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qbytearray.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringliteral.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringalgorithms.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringview.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringbuilder.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qpair.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qvector.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainertools_impl.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qpoint.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qbytearraylist.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringlist.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qregexp.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcoreevent.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qscopedpointer.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qmetatype.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ + release/moc_predefs.h \ + D:/QT/5.14.2/mingw73_64/bin/moc.exe + D:\QT\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include E:/Projects/QT/GUIProj/RRJClient/RRJClient/release/moc_predefs.h -ID:/QT/5.14.2/mingw73_64/mkspecs/win32-g++ -IE:/Projects/QT/GUIProj/RRJClient/RRJClient -ID:/QT/5.14.2/mingw73_64/include -ID:/QT/5.14.2/mingw73_64/include/QtWidgets -ID:/QT/5.14.2/mingw73_64/include/QtGui -ID:/QT/5.14.2/mingw73_64/include/QtANGLE -ID:/QT/5.14.2/mingw73_64/include/QtNetwork -ID:/QT/5.14.2/mingw73_64/include/QtCore -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include -ID:/QT/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed -ID:/QT/Tools/mingw730_32/i686-w64-mingw32/include Core\dataparser.h -o release\moc_dataparser.cpp + release/moc_recognizesystem.cpp: Core/recognizesystem.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ @@ -846,12 +916,12 @@ release/moc_mainwindow.cpp: mainwindow.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ Datas.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -970,11 +1040,7 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ Core/dataparser.h \ - Datas.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ @@ -984,10 +1050,14 @@ release/updatecontroller.o: Core/updatecontroller.cpp Core/updatecontroller.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -1166,7 +1236,8 @@ release/externalexecuter.o: Core/externalexecuter.cpp Core/externalexecuter.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qsharedpointer_impl.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\externalexecuter.o Core\externalexecuter.cpp -release/dataparser.o: Core/dataparser.cpp Core/FileData.h \ +release/dataparser.o: Core/dataparser.cpp Core/dataparser.h \ + Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/qlist.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qalgorithms.h \ @@ -1212,12 +1283,7 @@ release/dataparser.o: Core/dataparser.cpp Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qregexp.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ - Core/dataparser.h \ - Datas.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ @@ -1227,6 +1293,11 @@ release/dataparser.o: Core/dataparser.cpp Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Datas.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfile.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qfiledevice.h \ + D:/QT/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tools.h \ @@ -1861,12 +1932,12 @@ release/main.o: main.cpp mainwindow.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ Datas.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -2029,12 +2100,12 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ Core/FileData.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QList \ D:/QT/5.14.2/mingw73_64/include/QtCore/QString \ + D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ Datas.h \ D:/QT/5.14.2/mingw73_64/include/QtCore/QFile \ D:/QT/5.14.2/mingw73_64/include/QtCore/QXmlStreamWriter \ D:/QT/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ Core/tcpclient.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QObject \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ D:/QT/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ @@ -2077,42 +2148,7 @@ release/mainwindow.o: mainwindow.cpp mainwindow.h \ D:/QT/5.14.2/mingw73_64/include/QtGui/QGuiApplication \ D:/QT/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ D:/QT/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - ui_mainwindow.h \ - D:/QT/5.14.2/mingw73_64/include/QtCore/QVariant \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QHBoxLayout \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qboxlayout.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayout.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlayoutitem.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qgridlayout.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qpen.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QMenuBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qmenubar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qmenu.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qaction.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qactiongroup.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QProgressBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qprogressbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QStatusBar \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qstatusbar.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - D:/QT/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - D:/QT/5.14.2/mingw73_64/include/QtWidgets/QWidget + ui_mainwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\mainwindow.o mainwindow.cpp release/moc_updatecontroller.o: release/moc_updatecontroller.cpp @@ -2121,6 +2157,9 @@ release/moc_updatecontroller.o: release/moc_updatecontroller.cpp release/moc_externalexecuter.o: release/moc_externalexecuter.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_externalexecuter.o release\moc_externalexecuter.cpp +release/moc_dataparser.o: release/moc_dataparser.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_dataparser.o release\moc_dataparser.cpp + release/moc_recognizesystem.o: release/moc_recognizesystem.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_recognizesystem.o release\moc_recognizesystem.cpp diff --git a/RRJClient.pro b/RRJClient.pro index 9628214..ee8af3e 100644 --- a/RRJClient.pro +++ b/RRJClient.pro @@ -17,7 +17,7 @@ DEFINES += QT_DEPRECATED_WARNINGS #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 SOURCES += \ - Core/updatecontroller.cpp \ + Core\updatecontroller.cpp \ Core\externalexecuter.cpp\ Core\dataparser.cpp\ Core\recognizesystem.cpp\ @@ -28,7 +28,7 @@ SOURCES += \ mainwindow.cpp HEADERS += \ - Core/updatecontroller.h \ + Core\updatecontroller.h \ Core\externalexecuter.h\ Core\dataparser.h\ Core\FileData.h\ diff --git a/RRJClient.pro.user b/RRJClient.pro.user index 95e4156..29d05c8 100644 --- a/RRJClient.pro.user +++ b/RRJClient.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/authData.xml b/authData.xml new file mode 100644 index 0000000..38ab954 --- /dev/null +++ b/authData.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/dataparser.cpp b/dataparser.cpp deleted file mode 100644 index 1a5097b..0000000 --- a/dataparser.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "dataparser.h" - - -DataParser::DataParser() -{ - -} - diff --git a/dataparser.h b/dataparser.h deleted file mode 100644 index 85746ed..0000000 --- a/dataparser.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef DATAPARSER_H -#define DATAPARSER_H - -#include -#include -#include -#include - -#include "tools.h" -#include "Datas.h" - - - -class DataParser -{ -public: - DataParser(); - -}; - -#endif // DATAPARSER_H diff --git a/debug/RRJClient.exe b/debug/RRJClient.exe index 2afbc89..fe18d13 100644 Binary files a/debug/RRJClient.exe and b/debug/RRJClient.exe differ diff --git a/debug/UpdateController.o b/debug/UpdateController.o index 2e0c2c8..fa81a3f 100644 Binary files a/debug/UpdateController.o and b/debug/UpdateController.o differ diff --git a/debug/dataparser.o b/debug/dataparser.o index 5183942..5719d5e 100644 Binary files a/debug/dataparser.o and b/debug/dataparser.o differ diff --git a/debug/externalexecuter.o b/debug/externalexecuter.o index 3c0f9ef..3c3880a 100644 Binary files a/debug/externalexecuter.o and b/debug/externalexecuter.o differ diff --git a/debug/main.o b/debug/main.o index 64f95ee..8c739a7 100644 Binary files a/debug/main.o and b/debug/main.o differ diff --git a/debug/mainwindow.o b/debug/mainwindow.o index 23bfe0c..8cb1619 100644 Binary files a/debug/mainwindow.o and b/debug/mainwindow.o differ diff --git a/debug/moc_UpdateController.o b/debug/moc_UpdateController.o index 1dbf174..fdfbe88 100644 Binary files a/debug/moc_UpdateController.o and b/debug/moc_UpdateController.o differ diff --git a/debug/moc_dataparser.cpp b/debug/moc_dataparser.cpp new file mode 100644 index 0000000..206dc95 --- /dev/null +++ b/debug/moc_dataparser.cpp @@ -0,0 +1,95 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'dataparser.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include +#include "../Core/dataparser.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'dataparser.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.14.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_DataParser_t { + QByteArrayData data[1]; + char stringdata0[11]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_DataParser_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_DataParser_t qt_meta_stringdata_DataParser = { + { +QT_MOC_LITERAL(0, 0, 10) // "DataParser" + + }, + "DataParser" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_DataParser[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +void DataParser::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject DataParser::staticMetaObject = { { + QMetaObject::SuperData::link(), + qt_meta_stringdata_DataParser.data, + qt_meta_data_DataParser, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *DataParser::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *DataParser::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_DataParser.stringdata0)) + return static_cast(this); + return QObject::qt_metacast(_clname); +} + +int DataParser::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/debug/moc_dataparser.o b/debug/moc_dataparser.o new file mode 100644 index 0000000..ce45662 Binary files /dev/null and b/debug/moc_dataparser.o differ diff --git a/debug/moc_externalexecuter.o b/debug/moc_externalexecuter.o index 0e14b11..0c0a0e8 100644 Binary files a/debug/moc_externalexecuter.o and b/debug/moc_externalexecuter.o differ diff --git a/debug/moc_mainwindow.cpp b/debug/moc_mainwindow.cpp index 40193bc..f046cb5 100644 --- a/debug/moc_mainwindow.cpp +++ b/debug/moc_mainwindow.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[21]; - char stringdata0[363]; + QByteArrayData data[19]; + char stringdata0[329]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -35,37 +35,34 @@ static const qt_meta_stringdata_MainWindow_t qt_meta_stringdata_MainWindow = { QT_MOC_LITERAL(0, 0, 10), // "MainWindow" QT_MOC_LITERAL(1, 11, 18), // "onInitializeClient" QT_MOC_LITERAL(2, 30, 0), // "" -QT_MOC_LITERAL(3, 31, 17), // "UpdateController*" -QT_MOC_LITERAL(4, 49, 16), // "updateController" -QT_MOC_LITERAL(5, 66, 16), // "RecognizeSystem*" -QT_MOC_LITERAL(6, 83, 15), // "recognizeSystem" -QT_MOC_LITERAL(7, 99, 17), // "ExternalExecuter*" -QT_MOC_LITERAL(8, 117, 16), // "externalExecuter" -QT_MOC_LITERAL(9, 134, 12), // "onSetConnect" -QT_MOC_LITERAL(10, 147, 15), // "ServerSettings*" -QT_MOC_LITERAL(11, 163, 14), // "serverSettings" -QT_MOC_LITERAL(12, 178, 15), // "onCalculateHash" -QT_MOC_LITERAL(13, 194, 13), // "onSendMessage" -QT_MOC_LITERAL(14, 208, 7), // "message" -QT_MOC_LITERAL(15, 216, 22), // "on_loginButton_clicked" -QT_MOC_LITERAL(16, 239, 23), // "on_updateButton_clicked" -QT_MOC_LITERAL(17, 263, 22), // "on_startButton_clicked" -QT_MOC_LITERAL(18, 286, 27), // "on_saveServerButton_clicked" -QT_MOC_LITERAL(19, 314, 25), // "on_settingsButton_clicked" -QT_MOC_LITERAL(20, 340, 22) // "on_checkUpdate_clicked" +QT_MOC_LITERAL(3, 31, 16), // "RecognizeSystem*" +QT_MOC_LITERAL(4, 48, 15), // "recognizeSystem" +QT_MOC_LITERAL(5, 64, 17), // "ExternalExecuter*" +QT_MOC_LITERAL(6, 82, 16), // "externalExecuter" +QT_MOC_LITERAL(7, 99, 12), // "onSetConnect" +QT_MOC_LITERAL(8, 112, 15), // "ServerSettings*" +QT_MOC_LITERAL(9, 128, 14), // "serverSettings" +QT_MOC_LITERAL(10, 143, 15), // "onCalculateHash" +QT_MOC_LITERAL(11, 159, 23), // "SendClientAuthorization" +QT_MOC_LITERAL(12, 183, 13), // "onSendMessage" +QT_MOC_LITERAL(13, 197, 7), // "message" +QT_MOC_LITERAL(14, 205, 22), // "on_loginButton_clicked" +QT_MOC_LITERAL(15, 228, 23), // "on_updateButton_clicked" +QT_MOC_LITERAL(16, 252, 22), // "on_startButton_clicked" +QT_MOC_LITERAL(17, 275, 27), // "on_saveServerButton_clicked" +QT_MOC_LITERAL(18, 303, 25) // "on_settingsButton_clicked" }, "MainWindow\0onInitializeClient\0\0" - "UpdateController*\0updateController\0" "RecognizeSystem*\0recognizeSystem\0" "ExternalExecuter*\0externalExecuter\0" "onSetConnect\0ServerSettings*\0" "serverSettings\0onCalculateHash\0" - "onSendMessage\0message\0on_loginButton_clicked\0" + "SendClientAuthorization\0onSendMessage\0" + "message\0on_loginButton_clicked\0" "on_updateButton_clicked\0on_startButton_clicked\0" "on_saveServerButton_clicked\0" - "on_settingsButton_clicked\0" - "on_checkUpdate_clicked" + "on_settingsButton_clicked" }; #undef QT_MOC_LITERAL @@ -80,34 +77,34 @@ static const uint qt_meta_data_MainWindow[] = { 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 4, // signalCount + 5, // signalCount // signals: name, argc, parameters, tag, flags - 1, 3, 64, 2, 0x06 /* Public */, - 9, 1, 71, 2, 0x06 /* Public */, - 12, 0, 74, 2, 0x06 /* Public */, - 13, 1, 75, 2, 0x06 /* Public */, + 1, 2, 64, 2, 0x06 /* Public */, + 7, 1, 69, 2, 0x06 /* Public */, + 10, 0, 72, 2, 0x06 /* Public */, + 11, 0, 73, 2, 0x06 /* Public */, + 12, 1, 74, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags + 14, 0, 77, 2, 0x08 /* Private */, 15, 0, 78, 2, 0x08 /* Private */, 16, 0, 79, 2, 0x08 /* Private */, 17, 0, 80, 2, 0x08 /* Private */, 18, 0, 81, 2, 0x08 /* Private */, - 19, 0, 82, 2, 0x08 /* Private */, - 20, 0, 83, 2, 0x08 /* Private */, // signals: parameters - QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 0x80000000 | 7, 4, 6, 8, - QMetaType::Void, 0x80000000 | 10, 11, + QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 4, 6, + QMetaType::Void, 0x80000000 | 8, 9, QMetaType::Void, - QMetaType::Void, QMetaType::QString, 14, + QMetaType::Void, + QMetaType::Void, QMetaType::QString, 13, // slots: parameters QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Void, 0 // eod @@ -119,16 +116,16 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { - case 0: _t->onInitializeClient((*reinterpret_cast< UpdateController*(*)>(_a[1])),(*reinterpret_cast< RecognizeSystem*(*)>(_a[2])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[3]))); break; + case 0: _t->onInitializeClient((*reinterpret_cast< RecognizeSystem*(*)>(_a[1])),(*reinterpret_cast< ExternalExecuter*(*)>(_a[2]))); break; case 1: _t->onSetConnect((*reinterpret_cast< ServerSettings*(*)>(_a[1]))); break; case 2: _t->onCalculateHash(); break; - case 3: _t->onSendMessage((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 4: _t->on_loginButton_clicked(); break; - case 5: _t->on_updateButton_clicked(); break; - case 6: _t->on_startButton_clicked(); break; - case 7: _t->on_saveServerButton_clicked(); break; - case 8: _t->on_settingsButton_clicked(); break; - case 9: _t->on_checkUpdate_clicked(); break; + case 3: _t->SendClientAuthorization(); break; + case 4: _t->onSendMessage((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 5: _t->on_loginButton_clicked(); break; + case 6: _t->on_updateButton_clicked(); break; + case 7: _t->on_startButton_clicked(); break; + case 8: _t->on_saveServerButton_clicked(); break; + case 9: _t->on_settingsButton_clicked(); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -137,19 +134,17 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 0: switch (*reinterpret_cast(_a[1])) { default: *reinterpret_cast(_a[0]) = -1; break; - case 2: - *reinterpret_cast(_a[0]) = qRegisterMetaType< ExternalExecuter* >(); break; case 1: - *reinterpret_cast(_a[0]) = qRegisterMetaType< RecognizeSystem* >(); break; + *reinterpret_cast(_a[0]) = qRegisterMetaType< ExternalExecuter* >(); break; case 0: - *reinterpret_cast(_a[0]) = qRegisterMetaType< UpdateController* >(); break; + *reinterpret_cast(_a[0]) = qRegisterMetaType< RecognizeSystem* >(); break; } break; } } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { - using _t = void (MainWindow::*)(UpdateController * , RecognizeSystem * , ExternalExecuter * ); + using _t = void (MainWindow::*)(RecognizeSystem * , ExternalExecuter * ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onInitializeClient)) { *result = 0; return; @@ -169,10 +164,17 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, return; } } + { + using _t = void (MainWindow::*)(); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::SendClientAuthorization)) { + *result = 3; + return; + } + } { using _t = void (MainWindow::*)(QString ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&MainWindow::onSendMessage)) { - *result = 3; + *result = 4; return; } } @@ -220,9 +222,9 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) } // SIGNAL 0 -void MainWindow::onInitializeClient(UpdateController * _t1, RecognizeSystem * _t2, ExternalExecuter * _t3) +void MainWindow::onInitializeClient(RecognizeSystem * _t1, ExternalExecuter * _t2) { - void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))), const_cast(reinterpret_cast(std::addressof(_t3))) }; + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); } @@ -240,10 +242,16 @@ void MainWindow::onCalculateHash() } // SIGNAL 3 +void MainWindow::SendClientAuthorization() +{ + QMetaObject::activate(this, &staticMetaObject, 3, nullptr); +} + +// SIGNAL 4 void MainWindow::onSendMessage(QString _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; - QMetaObject::activate(this, &staticMetaObject, 3, _a); + QMetaObject::activate(this, &staticMetaObject, 4, _a); } QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/debug/moc_mainwindow.o b/debug/moc_mainwindow.o index 409bbd2..6484d54 100644 Binary files a/debug/moc_mainwindow.o and b/debug/moc_mainwindow.o differ diff --git a/debug/moc_recognizesystem.cpp b/debug/moc_recognizesystem.cpp index 8090d65..3e27ee4 100644 --- a/debug/moc_recognizesystem.cpp +++ b/debug/moc_recognizesystem.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_RecognizeSystem_t { - QByteArrayData data[11]; - char stringdata0[119]; + QByteArrayData data[16]; + char stringdata0[197]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -42,12 +42,20 @@ QT_MOC_LITERAL(6, 63, 12), // "onNeedUpdate" QT_MOC_LITERAL(7, 76, 4), // "flag" QT_MOC_LITERAL(8, 81, 14), // "onSendDebugLog" QT_MOC_LITERAL(9, 96, 7), // "message" -QT_MOC_LITERAL(10, 104, 14) // "SockedDisabled" +QT_MOC_LITERAL(10, 104, 14), // "SockedDisabled" +QT_MOC_LITERAL(11, 119, 13), // "SaveLoginData" +QT_MOC_LITERAL(12, 133, 20), // "ServerAuthorization*" +QT_MOC_LITERAL(13, 154, 10), // "serverAuth" +QT_MOC_LITERAL(14, 165, 22), // "SocketWaitForReadyRead" +QT_MOC_LITERAL(15, 188, 8) // "waitTime" }, "RecognizeSystem\0UpdateBytesAvailable\0" "\0size\0sended\0LoadComplete\0onNeedUpdate\0" - "flag\0onSendDebugLog\0message\0SockedDisabled" + "flag\0onSendDebugLog\0message\0SockedDisabled\0" + "SaveLoginData\0ServerAuthorization*\0" + "serverAuth\0SocketWaitForReadyRead\0" + "waitTime" }; #undef QT_MOC_LITERAL @@ -57,19 +65,21 @@ static const uint qt_meta_data_RecognizeSystem[] = { 8, // revision 0, // classname 0, 0, // classinfo - 5, 14, // methods + 7, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 5, // signalCount + 7, // signalCount // signals: name, argc, parameters, tag, flags - 1, 2, 39, 2, 0x06 /* Public */, - 5, 0, 44, 2, 0x06 /* Public */, - 6, 1, 45, 2, 0x06 /* Public */, - 8, 1, 48, 2, 0x06 /* Public */, - 10, 0, 51, 2, 0x06 /* Public */, + 1, 2, 49, 2, 0x06 /* Public */, + 5, 0, 54, 2, 0x06 /* Public */, + 6, 1, 55, 2, 0x06 /* Public */, + 8, 1, 58, 2, 0x06 /* Public */, + 10, 0, 61, 2, 0x06 /* Public */, + 11, 1, 62, 2, 0x06 /* Public */, + 14, 1, 65, 2, 0x06 /* Public */, // signals: parameters QMetaType::Void, QMetaType::LongLong, QMetaType::ULongLong, 3, 4, @@ -77,6 +87,8 @@ static const uint qt_meta_data_RecognizeSystem[] = { QMetaType::Void, QMetaType::Bool, 7, QMetaType::Void, QMetaType::QString, 9, QMetaType::Void, + QMetaType::Void, 0x80000000 | 12, 13, + QMetaType::Void, QMetaType::Int, 15, 0 // eod }; @@ -92,6 +104,8 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 2: _t->onNeedUpdate((*reinterpret_cast< bool(*)>(_a[1]))); break; case 3: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break; case 4: _t->SockedDisabled(); break; + case 5: _t->SaveLoginData((*reinterpret_cast< ServerAuthorization*(*)>(_a[1]))); break; + case 6: _t->SocketWaitForReadyRead((*reinterpret_cast< int(*)>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -131,6 +145,20 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int return; } } + { + using _t = void (RecognizeSystem::*)(ServerAuthorization * ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::SaveLoginData)) { + *result = 5; + return; + } + } + { + using _t = void (RecognizeSystem::*)(int ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::SocketWaitForReadyRead)) { + *result = 6; + return; + } + } } } @@ -163,13 +191,13 @@ int RecognizeSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 5) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 5; + _id -= 7; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 5) + if (_id < 7) *reinterpret_cast(_a[0]) = -1; - _id -= 5; + _id -= 7; } return _id; } @@ -206,5 +234,19 @@ void RecognizeSystem::SockedDisabled() { QMetaObject::activate(this, &staticMetaObject, 4, nullptr); } + +// SIGNAL 5 +void RecognizeSystem::SaveLoginData(ServerAuthorization * _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 5, _a); +} + +// SIGNAL 6 +void RecognizeSystem::SocketWaitForReadyRead(int _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 6, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/debug/moc_recognizesystem.o b/debug/moc_recognizesystem.o index bd23d66..b17c891 100644 Binary files a/debug/moc_recognizesystem.o and b/debug/moc_recognizesystem.o differ diff --git a/debug/moc_tcpclient.cpp b/debug/moc_tcpclient.cpp index 0cb2395..8ec2e21 100644 --- a/debug/moc_tcpclient.cpp +++ b/debug/moc_tcpclient.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_TCPClient_t { - QByteArrayData data[6]; - char stringdata0[61]; + QByteArrayData data[9]; + char stringdata0[90]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -36,11 +36,15 @@ QT_MOC_LITERAL(0, 0, 9), // "TCPClient" QT_MOC_LITERAL(1, 10, 14), // "onSendDebugLog" QT_MOC_LITERAL(2, 25, 0), // "" QT_MOC_LITERAL(3, 26, 7), // "message" -QT_MOC_LITERAL(4, 34, 14), // "MessageEntered" -QT_MOC_LITERAL(5, 49, 11) // "onReadyRead" +QT_MOC_LITERAL(4, 34, 9), // "Recognize" +QT_MOC_LITERAL(5, 44, 11), // "QTcpSocket*" +QT_MOC_LITERAL(6, 56, 6), // "socket" +QT_MOC_LITERAL(7, 63, 14), // "MessageEntered" +QT_MOC_LITERAL(8, 78, 11) // "onReadyRead" }, "TCPClient\0onSendDebugLog\0\0message\0" + "Recognize\0QTcpSocket*\0socket\0" "MessageEntered\0onReadyRead" }; #undef QT_MOC_LITERAL @@ -51,22 +55,24 @@ static const uint qt_meta_data_TCPClient[] = { 8, // revision 0, // classname 0, 0, // classinfo - 3, 14, // methods + 4, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 1, // signalCount + 2, // signalCount // signals: name, argc, parameters, tag, flags - 1, 1, 29, 2, 0x06 /* Public */, + 1, 1, 34, 2, 0x06 /* Public */, + 4, 1, 37, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 4, 1, 32, 2, 0x0a /* Public */, - 5, 0, 35, 2, 0x08 /* Private */, + 7, 1, 40, 2, 0x0a /* Public */, + 8, 0, 43, 2, 0x08 /* Private */, // signals: parameters QMetaType::Void, QMetaType::QString, 3, + QMetaType::Void, 0x80000000 | 5, 6, // slots: parameters QMetaType::Void, QMetaType::QString, 3, @@ -82,10 +88,22 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v Q_UNUSED(_t) switch (_id) { case 0: _t->onSendDebugLog((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 1: _t->MessageEntered((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 2: _t->onReadyRead(); break; + case 1: _t->Recognize((*reinterpret_cast< QTcpSocket*(*)>(_a[1]))); break; + case 2: _t->MessageEntered((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 3: _t->onReadyRead(); break; default: ; } + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + switch (_id) { + default: *reinterpret_cast(_a[0]) = -1; break; + case 1: + switch (*reinterpret_cast(_a[1])) { + default: *reinterpret_cast(_a[0]) = -1; break; + case 0: + *reinterpret_cast(_a[0]) = qRegisterMetaType< QTcpSocket* >(); break; + } + break; + } } else if (_c == QMetaObject::IndexOfMethod) { int *result = reinterpret_cast(_a[0]); { @@ -95,6 +113,13 @@ void TCPClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v return; } } + { + using _t = void (TCPClient::*)(QTcpSocket * ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&TCPClient::Recognize)) { + *result = 1; + return; + } + } } } @@ -127,13 +152,13 @@ int TCPClient::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) + if (_id < 4) qt_static_metacall(this, _c, _id, _a); - _id -= 3; + _id -= 4; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 3) - *reinterpret_cast(_a[0]) = -1; - _id -= 3; + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; } return _id; } @@ -144,5 +169,12 @@ void TCPClient::onSendDebugLog(QString _t1) void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); } + +// SIGNAL 1 +void TCPClient::Recognize(QTcpSocket * _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 1, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/debug/moc_tcpclient.o b/debug/moc_tcpclient.o index b63bd74..45f444a 100644 Binary files a/debug/moc_tcpclient.o and b/debug/moc_tcpclient.o differ diff --git a/debug/recognizesystem.o b/debug/recognizesystem.o index 98b6d90..08fe712 100644 Binary files a/debug/recognizesystem.o and b/debug/recognizesystem.o differ diff --git a/debug/tcpclient.o b/debug/tcpclient.o index 36bd022..1be312b 100644 Binary files a/debug/tcpclient.o and b/debug/tcpclient.o differ diff --git a/debug/tools.o b/debug/tools.o index c590d8e..6b9bfc4 100644 Binary files a/debug/tools.o and b/debug/tools.o differ diff --git a/hash.xml b/hash.xml index 07d3455..267fb0d 100644 --- a/hash.xml +++ b/hash.xml @@ -2,196 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main.cpp b/main.cpp index e127771..fd3e533 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,5 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; w.show(); - qDebug() << "WhatsUP"; return a.exec(); } diff --git a/mainwindow.cpp b/mainwindow.cpp index d56c4e1..5c6b407 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -16,8 +16,15 @@ void MainWindow::Initialize() { ui->settingsWidget->hide(); + ui->notificationLabel->hide(); + ui->loadingProgressBar->hide(); + ui->updateButton->hide(); + ui->startButton->setEnabled(false); + updateControllerThread = new QThread; + updateControllerThread->setPriority(QThread::LowPriority); connectionThread = new QThread; + connectionThread->setPriority(QThread::HighestPriority); client = new TCPClient; client->moveToThread(connectionThread); @@ -32,23 +39,27 @@ void MainWindow::Initialize() externalExecuter = new ExternalExecuter; connect(recognizeSystem,&RecognizeSystem::UpdateBytesAvailable,this,&MainWindow::UpdateProgress); - connect(recognizeSystem, &RecognizeSystem::LoadComplete,this,&MainWindow::LoadComplete); + connect(recognizeSystem,&RecognizeSystem::LoadComplete,this,&MainWindow::LoadComplete); connect(recognizeSystem,&RecognizeSystem::onNeedUpdate,this,&MainWindow::SetNeedUpdate); - connect(recognizeSystem, &RecognizeSystem::onSendDebugLog,this,&MainWindow::DebugLog); - connect(recognizeSystem, &RecognizeSystem::SockedDisabled,this,&MainWindow::LostConnection); + connect(recognizeSystem,&RecognizeSystem::onSendDebugLog,this,&MainWindow::DebugLog); + connect(recognizeSystem,&RecognizeSystem::SockedDisabled,this,&MainWindow::LostConnection); + connect(recognizeSystem,&RecognizeSystem::SaveLoginData,this,&MainWindow::CheckLoginResult); + connect(recognizeSystem,&RecognizeSystem::SocketWaitForReadyRead,client,&TCPClient::WaitRead); + + connectionThread->start(); + updateControllerThread->start(); connect(client,&TCPClient::onSendDebugLog,this,&MainWindow::DebugLog); connect(this,&MainWindow::onInitializeClient,client,&TCPClient::Initialize); connect(this,&MainWindow::onSetConnect,client,&TCPClient::SetConnect); connect(this,&MainWindow::onSendMessage,client,&TCPClient::MessageEntered); + connect(this,&MainWindow::SendClientAuthorization,client,&TCPClient::SendClientAutorization); + connect(this,&MainWindow::onCalculateHash,updateController,&UpdateController::CalculateHash); - connectionThread->start(); - updateControllerThread->start(); - emit onCalculateHash(); - emit onInitializeClient(updateController,recognizeSystem,externalExecuter); + emit onInitializeClient(recognizeSystem,externalExecuter); recognizeSystem->Initialize(updateController,dataParser); @@ -62,6 +73,7 @@ void MainWindow::Initialize() emit onSetConnect(dataParser->GetServerSettings()); + CheckAppAvailable(); } void MainWindow::UpdateProgress(qint64 size,quint64 sended) @@ -93,6 +105,28 @@ void MainWindow::LostConnection() } +void MainWindow::CheckLoginResult(ServerAuthorization *serverAuth) +{ + if (serverAuth->Result){ + emit onSendMessage("check"); + ui->loadingProgressBar->show(); + ui->updateButton->show(); + dataParser->CreateAuthData(serverAuth); + + } + else { + ui->notificationLabel->setText("Неверный логин/пароль"); + ui->notificationLabel->show(); + } + +} + +void MainWindow::CheckAppAvailable() +{ + bool isAvailable = externalExecuter->FindApp(); + ui->startButton->setEnabled(isAvailable); +} + void MainWindow::on_loginButton_clicked() { @@ -104,7 +138,7 @@ void MainWindow::on_loginButton_clicked() autorization->Password = password; dataParser->CreateAuthMessage(autorization); - client->SendClientAutorization(); + emit SendClientAuthorization(); } void MainWindow::on_updateButton_clicked() @@ -154,12 +188,11 @@ MainWindow::~MainWindow() connectionThread->quit(); connectionThread->wait(); + updateControllerThread->quit(); + updateControllerThread->wait(); + delete connectionThread; + delete updateControllerThread; delete ui; } - -void MainWindow::on_checkUpdate_clicked() -{ - emit onSendMessage("check"); -} diff --git a/mainwindow.h b/mainwindow.h index 4ad5c41..de65a1d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -29,12 +29,12 @@ public: ~MainWindow(); signals: - void onInitializeClient(UpdateController *updateController, - RecognizeSystem *recognizeSystem, + void onInitializeClient(RecognizeSystem *recognizeSystem, ExternalExecuter *externalExecuter); void onSetConnect(ServerSettings* serverSettings); void onCalculateHash(); + void SendClientAuthorization(); void onSendMessage(QString message); private slots: @@ -48,8 +48,6 @@ private slots: void on_settingsButton_clicked(); - void on_checkUpdate_clicked(); - private: Ui::MainWindow *ui; TCPClient *client; @@ -68,5 +66,7 @@ private: void LoadComplete(); void SetNeedUpdate(bool flag); void LostConnection(); + void CheckLoginResult(ServerAuthorization * serverAuth); + void CheckAppAvailable(); }; #endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui index 71f2bfe..8bd2fbb 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -99,6 +99,19 @@ + + + + 100 + 50 + 191 + 24 + + + + Неверный логин/пароль + + @@ -202,6 +215,9 @@ + + true + Запуск @@ -245,25 +261,11 @@ - - - - 10 - 440 - 161 - 25 - - - - Проверить обновления - - - layoutWidget - layoutWidget settingsWidget + layoutWidget + layoutWidget loginWidget debugText - checkUpdate diff --git a/object_script.RRJClient.Debug b/object_script.RRJClient.Debug index 2192188..28d46a8 100644 --- a/object_script.RRJClient.Debug +++ b/object_script.RRJClient.Debug @@ -9,6 +9,7 @@ debug/main.o debug/mainwindow.o debug/moc_updatecontroller.o debug/moc_externalexecuter.o +debug/moc_dataparser.o debug/moc_recognizesystem.o debug/moc_tcpclient.o debug/moc_mainwindow.o diff --git a/object_script.RRJClient.Release b/object_script.RRJClient.Release index e59e7a3..ed05ee8 100644 --- a/object_script.RRJClient.Release +++ b/object_script.RRJClient.Release @@ -9,6 +9,7 @@ release/main.o release/mainwindow.o release/moc_updatecontroller.o release/moc_externalexecuter.o +release/moc_dataparser.o release/moc_recognizesystem.o release/moc_tcpclient.o release/moc_mainwindow.o diff --git a/settings.xml b/settings.xml index 0e18607..6ef37e2 100644 --- a/settings.xml +++ b/settings.xml @@ -1,4 +1,4 @@ - + diff --git a/temp.xml b/temp.xml index 88e16c7..1a076a1 100644 --- a/temp.xml +++ b/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/ui_mainwindow.h b/ui_mainwindow.h index 0821ff2..37eed3b 100644 --- a/ui_mainwindow.h +++ b/ui_mainwindow.h @@ -41,6 +41,7 @@ public: QHBoxLayout *loginButtonsLayout; QPushButton *settingsButton; QPushButton *loginButton; + QLineEdit *notificationLabel; QWidget *settingsWidget; QPushButton *saveServerButton; QWidget *layoutWidget_4; @@ -61,7 +62,6 @@ public: QLabel *displayCountTitle; QLabel *disblayCount; QTextEdit *debugText; - QPushButton *checkUpdate; QMenuBar *menubar; QStatusBar *statusbar; @@ -125,6 +125,9 @@ public: loginButtonsLayout->addWidget(loginButton); + notificationLabel = new QLineEdit(loginWidget); + notificationLabel->setObjectName(QString::fromUtf8("notificationLabel")); + notificationLabel->setGeometry(QRect(100, 50, 191, 24)); settingsWidget = new QWidget(centralwidget); settingsWidget->setObjectName(QString::fromUtf8("settingsWidget")); settingsWidget->setEnabled(true); @@ -185,6 +188,7 @@ public: startButton = new QPushButton(layoutWidget3); startButton->setObjectName(QString::fromUtf8("startButton")); + startButton->setEnabled(true); downLayout->addWidget(startButton); @@ -207,16 +211,12 @@ public: debugText = new QTextEdit(centralwidget); debugText->setObjectName(QString::fromUtf8("debugText")); debugText->setGeometry(QRect(630, 10, 341, 461)); - checkUpdate = new QPushButton(centralwidget); - checkUpdate->setObjectName(QString::fromUtf8("checkUpdate")); - checkUpdate->setGeometry(QRect(10, 440, 161, 25)); MainWindow->setCentralWidget(centralwidget); - layoutWidget4->raise(); - layoutWidget4->raise(); settingsWidget->raise(); + layoutWidget4->raise(); + layoutWidget4->raise(); loginWidget->raise(); debugText->raise(); - checkUpdate->raise(); menubar = new QMenuBar(MainWindow); menubar->setObjectName(QString::fromUtf8("menubar")); menubar->setGeometry(QRect(0, 0, 993, 25)); @@ -237,6 +237,7 @@ public: passwordTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\260\321\200\320\276\320\273\321\214:", nullptr)); settingsButton->setText(QCoreApplication::translate("MainWindow", "\320\235\320\260\321\201\321\202\321\200\320\276\320\271\320\272\320\270", nullptr)); loginButton->setText(QCoreApplication::translate("MainWindow", "\320\222\320\276\320\271\321\202\320\270", nullptr)); + notificationLabel->setText(QCoreApplication::translate("MainWindow", "\320\235\320\265\320\262\320\265\321\200\320\275\321\213\320\271 \320\273\320\276\320\263\320\270\320\275/\320\277\320\260\321\200\320\276\320\273\321\214", nullptr)); saveServerButton->setText(QCoreApplication::translate("MainWindow", "\320\241\320\276\321\205\321\200\320\260\320\275\320\270\321\202\321\214", nullptr)); serverTitle->setText(QCoreApplication::translate("MainWindow", "\320\241\320\265\321\200\320\262\320\265\321\200:", nullptr)); portTitle->setText(QCoreApplication::translate("MainWindow", "\320\237\320\276\321\200\321\202:", nullptr)); @@ -244,7 +245,6 @@ public: startButton->setText(QCoreApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\320\272", nullptr)); displayCountTitle->setText(QCoreApplication::translate("MainWindow", "\320\224\320\276\321\201\321\202\321\203\320\277\320\275\320\276 \320\274\320\276\320\275\320\270\321\202\320\276\321\200\320\276\320\262: ", nullptr)); disblayCount->setText(QCoreApplication::translate("MainWindow", "0", nullptr)); - checkUpdate->setText(QCoreApplication::translate("MainWindow", "\320\237\321\200\320\276\320\262\320\265\321\200\320\270\321\202\321\214 \320\276\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\321\217", nullptr)); } // retranslateUi };