Changeset 162 in pacpusframework for branches/2.0-beta1/src/PacpusLib

Timestamp:

Aug 1, 2013, 4:46:07 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: merged changes from trunk.

Location:

branches/2.0-beta1/src/PacpusLib

Files:

• ComponentManager.cpp (modified) (2 diffs)
• PacpusApplication.cpp (modified) (2 diffs)
• XmlComponentConfig.cpp (modified) (2 diffs)

branches/2.0-beta1/src/PacpusLib/ComponentManager.cpp

@@ -3 +3 @@
 // CECILL-C License, Version 1.0.
 // %pacpus:license}
+/// @author  Gerald Dherbomez <firstname.surname@utc.fr>
 /// @version    $Id: ComponentManager.cpp 76 2013-01-10 17:05:10Z kurdejma $
 
+#include <Pacpus/kernel/ComponentFactoryBase.h>
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/ComponentBase.h>
@@ -10 +12 @@
 #include <Pacpus/kernel/Log.h>
 #include <QObject>
-
 #include <QDomNodeList>
 

branches/2.0-beta1/src/PacpusLib/PacpusApplication.cpp

@@ -9 +9 @@
 /// @copyright Copyright (c) UTC/CNRS Heudiasyc 2006 - 2013. All rights reserved.
 
-#include <Pacpus/kernel/DbiteException.h>
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/PacpusApplication.h>
+#include <Pacpus/kernel/PacpusException.h>
 
 using namespace pacpus;
@@ -83 +83 @@
     try {
         return QApplication::notify(receiver, ev);
-    } catch(DbiteException & e) {
+    } catch(PacpusException & e) {
         (void) e; // unused
-        LOG_ERROR("DbiteException thrown:" << e.what());
+        LOG_ERROR("PacpusException thrown:" << e.what());
     } catch(std::exception & e) {
         (void) e; // unused

branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

@@ -14 +14 @@
 DECLARE_STATIC_LOGGER("pacpus.core.XmlComponentConfig");
 
+// FIXME: const char* instead of const string
 static const string kPropertyComponentName = "name";
 static const string kPropertyComponentType = "type";
@@ -63 +64 @@
 int XmlComponentConfig::delProperty(const QString& name)
 {
-    if (!hasProperty(name))
-    {
+    if (!hasProperty(name)) {
         LOG_WARN("cannot delete compoenent property '" << name << "'"
                  << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"