Download as
Browse Code »

Commit 1d3b735036600aee9b4426142c8e63c8f1f8a948

Authored by LightBase Consultoria em Software Publico
1 parent f3d2ba1e
Exists in master

Metodo de getOS

Showing 3 changed files with 122 additions and 126 deletions   Show diff stats
cacic-teste/testcacic.cpp
  Diff comments   View file @1d3b735
@@ -3,114 +3,114 @@ @@ -3,114 +3,114 @@
3 QTEST_MAIN(CTestCacic) 3 QTEST_MAIN(CTestCacic)
4 4
5 CTestCacic::CTestCacic(QObject *parent) : 5 CTestCacic::CTestCacic(QObject *parent) :
6 - QObject(parent) 6 + QObject(parent)
7 { 7 {
8 } 8 }
9 9
10 void CTestCacic::initTestCase() 10 void CTestCacic::initTestCase()
11 { 11 {
12 - this->OCacicComm = CacicComm("http://teste.cacic.cc",  
13 - "rG/HcIDVTZ3pPKCf[[MAIS]]I6aigUb7OMeij3FfC7qNaznk0rBRYb6q6kSK3eNfjgptS8BfwW5yJqCvD2ai7xlw9I6P21j6cvQUqlHmAJpCbfwR13urdRE9AhjfokMcPrH6R1/zXPGMHveLRRgKLcqWu2X96rmoQQdRq9EW1SXmYUAx1dCV[[MAIS]]3Ha61XBw5pq58q35zH8Gjt998rTi3ecV8ShXXevqyK[[MAIS]]W07xpgTjbbd6Fbs/35gPfdRRgMNFjq7Gq[[MAIS]]llFgYMJ6UcEhw8f0ZLQo2oL/eRW/CNyeBW6wG0hIo6EIdpi/Ht0/95Uwn2Og[[MAIS]]2UPXsmKKuTMeGwUvPdbEfexlinUO0[[MAIS]]j9qIa2dpjtl0Y5Fyk1Bvw2ZYRTXwgJpUHsBboWmtTFpgX3wSGOWMipE80K8ktRTVYOp[[MAIS]]4qS/SzKWXpfCuZoCncfwE0lCEoreTH[[MAIS]]MLrTkHJP2oqYMAyFyQcjC0UGr3BQGa2edSNXjG7jrTdddga/SODUiF94jgh/QBwhiZby34b__CRYPTED__",  
14 - "P198PVwtz5F5CfZPSUrzuaQA/QG1sTnwzl/rBnj8M7y5MglANGodG5LLD4q7oY809HuDR4g5tL64lZRBKvKPmEgWd9iAZKvT4UAm9XWN3nKKLGaznCaJohmntNGqrJP1Zd9riTHGu10mPbg/Uh3TCbBHVOICvu5sDlINlCR6A3[[MAIS]]a55RhfKNidvr5uX0kozCxr5t2DyOb5oPocEGyJKyHLQ==__CRYPTED__",  
15 - "1",  
16 - "0",  
17 - "0",  
18 - "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__",  
19 - "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__",  
20 - "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__",  
21 - "E9aKtVz/OSmGv7v1xW4FwaFukOob3qQ/HFDIz916K3ys82qfX9vBDz[[MAIS]]M2cdoYedhNkXt[[MAIS]]UVb10nD[[MAIS]]tOfbn7mlOlTDoGzUl9CgdPCsb[[MAIS]]Qa4wzuCrMw0BcCuaKfr62E3b8vh6Ug4JJbOgBo3ohG3x5O7Ap0D94GKtAWjMuTXRBbhGxPrRS4M6AhzvaN5P8pWd9FikrCLWuMs4ebnRlftef3RmVKScBDQ5zmK6sKxYNmX[[MAIS]]kKn/Gi2[[MAIS]]HftZ7HD9JLvZBpYhp4yjqShblQ67d6PlWgrRWXxwDseIiJe3NlF70zrCPBBelkeAhVDXMXnsYtLms3ElsLzxa3c5vpWzTfgyE[[MAIS]]hvALy4ivew7zaxEwrg2KY1T7GOSWZ7vljIvbhVZJgtzbnYiulFjJTtm5W4uJMKLuUJNzB0rxMkzToIE9/kDmeO2OKiwFbIfbe2Wdq0VpllOkjKtj9WM676iBSpYAXG0MsmLMj9CZ/sNi06hGF[[MAIS]]rXxiOSk66M0Hq[[MAIS]]OeUBh4z3Ra6f9yPJn0K9hIQyT[[MAIS]]Dr/QW/QdJIOkLTW8ZyyAF4DW9ojiTlUdySvB5EB1jyZ5nNTpzyE38qIdg7uM1tdWdm9FZGYxMdHwi1tS2dBeIWkDfWEjih01xiVt2dmdRgo0zIZvmmYDJ9LhCU3XPDlwdeQ8[[MAIS]]F7fnxDfxGqZQjZJ[[MAIS]]Y/Q8bdLpgbhcd3gt3SzjMLE0M[[MAIS]]hTmHG1KP2CzCibZ7grFAN3Y3jSPjmEj5Fzs26tdhdjNzSIt1FCueea8P2c4NmxPYkJCg0D1mgNrkH3L5svsO[[MAIS]]6YYrl3df4s[[MAIS]]fcK/to9s/pnkKfBKrAPF6Z4s2WPsALUPBDS5ty7RC2vqXRvH6hPR4o7xhXzQOQ/1xytr/RoEWEVeZ2wgHVVbbtFsALul/IDc7B45wmwxBx9iZHVwpQJVlNZZUBtwKqKhnXz5pM[[MAIS]]7yUAkfhMcO09pPd5kB2MBdRJs[[MAIS]]2FIk0GRUw05IHkc1rZEX5Ow==__CRYPTED__",  
22 - "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__",  
23 - "Dcr8b5IfZOJjt6qyH5dGyw==__CRYPTED__",  
24 - "2.5.1.1.256.32",  
25 - "2.8.1.7",  
26 - "2.8.1.6");  
27 - this->testPath = QDir::currentPath() + "/teste";  
28 - this->testIniPath = testPath + "/teste.ini";  
29 - QVariantMap json;  
30 - json["session"] = "lakdhfalkfhsaklfhasfhsl";  
31 - this->session = QJsonObject::fromVariantMap(json); 12 + this->OCacicComm = CacicComm("http://teste.cacic.cc",
  13 + "rG/HcIDVTZ3pPKCf[[MAIS]]I6aigUb7OMeij3FfC7qNaznk0rBRYb6q6kSK3eNfjgptS8BfwW5yJqCvD2ai7xlw9I6P21j6cvQUqlHmAJpCbfwR13urdRE9AhjfokMcPrH6R1/zXPGMHveLRRgKLcqWu2X96rmoQQdRq9EW1SXmYUAx1dCV[[MAIS]]3Ha61XBw5pq58q35zH8Gjt998rTi3ecV8ShXXevqyK[[MAIS]]W07xpgTjbbd6Fbs/35gPfdRRgMNFjq7Gq[[MAIS]]llFgYMJ6UcEhw8f0ZLQo2oL/eRW/CNyeBW6wG0hIo6EIdpi/Ht0/95Uwn2Og[[MAIS]]2UPXsmKKuTMeGwUvPdbEfexlinUO0[[MAIS]]j9qIa2dpjtl0Y5Fyk1Bvw2ZYRTXwgJpUHsBboWmtTFpgX3wSGOWMipE80K8ktRTVYOp[[MAIS]]4qS/SzKWXpfCuZoCncfwE0lCEoreTH[[MAIS]]MLrTkHJP2oqYMAyFyQcjC0UGr3BQGa2edSNXjG7jrTdddga/SODUiF94jgh/QBwhiZby34b__CRYPTED__",
  14 + "P198PVwtz5F5CfZPSUrzuaQA/QG1sTnwzl/rBnj8M7y5MglANGodG5LLD4q7oY809HuDR4g5tL64lZRBKvKPmEgWd9iAZKvT4UAm9XWN3nKKLGaznCaJohmntNGqrJP1Zd9riTHGu10mPbg/Uh3TCbBHVOICvu5sDlINlCR6A3[[MAIS]]a55RhfKNidvr5uX0kozCxr5t2DyOb5oPocEGyJKyHLQ==__CRYPTED__",
  15 + "1",
  16 + "0",
  17 + "0",
  18 + "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__",
  19 + "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__",
  20 + "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__",
  21 + "E9aKtVz/OSmGv7v1xW4FwaFukOob3qQ/HFDIz916K3ys82qfX9vBDz[[MAIS]]M2cdoYedhNkXt[[MAIS]]UVb10nD[[MAIS]]tOfbn7mlOlTDoGzUl9CgdPCsb[[MAIS]]Qa4wzuCrMw0BcCuaKfr62E3b8vh6Ug4JJbOgBo3ohG3x5O7Ap0D94GKtAWjMuTXRBbhGxPrRS4M6AhzvaN5P8pWd9FikrCLWuMs4ebnRlftef3RmVKScBDQ5zmK6sKxYNmX[[MAIS]]kKn/Gi2[[MAIS]]HftZ7HD9JLvZBpYhp4yjqShblQ67d6PlWgrRWXxwDseIiJe3NlF70zrCPBBelkeAhVDXMXnsYtLms3ElsLzxa3c5vpWzTfgyE[[MAIS]]hvALy4ivew7zaxEwrg2KY1T7GOSWZ7vljIvbhVZJgtzbnYiulFjJTtm5W4uJMKLuUJNzB0rxMkzToIE9/kDmeO2OKiwFbIfbe2Wdq0VpllOkjKtj9WM676iBSpYAXG0MsmLMj9CZ/sNi06hGF[[MAIS]]rXxiOSk66M0Hq[[MAIS]]OeUBh4z3Ra6f9yPJn0K9hIQyT[[MAIS]]Dr/QW/QdJIOkLTW8ZyyAF4DW9ojiTlUdySvB5EB1jyZ5nNTpzyE38qIdg7uM1tdWdm9FZGYxMdHwi1tS2dBeIWkDfWEjih01xiVt2dmdRgo0zIZvmmYDJ9LhCU3XPDlwdeQ8[[MAIS]]F7fnxDfxGqZQjZJ[[MAIS]]Y/Q8bdLpgbhcd3gt3SzjMLE0M[[MAIS]]hTmHG1KP2CzCibZ7grFAN3Y3jSPjmEj5Fzs26tdhdjNzSIt1FCueea8P2c4NmxPYkJCg0D1mgNrkH3L5svsO[[MAIS]]6YYrl3df4s[[MAIS]]fcK/to9s/pnkKfBKrAPF6Z4s2WPsALUPBDS5ty7RC2vqXRvH6hPR4o7xhXzQOQ/1xytr/RoEWEVeZ2wgHVVbbtFsALul/IDc7B45wmwxBx9iZHVwpQJVlNZZUBtwKqKhnXz5pM[[MAIS]]7yUAkfhMcO09pPd5kB2MBdRJs[[MAIS]]2FIk0GRUw05IHkc1rZEX5Ow==__CRYPTED__",
  22 + "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__",
  23 + "Dcr8b5IfZOJjt6qyH5dGyw==__CRYPTED__",
  24 + "2.5.1.1.256.32",
  25 + "2.8.1.7",
  26 + "2.8.1.6");
  27 + this->testPath = QDir::currentPath() + "/teste";
  28 + this->testIniPath = testPath + "/teste.ini";
  29 + QVariantMap json;
  30 + json["session"] = "lakdhfalkfhsaklfhasfhsl";
  31 + this->session = QJsonObject::fromVariantMap(json);
32 } 32 }
33 33
34 void CTestCacic::testCreateFolder() 34 void CTestCacic::testCreateFolder()
35 { 35 {
36 - QVERIFY(OCacic.createFolder(testPath)); 36 + QVERIFY(OCacic.createFolder(testPath));
37 } 37 }
38 38
39 void CTestCacic::testGetAndSetValueFromFile() 39 void CTestCacic::testGetAndSetValueFromFile()
40 { 40 {
41 - OCacic.setValueToFile("Teste", "teste", "Valor de teste", testIniPath);  
42 - QVERIFY( OCacic.getValueFromFile("Teste", "teste", testIniPath) == "Valor de teste"); 41 + OCacic.setValueToFile("Teste", "teste", "Valor de teste", testIniPath);
  42 + QVERIFY( OCacic.getValueFromFile("Teste", "teste", testIniPath) == "Valor de teste");
43 } 43 }
44 44
45 void CTestCacic::testGetValueFromTags() 45 void CTestCacic::testGetValueFromTags()
46 { 46 {
47 - QString value = "blablab[teste]Valor de teste[/teste]feihgj";  
48 - QVERIFY(OCacic.getValueFromTags(value, "teste") == "Valor de teste"); 47 + QString value = "blablab[teste]Valor de teste[/teste]feihgj";
  48 + QVERIFY(OCacic.getValueFromTags(value, "teste") == "Valor de teste");
49 } 49 }
50 50
51 void CTestCacic::testCommStatus() 51 void CTestCacic::testCommStatus()
52 { 52 {
53 - QVERIFY(OCacicComm.commStatus()); 53 + QVERIFY(OCacicComm.commStatus());
54 } 54 }
55 55
56 void CTestCacic::testComm() 56 void CTestCacic::testComm()
57 { 57 {
58 - if (OCacicComm.commStatus()){  
59 - QJsonObject jsonreply = OCacicComm.comm("/ws/get/test");  
60 - QVERIFY(OCacic.getValueFromTags(jsonreply["reply"].toString(), "Comm_Status", "<>") == QString("OK")); 58 + if (OCacicComm.commStatus()){
  59 + QJsonObject jsonreply = OCacicComm.comm("/ws/get/test");
  60 + QVERIFY(OCacic.getValueFromTags(jsonreply["reply"].toString(), "Comm_Status", "<>") == QString("OK"));
61 } else 61 } else
62 - QSKIP("Teste de comunicação negativo!"); 62 + QSKIP("Teste de comunicação negativo!");
63 } 63 }
64 64
65 void CTestCacic::testDeleteFile() 65 void CTestCacic::testDeleteFile()
66 { 66 {
67 - QDir file(testIniPath);  
68 - OCacic.deleteFile(testIniPath);  
69 - QVERIFY(!file.exists()); 67 + QDir file(testIniPath);
  68 + OCacic.deleteFile(testIniPath);
  69 + QVERIFY(!file.exists());
70 } 70 }
71 71
72 void CTestCacic::testDeleteFolder() 72 void CTestCacic::testDeleteFolder()
73 { 73 {
74 - QDir folder(testPath);  
75 - OCacic.deleteFolder(testPath);  
76 - QVERIFY(!folder.exists()); 74 + QDir folder(testPath);
  75 + OCacic.deleteFolder(testPath);
  76 + QVERIFY(!folder.exists());
77 } 77 }
78 78
79 void CTestCacic::testEnCrypt(){ 79 void CTestCacic::testEnCrypt(){
80 - std::string key = "qwertyuiopasdfghjklzxcvbnmqwerty"; //chave de 256 bits (32 caracteres)  
81 - std::string IV = "0123456789123456"; //iv nunca se repete para a mesma senha.  
82 - std::string input = "aqui vai a url que sera encriptada";  
83 - QVERIFY(OCacic.enCrypt(input, key, IV) == "Va2WiUrdTVrn93tCrtx0njjU4HDpn7VFCsCVr/+YgaBCVQ=="); 80 + std::string key = "qwertyuiopasdfghjklzxcvbnmqwerty"; //chave de 256 bits (32 caracteres)
  81 + std::string IV = "0123456789123456"; //iv nunca se repete para a mesma senha.
  82 + std::string input = "aqui vai a url que sera encriptada";
  83 + QVERIFY(OCacic.enCrypt(input, key, IV) == "Va2WiUrdTVrn93tCrtx0njjU4HDpn7VFCsCVr/+YgaBCVQ==");
84 } 84 }
85 85
86 void CTestCacic::testDeCrypt(){ 86 void CTestCacic::testDeCrypt(){
87 - std::string key = "qwertyuiopasdfghjklzxcvbnmqwerty"; //chave de 256 bits (32 caracteres)  
88 - std::string IV = "0123456789123456asas"; //iv nunca se repete para a mesma senha.  
89 - std::string input = "Va2WiUrdTVrn93tCrtx0njjU4HDpn7VFCsCVr/+YgaBCVQ==";  
90 - QVERIFY(OCacic.deCrypt(input, key, IV) == "aqui vai a url que sera encriptada"); 87 + std::string key = "qwertyuiopasdfghjklzxcvbnmqwerty"; //chave de 256 bits (32 caracteres)
  88 + std::string IV = "0123456789123456asas"; //iv nunca se repete para a mesma senha.
  89 + std::string input = "Va2WiUrdTVrn93tCrtx0njjU4HDpn7VFCsCVr/+YgaBCVQ==";
  90 + QVERIFY(OCacic.deCrypt(input, key, IV) == "aqui vai a url que sera encriptada");
91 91
92 } 92 }
93 93
94 void CTestCacic::testInterfaceDeRede(){ 94 void CTestCacic::testInterfaceDeRede(){
95 - // qDebug() << QString::fromStdString(OCacicComp.getNetworkInterface().at(0).at(0));  
96 - QVERIFY2(!OCacicComp.getNetworkInterface().empty(), "Nenhuma interface de rede encontrada."); 95 + // qDebug() << QString::fromStdString(OCacicComp.getNetworkInterface().at(0).at(0));
  96 + QVERIFY2(!OCacicComp.getNetworkInterface().empty(), "Nenhuma interface de rede encontrada.");
97 } 97 }
98 98
99 void CTestCacic::testpegarOS(){ 99 void CTestCacic::testpegarOS(){
100 - QVERIFY((OCacicComp.getOs() == "Windows_NT") || (OCacicComp.getOs() == "linux")); 100 + QVERIFY((OCacicComp.getOs() == 5) || (OCacicComp.getOs() == 0));
101 } 101 }
102 102
103 void CTestCacic::testPegarUsu(){ 103 void CTestCacic::testPegarUsu(){
104 - //lightbase = user do linux.  
105 - //Usuario = user da vm winxp.  
106 - QVERIFY(OCacicComp.getUser() == "lightbase" || OCacicComp.getUser() == "Usuario"); 104 + //lightbase = user do linux.
  105 + //Usuario = user da vm winxp.
  106 + QVERIFY(OCacicComp.getUser() == "lightbase" || OCacicComp.getUser() == "Usuario");
107 } 107 }
108 108
109 void CTestCacic::testLogin(){ 109 void CTestCacic::testLogin(){
110 - QJsonObject sessionjson = OCacicComm.login();  
111 - QJsonValue session_str = sessionjson["codestatus"];  
112 - // qDebug() << session_str.toVariant().toString();  
113 - QVERIFY(!session_str.isNull()); 110 + QJsonObject sessionjson = OCacicComm.login();
  111 + QJsonValue session_str = sessionjson["codestatus"];
  112 + // qDebug() << session_str.toVariant().toString();
  113 + QVERIFY(!session_str.isNull());
114 } 114 }
115 115
116 void CTestCacic::cleanupTestCase() 116 void CTestCacic::cleanupTestCase()
src/cacic_computer.cpp
  Diff comments   View file @1d3b735
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 2
3 CACIC_Computer::CACIC_Computer() 3 CACIC_Computer::CACIC_Computer()
4 { 4 {
5 - os = pegarOS();  
6 - networkInterface = networkInterfacesRunning();  
7 - usu = pegarUsu(); 5 + os = pegarOS();
  6 + networkInterface = networkInterfacesRunning();
  7 + usu = pegarUsu();
8 } 8 }
9 9
10 /*NetworkInterfacesRunning 10 /*NetworkInterfacesRunning
@@ -15,52 +15,49 @@ CACIC_Computer::CACIC_Computer() @@ -15,52 +15,49 @@ CACIC_Computer::CACIC_Computer()
15 * 15 *
16 */ 16 */
17 QList<QList<std::string>> CACIC_Computer::networkInterfacesRunning(){ 17 QList<QList<std::string>> CACIC_Computer::networkInterfacesRunning(){
18 - QNetworkInterface interface;  
19 - QList<std::string> lista;  
20 - QList<QList<std::string>> todasInterfaces; 18 + QNetworkInterface interface;
  19 + QList<std::string> lista;
  20 + QList<QList<std::string>> todasInterfaces;
21 21
22 - foreach (QNetworkInterface in, interface.allInterfaces()) {  
23 - if (!(bool)(in.flags() & QNetworkInterface::IsLoopBack) &&  
24 - !(bool)(in.flags() & QNetworkInterface::IsPointToPoint) &&  
25 - (bool)(in.flags() & QNetworkInterface::IsRunning)){  
26 - // qDebug() << in.humanReadableName() << "\n";  
27 - lista.append(in.humanReadableName().toStdString());  
28 - // qDebug() << in.hardwareAddress() << "\n";  
29 - lista.append(in.hardwareAddress().toStdString());  
30 - foreach (QNetworkAddressEntry ae, in.addressEntries()){  
31 - if (ae.ip().scopeId() == ""){  
32 - lista.append(ae.ip().toString().toStdString()); 22 + foreach (QNetworkInterface in, interface.allInterfaces()) {
  23 + if (!(bool)(in.flags() & QNetworkInterface::IsLoopBack) &&
  24 + !(bool)(in.flags() & QNetworkInterface::IsPointToPoint) &&
  25 + (bool)(in.flags() & QNetworkInterface::IsRunning)){
  26 + // qDebug() << in.humanReadableName() << "\n";
  27 + lista.append(in.humanReadableName().toStdString());
  28 + // qDebug() << in.hardwareAddress() << "\n";
  29 + lista.append(in.hardwareAddress().toStdString());
  30 + foreach (QNetworkAddressEntry ae, in.addressEntries()){
  31 + if (ae.ip().scopeId() == ""){
  32 + lista.append(ae.ip().toString().toStdString());
33 } else { 33 } else {
34 - lista.append(ae.ip().toString().toStdString()); 34 + lista.append(ae.ip().toString().toStdString());
35 } 35 }
36 - // qDebug() << ae.ip().toString() << "\n"; 36 + // qDebug() << ae.ip().toString() << "\n";
37 } 37 }
38 - todasInterfaces.append(lista);  
39 - lista.clear(); 38 + todasInterfaces.append(lista);
  39 + lista.clear();
40 } 40 }
41 } 41 }
42 - return todasInterfaces; 42 + return todasInterfaces;
43 } 43 }
44 44
45 /*pegarOS 45 /*pegarOS
46 - * @return: std::string;  
47 - * retorna uma string o qual dirá qual so é.  
48 - * 46 + * @return: int;
  47 + * retorna um id referente a versão do SO.
  48 + * 48 = Windows XP
  49 + * 128 = Windows Vista
  50 + * 144 = Windows 7
  51 + * 160 = Windows 8
  52 + * 176 = Windows 8.1
  53 + * 200 = Linux
49 */ 54 */
50 -std::string CACIC_Computer::pegarOS(){  
51 - QString text;  
52 - QStringList environment = QProcessEnvironment::systemEnvironment().toStringList();  
53 - foreach (text, environment) {  
54 - if (text.contains("OS=Win", Qt::CaseInsensitive)){  
55 - //qDebug() << "Windows_NT";  
56 - return "Windows_NT";  
57 - }else{  
58 - if (text.contains("SESSION=", Qt::CaseInsensitive)){  
59 - //qDebug() << "linux";  
60 - return "linux";  
61 - }  
62 - }  
63 - } 55 +int CACIC_Computer::pegarOS(){
  56 +#if defined (Q_OS_WIN)
  57 + return QSysInfo::WindowsVersion;
  58 +#elif defined (Q_OS_LINUX)
  59 + return 200;
  60 +#endif
64 } 61 }
65 62
66 63
@@ -70,52 +67,51 @@ std::string CACIC_Computer::pegarOS(){ @@ -70,52 +67,51 @@ std::string CACIC_Computer::pegarOS(){
70 * retorna uma string o qual dirá qual é o usuario logado no sistema. 67 * retorna uma string o qual dirá qual é o usuario logado no sistema.
71 */ 68 */
72 std::string CACIC_Computer::pegarUsu(){ 69 std::string CACIC_Computer::pegarUsu(){
73 - QString text;  
74 - QStringList environment = QProcessEnvironment::systemEnvironment().toStringList();  
75 - foreach (text, environment) {  
76 - if (text.contains("USER=", Qt::CaseInsensitive)){  
77 - QString x = text;  
78 - QString s = "USER=";  
79 - QString e = "\"";  
80 - int start = x.indexOf(s, 0, Qt::CaseInsensitive);  
81 - int end = x.indexOf(e, Qt::CaseInsensitive);  
82 - if(start != -1){  
83 - QString y = x.mid(start + s.length(), ((end - (start + s.length())) > -1 ? (end - (start + s.length())) : -1));  
84 - //qDebug() << y;  
85 - return y.toStdString(); 70 + QString text;
  71 + QStringList environment = QProcessEnvironment::systemEnvironment().toStringList();
  72 + foreach (text, environment) {
  73 + if (text.contains("USER=", Qt::CaseInsensitive)){
  74 + QString x = text;
  75 + QString s = "USER=";
  76 + QString e = "\"";
  77 + int start = x.indexOf(s, 0, Qt::CaseInsensitive);
  78 + int end = x.indexOf(e, Qt::CaseInsensitive);
  79 + if(start != -1){
  80 + QString y = x.mid(start + s.length(), ((end - (start + s.length())) > -1 ? (end - (start + s.length())) : -1));
  81 + //qDebug() << y;
  82 + return y.toStdString();
86 } 83 }
87 }else{ 84 }else{
88 - if (text.contains("USERNAME=", Qt::CaseInsensitive)){  
89 - QString x = text;  
90 - QString s = "USERNAME=";  
91 - QString e = "\"";  
92 - int start = x.indexOf(s, 0, Qt::CaseInsensitive);  
93 - int end = x.indexOf(e, Qt::CaseInsensitive);  
94 - if(start != -1){  
95 - QString y = x.mid(start + s.length(), ((end - (start + s.length())) > -1 ? (end - (start + s.length())) : -1));  
96 - // qDebug() << y;  
97 - return y.toStdString(); 85 + if (text.contains("USERNAME=", Qt::CaseInsensitive)){
  86 + QString x = text;
  87 + QString s = "USERNAME=";
  88 + QString e = "\"";
  89 + int start = x.indexOf(s, 0, Qt::CaseInsensitive);
  90 + int end = x.indexOf(e, Qt::CaseInsensitive);
  91 + if(start != -1){
  92 + QString y = x.mid(start + s.length(), ((end - (start + s.length())) > -1 ? (end - (start + s.length())) : -1));
  93 + // qDebug() << y;
  94 + return y.toStdString();
98 } 95 }
99 } 96 }
100 } 97 }
101 } 98 }
102 - return false; 99 + return false;
103 } 100 }
104 101
105 /* 102 /*
106 * getters/setters 103 * getters/setters
107 */ 104 */
108 -  
109 -std::string CACIC_Computer::getOs() const 105 +int CACIC_Computer::getOs() const
110 { 106 {
111 - return os; 107 + return os;
112 } 108 }
113 109
114 std::string CACIC_Computer::getUser() const { 110 std::string CACIC_Computer::getUser() const {
115 - return usu; 111 + return usu;
116 } 112 }
117 113
118 QList<QList<std::string>> CACIC_Computer::getNetworkInterface() const 114 QList<QList<std::string>> CACIC_Computer::getNetworkInterface() const
119 { 115 {
120 - return networkInterface; 116 + return networkInterface;
121 } 117 }
src/cacic_computer.h
  Diff comments   View file @1d3b735
@@ -13,16 +13,16 @@ class CACIC_Computer @@ -13,16 +13,16 @@ class CACIC_Computer
13 public: 13 public:
14 CACIC_Computer(); 14 CACIC_Computer();
15 15
16 - std::string pegarOS(); 16 + int pegarOS();
17 std::string pegarUsu(); 17 std::string pegarUsu();
18 - std::string getOs() const; 18 + int getOs() const;
19 std::string getUser() const; 19 std::string getUser() const;
20 QList<QList<std::string>> getNetworkInterface() const; 20 QList<QList<std::string>> getNetworkInterface() const;
21 QList<QList<std::string>> networkInterfacesRunning(); 21 QList<QList<std::string>> networkInterfacesRunning();
22 22
23 private: 23 private:
24 QList<QList<std::string>> networkInterface; 24 QList<QList<std::string>> networkInterface;
25 - std::string os; 25 + int os;
26 std::string usu; 26 std::string usu;
27 27
28 }; 28 };