Use (id <String>) instead of (String*).

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@242 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1995-04-03 03:24:45 +00:00
parent 95bc03e7f4
commit d8483a782f
13 changed files with 30 additions and 26 deletions

View file

@ -34,6 +34,7 @@
#include <objects/RetainingNotifier.h> #include <objects/RetainingNotifier.h>
#include <objects/Collecting.h> #include <objects/Collecting.h>
#include <objects/Dictionary.h> #include <objects/Dictionary.h>
#include <objects/NSString.h>
@class Proxy; @class Proxy;
@class Port; @class Port;
@ -76,7 +77,7 @@
or registered for invalidation notification */ or registered for invalidation notification */
+ (Connection*) newWithRootObject: anObj; + (Connection*) newWithRootObject: anObj;
+ (Connection*) newRegisteringAtName: (String*)n withRootObject: anObj; + (Connection*) newRegisteringAtName: (id <String>)n withRootObject: anObj;
/* Registering your server object on the network. /* Registering your server object on the network.
These methods create a new connection object that must be "run" in order These methods create a new connection object that must be "run" in order
to start handling requests from clients. to start handling requests from clients.
@ -89,8 +90,8 @@
it's unclear if we're connecting to another Connection that already it's unclear if we're connecting to another Connection that already
registered with that name. */ registered with that name. */
+ (Proxy*) rootProxyAtName: (String*)name onHost: (String*)host; + (Proxy*) rootProxyAtName: (id <String>)name onHost: (id <String>)host;
+ (Proxy*) rootProxyAtName: (String*)name; + (Proxy*) rootProxyAtName: (id <String>)name;
+ (Proxy*) rootProxyAtPort: (Port*)anOutPort; + (Proxy*) rootProxyAtPort: (Port*)anOutPort;
+ (Proxy*) rootProxyAtPort: (Port*)anOutPort withInPort: (Port*)anInPort; + (Proxy*) rootProxyAtPort: (Port*)anOutPort withInPort: (Port*)anInPort;
/* Get a proxy to a remote server object. /* Get a proxy to a remote server object.

View file

@ -69,7 +69,7 @@
@end @end
@interface TclInvocation @interface TclInvocation
- initWithTcl: (Tcl*)t command: (String*)c; - initWithTcl: (Tcl*)t command: (id <String>)c;
@end @end
@interface Collection (Invokes) @interface Collection (Invokes)

View file

@ -27,14 +27,15 @@
#include <objects/stdobjects.h> #include <objects/stdobjects.h>
#include <objects/RetainingNotifier.h> #include <objects/RetainingNotifier.h>
#include <objects/Coding.h> #include <objects/Coding.h>
#include <objects/NSString.h>
@class Connection; @class Connection;
@interface Port : RetainingNotifier <Coding> @interface Port : RetainingNotifier <Coding>
/* xxx These will probably change */ /* xxx These will probably change */
+ newRegisteredPortWithName: (String*)n; + newRegisteredPortWithName: (id <String>)n;
+ newPortFromRegisterWithName: (String*)n onHost: (String*)host; + newPortFromRegisterWithName: (id <String>)n onHost: (id <String>)host;
+ newPort; + newPort;
/* xxx These sending and receiving interfaces will change */ /* xxx These sending and receiving interfaces will change */

View file

@ -45,7 +45,7 @@ typedef struct sockaddr_in sockport_t;
+ newForSockPort: (sockport_t)s; + newForSockPort: (sockport_t)s;
+ newLocalWithNumber: (int)n; + newLocalWithNumber: (int)n;
+ newLocal; + newLocal;
+ newRemoteWithNumber: (int)n onHost: (String*)h; + newRemoteWithNumber: (int)n onHost: (id <String>)h;
- (sockport_t) sockPort; - (sockport_t) sockPort;

View file

