← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdepim/quantal

« back to all changes in this revision

Viewing changes to kaddressbook/grantleecontactformatter.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-15 14:17:51 UTC
  • mto: This revision was merged to the branch mainline in revision 193.
  • Revision ID: package-import@ubuntu.com-20111215141751-bmhdpiwl23wd9w26
Tags: upstream-4.7.90
Import upstream version 4.7.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
kaddressbook/grantleecontactformatter.cpp
33
33
#include <kstringhandler.h>
34
34
 
35
35
#include <QtCore/QSet>
 
36
#include <QtCore/QRegExp>
36
37
 
37
38
using namespace Akonadi;
38
39
 
129
130
  }
130
131
 
131
132
  if ( !formattedAddress.isEmpty() ) {
132
 
    formattedAddress = formattedAddress.replace( QLatin1Char( '\n' ), QLatin1String( "<br/>" ) );
 
133
    formattedAddress = formattedAddress.replace( QRegExp( "\n+" ), QLatin1String( "<br/>" ) );
133
134
 
134
135
    const QString url = QString::fromLatin1( "<a href=\"address:?index=%1\">%2</a>" ).arg( counter).arg( formattedAddress );
135
136
    addressObject.insert( "formattedAddressLink", url );