Merge.

--HG--
branch : develop

README.txt

@@ -48,9 +48,19 @@ The installed toolchains have to match the one Qt was compiled with.
 You can build Valentina with
 
     cd $SOURCE_DIRECTORY\build
-    qmake ..\Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache (or qmake-qt5, depending on your platform)
+    qmake ..\Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache
     make (or mingw32-make or nmake or jom, depending on your platform)
 
+Note: On some platforms e.g. Fedora, all Qt-tools come as qmake-qt5 
+    etc. In this case you should install qtchooser. This wrapper 
+    resolves the Qt version with respect to QT_SELECT. So run 
+
+    export QT_SELECT=5
+
+    prior to qmake. You will not come along with just using qmake-qt5
+    here.
+
+
 Note:In order to build and use Valentina, the PATH environment variable 
 needs to be extended:
 

src/app/container/vcontainer.cpp

@@ -160,6 +160,12 @@ quint32 VContainer::AddDetail(VDetail detail)
     return id;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+quint32 VContainer::getId()
+{
+    return _id;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief getNextId generate next unique id

src/app/container/vcontainer.h

@@ -95,62 +95,13 @@ public:
     ~VContainer();
 
     template <typename T>
-    const QSharedPointer<T> GeometricObject(const quint32 &id) const
+    const QSharedPointer<T> GeometricObject(const quint32 &id) const;
-    {
-        QSharedPointer<VGObject> gObj = QSharedPointer<VGObject>();
-        if (d->gObjects.contains(id))
-        {
-            gObj = d->gObjects.value(id);
-        }
-        else
-        {
-            throw VExceptionBadId(tr("Can't find object"), id);
-        }
-
-        try
-        {
-            QSharedPointer<T> obj = qSharedPointerDynamicCast<T>(gObj);
-            SCASSERT(obj.isNull() == false);
-            return obj;
-        }
-        catch (const std::bad_alloc &)
-        {
-            throw VExceptionBadId(tr("Can't cast object"), id);
-        }
-    }
-
     const QSharedPointer<VGObject> GetGObject(quint32 id) const;
     const VDetail      GetDetail(quint32 id) const;
     qreal              GetTableValue(const QString& name) const;
     template <typename T>
-    /**
+    QSharedPointer<T> GetVariable(QString name) const;
-     * @brief GetVariable return varible by name
+    static quint32     getId();
-     * @param name variable's name
-     * @return variable
-     */
-    QSharedPointer<T> GetVariable(QString name) const
-    {
-        SCASSERT(name.isEmpty()==false);
-        if (d->variables.contains(name))
-        {
-            try
-            {
-                QSharedPointer<T> value = qSharedPointerDynamicCast<T>(d->variables.value(name));
-                SCASSERT(value.isNull() == false);
-                return value;
-            }
-            catch (const std::bad_alloc &)
-            {
-                throw VExceptionBadId(tr("Can't cast object"), name);
-            }
-        }
-        else
-        {
-            throw VExceptionBadId(tr("Can't find object"), name);
-        }
-    }
-
-    static quint32     getId(){return _id;}
     static quint32     getNextId();
     static void        UpdateId(quint32 newId);
 
@@ -160,37 +111,9 @@ public:
     void               AddArc(const quint32 &arcId, const quint32 &parentId = 0);
 
     template <typename T>
-    void               AddCurve(const quint32 &id, const quint32 &parentId = 0)
+    void               AddCurve(const quint32 &id, const quint32 &parentId = 0);
-    {
-        const QSharedPointer<T> curve = GeometricObject<T>(id);
-
-        VSplineLength *length = new VSplineLength(id, parentId, curve.data());
-        AddVariable(length->GetName(), length);
-
-        VSplineAngle *startAngle = new VSplineAngle(id, parentId, curve.data(), CurveAngle::StartAngle);
-        AddVariable(startAngle->GetName(), startAngle);
-
-        VSplineAngle *endAngle = new VSplineAngle(id, parentId, curve.data(), CurveAngle::EndAngle);
-        AddVariable(endAngle->GetName(), endAngle);
-    }
-
     template <typename T>
-    void               AddVariable(const QString& name, T *var)
+    void               AddVariable(const QString& name, T *var);
-    {
-        if (d->variables.contains(name))
-        {
-            if (d->variables.value(name)->GetType() == var->GetType())
-            {
-                d->variables[name].clear();
-            }
-            else
-            {
-                throw VExceptionBadId(tr("Can't find object. Type mismatch."), name);
-            }
-        }
-        d->variables[name] = QSharedPointer<T>(var);
-        uniqueNames.insert(name);
-    }
 
     void               UpdateGObject(quint32 id, VGObject* obj);
     void               UpdateDetail(quint32 id, const VDetail &detail);
@@ -243,10 +166,7 @@ private:
     QSharedDataPointer<VContainerData> d;
 
     template <class T>
-    uint qHash( const QSharedPointer<T> &p )
+    uint qHash( const QSharedPointer<T> &p );
-    {
-        return qHash( p.data() );
-    }
 
     template <typename key, typename val>
     // cppcheck-suppress functionStatic
@@ -262,4 +182,105 @@ private:
     const QMap<QString, QSharedPointer<T> > DataVar(const VarType &type) const;
 };
 
