From d0bdc415ce6f66eefc114850f50698bdef24787a Mon Sep 17 00:00:00 2001
From: ericmenezesn@gmail.com <ericmenezesn@gmail.com>
Date: Wed, 13 Aug 2014 13:56:00 -0300
Subject: [PATCH] Debug da função getOs; configuração dos projetos

---
 cacic-teste/testcacic.cpp | 11 ++---------
 cacic/cacic.pro           | 20 ++++++++++++++++++--
 gercols/gercols.pro       | 21 +++++++++++++++++++--
 src/cacic_computer.cpp    | 35 +++++++++++++++++++++++------------
 4 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp
index 3c00606..c8441a2 100644
--- a/cacic-teste/testcacic.cpp
+++ b/cacic-teste/testcacic.cpp
@@ -86,15 +86,8 @@ void CTestCacic::testInterfaceDeRede(){
 }
 
 void CTestCacic::testpegarOS(){
-    QVERIFY(OCacicComp.getOs() == CACIC_Computer::WIN_XP ||
-            OCacicComp.getOs() == CACIC_Computer::WIN_VISTA ||
-            OCacicComp.getOs() == CACIC_Computer::WIN_7 ||
-            OCacicComp.getOs() == CACIC_Computer::WIN_8 ||
-            OCacicComp.getOs() == CACIC_Computer::WIN_8_1 ||
-            OCacicComp.getOs() == CACIC_Computer::MAC ||
-            OCacicComp.getOs() == CACIC_Computer::LINUX_DEBIAN ||
-            OCacicComp.getOs() == CACIC_Computer::LINUX_UBUNTU ||
-            OCacicComp.getOs() == CACIC_Computer::LINUX_ARCH );
+    //basta que seja um retorno válido, não precisa validar todos.
+    QVERIFY(OCacicComp.getOs() != -1 );
 }
 
 void CTestCacic::testPegarUsu(){
diff --git a/cacic/cacic.pro b/cacic/cacic.pro
index 2224298..e0c8496 100644
--- a/cacic/cacic.pro
+++ b/cacic/cacic.pro
@@ -5,14 +5,30 @@
 #-------------------------------------------------
 
 QT       += core
-
 QT       -= gui
 
 TARGET = cacic
 CONFIG   += console
 CONFIG   -= app_bundle
 
+win32 {
+    LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp
+} else {
+    LIBS += -L/usr/lib -lcryptopp
+}
+
 TEMPLATE = app
 
+SOURCES += \
+    main.cpp \
+    ../src/ccacic.cpp \
+    ../src/cacic_computer.cpp
+
+
+HEADERS += \
+    ../src/ccacic.h \
+    ../src/cacic_computer.h \
+    ../src/cacic_comm.h
 
-SOURCES += main.cpp
+INCLUDEPATH += ../src \
+               ../src/crypto++/include/
diff --git a/gercols/gercols.pro b/gercols/gercols.pro
index 47f7382..1a9347a 100644
--- a/gercols/gercols.pro
+++ b/gercols/gercols.pro
@@ -5,14 +5,31 @@
 #-------------------------------------------------
 
 QT       += core
-
+QT       += network
 QT       -= gui
 
 TARGET = gercols
 CONFIG   += console
 CONFIG   -= app_bundle
 
+win32 {
+    LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp
+} else {
+    LIBS += -L/usr/lib -lcryptopp
+}
+
 TEMPLATE = app
 
+SOURCES += \
+    main.cpp \
+    ../src/ccacic.cpp \
+    ../src/cacic_computer.cpp
+
+
+HEADERS += \
+    ../src/ccacic.h \
+    ../src/cacic_computer.h \
+    ../src/cacic_comm.h
 
-SOURCES += main.cpp
+INCLUDEPATH += ../src \
+               ../src/crypto++/include/
diff --git a/src/cacic_computer.cpp b/src/cacic_computer.cpp
index 83ea13d..f93e1db 100644
--- a/src/cacic_computer.cpp
+++ b/src/cacic_computer.cpp
@@ -74,20 +74,31 @@ QJsonObject CACIC_Computer::toJsonObject()
 /*pegarOS
  * @return: int;
  *      retorna um id referente a versão do SO.
+ * 48 = Windows XP
+ * 128 = Windows Vista
+ * 144 = Windows 7
+ * 160 = Windows 8
+ * 176 = Windows 8.1
+ * 200 = Linux
+ * 0   = unkown
  */
 int CACIC_Computer::pegarOS(){
-
-#if defined (Q_OS_WIN) || defined(Q_OS_CYGWIN)
-    if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_XP)
-        return WIN_XP;
-    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_VISTA)
-        return WIN_VISTA;
-    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_WINDOWS7)
-        return WIN_7;
-    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_WINDOWS8)
-        return WIN_8;
-    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_WINDOWS8_1)
-        return WIN_8_1;
+/*Não entendi o que você tentou fazer aqui, mas não funcionou.
+ * Você chegou a testar? Comenta o que era pra fazer.
+ */
+//#if defined (Q_OS_WIN) || defined(Q_OS_CYGWIN)
+//    if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_XP)
+//        return WIN_XP;
+//    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_VISTA)
+//        return WIN_VISTA;
+//    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_WINDOWS7)
+//        return WIN_7;
+//    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_WINDOWS8)
+//        return WIN_8;
+//    else if(QSysInfo::WindowsVersion == QSysInfo::QSysInfo.WinVersion.WV_WINDOWS8_1)
+//        return WIN_8_1;
+#if defined (Q_OS_WIN)
+    return QSysInfo::WindowsVersion;
 #elif defined(Q_OS_MAC)
     return MAC;
 #elif defined (Q_OS_LINUX)
--
libgit2 0.21.2