Download as
Browse Code »

Commit 33066d0dbfa4c619326768a1326cf0d47efe06f3

Authored by Eric Menezes Noronha
1 parent 6a9d14ad
Exists in master

Organização projeto

Showing 6 changed files with 59 additions and 71 deletions   Show diff stats
cacic-daemon/cacicD/cacicD.pro
  Diff comments   View file @33066d0
... ... @@ -23,13 +23,14 @@ SOURCES += main.cpp \
23 23 ../../src/ccacic.cpp \
24 24 cacicd.cpp \
25 25 ../../src/wmi.cpp \
26   - cacictimer.cpp
  26 + cacictimer.cpp \
27 27 ../../src/cacic_computer.cpp \
28 28 ../../src/operatingsystem.cpp
29 29  
30 30 HEADERS += \
31 31 ../../src/ccacic.h \
32 32 cacicd.h \
  33 + cacictimer.h \
33 34 ../../src/wmi.h \
34 35 ../../src/cacic_computer.h \
35 36 ../../src/operatingsystem.h \
... ...
cacic-daemon/cacicD/cacicD.pro.user
  Diff comments   View file @33066d0
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3   -<!-- Written by QtCreator 3.1.2, 2014-09-03T15:17:46. -->
4   -<!-- Written by QtCreator 3.2.0, 2014-09-08T10:21:57. -->
  3 +<!-- Written by QtCreator 3.1.2, 2014-09-08T15:51:54. -->
5 4 <qtcreator>
6 5 <data>
7 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
... ... @@ -55,14 +54,14 @@
55 54 <data>
56 55 <variable>ProjectExplorer.Project.Target.0</variable>
57 56 <valuemap type="QVariantMap">
58   - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3 GCC 64bit</value>
59   - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3 GCC 64bit</value>
60   - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.gcc_64_kit</value>
  57 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.3.0 MinGW 32bit</value>
  58 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.3.0 MinGW 32bit</value>
  59 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.53.win32_mingw482_kit</value>
61 60 <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
62 61 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
63 62 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
64 63 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
65   - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lightbase/cacic-agente/build-cacic-service-Desktop_Qt_5_3_GCC_64bit-Debug</value>
  64 + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/LightBase/cacic-agente-project/builds/cacic/debug</value>
66 65 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
67 66 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
68 67 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
... ... @@ -79,10 +78,7 @@
79 78 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
80 79 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
81 80 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
82   - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
83   - <value type="QString">-w</value>
84   - <value type="QString">-r</value>
85   - </valuelist>
  81 + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
86 82 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
87 83 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
88 84 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
... ... @@ -98,10 +94,7 @@
98 94 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
99 95 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
100 96 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
101   - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
102   - <value type="QString">-w</value>
103   - <value type="QString">-r</value>
104   - </valuelist>
  97 + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
105 98 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
106 99 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
107 100 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
... ... @@ -121,7 +114,7 @@
121 114 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
122 115 </valuemap>
123 116 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
124   - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lightbase/cacic-agente/build-cacic-service-Desktop_Qt_5_3_GCC_64bit-Release</value>
  117 + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/LightBase/cacic-agente-project/builds/cacic/release</value>
125 118 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
126 119 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
127 120 <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
... ... @@ -138,10 +131,7 @@
138 131 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
139 132 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
140 133 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
141   - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
142   - <value type="QString">-w</value>
143   - <value type="QString">-r</value>
144   - </valuelist>
  134 + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
145 135 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
146 136 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
147 137 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
... ... @@ -157,10 +147,7 @@
157 147 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
158 148 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
159 149 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
160   - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
161   - <value type="QString">-w</value>
162   - <value type="QString">-r</value>
163   - </valuelist>
  150 + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
164 151 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
165 152 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
166 153 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
... ... @@ -231,13 +218,13 @@
231 218 </valuelist>
232 219 <value type="int" key="PE.EnvironmentAspect.Base">2</value>
233 220 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
234   - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">cacic-service</value>
  221 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">cacicD</value>