+
+
+/*
+*  Defintion of templated member functions of VContainer
+*/
+
+//---------------------------------------------------------------------------------------------------------------------
+template <typename T>
+const QSharedPointer<T> VContainer::GeometricObject(const quint32 &id) const
+{
+    QSharedPointer<VGObject> gObj = QSharedPointer<VGObject>();
+   if (d->gObjects.contains(id))
+   {
+       gObj = d->gObjects.value(id);
+    }
+    else
+    {
+        throw VExceptionBadId(tr("Can't find object"), id);
+    }
+    try
+    {
+        QSharedPointer<T> obj = qSharedPointerDynamicCast<T>(gObj);
+        SCASSERT(obj.isNull() == false);
+        return obj;
+     }
+     catch (const std::bad_alloc &)
+     {
+        throw VExceptionBadId(tr("Can't cast object"), id);
+     }
+}
+
+
+//---------------------------------------------------------------------------------------------------------------------
+/**
+* @brief GetVariable return varible by name
+* @param name variable's name
+* @return variable
+*/
+template <typename T>
+QSharedPointer<T> VContainer::GetVariable(QString name) const
+{
+    SCASSERT(name.isEmpty()==false);
+    if (d->variables.contains(name))
+    {
+        try
+        {
+            QSharedPointer<T> value = qSharedPointerDynamicCast<T>(d->variables.value(name));
+            SCASSERT(value.isNull() == false);
+            return value;
+        }
+        catch (const std::bad_alloc &)
+        {
+            throw VExceptionBadId(tr("Can't cast object"), name);
+        }
+    }
+    else
+    {
+        throw VExceptionBadId(tr("Can't find object"), name);
+    }
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <typename T>
+void VContainer::AddCurve(const quint32 &id, const quint32 &parentId)
+{
+    const QSharedPointer<T> curve = GeometricObject<T>(id);
+    VSplineLength *length = new VSplineLength(id, parentId, curve.data());
+    AddVariable(length->GetName(), length);
+
+    VSplineAngle *startAngle = new VSplineAngle(id, parentId, curve.data(), CurveAngle::StartAngle);
+    AddVariable(startAngle->GetName(), startAngle);
+
+    VSplineAngle *endAngle = new VSplineAngle(id, parentId, curve.data(), CurveAngle::EndAngle);
+    AddVariable(endAngle->GetName(), endAngle);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <typename T>
+void VContainer::AddVariable(const QString& name, T *var)
+{
+    if (d->variables.contains(name))
+    {
+        if (d->variables.value(name)->GetType() == var->GetType())
+        {
+            d->variables[name].clear();
+        }
+        else
+        {
+            throw VExceptionBadId(tr("Can't find object. Type mismatch."), name);
+        }
+    }
+    d->variables[name] = QSharedPointer<T>(var);
+    uniqueNames.insert(name);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+template <class T>
+uint VContainer::qHash( const QSharedPointer<T> &p )
+{
+    return qHash( p.data() );
+}
 #endif // VCONTAINER_H