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

@@ @@ -456,7 +456,7 @@ int main(int argc,char **argv) { @@
     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());

src/canvas.cpp

➞

Show inline comments

@@ @@ -719,7 +719,7 @@ void Main::saveStateXML() @@
       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);
+    }
+  }
@@ @@ -782,7 +782,7 @@ void Main::snapshot() @@
       } 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);
+    }
@@ @@ -846,7 +846,7 @@ int Main::readStateXML(const char *filen @@
     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();

src/modelcatalogue.cpp

➞

Show inline comments

@@ @@ -139,7 +139,7 @@ void ModelCatalogue::PopulateModelMenu() @@
 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);
+}

src/parameter.cpp

➞

Show inline comments

@@ @@ -388,7 +388,7 @@ void Parameter::Write(ostream &os) const @@
   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;
@@ @@ -600,7 +600,7 @@ xmlNewProp(xmlpar, BAD_CAST "val", BAD_C @@
   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());
+}

src/xmlwrite.cpp

➞

Show inline comments

@@ @@ -625,7 +625,7 @@ void Wall::XMLAdd(xmlNode *parent) const @@
+  {
     ostringstream text;
     text << WallTypetoStr(wall_type);
+    text << WallTypetoStr(wall_type).c_str();
     xmlNewProp(xmlwall, BAD_CAST "wall_type", BAD_CAST text.str().c_str());
+  }

0 comments (0 inline, 0 general)