Drop apache 1 build-dependency

[sope] / sope-core / EOControl / EOQualifier.h

diff --git a/sope-core/EOControl/EOQualifier.h b/sope-core/EOControl/EOQualifier.h
index 7db37e98fe3e2120f8fafa4ee57c58dbde931964..00ce8448f12b34040a7a96df5d528a26d82473ed 100644 (file)
--- a/sope-core/EOControl/EOQualifier.h
+++ b/sope-core/EOControl/EOQualifier.h
@@ -1,20 +1,20 @@
 /*
-  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.
 */
@@ -22,7 +22,8 @@
 #ifndef __EOQualifier_h__
 #define __EOQualifier_h__
 
-#import <Foundation/NSObject.h> 
+#import <Foundation/NSObject.h>
+#include <EOControl/EOKeyValueArchiver.h>
 
 /*
   EOQualifier
@@ -53,7 +54,7 @@
 - (BOOL)evaluateWithObject:(id)_object;
 @end
 
-@interface EOQualifier : NSObject
+@interface EOQualifier : NSObject < NSCopying, EOKeyValueArchiving >
 
 + (EOQualifier *)qualifierToMatchAnyValue:(NSDictionary *)_values;
 + (EOQualifier *)qualifierToMatchAllValues:(NSDictionary *)_values;
@@ -199,7 +200,7 @@ extern SEL EOQualifierOperatorCaseInsensitiveLike;
 
 /* variable qualifier content */
 
-@interface EOQualifierVariable : NSObject < NSCoding >
+@interface EOQualifierVariable : NSObject < NSCoding, EOKeyValueArchiving >
 {
   NSString *varKey;
 }
@@ -226,8 +227,8 @@ extern SEL EOQualifierOperatorCaseInsensitiveLike;
 - (BOOL)isLessThanOrEqualTo:(id)_object;
 - (BOOL)isGreaterThanOrEqualTo:(id)_object;
 - (BOOL)doesContain:(id)_object;
-- (BOOL)isLike:(id)_object;
-- (BOOL)isCaseInsensitiveLike:(id)_object;
+- (BOOL)isLike:(NSString *)_object;
+- (BOOL)isCaseInsensitiveLike:(NSString *)_object;
 @end
 
 @interface NSObject(EOQualifierTransformer)