diff -r 780f926bc26c -r f83bd4ae1fe3 emailuis/nmailui/src/nmviewerheader.cpp --- a/emailuis/nmailui/src/nmviewerheader.cpp Fri Jun 11 16:42:02 2010 +0300 +++ b/emailuis/nmailui/src/nmviewerheader.cpp Thu Jun 24 14:32:18 2010 +0300 @@ -11,14 +11,14 @@ * * Contributors: * -* Description: +* Description: NMail viewer view header widget implementation * */ #include "nmuiheaders.h" -static const qreal nmHeaderLineOpacity = 0.4; +static const qreal NmHeaderLineOpacity = 0.4; /*! \class NmViewerHeader @@ -119,7 +119,7 @@ Q_UNUSED(widget); if (painter) { painter->save(); - painter->setOpacity(nmHeaderLineOpacity); + painter->setOpacity(NmHeaderLineOpacity); QLineF line1( rect().topLeft().x(), rect().bottomRight().y(), rect().bottomRight().x(), rect().bottomRight().y()); painter->drawLine(line1); @@ -160,7 +160,7 @@ // Set recipients to text edit field as html NmAddress sender = mMessage->envelope().sender(); if (mRecipientsBox){ - mRecipientsBox->setHtml(formatRecipientList(addressToDisplayInHtml(sender), + mRecipientsBox->setHtml(formatRecipientList(addressToDisplay(sender), mMessage->envelope().toRecipients(), mMessage->envelope().ccRecipients())); } @@ -272,7 +272,7 @@ // Set recipients to text edit field as html NmAddress sender = mMessage->envelope().sender(); if (mMessage) { - mRecipientsBox->setHtml(formatRecipientList(addressToDisplayInHtml(sender), + mRecipientsBox->setHtml(formatRecipientList(addressToDisplay(sender), mMessage->envelope().toRecipients(), mMessage->envelope().ccRecipients())); } @@ -294,8 +294,8 @@ QString result; result.append(""); - result.append(""); + result.append(""); // Set text in HTML format based on layout direction @@ -309,7 +309,7 @@ result.append(" "); int reciCount = to.count(); for (int i=0; i < reciCount; i++) { - result.append(addressToDisplayInHtml(to[i])); + result.append(addressToDisplay(to[i])); result.append(" "); } reciCount = cc.count(); @@ -318,7 +318,7 @@ result.append(hbTrId("txt_mail_list_cc")); result.append(" "); for (int i=0; i < reciCount; i++) { - result.append(addressToDisplayInHtml(cc[i])); + result.append(addressToDisplay(cc[i])); result.append(" "); } } @@ -333,7 +333,7 @@ result.append(" "); int reciCount = to.count(); for (int i=0; i < reciCount; i++) { - result.append(addressToDisplayInHtml(to[i])); + result.append(addressToDisplay(to[i])); result.append("; "); } reciCount = cc.count(); @@ -342,7 +342,7 @@ result.append(hbTrId("txt_mail_list_cc")); result.append(" "); for (int i=0; i < reciCount; i++) { - result.append(addressToDisplayInHtml(cc[i])); + result.append(addressToDisplay(cc[i])); result.append("; "); } } @@ -355,7 +355,7 @@ Function retursn address string from NmAddress to be displayed in HTML format */ -QString NmViewerHeader::addressToDisplayInHtml(const NmAddress &addr) +QString NmViewerHeader::addressToDisplay(const NmAddress &addr) { NM_FUNCTION;