Feature #1711

CreaDevManager application implementation

- Changes for windows compatibility Tree hangs because of ids impossibility of recognition.
- Fix warnings because of < operator.
- Change to use of stable functions.

diff --git a/appli/creaDevManager/creaDevManager.cpp b/appli/creaDevManager/creaDevManager.cpp
index 36c64ed208e4ded3a6acb902cb5389285c200351..d47907aafce1158e8330563ebc2febe69dd4ad1b 100644 (file)
--- a/appli/creaDevManager/creaDevManager.cpp
+++ b/appli/creaDevManager/creaDevManager.cpp
@@ -30,6 +30,7 @@
 #include "creaDevManager.h"
 
 IMPLEMENT_APP(wxCreaDevManagerApp)
+CREA_WXMAIN_WITH_CONSOLE
 
 wxCreaDevManagerApp::wxCreaDevManagerApp():wxApp()
 {

diff --git a/appli/creaSed/creaSed.cpp b/appli/creaSed/creaSed.cpp
index 0f9927b42b029569aea39c05c84f6c76224c73d3..95ddc729704282a33316ccc52f5671af4f356ed9 100644 (file)
--- a/appli/creaSed/creaSed.cpp
+++ b/appli/creaSed/creaSed.cpp
@@ -72,8 +72,8 @@ int main(int argc, char **argv)
   findstring   = argv[2];
   replacestring = argv[3];
 
-  ffIn =  fopen(fileIn.c_str(),"r");
-  if (ffIn){
+  errno_t errorOpen = fopen_s(&ffIn, fileIn.c_str(),"r");
+  if (!errorOpen && ffIn){
         while(!feof(ffIn)){
            fgets( strTmp , 255, ffIn );
             lineStr=strTmp;

diff --git a/lib/creaDevManagerLib/CDMUtilities.cpp b/lib/creaDevManagerLib/CDMUtilities.cpp
index 4d409542b221dfb2ae83a975d1d1ece393d412d2..29ed9c0371ffafc1c8dc9c973566fc8ca256d402 100644 (file)
--- a/lib/creaDevManagerLib/CDMUtilities.cpp
+++ b/lib/creaDevManagerLib/CDMUtilities.cpp
@@ -87,7 +87,7 @@ namespace CDMUtilities
        if(0 < pathSplit.size())
                pathFixed = pathSplit[0];
 
-    for (int i = 1; i < pathSplit.size(); i++)
+    for (int i = 1; i < (int)(pathSplit.size()); i++)
       {
         pathFixed += CDMUtilities::SLASH + pathSplit[i];
       }
@@ -162,7 +162,7 @@ namespace CDMUtilities
     std::vector<std::string> words;
     splitter::split(words,name," \\/\",.'`",splitter::no_empties);
     std::string fixedName = "";
-    for (int i = 0; i < words.size(); i++)
+    for (int i = 0; i < (int)(words.size()); i++)
       {
         fixedName += words[i];
       }

diff --git a/lib/creaDevManagerLib/modelCDMAppli.cpp b/lib/creaDevManagerLib/modelCDMAppli.cpp
index 586c550dcf01e0e1263297853403956d31839671..4f61e13de3c84c765474ec4d709b798e46a5a265 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMAppli.cpp
+++ b/lib/creaDevManagerLib/modelCDMAppli.cpp
@@ -191,7 +191,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
               std::string applicationName = stdfileName;
               //check if application already exist
               bool found = false;
-              for (int i = 0; !found && i < this->applications.size(); i++)
+              for (int i = 0; !found && i < (int)(this->applications.size()); i++)
                 {
                   if (this->applications[i]->GetName() == applicationName)
                     {
@@ -214,7 +214,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
             {
               //check if folder already exist
               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)
                     {
@@ -259,7 +259,7 @@ const bool modelCDMAppli::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)
                     {
@@ -281,7 +281,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedApplications.size(); i++)
+  for (int i = 0; i < (int)(checkedApplications.size()); i++)
     {
       if(!checkedApplications[i])
         {
@@ -290,7 +290,7 @@ const bool modelCDMAppli::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])
         {
@@ -311,7 +311,7 @@ void modelCDMAppli::CheckStructure(std::map<std::string, bool>& properties)
   if(this->CMakeLists != NULL)
     {
       //set properties parameters based on model
-      for (int i = 0; i < this->applications.size(); i++)
+      for (int i = 0; i < (int)(this->applications.size()); i++)
         properties["appli add " + this->applications[i]->GetName()] = false;
 
       //open cmakelists
@@ -333,7 +333,7 @@ void modelCDMAppli::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;
@@ -371,7 +371,7 @@ void modelCDMAppli::CheckStructure(std::map<std::string, bool>& properties)
     }
 
   //check libraries' structure
-  for (int i = 0; i < this->applications.size(); i++)
+  for (int i = 0; i < (int)(this->applications.size()); i++)
     {
       properties["application " + this->applications[i]->GetName()] = true;
       this->applications[i]->CheckStructure(properties);

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index 56c9e08bbae20cdb00db5e66d2042c61c0368bd3..40fb8105b12dbb270f7e2704eb9cd5e7f95a7622 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMApplication.cpp
+++ b/lib/creaDevManagerLib/modelCDMApplication.cpp
@@ -82,7 +82,7 @@ modelCDMApplication::modelCDMApplication(modelCDMIProjectTreeNode* parent, const
           if(wordBits[0] == "EXE_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -176,7 +176,7 @@ bool modelCDMApplication::SetExecutableName(const std::string& fileName, std::st
   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];
     }
@@ -262,7 +262,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
           if(wordBits[0] == "EXE_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -290,7 +290,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
           std::string applicationName = stdfileName;
           //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() == applicationName)
                 {
@@ -336,7 +336,7 @@ const bool modelCDMApplication::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)
                     {
@@ -400,7 +400,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedFolders.size(); i++)
+  for (int i = 0; i < (int)(checkedFolders.size()); i++)
     {
       if(!checkedFolders[i])
         {
@@ -409,7 +409,7 @@ const bool modelCDMApplication::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])
         {
@@ -456,7 +456,7 @@ void modelCDMApplication::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;
@@ -485,7 +485,7 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
                 {
                   if (words[0] == "${EXE_NAME}_LINK_LIBRARIES")
                     {
-                      for (int i = 1; i < words.size(); i++)
+                      for (int i = 1; i < (int)(words.size()); i++)
                         {
                           properties["application " + this->name + " lib " + words[i]] = true;
                         }
@@ -498,7 +498,7 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
 
               CDMUtilities::splitter::split(words, word, " \t", CDMUtilities::splitter::no_empties);
 
-              for (int i = 0; i < words.size(); i++)
+              for (int i = 0; i < (int)(words.size()); i++)
                 {
                   properties["application " + this->name + " dir " + words[i]] = true;
                 }

diff --git a/lib/creaDevManagerLib/modelCDMBlackBox.cpp b/lib/creaDevManagerLib/modelCDMBlackBox.cpp
index c92c6777725e724c3729b679b9cfebeb8eb4c5d2..295a4333b2a5eb537ded5e3c8a43a27f11d38935 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMBlackBox.cpp
+++ b/lib/creaDevManagerLib/modelCDMBlackBox.cpp
@@ -132,7 +132,7 @@ bool modelCDMBlackBox::SetAuthors(const std::string& authors, std::string*& resu
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, authors, "/\\\"\n", CDMUtilities::splitter::no_empties);
   std::string authorsReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       authorsReal += "," + words[i];
     }
@@ -192,7 +192,7 @@ bool modelCDMBlackBox::SetCategories(
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, categories, "\"\\/", CDMUtilities::splitter::no_empties);
   std::string catsReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       catsReal += "," + words[i];
     }
@@ -251,7 +251,7 @@ bool modelCDMBlackBox::SetDescription(
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, description, "\"\n\\/", CDMUtilities::splitter::no_empties);
   std::string descReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       descReal += "-" + words[i];
     }

diff --git a/lib/creaDevManagerLib/modelCDMFolder.cpp b/lib/creaDevManagerLib/modelCDMFolder.cpp
index ca83e0550eb114af6075c73e0e98d51631004350..bcef483f2c6146028430e6baf83e3ca098cee4c7 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMFolder.cpp
+++ b/lib/creaDevManagerLib/modelCDMFolder.cpp
@@ -107,7 +107,7 @@ modelCDMFolder::~modelCDMFolder()
 {
   this->folders.clear();
   this->CMakeLists = NULL;
-  for (int i = 0; i < this->children.size(); i++)
+  for (int i = 0; i < (int)(this->children.size()); i++)
     {
       if(this->children[i] != NULL)
         {
@@ -186,7 +186,7 @@ const bool modelCDMFolder::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)
                 {
@@ -233,7 +233,7 @@ const bool modelCDMFolder::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)
                     {
@@ -255,7 +255,7 @@ const bool modelCDMFolder::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedFolders.size(); i++)
+  for (int i = 0; i < (int)(checkedFolders.size()); i++)
     {
       if(!checkedFolders[i])
         {
@@ -264,7 +264,7 @@ const bool modelCDMFolder::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])
         {

diff --git a/lib/creaDevManagerLib/modelCDMLib.cpp b/lib/creaDevManagerLib/modelCDMLib.cpp
index e09cf2d978b3a4bb693ce4d6fb6c2f7dd9ee07db..57411ec64f340fc70288a41e9d364eb33904831c 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMLib.cpp
+++ b/lib/creaDevManagerLib/modelCDMLib.cpp
@@ -193,7 +193,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
               std::string libraryName = stdfileName;
               //check if library already exist
               bool found = false;
-              for (int i = 0; !found && i < this->libraries.size(); i++)
+              for (int i = 0; !found && i < (int)(this->libraries.size()); i++)
                 {
                   if (this->libraries[i]->GetName() == libraryName)
                     {
@@ -216,7 +216,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
             {
               //check if folder already exist
               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)
                     {
@@ -260,7 +260,7 @@ const bool modelCDMLib::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)
                     {
@@ -282,7 +282,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedLibraries.size(); i++)
+  for (int i = 0; i < (int)(checkedLibraries.size()); i++)
     {
       if(!checkedLibraries[i])
         {
@@ -291,7 +291,7 @@ const bool modelCDMLib::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])
         {
@@ -312,7 +312,7 @@ void modelCDMLib::CheckStructure(std::map<std::string, bool>& properties)
   if(this->CMakeLists != NULL)
     {
       //set properties parameters based on model
-      for (int i = 0; i < this->libraries.size(); i++)
+      for (int i = 0; i < (int)(this->libraries.size()); i++)
         properties["lib add " + libraries[i]->GetName()] = false;
 
       //open cmakelists
@@ -334,7 +334,7 @@ void modelCDMLib::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;
@@ -372,7 +372,7 @@ void modelCDMLib::CheckStructure(std::map<std::string, bool>& properties)
     }
 
   //check libraries' structure
-  for (int i = 0; i < this->libraries.size(); i++)
+  for (int i = 0; i < (int)(this->libraries.size()); i++)
     {
       properties["library " + this->libraries[i]->GetName()] = true;
       this->libraries[i]->CheckStructure(properties);

diff --git a/lib/creaDevManagerLib/modelCDMLibrary.cpp b/lib/creaDevManagerLib/modelCDMLibrary.cpp
index f67999c06748b6441a43c538d07b7cbeb3a2c45c..58cc8929b669dea3741d889e30b937d297f34fae 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];
     }
@@ -236,7 +236,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 +263,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 +309,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 +331,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 +340,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 +389,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 +418,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;
                         }

diff --git a/lib/creaDevManagerLib/modelCDMMain.cpp b/lib/creaDevManagerLib/modelCDMMain.cpp
index 7b47e90035841b8cafb42d19a26113b6246ba121..fa5a96fe6931bbe00025a8a822487dd3b9c5e032 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMMain.cpp
+++ b/lib/creaDevManagerLib/modelCDMMain.cpp
@@ -176,10 +176,11 @@ bool modelCDMMain::OpenProject(
 
   //check if Makefile file exists
   std::string pathMakefile = pathFixed + CDMUtilities::SLASH + "Makefile";
-  FILE* pFile = fopen(pathMakefile.c_str(), "r");
+  FILE* pFile;
+  errno_t errorOpen = fopen_s(&pFile, pathMakefile.c_str(), "r");
 
   //is the binary folder
-  if (pFile != NULL)
+  if (!errorOpen && pFile)
     {
       fclose(pFile);
       std::ifstream readFile;
@@ -206,10 +207,10 @@ bool modelCDMMain::OpenProject(
   std::string pathSource = "";
   //check if CMakeLists file exists
   std::string pathCMakeLists = pathFixed + CDMUtilities::SLASH + "CMakeLists.txt";
-  pFile = fopen(pathCMakeLists.c_str(), "r");
+  errorOpen = fopen_s(&pFile, pathCMakeLists.c_str(), "r");
 
   //is the source folder
-  if (pFile != NULL)
+  if (!errorOpen && pFile)
     {
       fclose(pFile);
       std::ifstream readFile;

diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp
index 0f001bbde823b9733887cb11a3a282dc994b29ef..78b6adf6ffdeb85c5c92e8d31094861e516021ad 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMPackage.cpp
+++ b/lib/creaDevManagerLib/modelCDMPackage.cpp
@@ -76,7 +76,7 @@ modelCDMPackage::modelCDMPackage(modelCDMIProjectTreeNode* parent, const std::st
           if(wordBits[0] == "BBTK_PACKAGE_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -88,7 +88,7 @@ modelCDMPackage::modelCDMPackage(modelCDMIProjectTreeNode* parent, const std::st
           else if(wordBits[0] == "${BBTK_PACKAGE_NAME}_AUTHOR")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -100,7 +100,7 @@ modelCDMPackage::modelCDMPackage(modelCDMIProjectTreeNode* parent, const std::st
           else if(wordBits[0] == "${BBTK_PACKAGE_NAME}_DESCRIPTION")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -214,7 +214,7 @@ bool modelCDMPackage::SetAuthors(const std::string& authors, std::string*& resul
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, authors, ",\n", CDMUtilities::splitter::no_empties);
   std::string authorsReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       authorsReal += "/" + words[i];
     }
@@ -312,7 +312,7 @@ bool modelCDMPackage::SetDescription(const std::string& description, std::string
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, description, " \n", CDMUtilities::splitter::no_empties);
   std::string descriptionReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       descriptionReal += " " + words[i];
     }
@@ -395,7 +395,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
           if(wordBits[0] == "BBTK_PACKAGE_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -407,7 +407,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
           else if(wordBits[0] == "${BBTK_PACKAGE_NAME}_AUTHOR")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -419,7 +419,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
           else if(wordBits[0] == "${BBTK_PACKAGE_NAME}_DESCRIPTION")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -484,7 +484,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
 
               //check if folder already exist
               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)
                     {
@@ -529,7 +529,7 @@ const bool modelCDMPackage::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)
                     {
@@ -556,7 +556,7 @@ const bool modelCDMPackage::Refresh(std::string*& result)
       this->src = NULL;
     }
 
-  for (int i = 0; i < checked.size(); i++)
+  for (int i = 0; i < (int)(checked.size()); i++)
     {
       if(!checked[i])
         {
@@ -594,7 +594,7 @@ void modelCDMPackage::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;
@@ -655,7 +655,7 @@ void modelCDMPackage::CheckStructure(std::map<std::string, bool>& properties)
                     }
                   else if (words[0] == "${BBTK_PACKAGE_NAME}_INCLUDE_DIRS")
                     {
-                      for (int i = 1; i < words.size(); i++)
+                      for (int i = 1; i < (int)(words.size()); i++)
                         {
                           if(words[i].substr(0,2) == "${" || words[i].substr(0,2) == "..")
                           properties["package " + this->name + " dir " + words[i]] = true;
@@ -663,7 +663,7 @@ void modelCDMPackage::CheckStructure(std::map<std::string, bool>& properties)
                     }
                   else if (words[0] == "${BBTK_PACKAGE_NAME}_LIBS")
                     {
-                      for (int i = 1; i < words.size(); i++)
+                      for (int i = 1; i < (int)(words.size()); i++)
                         {
                           properties["package " + this->name + " lib " + words[i]] = true;
                         }

diff --git a/lib/creaDevManagerLib/modelCDMPackageSrc.cpp b/lib/creaDevManagerLib/modelCDMPackageSrc.cpp
index a5f3080c40ec171b0e5bf4337a6507c6073e0097..17c37a254c47790c2e1bcbd6333a5be65e9a6833 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMPackageSrc.cpp
+++ b/lib/creaDevManagerLib/modelCDMPackageSrc.cpp
@@ -116,7 +116,7 @@ modelCDMPackageSrc::modelCDMPackageSrc(modelCDMIProjectTreeNode* parent, const s
 
 modelCDMPackageSrc::~modelCDMPackageSrc()
 {
-  for (int i = 0; i < this->blackBoxes.size(); i++)
+  for (int i = 0; i < (int)(this->blackBoxes.size()); i++)
     {
       if(this->blackBoxes[i] != NULL)
         {
@@ -147,7 +147,7 @@ modelCDMBlackBox* modelCDMPackageSrc::CreateBlackBox(
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, name, " \n\",/\\'", CDMUtilities::splitter::no_empties);
   std::string bbName;
-  for (int i = 0; i < words.size(); i++)
+  for (int i = 0; i < (int)(words.size()); i++)
     {
       bbName += words[i];
     }
@@ -158,7 +158,7 @@ modelCDMBlackBox* modelCDMPackageSrc::CreateBlackBox(
   if(words.size() > 0)
     {
       bbCategories = words[0];
-      for (int i = 1; i < words.size(); i++)
+      for (int i = 1; i < (int)(words.size()); i++)
         {
           bbCategories += "," + words[i];
         }
@@ -172,7 +172,7 @@ modelCDMBlackBox* modelCDMPackageSrc::CreateBlackBox(
   if(words.size() > 0)
     {
       bbAuthors = words[0];
-      for (int i = 1; i < words.size(); i++)
+      for (int i = 1; i < (int)(words.size()); i++)
         {
           bbAuthors += "," + words[i];
         }
@@ -186,7 +186,7 @@ modelCDMBlackBox* modelCDMPackageSrc::CreateBlackBox(
   if(words.size() > 0)
     {
       bbDescription = words[0];
-      for (int i = 1; i < words.size(); i++)
+      for (int i = 1; i < (int)(words.size()); i++)
         {
           bbDescription += "," + words[i];
         }
@@ -196,7 +196,7 @@ modelCDMBlackBox* modelCDMPackageSrc::CreateBlackBox(
   if(words.size() > 0)
     {
       bbDescription += words[0];
-      for (int i = 1; i < words.size(); i++)
+      for (int i = 1; i < (int)(words.size()); i++)
         {
           bbDescription += words[i];
         }
@@ -297,7 +297,7 @@ const bool modelCDMPackageSrc::Refresh(std::string*& result)
           std::string folderName = stdfileName;
           //check if they already exist
           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() == folderName)
                 {
@@ -340,7 +340,7 @@ const bool modelCDMPackageSrc::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)
                     {
@@ -362,7 +362,7 @@ const bool modelCDMPackageSrc::Refresh(std::string*& result)
           if(stdfileName.substr(stdfileName.size() - 2, 2) == ".h" && stdfileName.substr(0,2) == "bb")
             {
               bool found = false;
-              for (int i = 0; i < this->blackBoxes.size(); i++)
+              for (int i = 0; i < (int)(this->blackBoxes.size()); i++)
                 {
                   if(this->blackBoxes[i]->GetHeaderFile()->GetName() == stdfileName)
                     {
@@ -386,7 +386,7 @@ const bool modelCDMPackageSrc::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedBoxes.size(); i++)
+  for (int i = 0; i < (int)(checkedBoxes.size()); i++)
     {
       if(!checkedBoxes[i])
         {
@@ -397,7 +397,7 @@ const bool modelCDMPackageSrc::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checked.size(); i++)
+  for (int i = 0; i < (int)(checked.size()); i++)
     {
       if(!checked[i])
         {

diff --git a/lib/creaDevManagerLib/modelCDMProject.cpp b/lib/creaDevManagerLib/modelCDMProject.cpp
index 51f642a0b097068da7d779cccbb84a6e561620dc..14422b6286332463bbe1fa7f82e6b9db64d8ed32 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMProject.cpp
+++ b/lib/creaDevManagerLib/modelCDMProject.cpp
@@ -87,7 +87,7 @@ modelCDMProject::modelCDMProject(
           CDMUtilities::splitter::split(nameBits, word, " ", CDMUtilities::splitter::no_empties);
 
           this->name = this->nameProject = "";
-          for (int i = 0; i < nameBits.size(); i++)
+          for (int i = 0; i < (int)(nameBits.size()); i++)
             {
               if(i != 0)
                 this->name += " ";
@@ -261,10 +261,12 @@ bool modelCDMProject::SetVersion(const std::string& version, std::string*& resul
   CDMUtilities::splitter::split(vers, version, " .", CDMUtilities::splitter::no_empties);
 
   time_t now = time(0);
-  tm* ltm = localtime(&now);
+
+  tm ltm;
+  localtime_s(&ltm, &now);
 
   std::stringstream date;
-  date << ltm->tm_mday << "/" << 1 + ltm->tm_mon << "/" << 1900 + ltm->tm_year;
+  date << ltm.tm_mday << "/" << 1 + ltm.tm_mon << "/" << 1900 + ltm.tm_year;
 
   //set name of library in CMakeLists inside copied folder
   std::string line;
@@ -337,7 +339,7 @@ modelCDMIProjectTreeNode* modelCDMProject::CreatePackage(
 
   CDMUtilities::splitter::split(words,name," ",CDMUtilities::splitter::no_empties);
   std::string nameFixed = "";
-  for (int i = 0; i < words.size(); i++)
+  for (int i = 0; i < (int)(words.size()); i++)
     {
       nameFixed += words[i];
     }
@@ -345,7 +347,7 @@ modelCDMIProjectTreeNode* modelCDMProject::CreatePackage(
   words.clear();
   CDMUtilities::splitter::split(words,authors," ",CDMUtilities::splitter::no_empties);
   std::string authorFixed;
-  for (int i = 0; i < words.size(); i++)
+  for (int i = 0; i < (int)(words.size()); i++)
     {
       authorFixed += words[i];
     }
@@ -353,13 +355,13 @@ modelCDMIProjectTreeNode* modelCDMProject::CreatePackage(
   words.clear();
   std::string descriptionFixed;
   CDMUtilities::splitter::split(words,authorsEmail," ",CDMUtilities::splitter::no_empties);
-  for (int i = 0; i < words.size(); i++)
+  for (int i = 0; i < (int)(words.size()); i++)
     {
       descriptionFixed += words[i];
     }
   words.clear();
   CDMUtilities::splitter::split(words,description," ",CDMUtilities::splitter::no_empties);
-  for (int i = 0; i < words.size(); i++)
+  for (int i = 0; i < (int)(words.size()); i++)
     {
       descriptionFixed += "_" + words[i];
     }
@@ -463,7 +465,7 @@ const bool modelCDMProject::Refresh(std::string*& result)
           CDMUtilities::splitter::split(nameBits, word, " ", CDMUtilities::splitter::no_empties);
 
           this->name = this->nameProject = "";
-          for (int i = 0; i < nameBits.size(); i++)
+          for (int i = 0; i < (int)(nameBits.size()); i++)
             {
               if(i != 0)
                 this->name += " ";
@@ -556,7 +558,7 @@ const bool modelCDMProject::Refresh(std::string*& result)
           else if(stdfileName.size() > 9 && stdfileName.substr(0,5) == "bbtk_" && stdfileName.substr(stdfileName.size()-4,4) == "_PKG")
             {
               bool found = false;
-              for (int i = 0; !found && i < this->packages.size(); i++)
+              for (int i = 0; !found && i < (int)(this->packages.size()); i++)
                 {
                   if (this->packages[i]->GetName() == stdfileName)
                     {
@@ -580,7 +582,7 @@ const bool modelCDMProject::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)
                     {
@@ -626,7 +628,7 @@ const bool modelCDMProject::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)
                     {
@@ -648,7 +650,7 @@ const bool modelCDMProject::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedPackages.size(); i++)
+  for (int i = 0; i < (int)(checkedPackages.size()); i++)
     {
       if(!checkedPackages[i])
         {
@@ -657,7 +659,7 @@ const bool modelCDMProject::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])
         {
@@ -802,7 +804,7 @@ void modelCDMProject::CheckStructure(std::map<std::string, bool>& properties)
       //set properties parameters based on model
       properties["project add appli"] = this->appli != NULL;
       properties["project add lib"] = this->lib != NULL;
-      for (int i = 0; i < this->packages.size(); i++)
+      for (int i = 0; i < (int)(this->packages.size()); i++)
         properties["project add " + packages[i]->GetName()] = false;
 
       //open cmakelists
@@ -824,7 +826,7 @@ void modelCDMProject::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;
@@ -922,7 +924,7 @@ void modelCDMProject::CheckStructure(std::map<std::string, bool>& properties)
   //check lib's structure
   this->lib->CheckStructure(properties);
   //check packages' structure
-  for (int i = 0; i < this->packages.size(); i++)
+  for (int i = 0; i < (int)(this->packages.size()); i++)
     {
       properties["package " + this->packages[i]->GetName()] = true;
       this->packages[i]->CheckStructure(properties);

diff --git a/lib/creaDevManagerLib/modelCDMProjectsTree.cpp b/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
index 06b9fb9e7fe0eee5af3b78ef42758f913401fbf6..7e00d95f991f1af25fe3df8f39f13fbed1dcbe50 100755 (executable)
--- a/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
+++ b/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
@@ -109,7 +109,7 @@ void modelCDMProjectsTree::SetRoot(std::string path)
   }
 
   path = "/";
-  for (int i = 0; i < breadcrumbs.size()-1; i++)
+  for (int i = 0; i < (int)(breadcrumbs.size())-1; i++)
   {
     path += breadcrumbs[i] + "/";
   }

diff --git a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
index 7d59be01986df4a14b27d9927a5891bdeb4997a5..7c087cbbda62cf5702397d6536db2f1c922cee8e 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
@@ -91,12 +91,12 @@ void wxCDMAppliDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->appli->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -123,7 +123,7 @@ void wxCDMAppliDescriptionPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
-  for (int i = 0; i < applications.size(); i++)
+  for (int i = 0; i < (int)(applications.size()); i++)
     {
       wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str()));
       pApplicationlk->SetWindowStyle(wxALIGN_LEFT);
@@ -235,7 +235,7 @@ void wxCDMAppliDescriptionPanel::OnLnkApplicationSelect(wxHyperlinkEvent& event)
 {
   modelCDMApplication* applicationFound = NULL;
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
-  for (int i = 0; i < applications.size(); i++)
+  for (int i = 0; i < (int)(applications.size()); i++)
     {
       if(applications[i]->GetName() == crea::wx2std(event.GetURL()))
         {
@@ -259,7 +259,7 @@ void wxCDMAppliDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->appli->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {
@@ -284,7 +284,7 @@ void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
   std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMApplication* theApp = NULL;
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
-  for (int i = 0; i < applications.size(); i++)
+  for (int i = 0; i < (int)(applications.size()); i++)
     {
       if(applications[i]->GetName() == AppName)
         {
@@ -304,7 +304,7 @@ void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event)
   std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMApplication* theApp = NULL;
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
-  for (int i = 0; i < applications.size(); i++)
+  for (int i = 0; i < (int)(applications.size()); i++)
     {
       if(applications[i]->GetName() == AppName)
         {

diff --git a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
index 1ccf43580e8e80bf7e3aef7d33521f3b369fabcf..ec904c7b2333e11140af82e0c1e8a4131920e552 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMApplicationDescriptionPanel.cpp
@@ -92,12 +92,12 @@ void wxCDMApplicationDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->application->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -203,7 +203,7 @@ void wxCDMApplicationDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->application->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {

diff --git a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
index 19385fe9654a251f5949477753f08fa87cdd7d54..0d2eb5df1fc34afb4bc222db75a0248cc91ee76c 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
@@ -91,12 +91,12 @@ void wxCDMBlackBoxDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->blackBox->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -214,7 +214,7 @@ void wxCDMBlackBoxDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->blackBox->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {

diff --git a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp
index 6fd19d595ef2b794a001d5f954ac71961125daec..da4047ded480625544b87eddf0743c0a46e7d2f3 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMCMakeListsDescriptionPanel.cpp
@@ -85,12 +85,12 @@ void wxCDMCMakeListsDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->cMakeLists->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -144,7 +144,7 @@ void wxCDMCMakeListsDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->cMakeLists->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {

diff --git a/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp
index 990f3ec196364b53c7ce075bc9f595ae6d67dcaa..3f0e5f5823d9ede13509452f27cfc9a276a22b66 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMFileDescriptionPanel.cpp
@@ -87,12 +87,12 @@ void wxCDMFileDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->file->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -178,7 +178,7 @@ void wxCDMFileDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->file->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {

diff --git a/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp
index 61a98cbd903aaa59223eb0faa249049544d02dc5..1da28aaf2111aed407704fe78a12c77e436ec04b 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMFolderDescriptionPanel.cpp
@@ -88,12 +88,12 @@ void wxCDMFolderDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->folder->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -161,7 +161,7 @@ void wxCDMFolderDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->folder->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {

diff --git a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
index 551d12cea78d9ce5cf6200a00efbc919132ee9b8..4cb283744c80979fa5d7cd8e5d8d9bc1b1f38d9b 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
@@ -89,12 +89,12 @@ void wxCDMLibDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->lib->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -120,7 +120,7 @@ void wxCDMLibDescriptionPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       wxHyperlinkCtrl* pLibrarylk = new wxHyperlinkCtrl(propertiesPanel, ID_LINK_SELECT_LIBRARY, crea::std2wx(libraries[i]->GetName().c_str()), crea::std2wx(libraries[i]->GetName().c_str()));
       pLibrarylk->SetWindowStyle(wxALIGN_LEFT);
@@ -232,7 +232,7 @@ void wxCDMLibDescriptionPanel::OnLnkLibrarySelect(wxHyperlinkEvent& event)
 {
   modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == crea::wx2std(event.GetURL()))
         {
@@ -258,7 +258,7 @@ void wxCDMLibDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->lib->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {
@@ -283,7 +283,7 @@ void wxCDMLibDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
   std::string LibName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == LibName)
         {
@@ -303,7 +303,7 @@ void wxCDMLibDescriptionPanel::OnMouseExit(wxMouseEvent& event)
   std::string LibName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == LibName)
         {

diff --git a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
index 52d0d2714da3ebaf698f1ab1fb7465a20262a2db..4bbf234840c00050734aad270d03e32efee20853 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp
@@ -91,12 +91,12 @@ void wxCDMLibraryDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->library->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -191,7 +191,7 @@ void wxCDMLibraryDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->library->GetParents();
     std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
     //std::cout << parentURL << std::endl;
-    for (int i = 0; i < parents.size(); i++)
+    for (int i = 0; i < (int)(parents.size()); i++)
       {
         if (parents[i]->GetPath() == parentURL)
           {

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index ad37e22c023a6bc3f12de9fd1ab7163100d14836..45dc8e587af7b58c181854246764400458d2b57e 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -29,6 +29,7 @@
 #include "wxCDMMainFrame.h"
 
 #include <iostream>
+#include <sstream>
 
 #include <creaWx.h>
 #include "creaSystem.h"
@@ -274,13 +275,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           event.Skip();
           return;
         }
-
-      //populate tree control
-      tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
-      tree_Projects->Unselect();
-      tree_Projects->SelectItem(this->model->GetProject()->GetId());
-
-
+      
       //show project actions panel
       if(this->panel_ProjectActions != NULL)
         {
@@ -288,7 +283,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           this->panel_ProjectActions->Destroy();
           this->panel_ProjectActions = NULL;
         }
-
+         
       panel_ProjectActions = new wxCDMProjectActionsPanel(
           this,
           this->model->GetProject(),
@@ -298,18 +293,16 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           wxSize(800,200),
           0
       );
-      panel_ProjectActions->SetMinSize(wxSize(500, 100));
-
-
+      
       auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false));
-
       auiManager.Update();
 
-      //wxMessageBox(_T("New Project created!"),_T("New Project - Success!"), wxOK | wxICON_INFORMATION);
-
+      //populate tree control
+      tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
+      tree_Projects->Unselect();
+         tree_Projects->SelectItem(this->model->GetProject()->GetId());
+         wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
     }
-
-  event.Skip();
 }
 void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
 {
@@ -353,7 +346,7 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       //populate tree control
       tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
       tree_Projects->Unselect();
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+         tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
 
 
 
@@ -597,15 +590,16 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
   //get selected element
   wxTreeItemId elementId = event.GetItem();
-  if(this->tree_Projects->IsSelected(elementId))
+  if(elementId.IsOk() && this->tree_Projects->IsSelected(elementId))
     {
       std::cout << "Tree Selection id: " << elementId << std::endl;
       //get element from model
       modelCDMIProjectTreeNode* element = this->model->GetModelElements()[elementId];
+
          if (element == NULL)
                  return;
       std::cout << "Tree Selection: " << element->GetName() << std::endl;
-               
+               
       //TODO get element type
       //project
       modelCDMProject* elementProject = dynamic_cast<modelCDMProject*>(element);
@@ -646,7 +640,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
             {
               //application
               modelCDMApplication* elementApplication = dynamic_cast<modelCDMApplication*>(element);
-              if(elementApplication != NULL)
+                         if(elementApplication != NULL)
                 {
                   //create element description
                   description = new wxCDMApplicationDescriptionPanel(

diff --git a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
index 2c8882e49b79dd8d1d503bd5de12b75a126ea2ca..a2868679c1904ad95b8f731c4b4eb10316791000 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
@@ -99,12 +99,12 @@ void wxCDMPackageDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->package->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -183,7 +183,7 @@ void wxCDMPackageDescriptionPanel::CreateControls()
 
 
   std::vector<modelCDMBlackBox*> blackBoxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < blackBoxes.size(); i++)
+  for (int i = 0; i < (int)(blackBoxes.size()); i++)
     {
 
       if(blackBoxes[i] != NULL)
@@ -248,7 +248,7 @@ void wxCDMPackageDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->package->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       if (parents[i]->GetPath() == parentURL)
         {
@@ -341,7 +341,7 @@ void wxCDMPackageDescriptionPanel::OnLnkBlackBoxSelect(wxHyperlinkEvent& event)
 {
   modelCDMBlackBox* bb;
   std::vector<modelCDMBlackBox*> bbs = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < bbs.size(); i++)
+  for (int i = 0; i < (int)(bbs.size()); i++)
     {
       if(bbs[i]->GetName() == crea::wx2std(event.GetURL()))
         {
@@ -438,7 +438,7 @@ void wxCDMPackageDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 
   modelCDMFile* bbHeader = NULL;
   std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < boxes.size(); i++)
+  for (int i = 0; i < (int)(boxes.size()); i++)
     {
       if(boxes[i]->GetName() == BBName)
         {
@@ -458,7 +458,7 @@ void wxCDMPackageDescriptionPanel::OnMouseExit(wxMouseEvent& event)
   std::string BBName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMFile* bbHeader = NULL;
   std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < boxes.size(); i++)
+  for (int i = 0; i < (int)(boxes.size()); i++)
     {
       if(boxes[i]->GetName() == BBName)
         {

diff --git a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
index cd3adf3fa28ef4313a25325d39597fab7f34bf0c..3176c561b57561280a9a610b53527208e755b2eb 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
@@ -113,7 +113,7 @@ void wxCDMPackageManagerPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       wxHyperlinkCtrl* pPackagelk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_PACKAGE, crea::std2wx(packages[i]->GetName().c_str()), crea::std2wx(packages[i]->GetName().c_str()));
       pPackagelk->SetWindowStyle(wxALIGN_LEFT);
@@ -184,7 +184,7 @@ void wxCDMPackageManagerPanel::OnLnkPackageSelect(wxHyperlinkEvent& event)
 {
   modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       if(packages[i]->GetName() == crea::wx2std(event.GetURL()))
         {
@@ -268,7 +268,7 @@ void wxCDMPackageManagerPanel::OnMouseEnter(wxMouseEvent& event)
   std::string PkgName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       if(packages[i]->GetName() == PkgName)
         {
@@ -289,7 +289,7 @@ void wxCDMPackageManagerPanel::OnMouseExit(wxMouseEvent& event)
   modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
   project->GetPackages();
-  for (int i = 0; i < packages.size(); i++)
+  for (int i = 0; i < (int)(packages.size()); i++)
     {
       if(packages[i]->GetName() == PkgName)
         {

diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
index 3b471199e0270ef5c25d798b4b8217dceeff025f..af393af26e2fc55e16f7f40603b2b9abb91c7138 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
+++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
@@ -36,6 +36,7 @@
 #include "wxCDMProjectsTreeCtrl.h"
 
 #include <vector>
+#include <sstream>
 
 #include <wx/imaglist.h>
 
@@ -109,42 +110,40 @@ void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxTreeItemId, modelCDMIProjectTr
   modelElements.clear();
   if(projectTree != NULL)
     {
-      wxTreeItemId rootIndex;
-      rootIndex= this-> AddRoot(crea::std2wx(projectTree->GetName()), this->ID_PrIcon, this->ID_PrIcon);
-      projectTree->SetId(rootIndex);
-      modelElements[rootIndex] = projectTree;
+      projectTree->SetId(this->AddRoot(crea::std2wx(projectTree->GetName()), this->ID_PrIcon));
+         
+         modelElements[projectTree->GetId()] = projectTree;
 
       std::cout << "Building TreeCtrl for " << projectTree->GetName() << std::endl;
-      this->BuildTree(projectTree->GetChildren(), modelElements, rootIndex);
+      this->BuildTree(projectTree->GetChildren(), modelElements, projectTree->GetId());
 
-      this->Expand(rootIndex);
+      this->Expand(projectTree->GetId());
 
       this->Update();
     }
   else
     {
-      wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project"), this->ID_Cicon, this->ID_Cicon);
+      wxTreeItemId rootIndex = this-> AddRoot(_("No Open Project"), this->ID_Cicon);
     }
 }
 
-void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode*>& treeNodes, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, wxTreeItemId parent)
+void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode*>& treeNodes, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, const wxTreeItemId& parent)
 {
-  for (int i = 0; i < treeNodes.size(); i++)
+  for (int i = 0; i < (int)(treeNodes.size()); i++)
     {
       //cout << projectsTree[i].GetName() << endl;
-      wxTreeItemId parentNodeIndex;
       if(treeNodes[i] != NULL)
         {
           int idIcon = GetIconId(treeNodes[i]);
           wxString nodeName((treeNodes[i]->GetName()).c_str(), wxConvUTF8);
-          parentNodeIndex = this->AppendItem(parent, nodeName, idIcon, idIcon);
-          treeNodes[i]->SetId(parentNodeIndex);
-          modelElements[parentNodeIndex] = treeNodes[i];
+          treeNodes[i]->SetId(this->AppendItem(parent, nodeName, idIcon));
+         
+                 modelElements[treeNodes[i]->GetId()] = treeNodes[i];
 
           std::vector<modelCDMIProjectTreeNode*> innerChildren = treeNodes[i]->GetChildren();
           if(innerChildren.size() > 0)
             {
-              this->BuildTree(innerChildren, modelElements, parentNodeIndex);
+              this->BuildTree(innerChildren, modelElements, treeNodes[i]->GetId());
             }
         }
 

diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h
index 87958dda55617c9af8b9b452b6ac1404329e15aa..33f21f40bc42f6da7b3d85dacf38121cba98a955 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h
+++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.h
@@ -152,7 +152,7 @@ private:
    * @param modelElements Id->node map.
    * @param parent ID of the root node ID.
    */
-  void BuildTree(const std::vector<modelCDMIProjectTreeNode*>& tree, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, wxTreeItemId parent);
+  void BuildTree(const std::vector<modelCDMIProjectTreeNode*>& tree, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, const wxTreeItemId& parent);
   /**
    * Retrieves the icon ID of the given node by its type.
    * @param node Node to search its icon.

diff --git a/src/creaSystem.cxx b/src/creaSystem.cxx
index eaac8f9bd0f5fd28e40fdcb7f73fc59b29f9a568..26a071e8fa1179a765dadaf9374f244071bf9a5b 100644 (file)
--- a/src/creaSystem.cxx
+++ b/src/creaSystem.cxx
@@ -117,7 +117,7 @@ int System::GetAppPath(char *pname, size_t pathsize)
                        }
                }
                
-               if ((access(pname, 0) == 0))
+               if ((_access(pname, 0) == 0))
                        return 0; /* file exists, return OK */
                /*else name doesn't seem to exist, return FAIL (falls
                 through) */