From 280b7c95841dd88a6da4310fb1c036a688a98479 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Thu, 26 Jun 2014 13:41:59 +0300
Subject: [PATCH] Refactoring.

--HG--
branch : develop
---
 src/app/tools/drawTools/vtoolsinglepoint.cpp |  8 +-------
 src/app/tools/vabstracttool.cpp              | 20 +++++++++++++-------
 src/app/tools/vabstracttool.h                |  1 +
 src/app/tools/vtooldetail.cpp                | 10 ++--------
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp
index 4d4fdf42a..6ef6046f0 100644
--- a/src/app/tools/drawTools/vtoolsinglepoint.cpp
+++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp
@@ -188,13 +188,7 @@ void VToolSinglePoint::DeleteTool(bool ask)
 {
     if (ask)
     {
-        QMessageBox msgBox;
-        msgBox.setText(tr("Confirm the deletion."));
-        msgBox.setInformativeText(tr("Do you really want delete?"));
-        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-        msgBox.setDefaultButton(QMessageBox::Ok);
-        msgBox.setIcon(QMessageBox::Question);
-        if (msgBox.exec() == QMessageBox::Cancel)
+        if (ConfirmDeletion() == QMessageBox::Cancel)
         {
             return;
         }
diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp
index 2c5fbc37a..e4a774e8f 100644
--- a/src/app/tools/vabstracttool.cpp
+++ b/src/app/tools/vabstracttool.cpp
@@ -246,13 +246,7 @@ void VAbstractTool::DeleteTool(bool ask)
 {
     if (ask)
     {
-        QMessageBox msgBox;
-        msgBox.setText(tr("Confirm the deletion."));
-        msgBox.setInformativeText(tr("Do you really want delete?"));
-        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-        msgBox.setDefaultButton(QMessageBox::Ok);
-        msgBox.setIcon(QMessageBox::Question);
-        if (msgBox.exec() == QMessageBox::Cancel)
+        if (ConfirmDeletion() == QMessageBox::Cancel)
         {
             return;
         }
@@ -296,6 +290,18 @@ Qt::PenStyle VAbstractTool::LineStyle()
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+int VAbstractTool::ConfirmDeletion()
+{
+    QMessageBox msgBox;
+    msgBox.setText(tr("Confirm the deletion."));
+    msgBox.setInformativeText(tr("Do you really want delete?"));
+    msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
+    msgBox.setDefaultButton(QMessageBox::Ok);
+    msgBox.setIcon(QMessageBox::Question);
+    return msgBox.exec();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 /**
  * @brief LineCoefficients coefficient for equation of segment. Segment equestion ax+by+c=0.
diff --git a/src/app/tools/vabstracttool.h b/src/app/tools/vabstracttool.h
index dda072331..5c2047cb1 100644
--- a/src/app/tools/vabstracttool.h
+++ b/src/app/tools/vabstracttool.h
@@ -148,6 +148,7 @@ protected:
     virtual void            RemoveReferens(){}
     virtual void            DeleteTool(bool ask = true);
     Qt::PenStyle            LineStyle();
+    static int              ConfirmDeletion();
 private:
     Q_DISABLE_COPY(VAbstractTool)
 };
diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp
index d5e61c90f..c89b12212 100644
--- a/src/app/tools/vtooldetail.cpp
+++ b/src/app/tools/vtooldetail.cpp
@@ -496,17 +496,11 @@ void VToolDetail::DeleteTool(bool ask)
     DeleteDetail *delDet = new DeleteDetail(doc, id);
     if (ask)
     {
-        QMessageBox msgBox;
-        msgBox.setText(tr("Confirm the deletion."));
-        msgBox.setInformativeText(tr("Do you really want delete?"));
-        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-        msgBox.setDefaultButton(QMessageBox::Ok);
-        msgBox.setIcon(QMessageBox::Question);
-        if (msgBox.exec() == QMessageBox::Cancel)
+        if (ConfirmDeletion() == QMessageBox::Cancel)
         {
             return;
         }
-        /*Ugly hack. If UnionDetails delete detail no need emit FullParsing */
+        /* If UnionDetails tool delete detail no need emit FullParsing.*/
         connect(delDet, &DeleteDetail::NeedFullParsing, doc, &VPattern::NeedFullParsing);
     }
     qApp->getUndoStack()->push(delDet);