summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/osmartpointer.h (renamed from libopie2/opiecore/osmart_pointer.h)27
1 files changed, 14 insertions, 13 deletions
diff --git a/libopie2/opiecore/osmart_pointer.h b/libopie2/opiecore/osmartpointer.h
index 2a2518f..9000e71 100644
--- a/libopie2/opiecore/osmart_pointer.h
+++ b/libopie2/opiecore/osmartpointer.h
@@ -30,9 +30,9 @@ _;:, .> :=|. This program is free software; you can
*/
-#ifndef _osmart_pointer_h
-#define _osmart_pointer_h
+#ifndef _OSmartPointer_h
+#define _OSmartPointer_h
/*!
- * \file osmart_pointer.h
+ * \file OSmartPointer.h
* \brief smart pointer and reference counter
* \author Rajko Albrecht
@@ -43,5 +43,5 @@ namespace Opie {
//! simple reference counter class
-class oref_count {
+class ORefCount {
protected:
//! reference count member
@@ -49,7 +49,7 @@ protected:
public:
//! first reference must be added after "new" via Pointer()
- oref_count() : m_RefCount(0)
+ ORefCount() : m_RefCount(0)
{}
- virtual ~oref_count() {}
+ virtual ~ORefCount() {}
//! add a reference
void Incr() {
@@ -65,5 +65,5 @@ public:
//! reference counting wrapper class
-template<class T> class osmart_pointer {
+template<class T> class OSmartPointer {
//! pointer to object
/*!
@@ -75,5 +75,5 @@ template<class T> class osmart_pointer {
public:
//! standart constructor
- osmart_pointer() { ptr = NULL; }
+ OSmartPointer() { ptr = NULL; }
//! standart destructor
/*!
@@ -81,5 +81,5 @@ public:
* ptr
*/
- ~osmart_pointer()
+ ~OSmartPointer()
{
if (ptr){
@@ -90,10 +90,10 @@ public:
}
//! construction
- osmart_pointer(T* t) { if (ptr = t) ptr->Incr(); }
+ OSmartPointer(T* t) { if (ptr = t) ptr->Incr(); }
//! Pointer copy
- osmart_pointer(const osmart_pointer<T>& p)
+ OSmartPointer(const OSmartPointer<T>& p)
{ if (ptr = p.ptr) ptr->Incr(); }
//! pointer copy by assignment
- osmart_pointer<T>& operator= (const osmart_pointer<T>& p)
+ OSmartPointer<T>& operator= (const OSmartPointer<T>& p)
{
// already same: nothing to do
@@ -105,5 +105,5 @@ public:
return *this;
}
- osmart_pointer<T>& operator= (T*p)
+ OSmartPointer<T>& operator= (T*p)
{
if (ptr==p)return *this;
@@ -143,2 +143,3 @@ public:
#endif
+