Commit a4529ce4 authored by Filippo Rusconi's avatar Filippo Rusconi
Browse files

Merge branch 'master' of forgemia.inra.fr:pappso/xtpcpp into master

parents dbfbf78d 9f762c8c
...@@ -68,7 +68,14 @@ TandemParameters::~TandemParameters() ...@@ -68,7 +68,14 @@ TandemParameters::~TandemParameters()
TandemParameters::TandemParameters(const TandemParameters &other) TandemParameters::TandemParameters(const TandemParameters &other)
{ {
qDebug() << "TandemParameters::TandemParameters copy begin"; this->operator=(other);
}
TandemParameters &
TandemParameters::operator=(const TandemParameters &other)
{
qDebug() << "copy begin";
//_map_label_value = other._map_label_value; //_map_label_value = other._map_label_value;
_method_name = other._method_name; _method_name = other._method_name;
...@@ -76,15 +83,14 @@ TandemParameters::TandemParameters(const TandemParameters &other) ...@@ -76,15 +83,14 @@ TandemParameters::TandemParameters(const TandemParameters &other)
other._map_label_value.constBegin(); other._map_label_value.constBegin();
while(i != other._map_label_value.constEnd()) while(i != other._map_label_value.constEnd())
{ {
qDebug() << "TandemParameters::TandemParameters copy " << i.key() << " " qDebug() << "copy " << i.key() << " " << i.value();
<< i.value();
_map_label_value.insert(i.key(), i.value()); _map_label_value.insert(i.key(), i.value());
i++; // added i++; // added
} }
qDebug() << "TandemParameters::TandemParameters copy end"; qDebug() << "copy end";
return *this;
} }
bool bool
TandemParameters::equals(const TandemParameters &other) const TandemParameters::equals(const TandemParameters &other) const
{ {
......
...@@ -38,6 +38,7 @@ class TandemParameters ...@@ -38,6 +38,7 @@ class TandemParameters
public: public:
TandemParameters(); TandemParameters();
TandemParameters(const TandemParameters &other); TandemParameters(const TandemParameters &other);
TandemParameters &operator=(const TandemParameters &);
virtual ~TandemParameters(); virtual ~TandemParameters();
const QString &getValue(const QString &label) const; const QString &getValue(const QString &label) const;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment