Download as
Browse Code »

Commit 0135fa4addda65045a87204ed777447dbe79d491

Authored by Thiago Rocha
1 parent 4e974e9c
Exists in master

Alteracao do include do cacic_comm no install-cacic.

Showing 3 changed files with 9 additions and 5 deletions   Show diff stats
install-cacic/install-cacic.pro
  Diff comments   View file @0135fa4
@@ -25,6 +25,7 @@ TEMPLATE = app @@ -25,6 +25,7 @@ TEMPLATE = app
25 SOURCES += main.cpp \ 25 SOURCES += main.cpp \
26 installcacic.cpp \ 26 installcacic.cpp \
27 ../src/ccacic.cpp \ 27 ../src/ccacic.cpp \
  28 + ../src/cacic_comm.cpp \
28 ../src/cacic_computer.cpp \ 29 ../src/cacic_computer.cpp \
29 ../src/operatingsystem.cpp \ 30 ../src/operatingsystem.cpp \
30 ../src/wmi.cpp \ 31 ../src/wmi.cpp \
install-cacic/installcacic.cpp
  Diff comments   View file @0135fa4
@@ -10,15 +10,18 @@ InstallCacic::InstallCacic(QObject *parent) : @@ -10,15 +10,18 @@ InstallCacic::InstallCacic(QObject *parent) :
10 void InstallCacic::run(QStringList argv, int argc) { 10 void InstallCacic::run(QStringList argv, int argc) {
11 11
12 QLogger::QLog_Debug("Install", "Inicio de instalacao"); 12 QLogger::QLog_Debug("Install", "Inicio de instalacao");
  13 +
  14 + oCacicComm = new CacicComm();
  15 +
13 bool ok; 16 bool ok;
14 //valida os parametros repassados 17 //valida os parametros repassados
15 QMap<QString, QString> param = validaParametros(argv, argc, &ok); 18 QMap<QString, QString> param = validaParametros(argv, argc, &ok);
16 //se tiver usuario, senha e url 19 //se tiver usuario, senha e url
17 if (ok){ 20 if (ok){
18 - oCacicComm.setUrlGerente(this->argumentos["host"]);  
19 - oCacicComm.setUsuario(this->argumentos["user"]);  
20 - oCacicComm.setPassword(this->argumentos["password"]);  
21 - QJsonObject jsonLogin = oCacicComm.login(&ok); 21 + oCacicComm->setUrlGerente(this->argumentos["host"]);
  22 + oCacicComm->setUsuario(this->argumentos["user"]);
  23 + oCacicComm->setPassword(this->argumentos["password"]);
  24 + QJsonObject jsonLogin = oCacicComm->login(&ok);
22 if (ok){ 25 if (ok){
23 //conectado, grava a chave na classe; 26 //conectado, grava a chave na classe;
24 oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString()); 27 oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
install-cacic/installcacic.h
  Diff comments   View file @0135fa4
@@ -23,7 +23,7 @@ public: @@ -23,7 +23,7 @@ public:
23 void registro(); 23 void registro();
24 private: 24 private:
25 QMap<QString, QString> argumentos; 25 QMap<QString, QString> argumentos;
26 - CacicComm oCacicComm; 26 + CacicComm *oCacicComm;
27 CACIC_Computer oCacicComputer; 27 CACIC_Computer oCacicComputer;
28 CCacic oCacic; 28 CCacic oCacic;
29 QLogger::QLoggerManager *logManager; 29 QLogger::QLoggerManager *logManager;