Changeset 25 for trunk/orca/qt/qorca.cpp

Timestamp:

02/06/06 23:30:15 (3 years ago)

Author:

krobillard

Message:

series which/index renamed to n/it.

Files:

• trunk/orca/qt/qorca.cpp (modified) (11 diffs)

trunk/orca/qt/qorca.cpp

@@ -222 +222 @@
         {
             OString* str = orSTRING(it);
-            const char* cp = str->charArray + it->series.index;
+            const char* cp = str->charArray + it->series.it;
             combo->addItem( cp );
         }
@@ -239 +239 @@
     QWidget* wid = new QWidget;
 
-    lo = qoLayout( layout, it->index, it->series.index );
+    lo = qoLayout( layout, it->index, it->series.it );
     wid->setLayout( lo );
 
@@ -255 +255 @@
         {
             OString* str = orSTRING(it);
-            label = str->charArray + it->series.index;
+            label = str->charArray + it->series.it;
         }
         else if( it->type == OT_WORD )
@@ -369 +369 @@
 
                 val = cbp.values + 1;
-                qoLayout( lo, val->index, val->series.index );
+                qoLayout( lo, val->index, val->series.it );
             }
                 break;
@@ -435 +435 @@
                 {
                     OBlock* blk = orBLOCK(val);
-                    OValue* it  = blk->values + val->series.index;
+                    OValue* it  = blk->values + val->series.it;
                     OValue* end = blk->values + blk->used;
                     while( it != end )
@@ -463 +463 @@
                 val = cbp.values + 1;
                 OBlock* blk = orBLOCK( val );
-                tabWidgetBlock( pw, blk->values + val->series.index,
+                tabWidgetBlock( pw, blk->values + val->series.it,
                                     blk->values + blk->used );
             }
@@ -538 +538 @@
 
                 LayoutInfo lo2;
-                pw->setLayout( qoLayout(lo2, val->index, val->series.index) );
+                pw->setLayout( qoLayout(lo2, val->index, val->series.it) );
             }
                 break;
@@ -610 +610 @@
 
                 ++val;
-                qoLayout( lo, val->index, val->series.index );
+                qoLayout( lo, val->index, val->series.it );
                 break;
 
@@ -778 +778 @@
     qEnv.curWidget = wid;
 
-    lo = qoLayout( li, a1->index, a1->series.index );
+    lo = qoLayout( li, a1->index, a1->series.it );
 
     qEnv.curWidget = saveWidget;
@@ -1281 +1281 @@
 void ExeBlock::setBlock( OValue* val )
 {
-    n     = val->series.which;
-    index = val->series.index; 
+    n     = val->series.n;
+    index = val->series.it; 
     hold  = orHold( OT_BLOCK, n );
 }
@@ -1305 +1305 @@
                 if( it->type == OT_BLOCK )
                 {
-                    orEvalBlock( orBlockPtr( it->series.which ),
-                                 it->series.index );
+                    orEvalBlock( orBlockPtr( it->series.n ), it->series.it );
                     qoError();
                     return;