From 33066d0dbfa4c619326768a1326cf0d47efe06f3 Mon Sep 17 00:00:00 2001
From: ericmenezesn@gmail.com <ericmenezesn@gmail.com>
Date: Mon, 8 Sep 2014 15:53:51 -0300
Subject: [PATCH] Organização projeto

---
 cacic-daemon/cacicD/cacicD.pro      |  3 ++-
 cacic-daemon/cacicD/cacicD.pro.user | 41 ++++++++++++++---------------------------
 cacic-daemon/cacicD/cacictimer.cpp  | 17 +++++++++++++++++
 cacic-daemon/cacicD/cacictimer.h    | 26 ++++++++++++++++++++++++++
 cacicD/cacictimer.cpp               | 17 -----------------
 cacicD/cacictimer.h                 | 26 --------------------------
 6 files changed, 59 insertions(+), 71 deletions(-)
 create mode 100644 cacic-daemon/cacicD/cacictimer.cpp
 create mode 100644 cacic-daemon/cacicD/cacictimer.h
 delete mode 100644 cacicD/cacictimer.cpp
 delete mode 100644 cacicD/cacictimer.h

diff --git a/cacic-daemon/cacicD/cacicD.pro b/cacic-daemon/cacicD/cacicD.pro
index 057f25b..85832be 100644
--- a/cacic-daemon/cacicD/cacicD.pro
+++ b/cacic-daemon/cacicD/cacicD.pro
@@ -23,13 +23,14 @@ SOURCES += main.cpp \
     ../../src/ccacic.cpp \
     cacicd.cpp \
     ../../src/wmi.cpp \
-    cacictimer.cpp
+    cacictimer.cpp \
     ../../src/cacic_computer.cpp \
     ../../src/operatingsystem.cpp
 
 HEADERS += \
     ../../src/ccacic.h \
     cacicd.h \
+    cacictimer.h \
     ../../src/wmi.h \
     ../../src/cacic_computer.h \
     ../../src/operatingsystem.h \
diff --git a/cacic-daemon/cacicD/cacicD.pro.user b/cacic-daemon/cacicD/cacicD.pro.user
index a8586a9..49de1ff 100644
--- a/cacic-daemon/cacicD/cacicD.pro.user
+++ b/cacic-daemon/cacicD/cacicD.pro.user
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.2, 2014-09-03T15:17:46. -->
-<!-- Written by QtCreator 3.2.0, 2014-09-08T10:21:57. -->
+<!-- Written by QtCreator 3.1.2, 2014-09-08T15:51:54. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -55,14 +54,14 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3 GCC 64bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3 GCC 64bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.gcc_64_kit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3.0 MinGW 32bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3.0 MinGW 32bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.win32_mingw482_kit</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lightbase/cacic-agente/build-cacic-service-Desktop_Qt_5_3_GCC_64bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/LightBase/cacic-agente-project/builds/cacic/debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -79,10 +78,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
-       <value type="QString">-w</value>
-       <value type="QString">-r</value>
-      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
@@ -98,10 +94,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
-       <value type="QString">-w</value>
-       <value type="QString">-r</value>
-      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
@@ -121,7 +114,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lightbase/cacic-agente/build-cacic-service-Desktop_Qt_5_3_GCC_64bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/LightBase/cacic-agente-project/builds/cacic/release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -138,10 +131,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
-       <value type="QString">-w</value>
-       <value type="QString">-r</value>
-      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
@@ -157,10 +147,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
-       <value type="QString">-w</value>
-       <value type="QString">-r</value>
-      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
@@ -231,13 +218,13 @@
     </valuelist>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">cacic-service</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">cacicD</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/lightbase/cacic-agente/cacic-service/cacic-service.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/LightBase/cacic-agente-project/cacic-agente/cacic-daemon/cacicD/cacicD.pro</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">cacicD.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
@@ -255,7 +242,7 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-  <value type="QByteArray">{ece4f619-8231-4029-8d3b-e5858b910820}</value>
+  <value type="QByteArray">{2d43e969-a5af-4db4-9730-35c8f8cce80d}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
diff --git a/cacic-daemon/cacicD/cacictimer.cpp b/cacic-daemon/cacicD/cacictimer.cpp
new file mode 100644
index 0000000..93a8df1
--- /dev/null
+++ b/cacic-daemon/cacicD/cacictimer.cpp
@@ -0,0 +1,17 @@
+#include "cacictimer.h"
+
+CacicTimer::CacicTimer()
+{
+    timer = new QTimer(this);
+    connect(timer,SIGNAL(timeout()),this,SLOT(mslot()));
+}
+
+void CacicTimer::iniciarTimer(int x)
+{
+    timer->start(x);
+}
+
+void CacicTimer::mslot()
+{
+    qDebug() << "timer executado";
+}
diff --git a/cacic-daemon/cacicD/cacictimer.h b/cacic-daemon/cacicD/cacictimer.h
new file mode 100644
index 0000000..8c380fc
--- /dev/null
+++ b/cacic-daemon/cacicD/cacictimer.h
@@ -0,0 +1,26 @@
+#ifndef CACICTIMER_H
+#define CACICTIMER_H
+#include <QtCore>
+#include <QTimer>
+#include <QDebug>
+#include "ccacic.h"
+#include "cacic_comm.h"
+#include "cacic_computer.h"
+
+class CacicTimer : public QObject
+{
+    Q_OBJECT
+public:
+    CacicTimer();
+    QTimer *timer;
+    void iniciarTimer(int x);
+
+signals:
+    void getTestSi();
+    void getConfigSi();
+
+private slots:
+    void mslot();
+};
+
+#endif // CACICTIMER_H
diff --git a/cacicD/cacictimer.cpp b/cacicD/cacictimer.cpp
deleted file mode 100644
index 93a8df1..0000000
--- a/cacicD/cacictimer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "cacictimer.h"
-
-CacicTimer::CacicTimer()
-{
-    timer = new QTimer(this);
-    connect(timer,SIGNAL(timeout()),this,SLOT(mslot()));
-}
-
-void CacicTimer::iniciarTimer(int x)
-{
-    timer->start(x);
-}
-
-void CacicTimer::mslot()
-{
-    qDebug() << "timer executado";
-}
diff --git a/cacicD/cacictimer.h b/cacicD/cacictimer.h
deleted file mode 100644
index 8c380fc..0000000
--- a/cacicD/cacictimer.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef CACICTIMER_H
-#define CACICTIMER_H
-#include <QtCore>
-#include <QTimer>
-#include <QDebug>
-#include "ccacic.h"
-#include "cacic_comm.h"
-#include "cacic_computer.h"
-
-class CacicTimer : public QObject
-{
-    Q_OBJECT
-public:
-    CacicTimer();
-    QTimer *timer;
-    void iniciarTimer(int x);
-
-signals:
-    void getTestSi();
-    void getConfigSi();
-
-private slots:
-    void mslot();
-};
-
-#endif // CACICTIMER_H
--
libgit2 0.21.2