X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fscicos%2Fsrc%2Fcpp%2Fview_scilab%2FScsAdapter.hxx;h=2cce04b8452c49e36c6b80ccb741feec02fc6e61;hp=e58c85f959ad01f115b457ef0e3a0e8ec695ec91;hb=3c59ba21d5f2;hpb=d8c865c1d5ec9017f75862d71ddde132493cc9de

diff --git a/scilab/modules/scicos/src/cpp/view_scilab/ScsAdapter.hxx b/scilab/modules/scicos/src/cpp/view_scilab/ScsAdapter.hxx
index e58c85f..2cce04b 100644
--- a/scilab/modules/scicos/src/cpp/view_scilab/ScsAdapter.hxx
+++ b/scilab/modules/scicos/src/cpp/view_scilab/ScsAdapter.hxx
@@ -1,12 +1,15 @@
 /*
  *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2014-2014 - Scilab Enterprises - Clement DAVID
+ *  Copyright (C) 2014-2016 - Scilab Enterprises - Clement DAVID
  *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
  *
  */
 
@@ -14,10 +17,8 @@
 #define SCSADAPTER_HXX_
 
 #include <string>
-#include <sstream>
 
 #include "BaseAdapter.hxx"
-
 #include "model/Diagram.hxx"
 
 namespace org_scilab_modules_scicos
@@ -28,8 +29,8 @@ namespace view_scilab
 class ScsAdapter : public BaseAdapter<ScsAdapter, org_scilab_modules_scicos::model::Diagram>
 {
 public:
-    ScsAdapter(const ScsAdapter& o);
-    ScsAdapter(org_scilab_modules_scicos::model::Diagram* o);
+    ScsAdapter(const Controller& c, org_scilab_modules_scicos::model::Diagram* adaptee);
+    ScsAdapter(const ScsAdapter& adapter);
     ~ScsAdapter();
 
     static const std::wstring getSharedTypeStr()
@@ -37,12 +38,11 @@ public:
         return L"scs";
     }
 
-    bool toString(std::wostringstream& ostr);
-    std::wstring getTypeStr();
-    std::wstring getShortTypeStr();
+    std::wstring getTypeStr() const;
+    std::wstring getShortTypeStr() const;
 };
 
-} /* view_scilab */
+} /* namespace view_scilab */
 } /* namespace org_scilab_modules_scicos */
 
 #endif /* SCSADAPTER_HXX_ */