@ -26,14 +26,14 @@
#include <objects/stdobjects.h> #include <objects/stdobjects.h>
@class String; /* protocol String; */
@protocol ValueGetting @protocol ValueGetting
- (int) intValue; - (int) intValue;
- (float) floatValue; - (float) floatValue;
- (double) doubleValue; - (double) doubleValue;
- (const char *) cStringValue; - (const char *) cStringValue;
- (String *) stringValue; - /* (id <String>) */ stringValue;
@end @end
@protocol ValueSetting @protocol ValueSetting
@ -41,7 +41,7 @@
- (void) setFloatValue: (float)aFloat; - (void) setFloatValue: (float)aFloat;
- (void) setDoubleValue: (double)aDouble; - (void) setDoubleValue: (double)aDouble;
- (void) setCStringValue: (const char *)aCString; - (void) setCStringValue: (const char *)aCString;
- (void) setStringValue: (String*)aString; - (void) setStringValue: /* (id <String>) */ aString;
@end @end
@protocol ValueHolding <ValueGetting, ValueSetting> @protocol ValueHolding <ValueGetting, ValueSetting>

View file

@ -61,10 +61,10 @@
@class String; @class String;
/* The following five lines are maintained by the libobjects Makefile */ /* The following five lines are maintained by the libobjects Makefile */
#define OBJECTS_VERSION 0.1.5 #define OBJECTS_VERSION 0.1.6
#define OBJECTS_MAJOR_VERSION 0 #define OBJECTS_MAJOR_VERSION 0
#define OBJECTS_MINOR_VERSION 1 #define OBJECTS_MINOR_VERSION 1
#define OBJECTS_SUBMINOR_VERSION 5 #define OBJECTS_SUBMINOR_VERSION 6
#define OBJECTS_GCC_VERSION 2.6.3 #define OBJECTS_GCC_VERSION 2.6.3
extern const char objects_version[]; extern const char objects_version[];

View file

@ -61,10 +61,10 @@
@class String; @class String;
/* The following five lines are maintained by the libobjects Makefile */ /* The following five lines are maintained by the libobjects Makefile */
#define OBJECTS_VERSION 0.1.5 #define OBJECTS_VERSION 0.1.6
#define OBJECTS_MAJOR_VERSION 0 #define OBJECTS_MAJOR_VERSION 0
#define OBJECTS_MINOR_VERSION 1 #define OBJECTS_MINOR_VERSION 1
#define OBJECTS_SUBMINOR_VERSION 5 #define OBJECTS_SUBMINOR_VERSION 6
#define OBJECTS_GCC_VERSION 2.6.3 #define OBJECTS_GCC_VERSION 2.6.3
extern const char objects_version[]; extern const char objects_version[];

View file

