EI/VirtualLeaf Changeset - f4023d64bb53 · Centrum Wiskunde & Informatica (CWI)

Changeset - f4023d64bb53

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Roeland Merks - 11 years ago 2014-05-01 16:15:10
merks@cwi.nl

Fixed some minor syntactic errors that popped up after compiling on MacOSX10.8.5

5 files changed with 8 insertions and 8 deletions:

src/VirtualLeaf.cpp

src/canvas.cpp

src/modelcatalogue.cpp

src/parameter.cpp

src/xmlwrite.cpp

0 comments (0 inline, 0 general)

src/VirtualLeaf.cpp

➞

Show inline comments

@@ @@ -453,13 +453,13 @@ int main(int argc,char **argv) { @@
       abort();
+    }
   } catch (ios_base::failure) {
     stringstream error_message;
     error_message << "I/O failure: " << strerror(errno);
     if (batch) {
       cerr << error_message.str() <<endl;
+      cerr << error_message.str().c_str() <<endl;
       abort();
     } else {
       QString qmess(error_message.str().c_str());
       QMessageBox::critical(0, "I/O Error", qmess );
       abort();
+    }

src/canvas.cpp

➞

Show inline comments

@@ @@ -716,13 +716,13 @@ void Main::saveStateXML() @@
     } else {
       mesh.XMLSave((const char *)fileName, XMLSettingsTree());
       QString status_message;
       status_message = QString("Wrote LeafML to %1").arg(fileName);
       cerr << status_message.toStdString() << endl;
+      cerr << status_message.toStdString().c_str() << endl;
       statusBar()->showMessage(status_message);
+    }
+  }
+}
@@ @@ -779,13 +779,13 @@ void Main::snapshot() @@
       QString status_message;
       if (Save((const char *)fileName, extension, 1024, 768)==0) {
 	status_message = QString("Wrote snapshot to %1").arg(fileName);
       } else {
 	status_message = QString("Error writing snapshot to %1").arg(fileName);
+      }
       cerr << status_message.toStdString() << endl;
+      cerr << status_message.toStdString().c_str() << endl;
       statusBar()->showMessage(status_message);
+    }
+  }
+}
@@ @@ -843,13 +843,13 @@ int Main::readStateXML(const char *filen @@
     FitLeafToCanvas();
     currentFile =  QString(filename);
     Plot();
     QString status_message = QString("Successfully read leaf from file %1. Time is %2 h.").arg(currentFile).arg(mesh.getTimeHours().c_str());
     cerr << status_message.toStdString() << endl;
+    cerr << status_message.toStdString().c_str() << endl;
     setCaption(caption_with_file.arg(filename));
     statusBar()->message(status_message);
     emit ParsChanged();
 #ifdef QDEBUG
     qDebug() << "Done. Returning 0." << endl;
 #endif

src/modelcatalogue.cpp

➞

Show inline comments

@@ @@ -136,13 +136,13 @@ void ModelCatalogue::PopulateModelMenu() @@
   connect(((Main *)mainwin)->modelmenu, SIGNAL(triggered(QAction *)), this, SLOT(InstallModel(QAction *)) );
+}
 void ModelCatalogue::InstallModel(QAction *modelaction) {
   QVariant data = modelaction->data();
   SimPluginInterface *model = data.value<SimPluginInterface *>();
   cerr << "You chose model " << model->ModelID().toStdString() << "!\n";
+  cerr << "You chose model " << model->ModelID().toStdString().c_str() << "!\n";
   mesh->Clean();
   InstallModel(model);
+}
 void ModelCatalogue::InstallModel(SimPluginInterface *plugin) {

src/parameter.cpp

➞

Show inline comments

@@ @@ -385,13 +385,13 @@ void Parameter::Write(ostream &os) const @@
   if (export_fn_prefix)
   os << " export_fn_prefix = " << export_fn_prefix << endl;
   os << " storage_stride = " << storage_stride << endl;
   os << " xml_storage_stride = " << xml_storage_stride << endl;
   if (datadir) {
                                      QDir dataDir = QDir::home().relativeFilePath(datadir);
                                      os << " datadir = " << dataDir.dirName().toStdString() << endl;
+                                     os << " datadir = " << dataDir.dirName().toStdString().c_str() << endl;
+                                 }
                                  else {
                                      os << "datadir = ." << endl;
+                                 }
   os << " T = " << T << endl;
   os << " lambda_length = " << lambda_length << endl;
@@ @@ -597,13 +597,13 @@ xmlNewProp(xmlpar, BAD_CAST "val", BAD_C @@
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "datadir" );
   ostringstream text;
   if (datadir) {
                                      QDir dataDir = QDir::home().relativeFilePath(datadir);
                                      text << dataDir.dirName().toStdString();
+                                     text << dataDir.dirName().toStdString().c_str();
+                                   }
 xmlNewProp(xmlpar, BAD_CAST "val", BAD_CAST text.str().c_str());
+}
+{
   xmlNode *xmlpar = xmlNewChild(xmlparameter, NULL, BAD_CAST "par", NULL);
   xmlNewProp(xmlpar, BAD_CAST "name", BAD_CAST "T" );

src/xmlwrite.cpp

➞

Show inline comments

@@ @@ -622,13 +622,13 @@ void Wall::XMLAdd(xmlNode *parent) const @@
     text << viz_flux;
     xmlNewProp(xmlwall, BAD_CAST "viz_flux", BAD_CAST text.str().c_str());
+  }
+  {
     ostringstream text;
     text << WallTypetoStr(wall_type);
+    text << WallTypetoStr(wall_type).c_str();
     xmlNewProp(xmlwall, BAD_CAST "wall_type", BAD_CAST text.str().c_str());
+  }
   xmlNodePtr tr1_xml = xmlNewChild(xmlwall, NULL, BAD_CAST "transporters1", NULL);
   if (transporters1) {

0 comments (0 inline, 0 general)