aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/renderer')
-rw-r--r--src/core/renderer/MCAddressDisplay.cc16
-rw-r--r--src/core/renderer/MCAddressDisplay.h1
-rw-r--r--src/core/renderer/MCDateFormatter.cc2
-rw-r--r--src/core/renderer/MCDateFormatter.h8
-rw-r--r--src/core/renderer/MCHTMLBodyRendererTemplateCallback.h2
-rw-r--r--src/core/renderer/MCHTMLRenderer.h1
-rw-r--r--src/core/renderer/MCHTMLRendererCallback.cc2
-rw-r--r--src/core/renderer/MCHTMLRendererCallback.h4
-rw-r--r--src/core/renderer/MCSizeFormatter.h1
9 files changed, 19 insertions, 18 deletions
diff --git a/src/core/renderer/MCAddressDisplay.cc b/src/core/renderer/MCAddressDisplay.cc
index 27229e18..dd2d559a 100644
--- a/src/core/renderer/MCAddressDisplay.cc
+++ b/src/core/renderer/MCAddressDisplay.cc
@@ -31,12 +31,12 @@ String * AddressDisplay::shortDisplayStringForAddress(Address * address)
String * AddressDisplay::veryShortDisplayStringForAddress(Address * address)
{
if ((address->displayName() != NULL) && (address->displayName()->length() > 0)) {
- Array * components;
- String * senderName;
+ Array * components;
+ String * senderName;
- senderName = address->displayName();
+ senderName = address->displayName();
senderName = (String *) senderName->copy()->autorelease();
-
+
senderName->replaceOccurrencesOfString(MCSTR(","), MCSTR(" "));
senderName->replaceOccurrencesOfString(MCSTR("'"), MCSTR(" "));
senderName->replaceOccurrencesOfString(MCSTR("\""), MCSTR(" "));
@@ -45,10 +45,10 @@ String * AddressDisplay::veryShortDisplayStringForAddress(Address * address)
return MCLOCALIZEDSTRING(MCSTR("invalid"));
}
return (String *) components->objectAtIndex(0);
- }
+ }
else if (address->mailbox()) {
- return address->mailbox();
- }
+ return address->mailbox();
+ }
else {
return MCLOCALIZEDSTRING(MCSTR("invalid"));
}
@@ -56,7 +56,7 @@ String * AddressDisplay::veryShortDisplayStringForAddress(Address * address)
String * AddressDisplay::displayStringForAddresses(Array * addresses)
{
- return Address::nonEncodedRFC822StringForAddresses(addresses);
+ return Address::nonEncodedRFC822StringForAddresses(addresses);
}
String * AddressDisplay::shortDisplayStringForAddresses(Array * addresses)
diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h
index 3fe6856d..0e69377a 100644
--- a/src/core/renderer/MCAddressDisplay.h
+++ b/src/core/renderer/MCAddressDisplay.h
@@ -16,7 +16,6 @@
namespace mailcore {
class AddressDisplay {
-
public:
static String * displayStringForAddress(Address * address);
static String * shortDisplayStringForAddress(Address * address);
diff --git a/src/core/renderer/MCDateFormatter.cc b/src/core/renderer/MCDateFormatter.cc
index 17e4c290..2882977d 100644
--- a/src/core/renderer/MCDateFormatter.cc
+++ b/src/core/renderer/MCDateFormatter.cc
@@ -204,7 +204,7 @@ void DateFormatter::prepare()
#if USE_COREFOUNDATION
if (mAppleDateFormatter != NULL)
return;
-
+
CFStringRef localeIdentifier = NULL;
CFLocaleRef localeRef = NULL;
if (mLocale != NULL) {
diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h
index 4c5a7140..e120702a 100644
--- a/src/core/renderer/MCDateFormatter.h
+++ b/src/core/renderer/MCDateFormatter.h
@@ -32,10 +32,10 @@ namespace mailcore {
class DateFormatter : public Object {
public:
- DateFormatter();
- virtual ~DateFormatter();
-
- static DateFormatter * dateFormatter();
+ DateFormatter();
+ virtual ~DateFormatter();
+
+ static DateFormatter * dateFormatter();
virtual void setDateStyle(DateFormatStyle style);
virtual DateFormatStyle dateStyle();
diff --git a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
index 7cb9ae10..5c2115f8 100644
--- a/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
+++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
@@ -15,7 +15,7 @@
#ifdef __cplusplus
namespace mailcore {
-
+
class HTMLBodyRendererTemplateCallback : public Object, public HTMLRendererTemplateCallback {
public:
virtual String * templateForMainHeader(MessageHeader * header);
diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h
index f76510e8..a9f49e89 100644
--- a/src/core/renderer/MCHTMLRenderer.h
+++ b/src/core/renderer/MCHTMLRenderer.h
@@ -34,6 +34,7 @@ namespace mailcore {
static Array * /* AbstractPart */ attachmentsForMessage(AbstractMessage * message);
static Array * /* AbstractPart */ htmlInlineAttachmentsForMessage(AbstractMessage * message);
};
+
};
#endif
diff --git a/src/core/renderer/MCHTMLRendererCallback.cc b/src/core/renderer/MCHTMLRendererCallback.cc
index 5147e934..bf408d4f 100644
--- a/src/core/renderer/MCHTMLRendererCallback.cc
+++ b/src/core/renderer/MCHTMLRendererCallback.cc
@@ -260,5 +260,5 @@ bool HTMLRendererTemplateCallback::canPreviewPart(AbstractPart * part)
bool HTMLRendererTemplateCallback::shouldShowPart(AbstractPart * part)
{
- return true;
+ return true;
}
diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h
index 84292dad..1d04c8d4 100644
--- a/src/core/renderer/MCHTMLRendererCallback.h
+++ b/src/core/renderer/MCHTMLRendererCallback.h
@@ -41,14 +41,14 @@ namespace mailcore {
virtual String * templateForEmbeddedMessage(AbstractMessagePart * part);
virtual String * templateForEmbeddedMessageHeader(MessageHeader * header);
virtual String * templateForAttachmentSeparator();
-
+
// Can be used to filter some HTML tags.
virtual String * filterHTMLForPart(String * html);
// Can be used to hide quoted text.
virtual String * filterHTMLForMessage(String * html);
};
-
+
}
#endif
diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h
index a51373ae..0eb40f6b 100644
--- a/src/core/renderer/MCSizeFormatter.h
+++ b/src/core/renderer/MCSizeFormatter.h
@@ -14,6 +14,7 @@
#ifdef __cplusplus
namespace mailcore {
+
class String;
class SizeFormatter : public Object {