- fix compilation on OSX

sbmlteam · Aug 4, 2015 · 34843ab · 34843ab
1 parent 6fed9a7
commit 34843ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/model/deviserbase.cpp b/model/deviserbase.cpp
@@ -8,8 +8,8 @@ DeviserBase::DeviserBase()
 
 }
 
-DeviserBase::DeviserBase(const DeviserBase &)
-  : mPackage(mPackage)
+DeviserBase::DeviserBase(const DeviserBase &other)
+  : mPackage(other.mPackage)
   , mVersion(NULL)
   , mUserData(NULL)
 {

diff --git a/model/deviserbase.h b/model/deviserbase.h
@@ -62,7 +62,7 @@ template<typename T> void setParentOn(QList<T*>& list, DeviserPackage* parent, D
 {
   if (!list.empty())
   {
-    for(QList<T*>::iterator it = list.begin();  it != list.end(); ++it)
+    for(typename QList<T*>::iterator it = list.begin();  it != list.end(); ++it)
     {
       (*it)->setParent(parent);
       (*it)->setParentVersion(version);

diff --git a/util.cpp b/util.cpp
@@ -2,14 +2,17 @@
 
 #include <QFile>
 #include <QStringList>
+#include <QString>
+#include <QTextStream>
 
 Util::Util()
 {
 
 }
 
-QString Util::guessPlural(const QString &str)
+QString Util::guessPlural(const QString &s)
 {
+  QString str(s);
   if (str.endsWith("Information")) return str;
   if (str.endsWith("Index")) return str.replace("Index", "Indices");
   if (str.endsWith("s")) return str;