CVS wrapper -- version: 1.57
? myp
? mypatch
Index: client.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/client.hxx,v
retrieving revision 1.3
diff -u -r1.3 client.hxx
--- client.hxx	31 Jul 2001 08:13:19 -0000	1.3
+++ client.hxx	8 Nov 2002 10:09:25 -0000
@@ -157,12 +157,12 @@
 
 class SvEmbeddedClient : public SvObject
 {
-friend ImpClientSite;
-friend ImpAdviseSink;
-friend SvEmbeddedObject;
-friend SvInPlaceClient;
-friend SvEditObjectProtocol;
-friend ImplSvEditObjectProtocol;
+friend class ImpClientSite;
+friend class ImpAdviseSink;
+friend class SvEmbeddedObject;
+friend class SvInPlaceClient;
+friend class SvEditObjectProtocol;
+friend class ImplSvEditObjectProtocol;
 
 	SvClientData *  	pData;		// Wird auch in SvInPlaceClient modifiziert
 	SvEmbeddedClient *	pParent;
Index: embobj.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/embobj.hxx,v
retrieving revision 1.11
diff -u -r1.11 embobj.hxx
--- embobj.hxx	31 Jul 2001 08:13:19 -0000	1.11
+++ embobj.hxx	8 Nov 2002 10:09:25 -0000
@@ -103,11 +103,11 @@
 class SvEmbeddedObject : virtual public SvPersist,
 						 public SvPseudoObject
 {
-friend ImpOleObject;
-friend SvEmbeddedClient;
-friend SvEditObjectProtocol;
-friend ImplSvEditObjectProtocol;
-friend SvPersist; // nur wegen Sun-C40 Compiler
+friend class ImpOleObject;
+friend class SvEmbeddedClient;
+friend class SvEditObjectProtocol;
+friend class ImplSvEditObjectProtocol;
+friend class SvPersist; // nur wegen Sun-C40 Compiler
 friend class SwWW6WrGrf; // SH benoetigt MakeMetafile
 	BOOL                    bAutoSave:1,   // TRUE, bei DoOpen( FALSE ), Save
 							bAutoHatch:1;  // TRUE, bei Embed automatisch Hatch zeichnen
Index: factory.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/factory.hxx,v
retrieving revision 1.6
diff -u -r1.6 factory.hxx
--- factory.hxx	15 Aug 2001 12:45:41 -0000	1.6
+++ factory.hxx	8 Nov 2002 10:09:25 -0000
@@ -115,7 +115,7 @@
 	Objekt bekommt man durch <SvObject::GetSvFactory>.
 */
 {
-friend ImpFactory;
+friend class ImpFactory;
 friend class SvFactory_Impl;
 	SvFactory_Impl *	pImp;
 	ULONG               nRegisterId;
Index: iface.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/iface.hxx,v
retrieving revision 1.3
diff -u -r1.3 iface.hxx
--- iface.hxx	31 Jul 2001 08:13:19 -0000	1.3
+++ iface.hxx	8 Nov 2002 10:09:25 -0000
@@ -255,9 +255,9 @@
 
 class SvObject : virtual public SotObject
 {
-friend IUnknown;
-friend SvSoIPCService;
-friend SvSoIPCClient;
+friend struct IUnknown;
+friend class SvSoIPCService;
+friend class SvSoIPCClient;
 friend class SvFactory;
 	union
 	{
@@ -325,8 +325,8 @@
 
 */
 {
-friend ImpFactory;
-friend SvFactory;
+friend class ImpFactory;
+friend class SvFactory;
 	IClassFactory * pObjI;
 	SvFactory *     pFact;
 public:
Index: ipclient.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/ipclient.hxx,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ipclient.hxx
--- ipclient.hxx	18 Sep 2000 16:54:25 -0000	1.1.1.1
+++ ipclient.hxx	8 Nov 2002 10:09:25 -0000
@@ -84,13 +84,13 @@
 //=========================================================================
 class SvInPlaceClient : public SvEmbeddedClient
 {
-friend ImpInPlaceSite;
-friend ImpInPlaceFrame;
-friend ImpInPlaceUIWin;
-friend SvInPlaceObject;
-friend SvEditObjectProtocol;
-friend ImplSvEditObjectProtocol;
-friend SvContainerEnvironment;
+friend class ImpInPlaceSite;
+friend class ImpInPlaceFrame;
+friend class ImpInPlaceUIWin;
+friend class SvInPlaceObject;
+friend class SvEditObjectProtocol;
+friend class ImplSvEditObjectProtocol;
+friend class SvContainerEnvironment;
 
 	IOleInPlaceSite *       pObjI;
 
Index: ipenv.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/ipenv.hxx,v
retrieving revision 1.2
diff -u -r1.2 ipenv.hxx
--- ipenv.hxx	7 Feb 2001 10:16:24 -0000	1.2
+++ ipenv.hxx	8 Nov 2002 10:09:25 -0000
@@ -90,8 +90,8 @@
 class SvAppFrame : public SvObject
 {
 friend class ImpInPlaceFrame;
-friend SvContainerEnvironment;
-friend SvInPlaceClient;
+friend class SvContainerEnvironment;
+friend class SvInPlaceClient;
 	IOleInPlaceFrame *      	pObjI;
 	SvContainerEnvironment *	pEnv;
 protected:
@@ -107,8 +107,8 @@
 class SvDocFrame : public SvObject
 {
 friend class ImpInPlaceUIWindow;
-friend SvContainerEnvironment;
-friend SvInPlaceClient;
+friend class SvContainerEnvironment;
+friend class SvInPlaceClient;
 	IOleInPlaceUIWindow *   	pObjI;
 	SvContainerEnvironment *	pEnv;
 protected:
@@ -130,8 +130,8 @@
 friend class ImpInPlaceFrame;
 friend class ImpInPlaceUIWindow;
 friend class SvInPlaceEnvironment;
-friend SvInPlaceClient;
-friend SvInPlaceObject;
+friend class SvInPlaceClient;
+friend class SvInPlaceObject;
 
 	SvInPlaceEnvironment *		pIPEnv; // IP-Env des Objektes
 	SvInPlaceClient *			pObj;	// kann auch NULL sein
@@ -262,12 +262,12 @@
 /*************************************************************************/
 class SvInPlaceEnvironment
 {
-friend SvInPlaceObject;
+friend class SvInPlaceObject;
 friend class ImpInPlaceObject;
-friend SvInPlaceClient;
-friend SvContainerEnvironment;
+friend class SvInPlaceClient;
+friend class SvContainerEnvironment;
 friend class ImpOleInPlaceActiveObject;
-friend ImplSvEditObjectProtocol;
+friend class ImplSvEditObjectProtocol;
 
 	USHORT                  nChangeRectsLockCount;
 	BOOL					bShowUITools:1,
Index: ipobj.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/ipobj.hxx,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ipobj.hxx
--- ipobj.hxx	18 Sep 2000 16:54:25 -0000	1.1.1.1
+++ ipobj.hxx	8 Nov 2002 10:09:25 -0000
@@ -88,13 +88,13 @@
 *************************************************************************/
 class SvInPlaceObject : public SvEmbeddedObject
 {
-friend ImpInPlaceObject;
-friend ImpInPlaceSite;
-friend SvInPlaceClient;
-friend ImpOleInPlaceActiveObject;
-friend SvEditObjectProtocol;
-friend ImplSvEditObjectProtocol;
-friend SvInPlaceEnvironment;
+friend class ImpInPlaceObject;
+friend class ImpInPlaceSite;
+friend class SvInPlaceClient;
+friend class ImpOleInPlaceActiveObject;
+friend class SvEditObjectProtocol;
+friend class ImplSvEditObjectProtocol;
+friend class SvInPlaceEnvironment;
 
 	IOleInPlaceObject *         pObjI;
 	IOleInPlaceActiveObject *   pActiveObj;
Index: persist.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/persist.hxx,v
retrieving revision 1.14
diff -u -r1.14 persist.hxx
--- persist.hxx	12 Sep 2002 15:05:11 -0000	1.14
+++ persist.hxx	8 Nov 2002 10:09:26 -0000
@@ -97,8 +97,8 @@
 
 */
 {
-friend ImpItemContainer;
-friend SvFactory;
+friend class ImpItemContainer;
+friend class SvFactory;
 protected:
 					~SvObjectContainer();
 public:
@@ -126,11 +126,11 @@
 
 class SvPersist : public SvObjectContainer
 {
-friend SvInfoObject;
-friend ImpPersistStorage;
-friend ImpPersistFile;
-friend ImpItemContainer;
-friend SvFactory;
+friend class SvInfoObject;
+friend class ImpPersistStorage;
+friend class ImpPersistFile;
+friend class ImpItemContainer;
+friend class SvFactory;
 	BOOL            bIsModified:1,
 					bIsInit:1,
 					bOpSave:1,
@@ -277,7 +277,7 @@
 class SvInfoObject_Impl;
 class SvInfoObject : public SvPersistBase
 {
-friend SvPersist;
+friend class SvPersist;
 	SvPersistRef    aObj;
     String          aObjName;           // object and substorage name
     String          aStorName;          // optional real storage name
Index: protocol.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/protocol.hxx,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 protocol.hxx
--- protocol.hxx	18 Sep 2000 16:54:25 -0000	1.1.1.1
+++ protocol.hxx	8 Nov 2002 10:09:26 -0000
@@ -84,7 +84,7 @@
 
 class SvEditObjectProtocol
 {
-friend SoDll;
+friend class SoDll;
 	ImplSvEditObjectProtocol * pImp;
 	static void         Imp_DeleteDefault();
 	BOOL                Release();
Index: pseudo.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/pseudo.hxx,v
retrieving revision 1.8
diff -u -r1.8 pseudo.hxx
--- pseudo.hxx	4 Sep 2001 10:21:05 -0000	1.8
+++ pseudo.hxx	8 Nov 2002 10:09:26 -0000
@@ -149,7 +149,7 @@
 	-Das Objekt anzeigen oder im Server aktivieren.
 */
 {
-friend ImpOleObject;
+friend class ImpOleObject;
 	SvVerbList *	pVerbs;          	// Liste der Verben
 	BOOL			bDeleteVerbs;		// TRUE, wenn pVerbs loeschen
 protected:
Index: so2dll.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/so2dll.hxx,v
retrieving revision 1.4
diff -u -r1.4 so2dll.hxx
--- so2dll.hxx	31 Jul 2001 08:13:19 -0000	1.4
+++ so2dll.hxx	8 Nov 2002 10:09:26 -0000
@@ -139,9 +139,9 @@
 
 class SoDll
 {
-friend ImpFactory;
+friend class ImpFactory;
 friend class SvFactory;
-friend Impl_DeathTimer;
+friend class Impl_DeathTimer;
 	UINT32          nAliveCount;
 	Link            aAliveHdl;
 	BOOL            bInit;
Index: soipc.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/soipc.hxx,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 soipc.hxx
--- soipc.hxx	18 Sep 2000 16:54:25 -0000	1.1.1.1
+++ soipc.hxx	8 Nov 2002 10:09:26 -0000
@@ -141,7 +141,7 @@
 
 class SvSoIPCService : public SvIPCService
 {
-friend SvSoIPCServer;
+friend class SvSoIPCServer;
 	SvObject * pObj;
 protected:
 	virtual BOOL Request( ULONG nSeviceId, SvStream* pIn, SvStream* pOut );
Index: svstor.hxx
===================================================================
RCS file: /cvs/oi/so3/inc/svstor.hxx,v
retrieving revision 1.6
diff -u -r1.6 svstor.hxx
--- svstor.hxx	21 Mar 2001 13:58:13 -0000	1.6
+++ svstor.hxx	8 Nov 2002 10:09:26 -0000
@@ -75,7 +75,7 @@
 class StorageStream;
 class SvStorageStream : virtual public SvObject, public SotStorageStream
 {
-friend SvStorage;
+friend class SvStorage;
 friend class ImpStream;
 	void *   pObjI;      // Zeiger auf das Speichermedium
 	void  *  pRelease;   // OLE-Spec, wenn Erzeuger zerstoert
@@ -118,8 +118,8 @@
 class  Storage;
 class SvStorage : virtual public SvObject, public SotStorage
 {
-friend SvStorageStream;
-friend ImpPersistFile;
+friend class SvStorageStream;
+friend class ImpPersistFile;
 	void	 *  pRelease;  // OLE-Spec, wenn Erzeuger zerstoert
 	void *		pObjI;     // Zeiger auf das Speichermedium
 protected: