[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kdepim/KDE/4.14] libkdepim/addressline: Adapt patch from Till Adam to avoid to search in baloo 
From:       Vishesh Handa <me () vhanda ! in>
Date:       2014-09-02 10:17:41
Message-ID: CAOPTMKBvKpd-qtakXHTcV7rPSZpu=OhrYCKetm6Bn+xqRgw=9w () mail ! gmail ! com
[Download RAW message or body]

On Tue, Sep 2, 2014 at 7:39 AM, Montel Laurent <montel@kde.org> wrote:

> Git commit d6806c4d56e4b1f8ef76a1d080cb664c55a3794a by Montel Laurent.
> Committed on 02/09/2014 at 05:36.
> Pushed by mlaurent into branch 'KDE/4.14'.
>
> Adapt patch from Till Adam to avoid to search in baloo when string size
> <3, and without Delay
>

Why? Is it too slow or something?


>
> CCMAIL: adam@kde.org
>
> M  +7    -11   libkdepim/addressline/addresseelineedit.cpp
>
> http://commits.kde.org/kdepim/d6806c4d56e4b1f8ef76a1d080cb664c55a3794a
>
> diff --git a/libkdepim/addressline/addresseelineedit.cpp
> b/libkdepim/addressline/addresseelineedit.cpp
> index b7e07f7..2fa47a0 100644
> --- a/libkdepim/addressline/addresseelineedit.cpp
> +++ b/libkdepim/addressline/addresseelineedit.cpp
> @@ -381,7 +381,8 @@ QStringList
> AddresseeLineEdit::Private::cleanupBalooContact(const QStringList &l
>
>  void AddresseeLineEdit::Private::searchInBaloo()
>  {
> -    Baloo::PIM::ContactCompleter com(m_searchString.trimmed(), 20);
> +    const QString trimmedString = m_searchString.trimmed();
> +    Baloo::PIM::ContactCompleter com(trimmedString, 20);
>      const QStringList listEmail = cleanupBalooContact(com.complete());
>      Q_FOREACH (const QString& email, listEmail) {
>          addCompletionItem(email, 1, s_static->balooCompletionSource);
> @@ -609,9 +610,13 @@ void AddresseeLineEdit::Private::updateSearchString()
>
>  void AddresseeLineEdit::Private::slotTriggerDelayedQueries()
>  {
> -    if (m_searchString.isEmpty())
> +    if (m_searchString.isEmpty() || m_searchString.trimmed().size() <= 2)
>          return;
>
> +    if (m_enableBalooSearch) {
> +       searchInBaloo();
> +    }
> +
>      // We send a contactsearch job through akonadi.
>      // This not only searches baloo but also servers if remote search is
> enabled
>      akonadiPerformSearch();
> @@ -619,21 +624,12 @@ void
> AddresseeLineEdit::Private::slotTriggerDelayedQueries()
>
>  void AddresseeLineEdit::Private::startSearches()
>  {
> -    if (m_enableBalooSearch) {
> -       //No need to delay the baloo search
> -       searchInBaloo();
> -    }
> -
>      if (!m_delayedQueryTimer.isActive())
>          m_delayedQueryTimer.start(50);
>  }
>
>  void AddresseeLineEdit::Private::akonadiPerformSearch()
>  {
> -
> -    if ( m_searchString.size() < 2 ) {
> -        return;
> -    }
>      kDebug() << "searching akonadi with:" << m_searchString;
>
>      // first, kill all job still in flight, they are no longer current
>



-- 
Vishesh Handa

[Attachment #3 (text/html)]

<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, \
Sep 2, 2014 at 7:39 AM, Montel Laurent <span dir="ltr">&lt;<a \
href="mailto:montel@kde.org" target="_blank">montel@kde.org</a>&gt;</span> wrote:<br> \
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">Git commit d6806c4d56e4b1f8ef76a1d080cb664c55a3794a by Montel \
Laurent.<br> Committed on 02/09/2014 at 05:36.<br>
Pushed by mlaurent into branch &#39;KDE/4.14&#39;.<br>
<br>
Adapt patch from Till Adam to avoid to search in baloo when string size &lt;3, and \
without Delay<br></blockquote><div><br></div><div>Why? Is it too slow or \
something?</div><div>  </div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex">

<br>
CCMAIL: <a href="mailto:adam@kde.org">adam@kde.org</a><br>
<br>
M   +7      -11     libkdepim/addressline/addresseelineedit.cpp<br>
<br>
<a href="http://commits.kde.org/kdepim/d6806c4d56e4b1f8ef76a1d080cb664c55a3794a" \
target="_blank">http://commits.kde.org/kdepim/d6806c4d56e4b1f8ef76a1d080cb664c55a3794a</a><br>
 <br>
diff --git a/libkdepim/addressline/addresseelineedit.cpp \
b/libkdepim/addressline/addresseelineedit.cpp<br> index b7e07f7..2fa47a0 100644<br>
--- a/libkdepim/addressline/addresseelineedit.cpp<br>
+++ b/libkdepim/addressline/addresseelineedit.cpp<br>
@@ -381,7 +381,8 @@ QStringList AddresseeLineEdit::Private::cleanupBalooContact(const \
QStringList &amp;l<br> <br>
  void AddresseeLineEdit::Private::searchInBaloo()<br>
  {<br>
-      Baloo::PIM::ContactCompleter com(m_searchString.trimmed(), 20);<br>
+      const QString trimmedString = m_searchString.trimmed();<br>
+      Baloo::PIM::ContactCompleter com(trimmedString, 20);<br>
        const QStringList listEmail = cleanupBalooContact(com.complete());<br>
        Q_FOREACH (const QString&amp; email, listEmail) {<br>
              addCompletionItem(email, 1, s_static-&gt;balooCompletionSource);<br>
@@ -609,9 +610,13 @@ void AddresseeLineEdit::Private::updateSearchString()<br>
<br>
  void AddresseeLineEdit::Private::slotTriggerDelayedQueries()<br>
  {<br>
-      if (m_searchString.isEmpty())<br>
+      if (m_searchString.isEmpty() || m_searchString.trimmed().size() &lt;= 2)<br>
              return;<br>
<br>
+      if (m_enableBalooSearch) {<br>
+           searchInBaloo();<br>
+      }<br>
+<br>
        // We send a contactsearch job through akonadi.<br>
        // This not only searches baloo but also servers if remote search is \
enabled<br>  akonadiPerformSearch();<br>
@@ -619,21 +624,12 @@ void \
AddresseeLineEdit::Private::slotTriggerDelayedQueries()<br> <br>
  void AddresseeLineEdit::Private::startSearches()<br>
  {<br>
-      if (m_enableBalooSearch) {<br>
-           //No need to delay the baloo search<br>
-           searchInBaloo();<br>
-      }<br>
-<br>
        if (!m_delayedQueryTimer.isActive())<br>
              m_delayedQueryTimer.start(50);<br>
  }<br>
<br>
  void AddresseeLineEdit::Private::akonadiPerformSearch()<br>
  {<br>
-<br>
-      if ( m_searchString.size() &lt; 2 ) {<br>
-            return;<br>
-      }<br>
        kDebug() &lt;&lt; &quot;searching akonadi with:&quot; &lt;&lt; \
m_searchString;<br> <br>
        // first, kill all job still in flight, they are no longer current<br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><span \
style="color:rgb(192,192,192)">Vishesh Handa</span><br> </div></div>



[prev in list] [next in list] [prev in thread] [next in thread]