convert vos/process.hxx and related API

11 files changed, 26 insertions, 44 deletions

diff --git a/framework/inc/commands.h b/framework/inc/commands.h
index fac23bd26648..182dbff8ceac 100644
--- a/framework/inc/commands.h
+++ b/framework/inc/commands.h
@@ -33,7 +33,6 @@
 //_________________________________________________________________________________________________________________
 
 #include <macros/generic.hxx>
-#include <vos/process.hxx>
 #include <rtl/ustring.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index cebdb1ee7c50..a1aca2d52808 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -487,9 +487,7 @@
 #include "vcl/window.hxx"
 #include "vcl/wintypes.hxx"
 
-#include "osl/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/thread.hxx"
+
 
 //---MARKER---
 #endif
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
index 817a0ed2b4db..f7e82da58413 100644
--- a/framework/source/application/framework.cxx
+++ b/framework/source/application/framework.cxx
@@ -36,6 +36,7 @@
 #include <helper/oinstanceprovider.hxx>
 #include <classes/servicemanager.hxx>
 #include <macros/debug.hxx>
+#include <osl/process.h>
 
 #include <defines.hxx>
 
@@ -68,14 +69,12 @@
 #include <svtools/unoiface.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vos/process.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespace
 //_________________________________________________________________________________________________________________
 
 using namespace ::rtl                           ;
-using namespace ::vos                           ;
 using namespace ::comphelper                    ;
 using namespace ::framework                     ;
 using namespace ::com::sun::star::uno           ;
@@ -167,13 +166,12 @@ void FrameWork::impl_analyzeCommandArguments()
     m_bUsePlugIn = sal_False;   // depends from "/plugin"
 
     // Then step over all given arguments and search for supported one.
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
-    sal_uInt32      nCount      = aInfo.getCommandArgCount();
+    sal_uInt32      nCount = osl_getCommandArgCount();
     for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument )
     {
         // If extraction of current argument successfull ...
-        if ( aInfo.getCommandArg( nArgument, sArgument ) == osl_Process_E_None )
+        if ( osl_getCommandArg( nArgument, &sArgument.pData ) == osl_Process_E_None )
         {
             // ... search for matching with supported values.
             if ( sArgument == COMMANDARGUMENT_PLUGIN )
diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx
index 22bd8bfe291c..45a2d0329ff8 100644
--- a/framework/source/application/login.cxx
+++ b/framework/source/application/login.cxx
@@ -51,7 +51,7 @@
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/event.hxx>
@@ -81,7 +81,6 @@
 //_________________________________________________________________________________________________________________
 
 using namespace ::rtl                       ;
-using namespace ::vos                       ;
 using namespace ::comphelper                ;
 using namespace ::framework                 ;
 using namespace ::com::sun::star::uno       ;
@@ -250,12 +249,10 @@ void LoginApplication::Main()
 //*****************************************************************************************************************
 void LoginApplication::impl_parseCommandline()
 {
-    // Use vos::OStartupInfo for access to command line.
     // Step over all arguments, search for supported ones and try to get his values.
     // Set it on our member. Caller of this method must control setted values.
-    OStartupInfo aInfo;
 
-    sal_uInt32  nCount      =   aInfo.getCommandArgCount()  ;
+    sal_uInt32  nCount = osl_getCommandArgCount();
     sal_uInt32  nArgument   =   0                           ;
     OUString    sArgument                                   ;
     OUString    sValue                                      ;
@@ -272,7 +269,7 @@ void LoginApplication::impl_parseCommandline()
     {
         // .. but work with valid ones only!
         // Don't check values here. Caller of this method must decide between wrong and allowed values!
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
 
         //_____________________________________________________________________________________________________
         // Look for "-f=<temp. file name>"
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 4bfe4d9e4de2..16f2f9d7e01b 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -54,7 +54,7 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <osl/socket.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <i18npool/mslangid.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/resmgr.hxx>
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx
index 49bb0245f49b..b3956cd5544f 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/threadhelp/lockhelper.cxx
@@ -46,7 +46,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <vos/process.hxx>
+#include <osl/process.h>
 
 //_________________________________________________________________________________________________________________
 //  namespace
@@ -533,9 +533,9 @@ ELockType& LockHelper::implts_getLockType()
         {
             static ELockType eType = FALLBACK_LOCKTYPE;
 
-            ::vos::OStartupInfo aEnvironment;
+            ::rtl::OUString     aEnvVar( ENVVAR_LOCKTYPE );
             ::rtl::OUString     sValue      ;
-            if( aEnvironment.getEnvironment( ENVVAR_LOCKTYPE, sValue ) == ::vos::OStartupInfo::E_None )
+            if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None )
             {
                 eType = (ELockType)(sValue.toInt32());
             }
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index 66343c0f5be4..d7f15304d85f 100644
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
@@ -51,8 +51,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/random.h>
-#include <vos/process.hxx>
-#include <vos/thread.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/time.h>
@@ -78,7 +77,6 @@
 
 using namespace ::rtl       ;
 using namespace ::osl       ;
-using namespace ::vos       ;
 using namespace ::framework ;
 
 //_________________________________________________________________________________________________________________
@@ -693,16 +691,15 @@ void TestApplication::Main()
     // Parse command line.
     // Attention: All parameter are required and must exist!
     // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>"
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
     sal_Int32       nArgument   ;
-    sal_Int32       nCount      = aInfo.getCommandArgCount();
+    sal_Int32       nCount      = osl_getCommandArgCount();
 
     LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!")
 
     for( nArgument=0; nArgument<nCount; ++nArgument )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
         if( nArgument== 0 ) nTestCount  =sArgument.toInt32();
         if( nArgument== 1 ) nThreadCount=sArgument.toInt32();
         if( nArgument== 2 ) nLoops      =sArgument.toInt32();
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index 633d48b9b858..e82fff4e454c 100644
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -50,7 +50,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <rtl/random.h>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/time.h>
@@ -691,16 +691,15 @@ void TestApplication::Main()
     // Parse command line.
     // Attention: All parameter are required and must exist!
     // syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>"
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
     sal_Int32       nArgument   ;
-    sal_Int32       nCount      = aInfo.getCommandArgCount();
+    sal_Int32       nCount      = osl_getCommandArgCount();
 
     LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!")
 
     for( nArgument=0; nArgument<nCount; ++nArgument )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
         if( nArgument== 0 ) nTestCount  =sArgument.toInt32();
         if( nArgument== 1 ) nThreadCount=sArgument.toInt32();
         if( nArgument== 2 ) nLoops      =sArgument.toInt32();
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index 2b8c453a94c7..8d000666191a 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -51,7 +51,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
@@ -115,7 +115,6 @@
 //_________________________________________________________________________________________________________________
 
 using namespace ::std                       ;
-using namespace ::vos                       ;
 using namespace ::rtl                       ;
 using namespace ::framework                 ;
 using namespace ::comphelper                ;
@@ -249,16 +248,14 @@ void CFGView::impl_printSyntax()
 *//*-*************************************************************************************************************/
 void CFGView::impl_parseCommandLine( AppMember& rMember )
 {
-    ::vos::OStartupInfo aInfo                                   ;
     ::rtl::OUString     sArgument                               ;
     sal_Int32           nArgument   = 0                         ;
-    sal_Int32           nCount      = aInfo.getCommandArgCount();
+    sal_Int32           nCount      =  osl_getCommandArgCount();
     sal_Int32           nMinCount   = 0                         ;
 
     while( nArgument<nCount )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
-
+        osl_getCommandArg( nArgument, &sArgument.pData );
         //_____________________________________________________________________________________________________
         // look for "-dir="
         if( sArgument.compareTo( ARGUMENT_DIRNAME, ARGUMENTLENGTH ) == ARGUMENTFOUND )
diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx
index 597e42f93ebb..4072b92790a6 100644
--- a/framework/test/typecfg/typecfg.cxx
+++ b/framework/test/typecfg/typecfg.cxx
@@ -49,7 +49,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
@@ -73,7 +73,6 @@
 //_________________________________________________________________________________________________________________
 
 using namespace ::std                       ;
-using namespace ::vos                       ;
 using namespace ::rtl                       ;
 using namespace ::framework                 ;
 using namespace ::comphelper                ;
@@ -158,14 +157,13 @@ void TypeApplication::Main()
 //*****************************************************************************************************************
 void TypeApplication::impl_parseCommandLine()
 {
-    OStartupInfo    aInfo       ;
     OUString        sArgument   ;
     sal_Int32       nArgument   = 0                         ;
-    sal_Int32       nCount      = aInfo.getCommandArgCount();
+    sal_Int32       nCount =  osl_getCommandArgCount();
 
     while( nArgument<nCount )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
 
         if( sArgument == ARGUMENT_GENERATE_CFGVIEW )
         {
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index ff2b989abe83..0013542bfce1 100644
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -54,7 +54,7 @@
 //_________________________________________________________________________________________________________________
 #include <comphelper/processfactory.hxx>
 #include <unotools/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
@@ -335,15 +335,14 @@ void XCDGenerator::impl_printSyntax()
 *//*-*************************************************************************************************************/
 void XCDGenerator::impl_parseCommandLine( AppMember& rMember )
 {
-    ::vos::OStartupInfo aInfo                                   ;
     ::rtl::OUString     sArgument                               ;
     sal_Int32           nArgument   = 0                         ;
-    sal_Int32           nCount      = aInfo.getCommandArgCount();
+    sal_Int32           nCount      = osl_getCommandArgCount();
     sal_Int32           nMinCount   = 0                         ;
 
     while( nArgument<nCount )
     {
-        aInfo.getCommandArg( nArgument, sArgument );
+        osl_getCommandArg( nArgument, &sArgument.pData );
 /*OBSOLETE
         //_____________________________________________________________________________________________________
         // look for "-fis=..."