6 files changed, 25 insertions, 40 deletions
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 971743ccd6b5..2d75769d2c89 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,15 +46,14 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 #include <usr/weak.hxx>      // OWeakObject
 
-#include <vos/conditn.hxx>
-#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/conditn.hxx>
+#include <osl/mutex.hxx>
+#include <osl/thread.hxx>
 
 #include <string.h>
 
 #include "testfactreg.hxx"
 
-using namespace vos;
 using namespace usr;
 
 #define DATASTREAM_TEST_MAX_HANDLE 1
@@ -1068,3 +1068,4 @@ UString     OObjectStreamTest_getImplementationName( int i) THROWS( () )
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/stm/makefile.mk b/extensions/test/stm/makefile.mk
index aa506fcb34af..ac31f76fb805 100644
--- a/extensions/test/stm/makefile.mk
+++ b/extensions/test/stm/makefile.mk
@@ -42,9 +42,8 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 LIB1TARGET= $(SLB)$/$(TARGET).lib	
 
 SHL1STDLIBS= \
-        $(VOSLIB) 	 \
         $(SALLIB) 	 \
-        $(TOOLSLIB)	
+        $(TOOLSLIB)
 
 LIB1OBJFILES=	$(OBJFILES)
 SHL1LIBS=		$(LIB1TARGET)
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 6ddd552a6ad0..d5a389691cc2 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,16 +42,15 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 #include <usr/weak.hxx>      // OWeakObject
 
-#include <vos/conditn.hxx>
-#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/conditn.hxx>
+#include <osl/mutex.hxx>
+#include <osl/thread.hxx>
 
 #include <string.h>
 
 #include "testfactreg.hxx"
 
 
-using namespace vos;
 using namespace usr;
 
 class OMarkableOutputStreamTest :
@@ -364,19 +364,8 @@ void OMarkableOutputStreamTest::testSimple(     const XOutputStreamRef &rOutput
 
 }
 
-/***
-* the test methods
-*
-****/
-
-
-
-
-
 /**
 * for external binding
-*
-*
 **/
 XInterfaceRef OMarkableOutputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
 {
@@ -414,7 +403,6 @@ UString     OMarkableOutputStreamTest_getImplementationName() THROWS( () )
 //-----------------------------------------------------
 // Input stream
 
-
 class OMarkableInputStreamTest :
         public XSimpleTest,
         public OWeakObject
@@ -637,19 +625,8 @@ void OMarkableInputStreamTest::testSimple(      const XOutputStreamRef &rOutput
     rInput->closeInput();
 }
 
-/***
-* the test methods
-*
-****/
-
-
-
-
-
 /**
 * for external binding
-*
-*
 **/
 XInterfaceRef OMarkableInputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception))
 {
@@ -677,3 +654,5 @@ UString     OMarkableInputStreamTest_getImplementationName() THROWS( () )
 {
     return L"test.com.sun.star.extensions.stm.MarkableInputStream";
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index b38cafd2952f..2de45fa0a2f5 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,9 +39,9 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 #include <usr/weak.hxx>      // OWeakObject
 
-#include <vos/conditn.hxx>
-#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/conditn.hxx>
+#include <osl/mutex.hxx>
+#include <osl/thread.hxx>
 
 #include <string.h>
 
@@ -48,11 +49,10 @@
 #define IMPLEMENTATION_NAME L"test.com.sun.star.comp.extensions.stm.Pipe"
 #define SERVICE_NAME        L"test.com.sun.star.io.Pipe"
 
-using namespace vos;
 using namespace usr;
 
 class WriteToStreamThread :
-        public OThread
+        public osl::Thread
 {
 
 public:
@@ -367,7 +367,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
     Sequence<BYTE> seqRead;
 
     // deletes itself
-    OThread *p = new WriteToStreamThread( output,  iMax );
+    osl::Thread *p = new WriteToStreamThread( output,  iMax );
 
     ERROR_ASSERT( p , "couldn't create thread for testing !\n" );
 
@@ -444,3 +444,5 @@ UString     OPipeTest_getImplementationName() THROWS( () )
 {
     return IMPLEMENTATION_NAME;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx
index 698404f9d61b..cd4b07ddb434 100644
--- a/extensions/test/stm/testfactreg.cxx
+++ b/extensions/test/stm/testfactreg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,7 +36,6 @@
 #include "testfactreg.hxx"
 
 
-using namespace vos;
 using namespace usr;
 
 #ifdef __cplusplus
@@ -168,3 +168,4 @@ Sequence<BYTE> createIntSeq( INT32 i )
     return createSeq( pcCount );
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/stm/testfactreg.hxx b/extensions/test/stm/testfactreg.hxx
index 1d5a261549cf..81c22d00b351 100644
--- a/extensions/test/stm/testfactreg.hxx
+++ b/extensions/test/stm/testfactreg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -108,3 +109,5 @@ Sequence<BYTE> createIntSeq( INT32 i );
         return; \
     } \
     ((void)0)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */