vos remvoed

5 files changed, 17 insertions, 28 deletions

diff --git a/bridges/test/makefile.mk b/bridges/test/makefile.mk
index 304c2ce2a3ef..4ffa8b107fe0 100644
--- a/bridges/test/makefile.mk
+++ b/bridges/test/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: jbu $ $Date: 2001-01-02 11:28:05 $
+#   last change: $Author: jbu $ $Date: 2001-03-16 09:42:20 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -173,7 +173,6 @@ OBJFILES=	\
 # 			$(UNOLIB) \
 # 			$(CPPULIB)	\
 # 			$(CPPUHELPERLIB)	\
-# 			$(VOSLIB)	\
 # 			$(SALLIB)	\
 # 			$(LIBCIMT)
 
@@ -190,7 +189,6 @@ APP2STDLIBS+= -lstdc++
 APP2STDLIBS+=	\
             $(CPPULIB)	\
             $(CPPUHELPERLIB)	\
-            $(VOSLIB)	\
             $(SALLIB)	\
             $(LIBCIMT) 
 
@@ -207,7 +205,6 @@ APP3STDLIBS+= -lstdc++
 APP3STDLIBS+=	\
             $(CPPULIB)	\
             $(CPPUHELPERLIB)	\
-            $(VOSLIB)	\
             $(SALLIB)	\
             $(LIBCIMT) 
 #			imsci_uno.lib
@@ -227,7 +224,6 @@ APP4STDLIBS+= -lstdc++
 APP4STDLIBS+=	\
             $(CPPULIB)	\
             $(CPPUHELPERLIB)	\
-            $(VOSLIB)	\
             $(SALLIB)	\
             $(LIBCIMT) 
 
@@ -247,7 +243,6 @@ APP4DEF=	$(MISC)$/$(APP4TARGET).def
 # 			$(CPPULIB)	\
 # 			$(CPPUHELPERLIB)\
 # 			$(SALLIB)	\
-# 			$(VOSLIB)\
 # 			$(LIBCIMT) 
 
 # APP5DEF=	$(MISC)$/$(APP5TARGET).def
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index a99ebbe15711..dd643aa14a7f 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testclient.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-14 09:25:39 $
+ *  last change: $Author: jbu $ $Date: 2001-03-16 09:42:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,9 +114,6 @@ using namespace ::com::sun::star::test::performance;
 #define DLL_POSTFIX     ".dll"
 #endif
 
-
-#include <vos/socket.hxx>
-
 void doPerformanceTest( const Reference < XPerformanceTest > & xBench )
 {
     printf( "not implemented\n" );
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h
index 19313afc63ea..ffc3b5e32bb0 100644
--- a/bridges/test/testcomp.h
+++ b/bridges/test/testcomp.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testcomp.h,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:28:51 $
+ *  last change: $Author: jbu $ $Date: 2001-03-16 09:42:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,8 +64,7 @@
 
 #include <com/sun/star/bridge/XInstanceProvider.hpp>
 //#include <com/sun/star/bridge/XConnectionAdministration.hpp>
-#include <vos/thread.hxx>
-#include <vos/timer.hxx>
+#include <osl/thread.hxx>
 
 
 void parseCommandLine( char *argv[] ,
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index 95de5c96a213..2f13f4ecd7ce 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testsameprocess.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-14 09:25:39 $
+ *  last change: $Author: jbu $ $Date: 2001-03-16 09:42:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,7 @@
 #endif
 
 #include <osl/mutex.hxx>
-#include <osl/thread.h>
+#include <osl/thread.hxx>
 
 #include <cppuhelper/servicefactory.hxx>
 
@@ -79,12 +79,11 @@
 
 #include <test/XTestFactory.hpp>
 
-#include <vos/thread.hxx>
 
 using namespace ::test;
 using namespace ::rtl;
 using namespace ::cppu;
-using namespace ::vos;
+using namespace ::osl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::bridge;
@@ -103,7 +102,7 @@ using namespace ::com::sun::star::registry;
  ********/
 
 class MyThread :
-    public OThread
+    public Thread
 {
 public:
     MyThread( const Reference< XAcceptor > &r ,
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index 43a1584c6fa2..dd2108ff8574 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testserver.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jl $ $Date: 2001-03-14 09:25:39 $
+ *  last change: $Author: jbu $ $Date: 2001-03-16 09:42:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,7 @@
 #include <osl/mutex.hxx>
 #include <osl/conditn.h>
 
-#include <vos/thread.hxx>
-#include <vos/socket.hxx>
+#include <osl/thread.hxx>
 
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -90,7 +89,7 @@
 
 using namespace ::test;
 using namespace ::rtl;
-using namespace ::vos;
+using namespace ::osl;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -109,7 +108,7 @@ using namespace ::com::sun::star::connection;
 
 
 class MyThread :
-    public OThread
+    public Thread
 {
 public:
     MyThread( const Reference< XAcceptor > &r ,