Branch 'dev/KQCompletion' - libkdepim/addressline

Sandro Knauß knauss at kolabsys.com
Thu Jun 12 22:00:04 CEST 2014


 libkdepim/addressline/addresseelineedit.cpp |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 1aff14188b3d87936865b56f25013aee7dd0a130
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Thu Jun 12 21:59:52 2014 +0200

    remove merge conficts

diff --git a/libkdepim/addressline/addresseelineedit.cpp b/libkdepim/addressline/addresseelineedit.cpp
index b867905..7baa955 100644
--- a/libkdepim/addressline/addresseelineedit.cpp
+++ b/libkdepim/addressline/addresseelineedit.cpp
@@ -1162,12 +1162,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
         const QString familyName= addr.familyName();
         const QString nickName  = addr.nickName();
         QString fullEmail       = addr.fullEmail( email );
-        QString appendix;
-
-        if ( !nickName.isEmpty() ) {
-            appendix = QLatin1String( " (%1)" );
-            appendix = appendix.arg( nickName );
-        }
 
         QString appendix;
 




More information about the commits mailing list