diff options
Diffstat (limited to 'registry/source/regimpl.hxx')
| -rw-r--r-- | registry/source/regimpl.hxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index 32baf9cc6ed5..54048584d7f7 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -32,10 +32,10 @@ #define _REGIMPL_HXX_ #include <set> - #include <hash_map> #include <registry/registry.h> +#include <rtl/ustring.hxx> #include <osl/mutex.hxx> #include <store/store.hxx> @@ -62,11 +62,10 @@ #define REG_CREATE 0x0004 // allow write accesses #define REG_GUARD(mutex) \ - Guard< Mutex > aGuard( mutex ); + osl::Guard< osl::Mutex > aGuard( mutex ); -using namespace rtl; -using namespace osl; -using namespace store; +// @@@ using namespace rtl; +// @@@ using namespace osl; class ORegKey; class RegistryTypeReader; @@ -82,39 +81,40 @@ public: sal_uInt32 release() { return --m_refCount; } - RegError initRegistry(const OUString& name, + RegError initRegistry(const rtl::OUString& name, RegAccessMode accessMode); RegError closeRegistry(); - RegError destroyRegistry(const OUString& name); + RegError destroyRegistry(const rtl::OUString& name); + + RegError acquireKey(RegKeyHandle hKey); + RegError releaseKey(RegKeyHandle hKey); RegError createKey(RegKeyHandle hKey, - const OUString& keyName, + const rtl::OUString& keyName, RegKeyHandle* phNewKey); RegError openKey(RegKeyHandle hKey, - const OUString& keyName, + const rtl::OUString& keyName, RegKeyHandle* phOpenKey); RegError closeKey(RegKeyHandle hKey); - RegError deleteKey(RegKeyHandle hKey, const OUString& keyName); + RegError deleteKey(RegKeyHandle hKey, const rtl::OUString& keyName); RegError loadKey(RegKeyHandle hKey, - const OUString& regFileName, + const rtl::OUString& regFileName, sal_Bool bWarings=sal_False, sal_Bool bReport=sal_False); RegError saveKey(RegKeyHandle hKey, - const OUString& regFileName, + const rtl::OUString& regFileName, sal_Bool bWarings=sal_False, sal_Bool bReport=sal_False); RegError dumpRegistry(RegKeyHandle hKey) const; - RegError flush(); - ~ORegistry(); sal_Bool isReadOnly() const @@ -125,62 +125,62 @@ public: ORegKey* getRootKey(); - const OStoreFile& getStoreFile() + const store::OStoreFile& getStoreFile() { return m_file; } - const OUString& getName() const + const rtl::OUString& getName() const { return m_name; } friend class ORegKey; private: - RegError eraseKey(ORegKey* pKey, const OUString& keyName); + RegError eraseKey(ORegKey* pKey, const rtl::OUString& keyName); RegError deleteSubkeysAndValues(ORegKey* pKey); RegError loadAndSaveValue(ORegKey* pTargetKey, ORegKey* pSourceKey, - const OUString& valueName, + const rtl::OUString& valueName, sal_uInt32 nCut, sal_Bool bWarnings=sal_False, sal_Bool bReport=sal_False); - RegError checkBlop(OStoreStream& rValue, - const OUString& sTargetPath, + RegError checkBlop(store::OStoreStream& rValue, + const rtl::OUString& sTargetPath, sal_uInt32 srcValueSize, sal_uInt8* pSrcBuffer, sal_Bool bReport=sal_False); - RegError mergeModuleValue(OStoreStream& rTargetValue, + RegError mergeModuleValue(store::OStoreStream& rTargetValue, RegistryTypeReader& reader, RegistryTypeReader& reader2); RegError loadAndSaveKeys(ORegKey* pTargetKey, ORegKey* pSourceKey, - const OUString& keyName, + const rtl::OUString& keyName, sal_uInt32 nCut, sal_Bool bWarnings=sal_False, sal_Bool bReport=sal_False); - RegError dumpValue(const OUString& sPath, - const OUString& sName, + RegError dumpValue(const rtl::OUString& sPath, + const rtl::OUString& sName, sal_Int16 nSpace) const; - RegError dumpKey(const OUString& sPath, - const OUString& sName, + RegError dumpKey(const rtl::OUString& sPath, + const rtl::OUString& sName, sal_Int16 nSpace) const; - typedef std::hash_map< OUString, ORegKey*, OUStringHash > KeyMap; + typedef std::hash_map< rtl::OUString, ORegKey*, rtl::OUStringHash > KeyMap; sal_uInt32 m_refCount; - Mutex m_mutex; + osl::Mutex m_mutex; sal_Bool m_readOnly; sal_Bool m_isOpen; - OUString m_name; - OStoreFile m_file; + rtl::OUString m_name; + store::OStoreFile m_file; KeyMap m_openKeyTable; - const OUString ROOT; + const rtl::OUString ROOT; }; #endif |