Change Font to an interface and stop using FontID. Fonts are shared and

reference counted using std::shared_ptr. This optimizes memory and reduces
potential for allocation bugs.

1 files changed, 5 insertions, 5 deletions

diff --git a/cocoa/QuartzTextStyle.h b/cocoa/QuartzTextStyle.h
index 3c5684685..f8d50ebe9 100644
--- a/cocoa/QuartzTextStyle.h
+++ b/cocoa/QuartzTextStyle.h
@@ -21,14 +21,14 @@ public:
 		characterSet = 0;
 	}
 
-	QuartzTextStyle(const QuartzTextStyle &other) {
+	QuartzTextStyle(const QuartzTextStyle *other) {
 		// Does not copy font colour attribute
-		fontRef = static_cast<CTFontRef>(CFRetain(other.fontRef));
+		fontRef = static_cast<CTFontRef>(CFRetain(other->fontRef));
 		styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
 						      &kCFTypeDictionaryKeyCallBacks,
 						      &kCFTypeDictionaryValueCallBacks);
 		CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef);
-		characterSet = other.characterSet;
+		characterSet = other->characterSet;
 	}
 
 	~QuartzTextStyle() {
@@ -77,11 +77,11 @@ public:
 		CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef);
 	}
 
-	CTFontRef getFontRef() {
+	CTFontRef getFontRef() const noexcept {
 		return fontRef;
 	}
 
-	int getCharacterSet() {
+	int getCharacterSet() const noexcept {
 		return characterSet;
 	}