changed #includes into #imports - does compile against MulleEOF out of the box now

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

diff --git a/SOPE.xcodeproj/project.pbxproj b/SOPE.xcodeproj/project.pbxproj
index 054a60b01be11f12b1f819d6981f3bdfa483ba84..36eefed9ff380d4363d4086044b339b8c96790e3 100644 (file)
--- a/SOPE.xcodeproj/project.pbxproj
+++ b/SOPE.xcodeproj/project.pbxproj
@@ -20,9 +20,9 @@
                                AD8BF0DB07018E6900EC239A /* PBXTargetDependency */,
                                AD8BF0DF07018E6900EC239A /* PBXTargetDependency */,
                                AD8BF0DD07018E6900EC239A /* PBXTargetDependency */,
-                               AD8BF8680701AE0600EC239A /* PBXTargetDependency */,
-                               AD8BF27B070199B000EC239A /* PBXTargetDependency */,
                                AD8BF1BD070197B000EC239A /* PBXTargetDependency */,
+                               AD8BF27B070199B000EC239A /* PBXTargetDependency */,
+                               AD8BF8680701AE0600EC239A /* PBXTargetDependency */,
                        );
                        name = "Wrapper Contents";
                        productName = "Wrapper Contents";
@@ -40,9 +40,9 @@
                                AD8BF0D307018E5200EC239A /* PBXTargetDependency */,
                                AD8BF0D707018E5200EC239A /* PBXTargetDependency */,
                                AD8BF0D507018E5200EC239A /* PBXTargetDependency */,
-                               AD8BF8660701ADF800EC239A /* PBXTargetDependency */,
-                               AD8BF279070199A200EC239A /* PBXTargetDependency */,
                                AD8BF1BB0701978A00EC239A /* PBXTargetDependency */,
+                               AD8BF279070199A200EC239A /* PBXTargetDependency */,
+                               AD8BF8660701ADF800EC239A /* PBXTargetDependency */,
                        );
                        name = all;
                        productName = all;
@@ -502,9 +502,9 @@
                                AD8BF0C907018E0300EC239A /* sope-core.xcodeproj */,
                                AD8BF0CD07018E3400EC239A /* sope-mime.xcodeproj */,
                                AD8BF0CB07018E0C00EC239A /* sope-appserver.xcodeproj */,
-                               AD8BF8620701ADE800EC239A /* sope-gdl1.xcodeproj */,
                                AD8BF2750701999500EC239A /* sope-ldap.xcodeproj */,
                                AD8BF1B70701977800EC239A /* sope-ical.xcodeproj */,
+                               AD8BF8620701ADE800EC239A /* sope-gdl1.xcodeproj */,
                        );
                        name = Projects;
                        sourceTree = "<group>";

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 2a19499b1e602f618ee46fbf6cc54e3886582934..6cfe02b1af4e6ecafb87b568cbbd82b17d466ce9 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * *m: changed EOControl related includes into imports
+         to enable compilation against MulleEOF (v4.5.233)
+
 2006-05-05  Helge Hess  <helge.hess@opengroupware.org>
 
        * WebDAV/SoWebDAVRenderer.m: deliver more lockinfo fields when a lock

diff --git a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
index 02ec14064c8c91ea9b168282a599f1dd72fc0876..d2be7ed7682f74c1252e435f736b429014272e40 100644 (file)
--- a/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGHttp/NGHttp.xcodeproj/project.pbxproj
@@ -410,7 +410,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -596,7 +596,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -637,7 +637,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -680,7 +680,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
index 6cd5ca36dde77ed20b7829fb0e96567507edf140..c68709d2a9a0abee4566f0be1ff0ecbf3a8ecec0 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -1984,7 +1984,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1998,7 +1998,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=228",
+                                       "-DSOPE_SUBMINOR_VERSION=233",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2506,7 +2506,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2530,7 +2530,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=228",
+                                       "-DSOPE_SUBMINOR_VERSION=233",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2552,7 +2552,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -2577,7 +2577,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=228",
+                                       "-DSOPE_SUBMINOR_VERSION=233",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
@@ -2600,7 +2600,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -2614,7 +2614,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=5",
-                                       "-DSOPE_SUBMINOR_VERSION=228",
+                                       "-DSOPE_SUBMINOR_VERSION=233",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObject.m b/sope-appserver/NGObjWeb/SoObjects/SoObject.m
index 04ad8eae72c2a74727fbcf93356e46f68a559b68..0bcc4abfc0b6122595d3ffdd965df66589e7af1e 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObject.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObject.m
@@ -24,7 +24,7 @@
 #include "SoClass.h"
 #include "SoSecurityManager.h"
 #include "WOContext+SoObjects.h"
