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

List:       kde-commits
Subject:    [kdepim/KDE/4.14] libkdepim/addressline: Remove unused code
From:       Montel Laurent <montel () kde ! org>
Date:       2015-02-11 12:52:33
Message-ID: E1YLWmP-0008Hi-2q () scm ! kde ! org
[Download RAW message or body]

Git commit 8156d8d553dc4090519e2bb2c4dc647821af612e by Montel Laurent.
Committed on 11/02/2015 at 12:52.
Pushed by mlaurent into branch 'KDE/4.14'.

Remove unused code

M  +2    -18   libkdepim/addressline/addresseelineedit.cpp

http://commits.kde.org/kdepim/8156d8d553dc4090519e2bb2c4dc647821af612e

diff --git a/libkdepim/addressline/addresseelineedit.cpp b/libkdepim/addressline/addresseelineedit.cpp
index 2f5cb41..9b52c64 100644
--- a/libkdepim/addressline/addresseelineedit.cpp
+++ b/libkdepim/addressline/addresseelineedit.cpp
@@ -264,7 +264,6 @@ public:
     void slotTriggerDelayedQueries();
     void slotShowOUChanged( bool );
     void slotConfigureBalooBlackList();
-    static KCompletion::CompOrder completionOrder();
 
     AddresseeLineEdit *q;
     QStringList m_balooBlackList;
@@ -287,7 +286,7 @@ public:
 void AddresseeLineEdit::Private::init()
 {
     if ( !s_static.exists() ) {
-        s_static->completion->setOrder( completionOrder() );
+        s_static->completion->setOrder( KCompletion::Weighted );
         s_static->completion->setIgnoreCase( true );
     }
 
@@ -700,7 +699,7 @@ void AddresseeLineEdit::Private::doCompletion( bool ctrlT )
         return;
     }
 
-    s_static->completion->setOrder( completionOrder() );
+    s_static->completion->setOrder( KCompletion::Weighted );
 
     // cursor at end of string - or Ctrl+T pressed for substring completion?
     if ( ctrlT ) {
@@ -998,21 +997,6 @@ void AddresseeLineEdit::Private::slotAkonadiCollectionsReceived(
     }
 }
 
-// not cached, to make sure we get an up-to-date value when it changes
-KCompletion::CompOrder AddresseeLineEdit::Private::completionOrder()
-{
-    KConfig _config( QLatin1String( "kpimcompletionorder" ) );
-    const KConfigGroup config( &_config, QLatin1String( "General" ) );
-    const QString order =
-            config.readEntry( QLatin1String( "CompletionOrder" ), QString::fromLatin1( "Weighted" ) );
-
-    if ( order == QLatin1String( "Weighted" ) ) {
-        return KCompletion::Weighted;
-    } else {
-        return KCompletion::Sorted;
-    }
-}
-
 void AddresseeLineEdit::Private::slotShowOUChanged(bool checked)
 {
     if ( checked != m_showOU ) {
[prev in list] [next in list] [prev in thread] [next in thread]