remove vos dependencies

rdbmaker/inc/codemaker/dependency.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dependency.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,11 +122,11 @@ struct LessTypeUsing
     }
 };
 
-typedef NAMESPACE_STD(set) <TypeUsing, LessTypeUsing> TypeUsingSet;
+typedef ::std::set< TypeUsing, LessTypeUsing > TypeUsingSet;
 
 
 #if (defined( _MSC_VER ) && ( _MSC_VER < 1200 ))
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString,
     TypeUsingSet,
@@ -135,7 +135,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > DependencyMap;
 
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString,
     sal_uInt16,
@@ -144,7 +144,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > GenerationMap;
 #else
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString,
     TypeUsingSet,
@@ -152,7 +152,7 @@ typedef NAMESPACE_STD(hash_map)
     EqualString
 > DependencyMap;
 
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString,
     sal_uInt16,

rdbmaker/inc/codemaker/global.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: global.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,21 +62,16 @@
 #ifndef _CODEMAKER_GLOBAL_HXX_
 #define _CODEMAKER_GLOBAL_HXX_
 
-#include    <list>
-#include    <vector>
-#include    <set>
+#include <list>
+#include <vector>
+#include <set>
 
-#include    <fstream.h>
+#include <fstream.h>
 
 #ifndef _RTL_USTRING_HXX_
-#include    <rtl/ustring.hxx>
+#include <rtl/ustring.hxx>
 #endif
 
-#ifndef _VOS_MACROS_HXX_
-#include    <vos/macros.hxx>
-#endif
-
-
 struct EqualString
 {
     sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
@@ -102,13 +97,13 @@ struct LessString
 };
 
 #if defined(_MSC_VER) &&  _MSC_VER < 1200
-typedef NAMESPACE_STD(new_alloc) NewAlloc;
+typedef ::std::new_alloc NewAlloc;
 #endif
 
 
-typedef NAMESPACE_STD(list) < ::rtl::OString >              StringList;
-typedef NAMESPACE_STD(vector)< ::rtl::OString >             StringVector;
-typedef NAMESPACE_STD(set) < ::rtl::OString, LessString >   StringSet;
+typedef ::std::list< ::rtl::OString >               StringList;
+typedef ::std::vector< ::rtl::OString >             StringVector;
+typedef ::std::set< ::rtl::OString, LessString >    StringSet;
 
 ::rtl::OString makeTempName(sal_Char* prefix);
 

rdbmaker/inc/codemaker/options.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: options.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,7 @@
 #endif
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString,
     ::rtl::OString,
@@ -78,7 +78,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > OptionMap;
 #else
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString,
     ::rtl::OString,

rdbmaker/inc/codemaker/typemanager.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typemanager.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,10 +71,10 @@
 RegistryTypeReaderLoader & getRegistryTypeReaderLoader();
 
 
-typedef NAMESPACE_STD(list) <Registry*>     RegistryList;
+typedef ::std::list< Registry* >    RegistryList;
 
 #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
-typedef NAMESPACE_STD(__hash_map__)
+typedef ::std::__hash_map__
 <
     ::rtl::OString, // Typename
     RTTypeClass,    // TypeClass
@@ -83,7 +83,7 @@ typedef NAMESPACE_STD(__hash_map__)
     NewAlloc
 > T2TypeClassMap;
 #else
-typedef NAMESPACE_STD(hash_map)
+typedef ::std::hash_map
 <
     ::rtl::OString, // Typename
     RTTypeClass,    // TypeClass

rdbmaker/source/codemaker/global.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: global.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-06 17:46:57 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,14 +58,14 @@
  *
  *
  ************************************************************************/
-#ifndef     _VOS_PROCESS_HXX_
-#include    <vos/process.hxx>
+#ifndef _OSL_PROCESS_H_
+#include <osl/process.h>
 #endif
-#ifndef     _RTL_OSTRINGBUFFER_HXX_
-#include    <rtl/strbuf.hxx>
+#ifndef _RTL_OSTRINGBUFFER_HXX_
+#include <rtl/strbuf.hxx>
 #endif
-#ifndef     _RTL_USTRING_HXX_
-#include    <rtl/ustring.hxx>
+#ifndef _RTL_USTRING_HXX_
+#include <rtl/ustring.hxx>
 #endif
 
 #include <stdlib.h>
