From 14c8fdeee7ff4024a6980ce7e589801d5b7a3ec3 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Sun, 29 Sep 2013 13:29:29 +0300
Subject: [PATCH] Fixed error in merging branches.

--HG--
branch : feature
---
 container/calculator.cpp |  1 -
 container/calculator.h   |  2 --
 container/vpointf.cpp    | 14 +++++++++++++-
 container/vpointf.h      |  3 +--
 tools/vabstracttool.h    |  3 +--
 tools/vdatatool.cpp      |  4 ----
 tools/vdatatool.h        | 12 ++----------
 xml/vdomdocument.cpp     |  2 --
 xml/vdomdocument.h       |  2 +-
 9 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/container/calculator.cpp b/container/calculator.cpp
index 928499c18..d161724bb 100644
--- a/container/calculator.cpp
+++ b/container/calculator.cpp
@@ -20,7 +20,6 @@
  ****************************************************************************/
 
 #include "calculator.h"
-#include <cmath>
 #include <QDebug>
 
 #define DELIMITER  1
diff --git a/container/calculator.h b/container/calculator.h
index d5ce32891..ad16c7f65 100644
--- a/container/calculator.h
+++ b/container/calculator.h
@@ -23,8 +23,6 @@
 #define CALCULATOR_H
 
 #include <QString>
-#include <QMap>
-#include <QLineF>
 #include "vcontainer.h"
 
 /**
diff --git a/container/vpointf.cpp b/container/vpointf.cpp
index b99c6fe2f..ae429b3e3 100644
--- a/container/vpointf.cpp
+++ b/container/vpointf.cpp
@@ -26,13 +26,25 @@ VPointF::VPointF():_name(QString()), _mx(0), _my(0), _x(0), _y(0), _referens(0),
 }
 
 VPointF::VPointF ( const VPointF & point ):_name(point.name()), _mx(point.mx()), _my(point.my()),
-    _x(point.x()), _y(point.y()), _referens(0), mode(point.getMode()), idObject(point.getIdObject()){
+    _x(point.x()), _y(point.y()), _referens(point.referens()), mode(point.getMode()), idObject(point.getIdObject()){
 }
 
 VPointF::VPointF (qreal x, qreal y , QString name, qreal mx, qreal my, Draw::Draws mode, qint64 idObject):_name(name), _mx(mx),
     _my(my), _x(x), _y(y), _referens(0), mode(mode), idObject(idObject){
 }
 
+VPointF &VPointF::operator =(const VPointF &point){
+    _name = point.name();
+    _mx = point.mx();
+    _my = point.my();
+    _x = point.x();
+    _y = point.y();
+    _referens = point.referens();
+    mode = point.getMode();
+    idObject = point.getIdObject();
+    return *this;
+}
+
 VPointF::~VPointF(){
 }
 
diff --git a/container/vpointf.h b/container/vpointf.h
index ef86307de..8db65792e 100644
--- a/container/vpointf.h
+++ b/container/vpointf.h
@@ -26,8 +26,7 @@
 #include <QString>
 #include "options.h"
 
-class VPointF
-{
+class VPointF{
 public:
     VPointF();
     VPointF (const VPointF &point );
diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h
index 12df54292..390c717fd 100644
--- a/tools/vabstracttool.h
+++ b/tools/vabstracttool.h
@@ -34,8 +34,7 @@ namespace Tool{
     };
 }
 
-class VAbstractTool:public VDataTool
-{
+class VAbstractTool:public VDataTool{
     Q_OBJECT
 public:
                           VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0);
diff --git a/tools/vdatatool.cpp b/tools/vdatatool.cpp
index a187cd9cf..c35ad7514 100644
--- a/tools/vdatatool.cpp
+++ b/tools/vdatatool.cpp
@@ -33,10 +33,6 @@ VDataTool &VDataTool::operator =(const VDataTool &tool){
    return *this;
 }
 
-VContainer VDataTool::getData() const{
-    return data;
-}
-
 void VDataTool::setData(const VContainer *value){
     data = *value;
 }
diff --git a/tools/vdatatool.h b/tools/vdatatool.h
index 38b74c978..7e8781c49 100644
--- a/tools/vdatatool.h
+++ b/tools/vdatatool.h
@@ -22,26 +22,18 @@
 #ifndef VDATATOOL_H
 #define VDATATOOL_H
 
-#include <QObject>
 #include "container/vcontainer.h"
 
-class VDataTool : public QObject
-{
+class VDataTool : public QObject{
     Q_OBJECT
 public:
     explicit VDataTool(VContainer *data, QObject *parent = 0);
     virtual ~VDataTool();
     VDataTool& operator= (const VDataTool &tool);
-    VContainer getData() const;
+    VContainer getData() const { return data; }
     void setData(const VContainer *value);
-
-signals:
-    
-public slots:
-
 protected:
     VContainer   data;
-    
 };
 
 #endif // VDATATOOL_H
diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp
index 889a28022..94bbe603a 100644
--- a/xml/vdomdocument.cpp
+++ b/xml/vdomdocument.cpp
@@ -370,8 +370,6 @@ qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QStri
     return param;
 }
 
-
-
 void VDomDocument::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail,
                                     const QDomNode& node, const Document::Documents &parse){
     QDomNode domNode = node.firstChild();
diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h
index 14df1b4da..9a6d37270 100644
--- a/xml/vdomdocument.h
+++ b/xml/vdomdocument.h
@@ -112,7 +112,7 @@ private:
     qint64      GetParametrId(const QDomElement& domElement) const;
     qint64      GetParametrLongLong(const QDomElement& domElement, const QString &name) const;
     QString     GetParametrString(const QDomElement& domElement, const QString &name) const;
-    qreal       GetParametrDouble(const QDomElement& domElement, const QString &name) const;
+    qreal       GetParametrDouble(const QDomElement& domElement, const QString &name) const;  
 };
 
 #pragma GCC diagnostic pop