Feature #1711

[crea.git] / lib / creaDevManagerLib / modelCDMLibrary.cpp

diff --git a/lib/creaDevManagerLib/modelCDMLibrary.cpp b/lib/creaDevManagerLib/modelCDMLibrary.cpp
index f67999c06748b6441a43c538d07b7cbeb3a2c45c..7b99318b58333425375949bdd6d8b689dd4d5fe8 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMLibrary.cpp
+++ b/lib/creaDevManagerLib/modelCDMLibrary.cpp
@@ -81,7 +81,7 @@ modelCDMLibrary::modelCDMLibrary(modelCDMIProjectTreeNode* parent, const std::st
           if(wordBits[0] == "LIBRARY_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -151,7 +151,7 @@ bool modelCDMLibrary::SetNameLibrary(const std::string& fileName, std::string*&
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, fileName, ", /\\\"", CDMUtilities::splitter::no_empties);
   std::string fileNameReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       fileNameReal += "-" + words[i];
     }
@@ -181,7 +181,11 @@ bool modelCDMLibrary::SetNameLibrary(const std::string& fileName, std::string*&
   in.close();
   out.close();
   //delete old file and rename new file
+#ifdef _WIN32
+  std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#else
   std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#endif
   if(system(renameCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + renameCommand + "'.");
@@ -236,7 +240,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result)
           if(wordBits[0] == "LIBRARY_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -263,7 +267,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result)
           std::string stdfileName = crea::wx2std(fileName);
           //check if they already exist
           bool found = false;
-          for (int i = 0; !found && i < this->folders.size(); i++)
+          for (int i = 0; !found && i < (int)(this->folders.size()); i++)
             {
               if (this->folders[i]->GetName() == stdfileName)
                 {
@@ -309,7 +313,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result)
           else
             {
               bool found = false;
-              for (int i = 0; !found && i < this->children.size(); i++)
+              for (int i = 0; !found && i < (int)(this->children.size()); i++)
                 {
                   if (this->children[i]->GetName() == stdfileName)
                     {
@@ -331,7 +335,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedFolders.size(); i++)
+  for (int i = 0; i < (int)(checkedFolders.size()); i++)
     {
       if(!checkedFolders[i])
         {
@@ -340,7 +344,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result)
           i--;
         }
     }
-  for (int i = 0; i < checked.size(); i++)
+  for (int i = 0; i < (int)(checked.size()); i++)
     {
       if(!checked[i])
         {
@@ -389,7 +393,7 @@ void modelCDMLibrary::CheckStructure(std::map<std::string, bool>& properties)
                 {
                   word = words[0];
                   CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::empties_ok);
-                  for (int i = 0; i < words.size(); i++)
+                  for (int i = 0; i < (int)(words.size()); i++)
                     {
                       if(words[i].substr(0,2) == "//")
                         break;
@@ -418,7 +422,7 @@ void modelCDMLibrary::CheckStructure(std::map<std::string, bool>& properties)
                 {
                   if (words[0] == "${LIBRARY_NAME}_LINK_LIBRARIES")
                     {
-                      for (int i = 1; i < words.size(); i++)
+                      for (int i = 1; i < (int)(words.size()); i++)
                         {
                           properties["library " + this->name + " lib " + words[i]] = true;
                         }