[M-CVS] CVS: M/src/adb ProvLine.cpp,1.8,1.9

[Robert Vazan]

Update of /cvsroot/mahogany/M/src/adb
In directory sc8-pr-cvs1:/tmp/cvs-serv2378/src/adb

Modified Files:
        ProvLine.cpp 
Log Message:
Cleaned up RefCounter and WeakRef interfaces

Index: ProvLine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvLine.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ProvLine.cpp        16 Oct 2003 10:29:23 -0000      1.8
+++ ProvLine.cpp        16 Oct 2003 12:17:10 -0000      1.9
@@ -41,6 +41,7 @@
 
 // fwd decl
-class LineEntry;
-class LineEntryData;
+DECLARE_REF_COUNTER(LineBook)
+DECLARE_REF_COUNTER(LineEntry)
+DECLARE_REF_COUNTER(LineEntryData)
 
 WX_DECLARE_STRING_HASH_MAP(RefCounter<LineEntryData>,LineEntryArray);
@@ -166,5 +167,5 @@
    
    // Don't call IncRef
-   virtual AdbEntryGroup *GetGroup() const { return m_book.Get(); }
+   virtual AdbEntryGroup *GetGroup() const { return m_book.get(); }
 
    virtual void GetFieldInternal(size_t n, String *pstr) const
@@ -223,4 +224,6 @@
 // ----------------------------------------------------------------------------
 
+DEFINE_REF_COUNTER(LineBook)
+
 // Duplicate of FCBook::GetFullAdbPath. It should be shared somehow.
 String LineBook::GetFullAdbPath(const String& filename)
@@ -302,5 +305,5 @@
    RefCounter<LineEntryData> data(new LineEntryData);
    RefCounter<LineEntry> entry(new LineEntry(
-      RefCounter<LineBook>::Convert(this),data));
+      RefCounter<LineBook>::convert(this),data));
    
    LineEntryArray::value_type pair(name,data);
@@ -309,5 +312,5 @@
    m_dirty = true;
    
-   return entry.Release();
+   return entry.release();
 }
 
@@ -331,9 +334,9 @@
    if( !entry )
    {
-      entry.Attach(new LineEntry(
-            RefCounter<LineBook>::Convert(this),found->second));
+      entry.attach(new LineEntry(
+            RefCounter<LineBook>::convert(this),found->second));
    }
 
-   return entry.Release();
+   return entry.release();
 }
 
@@ -442,9 +445,11 @@
 // ----------------------------------------------------------------------------
 
+DEFINE_REF_COUNTER(LineEntry)
+
 LineEntry::LineEntry(RefCounter<LineBook> parent,
    RefCounter<LineEntryData> data)
    : m_book(parent), m_data(data)
 {
-   m_data->m_handle = RefCounter<LineEntry>::Convert(this);
+   m_data->m_handle = RefCounter<LineEntry>::convert(this);
 }
 
@@ -466,4 +471,6 @@
 // ----------------------------------------------------------------------------
 
+DEFINE_REF_COUNTER(LineEntryData)
+
 void LineEntryData::GetField(size_t n, String *pstr) const
 {
@@ -545,5 +552,5 @@
    RefCounter<LineBook> book(new LineBook(name));
    CHECK ( !book->IsBad(), NULL, _T("Cannot create LineBook") )
-   return book.Release();
+   return book.release();
 }
 



-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates