From 1dfe9eda03bfb366158624f23886e2c7a4213a24 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 11 Jun 2014 19:38:09 +0300 Subject: [PATCH] Change slot FullUpdateFromGui name to more readable FullUpdateFromGuiOk. --HG-- branch : feature --- src/app/tools/drawTools/vdrawtool.cpp | 4 ++-- src/app/tools/drawTools/vdrawtool.h | 4 ++-- src/app/tools/vtooldetail.cpp | 4 ++-- src/app/tools/vtooldetail.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp index b8175d8e8..4720d9d93 100644 --- a/src/app/tools/drawTools/vdrawtool.cpp +++ b/src/app/tools/drawTools/vdrawtool.cpp @@ -105,10 +105,10 @@ void VDrawTool::ChangedNameDraw(const QString &oldName, const QString &newName) //--------------------------------------------------------------------------------------------------------------------- /** - * @brief FullUpdateFromGui refresh tool data after change in options. + * @brief FullUpdateFromGuiOk refresh tool data after change in options. * @param result keep result working dialog. */ -void VDrawTool::FullUpdateFromGui(int result) +void VDrawTool::FullUpdateFromGuiOk(int result) { if (result == QDialog::Accepted) { diff --git a/src/app/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h index 60bc4950a..bc470bff9 100644 --- a/src/app/tools/drawTools/vdrawtool.h +++ b/src/app/tools/drawTools/vdrawtool.h @@ -61,7 +61,7 @@ public slots: virtual void ShowTool(quint32 id, Qt::GlobalColor color, bool enable); virtual void ChangedActivDraw(const QString &newName); void ChangedNameDraw(const QString &oldName, const QString &newName); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromGuiOk(int result); /** * @brief FullUpdateFromGuiApply refresh tool data after change in options but do not delete dialog */ @@ -125,7 +125,7 @@ protected: connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, dialog, &DialogTool::ChoosedObject); - connect(dialog, &DialogTool::DialogClosed, tool, &Tool::FullUpdateFromGui); + connect(dialog, &DialogTool::DialogClosed, tool, &Tool::FullUpdateFromGuiOk); connect(dialog, &DialogTool::DialogApplied, tool, &Tool::FullUpdateFromGuiApply); if (ignoreFullUpdate == false) { diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index 2ff3cdd85..439c7e246 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -201,7 +201,7 @@ void VToolDetail::FullUpdateFromFile() } //--------------------------------------------------------------------------------------------------------------------- -void VToolDetail::FullUpdateFromGui(int result) +void VToolDetail::FullUpdateFromGuiOk(int result) { if (result == QDialog::Accepted) { @@ -369,7 +369,7 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) dialog = new DialogDetail(getData(), list.first()); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, dialog, &DialogTool::ChoosedObject); - connect(dialog, &DialogTool::DialogClosed, this, &VToolDetail::FullUpdateFromGui); + connect(dialog, &DialogTool::DialogClosed, this, &VToolDetail::FullUpdateFromGuiOk); setDialog(); dialog->show(); } diff --git a/src/app/tools/vtooldetail.h b/src/app/tools/vtooldetail.h index d650255f2..96b32ac1b 100644 --- a/src/app/tools/vtooldetail.h +++ b/src/app/tools/vtooldetail.h @@ -118,10 +118,10 @@ public slots: */ virtual void FullUpdateFromFile (); /** - * @brief FullUpdateFromGui refresh tool data after change in options. + * @brief FullUpdateFromGuiOk refresh tool data after change in options. * @param result keep result working dialog. */ - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromGuiOk(int result); protected: /** * @brief AddToFile add tag with informations about tool into file.