assoc = [self->queryParameters objectForKey:key];
value = [assoc stringValueInComponent:sComponent];
- [qd setObject:(value != nil ? value : (NSString *)@"") forKey:key];
+ [qd setObject:(value != nil ? value : (id)@"") forKey:key];
}
}
else
+2006-07-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings, use -isNotEmpty
+ when appropriate (v4.5.15)
+
2006-05-16 Marcus Mueller <znek@mulle-kybernetik.com>
* *m: changed EOControl related includes into imports
$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
endif
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
ms = [NSMutableString stringWithCapacity:128];
- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
if ([self isReady])
[ms appendFormat:@" ready=%@", self->result];
[ms appendFormat:@" token=%@", self->token];
[ms appendFormat:@" target=%@", self->target];
- if ([self->keptObjects count] > 0)
+ if ([self->keptObjects isNotEmpty])
[ms appendFormat:@" keeping=%@", self->keptObjects];
[ms appendString:@">"];
np = [[NSUserDefaults standardUserDefaults]
stringForKey:@"SxDefaultNamespacePrefix"];
- if ([np length] > 0)
+ if ([np isNotEmpty])
return np;
[self logWithFormat:
@"WARNING: SxDefaultNamespacePrefix default is not set !"];
np = [(NSHost *)[NSHost currentHost] name];
- if ([np length] > 0) {
+ if ([np isNotEmpty]) {
if (!isdigit([np characterAtIndex:0])) {
NSArray *parts;
parts = [np componentsSeparatedByString:@"."];
- if ([parts count] == 0) {
+ if (![parts isNotEmpty]) {
}
else if ([parts count] == 1)
return [parts objectAtIndex:0];
//[self debugWithFormat:@"shall create async result for proxy:\n %@", _proxy];
- token = [NSString stringWithFormat:@"0x%08X-%i", _proxy, cnt++];
+ token = [NSString stringWithFormat:@"0x%p-%i", _proxy, cnt++];
//[self debugWithFormat:@"token: %@", token];
ui = [NSDictionary dictionaryWithObject:token
forKey:@"WOAsyncResponseToken"];
unsigned i;
id *aa;
- aa = calloc(count, sizeof(id));
+ aa = calloc(count + 2 /* be defensive, yeah! */, sizeof(id));
for (i = 0; i < count; i++) {
NSString *xrtype;
id value;
value = [self->arguments objectAtIndex:i];
value = [value asXmlRpcValueOfType:xrtype];
- aa[i] = value ? value : null;
+ aa[i] = value != nil ? value : (id)null;
}
args = [NSArray arrayWithObjects:aa count:count];
- if (aa) free(aa);
+ if (aa != NULL) free(aa);
}
else
args = self->arguments;
return [[[self alloc] initWithXmlRpcTypes:_args] autorelease];
}
- (id)initWithXmlRpcTypes:(NSArray *)_arg {
- if ([_arg count] < 1) {
+ if (![_arg isNotEmpty]) {
RELEASE(self);
return nil;
}
sel = internalMethod->method_name;
selName = NSStringFromSelector(sel);
- if ([selName length] == 0) {
- NSLog(@"WARNING(%s): did not get selector for method 0x%08X",
+ if (![selName isNotEmpty]) {
+ NSLog(@"WARNING(%s): did not get selector for method 0x%p",
__PRETTY_FUNCTION__, internalMethod);
continue;
}
continue;
selName = NSStringFromSelector(sel);
- if ([selName length] == 0) {
- NSLog(@"WARNING(%s): did not get selector for method 0x%08X",
+ if (![selName isNotEmpty]) {
+ NSLog(@"WARNING(%s): did not get selector for method 0x%p",
__PRETTY_FUNCTION__, mlist->method_list[mcount - 1]);
continue;
}
# version file
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15
ud = [NSUserDefaults standardUserDefaults];
np = [ud stringForKey:@"SxDefaultNamespacePrefix"];
- if ([np length] > 0)
+ if ([np isNotEmpty])
return np;
[self logWithFormat:
@"WARNING: SxDefaultNamespacePrefix default is not set !"];
np = [(NSHost *)[NSHost currentHost] name];
- if ([np length] > 0) {
+ if ([np isNotEmpty]) {
if (!isdigit([np characterAtIndex:0])) {
NSArray *parts;
parts = [np componentsSeparatedByString:@"."];
- if ([parts count] == 0) {
+ if (![parts isNotEmpty]) {
}
else if ([parts count] == 1)
return [parts objectAtIndex:0];
}
/* go to next selector if ... */
- if ([actionName length] == 0) continue;
+ if (![actionName isNotEmpty]) continue;
/* add to reflection set */
[ma addObject:actionName];
p = [self xmlrpcComponentNamespace];
- if ([p length] > 0) {
+ if ([p isNotEmpty]) {
if ([_name hasPrefix:@"system."])
;
else if ([_name hasPrefix:p]) {
_name = [_name substringFromIndex:[p length]];
- if ([_name length] > 0) {
+ if ([_name isNotEmpty]) {
if ([_name characterAtIndex:0] == '.')
_name = [_name substringFromIndex:1];
}
}
/* go to next selector if ... */
- if ([actionName length] == 0) continue;
+ if (![actionName isNotEmpty]) continue;
/* make action name XMLRPC-style friendly */
actionName = [actionName stringByReplacingString:@"_" withString:@"."];
[signatures addObject:signature];
}
- return ([signatures count] > 0)
+ return [signatures isNotEmpty]
? signatures
- : (id)[NSNumber numberWithBool:NO];
+ : (NSMutableArray *)[NSNumber numberWithBool:NO];
}
- (NSString *)system_methodHelpAction:(NSString *)_xmlrpcMethod {
@end /* WODirectAction(XmlRpcIntrospection) */
+
#include <NGObjWeb/WOResponse.h>
@implementation WODirectAction(XmlRpcInfo)
}
[r appendContentString:@"</td>"];
- if ([info length] > 0) {
+ if ([info isNotEmpty]) {
[r appendContentString:@"<td>"];
[r appendContentString:info];
[r appendContentString:@"</td>"];
ifneq ($(FHS_INSTALL_ROOT),)
FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
+else
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+endif
+
NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+2006-07-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.22)
+
2006-04-27 Marcus Mueller <znek@mulle-kybernetik.com>
* OFSPropertyListObject.m: removed workaround for gstep-base KVC
$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
endif
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
- (NSString *)loggingPrefix {
/* improve perf ... */
NSString *n = [self nameInContainer];
- return [NSString stringWithFormat:@"0x%08X[%@]:%@",
+ return [NSString stringWithFormat:@"0x%p[%@]:%@",
self, NSStringFromClass([self class]),
- n ? n : @"ROOT"];
+ n != nil ? n : (NSString *)@"ROOT"];
}
/* description */
NSMutableString *ms;
ms = [NSMutableString stringWithCapacity:64];
- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
if (self->storagePath)
[ms appendFormat:@" path=%@", self->storagePath];
NSMutableString *ms;
ms = [NSMutableString stringWithCapacity:64];
- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
if (self->isNewObject)
[ms appendString:@" NEW"];
else if ([ext isEqualToString:@"gif"]) type = @"image/gif";
else if ([ext isEqualToString:@"png"]) type = @"image/png";
}
- return type ? type : @"application/octet-stream";
+ return type != nil ? type : (NSString *)@"application/octet-stream";
}
- (id)davContentLength {
self->recordKeys = rk;
}
- [self->record setObject:_value?_value:@"" forKey:_key];
+ [self->record setObject:(_value ? _value: (id)@"") forKey:_key];
}
- (BOOL)isStoredKey:(NSString *)_key {
NSMutableString *ms;
ms = [NSMutableString stringWithCapacity:64];
- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
if (self->baseObject)
[ms appendFormat:@" base=%@", self->baseObject];
if (self->context)
- [ms appendFormat:@" ctx=0x%08X", self->context];
+ [ms appendFormat:@" ctx=0x%p", self->context];
[ms appendString:@">"];
return ms;
/* the default renderer will recognize that as a component ... */
return [self useRendererForComponentCreation]
- ? self
+ ? (id)self
: (id)[self componentInContext:_ctx];
}
# version file
-SUBMINOR_VERSION:=21
+SUBMINOR_VERSION:=22
ifneq ($(FHS_INSTALL_ROOT),)
FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
FHS_SBIN_DIR=$(FHS_INSTALL_ROOT)/sbin/
+
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
+else
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+endif
FHS_SO_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/products/
NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+2006-07-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings, use -isNotEmpty
+ when appropriate (v4.5.86)
+
2006-03-12 Helge Hess <helge.hess@opengroupware.org>
* WEResourceManager.m: minor code cleanups, log the flat template
$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
endif
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
# bundle dependencies
comp = [_ctx component];
ccaps = [[_ctx request] clientCapabilities];
tt = [self->toolTip stringValueInComponent:comp];
- tt = tt ? tt : @"";
+ tt = tt != nil ? tt : (NSString *)@"";
if (![ccaps isInternetExplorer]) return;
if ([ccaps isMacBrowser]) return;
componentsJoinedByString:@"_"];
prfx = [self->prefix stringValueInComponent:[_ctx component]];
- prfx = (prfx) ? prfx : @"";
+ prfx = (prfx != nil) ? prfx : (NSString *)@"";
if ([ccaps isJavaScriptBrowser]) {
NSString *s;
[_response appendContentString:@"<!-- did not find JS string table -->"];
return;
}
- if ([_identifier length] == 0) _identifier = @"WELabels";
+ if (![_identifier isNotEmpty]) _identifier = @"WELabels";
[_response appendContentString:@"var "];
[_response appendContentString:_identifier];
product = [[rm valueForKey:@"container"] productName];
qd = [[NSDictionary alloc] initWithObjectsAndKeys:
- lname ? lname : @"", @"table",
- lfw ? lfw : @"", @"framework",
- lidentifier ? lidentifier : @"", @"id",
- product ? product : @"", @"product",
+ lname ? lname : (NSString *)@"", @"table",
+ lfw ? lfw : (NSString *)@"", @"framework",
+ lidentifier ? lidentifier : (NSString *)@"",
+ @"id",
+ product ? product : (id)@"",
+ @"product",
[langs componentsJoinedByString:@","],
@"languages",
nil];
r = [[self context] response];
productName = [rq formValueForKey:@"product"];
- if ([productName length] > 0) {
+ if ([productName isNotEmpty]) {
rm = [[[SoProductRegistry sharedProductRegistry]
productWithName:productName] resourceManager];
}
# version file
-SUBMINOR_VERSION:=85
+SUBMINOR_VERSION:=86
# v4.5.76 requires libNGObjWeb v4.5.176
# v4.5.75 requires libNGObjWeb v4.5.174
[ta release]; ta = nil;
/* append to response */
- if ([tmp length] > 0) {
+ if ([tmp isNotEmpty]) {
[_r appendContentString:@"<input type=\"text\" name=\""];
[_r appendContentString:[self elementIdWithSuffix:@"" ctx:_cx]];
[_r appendContentString:@"\" value=\""];
: [tdate dayOfMonth];
tformat = self->format
? [self->format stringValueInComponent: comp]
- : @"%Y-%m-%d";
+ : (NSString *)@"%Y-%m-%d";
if ([self isKindOfClass:[WECalendarField class]]) {
id t = tformat;
if ((prefix = [self->name stringValueInComponent:[_ctx component]]) == nil)
prefix = [_ctx elementID];
- if ([_suffix length])
+ if ([_suffix isNotEmpty])
prefix = [prefix stringByAppendingString:@"_"];
return [prefix stringByAppendingString:_suffix];
{
[_resp appendContentString:@"<a href=\""];
[_resp appendContentString:[_ctx componentActionURL]];
- if ([fragId length] > 0) {
+ if ([fragId isNotEmpty]) {
[_resp appendContentString:@"#"];
[_resp appendContentString:fragId];
}
[_resp appendContentString:@"\">"];
- if (img) {
+ if (img != nil) {
[_resp appendContentString:@"<img border=\"0\" src=\""];
[_resp appendContentString:img];
[_resp appendContentString:@"\""];
isCollapsed = [[_ctx objectForKey:WECollapsible_IsCollapsed] boolValue];
scriptId = [_ctx objectForKey:WECollapsible_ScriptId];
- doScript = [scriptId length] > 0 ? YES : NO;
+ doScript = [scriptId isNotEmpty] ? YES : NO;
img = (isCollapsed)
? [self->closedImageFileName stringValueInComponent:comp]
teffect = self->effectsAllowed
? [self->effectsAllowed stringValueInComponent:[_ctx component]]
- : @"all";
+ : (NSString *)@"all";
tdragContent = @"this.innerHTML";
NSString *v;
v = [[self->value valueInComponent:[_ctx component]] stringValue];
- if ([v length] == 0)
+ if (![v isNotEmpty])
return v;
ua = [[_ctx request] headerForKey:@"user-agent"];
}
[_response appendContentString:@">"];
- if ([v length] > 0)
+ if ([v isNotEmpty])
[_response appendContentHTMLString:v];
[_response appendContentString:@"</textarea>"];
NSArray *languages;
rm = [self resourceManagerInContext:_ctx];
- languages = [_ctx hasSession] ? [[_ctx session] languages] : nil;
+ languages = [_ctx hasSession] ? [[_ctx session] languages] : (NSArray *)nil;
return [rm urlForResourceNamed:_name inFramework:nil
languages:languages request:[_ctx request]];
s = (self->identifier != nil)
? [[self->identifier stringValueInComponent:comp] retain]
- : retStrForInt(idx);
+ : (id)retStrForInt(idx);
[_ctx appendElementIDComponent:s]; // append index-id
[s release];
/* find context object */
- context = self->object
+ context = (self->object != nil)
? [self->object valueInComponent:cmp]
- : cmp;
+ : (id)cmp;
/* evaluate */
NSMutableString *ms;
ms = [NSMutableString stringWithCapacity:128];
- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])];
if (self->name) [ms appendFormat:@" name=%@", self->name];
if (self->frameworkName) [ms appendFormat:@" fw=%@", self->frameworkName];
if (self->language) [ms appendFormat:@" lang=%@", self->language];
{
NSString *path;
- path = [_frameworkName length] > 0
+ path = [_frameworkName isNotEmpty]
? [_p stringByAppendingPathComponent:_frameworkName]
: _p;
path = checkCache(self->keyToPath, self->cachedKey, _name, _fwName, _lang);
if (path != nil) {
if (debugOn) [self debugWithFormat:@" found in cache: %@", path];
- return [path isNotNull] ? path : nil;
+ return [path isNotNull] ? path : (NSString *)nil;
}
/* check for framework resources (webserver resources + framework) */
NSString *language;
NSString *rpath;
- if ([_name length] == 0) {
+ if (![_name isNotEmpty]) {
[self debugWithFormat:@"got no name for resource lookup?!"];
return nil;
}
[self debugWithFormat:@" found in cache: %@ (#%d)", url,
[self->keyToURL count]];
}
- return [url isNotNull] ? url : nil;
+ return [url isNotNull] ? url : (NSString *)nil;
}
if (debugOn) {
/* check for framework resources */
- if ([_fwName length] > 0) {
+ if ([_fwName isNotEmpty]) {
if (debugOn)
[self debugWithFormat:@"check framework: '%@'", _fwName];
e = [wsPathes objectEnumerator];
NSString *url;
NSString *appName;
- if ([_name length] == 0) {
+ if (![_name isNotEmpty]) {
if (debugOn) [self logWithFormat:@"got no name for resource URL lookup?!"];
return nil;
}
r = [theme rangeOfString:@"_"];
theme = (r.length > 0)
? [theme substringFromIndex:(r.location + r.length)]
- : nil;
+ : (NSString *)nil;
}
else
theme = nil;
/* check without framework subdir */
- if ([_framework length] > 0) {
+ if ([_framework isNotEmpty]) {
path = [self lookupComponentInStandardPathes:_name inFramework:nil
theme:nil];
if (path != nil)
/* first check cache */
path = checkCache(self->keyToComponentPath, self->cachedKey, _name, _fw,
- [_langs count] > 0 ? [_langs objectAtIndex:0]:@"English");
+ [_langs isNotEmpty]
+ ? [_langs objectAtIndex:0] : (id)@"English");
if (path != nil) {
if (debugComponents)
[self logWithFormat:@" use cached location: %@", path];
- return [path isNotNull] ? path : nil;
+ return [path isNotNull] ? path : (NSString *)nil;
}
/* look in FHS locations */
NSString *cname;
id cacheKey;
- if ([_key length] == 0)
+ if (![_key isNotEmpty])
return _key;
if (_component == nil)
return _key;
NSString *p;
p = [[WOApplication application] gsTranslationsDirectoryName];
- if ([p length] == 0)
+ if (![p isNotEmpty])
return nil;
p = [@"Resources/" stringByAppendingString:p];
NSString *p;
p = [[WOApplication application] shareTranslationsDirectoryName];
- if ([p length] == 0)
+ if (![p isNotEmpty])
return nil;
p = [@"share/" stringByAppendingString:p];
// ...
imgUri = WEUriOfResource(imgName, _ctx);
- if ([imgUri length] < 1)
+ if (![imgUri isNotEmpty])
doImages = NO;
}
imgUri = WEUriOfResource(imgName, _ctx);
- if ([imgUri length] < 1)
+ if (![imgUri isNotEmpty])
doImages = NO;
}
hasFont = (fc || fs || ff) ? YES : NO;
- if ([label length] < 1)
+ if (![label isNotEmpty])
label = _info->key;
[_response appendContentString:@"<nobr>"];
if (hasFont) WEAppendFont(_response, fc, ff, fs); // <font>
s = WEUriOfResource(s, _ctx);
u = WEUriOfResource(u, _ctx);
- s = ([s length] < 1) ? imgUri : s;
- u = ([u length] < 1) ? imgUri : u;
+ s = (![s isNotEmpty]) ? imgUri : s;
+ u = (![u isNotEmpty]) ? imgUri : u;
#if 0
out = [NSString alloc];
- (NSString *)description {
return [NSString stringWithFormat:
- @"<0x%08X[%@]: object=0x%08X start=%d len=%d>",
+ @"<0x%p[%@]: object=0x%p start=%d len=%d>",
self, NSStringFromClass([self class]),
[self object],
self->range.location,
#if DEBUG
NSAssert(requiredIdx < self->size, @"index to high ..");
NSAssert3(self->threads[thread].objects[requiredIdx] == nil,
- @"index %i is already marked (by=0x%08X, my=0x%08X) !",
+ @"index %i is already marked (by=0x%p, my=0x%p) !",
requiredIdx, self->threads[thread].objects[requiredIdx], _obj);
#endif
}
- (NSString *)description {
- return [NSString stringWithFormat:@"<%08X[%@]: count=%d>",
+ return [NSString stringWithFormat:@"<%p[%@]: count=%d>",
self, NSStringFromClass([self class]),
self->count];
}
[_response appendContentHTMLAttributeValue:_icon];
[_response appendContentString:@"\""];
- if ([iconWidth length] > 0) {
+ if ([iconWidth isNotEmpty]) {
[_response appendContentString:@" width=\""];
[_response appendContentString:iconWidth];
[_response appendContentString:@"\""];
}
- if ([_alt length] > 0) {
+ if ([_alt isNotEmpty]) {
[_response appendContentString:@" alt=\""];
[_response appendContentHTMLAttributeValue:_alt];
[_response appendContentString:@"\""];
? [self->treeLink stringValueInComponent:[_ctx component]]
: [_ctx componentActionURL];
- if ([link length] > 0) {
+ if ([link isNotEmpty]) {
[_response appendContentString:@"<a href=\""];
[_response appendContentString:link];
[_response appendContentString:@"\">"];
}
[self _appendIcon:_icon alt:@"z" toResponse:_response inContext:_ctx];
- if ([link length] > 0)
+ if ([link isNotEmpty])
[_response appendContentString:@"</a>"];
[_ctx deleteLastElementIDComponent];
if (doLink) {
if (self->treeLink) {
link = [self->treeLink stringValueInComponent:[_ctx component]];
- if ([link length] == 0)
+ if (![link isNotEmpty])
doLink = NO;
}
}
if ((a = [self->sublist valueInComponent:[_ctx component]]) == nil)
return nil;
- return ([a count] > 0) ? a : nil;
+ return [a isNotEmpty] ? a : (NSArray *)nil;
}
/* handle requests */
sl = (!isLeaf && isZoom)
? [self _sublistInContext:_ctx]
- : nil;
+ : (NSArray *)nil;
}
else {
sl = [self _sublistInContext:_ctx];
- isLeaf = !([sl count] > 0);
+ isLeaf = ![sl isNotEmpty];
}
if (self->showItem) {
[_response appendContentString:bgcolor];
[_response appendContentCharacter:'"'];
}
- if ([style length] > 0) {
+ if ([style isNotEmpty]) {
[_response appendContentString:@" class=\""];
[_response appendContentString:style];
[_response appendContentCharacter:'"'];
// TODO: use CSS for alignment, width and color
[_response appendContentString:
@"<td valign=\"top\" align=\"left\" width=\"17%\""];
- if ([bgcolor length] > 0) {
+ if ([bgcolor isNotEmpty]) {
[_response appendContentString:@" bgcolor=\""];
[_response appendContentString:bgcolor];
[_response appendContentCharacter:'"'];
}
- if ([style length] > 0) {
+ if ([style isNotEmpty]) {
[_response appendContentString:@" class=\""];
[_response appendContentString:style];
[_response appendContentCharacter:'"'];
ifneq ($(FHS_INSTALL_ROOT),)
FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/
FHS_MAN_DIR=$(FHS_INSTALL_ROOT)/man
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
+else
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+endif
+FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/
+
NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+2006-07-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.30)
+
2005-09-18 Helge Hess <helge.hess@opengroupware.org>
* GNUmakefile.preamble: added dependency to NGMail (v4.5.29)
$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
endif
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
# bundle dependencies
[_response appendContentString:@"<a onclick=\"javascript:alert('"];
tmp = (self->alertMessage)
? [self->alertMessage stringValueInComponent: comp]
- : @"Press OK.";
+ : (NSString *)@"Press OK.";
if (self->escapeJS != nil && [self->escapeJS boolValueInComponent: comp]) {
tmp = [tmp stringByApplyingJavaScriptEscaping];
}
comp = [_ctx component];
msg = (self->confirmMessage)
? [self->confirmMessage stringValueInComponent:comp]
- : @"Really?";
+ : (NSString *)@"Really?";
if (self->escapeJS != nil && [self->escapeJS boolValueInComponent:comp]) {
msg = [msg stringByApplyingJavaScriptEscaping];
}
id assoc, value;
assoc = [self->queryParameters objectForKey:key];
value = [assoc stringValueInComponent:comp];
- [qd setObject:(value ? value : @"") forKey:key];
+ [qd setObject:(value != nil ? value : (id)@"") forKey:key];
}
}
terrMesg = (self->errorMessage)
? [self->errorMessage stringValueInComponent:comp]
- : @"Invalid values.";
+ : (NSString *)@"Invalid values.";
if (self->escapeJS != nil && [self->escapeJS boolValueInComponent:comp])
terrMesg = [terrMesg stringByApplyingJavaScriptEscaping];
tformName = [self->formName stringValueInComponent:comp];
# Version file
-SUBMINOR_VERSION:=29
+SUBMINOR_VERSION:=30
# v4.5.23 requires libNGObjWeb v4.5.145
# v4.5.22 requires libNGObjWeb v4.5.106
selColor = self->bgcolor
? [self->bgcolor stringValueInComponent:sComponent]
- : @"#CCCCCC";
+ : (NSString *)@"#CCCCCC";
unselColor = self->nonSelectedBgColor
? [self->nonSelectedBgColor stringValueInComponent:sComponent]
- : @"#AAAAAA";
+ : (NSString *)@"#AAAAAA";
if ([ttabs count] < 1) {
/* no tabs configured .. */
ifneq ($(FHS_INSTALL_ROOT),)
FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/
FHS_MAN_DIR=$(FHS_INSTALL_ROOT)/man
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
+else
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+endif
+FHS_WOx_DIR=$(FHS_LIB_DIR)sope-$(MAJOR_VERSION).$(MINOR_VERSION)/wox-builders/
+
NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+2006-07-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats (v4.5.9)
+
2005-05-03 Helge Hess <helge.hess@opengroupware.org>
* WOXMLMapDecoder.m: fixed a gcc 4.0 warnings, changed for the new
# Version file
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9
NSMutableString *s;
s = [NSMutableString stringWithCapacity:100];
- [s appendFormat:@"<%@ 0x%08X:", NSStringFromClass([self class]), self];
+ [s appendFormat:@"<%@ 0x%p:", NSStringFromClass([self class]), self];
if ([self name])
[s appendFormat:@" name=%@", [self name]];
NSMutableString *s;
s = [NSMutableString stringWithCapacity:100];
- [s appendFormat:@"<%@ 0x%08X:", NSStringFromClass([self class]), self];
+ [s appendFormat:@"<%@ 0x%p:", NSStringFromClass([self class]), self];
if ([self name])
[s appendFormat:@" name=%@", [self name]];
ifneq ($(FHS_INSTALL_ROOT),)
FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
+else
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+endif
+
NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
s = [NSMutableString stringWithCapacity:200];
- [s appendFormat:@"<%@[0x%08X]: author=%@ topic=%@ title='%@'>",
+ [s appendFormat:@"<%@[0x%p]: author=%@ topic=%@ title='%@'>",
NSStringFromClass([self class]), self,
[self topic],
[self title],
NSMutableString *s;
s = [NSMutableString stringWithCapacity:128];
- [s appendFormat:@"<0x%08X[%@]: ", self, NSStringFromClass([self class])];
+ [s appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])];
[s appendFormat:@" path=%@", self->path];
if ([self isPublic])
NSMutableString *s;
s = [NSMutableString stringWithCapacity:128];
- [s appendFormat:@"<0x%08X[%@]: ", self, NSStringFromClass([self class])];
+ [s appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])];
[s appendFormat:@" login=%@", self->login];
[s appendFormat:@" path=%@", self->path];
[s appendString:@">"];
projects / sope / commitdiff