rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity

3 files changed, 12 insertions, 16 deletions

diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
index 31203d680859..58a52d0f4507 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/aqua/inc/salinst.h
@@ -60,7 +60,7 @@ public:
     oslThreadIdentifier                         GetThreadId() const { return mnThreadId; }
 };
 
-#define YIELD_GUARD osl::SolarMutexGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
+#define YIELD_GUARD osl::SolarGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
 
 
 // -------------------
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 2bba83d0d287..01bd95e7ae69 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -33,7 +33,6 @@
 #include "vcl/salinst.hxx"
 #include "vcl/salframe.hxx"
 #include "vcl/salsys.hxx"
-#include "vos/process.hxx"
 #include "tools/tools.h"
 #include "tools/debug.hxx"
 #include "tools/time.hxx"
@@ -67,6 +66,7 @@
 #include "osl/module.h"
 #include "osl/file.hxx"
 #include "osl/mutex.hxx"
+#include "osl/process.h"
 #include "osl/thread.h"
 #include "rtl/tencinfo.h"
 #include "rtl/instance.hxx"
@@ -324,20 +324,18 @@ void Application::DeInit()
 
 // -----------------------------------------------------------------------
 
-USHORT Application::GetCommandLineParamCount()
+sal_uInt16 Application::GetCommandLineParamCount()
 {
-    vos::OStartupInfo aStartInfo;
-    return (USHORT)aStartInfo.getCommandArgCount();
+    return (sal_uInt16)osl_getCommandArgCount();
 }
 
 // -----------------------------------------------------------------------
 
 XubString Application::GetCommandLineParam( USHORT nParam )
 {
-    vos::OStartupInfo   aStartInfo;
-    rtl::OUString       aParam;
-    aStartInfo.getCommandArg( nParam, aParam );
-    return XubString( aParam );
+    rtl_uString* aParam;
+    osl_getCommandArg( nParam, &aParam );
+    return XubString( rtl_uString_getStr(aParam) );
 }
 
 // -----------------------------------------------------------------------
@@ -356,10 +354,9 @@ const XubString& Application::GetAppFileName()
     static String aAppFileName;
     if( !aAppFileName.Len() )
     {
-        vos::OStartupInfo   aStartInfo;
-        ::rtl::OUString     aExeFileName;
+        rtl_uString* aExeFileName;
 
-        aStartInfo.getExecutableFile( aExeFileName );
+        osl_getExecutableFile( &aExeFileName );
 
         // convert path to native file format
         rtl::OUString aNativeFileName;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index ea8396e9f91b..44da94e1cd22 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -71,8 +71,8 @@
 #include "vcl/impimagetree.hxx"
 #include "vcl/xconnection.hxx"
 
-#include "vos/process.hxx"
 #include "osl/file.hxx"
+#include "osl/process.h"
 #include "comphelper/processfactory.hxx"
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
@@ -289,8 +289,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
     // Main-Thread-Id merken
     pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier();
 
-    vos::OStartupInfo   aStartInfo;
-    rtl::OUString       aExeFileName;
+    rtl_uString*  aExeFileName;
 
 
     // Sal initialisieren
@@ -312,7 +311,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
 
     // Den AppFileName gleich holen und absolut machen, bevor das
     // WorkingDirectory sich aendert...
-    aStartInfo.getExecutableFile( aExeFileName );
+    osl_getExecutableFile( &aExeFileName );
 
     // convert path to native file format
     rtl::OUString aNativeFileName;