codecleanup02: #i52551# Removed old stuff: VOS_NAMESPACE, use vos:: directly

14 files changed, 56 insertions, 59 deletions

diff --git a/vos/inc/vos/execabl.hxx b/vos/inc/vos/execabl.hxx
index 04e0ef837b02..5788fb598662 100644
--- a/vos/inc/vos/execabl.hxx
+++ b/vos/inc/vos/execabl.hxx
@@ -50,7 +50,7 @@ namespace vos
     @version 0.1
 */
 
-class IExecutable : public NAMESPACE_VOS(IReference)
+class IExecutable : public vos::IReference
 {
 public:
 
@@ -82,8 +82,8 @@ public:
 /** OExecutable
     added default impl. of IReferenceCounter
 */
-class OExecutable : public NAMESPACE_VOS(IExecutable),
-                    public NAMESPACE_VOS(OReference)
+class OExecutable : public vos::IExecutable,
+                    public vos::OReference
 
 {
 public:
diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx
index ca1b750d67f4..be91b6d00aa2 100644
--- a/vos/inc/vos/macros.hxx
+++ b/vos/inc/vos/macros.hxx
@@ -149,9 +149,6 @@
 // def. for arbitrary namespace
 #define VOS_NAMESPACE(class_name, name_space) name_space::class_name
 
-// sal_Int16 def. for namespace vos
-#define NAMESPACE_VOS(class_name) vos::class_name
-
 // sal_Int16 def. for namespace std
 #define NAMESPACE_STD(class_name) std::class_name
 
diff --git a/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx
index e9b1145a36ee..ce378272c9b9 100644
--- a/vos/inc/vos/pipe.hxx
+++ b/vos/inc/vos/pipe.hxx
@@ -48,10 +48,10 @@ class OStreamPipe;
 
 /** Represents a pipe.
 */
-class OPipe : public NAMESPACE_VOS(OReference),
-              public NAMESPACE_VOS(OObject)
+class OPipe : public vos::OReference,
+              public vos::OObject
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OPipe));
+    VOS_DECLARE_CLASSINFO(vos::OPipe);
 
 public:
     /*
@@ -101,7 +101,7 @@ public:
         @param Security
     */
     OPipe(const ::rtl::OUString& strName, TPipeOption Options,
-          const NAMESPACE_VOS(OSecurity)& rSecurity);
+          const vos::OSecurity& rSecurity);
 
     /** Copy constructor.
     */
@@ -132,7 +132,7 @@ public:
         @return True if socket was successfully created.
     */
     sal_Bool SAL_CALL create(const ::rtl::OUString& strName, TPipeOption Options,
-                   const NAMESPACE_VOS(OSecurity)& rSecurity);
+                   const vos::OSecurity& rSecurity);
 
     /** Assignment operator. If pipe was already created, the old one will
         be discarded.
@@ -191,10 +191,10 @@ public:
 
 /** A pipe to send or receive a stream of data.
 */
-class OStreamPipe : public NAMESPACE_VOS(OPipe),
-                    public NAMESPACE_VOS(IStream)
+class OStreamPipe : public vos::OPipe,
+                    public vos::IStream
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OStreamPipe));
+    VOS_DECLARE_CLASSINFO(vos::OStreamPipe);
 public:
 
     /** Creates an unattached pipe. You must attach the pipe to an oslPipe
diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index e41a050acaa0..0b98278d117e 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.hxx
@@ -284,7 +284,7 @@ class OExtCommandLineImpl;
 class OExtCommandLine : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OExtCommandLine, vos));
-    static NAMESPACE_VOS(OExtCommandLineImpl)* pExtImpl;
+    static vos::OExtCommandLineImpl* pExtImpl;
 
 public:
 
diff --git a/vos/inc/vos/refernce.hxx b/vos/inc/vos/refernce.hxx
index 25f0f39eb0f3..8f5a0ec799fb 100644
--- a/vos/inc/vos/refernce.hxx
+++ b/vos/inc/vos/refernce.hxx
@@ -82,7 +82,7 @@ private:
     ORefCount& SAL_CALL operator= (const ORefCount&);
 };
 
-class OReference : public NAMESPACE_VOS(IReference)
+class OReference : public vos::IReference
 {
 public:
     OReference();
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx
index ea9db4850490..f2bff35998ec 100644
--- a/vos/inc/vos/signal.hxx
+++ b/vos/inc/vos/signal.hxx
@@ -46,7 +46,7 @@ SignalHandlerFunction_impl signalHandlerFunction_impl;
     @version 1.0
 */
 
