Xcos MVC: fix link issue on loadScicos 86/14986/2
Clément DAVID [Wed, 6 Aug 2014 10:07:55 +0000 (12:07 +0200)]
Change-Id: I8bde5570cabbd68db9e3dd5346ef72a73f39d967

scilab/modules/scicos/src/cpp/Model.cpp
scilab/modules/scicos/src/cpp/view_scilab/CprAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/CprAdapter.hxx
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.hxx

index a022ccb..51bdf3e 100644 (file)
@@ -106,7 +106,7 @@ void Model::deleteObject(ScicosID uid)
     objects_map_t::iterator iter = allObjects.lower_bound(uid);
     if (iter == allObjects.end() || uid < iter->first)
     {
-        throw "key has not been found";
+        throw std::string("key has not been found");
     }
 
     allObjects.erase(iter);
@@ -118,7 +118,7 @@ model::BaseObject* Model::getObject(ScicosID uid) const
     objects_map_t::const_iterator iter = allObjects.lower_bound(uid);
     if (iter == allObjects.end() || uid < iter->first)
     {
-        throw "key has not been found";
+        throw std::string("key has not been found");
     }
 
     return iter->second;
@@ -129,7 +129,7 @@ update_status_t Model::setObject(model::BaseObject* o)
     objects_map_t::iterator iter = allObjects.lower_bound(o->id());
     if (iter == allObjects.end() || o->id() < iter->first)
     {
-        throw "key has not been found";
+        throw std::string("key has not been found");
     }
 
     if (*iter->second == *o)
index 74840f5..d32a9e5 100644 (file)
@@ -47,12 +47,6 @@ CprAdapter::~CprAdapter()
 {
 }
 
-bool CprAdapter::toString(std::wostringstream& ostr)
-{
-    ostr << L"CprAdapter.hxx: Dunno what to display there";
-    return true;
-}
-
 std::wstring CprAdapter::getTypeStr()
 {
     return getSharedTypeStr();
index af883c8..188cd6f 100644 (file)
@@ -37,7 +37,6 @@ public:
         return L"cpr";
     }
 
-    bool toString(std::wostringstream& ostr);
     std::wstring getTypeStr();
     std::wstring getShortTypeStr();
 };
index 26ea9d4..884d9bf 100644 (file)
@@ -433,12 +433,6 @@ ModelAdapter::~ModelAdapter()
 {
 }
 
-bool ModelAdapter::toString(std::wostringstream& ostr)
-{
-    ostr << L"ModelAdapter.hxx: Dunno what to display there" << std::endl;
-    return true;
-}
-
 std::wstring ModelAdapter::getTypeStr()
 {
     return getSharedTypeStr();
index 8fa9508..3dcb0de 100644 (file)
@@ -37,7 +37,6 @@ public:
         return L"model";
     }
 
-    bool toString(std::wostringstream& ostr);
     std::wstring getTypeStr();
     std::wstring getShortTypeStr();
 };