Fixes to NGCalendarDateRange.m

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@57 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 890626e0ab0fe1328c55c3d112478a1ac423989e..310abf01c6f8ab3e1f95d1151e8a0aa2ce2bda5c 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-25  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * NGCalendarDateRange.m: properly fixed intersectionDateRange: to not
+         return pseudo-ranges. (v4.3.107)
+
 2004-08-23  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v4.3.106

diff --git a/sope-core/NGExtensions/NGCalendarDateRange.m b/sope-core/NGExtensions/NGCalendarDateRange.m
index 1bb488640bbb2e231c721357f2dfe295d5457ca3..1c3e9dcfa535067f2045675f605f23ecbbb71a24 100644 (file)
--- a/sope-core/NGExtensions/NGCalendarDateRange.m
+++ b/sope-core/NGExtensions/NGCalendarDateRange.m
@@ -81,11 +81,20 @@
     c = self->startDate;
     d = self->endDate;
   }
+  // [a;b[ ?< [c;d[
   if ([b compare:c] == NSOrderedAscending)
     return nil; // no intersection
-  if ([b compare:d] == NSOrderedAscending)
-    return [NGCalendarDateRange calendarDateRangeWithStartDate:c endDate:b];
-  
+  // b ?< d
+  if ([b compare:d] == NSOrderedAscending) {
+    // c !< b  && b !< d -> [c;b[
+    if([c compare:b] == NSOrderedSame)
+      return nil; // no real range, thus return nil!
+    else
+      return [NGCalendarDateRange calendarDateRangeWithStartDate:c endDate:b];
+  }
+  if([c compare:d] == NSOrderedSame)
+    return nil; // no real range, thus return nil!
+  // b !> d -> [c;d[
   return [NGCalendarDateRange calendarDateRangeWithStartDate:c endDate:d];
 }
 
@@ -117,10 +126,8 @@
 }
 
 - (BOOL)containsDate:(NSCalendarDate *)date {
-  if([self->endDate isEqualToDate:date])
-      return NO;
   return ([self->startDate earlierDate:date] == self->startDate && 
-         [self->endDate laterDate:date] == self->endDate) ? YES : NO;
+         [self->endDate compare:date] == NSOrderedDescending) ? YES : NO;
 }
 
 /* comparison */

diff --git a/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj b/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj
index 3ed152b36ac1a7fccc9d5881b1db7aff04817c34..374276ed06395ab3551b8db09e8fb1a828bf30ba 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj
+++ b/sope-core/NGExtensions/NGExtensions.xcode/project.pbxproj
@@ -102,6 +102,7 @@
                };
                ADD65C2506DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOCacheDataSource.m;
@@ -110,6 +111,7 @@
                };
                ADD65C2606DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOCompoundDataSource.m;
@@ -118,6 +120,7 @@
                };
                ADD65C2706DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "EODataSource+NGExtensions.m";
@@ -126,6 +129,7 @@
                };
                ADD65C2806DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "EOFetchSpecification+plist.m";
@@ -134,6 +138,7 @@
                };
                ADD65C2906DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOFilterDataSource.m;
@@ -142,6 +147,7 @@
                };
                ADD65C2A06DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOGrouping.m;
@@ -150,6 +156,7 @@
                };
                ADD65C2B06DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOGroupingSet.m;
@@ -158,6 +165,7 @@
                };
                ADD65C2C06DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOKeyGrouping.m;
@@ -166,6 +174,7 @@
                };
                ADD65C2D06DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOKeyMapDataSource.m;
@@ -174,6 +183,7 @@
                };
                ADD65C2E06DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "EOQualifier+CtxEval.m";
@@ -182,6 +192,7 @@
                };
                ADD65C2F06DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "EOQualifier+plist.m";
@@ -190,6 +201,7 @@
                };
                ADD65C3006DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOQualifierGrouping.m;
@@ -198,6 +210,7 @@
                };
                ADD65C3106DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "EOSortOrdering+plist.m";
@@ -206,6 +219,7 @@
                };
                ADD65C3206DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = EOTrueQualifier.m;
@@ -213,15 +227,18 @@
                        sourceTree = "<group>";
                };
                ADD65C3306DA3323007161CA = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                ADD65C3406DA3323007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSArray+EOGrouping.m";
@@ -267,15 +284,18 @@
                        sourceTree = "<group>";
                };
                ADD65C3906DA336E007161CA = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                ADD65C3A06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGPropertyListParser.m;
@@ -284,6 +304,7 @@
                };
                ADD65C3B06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSArray+enumerator.m";
@@ -292,6 +313,7 @@
                };
                ADD65C3C06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSAutoreleasePool+misc.m";
@@ -300,6 +322,7 @@
                };
                ADD65C3D06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSCalendarDate+misc.m";
@@ -308,6 +331,7 @@
                };
                ADD65C3E06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSData+gzip.m";
@@ -316,6 +340,7 @@
                };
                ADD65C3F06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSData+misc.m";
@@ -324,6 +349,7 @@
                };
                ADD65C4006DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSDictionary+misc.m";
@@ -332,6 +358,7 @@
                };
                ADD65C4106DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSEnumerator+misc.m";
@@ -340,6 +367,7 @@
                };
                ADD65C4206DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSException+misc.m";
@@ -348,6 +376,7 @@
                };
                ADD65C4306DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSFileManager+Extensions.m";
@@ -356,6 +385,7 @@
                };
                ADD65C4406DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSMethodSignature+misc.m";
@@ -364,6 +394,7 @@
                };
                ADD65C4506DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSNull+misc.m";
@@ -372,6 +403,7 @@
                };
                ADD65C4606DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSObject+Logs.m";
@@ -380,6 +412,7 @@
                };
                ADD65C4706DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSObject+Values.m";
@@ -388,6 +421,7 @@
                };
                ADD65C4806DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSProcessInfo+misc.m";
@@ -396,6 +430,7 @@
                };
                ADD65C4906DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSRunLoop+FileObjects.m";
@@ -404,6 +439,7 @@
                };
                ADD65C4A06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSSet+enumerator.m";
@@ -412,6 +448,7 @@
                };
                ADD65C4B06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+Encoding.m";
@@ -420,6 +457,7 @@
                };
                ADD65C4C06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+Ext.m";
@@ -428,6 +466,7 @@
                };
                ADD65C4D06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+Formatting.m";
@@ -436,6 +475,7 @@
                };
                ADD65C4E06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+German.m";
@@ -444,6 +484,7 @@
                };
                ADD65C4F06DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+HTMLEscaping.m";
@@ -452,6 +493,7 @@
                };
                ADD65C5006DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+misc.m";
@@ -460,6 +502,7 @@
                };
                ADD65C5106DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+URLEscaping.m";
@@ -468,6 +511,7 @@
                };
                ADD65C5206DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSString+XMLEscaping.m";
@@ -476,6 +520,7 @@
                };
                ADD65C5306DA336E007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NSURL+misc.m";
@@ -500,15 +545,18 @@
                        sourceTree = "<group>";
                };
                ADD65C5506DA336F007161CA = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                ADD65C5606DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGRule.m;
@@ -517,6 +565,7 @@
                };
                ADD65C5706DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGRuleAssignment.m;
@@ -525,6 +574,7 @@
                };
                ADD65C5806DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGRuleContext.m;
@@ -533,6 +583,7 @@
                };
                ADD65C5906DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGRuleModel.m;
@@ -541,6 +592,7 @@
                };
                ADD65C5A06DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGRuleParser.h;
@@ -549,6 +601,7 @@
                };
                ADD65C5B06DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGRuleParser.m;
@@ -576,6 +629,7 @@
                };
                ADD65C5E06DA336F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "DOMNode+EOQualifier.m";
@@ -583,12 +637,14 @@
                        sourceTree = "<group>";
                };
                ADD65C5F06DA336F007161CA = {
+                       explicitFileType = sourcecode.make;
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = text;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                ADD65C6206DA3379007161CA = {
                        children = (
@@ -646,6 +702,7 @@
                };
                ADD65C7006DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
@@ -670,6 +727,7 @@
                };
                ADD65C7306DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = FileObjectHolder.m;
@@ -706,6 +764,7 @@
                };
                ADD65C7706DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGBase64Coding.m;
@@ -714,6 +773,7 @@
                };
                ADD65C7806DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGBitSet.m;
@@ -722,6 +782,7 @@
                };
                ADD65C7906DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGBundleManager.m;
@@ -730,6 +791,7 @@
                };
                ADD65C7A06DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGCalendarDateRange.m;
@@ -738,6 +800,7 @@
                };
                ADD65C7C06DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGCustomFileManager.m;
@@ -746,6 +809,7 @@
                };
                ADD65C7D06DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGDirectoryEnumerator.m;
@@ -754,6 +818,7 @@
                };
                ADD65C7E06DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGExtensions.m;
@@ -762,6 +827,7 @@
                };
                ADD65C7F06DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGFileFolderInfoDataSource.m;
@@ -770,6 +836,7 @@
                };
                ADD65C8006DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGFileManager.m;
@@ -778,6 +845,7 @@
                };
                ADD65C8106DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "NGFileManager+JS.m";
@@ -786,6 +854,7 @@
                };
                ADD65C8206DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGFileManagerURL.m;
@@ -794,6 +863,7 @@
                };
                ADD65C8306DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGHashMap.m;
@@ -802,6 +872,7 @@
                };
                ADD65C8406DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGMerging.m;
@@ -810,6 +881,7 @@
                };
                ADD65C8506DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGObjCRuntime.m;
@@ -818,6 +890,7 @@
                };
                ADD65C8606DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGQuotedPrintableCoding.m;
@@ -826,6 +899,7 @@
                };
                ADD65C8706DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGStack.m;
@@ -834,6 +908,7 @@
                };
                ADD65C8806DA343C007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = NGStringScanEnumerator.m;
@@ -1217,6 +1292,7 @@
                };
                ADD65D6206DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = AutoDefines.h;
@@ -1225,6 +1301,7 @@
                };
                ADD65D6306DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "DOMNode+EOQualifier.h";
@@ -1233,6 +1310,7 @@
                };
                ADD65D6406DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOCacheDataSource.h;
@@ -1241,6 +1319,7 @@
                };
                ADD65D6506DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOCompoundDataSource.h;
@@ -1249,6 +1328,7 @@
                };
                ADD65D6606DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "EODataSource+NGExtensions.h";
@@ -1257,6 +1337,7 @@
                };
                ADD65D6706DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "EOFetchSpecification+plist.h";
@@ -1265,6 +1346,7 @@
                };
                ADD65D6806DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOFilterDataSource.h;
@@ -1273,6 +1355,7 @@
                };
                ADD65D6906DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOGrouping.h;
@@ -1281,6 +1364,7 @@
                };
                ADD65D6A06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOGroupingSet.h;
@@ -1289,6 +1373,7 @@
                };
                ADD65D6B06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOKeyGrouping.h;
@@ -1297,6 +1382,7 @@
                };
                ADD65D6C06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOKeyMapDataSource.h;
@@ -1305,6 +1391,7 @@
                };
                ADD65D6D06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "EOQualifier+CtxEval.h";
@@ -1313,6 +1400,7 @@
                };
                ADD65D6E06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "EOQualifier+plist.h";
@@ -1321,6 +1409,7 @@
                };
                ADD65D6F06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOQualifierGrouping.h;
@@ -1329,6 +1418,7 @@
                };
                ADD65D7006DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "EOSortOrdering+plist.h";
@@ -1337,6 +1427,7 @@
                };
                ADD65D7106DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = EOTrueQualifier.h;
@@ -1345,6 +1436,7 @@
                };
                ADD65D7206DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = FileObjectHolder.h;
@@ -1353,6 +1445,7 @@
                };
                ADD65D7306DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = IndexFunc.h;
@@ -1361,6 +1454,7 @@
                };
                ADD65D7406DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGBase64Coding.h;
@@ -1369,6 +1463,7 @@
                };
                ADD65D7506DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGBaseTypes.h;
@@ -1377,6 +1472,7 @@
                };
                ADD65D7606DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGBitSet.h;
@@ -1385,6 +1481,7 @@
                };
                ADD65D7706DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGBundleManager.h;
@@ -1393,6 +1490,7 @@
                };
                ADD65D7806DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGCalendarDateRange.h;
@@ -1401,6 +1499,7 @@
                };
                ADD65D7906DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGCharBuffers.h;
@@ -1409,6 +1508,7 @@
                };
                ADD65D7B06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGCustomFileManager.h;
@@ -1417,6 +1517,7 @@
                };
                ADD65D7C06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGDirectoryEnumerator.h;
@@ -1425,6 +1526,7 @@
                };
                ADD65D7D06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGExtensions.h;
@@ -1433,6 +1535,7 @@
                };
                ADD65D7E06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGExtensionsDecls.h;
@@ -1441,6 +1544,7 @@
                };
                ADD65D7F06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGFileFolderInfoDataSource.h;
@@ -1449,6 +1553,7 @@
                };
                ADD65D8006DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGFileManager.h;
@@ -1457,6 +1562,7 @@
                };
                ADD65D8106DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGFileManagerURL.h;
@@ -1465,6 +1571,7 @@
                };
                ADD65D8206DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGHashMap.h;
@@ -1473,6 +1580,7 @@
                };
                ADD65D8306DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGMemoryAllocation.h;
@@ -1481,6 +1589,7 @@
                };
                ADD65D8406DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGMerging.h;
@@ -1489,6 +1598,7 @@
                };
                ADD65D8506DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGObjCRuntime.h;
@@ -1497,6 +1607,7 @@
                };
                ADD65D8606DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGObjectMacros.h;
@@ -1505,6 +1616,7 @@
                };
                ADD65D8706DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGPropertyListParser.h;
@@ -1513,6 +1625,7 @@
                };
                ADD65D8806DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGQuotedPrintableCoding.h;
@@ -1521,6 +1634,7 @@
                };
                ADD65D8906DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGRule.h;
@@ -1529,6 +1643,7 @@
                };
                ADD65D8A06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGRuleAssignment.h;
@@ -1537,6 +1652,7 @@
                };
                ADD65D8B06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGRuleContext.h;
@@ -1545,6 +1661,7 @@
                };
                ADD65D8C06DA382F007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGRuleEngine.h;
@@ -1553,6 +1670,7 @@
                };
                ADD65D8D06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGRuleModel.h;
@@ -1561,6 +1679,7 @@
                };
                ADD65D8E06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGStack.h;
@@ -1569,6 +1688,7 @@
                };
                ADD65D8F06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = NGStringScanEnumerator.h;
@@ -1577,6 +1697,7 @@
                };
                ADD65D9006DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSArray+enumerator.h";
@@ -1585,6 +1706,7 @@
                };
                ADD65D9106DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSAutoreleasePool+misc.h";
@@ -1593,6 +1715,7 @@
                };
                ADD65D9206DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSCalendarDate+misc.h";
@@ -1601,6 +1724,7 @@
                };
                ADD65D9306DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSData+gzip.h";
@@ -1609,6 +1733,7 @@
                };
                ADD65D9406DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSData+misc.h";
@@ -1617,6 +1742,7 @@
                };
                ADD65D9506DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSDictionary+misc.h";
@@ -1625,6 +1751,7 @@
                };
                ADD65D9606DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSEnumerator+misc.h";
@@ -1633,6 +1760,7 @@
                };
                ADD65D9706DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSException+misc.h";
@@ -1641,6 +1769,7 @@
                };
                ADD65D9806DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSFileManager+Extensions.h";
@@ -1649,6 +1778,7 @@
                };
                ADD65D9906DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSMethodSignature+misc.h";
@@ -1657,6 +1787,7 @@
                };
                ADD65D9A06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSNull+misc.h";
@@ -1665,6 +1796,7 @@
                };
                ADD65D9B06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSObject+Logs.h";
@@ -1673,6 +1805,7 @@
                };
                ADD65D9C06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSObject+Values.h";
@@ -1681,6 +1814,7 @@
                };
                ADD65D9D06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSProcessInfo+misc.h";
@@ -1689,6 +1823,7 @@
                };
                ADD65D9E06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSRunLoop+FileObjects.h";
@@ -1697,6 +1832,7 @@
                };
                ADD65D9F06DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSSet+enumerator.h";
@@ -1705,6 +1841,7 @@
                };
                ADD65DA006DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSString+Encoding.h";
@@ -1713,6 +1850,7 @@
                };
                ADD65DA106DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSString+Ext.h";
@@ -1721,6 +1859,7 @@
                };
                ADD65DA206DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSString+Formatting.h";
@@ -1729,6 +1868,7 @@
                };
                ADD65DA306DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSString+German.h";
@@ -1737,6 +1877,7 @@
                };
                ADD65DA406DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSString+misc.h";
@@ -1745,6 +1886,7 @@
                };
                ADD65DA506DA3830007161CA = {
                        fileEncoding = 4;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = "NSURL+misc.h";

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index b12aa9c0a7efb46214afa293e370189eb53871c3..33b1f9607066f5748778b6f5ea932e5d3db6d3bd 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,5 +1,5 @@
 # $Id$
 
-SUBMINOR_VERSION:=106
+SUBMINOR_VERSION:=107
 
 # v4.2.72 requires libEOControl v4.2.39