-#include <EOControl/EOClassDescription.h>
+// #import <EOControl/EOClassDescription.h>
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WORequest.h>
 #include "common.h"

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
index 7b2a4c3751676dea3d187f298aff15c03a654892..d2e2c07f4cbbcbae7ed5739cd53fe1e1c416d89a 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjects.xcodeproj/project.pbxproj
@@ -305,7 +305,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -404,7 +404,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -444,7 +444,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -486,7 +486,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index c1996c3130754abb3ced297cb4ad3653719fda8a..9ae0437d08c0372561a609586e4701867663a48c 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=232
+SUBMINOR_VERSION:=233
 
 # v4.5.214 requires libNGExtensions v4.5.179
 # v4.5.122 requires libNGExtensions v4.5.153

diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m
index a79b58717900cf1707391d9b43ed17946974c167..1e4bca654005e95181c08ada26b5d33663875e28 100644 (file)
--- a/sope-appserver/NGObjWeb/WOApplication.m
+++ b/sope-appserver/NGObjWeb/WOApplication.m
@@ -34,7 +34,7 @@
 #include <NGObjWeb/WOStatisticsStore.h>
 #include <NGObjWeb/WODynamicElement.h>
 #include <NGObjWeb/WOTemplate.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 #include <time.h>
 

diff --git a/sope-appserver/NGObjWeb/WOComponent.m b/sope-appserver/NGObjWeb/WOComponent.m
index 649e13868f8e99021e0c54c08ed115945558d66b..7145ed0f9bbb3fc387623f5445002c5b3db7921e 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponent.m
+++ b/sope-appserver/NGObjWeb/WOComponent.m
@@ -32,7 +32,10 @@
 #include "WOComponentFault.h"
 #include "common.h"
 #include <NGExtensions/NGBundleManager.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
+#ifdef MULLE_EO_CONTROL
+#import <EOControl/EOKeyValueUnarchiver.h>
+#endif
 #include <NGExtensions/NSString+Ext.h>
 
 @interface WOContext(ComponentStackCount)

diff --git a/sope-appserver/NGObjWeb/WOComponentDefinition.m b/sope-appserver/NGObjWeb/WOComponentDefinition.m
index 765470bff2aa36363a33f8517e27fd534497aa8d..75be04dc4c9eb718e827fbe20b44d46dd8fcf4da 100644 (file)
--- a/sope-appserver/NGObjWeb/WOComponentDefinition.m
+++ b/sope-appserver/NGObjWeb/WOComponentDefinition.m
@@ -29,7 +29,10 @@
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOResourceManager.h>
 #include "common.h"
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
+#ifdef MULLE_EO_CONTROL
+#import <EOControl/EOKeyValueUnarchiver.h>
+#endif
 
 #include <NGObjWeb/WOTemplateBuilder.h>
 

diff --git a/sope-appserver/NGObjWeb/WOCoreApplication.m b/sope-appserver/NGObjWeb/WOCoreApplication.m
index 7db7e352bd26a07ebac127c57b92fc0fb9fda9de..0cf0781142f1754e3d600c62fde839925c1cca20 100644 (file)
--- a/sope-appserver/NGObjWeb/WOCoreApplication.m
+++ b/sope-appserver/NGObjWeb/WOCoreApplication.m
@@ -25,7 +25,7 @@
 #include <NGObjWeb/WORequestHandler.h>
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOContext.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include <NGStreams/NGStreams.h>
 #include <NGStreams/NGNet.h>
 #include <NGExtensions/NGResourceLocator.h>

diff --git a/sope-appserver/NGObjWeb/WODisplayGroup.m b/sope-appserver/NGObjWeb/WODisplayGroup.m
index ae3e58ef406217d1613da8b395c84f83217298b1..6badbd1424693ed2a5fffd70079ac6ebb803b6af 100644 (file)
--- a/sope-appserver/NGObjWeb/WODisplayGroup.m
+++ b/sope-appserver/NGObjWeb/WODisplayGroup.m
@@ -21,6 +21,7 @@
 
 #include <NGObjWeb/WODisplayGroup.h>
 #import <EOControl/EOControl.h>
+#import <EOControl/EOKeyValueArchiver.h>
 #import <Foundation/Foundation.h>
 #import <Foundation/NSNotification.h>
 #include "common.h"

