[q-lang-cvs] qcalc qcalc.q,1.108,1.109

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18396

Modified Files:
	qcalc.q 
Log Message:
code cleanup

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** qcalc.q	7 Nov 2007 21:41:42 -0000	1.108
--- qcalc.q	7 Nov 2007 21:57:22 -0000	1.109
***************
*** 663,667 ****
  		    where [S] = regex "" "^\\+\\+\\+ Message: (.*)$" S (reg 1);
  		= if is_qt_object X then
! 		    (process_gui (I,J) X || digest_loop)
  		  else
  		    (process_sel2 [(I,J,X)] || merge_undo (I,J))
--- 663,667 ----
  		    where [S] = regex "" "^\\+\\+\\+ Message: (.*)$" S (reg 1);
  		= if is_qt_object X then
! 		    (process_gui (I,J) (gui_elem (I,J)) || digest_loop)
  		  else
  		    (process_sel2 [(I,J,X)] || merge_undo (I,J))
***************
*** 678,682 ****
  
  process_update (I,J) S
! 		= gui_setval X S || X where X:QtObject = gui_elem (I,J);
  		= if null S0 then delete_cells (I,J)
  		  else insert_cells ((I,J),S0) || S0
--- 678,683 ----
  
  process_update (I,J) S
! 		= gui_setval X S || get CELLS!(I,J)
! 		    where X:QtObject = gui_elem (I,J);
  		= if null S0 then delete_cells (I,J)
  		  else insert_cells ((I,J),S0) || S0
***************
*** 686,690 ****
  
  process_update2 (I,J) S
! 		= gui_setval X S || X where X:QtObject = gui_elem (I,J);
  		= if null S0 then delete_cells (I,J)
  		  else insert_cells ((I,J),S0) ||
--- 687,692 ----
  
  process_update2 (I,J) S
! 		= gui_setval X S || get CELLS!(I,J)
! 		    where X:QtObject = gui_elem (I,J);
  		= if null S0 then delete_cells (I,J)
  		  else insert_cells ((I,J),S0) ||
***************
*** 2603,2607 ****
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),X)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Pushbutton: (\\([0-9]+,[0-9]+\\)) (.*)$" S
--- 2605,2609 ----
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Pushbutton: (\\([0-9]+,[0-9]+\\)) (.*)$" S
***************
*** 2630,2634 ****
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),X)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Togglebutton: (\\([0-9]+,[0-9]+\\)) (.*)$" S
--- 2632,2636 ----
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Togglebutton: (\\([0-9]+,[0-9]+\\)) (.*)$" S
***************
*** 2682,2686 ****
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),X)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Spinbox: (\\([0-9]+,[0-9]+\\)) (.*)$" S
--- 2684,2688 ----
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Spinbox: (\\([0-9]+,[0-9]+\\)) (.*)$" S
***************
*** 2707,2711 ****
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),X)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Slider: (\\([0-9]+,[0-9]+\\)) (.*)$" S
--- 2709,2713 ----
  		  qt TABLE "setCellWidget" (I1,J1,X) ||
  		  insert_cells ((I1,J1),IT) ||
! 		  collect_results (insert U ((I1,J1),IT)) [(I,J)|V]
  		    where [(K1,S1)] = regex ""
  		      "^\\+\\+\\+ Slider: (\\([0-9]+,[0-9]+\\)) (.*)$" S