235 222 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
236   - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/lightbase/cacic-agente/cacic-service/cacic-service.pro</value>
  223 + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/LightBase/cacic-agente-project/cacic-agente/cacic-daemon/cacicD/cacicD.pro</value>
237 224 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
238 225 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">cacicD.pro</value>
239 226 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
240   - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value>
  227 + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
241 228 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
242 229 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
243 230 <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
... ... @@ -255,7 +242,7 @@
255 242 </data>
256 243 <data>
257 244 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
258   - <value type="QByteArray">{ece4f619-8231-4029-8d3b-e5858b910820}</value>
  245 + <value type="QByteArray">{2d43e969-a5af-4db4-9730-35c8f8cce80d}</value>
259 246 </data>
260 247 <data>
261 248 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
... ...
cacic-daemon/cacicD/cacictimer.cpp 0 → 100644
  Diff comments   View file @33066d0
... ... @@ -0,0 +1,17 @@
  1 +#include "cacictimer.h"
  2 +
  3 +CacicTimer::CacicTimer()
  4 +{
  5 + timer = new QTimer(this);
  6 + connect(timer,SIGNAL(timeout()),this,SLOT(mslot()));
  7 +}
  8 +
  9 +void CacicTimer::iniciarTimer(int x)
  10 +{
  11 + timer->start(x);
  12 +}
  13 +
  14 +void CacicTimer::mslot()
  15 +{
  16 + qDebug() << "timer executado";
  17 +}
... ...
cacic-daemon/cacicD/cacictimer.h 0 → 100644
  Diff comments   View file @33066d0
... ... @@ -0,0 +1,26 @@
  1 +#ifndef CACICTIMER_H
  2 +#define CACICTIMER_H
  3 +#include <QtCore>
  4 +#include <QTimer>
  5 +#include <QDebug>
  6 +#include "ccacic.h"
  7 +#include "cacic_comm.h"
  8 +#include "cacic_computer.h"
  9 +
  10 +class CacicTimer : public QObject
  11 +{
  12 + Q_OBJECT
  13 +public:
  14 + CacicTimer();
  15 + QTimer *timer;
  16 + void iniciarTimer(int x);
  17 +
  18 +signals:
  19 + void getTestSi();
  20 + void getConfigSi();
  21 +
  22 +private slots:
  23 + void mslot();
  24 +};
  25 +
  26 +#endif // CACICTIMER_H
... ...
cacicD/cacictimer.cpp
View file @6a9d14a
... ... @@ -1,17 +0,0 @@
1   -#include "cacictimer.h"
2   -
3   -CacicTimer::CacicTimer()
4   -{
5   - timer = new QTimer(this);
6   - connect(timer,SIGNAL(timeout()),this,SLOT(mslot()));
7   -}
8   -
9   -void CacicTimer::iniciarTimer(int x)
10   -{
11   - timer->start(x);
12   -}
13   -
14   -void CacicTimer::mslot()
15   -{
16   - qDebug() << "timer executado";
17   -}
cacicD/cacictimer.h
View file @6a9d14a
... ... @@ -1,26 +0,0 @@
1   -#ifndef CACICTIMER_H
2   -#define CACICTIMER_H
3   -#include <QtCore>
4   -#include <QTimer>
5   -#include <QDebug>
6   -#include "ccacic.h"
7   -#include "cacic_comm.h"
8   -#include "cacic_computer.h"
9   -
10   -class CacicTimer : public QObject
11   -{
12   - Q_OBJECT
13   -public:
14   - CacicTimer();
15   - QTimer *timer;
16   - void iniciarTimer(int x);
17   -
18   -signals:
19   - void getTestSi();
20   - void getConfigSi();
21   -
22   -private slots:
23   - void mslot();
24   -};
25   -
26   -#endif // CACICTIMER_H