diff --git a/sope-appserver/NGObjWeb/WOResponse.m b/sope-appserver/NGObjWeb/WOResponse.m
index f78997e663dee80f640844e8290859b19f387ce2..6087888378b7bc6ed2702c71b0a4689aedd2254a 100644 (file)
--- a/sope-appserver/NGObjWeb/WOResponse.m
+++ b/sope-appserver/NGObjWeb/WOResponse.m
@@ -23,7 +23,7 @@
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOCookie.h>
 #include <NGExtensions/NSData+gzip.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 
 @implementation WOResponse

diff --git a/sope-appserver/NGObjWeb/WOSession.m b/sope-appserver/NGObjWeb/WOSession.m
index 4a957203aa7ec0d25302398de3bbe00260802e8d..c965de88a7851488910a336c1e69524945cc3f0a 100644 (file)
--- a/sope-appserver/NGObjWeb/WOSession.m
+++ b/sope-appserver/NGObjWeb/WOSession.m
@@ -28,7 +28,7 @@
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOStatisticsStore.h>
-#include <EOControl/EONull.h>
+#import <EOControl/EONull.h>
 #include "common.h"
 #include <string.h>
 

diff --git a/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m b/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m
index 26248a1caaf60aaee2fb7981c60bf49676d8c430..ba99f6070700700dac23a61031a3084772f464a6 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m
+++ b/sope-appserver/NGObjWeb/WebDAV/EOFetchSpecification+SoDAV.m
@@ -21,7 +21,7 @@
 
 #include "EOFetchSpecification+SoDAV.h"
 #include "SoDAVSQLParser.h"
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 
 @implementation EOFetchSpecification(SoDAV)

diff --git a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
index 4adece3c203bf981ffffb86cf4ffdd1479006afa..63f16045bc6add15d0f05c70085b0656291826f5 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
@@ -22,7 +22,7 @@
 #include "SaxDAVHandler.h"
 #include "EOFetchSpecification+SoDAV.h"
 #include <SaxObjC/XMLNamespaces.h>
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 #include "common.h"
 
 /*

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m
index 4644b1fa8574c337b3cdff8da9b226850e168540..4697d79f54e9a9e749c5f06c29def1f1f579e3ea 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m
@@ -20,10 +20,10 @@
 */
 
 #include "SoDAVSQLParser.h"
-#include <EOControl/EOQualifier.h>
-#include <EOControl/EOFetchSpecification.h>
-#include <EOControl/EOSortOrdering.h>
-#include <EOControl/EOClassDescription.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOSortOrdering.h>
+#import <EOControl/EOClassDescription.h>
 #include "common.h"
 #include <string.h>
 

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m
index f4f846e18608449e87020c013ed432737460bdab..8d36a2a662d22e586531cfac0716fa39c193f90c 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAVQuery.m
@@ -26,8 +26,8 @@
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WOContext.h>
 #include <NGObjWeb/WEClientCapabilities.h>
-#include <EOControl/EOQualifier.h>
-#include <EOControl/EOSortOrdering.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOSortOrdering.h>
 #include "common.h"
 
 @implementation NSObject(SoObjectDAVQueries)

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
index 3938c6d072a8d435a0829552c67bcaa6664fe694..8b9453f94725bcf75674d5232ef067ae2f17f5fc 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
@@ -26,8 +26,8 @@
 #include "EOFetchSpecification+SoDAV.h"
 #include <NGObjWeb/WEClientCapabilities.h>
 #include <NGObjWeb/WOContext.h>
-#include <EOControl/EOQualifier.h>
-#include <EOControl/EOSortOrdering.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOSortOrdering.h>
 #include "common.h"
 
 @implementation SoObjectDataSource

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m
index 15fd8859400c9243dba91013920a4e96cbbc861f..612a1ab66612b0f5ab5840095cd79344b31eb615 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m
@@ -22,7 +22,7 @@
 #include "SoSubscriptionManager.h"
 #include "SoSubscription.h"
 #include "SoObject.h"
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 
 @implementation SoSubscriptionManager

diff --git a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
index 87bae51c244bc4e97ebfa8b9a8ee672b457ae751..119d942f2386feaf0aabe96f20fdf3c5b4b272ef 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/WebDAV/WebDAV.xcodeproj/project.pbxproj
@@ -234,7 +234,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -332,7 +332,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -372,7 +372,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -414,7 +414,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.228;
+                               DYLIB_CURRENT_VERSION = 4.5.233;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog
index 877abb239b4867e28a0d951912a5227c0155b04c..42ab4e6202db19b346afd168d55d9347b8404c92 100644 (file)
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * *m: changed EOControl related includes into imports
+         to enable compilation against MulleEOF (v4.5.14)
+
 2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: added dependency to NGMail (v4.5.13)

diff --git a/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m
index f934d94fb28e46da54539d4fe19cbe2d851b1c3f..157661093c7be71c8723b72122681a8b6c120bb1 100644 (file)
--- a/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m
+++ b/sope-appserver/NGXmlRpc/EOFetchSpecification+XmlRpcCoding.m
@@ -19,11 +19,11 @@
   02111-1307, USA.
 */
 
-#include <EOControl/EOFetchSpecification.h>
-#include <EOControl/EOSortOrdering.h>
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOSortOrdering.h>
 #include "common.h"
 #include <XmlRpc/XmlRpcCoder.h>
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 @implementation EOFetchSpecification(XmlRpcCoding)
 

diff --git a/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m
index 22414cd7fd672ff77f6de21e443e14ae9e002d3c..a9155f71d04e3f45873d7271ddea0f098e9b163f 100644 (file)
--- a/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m
+++ b/sope-appserver/NGXmlRpc/EOKeyGlobalID+XmlRpcCoding.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <EOControl/EOKeyGlobalID.h>
+#import <EOControl/EOKeyGlobalID.h>
 #include "common.h"
 #include <XmlRpc/XmlRpcCoder.h>
 

diff --git a/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m
index 4301555a97ec8f3a380b5828e8e4900d2bd2dbac..091f834fd385247e636e527a3a7d0358e7d467bd 100644 (file)
--- a/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m
+++ b/sope-appserver/NGXmlRpc/EONull+XmlRpcCoding.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <EOControl/EONull.h>
+#import <EOControl/EONull.h>
 #include "common.h"
 #include <XmlRpc/XmlRpcCoder.h>
 

diff --git a/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m
index e68267c2e148b6c5a95a8735add8b981cb20bc0a..88383e3118c51c5781ce55555bdbb9bde2f74494 100644 (file)
--- a/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m
+++ b/sope-appserver/NGXmlRpc/EOQualifier+XmlRpcCoding.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 #include "common.h"
 #include <XmlRpc/XmlRpcCoder.h>
 
@@ -125,6 +125,9 @@
 
 @end /* EOKeyComparisonQualifier(XmlRpcCoding) */
 
+#ifdef MULLE_EO_CONTROL
+#warning !! EOQualifierVariable still private?
+#else
 @implementation EOQualifierVariable(XmlRpcCoding)
 
 - (id)initWithXmlRpcCoder:(XmlRpcDecoder *)_coder {
@@ -136,3 +139,4 @@
 }
 
 @end /* EOQualifierVariable(XmlRpcCoding) */
+#endif /* MULLE_EO_CONTROL */

diff --git a/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m b/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m
index ff497d6caf15d1b1045dcd5006824ab963b45744..e7f634ca027eb29bf466780db4e66ad3beb07d23 100644 (file)
--- a/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m
+++ b/sope-appserver/NGXmlRpc/EOSortOrdering+XmlRpcCoding.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <EOControl/EOSortOrdering.h>
+#import <EOControl/EOSortOrdering.h>
 #include "common.h"
 #include <XmlRpc/XmlRpcCoder.h>
 

diff --git a/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj b/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj
index 7411a94f5fdb68354e5087b1022baddef7a7919d..cd8fbeeebe1407bdb7a9c71ff486c8783ad1419f 100644 (file)
--- a/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGXmlRpc/NGXmlRpc.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.13;
+                               DYLIB_CURRENT_VERSION = 4.5.14;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -485,7 +485,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.13;
+                               DYLIB_CURRENT_VERSION = 4.5.14;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -526,7 +526,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.13;
+                               DYLIB_CURRENT_VERSION = 4.5.14;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -569,7 +569,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.13;
+                               DYLIB_CURRENT_VERSION = 4.5.14;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version
index 36c1074d67afe2bdaebb02aee0b2a2160f8b9d89..a61800193508eae2e91f495b3d1b106b17416b41 100644 (file)
--- a/sope-appserver/NGXmlRpc/Version
+++ b/sope-appserver/NGXmlRpc/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=13
+SUBMINOR_VERSION:=14

diff --git a/sope-appserver/sope-appserver.xcodeproj/project.pbxproj b/sope-appserver/sope-appserver.xcodeproj/project.pbxproj
index f6513144496d44b6de48c03adf675eb0c5d44d05..5fbb831e9c581101a9b658f9ecd09eb9965e199e 100644 (file)
--- a/sope-appserver/sope-appserver.xcodeproj/project.pbxproj
+++ b/sope-appserver/sope-appserver.xcodeproj/project.pbxproj
@@ -257,7 +257,6 @@
                ADDF477106DA575700C4E7F8 /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = COPYRIGHT; sourceTree = "<group>"; };
                ADDF477306DA575700C4E7F8 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = "<group>"; tabWidth = 8; };
                ADDF477406DA575700C4E7F8 /* PROJECTLEAD */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = PROJECTLEAD; sourceTree = "<group>"; };
