Changeset 138 for trunk/orca

Timestamp:

05/04/06 21:52:56 (3 years ago)

Author:

krobillard

Message:

Orca - orEnv now cleared in orFreeEnv().
Orca-Qt - User defined WIDPool objects can now be flagged for auto deletion.

Location:

trunk/orca

Files:

• ovalue.c (modified) (1 diff)
• qt/qorca.cpp (modified) (8 diffs)
• qt/qorca.h (modified) (2 diffs)

trunk/orca/ovalue.c

@@ -523 +523 @@
 void orFreeEnv( OEnv* env )
 {
+    if( orEnv == env )
+        orEnv = 0;
+
     orFreeArrayOfArray( &env->blocks );
     orFreeArrayOfArray( &env->strings );

trunk/orca/qt/qorca.cpp

@@ -32 +32 @@
 
 
+inline bool qEnvExists() { return qEnv.atom_close > 0; }
+
+
 struct LayoutInfo
 {
@@ -103 +106 @@
 
 
-int WIDPool::add( QObject* ptr, int type )
+/**
+  Returns REC id.
+*/
+int WIDPool::add( QObject* ptr, int type, int flags )
 {
     int index;
@@ -114 +120 @@
 
         rec.type   = type;
+        rec.flags  = flags;
         rec.object = ptr;
 
@@ -123 +130 @@
         REC rec;
         rec.type   = type;
+        rec.flags  = flags;
         rec.object = ptr;
         _records.push_back( rec ); 
@@ -132 +140 @@
 void WIDPool::remove( int id )
 {
-    REC& rec = _records[ id ];
-
-    assert( rec.widget ); 
-
-    rec.type = _freeIndex;
-    _freeIndex = id;
-    rec.object = 0;
-
-    ++_freeCount;
+    if( qEnvExists() )
+    {
+        REC& rec = _records[ id ];
+
+        assert( rec.widget ); 
+
+        rec.type = _freeIndex;
+        _freeIndex = id;
+        rec.object = 0;
+
+        ++_freeCount;
+    }
 }
 
@@ -1310 +1321 @@
     // orEnv goes away.
 
+    qEnv.atom_close = 0;    // Using atom_close as qEnvExists indicator.
+
     WIDPool::iterator it;
     for( it = qEnv.pool.begin(); it != qEnv.pool.end(); ++it )
     {
-        if( (*it).widget )
-        {
-            if( (*it).type == WT_Dialog )
-            {
-                delete (*it).widget;
-            }
-            else if( (*it).type == WT_Widget )
-            {
-                delete (*it).widget;
-            }
-
-            // Assuming all other widgets are deleted from WT_Dialog &
-            // WT_Widget.
+        // Records without DeleteObject flag set are assumed to be child
+        // widgets of a WT_Dialog or WT_Widget.
+
+        WIDPool::REC& rec = *it;
+        if( rec.object && (rec.flags & WIDPool::DeleteObject) )
+        {
+            delete rec.object;
         }
     }
@@ -1383 +1390 @@
 SWidget::SWidget()
 {
-    _wid = qEnv.pool.add( this, WT_Widget );
+    _wid = qEnv.pool.add( this, WT_Widget, WIDPool::DeleteObject );
 }
 
@@ -1503 +1510 @@
 
 
-#if 0
-SDialog::SDialog()  { _wid = qEnv.pool.add( this, WT_Dialog ); }
-SDialog::~SDialog() { qEnv.pool.remove( _wid ); printf("~SDialog\n"); }
-#else
-WIDGET_CODE(SDialog,WT_Dialog)
-#endif
+SDialog::SDialog()
+{
+    _wid = qEnv.pool.add( this, WT_Dialog, WIDPool::DeleteObject );
+}
+
+
+SDialog::~SDialog()
+{
+    qEnv.pool.remove( _wid );
+    //printf("~SDialog\n");
+}
 
 

trunk/orca/qt/qorca.h

@@ -58 +58 @@
 public:
 
+    enum eRecFlags
+    {
+        DeleteObject = 0x0001
+    };
+
     struct REC
     {
-        int type;
+        short type;
+        short flags;
         union
         {
@@ -70 +76 @@
     WIDPool() : _freeCount(0), _freeIndex(-1) {}
 
-    int  add( QObject*, int type );
+    int  add( QObject*, int type, int flags = 0 );
     void remove( int id );
     REC* record( int id );