Fix a Clang warning in Shiva.

[flightgear.git] / src / Canvas / property_helper.hxx

diff --git a/src/Canvas/property_helper.hxx b/src/Canvas/property_helper.hxx
index dbafdd77eb279634f49bea0bf8929ea953d04738..92e556afcfd617b7d90214d0d64af325103386e6 100644 (file)
--- a/src/Canvas/property_helper.hxx
+++ b/src/Canvas/property_helper.hxx
@@ -60,12 +60,26 @@ namespace canvas
     return values;
   }
 
+  /**
+   * Split a string by a delimter and convert the values to float
+   *
+   * TODO do we need other types than float?
+   */
+  std::vector<float> splitAndConvert(const char del[], const std::string& str);
+
+  /**
+   * Parse a (CSS) color
+   */
+  osg::Vec4 parseColor(std::string str);
+
   /**
    * @param name    Name of color node
    * @param parent  Parent for color channel nodes
    * @param nodes   Vector to push color nodes into
    * @param def     Default color
    *
+   * @deprecated Use only a single property instead and parse with #parseColor
+   *
    * <name>
    *   <red type="float">def[0] or existing value</red>
    *   <green type="float">def[1] or existing value</green>
@@ -84,6 +98,12 @@ namespace canvas
    */
   void triggerChangeRecursive(SGPropertyNode* node);
 
+  /**
+   * Trigger a childRemoved event for every child of node (Unlimited depth) and
+   * node itself.
+   */
+  void triggerRemoveRecursive(SGPropertyNode* node);
+
 } // namespace canvas
 
 #endif /* PROPERTY_HELPER_HXX_ */