summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/basobj.hxx7
-rw-r--r--idl/inc/bastype.hxx15
-rw-r--r--idl/inc/char.hxx1
-rw-r--r--idl/inc/command.hxx3
-rw-r--r--idl/inc/database.hxx10
-rw-r--r--idl/inc/hash.hxx7
-rw-r--r--idl/inc/lex.hxx27
-rw-r--r--idl/inc/module.hxx3
-rw-r--r--idl/inc/object.hxx13
-rw-r--r--idl/inc/slot.hxx13
-rw-r--r--idl/inc/types.hxx21
11 files changed, 24 insertions, 96 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index f029b71b4cc8..2db45be5f523 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -59,7 +59,6 @@ enum
};
typedef int WriteAttribute;
-/******************** Meta Factory **************************************/
#define SV_DECL_META_FACTORY( Class, CLASS_ID ) \
SV_DECL_PERSIST( Class, CLASS_ID )
@@ -74,7 +73,6 @@ typedef int WriteAttribute;
#define SV_IMPL_META_FACTORY1( Class, Super1 ) \
SV_IMPL_PERSIST1( Class, Super1 )
-/******************** class SvMetaObject ********************************/
class SvMetaObject : public SvPersistBase
{
public:
@@ -128,7 +126,6 @@ public:
}
};
-/******************** class SvMetaName **********************************/
class SvMetaName : public SvMetaObject
{
SvString aName;
@@ -180,7 +177,6 @@ SV_DECL_IMPL_REF(SvMetaName)
SV_DECL_IMPL_PERSIST_LIST(SvMetaName,SvMetaName *)
-/******************** class SvMetaReference *****************************/
SV_DECL_REF(SvMetaReference)
class SvMetaReference : public SvMetaName
{
@@ -229,11 +225,10 @@ SV_IMPL_REF(SvMetaReference)
SV_DECL_IMPL_PERSIST_LIST(SvMetaReference,SvMetaReference *)
-/******************** class SvMetaExtern *********************************/
class SvMetaModule;
class SvMetaExtern : public SvMetaReference
{
- SvMetaModule * pModule; // in welchem Modul enthalten
+ SvMetaModule * pModule; // included in which module
SvUUId aUUId;
SvVersion aVersion;
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index bc9c8867377e..79290a46c39b 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -40,7 +40,6 @@ class SvStringHashEntry;
class SvIdlDataBase;
class SvTokenStream;
-/******************** class SvUINT32 **********************************/
class SvUINT32
{
UINT32 nVal;
@@ -61,7 +60,6 @@ public:
};
-/******************** class SvINT16 **********************************/
class SvINT16
{
short nVal;
@@ -79,7 +77,6 @@ public:
};
-/******************** class SvUINT16 **********************************/
class SvUINT16
{
USHORT nVal;
@@ -97,7 +94,6 @@ public:
};
-/******************** class SvINT32 **********************************/
class SvINT32
{
INT32 nVal;
@@ -115,7 +111,6 @@ public:
};
-/******************** class Svint **********************************/
class Svint
{
int nVal;
@@ -136,7 +131,6 @@ public:
};
-/******************** class SvBOOL **********************************/
class SvBOOL
{
BOOL nVal:1,
@@ -165,7 +159,6 @@ public:
};
-/******************** class SvIdentifier **********************************/
class SvIdentifier : public ByteString
{
public:
@@ -184,11 +177,10 @@ public:
};
-/******************** class SvIdentifier **********************************/
class SvNumberIdentifier : public SvIdentifier
{
UINT32 nValue;
- // darf nicht benutzt werden
+ // must not be used
BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
public:
SvNumberIdentifier() : nValue( 0 ) {};
@@ -209,7 +201,6 @@ public:
};
-/******************** class SvString **********************************/
class SvString : public ByteString
{
public:
@@ -228,7 +219,6 @@ public:
};
-/******************** class SvHelpText **********************************/
class SvHelpText : public SvString
{
public:
@@ -241,12 +231,10 @@ public:
};
-/******************** class SvHelpContext *******************************/
class SvHelpContext : public SvNumberIdentifier
{
};
-/******************** class SvUUId *************************************/
class SvUUId : public SvGlobalName
{
public:
@@ -258,7 +246,6 @@ public:
};
-/******************** class SvVersion **********************************/
class SvVersion
{
USHORT nMajorVersion;
diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx
index f27eb1028965..0c0528d08a98 100644
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
@@ -31,7 +31,6 @@
#include <tools/string.hxx>
-/******************* T y p e s *******************************************/
class SvChar
{
public:
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 8332569453c7..2882ba07a226 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -29,8 +29,6 @@
#ifndef _COMMAND_HXX
#define _COMMAND_HXX
-
-#include <tools/list.hxx>
#include <tools/string.hxx>
#include <vector>
@@ -41,7 +39,6 @@ typedef ::std::vector< String* > StringList;
typedef ::std::vector< ByteString* > ByteStringList;
-/******************** class SvCommand ************************************/
class SvCommand
{
public:
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 1127ed60b7e5..8d28bb0ce349 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -34,13 +34,10 @@
#include <lex.hxx>
#include <tools/pstm.hxx>
-/*************************************************************************
-*************************************************************************/
-
class SvCommand;
#ifdef IDL_COMPILER
-/******************** class SvIdlError ***********************************/
+
class SvIdlError
{
ByteString aText;
@@ -64,7 +61,6 @@ public:
};
#endif
-/******************** class SvIdlDataBase ********************************/
class SvIdlDataBase
{
BOOL bExport;
@@ -82,7 +78,7 @@ class SvIdlDataBase
SvMetaClassMemberList aClassList;
SvMetaModuleMemberList aModuleList;
SvMetaAttributeMemberList aAttrList;
- SvMetaTypeMemberList aTmpTypeList; // nicht Persistent
+ SvMetaTypeMemberList aTmpTypeList; // not persistent
protected:
#ifdef IDL_COMPILER
@@ -111,7 +107,7 @@ public:
SvMetaModuleMemberList & GetModuleList() { return aModuleList; }
SvMetaModule * GetModule( const ByteString & rName );
- // Liste der benutzten Typen beim Schreiben
+ // list of used types while writing
SvMetaTypeMemberList aUsedTypes;
ByteString aIFaceName;
SvNumberIdentifier aStructSlotId;
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 8f13536265ce..41ee6db65c65 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -33,13 +33,12 @@
#include <tools/string.hxx>
#include <vector>
-/****************** H a s h - T a b l e **********************************/
class SvHashTable
{
UINT32 nMax; // size of hash-tabel
UINT32 nFill; // elements in hash-tabel
- UINT32 lAsk; // Anzahl der Anfragen
- UINT32 lTry; // Anzahl der Versuche
+ UINT32 lAsk; // number of requests
+ UINT32 lTry; // number of tries
protected:
BOOL Test_Insert( const void *, BOOL bInsert, UINT32 * pInsertPos );
@@ -56,7 +55,6 @@ public:
virtual BOOL IsEntry( UINT32 ) const = 0;
};
-/************** S t r i n g H a s h T a b l e E n t r y ******************/
class SvStringHashTable;
class SvStringHashEntry : public SvRefBase
{
@@ -97,7 +95,6 @@ public:
SV_DECL_IMPL_REF(SvStringHashEntry)
-/****************** S t r i n g H a s h T a b l e ************************/
typedef ::std::vector< SvStringHashEntry* > SvStringHashList;
class SvStringHashTable : public SvHashTable
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index a2553e063316..749d109bbf95 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -32,15 +32,14 @@
#include <hash.hxx>
#include <tools/gen.hxx>
#include <tools/stream.hxx>
+#include <tools/list.hxx>
-/******************** enum ***********************************************/
enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT,
SVTOKEN_INTEGER, SVTOKEN_STRING,
SVTOKEN_BOOL, SVTOKEN_IDENTIFIER,
SVTOKEN_CHAR, SVTOKEN_RTTIBASE,
SVTOKEN_EOF, SVTOKEN_HASHID };
-/******************** class SvToken **************************************/
class BigInt;
class SvToken
{
@@ -53,7 +52,6 @@ friend class SvTokenStream;
ULONG nLong;
BOOL bBool;
char cChar;
-// SvRttiBase * pComplexObj;
SvStringHashEntry * pHash;
};
public:
@@ -63,7 +61,6 @@ public:
SvToken( SVTOKEN_ENUM nTypeP, BOOL b );
SvToken( char c );
SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
-// SvToken( SvRttiBase * pComplexObj );
SvToken( SVTOKEN_ENUM nTypeP );
SvToken & operator = ( const SvToken & rObj );
@@ -102,7 +99,6 @@ public:
ULONG GetNumber() const { return nLong; }
BOOL GetBool() const { return bBool; }
char GetChar() const { return cChar; }
-// SvRttiBase *GetObject() const { return pComplexObj; }
void SetHash( SvStringHashEntry * pHashP )
{ pHash = pHashP; nType = SVTOKEN_HASHID; }
@@ -128,26 +124,19 @@ inline SvToken::SvToken( char c )
inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr )
: nType( nTypeP ), aString( rStr ) {}
-/*
-inline SvToken::SvToken( SvRttiBase * pObj )
- : nType( SVTOKEN_RTTIBASE ), pComplexObj( pObj )
- { pObj->AddRef(); }
-*/
-
inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
: nType( nTypeP ) {}
DECLARE_LIST( SvTokenList, SvToken * )
-/******************** class SvTokenStream ********************************/
class SvTokenStream
{
ULONG nLine, nColumn;
int nBufPos;
- int c; // naechstes Zeichen
+ int c; // next character
CharSet nCharSet;
- char * pCharTab; // Zeiger auf die Konverierungstabelle
- USHORT nTabSize; // Tabulator Laenge
+ char * pCharTab; // pointer to conversion table
+ USHORT nTabSize; // length of tabulator
ByteString aStrTrue;
ByteString aStrFalse;
ULONG nMaxPos;
@@ -179,7 +168,7 @@ class SvTokenStream
}
void CalcColumn()
{
- // wenn Zeilenende berechnung sparen
+ // if end of line spare calculation
if( 0 != c )
{
USHORT n = 0;
@@ -207,7 +196,7 @@ public:
{
SvToken * pRetToken = pCurToken;
if( NULL == (pCurToken = aTokList.Prev()) )
- // Current Zeiger nie Null
+ // current pointer never null
pCurToken = pRetToken;
return pRetToken;
@@ -216,14 +205,14 @@ public:
{
SvToken * pRetToken = pCurToken;
if( NULL == (pCurToken = aTokList.Next()) )
- // Current Zeiger nie Null
+ // current pointer never null
pCurToken = pRetToken;
SetMax();
return pRetToken;
}
SvToken * GetToken_Next()
{
- // Kommentare werden initial entfernt
+ // comments get removed initially
return GetToken_NextAll();
}
SvToken * GetToken() const { return pCurToken; }
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 1bea395d41be..5d206e0f4794 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -41,13 +41,12 @@ struct SvNamePos
, nStmPos( nPos ) {}
};
-/******************** class SvMetaModule *********************************/
class SvMetaModule : public SvMetaExtern
{
SvMetaClassMemberList aClassList;
SvMetaTypeMemberList aTypeList;
SvMetaAttributeMemberList aAttrList;
-// Browser
+// browser
String aIdlFileName;
SvString aHelpFileName;
SvString aSlotIdFile;
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index ee8d88a2c418..417885184dfb 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -33,6 +33,7 @@
#include <types.hxx>
#include <slot.hxx>
#include <vector>
+#include <tools/list.hxx>
struct SvSlotElement
{
@@ -48,15 +49,6 @@ DECLARE_LIST( SvSlotElementList, SvSlotElement* )
class SvMetaClass;
typedef ::std::vector< SvMetaClass* > SvMetaClassList;
-class SvULongs : public List
-{
-public:
- void Insert( ULONG& rId, ULONG nPos ) { ULONG nId(rId ); List::Insert( (void*) nId, nPos ); }
- void Remove( ULONG& rId ){ ULONG nId(rId ); List::Remove( (void*) nId ); }
- ULONG GetObject( ULONG nPos ){ return (ULONG) List::GetObject( nPos ); }
-};
-
-/******************** class SvClassElement *******************************/
SV_DECL_REF(SvMetaClass)
class SvClassElement : public SvPersistBase
{
@@ -86,7 +78,6 @@ public:
SV_DECL_IMPL_REF(SvClassElement)
SV_DECL_IMPL_PERSIST_LIST(SvClassElement,SvClassElement *)
-/******************** class SvMetaClass *********************************/
class SvMetaModule;
SV_DECL_PERSIST_LIST(SvMetaClass,SvMetaClass *)
class SvMetaClass : public SvMetaType
@@ -112,7 +103,7 @@ class SvMetaClass : public SvMetaType
SvIdlDataBase & rBase,
SvStream & rOutStm );
- void InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
+ void InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSuperList,
SvMetaClassList & rClassList,
const ByteString & rPrefix, SvIdlDataBase& rBase );
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index d185b8acfbea..bc8832a60f0b 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -32,8 +32,6 @@
#include <types.hxx>
#include <command.hxx>
-/******************** class SvMetaSlot **********************************/
-//class SbxObject;
class SvMetaSlotMemberList;
class SvMetaSlot : public SvMetaAttribute
{
@@ -49,15 +47,15 @@ class SvMetaSlot : public SvMetaAttribute
SvBOOL aGet;
SvBOOL aSet;
- SvBOOL aCachable; // exclusiv
+ SvBOOL aCachable; // exclusive
SvBOOL aVolatile;
SvBOOL aToggle;
SvBOOL aAutoUpdate;
- SvBOOL aSynchron; // exclusiv
+ SvBOOL aSynchron; // exclusive
SvBOOL aAsynchron;
- SvBOOL aRecordPerItem;// exclusiv
+ SvBOOL aRecordPerItem;// exclusive
SvBOOL aRecordPerSet;
SvBOOL aRecordManual;
SvBOOL aNoRecord;
@@ -202,10 +200,6 @@ public:
const ByteString & GetDefault() const;
const ByteString & GetDisableFlags() const;
BOOL GetPseudoSlots() const;
- /*
- BOOL GetGet() const;
- BOOL GetSet() const;
- */
BOOL GetCachable() const;
BOOL GetVolatile() const;
BOOL GetToggle() const;
@@ -242,7 +236,6 @@ public:
void ResetSlotPointer()
{ pNextSlot = pLinkedSlot = 0; }
-// void FillSbxObject( SvIdlDataBase & rBase, SbxObject *, BOOL bProp );
#ifdef IDL_COMPILER
SvMetaEnumValue* GetEnumValue() const
{ return pEnumValue; }
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index d4539ae47c70..46882af1f85e 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -35,7 +35,6 @@
class SvSlotElementList;
struct SvSlotElement;
-/******************** class SvMetaAttribute *****************************/
SV_DECL_REF(SvMetaType)
SV_DECL_REF(SvMetaAttribute)
SV_DECL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
@@ -105,8 +104,6 @@ public:
virtual BOOL IsVariable() const;
virtual ByteString GetMangleName( BOOL bVariable ) const;
-// void FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags = 0 );
-// virtual void FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, BOOL bVariable );
#ifdef IDL_COMPILER
virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -135,14 +132,13 @@ SV_IMPL_REF(SvMetaAttribute)
SV_IMPL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
-/******************** class SvType *********************************/
enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE };
enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION,
TYPE_CLASS, TYPE_POINTER };
class SvMetaType : public SvMetaExtern
{
- SvBOOL aIn; // Eingangsparameter
- SvBOOL aOut; // Returnparameter
+ SvBOOL aIn; // input parameter
+ SvBOOL aOut; // return parameter
Svint aCall0, aCall1;
Svint aSbxDataType;
SvIdentifier aSvName;
@@ -186,7 +182,7 @@ public:
SvMetaType( const ByteString & rTypeName, const ByteString & rSbxName,
const ByteString & rOdlName, char cParserChar,
const ByteString & rCName, const ByteString & rBasicName,
- const ByteString & rBasicPostfix/*, SbxDataType nT = SbxEMPTY */);
+ const ByteString & rBasicPostfix );
SvMetaAttributeMemberList & GetAttrList() const;
ULONG GetAttrCount() const
@@ -205,10 +201,6 @@ public:
BOOL IsItem() const { return bIsItem; }
BOOL IsShell() const { return bIsShell; }
-// void SetSbxDataType( SbxDataType nT )
-// { aSbxDataType = (int)nT; }
-// SbxDataType GetSbxDataType() const;
-
void SetIn( BOOL b ) { aIn = b; }
BOOL GetIn() const;
@@ -234,7 +226,6 @@ public:
virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
-// void FillSbxObject( SbxVariable * pObj, BOOL bVariable );
#ifdef IDL_COMPILER
virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -249,7 +240,6 @@ public:
ULONG MakeSfx( ByteString * pAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
- //BOOL ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm );
BOOL ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
@@ -261,11 +251,9 @@ public:
#endif
};
SV_IMPL_REF(SvMetaType)
-DECLARE_LIST(SvMetaTypeList,SvMetaType *)
SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *)
-/******************** class SvTypeString *********************************/
class SvMetaTypeString : public SvMetaType
{
public:
@@ -276,7 +264,6 @@ SV_DECL_IMPL_REF(SvMetaTypeString)
SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeString,SvMetaTypeString *)
-/******************** class SvMetaEnumValue **********************************/
class SvMetaEnumValue : public SvMetaName
{
ByteString aEnumValue;
@@ -295,7 +282,6 @@ SV_DECL_IMPL_REF(SvMetaEnumValue)
SV_DECL_IMPL_PERSIST_LIST(SvMetaEnumValue,SvMetaEnumValue *)
-/******************** class SvTypeEnum *********************************/
class SvMetaTypeEnum : public SvMetaType
{
SvMetaEnumValueMemberList aEnumValueList;
@@ -331,7 +317,6 @@ SV_DECL_IMPL_REF(SvMetaTypeEnum)
SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeEnum,SvMetaTypeEnum *)
-/******************** class SvTypeVoid ***********************************/
class SvMetaTypevoid : public SvMetaType
{
public:
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 15:03:17 +0000