-               ADDF477506DA575700C4E7F8 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
                ADDF477606DA575700C4E7F8 /* README-OSX.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-OSX.txt"; sourceTree = "<group>"; };
                ADDF477706DA575700C4E7F8 /* Version */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = Version; sourceTree = "<group>"; tabWidth = 8; };
                ADEAC65B078A325700097697 /* SoOFS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SoOFS.xcodeproj; path = SoOFS/SoOFS.xcodeproj; sourceTree = "<group>"; };
@@ -332,7 +331,6 @@
                ADDF476606DA572500C4E7F8 = {
                        isa = PBXGroup;
                        children = (
-                               ADDF477506DA575700C4E7F8 /* README */,
                                ADDF477606DA575700C4E7F8 /* README-OSX.txt */,
                                ADDF477006DA575700C4E7F8 /* COPYING */,
                                ADDF477106DA575700C4E7F8 /* COPYRIGHT */,

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 2ad1beabe0058fb04a3e00a7b232c25ca093b030..d952a4b6c4d7734a5b15ce39fe700d1d71f06945 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * *.h, *m: changed EOControl related includes into imports
+         to enable compilation against MulleEOF (v4.5.183)
+
 2006-02-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGBundleManager.m: minor code cleanups (v4.5.182)

diff --git a/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m b/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m
index 7a696cad73a9c0952709bb6bf2cb3d57f9b0f9f2..7cd0e6630e224020c6518c88859714a7f7b8c8b0 100644 (file)
--- a/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m
+++ b/sope-core/NGExtensions/EOExt.subproj/EODataSource+NGExtensions.m
@@ -20,7 +20,7 @@
 */
 
 #include "EODataSource+NGExtensions.h"
-#include <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOFetchSpecification.h>
 #include "common.h"
 
 NGExtensions_DECLARE NSString *EODataSourceDidChangeNotification =

diff --git a/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m b/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m
index 48d5a59dc7d915624c0dff00b5fb03988c714365..32b6c29116180e6bdc227a27597ee9dfc91ca05a 100644 (file)
--- a/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m
+++ b/sope-core/NGExtensions/EOExt.subproj/EOFetchSpecification+plist.m
@@ -20,7 +20,7 @@
 */
 
 #include <NGExtensions/EOFetchSpecification+plist.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 
 @implementation EOFetchSpecification(plist)
@@ -83,10 +83,10 @@
         NSLog(@"%s: invalid hints key !", __PRETTY_FUNCTION__);
     }
     
