mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-03 06:01:04 +00:00
Tidy some warning suppression cleanups
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23129 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
2ed1c70692
commit
68f0e574ba
3 changed files with 8 additions and 7 deletions
|
@ -238,7 +238,7 @@
|
||||||
return @"nil";
|
return @"nil";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
id label;
|
NSString *label;
|
||||||
id upperObjectRepresentation;
|
id upperObjectRepresentation;
|
||||||
|
|
||||||
anObject = [anObject replacementObjectForModelArchiver: self];
|
anObject = [anObject replacementObjectForModelArchiver: self];
|
||||||
|
@ -258,7 +258,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!label) {
|
if (label != nil) {
|
||||||
Class archiveClass;
|
Class archiveClass;
|
||||||
|
|
||||||
/* If the object gets encoded on the top level, set the label to be
|
/* If the object gets encoded on the top level, set the label to be
|
||||||
|
@ -289,7 +289,7 @@
|
||||||
-encodeObject: withName: message, save its label into the
|
-encodeObject: withName: message, save its label into the
|
||||||
topLevelObjects array. */
|
topLevelObjects array. */
|
||||||
if (!level)
|
if (!level)
|
||||||
[topLevelObjects addObject: (name ? (id)name : (id)label)];
|
[topLevelObjects addObject: (name ? name : label)];
|
||||||
|
|
||||||
lastObjectRepresentation = objectPList;
|
lastObjectRepresentation = objectPList;
|
||||||
|
|
||||||
|
@ -577,9 +577,9 @@
|
||||||
|
|
||||||
- (NSString*) classNameEncodedForTrueClassName: (NSString*)trueName
|
- (NSString*) classNameEncodedForTrueClassName: (NSString*)trueName
|
||||||
{
|
{
|
||||||
id inArchiveName = [(id)NSMapGet(classes, trueName) className];
|
NSString *inArchiveName = [(id)NSMapGet(classes, trueName) className];
|
||||||
|
|
||||||
return inArchiveName ? (NSString*)inArchiveName : (NSString*)trueName;
|
return inArchiveName ? inArchiveName : trueName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* In the following method the version of class named trueName is written as
|
/* In the following method the version of class named trueName is written as
|
||||||
|
|
|
@ -248,7 +248,7 @@ typedef enum
|
||||||
[aDecoder decodeValueOfObjCType: @encode(int)
|
[aDecoder decodeValueOfObjCType: @encode(int)
|
||||||
at: &_selectionType];
|
at: &_selectionType];
|
||||||
[aDecoder decodeValueOfObjCType: @encode(id)
|
[aDecoder decodeValueOfObjCType: @encode(id)
|
||||||
at: obj];
|
at: &obj];
|
||||||
ASSIGN(_descriptionData, obj);
|
ASSIGN(_descriptionData, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -723,9 +723,10 @@ that makes decoding and encoding compatible with the old code.
|
||||||
if ([aDecoder containsValueForKey: @"NSSharedData"])
|
if ([aDecoder containsValueForKey: @"NSSharedData"])
|
||||||
{
|
{
|
||||||
NSTextViewSharedData *shared;
|
NSTextViewSharedData *shared;
|
||||||
unsigned int flags = [shared flags];
|
unsigned int flags;
|
||||||
|
|
||||||
shared = [aDecoder decodeObjectForKey: @"NSSharedData"];
|
shared = [aDecoder decodeObjectForKey: @"NSSharedData"];
|
||||||
|
flags = [shared flags];
|
||||||
ASSIGN(_insertionPointColor, [shared insertionColor]);
|
ASSIGN(_insertionPointColor, [shared insertionColor]);
|
||||||
ASSIGN(_backgroundColor, [shared backgroundColor]);
|
ASSIGN(_backgroundColor, [shared backgroundColor]);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue