Changeset 165 in pacpusframework for branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

Timestamp:

Aug 1, 2013, 6:30:31 PM (11 years ago)

Author:

Marek Kurdej

Message:

Major: changed plugins section name to plugings. Parameters section will be used for something else.

File:

• branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp (modified) (8 diffs)

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";
-static const string kPropertyConnectionType = "type";
-static const string kPropertyConnectionInput = "input";
-static const string kPropertyConnectionOutput = "output";
-static const string kPropertyConnectionPriority = "priority";
-//static const string kPropertyConnectionInputC = "inputC";
-//static const string kPropertyConnectionInputP = "inputP";
-//static const string kPropertyConnectionOutputC = "outputC";
-//static const string kPropertyConnectionOutputP = "outputP";
+static const char* kPropertyComponentName = "name";
+static const char* kPropertyComponentType = "type";
+static const char* kPropertyConnectionType = "type";
+static const char* kPropertyConnectionInput = "input";
+static const char* kPropertyConnectionOutput = "output";
+static const char* kPropertyConnectionPriority = "priority";
 
 XmlComponentConfig::XmlComponentConfig(const QString& name)
@@ -47 +42 @@
     {
         LOG_ERROR("cannot add component property:"
-                  << " component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+                  << " component '" << component_.attribute(kPropertyComponentName) << "'"
                   << " already contains property '" << name << "'"
                   << " and its value is '" << component_.attribute(name) << "'"
@@ -57 +52 @@
     component_.setAttribute(name, 0);
     LOG_INFO("property '" << name << "'"
-              << " was added to the component " << component_.attribute(kPropertyComponentName.c_str()) << "'"
+              << " was added to the component " << component_.attribute(kPropertyComponentName) << "'"
               << " and set to '" << component_.attribute(name) << "'"
               );
@@ -66 +61 @@
     if (!hasProperty(name)) {
         LOG_WARN("cannot delete compoenent property '" << name << "'"
-                 << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+                 << " of component '" << component_.attribute(kPropertyComponentName) << "'"
                  << ". Component does not contain this property."
                  );
@@ -75 +70 @@
     component_.removeAttribute(name);
     LOG_INFO("property '" << name << "' "
-      << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+      << " of component '" << component_.attribute(kPropertyComponentName) << "'"
       << " was deleted"
       );
@@ -87 +82 @@
     {
         LOG_WARN("cannot retrieve component property '" << name << "'"
-                 << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+                 << " of component '" << component_.attribute(kPropertyComponentName) << "'"
                  << ". Component does not contain this property."
                  );
@@ -116 +111 @@
     component_.setAttribute(name, value);
     LOG_INFO("property " << name
-             << " of the component " << component_.attribute(kPropertyComponentName.c_str())
+             << " of the component " << component_.attribute(kPropertyComponentName)
              << " was set to : " << value
              );
@@ -138 +133 @@
 QString const XmlComponentConfig::getComponentName() const
 {
-    //return component_.attribute(kPropertyComponentName.c_str());
-    return getProperty(kPropertyComponentName.c_str());
+    return getProperty(kPropertyComponentName);
 }
 
 QString const XmlComponentConfig::getComponentType() const
 {
-    return getProperty(kPropertyComponentType.c_str());
+    return getProperty(kPropertyComponentType);
 }
 
 QString const XmlComponentConfig::getConnectionType() const
 {
-    return getProperty(kPropertyConnectionType.c_str());
+    return getProperty(kPropertyConnectionType);
 }
 
 QString const XmlComponentConfig::getConnectionInput() const
 {
-    return getProperty(kPropertyConnectionInput.c_str());
+    return getProperty(kPropertyConnectionInput);
 }
 
 QString const XmlComponentConfig::getConnectionOutput() const
 {
-    return getProperty(kPropertyConnectionOutput.c_str());
+    return getProperty(kPropertyConnectionOutput);
 }
 
 int const XmlComponentConfig::getConnectionPriority() const
 {
-    return getIntProperty(kPropertyConnectionPriority.c_str(),0);
+    return getIntProperty(kPropertyConnectionPriority, /*defaultValue=*/0);
 }