Merge remote-tracking branch 'origin/changestoITK3and4'

diff --git a/lib/creaDevManagerLib/CDMUtilities.cpp b/lib/creaDevManagerLib/CDMUtilities.cpp
index cc64ee3e96acfa6376010b08e7adc64afc5b29bd..37f4deb9370e09b7bf2fc7b1130d5ce5ab8f6d1c 100644 (file)
--- a/lib/creaDevManagerLib/CDMUtilities.cpp
+++ b/lib/creaDevManagerLib/CDMUtilities.cpp
@@ -46,37 +46,6 @@
 
 namespace CDMUtilities
 {
-  template <typename Container>
-  Container& splitter::split
-  (
-      Container& result,
-      const typename Container::value_type& s,
-      const typename Container::value_type& delimiters,
-      empties_t empties
-  )
-  {
-    result.clear();
-    size_t current;
-    size_t next = -1;
-    do
-      {
-        if (empties == no_empties)
-          {
-            next = s.find_first_not_of(delimiters, next + 1);
-            if (next == Container::value_type::npos)
-              {
-                break;
-              }
-            next -= 1;
-          }
-        current = next + 1;
-        next = s.find_first_of(delimiters, current);
-        result.push_back(s.substr(current, next - current));
-      }
-    while (next != Container::value_type::npos);
-    return result;
-  }
-
   const std::string fixPath(const std::string& path)
   {
     std::string pathFixed = "";

diff --git a/lib/creaDevManagerLib/CDMUtilities.h b/lib/creaDevManagerLib/CDMUtilities.h
index 92fe3d0cbd409b2cb531711fefd252da8a77b1da..8ec696733767b7052c1cf099974a0e5644a013f9 100644 (file)
--- a/lib/creaDevManagerLib/CDMUtilities.h
+++ b/lib/creaDevManagerLib/CDMUtilities.h
@@ -118,7 +118,29 @@ namespace CDMUtilities
         const typename Container::value_type& s,
         const typename Container::value_type& delimiters,
         empties_t empties = empties_ok
-    );
+      )
+      {
+        result.clear();
+        size_t current;
+        size_t next = -1;
+        do
+        {
+          if (empties == no_empties)
+          {
+            next = s.find_first_not_of(delimiters, next + 1);
+            if (next == Container::value_type::npos)
+            {
+              break;
+            }
+            next -= 1;
+          }
+          current = next + 1;
+          next = s.find_first_of(delimiters, current);
+          result.push_back(s.substr(current, next - current));
+        }
+        while (next != Container::value_type::npos);
+        return result;
+      }
   };
 
   /**

diff --git a/lib/creaDevManagerLib/modelCDMProjectsTreeNode.h b/lib/creaDevManagerLib/modelCDMProjectsTreeNode.h
index 25ec95946782d38cca4df456279e455d0d339032..aa27b185f955fd9a0f605af50c17677cbb4600cb 100755 (executable)
--- a/lib/creaDevManagerLib/modelCDMProjectsTreeNode.h
+++ b/lib/creaDevManagerLib/modelCDMProjectsTreeNode.h
@@ -42,7 +42,7 @@
 class modelCDMProjectsTreeNode
 {
 public:
-  modelCDMProjectsTreeNode();
+  modelCDMProjectsTreeNode() { }
   modelCDMProjectsTreeNode(std::string path, std::string name, unsigned char type, int level);
   ~modelCDMProjectsTreeNode();