@ -34,6 +34,7 @@
#include <objects/RetainingNotifier.h> #include <objects/RetainingNotifier.h>
#include <objects/Collecting.h> #include <objects/Collecting.h>
#include <objects/Dictionary.h> #include <objects/Dictionary.h>
#include <objects/NSString.h>
@class Proxy; @class Proxy;
@class Port; @class Port;
@ -76,7 +77,7 @@
or registered for invalidation notification */ or registered for invalidation notification */
+ (Connection*) newWithRootObject: anObj; + (Connection*) newWithRootObject: anObj;
+ (Connection*) newRegisteringAtName: (String*)n withRootObject: anObj; + (Connection*) newRegisteringAtName: (id <String>)n withRootObject: anObj;
/* Registering your server object on the network. /* Registering your server object on the network.
These methods create a new connection object that must be "run" in order These methods create a new connection object that must be "run" in order
to start handling requests from clients. to start handling requests from clients.
@ -89,8 +90,8 @@
it's unclear if we're connecting to another Connection that already it's unclear if we're connecting to another Connection that already
registered with that name. */ registered with that name. */
+ (Proxy*) rootProxyAtName: (String*)name onHost: (String*)host; + (Proxy*) rootProxyAtName: (id <String>)name onHost: (id <String>)host;
+ (Proxy*) rootProxyAtName: (String*)name; + (Proxy*) rootProxyAtName: (id <String>)name;
+ (Proxy*) rootProxyAtPort: (Port*)anOutPort; + (Proxy*) rootProxyAtPort: (Port*)anOutPort;
+ (Proxy*) rootProxyAtPort: (Port*)anOutPort withInPort: (Port*)anInPort; + (Proxy*) rootProxyAtPort: (Port*)anOutPort withInPort: (Port*)anInPort;
/* Get a proxy to a remote server object. /* Get a proxy to a remote server object.

View file

@ -69,7 +69,7 @@
@end @end
@interface TclInvocation @interface TclInvocation
- initWithTcl: (Tcl*)t command: (String*)c; - initWithTcl: (Tcl*)t command: (id <String>)c;
@end @end
@interface Collection (Invokes) @interface Collection (Invokes)

View file

@ -27,14 +27,15 @@
#include <objects/stdobjects.h> #include <objects/stdobjects.h>
#include <objects/RetainingNotifier.h> #include <objects/RetainingNotifier.h>
#include <objects/Coding.h> #include <objects/Coding.h>
#include <objects/NSString.h>
@class Connection; @class Connection;
@interface Port : RetainingNotifier <Coding> @interface Port : RetainingNotifier <Coding>
/* xxx These will probably change */ /* xxx These will probably change */
+ newRegisteredPortWithName: (String*)n; + newRegisteredPortWithName: (id <String>)n;
+ newPortFromRegisterWithName: (String*)n onHost: (String*)host; + newPortFromRegisterWithName: (id <String>)n onHost: (id <String>)host;
+ newPort; + newPort;
/* xxx These sending and receiving interfaces will change */ /* xxx These sending and receiving interfaces will change */

View file

@ -45,7 +45,7 @@ typedef struct sockaddr_in sockport_t;
+ newForSockPort: (sockport_t)s; + newForSockPort: (sockport_t)s;
+ newLocalWithNumber: (int)n; + newLocalWithNumber: (int)n;
+ newLocal; + newLocal;
+ newRemoteWithNumber: (int)n onHost: (String*)h; + newRemoteWithNumber: (int)n onHost: (id <String>)h;
- (sockport_t) sockPort; - (sockport_t) sockPort;

View file

@ -26,14 +26,14 @@
#include <objects/stdobjects.h> #include <objects/stdobjects.h>
@class String; /* protocol String; */
@protocol ValueGetting @protocol ValueGetting
- (int) intValue; - (int) intValue;
- (float) floatValue; - (float) floatValue;
- (double) doubleValue; - (double) doubleValue;
- (const char *) cStringValue; - (const char *) cStringValue;
- (String *) stringValue; - /* (id <String>) */ stringValue;
@end @end
@protocol ValueSetting @protocol ValueSetting
@ -41,7 +41,7 @@
- (void) setFloatValue: (float)aFloat; - (void) setFloatValue: (float)aFloat;
- (void) setDoubleValue: (double)aDouble; - (void) setDoubleValue: (double)aDouble;
- (void) setCStringValue: (const char *)aCString; - (void) setCStringValue: (const char *)aCString;
- (void) setStringValue: (String*)aString; - (void) setStringValue: /* (id <String>) */ aString;
@end @end
@protocol ValueHolding <ValueGetting, ValueSetting> @protocol ValueHolding <ValueGetting, ValueSetting>

View file

@ -61,10 +61,10 @@
@class String; @class String;
/* The following five lines are maintained by the libobjects Makefile */ /* The following five lines are maintained by the libobjects Makefile */
#define OBJECTS_VERSION 0.1.5 #define OBJECTS_VERSION 0.1.6
#define OBJECTS_MAJOR_VERSION 0 #define OBJECTS_MAJOR_VERSION 0
#define OBJECTS_MINOR_VERSION 1 #define OBJECTS_MINOR_VERSION 1
#define OBJECTS_SUBMINOR_VERSION 5 #define OBJECTS_SUBMINOR_VERSION 6
#define OBJECTS_GCC_VERSION 2.6.3 #define OBJECTS_GCC_VERSION 2.6.3
extern const char objects_version[]; extern const char objects_version[];