Diff: operation/OperationSupport.cpp

Revision:

62:86a04c5bda18

Parent:

61:15719dbe8820

Child:

63:010bbbb4732a

--- a/operation/OperationSupport.cpp	Fri Oct 24 15:21:21 2014 +0000
+++ b/operation/OperationSupport.cpp	Wed Oct 29 21:09:29 2014 +0000
@@ -14,6 +14,7 @@
     _client(client),
     _tpl(tpl),
     _deviceId(deviceId),
+    _executor(client, tpl, deviceId),
     _thread(OperationSupport::thread_func, this)
 {
     _init = false;
@@ -83,7 +84,7 @@
     }
     
     for (size_t i = 0; i < nops; i++) {
-        ops[i].state = STATE_SUCCESSFUL;
+        ops[i].state = OPERATION_SUCCESSFUL;
         if (!updateOperation(ops[i]))
             puts("Operation update failed.");
     }
@@ -105,13 +106,13 @@
     op.identifier = received.value(2).integerValue();
     tmp = received.value(3).characterValue();
     if (strcmp(tmp, "EXECUTING") == 0)
-        op.state = STATE_EXECUTING;
+        op.state = OPERATION_EXECUTING;
     else if (strcmp(tmp, "SUCCESSFUL") == 0)
-        op.state = STATE_SUCCESSFUL;
+        op.state = OPERATION_SUCCESSFUL;
     else if (strcmp(tmp, "FAILED") == 0)
-        op.state = STATE_FAILED;
+        op.state = OPERATION_FAILED;
     else
-        op.state = STATE_PENDING;
+        op.state = OPERATION_PENDING;
     
     return true;
 }
@@ -152,11 +153,11 @@
 CharValue& OperationSupport::operationStateValue(OperationStore::Operation& op)
 {
     switch (op.state) {
-    case STATE_EXECUTING:
+    case OPERATION_EXECUTING:
         return aOperationStateExecuting;
-    case STATE_SUCCESSFUL:
+    case OPERATION_SUCCESSFUL:
         return aOperationStateSuccessful;
-    case STATE_FAILED:
+    case OPERATION_FAILED:
         return aOperationStateFailed;
     default:
         return aOperationStatePending;