summaryrefslogtreecommitdiff
path: root/store
diff options
context:
space:
mode:
Diffstat (limited to 'store')
-rw-r--r--store/source/storbase.cxx2
-rw-r--r--store/source/storbase.hxx18
-rw-r--r--store/source/storbios.cxx14
-rw-r--r--store/source/storbios.hxx26
-rw-r--r--store/source/storcach.cxx2
-rw-r--r--store/source/stordata.hxx24
-rw-r--r--store/source/stordir.cxx4
-rw-r--r--store/source/stordir.hxx4
-rw-r--r--store/source/storlckb.cxx6
-rw-r--r--store/source/storlckb.hxx6
-rw-r--r--store/source/storpage.cxx6
-rw-r--r--store/source/storpage.hxx8
-rw-r--r--store/source/stortree.hxx12
13 files changed, 66 insertions, 66 deletions
diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx
index fb14595bdf01..a96c97bd0c08 100644
--- a/store/source/storbase.cxx
+++ b/store/source/storbase.cxx
@@ -165,7 +165,7 @@ PageData::Allocator::createInstance (rtl::Reference< PageData::Allocator > & rxA
/*
* ~OStorePageObject.
*/
-OStorePageObject::~OStorePageObject (void)
+OStorePageObject::~OStorePageObject()
{
}
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 83b3ab68c4b9..83dd44888219 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -794,13 +794,13 @@ public:
/** State.
*/
- inline bool dirty (void) const;
- inline void clean (void);
- inline void touch (void);
+ inline bool dirty() const;
+ inline void clean();
+ inline void touch();
/** Location.
*/
- inline sal_uInt32 location (void) const;
+ inline sal_uInt32 location() const;
inline void location (sal_uInt32 nAddr);
protected:
@@ -817,7 +817,7 @@ protected:
/** Destruction.
*/
- virtual ~OStorePageObject (void);
+ virtual ~OStorePageObject();
public:
template< class U >
@@ -847,22 +847,22 @@ public:
virtual storeError verify (sal_uInt32 nAddr) const = 0;
};
-inline bool OStorePageObject::dirty (void) const
+inline bool OStorePageObject::dirty() const
{
return m_bDirty;
}
-inline void OStorePageObject::clean (void)
+inline void OStorePageObject::clean()
{
m_bDirty = false;
}
-inline void OStorePageObject::touch (void)
+inline void OStorePageObject::touch()
{
m_bDirty = true;
}
-inline sal_uInt32 OStorePageObject::location (void) const
+inline sal_uInt32 OStorePageObject::location() const
{
return m_xPage->location();
}
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx
index 1e777ff178e1..3f9ec2d93052 100644
--- a/store/source/storbios.cxx
+++ b/store/source/storbios.cxx
@@ -89,11 +89,11 @@ struct OStoreSuperBlock
/** unused(Count|Head|Insert|Remove|Reset).
*/
- sal_uInt32 unusedCount (void) const
+ sal_uInt32 unusedCount() const
{
return store::ntohl(m_nUnused);
}
- const L& unusedHead (void) const
+ const L& unusedHead() const
{
return m_aUnused;
}
@@ -109,7 +109,7 @@ struct OStoreSuperBlock
m_nUnused = store::htonl(nUnused - 1);
m_aUnused = rLink;
}
- void unusedReset (void)
+ void unusedReset()
{
m_nUnused = store::htonl(0);
m_aUnused = L(0);
@@ -528,7 +528,7 @@ OStorePageBIOS::AceCache::destroy (OStorePageBIOS::Ace * ace)
/*
* OStorePageBIOS.
*/
-OStorePageBIOS::OStorePageBIOS (void)
+OStorePageBIOS::OStorePageBIOS()
: m_xLockBytes (NULL),
m_pSuper (NULL),
m_bWriteable (false)
@@ -538,7 +538,7 @@ OStorePageBIOS::OStorePageBIOS (void)
/*
* ~OStorePageBIOS.
*/
-OStorePageBIOS::~OStorePageBIOS (void)
+OStorePageBIOS::~OStorePageBIOS()
{
cleanup_Impl();
}
@@ -786,7 +786,7 @@ storeError OStorePageBIOS::releasePage (const OStorePageDescriptor& rDescr)
* getRefererCount.
* Precond: none.
*/
-sal_uInt32 OStorePageBIOS::getRefererCount (void)
+sal_uInt32 OStorePageBIOS::getRefererCount()
{
// Acquire exclusive access.
osl::MutexGuard aGuard (m_aMutex);
@@ -971,7 +971,7 @@ storeError OStorePageBIOS::close()
* flush.
* Precond: initialized.
*/
-storeError OStorePageBIOS::flush (void)
+storeError OStorePageBIOS::flush()
{
// Acquire exclusive access.
osl::MutexGuard aGuard (m_aMutex);
diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx
index ceffce7e4ebc..0380b134485e 100644
--- a/store/source/storbios.hxx
+++ b/store/source/storbios.hxx
@@ -45,7 +45,7 @@ class OStorePageBIOS : public store::OStoreObject
public:
/** Construction.
*/
- OStorePageBIOS (void);
+ OStorePageBIOS();
/** Conversion into Mutex&
*/
@@ -79,11 +79,11 @@ public:
/** isWriteable.
*/
- inline bool isWriteable (void) const;
+ inline bool isWriteable() const;
/** isValid.
*/
- inline bool isValid (void) const;
+ inline bool isValid() const;
/** Page Access.
*/
@@ -92,7 +92,7 @@ public:
storeError releasePage (const OStorePageDescriptor& rDescr);
- sal_uInt32 getRefererCount (void);
+ sal_uInt32 getRefererCount();
/** Page Allocation.
*/
@@ -119,12 +119,12 @@ public:
/** close.
* @return store_E_None upon success.
*/
- storeError close (void);
+ storeError close();
/** flush.
* @return store_E_None upon success.
*/
- storeError flush (void);
+ storeError flush();
/** size.
*/
@@ -142,11 +142,11 @@ public:
/** Construction.
*/
- inline ScanContext (void);
+ inline ScanContext();
/** isValid.
*/
- inline bool isValid (void) const;
+ inline bool isValid() const;
};
/** scanBegin.
@@ -164,7 +164,7 @@ public:
protected:
/** Destruction (OReference).
*/
- virtual ~OStorePageBIOS (void);
+ virtual ~OStorePageBIOS();
private:
/** Representation.
@@ -227,20 +227,20 @@ inline OStorePageBIOS::operator osl::Mutex& (void) const
{
return (osl::Mutex&)m_aMutex;
}
-inline bool OStorePageBIOS::isWriteable (void) const
+inline bool OStorePageBIOS::isWriteable() const
{
return m_bWriteable;
}
-inline bool OStorePageBIOS::isValid (void) const
+inline bool OStorePageBIOS::isValid() const
{
return m_xLockBytes.is();
}
-inline OStorePageBIOS::ScanContext::ScanContext (void)
+inline OStorePageBIOS::ScanContext::ScanContext()
: m_aDescr (0, 0, 0), m_nSize (0), m_nMagic (0)
{
}
-inline bool OStorePageBIOS::ScanContext::isValid (void) const
+inline bool OStorePageBIOS::ScanContext::isValid() const
{
return (m_aDescr.m_nAddr < m_nSize);
}
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 5146ee13d979..072679cd0e0f 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -276,7 +276,7 @@ public:
protected:
// Destruction
- virtual ~PageCache_Impl (void);
+ virtual ~PageCache_Impl();
};
} // namespace store
diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx
index 52bfb8ac63e7..a8b131778778 100644
--- a/store/source/stordata.hxx
+++ b/store/source/stordata.hxx
@@ -306,7 +306,7 @@ struct OStorePageNameBlock
/** initialize.
*/
- void initialize (void)
+ void initialize()
{
m_aGuard = G();
m_aKey = K();
@@ -316,7 +316,7 @@ struct OStorePageNameBlock
/** Construction.
*/
- OStorePageNameBlock (void)
+ OStorePageNameBlock()
: m_aGuard(), m_aKey(), m_nAttrib (0)
{
memset (m_pData, 0, sizeof(m_pData));
@@ -373,7 +373,7 @@ struct OStoreDirectoryDataBlock
/** Construction.
*/
- LinkDescriptor (void)
+ LinkDescriptor()
: m_nIndex0 ((sal_uInt16)(~0)),
m_nIndex1 ((sal_uInt16)(~0)),
m_nIndex2 ((sal_uInt16)(~0)),
@@ -394,7 +394,7 @@ struct OStoreDirectoryDataBlock
/** initialize.
*/
- void initialize (void)
+ void initialize()
{
memset(m_pDirect, STORE_PAGE_NULL, sizeof(m_pDirect));
memset(m_pSingle, STORE_PAGE_NULL, sizeof(m_pSingle));
@@ -404,7 +404,7 @@ struct OStoreDirectoryDataBlock
/** Construction.
*/
- LinkTable (void)
+ LinkTable()
{
initialize();
}
@@ -422,7 +422,7 @@ struct OStoreDirectoryDataBlock
/** initialize.
*/
- void initialize (void)
+ void initialize()
{
m_aGuard = G();
m_aTable.initialize();
@@ -431,7 +431,7 @@ struct OStoreDirectoryDataBlock
/** Construction.
*/
- OStoreDirectoryDataBlock (void)
+ OStoreDirectoryDataBlock()
: m_aGuard(), m_aTable(), m_nDataLen (0)
{}
@@ -575,7 +575,7 @@ struct OStoreDirectoryPageData : public store::OStorePageData
/** initialize.
*/
- void initialize (void)
+ void initialize()
{
base::m_aGuard.m_nMagic = store::htonl(self::theTypeId);
base::m_aDescr.m_nUsed = store::htons(self::thePageSize);
@@ -687,7 +687,7 @@ public:
/** attrib.
*/
- sal_uInt32 attrib (void) const
+ sal_uInt32 attrib() const
{
return store::ntohl(PAGE().m_aNameBlock.m_nAttrib);
}
@@ -699,7 +699,7 @@ public:
/** key.
*/
- OStorePageKey key (void) const
+ OStorePageKey key() const
{
return PAGE().m_aNameBlock.m_aKey;
}
@@ -711,7 +711,7 @@ public:
/** path.
*/
- sal_uInt32 path (void) const
+ sal_uInt32 path() const
{
page const & rPage = PAGE();
const sal_Char * pszName = rPage.m_aNameBlock.m_pData;
@@ -729,7 +729,7 @@ public:
/** dataLength.
*/
- sal_uInt32 dataLength (void) const
+ sal_uInt32 dataLength() const
{
return store::ntohl(PAGE().m_aDataBlock.m_nDataLen);
}
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index c319b9a2de44..77ea3f0afd47 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -68,7 +68,7 @@ const sal_uInt32 OStoreDirectory_Impl::m_nTypeId = sal_uInt32(0x89191107);
/*
* OStoreDirectory_Impl.
*/
-OStoreDirectory_Impl::OStoreDirectory_Impl (void)
+OStoreDirectory_Impl::OStoreDirectory_Impl()
: m_xManager (),
m_aDescr (0, 0, 0),
m_nPath (0),
@@ -78,7 +78,7 @@ OStoreDirectory_Impl::OStoreDirectory_Impl (void)
/*
* ~OStoreDirectory_Impl.
*/
-OStoreDirectory_Impl::~OStoreDirectory_Impl (void)
+OStoreDirectory_Impl::~OStoreDirectory_Impl()
{
if (m_xManager.is())
{
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 58764784918f..8fb9de74798e 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -45,7 +45,7 @@ class OStoreDirectory_Impl : public store::OStoreObject
public:
/** Construction.
*/
- OStoreDirectory_Impl (void);
+ OStoreDirectory_Impl();
/** create (two-phase construction).
* @param pManager [in]
@@ -75,7 +75,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~OStoreDirectory_Impl (void);
+ virtual ~OStoreDirectory_Impl();
private:
/** IStoreHandle TypeId.
diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx
index 0db186b94df2..b6afa2d086c8 100644
--- a/store/source/storlckb.cxx
+++ b/store/source/storlckb.cxx
@@ -44,7 +44,7 @@ const sal_uInt32 OStoreLockBytes::m_nTypeId = sal_uInt32(0x94190310);
/*
* OStoreLockBytes.
*/
-OStoreLockBytes::OStoreLockBytes (void)
+OStoreLockBytes::OStoreLockBytes()
: m_xManager (),
m_xNode (),
m_bWriteable (false)
@@ -54,7 +54,7 @@ OStoreLockBytes::OStoreLockBytes (void)
/*
* ~OStoreLockBytes.
*/
-OStoreLockBytes::~OStoreLockBytes (void)
+OStoreLockBytes::~OStoreLockBytes()
{
if (m_xManager.is() && m_xNode.is())
{
@@ -351,7 +351,7 @@ storeError OStoreLockBytes::writeAt (
/*
* flush.
*/
-storeError OStoreLockBytes::flush (void)
+storeError OStoreLockBytes::flush()
{
if (!m_xManager.is())
return store_E_InvalidAccess;
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index 2b1b1c680e1c..67c4a14aea4d 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -45,7 +45,7 @@ class OStoreLockBytes : public store::OStoreObject
public:
/** Construction.
*/
- OStoreLockBytes (void);
+ OStoreLockBytes();
/** create (two-phase construction).
* @param pManager [in]
@@ -89,7 +89,7 @@ public:
/** flush.
* @return store_E_None upon success
*/
- storeError flush (void);
+ storeError flush();
/** setSize.
* @param nSize [in]
@@ -110,7 +110,7 @@ public:
protected:
/** Destruction (OReference).
*/
- virtual ~OStoreLockBytes (void);
+ virtual ~OStoreLockBytes();
private:
/** IStoreHandle TypeId.
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index 5599eef9a5c4..d6b186c074e5 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -47,14 +47,14 @@ const sal_uInt32 OStorePageManager::m_nTypeId = sal_uInt32(0x62190120);
/*
* OStorePageManager.
*/
-OStorePageManager::OStorePageManager (void)
+OStorePageManager::OStorePageManager()
{
}
/*
* ~OStorePageManager.
*/
-OStorePageManager::~OStorePageManager (void)
+OStorePageManager::~OStorePageManager()
{
}
@@ -798,7 +798,7 @@ struct RebuildContext
/** Construction.
*/
- RebuildContext (void)
+ RebuildContext()
: m_xBIOS (new OStorePageBIOS()),
m_nPageSize (0)
{}
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 1ff3f9f00b25..f400a3fbd25e 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -45,7 +45,7 @@ class OStorePageManager : public store::OStorePageBIOS
public:
/** Construction.
*/
- OStorePageManager (void);
+ OStorePageManager();
/** Initialization (two-phase construction).
*/
@@ -58,7 +58,7 @@ public:
* @return sal_True upon successful initialization,
* sal_False otherwise.
*/
- inline bool isValid (void) const;
+ inline bool isValid() const;
/** DirectoryPage I/O (managed).
*/
@@ -135,7 +135,7 @@ public:
protected:
/** Destruction.
*/
- virtual ~OStorePageManager (void);
+ virtual ~OStorePageManager();
private:
/** Implementation.
@@ -188,7 +188,7 @@ private:
OStorePageManager& operator= (const OStorePageManager&) SAL_DELETED_FUNCTION;
};
-inline bool OStorePageManager::isValid (void) const
+inline bool OStorePageManager::isValid() const
{
return (base::isValid() /* @@@ NYI && (m_aRoot.is()) */);
}
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index f91d94bd98e3..2cfe8f2ee683 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -126,28 +126,28 @@ struct OStoreBTreeNodeData : public store::OStorePageData
/** capacity.
*/
- sal_uInt16 capacity (void) const
+ sal_uInt16 capacity() const
{
return (store::ntohs(base::m_aDescr.m_nSize) - self::thePageSize);
}
/** capacityCount (must be even).
*/
- sal_uInt16 capacityCount (void) const
+ sal_uInt16 capacityCount() const
{
return sal_uInt16(capacity() / sizeof(T));
}
/** usage.
*/
- sal_uInt16 usage (void) const
+ sal_uInt16 usage() const
{
return (store::ntohs(base::m_aDescr.m_nUsed) - self::thePageSize);
}
/** usageCount.
*/
- sal_uInt16 usageCount (void) const
+ sal_uInt16 usageCount() const
{
return sal_uInt16(usage() / sizeof(T));
}
@@ -186,7 +186,7 @@ struct OStoreBTreeNodeData : public store::OStorePageData
/** depth.
*/
- sal_uInt32 depth (void) const
+ sal_uInt32 depth() const
{
return store::ntohl(self::m_aGuard.m_nMagic);
}
@@ -204,7 +204,7 @@ struct OStoreBTreeNodeData : public store::OStorePageData
/** querySplit.
*/
- bool querySplit (void) const
+ bool querySplit() const
{
return (!(usageCount() < capacityCount()));
}