PCH support

[sope] / sope-appserver / WOXML / WOXMLMapDecoder.m

diff --git a/sope-appserver/WOXML/WOXMLMapDecoder.m b/sope-appserver/WOXML/WOXMLMapDecoder.m
index 7c75fdf3f6e0c851a1a5918a7d3eb94626f42cc7..54cd2c05ee25befa471375b22ff0b66a9cb91f22 100644 (file)
--- a/sope-appserver/WOXML/WOXMLMapDecoder.m
+++ b/sope-appserver/WOXML/WOXMLMapDecoder.m
@@ -1,24 +1,23 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOXMLMapDecoder.h"
 #include "WOXMLMappingModel.h"
@@ -31,16 +30,18 @@
 
 @implementation WOXMLMapDecoder
 
-- (id)initWithModel:(id)_model {
-  self->model = RETAIN(_model);
+- (id)initWithModel:(WOXMLMappingModel *)_model {
+  self->model = [_model retain];
   return self;
 }
 
 - (void)dealloc {
-  RELEASE(self->model);
+  [self->model release];
   [super dealloc];
 }
 
+/* operations */
+
 - (WOXMLMappingEntity *)defaultEntity {
   return nil;
 }
@@ -175,7 +176,7 @@
 - (id)decodeRootObjectFromString:(NSString *)_str {
   id doc;
   
-  doc = [DOMDocument documentFromString:_str];
+  doc = [NGDOMDocument documentFromString:_str];
   
   return [self _processDOMDocument:doc];
 }
@@ -183,7 +184,7 @@
 - (id)decodeRootObjectFromData:(NSData *)_data {
   id doc;
   
-  doc = [DOMDocument documentFromData:_data];
+  doc = [NGDOMDocument documentFromData:_data];
   
   return [self _processDOMDocument:doc];
 }