Xcos MVC: minor typo fix & unneeded dependency removal 89/15089/3
Paul Bignier [Mon, 25 Aug 2014 08:28:28 +0000 (10:28 +0200)]
Change-Id: I7d4e3de80f99923f7634b74d681f89a4b578ab0c

12 files changed:
scilab/modules/scicos/includes/Controller.hxx
scilab/modules/scicos/src/cpp/view_scilab/BaseAdapter.hxx
scilab/modules/scicos/src/cpp/view_scilab/BlockAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/CprAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/DiagramAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/GraphicsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/LinkAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ScsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/StateAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/TextAdapter.cpp

index 0704ff6..193f887 100644 (file)
@@ -14,7 +14,6 @@
 #define CONTROLLER_HXX_
 
 #include <vector>
-#include <string>
 
 #include "utilities.hxx"
 #include "Model.hxx"
index 95afd40..a8e8a04 100644 (file)
@@ -69,9 +69,9 @@ public:
     static props_t fields;
 
     /**
-     * @return true if the properties has already been setup, false otherwise.
+     * @return true if the properties have already been setup, false otherwise.
      */
-    static bool properties_has_not_been_set()
+    static bool properties_have_not_been_set()
     {
         return fields.empty();
     }
index 78003ce..b48a74f 100644 (file)
@@ -135,7 +135,7 @@ BlockAdapter::BlockAdapter(const BlockAdapter& o) :
 BlockAdapter::BlockAdapter(org_scilab_modules_scicos::model::Block* o) :
     BaseAdapter<BlockAdapter, org_scilab_modules_scicos::model::Block>(o)
 {
-    if (property<BlockAdapter>::properties_has_not_been_set())
+    if (property<BlockAdapter>::properties_have_not_been_set())
     {
         property<BlockAdapter>::fields.reserve(4);
         property<BlockAdapter>::add_property(L"graphics", &graphics::get, &graphics::set);
index 8f14a37..4bf052b 100644 (file)
@@ -37,7 +37,7 @@ CprAdapter::CprAdapter(const CprAdapter& o) :
 CprAdapter::CprAdapter(org_scilab_modules_scicos::model::Diagram* o) :
     BaseAdapter<CprAdapter, org_scilab_modules_scicos::model::Diagram>(o)
 {
-    if (property<CprAdapter>::properties_has_not_been_set())
+    if (property<CprAdapter>::properties_have_not_been_set())
     {
         // FIXME: add some properties
     }
index f40737d..c97349a 100644 (file)
@@ -113,7 +113,7 @@ DiagramAdapter::DiagramAdapter(const DiagramAdapter& o) :
 DiagramAdapter::DiagramAdapter(org_scilab_modules_scicos::model::Diagram* o) :
     BaseAdapter<DiagramAdapter, org_scilab_modules_scicos::model::Diagram>(o), contrib(0)
 {
-    if (property<DiagramAdapter>::properties_has_not_been_set())
+    if (property<DiagramAdapter>::properties_have_not_been_set())
     {
         property<DiagramAdapter>::fields.reserve(4);
         property<DiagramAdapter>::add_property(L"props", &props::get, &props::set);
index a45fb2c..d895e7d 100644 (file)
@@ -523,7 +523,7 @@ GraphicsAdapter::GraphicsAdapter(const GraphicsAdapter& o) :
 GraphicsAdapter::GraphicsAdapter(org_scilab_modules_scicos::model::Block* o) :
     BaseAdapter<GraphicsAdapter, org_scilab_modules_scicos::model::Block>(o)
 {
-    if (property<GraphicsAdapter>::properties_has_not_been_set())
+    if (property<GraphicsAdapter>::properties_have_not_been_set())
     {
         property<GraphicsAdapter>::fields.reserve(18);
         property<GraphicsAdapter>::add_property(L"orig", &orig::get, &orig::set);
index e2d5cab..dabcae6 100644 (file)
@@ -424,7 +424,7 @@ LinkAdapter::LinkAdapter(const LinkAdapter& o) :
 LinkAdapter::LinkAdapter(org_scilab_modules_scicos::model::Link* o) :
     BaseAdapter<LinkAdapter, org_scilab_modules_scicos::model::Link>(o)
 {
-    if (property<LinkAdapter>::properties_has_not_been_set())
+    if (property<LinkAdapter>::properties_have_not_been_set())
     {
         property<LinkAdapter>::fields.reserve(7);
         property<LinkAdapter>::add_property(L"xx", &xx::get, &xx::set);
index f6acd5e..39448dc 100644 (file)
@@ -813,7 +813,7 @@ ModelAdapter::ModelAdapter(const ModelAdapter& o) :
 ModelAdapter::ModelAdapter(org_scilab_modules_scicos::model::Block* o) :
     BaseAdapter<ModelAdapter, org_scilab_modules_scicos::model::Block>(o)
 {
-    if (property<ModelAdapter>::properties_has_not_been_set())
+    if (property<ModelAdapter>::properties_have_not_been_set())
     {
         property<ModelAdapter>::fields.reserve(23);
         property<ModelAdapter>::add_property(L"sim", &sim::get, &sim::set);
index 87ce9c4..3fd2619 100644 (file)
@@ -29,7 +29,7 @@ ParamsAdapter::ParamsAdapter(const ParamsAdapter& o) :
 ParamsAdapter::ParamsAdapter(org_scilab_modules_scicos::model::Diagram* o) :
     BaseAdapter<ParamsAdapter, org_scilab_modules_scicos::model::Diagram>(o)
 {
-    if (property<ParamsAdapter>::properties_has_not_been_set())
+    if (property<ParamsAdapter>::properties_have_not_been_set())
     {
         // FIXME: add some properties
     }
index 16e7910..cb1485c 100644 (file)
@@ -37,7 +37,7 @@ ScsAdapter::ScsAdapter(const ScsAdapter& o) :
 ScsAdapter::ScsAdapter(org_scilab_modules_scicos::model::Diagram* o) :
     BaseAdapter<ScsAdapter, org_scilab_modules_scicos::model::Diagram>(o)
 {
-    if (property<ScsAdapter>::properties_has_not_been_set())
+    if (property<ScsAdapter>::properties_have_not_been_set())
     {
         // FIXME: add some properties
     }
index 58c428a..eb725cb 100644 (file)
@@ -37,7 +37,7 @@ StateAdapter::StateAdapter(const StateAdapter& o) :
 StateAdapter::StateAdapter(org_scilab_modules_scicos::model::Diagram* o) :
     BaseAdapter<StateAdapter, org_scilab_modules_scicos::model::Diagram>(o)
 {
-    if (property<StateAdapter>::properties_has_not_been_set())
+    if (property<StateAdapter>::properties_have_not_been_set())
     {
         // FIXME: add some properties
     }
index 1d97a6f..a260f2f 100644 (file)
@@ -34,7 +34,7 @@ TextAdapter::TextAdapter(const TextAdapter& o) :
 TextAdapter::TextAdapter(org_scilab_modules_scicos::model::Annotation* o) :
     BaseAdapter<TextAdapter, org_scilab_modules_scicos::model::Annotation>(o)
 {
-    if (property<TextAdapter>::properties_has_not_been_set())
+    if (property<TextAdapter>::properties_have_not_been_set())
     {
         // FIXME: add some properties
     }