@@ -86,7 +86,6 @@
 #include    <codemaker/global.hxx>
 #endif
 
-using namespace vos;
 using namespace rtl;
 
 OString makeTempName(sal_Char* prefix)
@@ -103,13 +102,11 @@ OString makeTempName(sal_Char* prefix)
     if (prefix)
         pPrefix = prefix;
 
-    OStartupInfo StartupInfo;
-
-    if (StartupInfo.getEnvironment(uTMP, uPattern) != OStartupInfo::E_None)
+    if ( osl_getEnvironment(uTMP.pData, &uPattern.pData) != osl_Process_E_None )
     {
-        if (StartupInfo.getEnvironment(uTEMP, uPattern) != OStartupInfo::E_None)
+        if ( osl_getEnvironment(uTEMP.pData, &uPattern.pData) != osl_Process_E_None )
         {
-#if defined(WIN32) || defined(WNT) || defined(OS2)
+#if defined(SAL_W32) || defined(SAL_OS2)
             strcpy(tmpPattern, ".");
 #else
             strcpy(tmpPattern, "/tmp");

rdbmaker/source/rdbmaker/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-02 07:16:21 $
+#   last change: $Author: jsc $ $Date: 2001-03-13 12:45:16 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -110,7 +110,7 @@ APP1OBJS=   $(OBJ)$/rdbmaker.obj	\
 
 APP1STDLIBS=\
             $(SALLIB) \
-            $(VOSLIB) \
+            $(SALHELPERLIB) \
             $(REGLIB) \
             $(CPPULIB) \
             $(CPPUHELPERLIB) \

rdbmaker/source/rdbmaker/rdbmaker.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rdbmaker.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,10 +64,9 @@
 #ifndef _OSL_FILE_HXX_
 #include <osl/file.hxx>
 #endif
-#ifndef _VOS_PROCESS_HXX_
-#include <vos/process.hxx>
+#ifndef _OSL_PROCESS_H_
+#include <osl/process.h>
 #endif
-
 #ifndef _CODEMAKER_TYPEMANAGER_HXX_
 #include <codemaker/typemanager.hxx>
 #endif
@@ -75,8 +74,8 @@
 #include <codemaker/dependency.hxx>
 #endif
 
-#ifndef     _RTL_OSTRINGBUFFER_HXX_
-#include    <rtl/strbuf.hxx>
+#ifndef _RTL_OSTRINGBUFFER_HXX_
+#include <rtl/strbuf.hxx>
 #endif
 
 #if defined(SAL_W32) || defined(SAL_OS2)
@@ -100,7 +99,6 @@
 
 using namespace rtl;
 using namespace osl;
-using namespace vos;
 
 FileStream          listFile;
 RegistryKey         rootKey;
@@ -115,7 +113,7 @@ OString getFullNameOfApplicatRdb()
 {
     OUString bootReg;
     OUString uTmpStr;
-    if( OStartupInfo::E_None == OStartupInfo().getExecutableFile(uTmpStr) )
+    if( osl_getExecutableFile(&uTmpStr.pData) == osl_Process_E_None )
     {
         sal_uInt32  lastIndex = uTmpStr.lastIndexOf(PATH_DELEMITTER);
         OUString    tmpReg;

rdbmaker/source/rdbmaker/typeblop.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typeblop.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:08 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:45:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -245,16 +245,16 @@ void writeMethodData( RegistryTypeWriter& rWriter, sal_uInt32 inheritedMmeberCou
 
     Sequence< Reference< XMethodParameter > > parameters( xMethod->getParameters() );
     Sequence< Reference< XTypeDescription > > exceptions( xMethod->getExceptions() );
-    sal_uInt32 methodIndex = xMember->getPosition() - inheritedMmeberCount;
-    sal_uInt32 paramCount = parameters.getLength();
-    sal_uInt32 exceptionCount = exceptions.getLength();
+    sal_uInt16 methodIndex = (sal_uInt16)(xMember->getPosition() - inheritedMmeberCount);
+    sal_uInt16 paramCount = (sal_uInt16)parameters.getLength();
+    sal_uInt16 exceptionCount = (sal_uInt16)exceptions.getLength();
 
     rWriter.setMethodData(methodIndex, xMember->getMemberName(),
                           xMethod->getReturnType()->getName().replace('.', '/'),
                           methodMode, paramCount, exceptionCount, OUString());
 
     RTParamMode paramMode = RT_PARAM_IN;
-    for (sal_Int32 i=0; i < paramCount; i++)
+    for (sal_uInt16 i=0; i < paramCount; i++)
     {
         Reference< XMethodParameter > xParam = parameters[i];
         if ( xParam->isIn() && xParam->isOut())
@@ -270,7 +270,7 @@ void writeMethodData( RegistryTypeWriter& rWriter, sal_uInt32 inheritedMmeberCou
             paramMode = RT_PARAM_OUT;
         }
 
-        rWriter.setParamData(methodIndex, xParam->getPosition(), xParam->getType()->getName().replace('.', '/'),
+        rWriter.setParamData(methodIndex, (sal_uInt16)xParam->getPosition(), xParam->getType()->getName().replace('.', '/'),
                              xParam->getName(), paramMode);
     }
 
@@ -358,9 +358,9 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                     Reference< XInterfaceAttributeTypeDescription > xAttr;
                     Reference< XInterfaceMethodTypeDescription > xMethod;
                     Sequence< Reference< XInterfaceMemberTypeDescription > > memberTypes( xIFace->getMembers());
-                    sal_uInt32 memberCount = memberTypes.getLength();
-                    sal_uInt32 attrCount = 0;
-                    sal_uInt32 inheritedMemberCount = 0;
+                    sal_uInt16 memberCount = (sal_uInt16)memberTypes.getLength();
+                    sal_uInt16 attrCount = 0;
+                    sal_uInt16 inheritedMemberCount = 0;
 
                     for (sal_Int32 i=0; i < memberCount; i++)
                     {
@@ -376,7 +376,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                     if ( xSuperType.is() )
                     {
                         uSuperType = xSuperType->getName().replace('.','/');
-                        inheritedMemberCount = getInheritedMemberCount( xSuperType );
+                        inheritedMemberCount = (sal_uInt16)getInheritedMemberCount( xSuperType );
                     }
 
                     RegistryTypeWriter writer(rtwLoader, RT_TYPE_INTERFACE, uTypeName.replace('.', '/'),
@@ -434,7 +434,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
 
                     Sequence< OUString > memberNames( xComp->getMemberNames());
                     Sequence< Reference< XTypeDescription > > memberTypes( xComp->getMemberTypes());
-                    sal_uInt32 memberCount = memberNames.getLength();
+                    sal_uInt16 memberCount = (sal_uInt16)memberNames.getLength();
 
                     OUString uSuperType;
                     Reference< XTypeDescription > xSuperType = xComp->getBaseType();
@@ -446,7 +446,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
                     RegistryTypeWriter writer(rtwLoader, rtTypeClass, uTypeName.replace('.', '/'),
                                               uSuperType, memberCount, 0, 0);
 
-                    for (sal_Int32 i=0; i < memberCount; i++)
+                    for (sal_Int16 i=0; i < memberCount; i++)
                     {
                         writer.setFieldData(i , memberNames[i], memberTypes[i]->getName().replace('.', '/'),
                                             OUString(), OUString(), RT_ACCESS_READWRITE);
@@ -466,13 +466,13 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop)
 
                     Sequence< OUString > enumNames( xEnum->getEnumNames());
                     Sequence< sal_Int32 > enumValues( xEnum->getEnumValues());
-                    sal_uInt32 enumCount = enumNames.getLength();
+                    sal_uInt16 enumCount = (sal_uInt16)enumNames.getLength();
 
                     RegistryTypeWriter writer(rtwLoader, RT_TYPE_ENUM, uTypeName.replace('.', '/'),
                                               OUString(), enumCount, 0, 0);
 
                     RTConstValue constValue;
-                    for (sal_Int32 i=0; i < enumCount; i++)
+                    for (sal_Int16 i=0; i < enumCount; i++)
                     {
                         constValue.m_type = RT_TYPE_INT32;
                         constValue.m_value.aLong = enumValues[i];