Renamed file to match class name.

* Updated includes.

4 files changed, 14 insertions, 14 deletions

diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index 7f5e5b4f..7101d5cb 100644
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -677,8 +677,8 @@
 		C6F61FB61702B5290073032E /* MCOIMAPBaseOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6F61FB31702AB2A0073032E /* MCOIMAPBaseOperation.h */; };
 		DA0F1C7B177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = DA0F1C79177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.cc */; };
 		DA0F1C7C177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = DA0F1C79177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.cc */; };
-		DAD28C8B1783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc */; };
-		DAD28C8C1783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc */; };
+		DAD28C8B1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc */; };
+		DAD28C8C1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc */; };
 		F87F190C16BB62B00012652F /* MCOIMAPFetchFoldersOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = F87F190B16BB62B00012652F /* MCOIMAPFetchFoldersOperation.mm */; };
 		F8EA941716BB1C9D0011AC6F /* MCOIMAPSession.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = F8EA941416BAED6E0011AC6F /* MCOIMAPSession.h */; };
 /* End PBXBuildFile section */
@@ -1459,8 +1459,8 @@
 		C6F61FB41702AB2F0073032E /* MCOIMAPBaseOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPBaseOperation.mm; sourceTree = "<group>"; };
 		DA0F1C79177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPMessageRenderingOperation.cc; sourceTree = "<group>"; };
 		DA0F1C7A177C07B300F0D3B4 /* MCIMAPMessageRenderingOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPMessageRenderingOperation.h; sourceTree = "<group>"; };
-		DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCHTMLBodyRendererCallback.cc; sourceTree = "<group>"; };
-		DAD28C8A1783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCHTMLBodyRendererCallback.h; sourceTree = "<group>"; };
+		DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCHTMLBodyRendererTemplateCallback.cc; sourceTree = "<group>"; };
+		DAD28C8A1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCHTMLBodyRendererTemplateCallback.h; sourceTree = "<group>"; };
 		F87F190816BB62690012652F /* MCOIMAPFetchFoldersOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPFetchFoldersOperation.h; sourceTree = "<group>"; };
 		F87F190B16BB62B00012652F /* MCOIMAPFetchFoldersOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPFetchFoldersOperation.mm; sourceTree = "<group>"; };
 		F8EA941416BAED6E0011AC6F /* MCOIMAPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPSession.h; sourceTree = "<group>"; };
@@ -1559,8 +1559,8 @@
 				C63CD68416BE148B00DB18F1 /* MCHTMLRendererCallback.cc */,
 				C63CD68516BE148B00DB18F1 /* MCHTMLRendererCallback.h */,
 				C63CD68716BE1AB600DB18F1 /* MCRenderer.h */,
-				DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc */,
-				DAD28C8A1783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.h */,
+				DAD28C891783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc */,
+				DAD28C8A1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.h */,
 			);
 			path = renderer;
 			sourceTree = "<group>";
@@ -2506,7 +2506,7 @@
 				9EF9AB11175F319A0027FA3B /* MCIMAPFolderStatusOperation.cc in Sources */,
 				9EF9AB19175F36600027FA3B /* MCOIMAPFolderStatusOperation.mm in Sources */,
 				9E774D891767C7F60065EB9B /* MCIMAPFolderStatus.cc in Sources */,
-				DAD28C8B1783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc in Sources */,
+				DAD28C8B1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc in Sources */,
 				BD63713B177DFF080094121B /* MCLibetpan.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2691,7 +2691,7 @@
 				9EF9AB12175F319A0027FA3B /* MCIMAPFolderStatusOperation.cc in Sources */,
 				9EF9AB1A175F36600027FA3B /* MCOIMAPFolderStatusOperation.mm in Sources */,
 				9E774D8A1767C7F60065EB9B /* MCIMAPFolderStatus.cc in Sources */,
-				DAD28C8C1783CFFC00F2BB8F /* MCHTMLBodyRendererCallback.cc in Sources */,
+				DAD28C8C1783CFFC00F2BB8F /* MCHTMLBodyRendererTemplateCallback.cc in Sources */,
 				BD63713C177DFF080094121B /* MCLibetpan.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index a2b9cc60..0583dc79 100644
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -6,7 +6,7 @@
 #include <MailCore/MCMessageConstants.h>
 #include <MailCore/MCIMAPMessage.h>
 #include <MailCore/MCHTMLRendererCallback.h>
-#include <MailCore/MCHTMLBodyRendererCallback.h>
+#include <MailCore/MCHTMLBodyRendererTemplateCallback.h>
 
 #ifdef __cplusplus
 
diff --git a/src/core/renderer/MCHTMLBodyRendererCallback.cc b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.cc
index 98bb2a2f..06a1a7a3 100644
--- a/src/core/renderer/MCHTMLBodyRendererCallback.cc
+++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.cc
@@ -1,12 +1,12 @@
 //
-//  MCHTMLBodyRendererCallback.cc
+//  MCHTMLBodyRendererTemplateCallback.cc
 //  mailcore2
 //
 //  Created by Paul Young on 02/07/2013.
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#include "MCHTMLBodyRendererCallback.h"
+#include "MCHTMLBodyRendererTemplateCallback.h"
 
 using namespace mailcore;
 
diff --git a/src/core/renderer/MCHTMLBodyRendererCallback.h b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
index ca2ec91b..27170d66 100644
--- a/src/core/renderer/MCHTMLBodyRendererCallback.h
+++ b/src/core/renderer/MCHTMLBodyRendererTemplateCallback.h
@@ -1,14 +1,14 @@
 //
-//  MCHTMLBodyRendererCallback.h
+//  MCHTMLBodyRendererTemplateCallback.h
 //  mailcore2
 //
 //  Created by Paul Young on 02/07/2013.
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __MAILCORE_MCHTMLBODYRENDERERCALLBACK_H_
+#ifndef __MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H_
 
-#define __MAILCORE_MCHTMLBODYRENDERERCALLBACK_H_
+#define __MAILCORE_MCHTMLBODYRENDERERTEMPLATECALLBACK_H_
 
 #include <MailCore/MCHTMLRendererCallback.h>