Changeset 8264

Timestamp:

30/11/11 12:13:13 (6 months ago)

Author:

westram

Message:

• removed unused(-but-set) variables/params

Location:

trunk/EDIT4

Files:

• ED4_block.cxx (modified) (5 diffs)
• ED4_manager.cxx (modified) (3 diffs)
• ED4_no_class.cxx (modified) (1 diff)
• ED4_terminal.cxx (modified) (1 diff)
• ed4_class.hxx (modified) (1 diff)

trunk/EDIT4/ED4_block.cxx

@@ -170 +170 @@
 
 void ED4_with_whole_block(ED4_blockoperation block_operation, int repeat) {
-    GB_ERROR               error    = GB_begin_transaction(GLOBAL_gb_main);
-    ED4_sequence_terminal *err_term = 0;
-    ED4_cursor            *cursor   = &ED4_ROOT->get_ed4w()->cursor;
-    int                    base_pos = (cursor && cursor->owner_of_cursor != 0) ? cursor->get_base_position() : -1;
+    GB_ERROR    error    = GB_begin_transaction(GLOBAL_gb_main);
+    ED4_cursor *cursor   = &ED4_ROOT->get_ed4w()->cursor;
+    int         base_pos = (cursor && cursor->owner_of_cursor != 0) ? cursor->get_base_position() : -1;
 
     switch (blocktype) {
@@ -180 +179 @@
             break;
         }
-        case ED4_BT_LINEBLOCK: {
+        case ED4_BT_LINEBLOCK: { // @@@ dry
             ED4_list_elem *listElem = ED4_ROOT->selected_objects.first();
             while (listElem && !error) {
@@ -186 +185 @@
                 ED4_sequence_terminal *seqTerm        = selectionEntry->object->get_parent(ED4_L_SPECIES)->search_spec_child_rek(ED4_L_SEQUENCE_STRING)->to_sequence_terminal();
 
-                error               = perform_block_operation_on_whole_sequence(block_operation, seqTerm, repeat);
-                if (error) err_term = seqTerm;
-
+                error    = perform_block_operation_on_whole_sequence(block_operation, seqTerm, repeat);
                 listElem = listElem->next();
             }
@@ -194 +191 @@
         }
         case ED4_BT_MODIFIED_COLUMNBLOCK:
-        case ED4_BT_COLUMNBLOCK: {
+        case ED4_BT_COLUMNBLOCK: { // @@@ vs here
             ED4_list_elem *listElem = ED4_ROOT->selected_objects.first();
             while (listElem && !error) {
@@ -200 +197 @@
                 ED4_sequence_terminal *seqTerm = selectionEntry->object->get_parent(ED4_L_SPECIES)->search_spec_child_rek(ED4_L_SEQUENCE_STRING)->to_sequence_terminal();
 
-                error = perform_block_operation_on_part_of_sequence(block_operation, seqTerm, repeat);
-                if (error) err_term = seqTerm;
-
+                error    = perform_block_operation_on_part_of_sequence(block_operation, seqTerm, repeat);
                 listElem = listElem->next();
             }

trunk/EDIT4/ED4_manager.cxx

@@ -507 +507 @@
     ED4_list_elem       *list_elem;
     bool                 i_am_consensus = 0;
-    ED4_AREA_LEVEL       level;
     ED4_base            *found_member   = NULL;
     ED4_extension        loc;
@@ -551 +550 @@
 
 
-        old_parent                                       = object->parent;
-        ED4_multi_species_manager *multi_species_manager = NULL;
-
-        level = get_area_level(&multi_species_manager);
+        old_parent = object->parent;
 
 #if defined(LIMIT_TOP_AREA_SPACE)
@@ -945 +941 @@
 
 ED4_returncode ED4_main_manager::resize_requested_by_parent() {
-    ED4_returncode result = ED4_R_OK;
-
     if (update_info.resize) {
-        result = ED4_manager::resize_requested_by_parent();
+        ED4_manager::resize_requested_by_parent();
         ED4_ROOT->get_ed4w()->update_scrolled_rectangle();
     }

trunk/EDIT4/ED4_no_class.cxx

@@ -166 +166 @@
 
     if (object->is_terminal()) {
-        GB_TYPES gb_type;
-
-        if (object->get_species_pointer()) {
-            gb_type = GB_read_type(object->get_species_pointer());
-        }
-        else {
-            gb_type = GB_NONE;
-        }
-
         ED4_base *species_manager = object->get_parent(ED4_L_SPECIES);
 

trunk/EDIT4/ED4_terminal.cxx

@@ -390 +390 @@
 ED4_returncode ED4_terminal::draw_drag_box(AW_pos x, AW_pos y, GB_CSTR text, int cursor_y)      // draws drag box of object at location abs_x, abs_y
 {
-    ED4_index   i;
-    AW_pos          width, height, drag_x, drag_y;
-    AW_pos      drag_line_x0[3], drag_line_y0[3];
-    AW_pos      drag_line_x1[3], drag_line_y1[3];
-    ED4_base    *drag_target = NULL;
-    AW_pos      target_x, target_y;
-    ED4_extension   location;
-
-    width = extension.size[WIDTH] - 1;
-    height = extension.size[HEIGHT] - 1;
-
-    if (cursor_y!=-1)
-    {
+    ED4_index      i;
+    AW_pos         drag_x, drag_y;
+    AW_pos         drag_line_x0[3], drag_line_y0[3];
+    AW_pos         drag_line_x1[3], drag_line_y1[3];
+    ED4_base      *drag_target = NULL;
+    AW_pos         target_x, target_y;
+    ED4_extension  location;
+
+    if (cursor_y!=-1) {
         ED4_device_manager *device_manager = ED4_ROOT->main_manager->search_spec_child_rek(ED4_L_DEVICE)->to_device_manager();
         drag_x = 0;

trunk/EDIT4/ed4_class.hxx

@@ -12 +12 @@
 #endif
 
-// #define LIMIT_TOP_AREA_SPACE // // if defined, top area is size-limited
+// #define LIMIT_TOP_AREA_SPACE // // if defined, top area is size-limited // @@@ remove this
 #ifdef LIMIT_TOP_AREA_SPACE
 #define MAX_TOP_AREA_SIZE 10    // size limit for top-area