diff options
author | Joachim Lingner <jl@openoffice.org> | 2001-03-16 14:25:50 +0000 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2001-03-16 14:25:50 +0000 |
commit | 1851fe20ec4ede5eea7a15402305056b845df989 (patch) | |
tree | 3bd718d0bec3abfb0b58a8aafe89f891d91f454e /vos | |
parent | 315052727c1815817a5ac1704e7d236375fd31b7 (diff) |
script did udk cleanup: -osl/types.h -osl/macros.hxx -rtl/types.h -rtl/macros.hxx -OSL_ENSHURE +OSL_ENSURE
Diffstat (limited to 'vos')
-rw-r--r-- | vos/inc/vos/diagnose.hxx | 6 | ||||
-rw-r--r-- | vos/inc/vos/module.hxx | 12 | ||||
-rw-r--r-- | vos/inc/vos/pipe.hxx | 12 | ||||
-rw-r--r-- | vos/inc/vos/process.hxx | 30 | ||||
-rw-r--r-- | vos/inc/vos/security.hxx | 22 | ||||
-rw-r--r-- | vos/inc/vos/socket.hxx | 34 | ||||
-rw-r--r-- | vos/inc/vos/types.hxx | 7 | ||||
-rw-r--r-- | vos/source/process.cxx | 10 |
8 files changed, 65 insertions, 68 deletions
diff --git a/vos/inc/vos/diagnose.hxx b/vos/inc/vos/diagnose.hxx index dcae8ed1e8be..fb8f0f1bfb6e 100644 --- a/vos/inc/vos/diagnose.hxx +++ b/vos/inc/vos/diagnose.hxx @@ -2,9 +2,9 @@ * * $RCSfile: diagnose.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:18:12 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ #define VOS_TRACE _OSL_TRACE #define VOS_ASSERT(c) _OSL_ASSERT(c, VOS_THIS_FILE, __LINE__) #define VOS_VERIFY(c) _OSL_VERIFY(c, VOS_THIS_FILE, __LINE__) -#define VOS_ENSHURE(c, m) _OSL_ENSHURE(c, VOS_THIS_FILE, __LINE__, m) +#define VOS_ENSHURE(c, m) _OSL_ENSURE(c, VOS_THIS_FILE, __LINE__, m) #define VOS_ENSURE(c, m) _OSL_ENSURE(c, VOS_THIS_FILE, __LINE__, m) #define VOS_PRECOND(c, m) VOS_ENSHURE(c, m) diff --git a/vos/inc/vos/module.hxx b/vos/inc/vos/module.hxx index a3e793cf87e4..52ea0dc757f2 100644 --- a/vos/inc/vos/module.hxx +++ b/vos/inc/vos/module.hxx @@ -2,9 +2,9 @@ * * $RCSfile: module.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:18:12 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,11 +88,11 @@ public: OModule(); /// this c'tor is a combination of the default c'tor and load() - OModule(const NAMESPACE_RTL(OUString)& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); + OModule(const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); virtual ~OModule(); /// loads the specified module - sal_Bool SAL_CALL load(const NAMESPACE_RTL(OUString)& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); + sal_Bool SAL_CALL load(const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); /// unloads the currently loaded module void SAL_CALL unload(); @@ -103,11 +103,11 @@ public: #if 0 // not implemented yet // returns the name of the currently loaded module or an empty string if none. - NAMESPACE_RTL(OUString) SAL_CALL getModuleName(); + ::rtl::OUString SAL_CALL getModuleName(); #endif /// returns a pointer to the specified Symbol if found, NULL otherwise - void* SAL_CALL getSymbol(const NAMESPACE_RTL(OUString)& strSymbolName); + void* SAL_CALL getSymbol(const ::rtl::OUString& strSymbolName); protected: diff --git a/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx index 22340f7c8107..18ecd8eca2a4 100644 --- a/vos/inc/vos/pipe.hxx +++ b/vos/inc/vos/pipe.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pipe.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jl $ $Date: 2001-03-16 13:38:54 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -144,14 +144,14 @@ public: @param strName @param Options */ - OPipe(const NAMESPACE_RTL(OUString)& strName, TPipeOption Options = TOption_Open); + OPipe(const ::rtl::OUString& strName, TPipeOption Options = TOption_Open); /** Creates a pipe. @param strName @param Options @param Security */ - OPipe(const NAMESPACE_RTL(OUString)& strName, TPipeOption Options, + OPipe(const ::rtl::OUString& strName, TPipeOption Options, const NAMESPACE_VOS(OSecurity)& rSecurity); /** Copy constructor. @@ -173,7 +173,7 @@ public: @param Options @return True if socket was successfully created. */ - sal_Bool SAL_CALL create(const NAMESPACE_RTL(OUString)& strName, TPipeOption Options = TOption_Open); + sal_Bool SAL_CALL create(const ::rtl::OUString& strName, TPipeOption Options = TOption_Open); /** Create a pipe with the given attributes. If socket was already created, the old one will be discarded. @@ -182,7 +182,7 @@ public: @param Security @return True if socket was successfully created. */ - sal_Bool SAL_CALL create(const NAMESPACE_RTL(OUString)& strName, TPipeOption Options, + sal_Bool SAL_CALL create(const ::rtl::OUString& strName, TPipeOption Options, const NAMESPACE_VOS(OSecurity)& rSecurity); /** Assignment operator. If pipe was already created, the old one will diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx index 46daa1b91040..1a5b5fe83bba 100644 --- a/vos/inc/vos/process.hxx +++ b/vos/inc/vos/process.hxx @@ -2,9 +2,9 @@ * * $RCSfile: process.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mfe $ $Date: 2001-02-06 17:34:19 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,9 +98,9 @@ class OArgumentList public: OArgumentList(); - OArgumentList( sal_uInt32 nArgs, const NAMESPACE_RTL(OUString)* aArgument1, ... ); + OArgumentList( sal_uInt32 nArgs, const ::rtl::OUString* aArgument1, ... ); // switched argument list to avoid ambiguity with previous constructor. - OArgumentList( const NAMESPACE_RTL(OUString) aArgumentList[], sal_uInt32 nArgs ); + OArgumentList( const ::rtl::OUString aArgumentList[], sal_uInt32 nArgs ); OArgumentList( const OArgumentList& rOther); @@ -121,9 +121,9 @@ class OEnvironment public: OEnvironment(); - OEnvironment( sal_uInt32 nVars, const NAMESPACE_RTL(OUString)* aVariable1, ... ); + OEnvironment( sal_uInt32 nVars, const ::rtl::OUString* aVariable1, ... ); // switched argument list to avoid ambiguity with previous constructor. - OEnvironment( const NAMESPACE_RTL(OUString) aVariableList[], sal_uInt32 nVars ); + OEnvironment( const ::rtl::OUString aVariableList[], sal_uInt32 nVars ); OEnvironment( const OEnvironment& rOther ); @@ -202,10 +202,10 @@ public: OProcess( ); - OProcess(const NAMESPACE_RTL(OUString)& strImageName); + OProcess(const ::rtl::OUString& strImageName); - OProcess(const NAMESPACE_RTL(OUString)& strImageName, - const NAMESPACE_RTL(OUString)& strWorkingDirectory); + OProcess(const ::rtl::OUString& strImageName, + const ::rtl::OUString& strWorkingDirectory); /// destroying a process object virtual ~OProcess(); @@ -268,8 +268,8 @@ public: void SAL_CALL provideIOResource(oslSocket Socket, TDescriptorFlags Flags = TFlags_Wait); protected: - const NAMESPACE_RTL(OUString) m_strImageName; - const NAMESPACE_RTL(OUString) m_strDirectory; + const ::rtl::OUString m_strImageName; + const ::rtl::OUString m_strDirectory; oslIOResource* m_IoResources; sal_Int32 m_NoResources; @@ -324,9 +324,9 @@ public: @param strCommandArg [out] the string that receives the argument. @return eNONE */ - TStartupError SAL_CALL getCommandArg(sal_uInt32 nArg, NAMESPACE_RTL(OUString)& strCommandArg); + TStartupError SAL_CALL getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg); - TStartupError SAL_CALL getExecutableFile(NAMESPACE_RTL(OUString)& strImageName); + TStartupError SAL_CALL getExecutableFile(::rtl::OUString& strImageName); /** Get the value of one enviroment variable. @param Name [in] denotes the name of the variable to get. @@ -334,7 +334,7 @@ public: @param Max [in] is the size of this buffer. @return eNONE, if the variable exist in the enviroment, otherwise False. */ - TStartupError SAL_CALL getEnvironment(const NAMESPACE_RTL(OUString)& strVar, NAMESPACE_RTL(OUString)& strValue); + TStartupError SAL_CALL getEnvironment(const ::rtl::OUString& strVar, ::rtl::OUString& strValue); protected: oslIOResource* m_IoResources; @@ -380,7 +380,7 @@ public: @return sal_True if the nArg-th argument has been retriveded successfully @return sal_False on all other cases */ - sal_Bool SAL_CALL getCommandArg(sal_uInt32 nArg, NAMESPACE_RTL(OUString)& strCommandArg); + sal_Bool SAL_CALL getCommandArg(sal_uInt32 nArg, ::rtl::OUString& strCommandArg); }; diff --git a/vos/inc/vos/security.hxx b/vos/inc/vos/security.hxx index c7544811255d..4812ed3c23a6 100644 --- a/vos/inc/vos/security.hxx +++ b/vos/inc/vos/security.hxx @@ -2,9 +2,9 @@ * * $RCSfile: security.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:18:13 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,8 +101,8 @@ public: @return True, if the specified user is known by the underlying operating system, otherwise False */ - sal_Bool SAL_CALL logonUser(const NAMESPACE_RTL(OUString)& strName, - const NAMESPACE_RTL(OUString)& strPasswd); + sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName, + const ::rtl::OUString& strPasswd); /** get the security information for one user. This method will try to login the user at the denoted file server. If a network resource named \\server\username exists and this resource @@ -113,37 +113,37 @@ public: @return True, if the specified user is known by file server and the could be connected, otherwise False */ - sal_Bool SAL_CALL logonUser(const NAMESPACE_RTL(OUString)& strName, - const NAMESPACE_RTL(OUString)& strPasswd, - const NAMESPACE_RTL(OUString)& strFileServer); + sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName, + const ::rtl::OUString& strPasswd, + const ::rtl::OUString& strFileServer); /** get the ident of the logged in user. @param strName [out] is the buffer which returns the name @param max [in] is the size of this buffer @return True, if any user is successfuly logged in, otherwise False */ - sal_Bool SAL_CALL getUserIdent(NAMESPACE_RTL(OUString)& strIdent) const; + sal_Bool SAL_CALL getUserIdent(::rtl::OUString& strIdent) const; /** get the name of the logged in user. @param strName [out] is the buffer which returns the name @param max [in] is the size of this buffer @return True, if any user is successfuly logged in, otherwise False */ - sal_Bool SAL_CALL getUserName(NAMESPACE_RTL(OUString)& strName) const; + sal_Bool SAL_CALL getUserName(::rtl::OUString& strName) const; /** get the home directory of the logged in user. @param strDirectory [out] is the buffer which returns the directory name @param max [in] is the size of this buffer @return True, if any user is successfuly logged in, otherwise False */ - sal_Bool SAL_CALL getHomeDir(NAMESPACE_RTL(OUString)& strDirectory) const; + sal_Bool SAL_CALL getHomeDir(::rtl::OUString& strDirectory) const; /** get the directory for configuration data of the logged in user. @param strDirectory [out] is the buffer which returns the directory name @param max [in] is the size of this buffer @return True, if any user is successfuly logged in, otherwise False */ - sal_Bool SAL_CALL getConfigDir(NAMESPACE_RTL(OUString)& strDirectory) const; + sal_Bool SAL_CALL getConfigDir(::rtl::OUString& strDirectory) const; /** Query if the user who is logged inhas administrator rigths. @return True, if the user has administrator rights, otherwise false. diff --git a/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx index 077392f7b74a..fa1242b1ef8a 100644 --- a/vos/inc/vos/socket.hxx +++ b/vos/inc/vos/socket.hxx @@ -2,9 +2,9 @@ * * $RCSfile: socket.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jl $ $Date: 2001-03-14 10:01:09 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -246,7 +246,7 @@ public: virtual TAddrFamily SAL_CALL getFamily() const= 0; - virtual TResult SAL_CALL getHostname(NAMESPACE_RTL(OUString)& strHostName) const= 0; + virtual TResult SAL_CALL getHostname(::rtl::OUString& strHostName) const= 0; virtual SAL_CALL operator oslSocketAddr() const= 0; virtual void SAL_CALL operator= (oslSocketAddr Addr)= 0; virtual sal_Bool SAL_CALL operator== (oslSocketAddr Addr)= 0; @@ -288,17 +288,17 @@ public: @return the hostname represented by the address. On failure returns the empty string. */ - virtual TResult SAL_CALL getHostname(NAMESPACE_RTL(OUString)& strHostName) const; + virtual TResult SAL_CALL getHostname(::rtl::OUString& strHostName) const; /** Get the hostname for the local interface. @return the hostname or an error. */ - static TResult SAL_CALL getLocalHostname(NAMESPACE_RTL(OUString)& strLocalHostName); + static TResult SAL_CALL getLocalHostname(::rtl::OUString& strLocalHostName); /** Tries to find an address for a host. @return A new created socket-address or 0 if the name could not be found. */ - static oslSocketAddr SAL_CALL resolveHostname(const NAMESPACE_RTL(OUString)& strHostName); + static oslSocketAddr SAL_CALL resolveHostname(const ::rtl::OUString& strHostName); /** Wraps itself around the osl Socket-Address. The object assumes ownership of the Addr, it @@ -343,7 +343,7 @@ public: Create a socket address either from a dotted decimal address (e.g. 141.99.128.50) or a hostname (e.g. www.stardiv.de). */ - OInetSocketAddr(const NAMESPACE_RTL(OUString)& strAddrOrHostName, sal_Int32 Port); + OInetSocketAddr(const ::rtl::OUString& strAddrOrHostName, sal_Int32 Port); /** Copy constructor. @@ -379,8 +379,8 @@ public: @return the port number in host-byte order or CVOS_PORT_NONE if no service/protocol pair could be found. */ - static sal_Int32 SAL_CALL getServicePort(const NAMESPACE_RTL(OUString)& strServiceName, - const NAMESPACE_RTL(OUString)& strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) ); + static sal_Int32 SAL_CALL getServicePort(const ::rtl::OUString& strServiceName, + const ::rtl::OUString& strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) ); /** Delivers the port number of the address. @@ -397,13 +397,13 @@ public: /** @return the dotted-address-form (141.99.128.90) of this address. On failure returns the empty string. */ - TResult SAL_CALL getDottedAddr(NAMESPACE_RTL(OUString)& strDottedAddr) const; + TResult SAL_CALL getDottedAddr(::rtl::OUString& strDottedAddr) const; /** Sets the host-part of the address from the dotted-address-form (141.99.128.90) or from a hostname. @param strDottedAddrOrHostname the address in dotted form or a hostname. */ - sal_Bool SAL_CALL setAddr(const NAMESPACE_RTL(OUString)& strDottedAddrOrHostname); + sal_Bool SAL_CALL setAddr(const ::rtl::OUString& strDottedAddrOrHostname); }; @@ -429,8 +429,8 @@ public: /** Create an IPX/SPX socketaddress from native parameters. */ - OIpxSocketAddr(const NAMESPACE_RTL(OUString)& strNetNumber, - const NAMESPACE_RTL(OUString)& strNodeNumber, + OIpxSocketAddr(const ::rtl::OUString& strNetNumber, + const ::rtl::OUString& strNodeNumber, sal_uInt32 SocketNumber); /** Copy constructor. @@ -474,7 +474,7 @@ public: /** Builds a human readable string in the format network.node:socket. The numbers are given in hexadecimal form. */ - void SAL_CALL getAddressString(NAMESPACE_RTL(OUString)& strAddressString) const; + void SAL_CALL getAddressString(::rtl::OUString& strAddressString) const; }; @@ -570,7 +570,7 @@ public: /** Get the hostname for the local interface. @return the hostname or an empty string (""). */ - TResult SAL_CALL getLocalHost(NAMESPACE_RTL(OUString)& strLocalHost) const; + TResult SAL_CALL getLocalHost(::rtl::OUString& strLocalHost) const; /** Retrieves the address of the remote host of this socket. @param Addr [out] receives the address. @@ -585,7 +585,7 @@ public: /** Get the hostname for the remote interface. @return the hostname or an empty string (""). */ - TResult SAL_CALL getPeerHost(NAMESPACE_RTL(OUString)& strPeerHost) const; + TResult SAL_CALL getPeerHost(::rtl::OUString& strPeerHost) const; /** Binds the socket to the specified (local) interface. @param LocalInterface Address of the Interface @@ -846,7 +846,7 @@ public: sal_Int16 if the buffer isn't large enough, but still remains a valid zero-terminated string. */ - void SAL_CALL getError(NAMESPACE_RTL(OUString)& strError) const; + void SAL_CALL getError(::rtl::OUString& strError) const; /** Delivers a constant decribing the last error for the socket system. @return ENONE if no error occured, invalid_SocketError if diff --git a/vos/inc/vos/types.hxx b/vos/inc/vos/types.hxx index e68f3051751c..d4889b8848cf 100644 --- a/vos/inc/vos/types.hxx +++ b/vos/inc/vos/types.hxx @@ -2,9 +2,9 @@ * * $RCSfile: types.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:18:13 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,9 +63,6 @@ #ifndef _VOS_TYPES_HXX_ #define _VOS_TYPES_HXX_ -#ifndef _OSL_TYPES_H_ -# include <osl/types.h> -#endif /* disable some warnings for MS-C */ #ifdef _MSC_VER diff --git a/vos/source/process.cxx b/vos/source/process.cxx index b0365640e018..194cc7cd8f4d 100644 --- a/vos/source/process.cxx +++ b/vos/source/process.cxx @@ -2,9 +2,9 @@ * * $RCSfile: process.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jbu $ $Date: 2001-03-14 16:38:40 $ + * last change: $Author: jl $ $Date: 2001-03-16 15:25:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ OArgumentList::OArgumentList() : // empty } -OArgumentList::OArgumentList( sal_uInt32 nArgs, const NAMESPACE_RTL(OUString)* aArgument1, ... ) : +OArgumentList::OArgumentList( sal_uInt32 nArgs, const ::rtl::OUString* aArgument1, ... ) : n_Args( nArgs ) { m_aVec = new rtl_uString* [nArgs]; @@ -173,7 +173,7 @@ OEnvironment::OEnvironment() : { } -OEnvironment::OEnvironment( sal_uInt32 nVars, const NAMESPACE_RTL(OUString)* aArgument1, ... ) : +OEnvironment::OEnvironment( sal_uInt32 nVars, const ::rtl::OUString* aArgument1, ... ) : n_Vars( nVars ) { m_aVec = new rtl_uString* [nVars]; @@ -196,7 +196,7 @@ OEnvironment::OEnvironment( sal_uInt32 nVars, const NAMESPACE_RTL(OUString)* aAr } -OEnvironment::OEnvironment( const NAMESPACE_RTL(OUString) aVariableList[], sal_uInt32 nVars ) : +OEnvironment::OEnvironment( const ::rtl::OUString aVariableList[], sal_uInt32 nVars ) : n_Vars( nVars ) { m_aVec = new rtl_uString* [n_Vars]; |