[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=3156579

The following commit has been merged in the master branch:
commit 31565791d248e39ace22e12c25df6bb52a26b364
Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Date:   Sun Feb 7 20:40:40 2016 +0100

    logviewer: Fix signals of search field
    
    REVIEW: 127007
---
 logviewer/log-viewer.cpp | 7 ++++---
 logviewer/log-viewer.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index 1ae0f7b..3f95f03 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -114,8 +114,8 @@ LogViewer::LogViewer(const Tp::AccountFactoryPtr &accountFactory, const Tp::Conn
     connect(ui->datesView, SIGNAL(clicked(QModelIndex)), SLOT(slotDateClicked(QModelIndex)));
     connect(ui->datesView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), SLOT(slotUpdateMainWindow()));
     connect(ui->messageView, SIGNAL(conversationSwitchRequested(QDate)), SLOT(slotSetConversationDate(QDate)));
-    connect(ui->globalSearch, SIGNAL(returnPressed(QString)), SLOT(slotStartGlobalSearch(QString)));
-    connect(ui->globalSearch, SIGNAL(clearButtonClicked()), SLOT(slotClearGlobalSearch()));
+    connect(ui->globalSearch, SIGNAL(returnPressed()), SLOT(slotStartGlobalSearch()));
+    connect(ui->globalSearch, &QLineEdit::textChanged, [this](const QString &text) { if (text.isEmpty()) { slotClearGlobalSearch(); } });
     connect(ui->entityList, SIGNAL(customContextMenuRequested(QPoint)), SLOT(slotShowEntityListContextMenu(QPoint)));
     connect(ui->entityList, SIGNAL(noSuchContact()), SLOT(slotNoLogsForContact()));
 }
@@ -302,8 +302,9 @@ void LogViewer::slotSetConversationDate(const QDate &date)
     }
 }
 
-void LogViewer::slotStartGlobalSearch(const QString &term)
+void LogViewer::slotStartGlobalSearch()
 {
+    const QString &term = ui->globalSearch->text();
     if (term.isEmpty()) {
         ui->messageView->clearHighlightText();
         m_filterModel->clearSearchHits();
diff --git a/logviewer/log-viewer.h b/logviewer/log-viewer.h
index e6b6d3d..578f0cd 100644
--- a/logviewer/log-viewer.h
+++ b/logviewer/log-viewer.h
@@ -66,7 +66,7 @@ private Q_SLOTS:
 
     void slotShowEntityListContextMenu(const QPoint &coords);
     void slotClearGlobalSearch();
-    void slotStartGlobalSearch(const QString &term);
+    void slotStartGlobalSearch();
     void onGlobalSearchFinished(KTp::PendingLoggerOperation *);
 
     void slotClearContactHistory();

-- 
ktp-text-ui packaging