Xcos MVC: add missing headers 27/15127/4
Paul Bignier [Fri, 29 Aug 2014 06:03:00 +0000 (08:03 +0200)]
Change-Id: Ic0b7abc6cdfb86b41e809451232935dffc2e87da

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/ports_management.hxx

index 4f21601..1ad6acb 100644 (file)
 #include "Controller.hxx"
 #include "LinkAdapter.hxx"
 
+extern "C" {
+#include "sci_malloc.h"
+#include "charEncoding.h"
+}
+
 namespace org_scilab_modules_scicos
 {
 namespace view_scilab
index 875ed9e..bad5764 100644 (file)
 #include "ModelAdapter.hxx"
 #include "ports_management.hxx"
 
+extern "C" {
+#include "sci_malloc.h"
+#include "charEncoding.h"
+}
+
 namespace org_scilab_modules_scicos
 {
 namespace view_scilab
index 0ffd052..b86333f 100644 (file)
@@ -23,6 +23,7 @@
 
 extern "C" {
 #include "sci_malloc.h"
+#include "charEncoding.h"
 }
 
 namespace org_scilab_modules_scicos
@@ -32,7 +33,7 @@ namespace view_scilab
 namespace
 {
 
-static const wchar_t* scsopt = L"scsopt";
+const std::wstring scsopt(L"scsopt");
 
 struct dummy_property
 {
@@ -267,7 +268,7 @@ struct options
         (void) controller;
 
         // Return a dummy 'scsopt'-typed tlist.
-        types::String* header = new types::String(scsopt);
+        types::String* header = new types::String(scsopt.c_str());
 
         types::TList* Scsopt = new types::TList();
         Scsopt->set(0, header);
index 6d4ef98..84586e9 100644 (file)
 
 #include "Controller.hxx"
 
+extern "C" {
+#include "sci_malloc.h"
+#include "charEncoding.h"
+}
+
 namespace org_scilab_modules_scicos
 {
 namespace view_scilab