-    if ([self->hints objectForKey:@"addDocumentsAsObserver"] == nil) {
+    if ([[self hints] objectForKey:@"addDocumentsAsObserver"] == nil) {
       NSMutableDictionary *hnts;
 
-      hnts = [[NSMutableDictionary alloc] initWithDictionary:self->hints];
+      hnts = [[NSMutableDictionary alloc] initWithDictionary:[self hints]];
       [hnts setObject:[NSNumber numberWithBool:NO]
             forKey:@"addDocumentsAsObserver"];
       [self setHints:hnts];

diff --git a/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m b/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m
index d47b4d76f5c5feaa0fffd7f59b82f1eb7c91bde8..f4d2938127b0a5769ae42a927f45508955b4e49d 100644 (file)
--- a/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m
+++ b/sope-core/NGExtensions/EOExt.subproj/EOFilterDataSource.m
@@ -22,7 +22,7 @@
 #include "EOFilterDataSource.h"
 #include "EODataSource+NGExtensions.h"
 #include "EOGrouping.h"
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 
 @interface NSDictionary(EOFilterDataSource)

diff --git a/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m b/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m
index c9ee8b2dfed41447b8fc6bc14f44d55de9c48603..443cc3f489986220cc4512155b37546db4c16af8 100644 (file)
--- a/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m
+++ b/sope-core/NGExtensions/EOExt.subproj/EOQualifierGrouping.m
@@ -20,7 +20,7 @@
 */
 
 #include "EOGrouping.h"
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 #include "common.h"
 
 @implementation EOQualifierGrouping

diff --git a/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m b/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m
index 10f69f22a95d5d35f529fbb8048f6a885fb7cf66..8a3bc20e5bba88ddb125f0ea350a11ff03cb5efe 100644 (file)
--- a/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m
+++ b/sope-core/NGExtensions/EOExt.subproj/NSArray+EOGrouping.m
@@ -20,7 +20,7 @@
 */
 
 #include "EOGrouping.h"
-#include <EOControl/EOSortOrdering.h>
+#import <EOControl/EOSortOrdering.h>
 #include "common.h"
 
 @implementation NSArray(EOGrouping)

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m b/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m
index 7af58b89fca97fbb864aed5cd2ac9fd7dade0a63..9e95d8f0a2f602b7300c84892cf17ae929bf728d 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSFileManager+Extensions.m
@@ -21,7 +21,7 @@
 
 #include "NSFileManager+Extensions.h"
 #include "NGFileFolderInfoDataSource.h"
-#include <EOControl/EOGlobalID.h>
+#import <EOControl/EOGlobalID.h>
 #include "common.h"
 
 @interface NSFileManagerGlobalID : EOGlobalID < NSCopying >

diff --git a/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj b/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj
index 535101295f3bf6cee5d9b44eb57631fed89e0f2f..16544f09893f37ef6fdeb8cb1b2969bc9fbbe068 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj
+++ b/sope-core/NGExtensions/NGExtensions.xcodeproj/project.pbxproj
@@ -972,7 +972,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.182;
+                               DYLIB_CURRENT_VERSION = 4.5.183;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1173,7 +1173,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.182;
+                               DYLIB_CURRENT_VERSION = 4.5.183;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1218,7 +1218,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.182;
+                               DYLIB_CURRENT_VERSION = 4.5.183;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -1265,7 +1265,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.182;
+                               DYLIB_CURRENT_VERSION = 4.5.183;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h b/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h
index 47c03da6865a4696c44a3942716c31af141578b8..f8dc9fa6e2feb797b358c16f2b9c15e9c8806bb8 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h
+++ b/sope-core/NGExtensions/NGExtensions/EODataSource+NGExtensions.h
@@ -22,7 +22,7 @@
 #ifndef __NGExtensions_EODataSource_NGExtensions_H__
 #define __NGExtensions_EODataSource_NGExtensions_H__
 
-#include <EOControl/EODataSource.h>
+#import <EOControl/EODataSource.h>
 #include <NGExtensions/NGExtensionsDecls.h>
 
 @class EOFetchSpecification;

diff --git a/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h b/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h
index fc5c5d9cba95d50568c5b0a1b8b3b4fcd333518b..d054095d8079a20b46afc4c9adb799d092be492a 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h
+++ b/sope-core/NGExtensions/NGExtensions/EOFetchSpecification+plist.h
@@ -22,7 +22,7 @@
 #ifndef __EOFetchSpecification_plist_h__
 #define __EOFetchSpecification_plist_h__
 
-#include <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOFetchSpecification.h>
 
 @class NSDictionary, NSString;
 

diff --git a/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h b/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h
index 6b803ca09d57659c57eee3992992c9dff191024b..aaedd16bf936644e4d0c01263c668cde729a511b 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h
+++ b/sope-core/NGExtensions/NGExtensions/EOQualifier+plist.h
@@ -22,7 +22,7 @@
 #ifndef __EOQualifier_plist_h__
 #define __EOQualifier_plist_h__
 
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 @class NSDictionary, NSString;
 

diff --git a/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h b/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h
index 63536230afa103e0f8f18e14d3107b4760c76fce..f3a245d9816cf31266018e536d553c793924fb99 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h
+++ b/sope-core/NGExtensions/NGExtensions/EOSortOrdering+plist.h
@@ -22,7 +22,7 @@
 #ifndef __EOSortOrdering_plist_h__
 #define __EOSortOrdering_plist_h__
 
-#include <EOControl/EOSortOrdering.h>
+#import <EOControl/EOSortOrdering.h>
 
 @class NSDictionary, NSString;
 

diff --git a/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h b/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h
index 1222f86c59bc0f8595586541ce34279b4d9f7707..38f3602f72535773448cb2c138bf2ef198d6464b 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h
+++ b/sope-core/NGExtensions/NGExtensions/EOTrueQualifier.h
@@ -22,7 +22,7 @@
 #ifndef __EOExt_EOTrueQualifier_H__
 #define __EOExt_EOTrueQualifier_H__
 
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 /*
   EOTrueQualifier

diff --git a/sope-core/NGExtensions/NGExtensions/NGRule.h b/sope-core/NGExtensions/NGExtensions/NGRule.h
index 6ab33b7a81c0804c43e940e0376c22d761de70c6..0e7670de845afe962bd94ea6138a4e93fc4b3946 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/NGRule.h
+++ b/sope-core/NGExtensions/NGExtensions/NGRule.h
@@ -23,7 +23,7 @@
 #define __NGRuleEngine_NGRule_H__
 
 #import <Foundation/NSObject.h>
-#include <EOControl/EOKeyValueArchiver.h>
+#import <EOControl/EOKeyValueArchiver.h>
 
 /*
   NGRule

diff --git a/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h b/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h
index b3c2d712a9f72e53810bec8b311c00a5923f015e..88c741421e4eddc5ff2f35f09b4433df006f509d 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h
+++ b/sope-core/NGExtensions/NGExtensions/NGRuleAssignment.h
@@ -23,7 +23,7 @@
 #define __NGRuleEngine_NGRuleAssignment_H__
 
 #import <Foundation/NSObject.h>
-#include <EOControl/EOKeyValueArchiver.h>
+#import <EOControl/EOKeyValueArchiver.h>
 
 /*
   NGRuleAssignment

diff --git a/sope-core/NGExtensions/NGExtensions/NGRuleModel.h b/sope-core/NGExtensions/NGExtensions/NGRuleModel.h
index cefd1ce89edd9dd96ce6c3ee5ba78ddb35c7fd6d..8bcd7770114373ed58fba6658e74897fcd4fa9ae 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/NGRuleModel.h
+++ b/sope-core/NGExtensions/NGExtensions/NGRuleModel.h
@@ -23,7 +23,7 @@
 #define __NGRuleEngine_NGRuleModel_H__
 
 #import <Foundation/NSObject.h>
-#include <EOControl/EOKeyValueArchiver.h>
+#import <EOControl/EOKeyValueArchiver.h>
 
 /*
   NGRuleModel

diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m
index be742032ce9a0d63b3b273694ff603bce6c511c7..c76178a61877b6902c05d7b5eabfd215669b512c 100644 (file)
--- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m
+++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRule.m
@@ -23,7 +23,7 @@
 #include "NGRuleAssignment.h"
 #include "NGRuleParser.h"
 #include "common.h"
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 @implementation NGRule
 

diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
index 9d39fffba7280c37960c8335b1397783090923cc..ae780483f36c1ba7a9e3173b2f3da4876e266e47 100644 (file)
--- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
+++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleContext.m
@@ -24,7 +24,7 @@
 #include "NGRuleModel.h"
 #include "NSObject+Logs.h"
 #include "common.h"
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 @implementation NGRuleContext
 

diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m
index 39e4e3ff27f49a236ff762f8d2ce3ed584f52d71..b0cec3de34c19d5d1a334e8da89bd965be551259 100644 (file)
--- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m
+++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleModel.m
@@ -24,7 +24,7 @@
 #include "NGRuleParser.h"
 #include "EOTrueQualifier.h"
 #include <NGExtensions/NSObject+Logs.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include "common.h"
 
 // TODO: add a candidate cache

diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m
index e7968464400f0d246a342b4b5415c73b68b8522b..c26674893fe4bb35cd3137560e7f628fd08a1361 100644 (file)
--- a/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m
+++ b/sope-core/NGExtensions/NGRuleEngine.subproj/NGRuleParser.m
@@ -27,7 +27,7 @@
 #include "NSString+misc.h"
 #include "NSString+Ext.h"
 #include "EOTrueQualifier.h"
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 #include "common.h"
 
 // TODO: proper reports errors in last-exception !

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index a642b68b55bfca8390eec71c2dea8b02d1e49b22..629cbb0c2a584ccd1d8a5686fd595e3b2359c276 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=182
+SUBMINOR_VERSION:=183
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39

diff --git a/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m b/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m
index aaaf12261bbcb84376f20a12c197e56cff5c39a3..4c652b0d4725e90b270bab2b11e86a02fda0643b 100644 (file)
--- a/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m
+++ b/sope-core/NGExtensions/XmlExt.subproj/DOMNode+EOQualifier.m
@@ -20,7 +20,7 @@
 */
 
 #include "DOMNode+EOQualifier.h"
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 #include "common.h"
 
 @interface NSObject(DOMNodeEOQualifier)

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 16b1c34b5b67ce764d4e957f0c762df7202de9f1..66d7e3bb91f22308da1568eae7fbb0698d49b920 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * iCalDataSource.h, common.h: changed EOControl related includes into
+         imports to enable compilation against MulleEOF (v4.5.74)
+
 2006-04-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * iCalEntityObject.h: added missing forward declaration for

diff --git a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj
index e0fa5de55e7955bcbd2fcb3510969e581221b222..dbac03730abb1a4d3173bdcc7bac9fb4928fb495 100644 (file)
--- a/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj
+++ b/sope-ical/NGiCal/NGiCal.xcodeproj/project.pbxproj
@@ -582,7 +582,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -645,7 +645,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -821,7 +821,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -864,7 +864,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -909,7 +909,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -939,7 +939,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -975,7 +975,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -1013,7 +1013,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.73;
+                               DYLIB_CURRENT_VERSION = 4.5.74;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;

diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version
index cbb19f9928771c0e350a8bb415d27133075fbdde..b9d4ae75649ddcdef8b54bd51d503e2f91d31471 100644 (file)
--- a/sope-ical/NGiCal/Version
+++ b/sope-ical/NGiCal/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=73
+SUBMINOR_VERSION:=74
 
 # v4.5.40 requires NGExtensions v4.5.145
 # v4.5.37 requires NGExtensions v4.5.140

diff --git a/sope-ical/NGiCal/common.h b/sope-ical/NGiCal/common.h
index 3fb8eb015dd2161bb85a698c5d653f30ea6fd5db..0ffdb5748ba2d8b263dea8b272c04283e7875e08 100644 (file)
--- a/sope-ical/NGiCal/common.h
+++ b/sope-ical/NGiCal/common.h
@@ -23,7 +23,7 @@
 #define __ICal_common_H__
 
 #import <Foundation/Foundation.h>
-#include <EOControl/EOControl.h>
+#import <EOControl/EOControl.h>
 #include <NGExtensions/NGExtensions.h>
 
 #define IS_EQUAL(a, b, sel) \

diff --git a/sope-ical/NGiCal/iCalDataSource.h b/sope-ical/NGiCal/iCalDataSource.h
index e41f4e2a4ede1bcb2d69121325db7ea70f899ec8..770987bbb1f9aeafbf5159d08ed4013c927ed049 100644 (file)
--- a/sope-ical/NGiCal/iCalDataSource.h
+++ b/sope-ical/NGiCal/iCalDataSource.h
@@ -22,7 +22,7 @@
 #ifndef __NGiCal_iCalDataSource_H__
 #define __NGiCal_iCalDataSource_H__
 
-#include <EOControl/EODataSource.h>
+#import <EOControl/EODataSource.h>
 
 @class NSString, NSURL;
 @class EOFetchSpecification;

diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog
index 5f653129c0c3057f6798f54a762e23789256848d..26c8eb289555de2e4d3ba262bed11e559d48c4d4 100644 (file)
--- a/sope-ldap/NGLdap/ChangeLog
+++ b/sope-ldap/NGLdap/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * EOQualifier+LDAP.h: changed EOControl related includes into imports
+         to enable compilation against MulleEOF (v4.5.29)
+
 2006-01-30  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGLdapConnection.m: set LDAP options prior performing a bind. Default

diff --git a/sope-ldap/NGLdap/EOQualifier+LDAP.h b/sope-ldap/NGLdap/EOQualifier+LDAP.h
index 841f5817ad61336af1b086bed1d03578163a0aad..c87a38d1d2ae21639775cf9836e6359a96636958 100644 (file)
--- a/sope-ldap/NGLdap/EOQualifier+LDAP.h
+++ b/sope-ldap/NGLdap/EOQualifier+LDAP.h
@@ -22,7 +22,7 @@
 #ifndef __EOQualifier_LDAP_H__
 #define __EOQualifier_LDAP_H__
 
-#include <EOControl/EOQualifier.h>
+#import <EOControl/EOQualifier.h>
 
 @class NSString;
 

diff --git a/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj b/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj
index e75bc59fa3f42ca48c1fee45ad0c052cccafeb0d..416b0022e6ceba2bf959b0d66480f9be51f01e88 100644 (file)
--- a/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj
+++ b/sope-ldap/NGLdap/NGLdap.xcodeproj/project.pbxproj
@@ -306,7 +306,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.28;
+                               DYLIB_CURRENT_VERSION = 4.5.29;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -417,7 +417,7 @@
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.28;
+                               DYLIB_CURRENT_VERSION = 4.5.29;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -458,7 +458,7 @@
                                DEPLOYMENT_POSTPROCESSING = YES;
                                DSTROOT = /;
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.28;
+                               DYLIB_CURRENT_VERSION = 4.5.29;
                                DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/";
                                FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                FRAMEWORK_VERSION = A;
@@ -501,7 +501,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.28;
+                               DYLIB_CURRENT_VERSION = 4.5.29;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version
index fdf3cd940e61bf2678246240d5e2a5f029bb1212..2aec4a55d1dc79d1f58003cbecbc7b511af8ba6b 100644 (file)
--- a/sope-ldap/NGLdap/Version
+++ b/sope-ldap/NGLdap/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=28
+SUBMINOR_VERSION:=29