-class OSignalHandler : public NAMESPACE_VOS(OObject)
+class OSignalHandler : public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OSignalHandler, vos));
 
diff --git a/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx
index cfd51fbb069b..f803a455129c 100644
--- a/vos/inc/vos/socket.hxx
+++ b/vos/inc/vos/socket.hxx
@@ -189,7 +189,7 @@ public:
 
 /** Base class for socket addresses.
 */
-class ISocketAddr : public NAMESPACE_VOS(ISocketTypes)
+class ISocketAddr : public vos::ISocketTypes
 {
 public:
     virtual ~ISocketAddr() { }
@@ -202,11 +202,11 @@ public:
     virtual sal_Bool SAL_CALL operator== (oslSocketAddr Addr)= 0;
 };
 
-class OSocketAddr : public NAMESPACE_VOS(ISocketAddr),
-            public NAMESPACE_VOS(OObject)
+class OSocketAddr : public vos::ISocketAddr,
+            public vos::OObject
 
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OSocketAddr));
+    VOS_DECLARE_CLASSINFO(vos::OSocketAddr);
 public:
 
     /** Creates socket address of unknown type.
@@ -274,9 +274,9 @@ protected:
 
 /** Represents an internet-address.
 */
-class OInetSocketAddr : public NAMESPACE_VOS(OSocketAddr)
+class OInetSocketAddr : public vos::OSocketAddr
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OInetSocketAddr));
+    VOS_DECLARE_CLASSINFO(vos::OInetSocketAddr);
 public:
 
     /** Creates an empty internet-address (INADDR_ANY).
@@ -359,9 +359,9 @@ public:
 
 /** Represents an IPX/SPX address.
 */
-class OIpxSocketAddr :  public NAMESPACE_VOS(OSocketAddr)
+class OIpxSocketAddr :  public vos::OSocketAddr
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OIpxSocketAddr));
+    VOS_DECLARE_CLASSINFO(vos::OIpxSocketAddr);
 public:
 
     typedef oslSocketIpxNetNumber  TIpxNetNumber;
@@ -430,11 +430,11 @@ public:
 
 /** Represents a socket.
 */
-class OSocket : public NAMESPACE_VOS(ISocketTypes),
-                public NAMESPACE_VOS(OReference),
-                public NAMESPACE_VOS(OObject)
+class OSocket : public vos::ISocketTypes,
+                public vos::OReference,
+                public vos::OObject
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OSocket));
+    VOS_DECLARE_CLASSINFO(vos::OSocket);
 
 protected:
     typedef ORefObj<oslSocket> SockRef;
@@ -809,10 +809,10 @@ public:
 
 /** A socket to send or receive a stream of data.
 */
-class OStreamSocket : public NAMESPACE_VOS(OSocket),
-                      public NAMESPACE_VOS(IStream)
+class OStreamSocket : public vos::OSocket,
+                      public vos::IStream
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OStreamSocket));
+    VOS_DECLARE_CLASSINFO(vos::OStreamSocket);
 public:
 
     /** Creates an unattached socket. You must attach the socket to an oslSocket
@@ -952,9 +952,9 @@ protected:
 
 /** A socket to accept incoming connections.
 */
