392970 - Split NSString+Utils into two pieces

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Jeff Dlouhy]

The inclusion of NSString+Utils.h into a file requires that file to be a '.mm' due to Gecko headers. The proposed plan is to split NSString+Utils into two files, one with the Gecko bits that require ObjC++, and one that doesn't.

Comment 1

[Stuart Morgan]

Attachment: split

Other than splitting it there are just a few small formatting fixes and the removal of one method no-one was using.

Since I was auditing NSString+Util importing anyway, I removed it entirely from a bunch of files that weren't actually using it. I also had to add a missing core header to RemoteDataProvider, which has only ever compiled before by accident.

The remove of NSString+Utils.mm isn't in the patch; I'll do that on checkin.

Comment 2

[Mark Mentovai]

Comment on attachment 278247 [details] [diff] [review]
split

+- (void)assignTo_nsAString:(nsAString&)ioString


+  if (len + 1 > ASSIGN_STACK_BUFFER_CHARACTERS) {
+    buffer = (PRUnichar *)malloc(sizeof(PRUnichar) * (len + 1));
[...]

+  [self getCharacters:buffer];   // does not null terminate

Then what's this +1 business about?


++ (id)stringWithPRUnichars:(const PRUnichar*)inString

+- (id)initWithPRUnichars:(const PRUnichar*)inString

One of these methods checks inString for nullness, and the other doesn't.  Be consistent.  (I don't mind eliminating the check, or making it an assertion.)

Comment 3

[Stuart Morgan]

Attachment: complete unbitrotted trunk version

Trunk version as checked in. I didn't make any of the functional changes, since they would be hidden from history by the split. We can clean up NSString+Gecko in another patch if we want to.

Comment 4

[Stuart Morgan]

Attachment: branch version

As checked in on MOZILLA_1_8_BRANCH.