From 45f9737fba7cbad9d8501c025eef850e0c50396d Mon Sep 17 00:00:00 2001
From: Valentina Zhuravska <none@none>
Date: Sat, 11 Jun 2016 19:50:20 +0300
Subject: [PATCH] Used Lambda expressions for slots in TMainWindow and
 DialogIncrements.

--HG--
branch : develop
---
 src/app/tape/tmainwindow.cpp                  | 24 +++----------------
 src/app/tape/tmainwindow.h                    |  5 +---
 .../valentina/dialogs/dialogincrements.cpp    | 24 +++----------------
 src/app/valentina/dialogs/dialogincrements.h  |  3 ---
 4 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index b76562758..4133df72f 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -459,24 +459,6 @@ void TMainWindow::CreateFromExisting()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::Find(const QString &term)
-{
-    search->Find(term);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::FindPrevious()
-{
-    search->FindPrevious();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void TMainWindow::FindNext()
-{
-    search->FindNext();
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::closeEvent(QCloseEvent *event)
 {
@@ -2018,9 +2000,9 @@ void TMainWindow::InitWindow()
     connect(ui->comboBoxPMSystem, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
             &TMainWindow::SavePMSystem);
 
-    connect(ui->lineEditFind, &QLineEdit::textEdited, this, &TMainWindow::Find);
-    connect(ui->toolButtonFindPrevious, &QToolButton::clicked, this, &TMainWindow::FindPrevious);
-    connect(ui->toolButtonFindNext, &QToolButton::clicked, this, &TMainWindow::FindNext);
+    connect(ui->lineEditFind, &QLineEdit::textEdited, [=] (const QString &term){search->Find(term);});
+    connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=] (){search->FindPrevious();});
+    connect(ui->toolButtonFindNext, &QToolButton::clicked, [=] (){search->FindNext();});
 
     ui->plainTextEditNotes->setPlainText(m->Notes());
     connect(ui->plainTextEditNotes, &QPlainTextEdit::textChanged, this, &TMainWindow::SaveNotes);
diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h
index 587387ee7..e349f391a 100644
--- a/src/app/tape/tmainwindow.h
+++ b/src/app/tape/tmainwindow.h
@@ -35,7 +35,7 @@
 #include "../vmisc/def.h"
 #include "../vmisc/vlockguard.h"
 #include "../vformat/vmeasurements.h"
-#include "vtablesearch.h"
+#include "../vmisc/vtablesearch.h"
 
 namespace Ui
 {
@@ -129,9 +129,6 @@ private slots:
     void NewWindow();
     void Preferences();
     void PatternUnitChanged(int index);
-    void Find(const QString &term);
-    void FindPrevious();
-    void FindNext();
 
 private:
     Q_DISABLE_COPY(TMainWindow)
diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp
index b13541c62..6ddb5c78f 100644
--- a/src/app/valentina/dialogs/dialogincrements.cpp
+++ b/src/app/valentina/dialogs/dialogincrements.cpp
@@ -106,9 +106,9 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
     connect(ui->lineEditName, &QLineEdit::editingFinished, this, &DialogIncrements::SaveIncrName);
     connect(ui->plainTextEditDescription, &QPlainTextEdit::textChanged, this, &DialogIncrements::SaveIncrDescription);
     connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogIncrements::SaveIncrFormula);
-    connect(ui->lineEditFind, &QLineEdit::textEdited, this, &DialogIncrements::Find);
-    connect(ui->toolButtonFindPrevious, &QToolButton::clicked, this, &DialogIncrements::FindPrevious);
-    connect(ui->toolButtonFindNext, &QToolButton::clicked, this, &DialogIncrements::FindNext);
+    connect(ui->lineEditFind, &QLineEdit::textEdited,  [=](const QString &term){search->Find(term);});
+    connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=](){search->FindPrevious();});
+    connect(ui->toolButtonFindNext, &QToolButton::clicked, [=](){search->FindNext();});
 
     if (ui->tableWidgetIncrement->rowCount() > 0)
     {
@@ -784,24 +784,6 @@ void DialogIncrements::ShowIncrementDetails()
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-void DialogIncrements::Find(const QString &term)
-{
-    search->Find(term);
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogIncrements::FindPrevious()
-{
-    search->FindPrevious();
-}
-
-//---------------------------------------------------------------------------------------------------------------------
-void DialogIncrements::FindNext()
-{
-    search->FindNext();
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 DialogIncrements::~DialogIncrements()
 {
diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h
index 33f6402a5..d54ef48b3 100644
--- a/src/app/valentina/dialogs/dialogincrements.h
+++ b/src/app/valentina/dialogs/dialogincrements.h
@@ -73,9 +73,6 @@ private slots:
     void DeployFormula();
     void Fx();
     void FullUpdateFromFile();
-    void Find(const QString &term);
-    void FindPrevious();
-    void FindNext();
 
 private:
     Q_DISABLE_COPY(DialogIncrements)