diff --git a/cacic-teste/cacic-teste.pro b/cacic-teste/cacic-teste.pro index 27dfa96..f2b28d8 100644 --- a/cacic-teste/cacic-teste.pro +++ b/cacic-teste/cacic-teste.pro @@ -23,6 +23,7 @@ SOURCES += \ ../src/cacic_computer.cpp \ ../src/operatingsystem.cpp \ ../src/cacic_software.cpp \ + ../src/cacic_hardware.cpp \ # ../src/qtservice/src/qtservice.cpp \ # ../src/qtservice/src/qtservice_unix.cpp \ # ../src/qtservice/src/qtservice_win.cpp \ @@ -38,10 +39,12 @@ HEADERS += \ ../src/console.h \ ../src/operatingsystem.h \ ../src/cacic_software.h \ + ../src/cacic_hardware.h \ # ../src/qtservice/src/qtservice.h \ # ../src/qtservice/src/qtservice_p.h \ # ../src/qtservice/src/qtunixserversocket.h \ # ../src/qtservice/src/qtunixsocket.h + ../src/cacic_hardware.h INCLUDEPATH += ../src \ ../src/crypto++/include/ diff --git a/gercols/gercols.pro b/gercols/gercols.pro index 59ef618..a28e681 100644 --- a/gercols/gercols.pro +++ b/gercols/gercols.pro @@ -26,6 +26,7 @@ SOURCES += \ ../src/ccacic.cpp \ ../src/cacic_computer.cpp \ ../src/cacic_software.cpp \ + ../src/cacic_hardware.cpp \ ../src/operatingsystem.cpp \ ../src/ccoleta.cpp \ ./gercols.cpp @@ -35,10 +36,12 @@ HEADERS += \ ../src/ccacic.h \ ../src/cacic_computer.h \ ../src/cacic_software.h \ + ../src/cacic_hardware.h \ ../src/operatingsystem.h \ ../src/console.h \ ../src/ccoleta.h \ - ./gercols.h + ./gercols.h \ + ../src/cacic_hardware.h INCLUDEPATH += ../src \ ../src/crypto++/include/ diff --git a/src/cacic_hardware.cpp b/src/cacic_hardware.cpp new file mode 100644 index 0000000..8a350ab --- /dev/null +++ b/src/cacic_hardware.cpp @@ -0,0 +1,28 @@ +#include "cacic_hardware.h" + +cacic_hardware::cacic_hardware() +{ +} + +void cacic_hardware::iniciaColeta() +{ +#ifdef Q_OS_WIN + this->coletaHardware = coletaWin(); +#elif defined(Q_OS_LINUX) + this->coletaHardware = coletaLinux(); + +#endif +} + +QJsonObject cacic_hardware::coletaWin() +{ +#if defined(Q_OS_WIN) + // Implementação seguindo as definições na documentação WMI. +#endif + return QJsonObject(); +} + +QJsonObject cacic_hardware::coletaLinux() +{ + return QJsonObject(); +} diff --git a/src/cacic_hardware.h b/src/cacic_hardware.h new file mode 100644 index 0000000..bc4e2c4 --- /dev/null +++ b/src/cacic_hardware.h @@ -0,0 +1,33 @@ +#ifndef CACIC_HARDWARE_H +#define CACIC_HARDWARE_H +#include +#include +#include +#include + +#if defined(Q_OS_WIN) + #define _WIN32_DCOM + #include + //using namespace std; + #include + #include + # pragma comment(lib, "wbemuuid.lib") + +#endif + +class cacic_hardware +{ +public: + cacic_hardware(); + void iniciaColeta(); + QJsonObject toJsonObject(); + +private: + QJsonObject coletaWin(); + QJsonObject coletaLinux(); + + CCacic oCacic; + QJsonObject coletaHardware; +}; + +#endif // CACIC_HARDWARE_H diff --git a/src/ccoleta.cpp b/src/ccoleta.cpp index 8e5c676..4be5478 100644 --- a/src/ccoleta.cpp +++ b/src/ccoleta.cpp @@ -34,6 +34,11 @@ cacic_software CColeta::getOSoftware() const return oSoftware; } +cacic_hardware CColeta::getOHardware() const +{ + return oHardware; +} + void CColeta::run() { QJsonObject coleta = oCacic.getJsonFromFile("configReq.json"); diff --git a/src/ccoleta.h b/src/ccoleta.h index 7874173..838f943 100644 --- a/src/ccoleta.h +++ b/src/ccoleta.h @@ -7,6 +7,7 @@ #include #include #include +#include class CColeta : public QObject @@ -17,12 +18,14 @@ private: CCacic oCacic; CACIC_Computer oComputer; cacic_software oSoftware; + cacic_hardware oHardware; public: explicit CColeta(QObject *parent = 0); CACIC_Computer getOComputer() const; cacic_software getOSoftware() const; + cacic_hardware getOHardware() const; QJsonObject toJsonObject(); -- libgit2 0.21.2