diff options
35 files changed, 111 insertions, 114 deletions
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index b0e77d658931..798ff87e02ac 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -347,7 +347,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn ) if ( pBtn == pHomeBtn ) { ::rtl::OUString aHomeDir; - NAMESPACE_VOS( OSecurity ) aSecurity; + vos:: OSecurity aSecurity; if ( aSecurity.getHomeDir( aHomeDir ) ) { DirEntry aFile ( aHomeDir ); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index bf9e87d33a74..8834f5497e5a 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -64,7 +64,7 @@ static USHORT aWndFunc( { - NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() ); + vos:: OGuard aGuard( Application::GetSolarMutex() ); // aus den Flags die benoetigten WinBits ermitteln WinBits eBits=0; @@ -377,7 +377,7 @@ BOOL SfxErrorHandler::GetErrorString( */ { - NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() ); + vos:: OGuard aGuard( Application::GetSolarMutex() ); BOOL bRet = FALSE; rStr=String(SvtResId(RID_ERRHDL_CLASS)); @@ -454,7 +454,7 @@ BOOL SfxErrorContext::GetString(ULONG nErrId, String &rStr) } if( pMgr ) { - NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() ); + vos:: OGuard aGuard( Application::GetSolarMutex() ); ResId aResId( nResId, *pMgr ); diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index 62753a36136d..bb1c35078055 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -58,7 +58,7 @@ class TOOLKIT_DLLPUBLIC VCLXDevice : public ::com::sun::star::awt::XDevice, friend class VCLXGraphics; private: - NAMESPACE_VOS(IMutex)& mrMutex; // Reference to SolarMutex + vos::IMutex& mrMutex; // Reference to SolarMutex OutputDevice* mpOutputDevice; public: @@ -66,7 +66,7 @@ public: sal_uInt32 nFlags; protected: - NAMESPACE_VOS(IMutex)& GetMutex() { return mrMutex; } + vos::IMutex& GetMutex() { return mrMutex; } void DestroyOutputDevice(); public: diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx index 5fda9ac947ee..6a076a5339b8 100644 --- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx @@ -60,7 +60,7 @@ class VCLXGraphics : public ::com::sun::star::awt::XGraphics, public ::cppu::OWeakObject { private: - NAMESPACE_VOS(IMutex)& mrMutex; // Reference to SolarMutex + vos::IMutex& mrMutex; // Reference to SolarMutex ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben OutputDevice* mpOutputDevice; @@ -73,7 +73,7 @@ private: Region* mpClipRegion; protected: - NAMESPACE_VOS(IMutex)& GetMutex() { return mrMutex; } + vos::IMutex& GetMutex() { return mrMutex; } public: VCLXGraphics(); diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx index 5ca6ec83d330..b944a74b65d2 100644 --- a/toolkit/inc/toolkit/helper/throbberimpl.hxx +++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx @@ -43,7 +43,7 @@ namespace toolkit class Throbber_Impl { private: - NAMESPACE_VOS(IMutex)& mrMutex; // Reference to SolarMutex + vos::IMutex& mrMutex; // Reference to SolarMutex ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList; ::com::sun::star::uno::Reference< VCLXWindow > mxParent; @@ -55,7 +55,7 @@ namespace toolkit DECL_LINK( TimeOutHdl, Throbber_Impl* ); - NAMESPACE_VOS(IMutex)& GetMutex() { return mrMutex; } + vos::IMutex& GetMutex() { return mrMutex; } public: Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent, diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index bfbdb531e8d2..edaf64799d43 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -109,7 +109,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags ) { if(mpOutputDevice) { - NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex() ); + vos::OGuard aVclGuard( Application::GetSolarMutex() ); if ( nFlags & INITOUTDEV_FONT ) { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index f85e29c21099..1af422bf7f00 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -659,7 +659,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if ( nType ) { - NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex() ); + vos::OGuard aVclGuard( Application::GetSolarMutex() ); switch ( (WindowType)nType ) { case WINDOW_CANCELBUTTON: diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index d91077823495..6849d588aca2 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -653,7 +653,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent // #82300# - 2000-12-21 - fs@openoffice.org if (bNeedNewPeer && xParent.is()) { - NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex() ); + vos::OGuard aVclGuard( Application::GetSolarMutex() ); // and now this is the final withdrawal: // With 83561, I have no other idea than locking the SolarMutex here .... // I really hate the fact that VCL is not theadsafe .... diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2d7664b8b69f..994418bae4b5 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -264,7 +264,7 @@ private: static Link aDBNotFoundHdl; protected: - NAMESPACE_VOS( OMutex ) aMutex; + vos:: OMutex aMutex; USHORT nStarMode; SolarFileList aFileList; diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx index c16fe41abc0b..6b8f31147f96 100644 --- a/tools/inc/tools/simplerm.hxx +++ b/tools/inc/tools/simplerm.hxx @@ -46,7 +46,7 @@ class InternalResMgr; class TOOLS_DLLPUBLIC SimpleResMgr { protected: - NAMESPACE_VOS(OMutex) m_aAccessSafety; + vos::OMutex m_aAccessSafety; InternalResMgr* m_pResImpl; public: diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 1bd43bffc4e7..74a2142db692 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -136,13 +136,13 @@ BOOL bInRedirection = TRUE; #else BOOL bInRedirection = FALSE; #endif -static NAMESPACE_VOS( OMutex )* pRedirectMutex = 0; +static vos:: OMutex * pRedirectMutex = 0; //------------------------------------------------------------------------ void FSysRedirector::Register( FSysRedirector *pRedirector ) { if ( pRedirector ) - pRedirectMutex = new NAMESPACE_VOS( OMutex ); + pRedirectMutex = new vos:: OMutex ; else DELETEZ( pRedirectMutex ); _pRedirector = pRedirector; @@ -165,7 +165,7 @@ void FSysRedirector::DoRedirect( String &rPath ) // Redirection is acessible only by one thread per time // dont move the guard behind the bInRedirection check!!! // think of nested calls (when called from callback) - NAMESPACE_VOS( OGuard ) aGuard( pRedirectMutex ); + vos:: OGuard aGuard( pRedirectMutex ); // if already in redirection, dont redirect if ( bInRedirection ) @@ -1040,8 +1040,8 @@ DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize ) BOOL DirEntry::Exists( FSysAccess nAccess ) const { #ifndef BOOTSTRAP - static NAMESPACE_VOS(OMutex) aLocalMutex; - NAMESPACE_VOS(OGuard) aGuard( aLocalMutex ); + static vos::OMutex aLocalMutex; + vos::OGuard aGuard( aLocalMutex ); #endif if ( !IsValid() ) return FALSE; diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index daeaf8e4c3a5..d05fcac331f2 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -837,18 +837,18 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, static void RscException_Impl() { - switch ( NAMESPACE_VOS(OSignalHandler)::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) ) + switch ( vos::OSignalHandler::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) ) { - case NAMESPACE_VOS(OSignalHandler)::TAction_CallNextHandler: + case vos::OSignalHandler::TAction_CallNextHandler: abort(); - case NAMESPACE_VOS(OSignalHandler)::TAction_Ignore: + case vos::OSignalHandler::TAction_Ignore: return; - case NAMESPACE_VOS(OSignalHandler)::TAction_AbortApplication: + case vos::OSignalHandler::TAction_AbortApplication: abort(); - case NAMESPACE_VOS(OSignalHandler)::TAction_KillApplication: + case vos::OSignalHandler::TAction_KillApplication: exit(-1); } } @@ -1919,7 +1919,7 @@ SimpleResMgr* SimpleResMgr::Create( const sal_Char* pPrefixName, com::sun::star: // ----------------------------------------------------------------------- bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId ) { - NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety); + vos::OGuard aGuard(m_aAccessSafety); if ( ( RSC_STRING != _resourceType ) && ( RSC_RESOURCE != _resourceType ) ) return false; @@ -1931,7 +1931,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc // ----------------------------------------------------------------------- UniString SimpleResMgr::ReadString( sal_uInt32 nId ) { - NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety); + vos::OGuard aGuard(m_aAccessSafety); DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadString : have no impl class !" ); // perhaps constructed with an invalid filename ? @@ -2002,7 +2002,7 @@ const ::com::sun::star::lang::Locale& SimpleResMgr::GetLocale() const sal_uInt32 SimpleResMgr::ReadBlob( sal_uInt32 nId, void** pBuffer ) { - NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety); + vos::OGuard aGuard(m_aAccessSafety); DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadBlob : have no impl class !" ); diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 88ccb2113e0d..f3c5d642ed6e 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -60,7 +60,7 @@ DECLARE_LIST( InternalStreamLockList, InternalStreamLock* ) namespace { struct LockList : public rtl::Static< InternalStreamLockList, LockList > {}; } #ifndef BOOTSTRAP -namespace { struct LockMutex : public rtl::Static< NAMESPACE_VOS(OMutex), LockMutex > {}; } +namespace { struct LockMutex : public rtl::Static< vos::OMutex, LockMutex > {}; } #endif class InternalStreamLock @@ -111,7 +111,7 @@ InternalStreamLock::~InternalStreamLock() sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream ) { #ifndef BOOTSTRAP - NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() ); + vos:: OGuard aGuard( LockMutex::get() ); #endif ByteString aFileName(pStream->GetFileName(), osl_getThreadTextEncoding()); struct stat aStat; @@ -161,7 +161,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr void InternalStreamLock::UnlockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream ) { #ifndef BOOTSTRAP - NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() ); + vos:: OGuard aGuard( LockMutex::get() ); #endif InternalStreamLock* pLock = NULL; InternalStreamLockList &rLockList = LockList::get(); diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx index ca269ef6eea2..21a1a715dc08 100644 --- a/tools/source/testtoolloader/testtoolloader.cxx +++ b/tools/source/testtoolloader/testtoolloader.cxx @@ -56,16 +56,16 @@ static bool bLoggerStarted = false; sal_uInt32 GetCommandLineParamCount() { - NAMESPACE_VOS( OStartupInfo ) aStartInfo; + vos:: OStartupInfo aStartInfo; return aStartInfo.getCommandArgCount(); } String GetCommandLineParam( sal_uInt32 nParam ) { - NAMESPACE_VOS( OStartupInfo ) aStartInfo; + vos:: OStartupInfo aStartInfo; ::rtl::OUString aParam; - NAMESPACE_VOS( OStartupInfo )::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam ); - if ( eError == NAMESPACE_VOS( OStartupInfo )::E_None ) + vos:: OStartupInfo ::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam ); + if ( eError == vos:: OStartupInfo ::E_None ) return String( aParam ); else { diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index b8a2261ed9db..6eb5bcd1390e 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -371,13 +371,13 @@ SalYieldMutex::SalYieldMutex() void SalYieldMutex::acquire() { OMutex::acquire(); - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; } void SalYieldMutex::release() { - if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + if ( mnThreadId == vos::OThread::getCurrentIdentifier() ) { if ( mnCount == 1 ) mnThreadId = 0; @@ -390,7 +390,7 @@ sal_Bool SalYieldMutex::tryToAcquire() { if ( OMutex::tryToAcquire() ) { - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; return sal_True; } @@ -536,7 +536,7 @@ ULONG AquaSalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == - NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + vos::OThread::getCurrentIdentifier() ) { ULONG nCount = pYieldMutex->GetAcquireCount(); ULONG n = nCount; diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 68617c8c16be..faedc7e5e600 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -76,7 +76,7 @@ void GtkHookedYieldMutex::ThreadsLeave() #if OSL_DEBUG_LEVEL > 1 if( mnThreadId && - mnThreadId != NAMESPACE_VOS(OThread)::getCurrentIdentifier()) + mnThreadId != vos::OThread::getCurrentIdentifier()) fprintf( stderr, "\n\n--- A different thread owns the mutex ...---\n\n\n"); #endif diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx index 466b56868900..5c3be54f9ddc 100644 --- a/vcl/unx/headless/svpinst.cxx +++ b/vcl/unx/headless/svpinst.cxx @@ -302,7 +302,7 @@ vos::IMutex* SvpSalInstance::GetYieldMutex() ULONG SvpSalInstance::ReleaseYieldMutex() { if ( m_aYieldMutex.GetThreadId() == - NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + vos::OThread::getCurrentIdentifier() ) { ULONG nCount = m_aYieldMutex.GetAcquireCount(); ULONG n = nCount; @@ -464,13 +464,13 @@ SvpSalYieldMutex::SvpSalYieldMutex() void SvpSalYieldMutex::acquire() { OMutex::acquire(); - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; } void SvpSalYieldMutex::release() { - if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + if ( mnThreadId == vos::OThread::getCurrentIdentifier() ) { if ( mnCount == 1 ) mnThreadId = 0; @@ -483,7 +483,7 @@ sal_Bool SvpSalYieldMutex::tryToAcquire() { if ( OMutex::tryToAcquire() ) { - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; return sal_True; } diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index 284a2d11cd82..d931a2735ff9 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -46,11 +46,11 @@ // SalYieldMutex // ------------------------------------------------------------------------- -class SvpSalYieldMutex : public NAMESPACE_VOS(OMutex) +class SvpSalYieldMutex : public vos::OMutex { protected: ULONG mnCount; - NAMESPACE_VOS(OThread)::TThreadIdentifier mnThreadId; + vos::OThread::TThreadIdentifier mnThreadId; public: SvpSalYieldMutex(); @@ -60,7 +60,7 @@ public: virtual sal_Bool tryToAcquire(); ULONG GetAcquireCount() const { return mnCount; } - NAMESPACE_VOS(OThread)::TThreadIdentifier GetThreadId() const { return mnThreadId; } + vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; // --------------- diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h index d73d67f81425..8f4719f098f0 100644 --- a/vcl/unx/inc/salinst.h +++ b/vcl/unx/inc/salinst.h @@ -39,11 +39,11 @@ #include <vcl/dllapi.h> #include <vcl/salinst.hxx> -class VCL_DLLPUBLIC SalYieldMutex : public NAMESPACE_VOS(OMutex) +class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex { protected: ULONG mnCount; - NAMESPACE_VOS(OThread)::TThreadIdentifier mnThreadId; + vos::OThread::TThreadIdentifier mnThreadId; public: SalYieldMutex(); @@ -53,7 +53,7 @@ public: virtual sal_Bool tryToAcquire(); ULONG GetAcquireCount() const { return mnCount; } - NAMESPACE_VOS(OThread)::TThreadIdentifier GetThreadId() const { return mnThreadId; } + vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index aa2afab93657..71e2975abc8a 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2257,7 +2257,7 @@ void SalX11Display::Yield() XEvent aEvent; DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == - NAMESPACE_VOS(OThread)::getCurrentIdentifier(), + vos::OThread::getCurrentIdentifier(), "will crash soon since solar mutex not locked in SalDisplay::Yield" ); XNextEvent( pDisp_, &aEvent ); diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx index 8a8db44cefcd..49a9cceb8617 100644 --- a/vcl/unx/source/app/salinst.cxx +++ b/vcl/unx/source/app/salinst.cxx @@ -66,13 +66,13 @@ SalYieldMutex::SalYieldMutex() void SalYieldMutex::acquire() { OMutex::acquire(); - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; } void SalYieldMutex::release() { - if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + if ( mnThreadId == vos::OThread::getCurrentIdentifier() ) { if ( mnCount == 1 ) mnThreadId = 0; @@ -85,7 +85,7 @@ sal_Bool SalYieldMutex::tryToAcquire() { if ( OMutex::tryToAcquire() ) { - mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier(); + mnThreadId = vos::OThread::getCurrentIdentifier(); mnCount++; return True; } @@ -231,7 +231,7 @@ ULONG X11SalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == - NAMESPACE_VOS(OThread)::getCurrentIdentifier() ) + vos::OThread::getCurrentIdentifier() ) { ULONG nCount = pYieldMutex->GetAcquireCount(); ULONG n = nCount; 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() { |