merge vosremoval-thread patch

4 files changed, 8 insertions, 8 deletions

diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 36a6660f1a6d..5e42fa71d15d 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -29,7 +29,7 @@
 #define _COMMUNI_HXX
 
 #include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/timer.hxx>
 #include <automation/simplecm.hxx>
@@ -76,7 +76,7 @@ public:
     CommunicationManagerClient( BOOL bUseMultiChannel = FALSE );
 };
 
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread)
+class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
 {
 public:
     CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
@@ -133,7 +133,7 @@ private:
     void AddConnection( CommunicationLink *pNewConnection );
 };
 
-class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread)
+class CommunicationManagerServerAcceptThread: public osl::Thread
 {
 public:
     CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS );
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index e62e060ba89c..dd2340bcaaa0 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -205,7 +205,7 @@ void CommunicationLinkViaSocket::run()
 
         TimeValue sNochEins = {0, 1000000};
         while ( schedule() && bIsInsideCallback )   // solange der letzte Callback nicht beendet ist
-            sleep( sNochEins );
+            wait( sNochEins );
         SetNewPacketAsCurrent();
         StartCallback();
         {
@@ -216,7 +216,7 @@ void CommunicationLinkViaSocket::run()
     }
     TimeValue sNochEins = {0, 1000000};
     while ( schedule() && bIsInsideCallback )   // solange der letzte Callback nicht beendet ist
-        sleep( sNochEins );
+        wait( sNochEins );
 
     StartCallback();
     {
@@ -527,7 +527,7 @@ void CommunicationManagerServerAcceptThread::run()
 
                 TimeValue sNochEins = {0, 100};
                 while ( schedule() && xmNewConnection.Is() )    // Solange die letzte Connection nicht abgeholt wurde warten wir
-                    sleep( sNochEins );
+                    wait( sNochEins );
                 xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
                 xmNewConnection->StartCallback();
                 {
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index 099973bee6bb..357bbe04364a 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -27,7 +27,7 @@
 #ifndef _SERVER_HXX
 #define _SERVER_HXX
 
-/*#include <vos/thread.hxx>
+/*#include <osl/thread.hxx>
 #ifndef _STD_NO_NAMESPACE
 namespace vos
 {
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 4374edfd7fc9..51d666489ee4 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -29,7 +29,7 @@
 #include <tools/link.hxx>
 #include <svl/svarray.hxx>
 
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
 
 #ifndef _STRING_LIST
 DECLARE_LIST( StringList, String * )