Adapted source to UDK212

4 files changed, 13 insertions, 13 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 6b5695b44923..e1fc91c79787 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svapp.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mt $ $Date: 2001-03-15 11:32:26 $
+ *  last change: $Author: jl $ $Date: 2001-03-20 10:03:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -394,7 +394,7 @@ USHORT Application::GetCommandLineParamCount()
 XubString Application::GetCommandLineParam( USHORT nParam )
 {
     NAMESPACE_VOS( OStartupInfo )   aStartInfo;
-    NAMESPACE_RTL( OUString )       aParam;
+    ::rtl::OUString     aParam;
     aStartInfo.getCommandArg( nParam, aParam );
     return XubString( aParam );
 }
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index f3087a100d68..a4df124a3e00 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svmain.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: pluby $ $Date: 2001-03-09 00:03:51 $
+ *  last change: $Author: jl $ $Date: 2001-03-20 10:03:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -338,7 +338,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
     pSVData->mnMainThreadId = ::vos::OThread::getCurrentIdentifier();
 
     NAMESPACE_VOS( OStartupInfo )   aStartInfo;
-    NAMESPACE_RTL( OUString )       aExeFileName;
+    ::rtl::OUString     aExeFileName;
 
 #ifdef REMOTE_APPSERVER
     // create condition now to avoid race
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index cad1edd75456..2b49074202e5 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bitmapex.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-16 17:35:51 $
+ *  last change: $Author: jl $ $Date: 2001-03-20 10:03:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -542,7 +542,7 @@ BOOL BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc,
                     }
                     else
                     {
-                        Byte        cBlack = 0;
+                        sal_uInt8       cBlack = 0;
                         AlphaMask*  pAlpha = new AlphaMask( GetSizePixel(), &cBlack );
 
                         aMask = pAlpha->ImplGetBitmap();
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 5759909514c2..77be08833851 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salinst.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mm $ $Date: 2001-02-22 15:40:00 $
+ *  last change: $Author: jl $ $Date: 2001-03-20 10:03:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -220,10 +220,10 @@ sal_Bool SAL_CALL SalYieldMutex::tryToAcquire()
     {
         mnCount++;
         mnThreadId = GetCurrentThreadId();
-        return True;
+        return sal_True;
     }
     else
-        return False;
+        return sal_False;
 }
 
 // -----------------------------------------------------------------------