-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 @@ -31,7 +31,7 @@ _;:, .> :=|. 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 @@ -44,3 +44,3 @@ namespace Opie { //! simple reference counter class -class oref_count { +class ORefCount { protected: @@ -50,5 +50,5 @@ 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 @@ -66,3 +66,3 @@ public: //! reference counting wrapper class -template<class T> class osmart_pointer { +template<class T> class OSmartPointer { //! pointer to object @@ -76,3 +76,3 @@ public: //! standart constructor - osmart_pointer() { ptr = NULL; } + OSmartPointer() { ptr = NULL; } //! standart destructor @@ -82,3 +82,3 @@ public: */ - ~osmart_pointer() + ~OSmartPointer() { @@ -91,8 +91,8 @@ 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) { @@ -106,3 +106,3 @@ public: } - osmart_pointer<T>& operator= (T*p) + OSmartPointer<T>& operator= (T*p) { @@ -144 +144,2 @@ public: #endif + |