Commit 215e552d0b12fe78307add3333d0bdae6acb1425
Exists in
master
merge
Showing
5 changed files
with
15 additions
and
612 deletions
Show diff stats
.gitignore
1 | +# Project User Files | ||
2 | +*.pro.user | ||
3 | + | ||
1 | # Compiled Object files | 4 | # Compiled Object files |
2 | *.slo | 5 | *.slo |
3 | *.lo | 6 | *.lo |
@@ -21,4 +24,4 @@ | @@ -21,4 +24,4 @@ | ||
21 | *.app | 24 | *.app |
22 | 25 | ||
23 | #Build directories | 26 | #Build directories |
24 | -./build-* | ||
25 | \ No newline at end of file | 27 | \ No newline at end of file |
28 | +./build-* |
cacic-daemon/cacic-controller/cacic-controller.pro.user
@@ -1,267 +0,0 @@ | @@ -1,267 +0,0 @@ | ||
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<!DOCTYPE QtCreatorProject> | ||
3 | -<!-- Written by QtCreator 3.2.0, 2014-09-08T10:21:55. --> | ||
4 | -<qtcreator> | ||
5 | - <data> | ||
6 | - <variable>EnvironmentId</variable> | ||
7 | - <value type="QByteArray">{6923937e-3382-40eb-9eb3-825260fc7246}</value> | ||
8 | - </data> | ||
9 | - <data> | ||
10 | - <variable>ProjectExplorer.Project.ActiveTarget</variable> | ||
11 | - <value type="int">0</value> | ||
12 | - </data> | ||
13 | - <data> | ||
14 | - <variable>ProjectExplorer.Project.EditorSettings</variable> | ||
15 | - <valuemap type="QVariantMap"> | ||
16 | - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> | ||
17 | - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | ||
18 | - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | ||
19 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | ||
20 | - <value type="QString" key="language">Cpp</value> | ||
21 | - <valuemap type="QVariantMap" key="value"> | ||
22 | - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> | ||
23 | - </valuemap> | ||
24 | - </valuemap> | ||
25 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | ||
26 | - <value type="QString" key="language">QmlJS</value> | ||
27 | - <valuemap type="QVariantMap" key="value"> | ||
28 | - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> | ||
29 | - </valuemap> | ||
30 | - </valuemap> | ||
31 | - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> | ||
32 | - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> | ||
33 | - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | ||
34 | - <value type="int" key="EditorConfiguration.IndentSize">4</value> | ||
35 | - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | ||
36 | - <value type="int" key="EditorConfiguration.MarginColumn">80</value> | ||
37 | - <value type="bool" key="EditorConfiguration.MouseHiding">true</value> | ||
38 | - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | ||
39 | - <value type="int" key="EditorConfiguration.PaddingMode">1</value> | ||
40 | - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | ||
41 | - <value type="bool" key="EditorConfiguration.ShowMargin">false</value> | ||
42 | - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> | ||
43 | - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | ||
44 | - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> | ||
45 | - <value type="int" key="EditorConfiguration.TabSize">8</value> | ||
46 | - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> | ||
47 | - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> | ||
48 | - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> | ||
49 | - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> | ||
50 | - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> | ||
51 | - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> | ||
52 | - </valuemap> | ||
53 | - </data> | ||
54 | - <data> | ||
55 | - <variable>ProjectExplorer.Project.PluginSettings</variable> | ||
56 | - <valuemap type="QVariantMap"/> | ||
57 | - </data> | ||
58 | - <data> | ||
59 | - <variable>ProjectExplorer.Project.Target.0</variable> | ||
60 | - <valuemap type="QVariantMap"> | ||
61 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> | ||
62 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> | ||
63 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ee9c574b-e4fe-4328-9914-eb06b7267a22}</value> | ||
64 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> | ||
65 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||
66 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||
67 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | ||
68 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/thiroc80/lightbase/cacic-agente/build-cacic-daemon-Desktop-Debug</value> | ||
69 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
70 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
71 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
72 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
73 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
74 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
75 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
76 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
77 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
78 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
79 | - </valuemap> | ||
80 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
81 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
82 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
83 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
84 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
85 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
86 | - <value type="QString">-w</value> | ||
87 | - <value type="QString">-r</value> | ||
88 | - </valuelist> | ||
89 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
90 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
91 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
92 | - </valuemap> | ||
93 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
94 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
95 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
96 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
97 | - </valuemap> | ||
98 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
99 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
100 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
101 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
102 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
103 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
104 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
105 | - <value type="QString">-w</value> | ||
106 | - <value type="QString">-r</value> | ||
107 | - </valuelist> | ||
108 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
109 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
110 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
111 | - </valuemap> | ||
112 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
113 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
114 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
115 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
116 | - </valuemap> | ||
117 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
118 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
119 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
120 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> | ||
121 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
122 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
123 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | ||
124 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
125 | - </valuemap> | ||
126 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> | ||
127 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/thiroc80/lightbase/build-cacic-controller-Desktop-Release</value> | ||
128 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
129 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
130 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
131 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
132 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
133 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
134 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
135 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
136 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
137 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
138 | - </valuemap> | ||
139 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
140 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
141 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
142 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
143 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
144 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
145 | - <value type="QString">-w</value> | ||
146 | - <value type="QString">-r</value> | ||
147 | - </valuelist> | ||
148 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
149 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
150 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
151 | - </valuemap> | ||
152 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
153 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
154 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
155 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
156 | - </valuemap> | ||
157 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
158 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
159 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
160 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
161 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
162 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
163 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
164 | - <value type="QString">-w</value> | ||
165 | - <value type="QString">-r</value> | ||
166 | - </valuelist> | ||
167 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
168 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
169 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
170 | - </valuemap> | ||
171 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
172 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
173 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
174 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
175 | - </valuemap> | ||
176 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
177 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
178 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
179 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> | ||
180 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
181 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
182 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | ||
183 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
184 | - </valuemap> | ||
185 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> | ||
186 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||
187 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
188 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||
189 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||
190 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
191 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||
192 | - </valuemap> | ||
193 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||
194 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | ||
195 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
196 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||
197 | - </valuemap> | ||
198 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||
199 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> | ||
200 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||
201 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | ||
202 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | ||
203 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | ||
204 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> | ||
205 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> | ||
206 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> | ||
207 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | ||
208 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | ||
209 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | ||
210 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> | ||
211 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | ||
212 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | ||
213 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> | ||
214 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> | ||
215 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> | ||
216 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | ||
217 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | ||
218 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | ||
219 | - <value type="int">0</value> | ||
220 | - <value type="int">1</value> | ||
221 | - <value type="int">2</value> | ||
222 | - <value type="int">3</value> | ||
223 | - <value type="int">4</value> | ||
224 | - <value type="int">5</value> | ||
225 | - <value type="int">6</value> | ||
226 | - <value type="int">7</value> | ||
227 | - <value type="int">8</value> | ||
228 | - <value type="int">9</value> | ||
229 | - <value type="int">10</value> | ||
230 | - <value type="int">11</value> | ||
231 | - <value type="int">12</value> | ||
232 | - <value type="int">13</value> | ||
233 | - <value type="int">14</value> | ||
234 | - </valuelist> | ||
235 | - <value type="int" key="PE.EnvironmentAspect.Base">2</value> | ||
236 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> | ||
237 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">cacic-controller</value> | ||
238 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
239 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/thiroc80/lightbase/cacic-agente/cacic-daemon/cacic-controller/cacic-controller.pro</value> | ||
240 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | ||
241 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">cacic-controller.pro</value> | ||
242 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | ||
243 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value> | ||
244 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> | ||
245 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | ||
246 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> | ||
247 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> | ||
248 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | ||
249 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | ||
250 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | ||
251 | - </valuemap> | ||
252 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||
253 | - </valuemap> | ||
254 | - </data> | ||
255 | - <data> | ||
256 | - <variable>ProjectExplorer.Project.TargetCount</variable> | ||
257 | - <value type="int">1</value> | ||
258 | - </data> | ||
259 | - <data> | ||
260 | - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | ||
261 | - <value type="int">16</value> | ||
262 | - </data> | ||
263 | - <data> | ||
264 | - <variable>Version</variable> | ||
265 | - <value type="int">16</value> | ||
266 | - </data> | ||
267 | -</qtcreator> |
cacic-daemon/cacicD/cacicD.pro.user
@@ -1,251 +0,0 @@ | @@ -1,251 +0,0 @@ | ||
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<!DOCTYPE QtCreatorProject> | ||
3 | -<!-- Written by QtCreator 3.1.2, 2014-09-08T18:34:03. --> | ||
4 | -<qtcreator> | ||
5 | - <data> | ||
6 | - <variable>ProjectExplorer.Project.ActiveTarget</variable> | ||
7 | - <value type="int">0</value> | ||
8 | - </data> | ||
9 | - <data> | ||
10 | - <variable>ProjectExplorer.Project.EditorSettings</variable> | ||
11 | - <valuemap type="QVariantMap"> | ||
12 | - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> | ||
13 | - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | ||
14 | - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | ||
15 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | ||
16 | - <value type="QString" key="language">Cpp</value> | ||
17 | - <valuemap type="QVariantMap" key="value"> | ||
18 | - <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> | ||
19 | - </valuemap> | ||
20 | - </valuemap> | ||
21 | - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | ||
22 | - <value type="QString" key="language">QmlJS</value> | ||
23 | - <valuemap type="QVariantMap" key="value"> | ||
24 | - <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> | ||
25 | - </valuemap> | ||
26 | - </valuemap> | ||
27 | - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> | ||
28 | - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> | ||
29 | - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | ||
30 | - <value type="int" key="EditorConfiguration.IndentSize">4</value> | ||
31 | - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | ||
32 | - <value type="int" key="EditorConfiguration.MarginColumn">80</value> | ||
33 | - <value type="bool" key="EditorConfiguration.MouseHiding">true</value> | ||
34 | - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | ||
35 | - <value type="int" key="EditorConfiguration.PaddingMode">1</value> | ||
36 | - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | ||
37 | - <value type="bool" key="EditorConfiguration.ShowMargin">false</value> | ||
38 | - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> | ||
39 | - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | ||
40 | - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> | ||
41 | - <value type="int" key="EditorConfiguration.TabSize">8</value> | ||
42 | - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> | ||
43 | - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> | ||
44 | - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> | ||
45 | - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> | ||
46 | - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> | ||
47 | - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> | ||
48 | - </valuemap> | ||
49 | - </data> | ||
50 | - <data> | ||
51 | - <variable>ProjectExplorer.Project.PluginSettings</variable> | ||
52 | - <valuemap type="QVariantMap"/> | ||
53 | - </data> | ||
54 | - <data> | ||
55 | - <variable>ProjectExplorer.Project.Target.0</variable> | ||
56 | - <valuemap type="QVariantMap"> | ||
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> | ||
60 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> | ||
61 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||
62 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||
63 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | ||
64 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/LightBase/cacic-agente-project/builds/cacic/debug</value> | ||
65 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
66 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
67 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
68 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
69 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
70 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
71 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
72 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
73 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
74 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
75 | - </valuemap> | ||
76 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
77 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
78 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
79 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
80 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
81 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> | ||
82 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
83 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
84 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
85 | - </valuemap> | ||
86 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
87 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
88 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
89 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
90 | - </valuemap> | ||
91 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
92 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
93 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
94 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
95 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
96 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
97 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> | ||
98 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
99 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
100 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
101 | - </valuemap> | ||
102 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
103 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
104 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
105 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
106 | - </valuemap> | ||
107 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
108 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
109 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
110 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> | ||
111 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
112 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
113 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | ||
114 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
115 | - </valuemap> | ||
116 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> | ||
117 | - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/LightBase/cacic-agente-project/builds/cacic/release</value> | ||
118 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
119 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
120 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
121 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
122 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
123 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
124 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
125 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
126 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
127 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
128 | - </valuemap> | ||
129 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
130 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
131 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
132 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
133 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
134 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> | ||
135 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
136 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
137 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
138 | - </valuemap> | ||
139 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
140 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
141 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
142 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
143 | - </valuemap> | ||
144 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
145 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
146 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
147 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
148 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
149 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
150 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/> | ||
151 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
152 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
153 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
154 | - </valuemap> | ||
155 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
156 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
157 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
158 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
159 | - </valuemap> | ||
160 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
161 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
162 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
163 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> | ||
164 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
165 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
166 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | ||
167 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
168 | - </valuemap> | ||
169 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> | ||
170 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||
171 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
172 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||
173 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||
174 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
175 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||
176 | - </valuemap> | ||
177 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||
178 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | ||
179 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
180 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||
181 | - </valuemap> | ||
182 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||
183 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> | ||
184 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||
185 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | ||
186 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | ||
187 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | ||
188 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> | ||
189 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> | ||
190 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> | ||
191 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | ||
192 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | ||
193 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | ||
194 | - <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> | ||
195 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | ||
196 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | ||
197 | - <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> | ||
198 | - <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> | ||
199 | - <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> | ||
200 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | ||
201 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | ||
202 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | ||
203 | - <value type="int">0</value> | ||
204 | - <value type="int">1</value> | ||
205 | - <value type="int">2</value> | ||
206 | - <value type="int">3</value> | ||
207 | - <value type="int">4</value> | ||
208 | - <value type="int">5</value> | ||
209 | - <value type="int">6</value> | ||
210 | - <value type="int">7</value> | ||
211 | - <value type="int">8</value> | ||
212 | - <value type="int">9</value> | ||
213 | - <value type="int">10</value> | ||
214 | - <value type="int">11</value> | ||
215 | - <value type="int">12</value> | ||
216 | - <value type="int">13</value> | ||
217 | - <value type="int">14</value> | ||
218 | - </valuelist> | ||
219 | - <value type="int" key="PE.EnvironmentAspect.Base">2</value> | ||
220 | - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> | ||
221 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">cacicD</value> | ||
222 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
223 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/LightBase/cacic-agente-project/cacic-agente/cacic-daemon/cacicD/cacicD.pro</value> | ||
224 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | ||
225 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">cacicD.pro</value> | ||
226 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | ||
227 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> | ||
228 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> | ||
229 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | ||
230 | - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> | ||
231 | - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> | ||
232 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | ||
233 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | ||
234 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | ||
235 | - </valuemap> | ||
236 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||
237 | - </valuemap> | ||
238 | - </data> | ||
239 | - <data> | ||
240 | - <variable>ProjectExplorer.Project.TargetCount</variable> | ||
241 | - <value type="int">1</value> | ||
242 | - </data> | ||
243 | - <data> | ||
244 | - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | ||
245 | - <value type="QByteArray">{2d43e969-a5af-4db4-9730-35c8f8cce80d}</value> | ||
246 | - </data> | ||
247 | - <data> | ||
248 | - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | ||
249 | - <value type="int">15</value> | ||
250 | - </data> | ||
251 | -</qtcreator> |
cacic-daemon/cacicD/cacicd.cpp
@@ -3,8 +3,8 @@ | @@ -3,8 +3,8 @@ | ||
3 | cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, "CacicD") | 3 | cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, "CacicD") |
4 | { | 4 | { |
5 | try{ | 5 | try{ |
6 | - OCacicComm = new CacicComm(); | ||
7 | - OCacicTimer = new CacicTimer(); | 6 | + Ocacictimer = new CacicTimer(); |
7 | + ccacic = new CCacic; | ||
8 | setServiceDescription("Cacic Daemon"); | 8 | setServiceDescription("Cacic Daemon"); |
9 | setServiceFlags(QtService::Default); | 9 | setServiceFlags(QtService::Default); |
10 | } catch (...){ | 10 | } catch (...){ |
@@ -26,9 +26,12 @@ void cacicD::start() { | @@ -26,9 +26,12 @@ void cacicD::start() { | ||
26 | this->app = application(); | 26 | this->app = application(); |
27 | qDebug() << "\nServiço iniciado em" << app->applicationDirPath(); | 27 | qDebug() << "\nServiço iniciado em" << app->applicationDirPath(); |
28 | QJsonObject result = ccacic->getJsonFromFile(app->applicationDirPath() + "/getConfig.json"); | 28 | QJsonObject result = ccacic->getJsonFromFile(app->applicationDirPath() + "/getConfig.json"); |
29 | - if(!result.contains("error")){ | ||
30 | - OCacicTimer->iniciarTimer(result["codestatus"].toInt()); | ||
31 | - } | 29 | + //if(!result.contains("error") && !result.isEmpty()){ |
30 | + //Ocacictimer->iniciarTimer(result["codestatus"].toInt(), app->applicationDirPath()); | ||
31 | + Ocacictimer->iniciarTimer(1000, app->applicationDirPath()); | ||
32 | + //}else{ | ||
33 | + // qDebug() << "getConfig.json não encontrado."; | ||
34 | + //} | ||
32 | }catch (...){ | 35 | }catch (...){ |
33 | qCritical() << "Error desconhecido ao iniciar o serviço."; | 36 | qCritical() << "Error desconhecido ao iniciar o serviço."; |
34 | } | 37 | } |
@@ -61,76 +64,4 @@ void cacicD::stop() | @@ -61,76 +64,4 @@ void cacicD::stop() | ||
61 | } | 64 | } |
62 | } | 65 | } |
63 | 66 | ||
64 | -bool cacicD::getTest(){ | ||
65 | - try{ | ||
66 | - qDebug() << app->applicationDirPath() + "getTest.json"; | ||
67 | - OCacicComm->setUrlGerente("http://10.1.0.137/cacic/web/app_dev.php"); | ||
68 | - OCacicComm->setUsuario("cacic"); | ||
69 | - OCacicComm->setPassword("cacic123"); | ||
70 | - bool ok; | ||
71 | - QJsonObject as; | ||
72 | - as["computador"] = OCacic_Computer.toJsonObject(); | ||
73 | - QJsonObject jsonresult = OCacicComm->comm("/ws/neo/login", &ok, as); | ||
74 | - if(jsonresult.contains("error")){ | ||
75 | - return false; | ||
76 | - } | ||
77 | - try{ | ||
78 | - qDebug() << app->applicationDirPath() + "getTest.json"; | ||
79 | - ccacic->setJsonToFile(jsonresult, app->applicationDirPath() + "/getTest.json"); | ||
80 | - return true; | ||
81 | - } catch (...) { | ||
82 | - qDebug() << "Erro ao salvar o arquivo de configurações."; | ||
83 | - return false; | ||
84 | - } | ||
85 | - } catch (...){ | ||
86 | - qDebug() << "Erro ao conectar com o servidor."; | ||
87 | - return false; | ||
88 | - } | ||
89 | -} | ||
90 | - | ||
91 | -bool cacicD::getConfig(){ | ||
92 | - try{ | ||
93 | - OCacicComm->setUrlGerente("http://10.1.0.137/cacic/web/app_dev.php"); | ||
94 | - OCacicComm->setUsuario("cacic"); | ||
95 | - OCacicComm->setPassword("cacic123"); | ||
96 | - bool ok; | ||
97 | - QJsonObject as; | ||
98 | - as["computador"] = OCacic_Computer.toJsonObject(); | ||
99 | - QJsonObject jsonresult = OCacicComm->comm("/ws/neo/login", &ok, as); | ||
100 | - if(jsonresult.contains("error")){ | ||
101 | - return false; | ||
102 | - } | ||
103 | - try{ | ||
104 | - ccacic->setJsonToFile(jsonresult, app->applicationDirPath() + "/getConfig.json"); | ||
105 | - return true; | ||
106 | - } catch (...) { | ||
107 | - qDebug() << "Erro ao salvar o arquivo de configurações."; | ||
108 | - return false; | ||
109 | - } | ||
110 | - } catch (...){ | ||
111 | - qDebug() << "Erro ao conectar com o servidor."; | ||
112 | - return false; | ||
113 | - } | ||
114 | -} | ||
115 | 67 | ||
116 | -void cacicD::registraInicio() | ||
117 | -{ | ||
118 | - | ||
119 | -} | ||
120 | - | ||
121 | -void cacicD::registraFim() | ||
122 | -{ | ||
123 | - | ||
124 | -} | ||
125 | - | ||
126 | -bool cacicD::compararHashMD5(QJsonDocument getconfigfile,QJsonDocument getConfig){ | ||
127 | - QString getconfigMD5 = QString(QCryptographicHash::hash( | ||
128 | - (getconfigfile.toVariant().toByteArray()),QCryptographicHash::Md5).toHex()); | ||
129 | - QString getconfigMD52 = QString(QCryptographicHash::hash( | ||
130 | - (getConfig.toVariant().toByteArray()),QCryptographicHash::Md5).toHex()); | ||
131 | - if(getconfigMD5 == getconfigMD52){ | ||
132 | - return true; | ||
133 | - }else{ | ||
134 | - return false; | ||
135 | - } | ||
136 | -} |
cacic-daemon/cacicD/cacicd.h
1 | #ifndef CACICD_H | 1 | #ifndef CACICD_H |
2 | #define CACICD_H | 2 | #define CACICD_H |
3 | -#include <QTextStream> | ||
4 | -#include <QVariant> | ||
5 | -#include <QCryptographicHash> | 3 | + |
6 | #include <QCoreApplication> | 4 | #include <QCoreApplication> |
7 | #include "qtservice.h" | 5 | #include "qtservice.h" |
8 | #include "cacictimer.h" | 6 | #include "cacictimer.h" |
9 | 7 | ||
8 | + | ||
10 | class cacicD : public QtService<QCoreApplication> | 9 | class cacicD : public QtService<QCoreApplication> |
11 | { | 10 | { |
12 | public: | 11 | public: |
13 | QCoreApplication *app; | 12 | QCoreApplication *app; |
13 | + CacicTimer *Ocacictimer; | ||
14 | CCacic *ccacic; | 14 | CCacic *ccacic; |
15 | - CACIC_Computer OCacic_Computer; | ||
16 | - CacicComm *OCacicComm; | ||
17 | - CacicTimer *OCacicTimer; | ||
18 | cacicD(int argc, char **argv); | 15 | cacicD(int argc, char **argv); |
19 | ~cacicD(); | 16 | ~cacicD(); |
20 | void start(); | 17 | void start(); |
21 | void pause(); | 18 | void pause(); |
22 | void resume(); | 19 | void resume(); |
23 | void stop(); | 20 | void stop(); |
24 | - | ||
25 | -private: | ||
26 | - bool compararHashMD5(QJsonDocument getconfigfile,QJsonDocument getConfig); | ||
27 | - void registraInicio(); | ||
28 | - void registraFim(); | ||
29 | - | ||
30 | -public slots: | ||
31 | - bool getTest(); | ||
32 | - bool getConfig(); | ||
33 | - | ||
34 | }; | 21 | }; |
35 | #endif // CACICD_H | 22 | #endif // CACICD_H |