-class OAcceptorSocket : public NAMESPACE_VOS(OSocket)
+class OAcceptorSocket : public vos::OSocket
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OAcceptorSocket));
+    VOS_DECLARE_CLASSINFO(vos::OAcceptorSocket);
 public:
 
     /** Creates a socket that can accept connections.
@@ -1014,9 +1014,9 @@ public:
 
 /** A socket to initiate a conenction.
 */
-class OConnectorSocket : public NAMESPACE_VOS(OStreamSocket)
+class OConnectorSocket : public vos::OStreamSocket
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OConnectorSocket));
+    VOS_DECLARE_CLASSINFO(vos::OConnectorSocket);
 public:
 
     /** Creates a socket that can accept connections.
@@ -1050,9 +1050,9 @@ public:
 
 /** A connectionless socket to send and receive datagrams.
 */
-class ODatagramSocket : public NAMESPACE_VOS(OSocket)
+class ODatagramSocket : public vos::OSocket
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(ODatagramSocket));
+    VOS_DECLARE_CLASSINFO(vos::ODatagramSocket);
 public:
 
     /** Creates a datagram socket.
diff --git a/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx
index 5e25aa1d103a..6df13d5ddb28 100644
--- a/vos/inc/vos/stream.hxx
+++ b/vos/inc/vos/stream.hxx
@@ -37,7 +37,7 @@ namespace vos
 
 /** Adds seeking capabilities to IStream
 */
-class IPositionableStream : public NAMESPACE_VOS(IStream)
+class IPositionableStream : public vos::IStream
 {
 
 public:
@@ -75,8 +75,8 @@ protected:
 
 /** Implements IPositionableStream
 */
-class OStream : public NAMESPACE_VOS(OObject),
-                public NAMESPACE_VOS(IPositionableStream)
+class OStream : public vos::OObject,
+                public vos::IPositionableStream
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStream, vos));
 
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx
index 16f64c0e0812..d84fdfdadccc 100644
--- a/vos/inc/vos/thread.hxx
+++ b/vos/inc/vos/thread.hxx
@@ -53,8 +53,8 @@ ThreadWorkerFunction_impl threadWorkerFunction_impl;
     @version 1.0
 */
 
-class OThread : public NAMESPACE_VOS(IRunnable),
-                public NAMESPACE_VOS(OObject)
+class OThread : public vos::IRunnable,
+                public vos::OObject
 {
 
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThread, vos));
@@ -203,7 +203,7 @@ protected:
     friend void threadWorkerFunction_impl(void *);
 };
 
-class OThreadData : public NAMESPACE_VOS(OObject)
+class OThreadData : public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos));
 
