Changeset 42 in pacpusframework for trunk/src

Timestamp:

Jan 8, 2013, 9:44:51 PM (12 years ago)

Author:

sgosseli

Message:

• Coding style
• License header
• Some clean-up

File:

• trunk/src/PacpusLib/ComponentBase.cpp (modified) (4 diffs)

trunk/src/PacpusLib/ComponentBase.cpp

@@ -1 +1 @@
 /**
  *
- * Distributed under the UTC Heudiascy Pacpus License, Version 1.0.
- * Copyright (c) UTC Heudiasyc 2010 - 2013. All rights reserved.
- *
- * See the LICENSE file for more information or a copy at:
- *   http://www.hds.utc.fr/~kurdejma/LICENSE_1_0.txt
- *
+ * This file is part of the PACPUS framework distributed under the 
+ * CECILL-C License, Version 1.0.
+ * 
+ * @author  Samuel Gosselin
+ * @date    December, 2012
+ * @version $Id$
+ * @copyright Copyright (c) UTC/CNRS Heudiasyc 2005 - 2013. All rights reserved.
+ * 
  */
 
@@ -18 +20 @@
 
 ComponentBase::ComponentBase(const QString& name)
+  : componentName(name)
+  , recording(true)
+  , THREAD_ALIVE(true)
+  , mIsActive(false)
+  , mgr(NULL)
+  , componentState_(NOT_MONITORED)
 {
     LOG_TRACE("constructor");
-
-    configuration_ = NOT_CONFIGURED;
-    componentName = name;
-    recording = true;
-    THREAD_ALIVE = true;
-    mIsActive = 0;
-    componentState_ = ComponentBase::NOT_MONITORED;
-
-    // we get a pointer on the instance of ComponentManager
+    // Get a pointer on the instance of ComponentManager.
     mgr = ComponentManager::getInstance();
-
-    LOG_INFO("component " << componentName
-             << " was created"
-             );
+    LOG_INFO("component " << componentName << " was created");
 }
 
@@ -43 +40 @@
 int ComponentBase::startComponent()
 {
-    if (mIsActive == 0) {
-        mIsActive = 1;
-        startActivity();
-        return 1;
-    } else {
-        return 0;
-    }
+    if (mIsActive)
+      return false;
+      
+    mIsActive = true;
+    startActivity();
+    
+    return true;
 }
 
 int ComponentBase::stopComponent()
 {
-    if (mIsActive == 1) {
-        mIsActive = 0;
-        stopActivity();
-        return 1;
-    } else {
-        return 0;
-    }
+    if (!mIsActive)
+      return false;
+
+    mIsActive = false;
+    stopActivity();
+    
+    return true;
 }
 
 void ComponentBase::setState(const COMPONENT_STATE state)
 {
-    if (state != componentState_) {
-        componentState_ = state;
-    }
+    componentState_ = state;
 }
 
@@ -82 +77 @@
 bool ComponentBase::isConfigured() const
 {
-    return CONFIGURED_OK == configuration_;
+    return configuration_ == CONFIGURED_OK;
 }