Mailing Lists: Apple Mailing Lists
Image of Mac OS face in stamp
R16 - MacApp Xcode CUniString_AC fixes
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

R16 - MacApp Xcode CUniString_AC fixes



Hi All,

I have been updating the MacApp Xcode project files to work with Xcode
1.1. I have change the CUniString_AC class to compare using a
CUniString_AC object instead of a UNISTR macro because the UNISTR macro
doesn't really work with the GCC compiler.

The relevant code changes are included below.

Steve

Index: macapp.16/ACS/Suites/text/CUniString_AC.cpp
===================================================================
RCS file: /home1/frmwrks/clubmacapp/cvs/macapp.16/ACS/Suites/text/
CUniString_AC.cpp,v
retrieving revision 1.4
diff -r1.4 CUniString_AC.cpp
11a12
> 		09/21/04	SPG		Changed GetSubstitutionMetrics to use CUniString_AC
strings instead UniChar arrays.
1323,1331c1324,1325
< #if qCarbonMach0
< 	// Don't use the UNISTR macro on Mach0 build because it will create
UTF32 strings
< 	// which are not compatible with UniChar strings which take UTF16
characters.
< 	static const UniChar kStartMarker[] = { '<', '<', '<' };	//
< 	static const UniChar kEndMarker[] = { '>', '>', '>' };
< #else
< 	static const UniChar* kStartMarker = UNISTR("<<<");	//
< 	static const UniChar* kEndMarker = UNISTR(">>>");
< #endif
---
> 	static const CUniString_AC kStartMarker("<<<");	//
> 	static const CUniString_AC kEndMarker(">>>");
1344,1345c1338,1339
< 			size_type	endPos = startPos + u_strlen(kStartMarker);
< 			size_type	postDocName = find(kEndMarker, endPos);
---
> 			size_type endPos = startPos + kStartMarker.length();
> 			size_type postDocName = find(kEndMarker, endPos);
1347c1341
< 				tailSize = size() - (postDocName + u_strlen(kEndMarker));
---
> 				tailSize = size() - (postDocName + kEndMarker.length());
1431c1425
< 							   'C', 'U', 'n', 'i', 'S', 't', 'r', 'i', 'n', 'g', '_', 'A',
'C', '!' };
---
> 							   'C', 'U', 'n', 'i', 'S', 't', 'r', 'i', 'n', 'g', '_', 'A',
'C', '!', '\0' };
1715c1709
< 	const CUniString_AC source(UNISTR("The original"));
---
> 	const CUniString_AC source("The original");
1823c1817
< 	CUniString_AC titleString = titleT
emplate.DoSubstitution(UNISTR("Changes"));
---
> 	CUniString_AC titleString = titleT
emplate.DoSubstitution(CUniString_AC("Changes"));


 _______________________________________________
Do not post admin requests to the list. They will be ignored.
Macapp-dev mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription:

This email sent to email@hidden



Visit the Apple Store online or at retail locations.
1-800-MY-APPLE

Contact Apple | Terms of Use | Privacy Policy

Copyright © 2011 Apple Inc. All rights reserved.