diff --git a/vos/source/pipe.cxx b/vos/source/pipe.cxx
index a7d8e655414d..777d1a76b36b 100644
--- a/vos/source/pipe.cxx
+++ b/vos/source/pipe.cxx
@@ -138,7 +138,7 @@ sal_Bool OPipe::create( const rtl::OUString& strName, TPipeOption Options )
 /*****************************************************************************/
 sal_Bool OPipe::create( const rtl::OUString& strName,
                         TPipeOption Options,
-                        const NAMESPACE_VOS(OSecurity)& rSecurity )
+                        const vos::OSecurity& rSecurity )
 {
     // if this was a valid pipe, decrease reference
     if ((m_pPipeRef) && (m_pPipeRef->release() == 0))
diff --git a/vos/source/process.cxx b/vos/source/process.cxx
index 71c8729d9023..59b1af3223d4 100644
--- a/vos/source/process.cxx
+++ b/vos/source/process.cxx
@@ -485,7 +485,7 @@ void OExtCommandLineImpl::init()
 
 namespace
 {
-    struct lclMutex : public rtl::Static< NAMESPACE_VOS(OMutex), lclMutex > {};
+    struct lclMutex : public rtl::Static< vos::OMutex, lclMutex > {};
 }
 
 OExtCommandLineImpl* OExtCommandLine::pExtImpl=0;
diff --git a/vos/source/signal.cxx b/vos/source/signal.cxx
index 1f879f8b225c..eb1b65191918 100644
--- a/vos/source/signal.cxx
+++ b/vos/source/signal.cxx
@@ -35,7 +35,7 @@ using namespace vos;
 oslSignalAction vos::signalHandlerFunction_impl(
     void * pthis, oslSignalInfo * pInfo)
 {
-    NAMESPACE_VOS(OSignalHandler)* pThis= (NAMESPACE_VOS(OSignalHandler)*)pthis;
+    vos::OSignalHandler* pThis= (vos::OSignalHandler*)pthis;
 
     return ((oslSignalAction)pThis->signal(pInfo));
 }
diff --git a/vos/source/thread.cxx b/vos/source/thread.cxx
index 8b2c8826b753..94cdfbdf970b 100644
--- a/vos/source/thread.cxx
+++ b/vos/source/thread.cxx
@@ -34,7 +34,7 @@ using namespace vos;
 
 void vos::threadWorkerFunction_impl(void * pthis)
 {
-    NAMESPACE_VOS(OThread)* pThis= (NAMESPACE_VOS(OThread)*)pthis;
+    vos::OThread* pThis= (vos::OThread*)pthis;
 
     // call Handler-Function of OThread-derived class
     pThis->run();
diff --git a/vos/source/timer.cxx b/vos/source/timer.cxx
index 1c1e2385b60c..a365415672e9 100644
--- a/vos/source/timer.cxx
+++ b/vos/source/timer.cxx
@@ -41,7 +41,7 @@
 
 class OTimerManagerCleanup;
 
-class NAMESPACE_VOS(OTimerManager) : public NAMESPACE_VOS(OThread)
+class vos::OTimerManager : public vos::OThread
 {
 
 public:
@@ -53,13 +53,13 @@ public:
       ~OTimerManager();
 
       /// register timer
-    sal_Bool SAL_CALL registerTimer(NAMESPACE_VOS(OTimer)* pTimer);
+    sal_Bool SAL_CALL registerTimer(vos::OTimer* pTimer);
 
       /// unregister timer
-    sal_Bool SAL_CALL unregisterTimer(NAMESPACE_VOS(OTimer)* pTimer);
+    sal_Bool SAL_CALL unregisterTimer(vos::OTimer* pTimer);
 
       /// lookup timer
-    sal_Bool SAL_CALL lookupTimer(const NAMESPACE_VOS(OTimer)* pTimer);
+    sal_Bool SAL_CALL lookupTimer(const vos::OTimer* pTimer);
 
     /// retrieves the "Singleton" TimerManager Instance
     static OTimerManager* SAL_CALL getTimerManager();
@@ -77,17 +77,17 @@ protected:
     virtual void SAL_CALL onTerminated();
 
       // sorted-queue data
-      NAMESPACE_VOS(OTimer)*        m_pHead;
+      vos::OTimer*      m_pHead;
     // List Protection
-    NAMESPACE_VOS(OMutex)       m_Lock;
+    vos::OMutex     m_Lock;
     // Signal the insertion of a timer
-    NAMESPACE_VOS(OCondition)   m_notEmpty;
+    vos::OCondition m_notEmpty;
 
     // Synchronize access to OTimerManager
-    static NAMESPACE_VOS(OMutex) m_Access;
+    static vos::OMutex m_Access;
 
     // "Singleton Pattern"
-    static NAMESPACE_VOS(OTimerManager)* m_pManager;
+    static vos::OTimerManager* m_pManager;
 
     friend class OTimerManagerCleanup;
 
@@ -267,8 +267,8 @@ TTimeValue OTimer::getRemainingTime() const
 // Timer manager
 //
 
-OMutex NAMESPACE_VOS(OTimerManager)::m_Access;
-OTimerManager* NAMESPACE_VOS(OTimerManager)::m_pManager=0;
+OMutex vos::OTimerManager::m_Access;
+OTimerManager* vos::OTimerManager::m_pManager=0;
 
 OTimerManager::OTimerManager()
 {