Changeset 6141 for trunk/EDIT4/ED4_base.cxx

Timestamp:

14/08/09 16:29:27 (3 years ago)

Author:

westram

Message:

• spellchecked all (phew)

Files:

• trunk/EDIT4/ED4_base.cxx (modified) (10 diffs)

trunk/EDIT4/ED4_base.cxx

@@ -28 +28 @@
 }
 
-bool ED4_base::remove_deleted_childs()
+bool ED4_base::remove_deleted_children()
 {
     e4_assert(0);
@@ -34 +34 @@
 }
 
-bool ED4_terminal::remove_deleted_childs()
+bool ED4_terminal::remove_deleted_children()
 {
     if (flag.deleted) {
         if (get_species_pointer() != 0) {
 #if defined(DEBUG)
-            printf("ED4_terminal: has non-zero species_pointer in remove_deleted_childs (resetting to zero)\n");
+            printf("ED4_terminal: has non-zero species_pointer in remove_deleted_children (resetting to zero)\n");
 #endif // DEBUG
             set_species_pointer(0);
@@ -50 +50 @@
     return false;
 }
-bool ED4_sequence_info_terminal::remove_deleted_childs()
+bool ED4_sequence_info_terminal::remove_deleted_children()
 {
     if (flag.deleted) {
         if (get_species_pointer() != 0) {
 #if defined(DEBUG)
-            printf("ED4_sequence_info_terminal: has non-zero species_pointer in remove_deleted_childs (resetting to zero)\n");
+            printf("ED4_sequence_info_terminal: has non-zero species_pointer in remove_deleted_children (resetting to zero)\n");
 #endif // DEBUG
             set_species_pointer(0);
@@ -67 +67 @@
 }
 
-bool ED4_manager::remove_deleted_childs()
+bool ED4_manager::remove_deleted_children()
 {
     int  i;
@@ -76 +76 @@
     for (i=0; i<children->members(); i++) {
         ED4_base *child = children->member(i);
-        if (child->remove_deleted_childs()) {
+        if (child->remove_deleted_children()) {
             deletion_occurred = true;
-            goto restart;       // because order of childs may have changed
+            goto restart;       // because order of children may have changed
         }
     }
@@ -89 +89 @@
         }
 #if defined(DEBUG)
-        printf("ED4_manager::remove_deleted_childs: I have no parent\n");
+        printf("ED4_manager::remove_deleted_children: I have no parent\n");
 #endif // DEBUG
     }
@@ -107 +107 @@
 
 void ED4_manager::changed_by_database(void) {
-    remove_deleted_childs();
+    remove_deleted_children();
     set_refresh(1);
     if (parent) {
@@ -208 +208 @@
     }
     else {
-        e4_assert(0); // not prepated for that situation
+        e4_assert(0); // not prepared for that situation
     }
 }
@@ -799 +799 @@
 bool ED4_base::has_parent(ED4_manager *Parent)
 {
-    // return true if 'parent' is a perent of this
+    // return true if 'parent' is a parent of this
 
     if (is_manager()) {
@@ -1202 +1202 @@
     AW_pos   world_x, world_y;
 
-    calc_world_coords( &world_x, &world_y );                                            // calculate world coordinates of current object
-
-    *x -= world_x;                                                                              // calculate relative coordinates by substracting world
-    *y -= world_y;                                                                              // coords of current object
+    calc_world_coords( &world_x, &world_y );        // calculate world coordinates of current object
+
+    *x -= world_x;                                  // calculate relative coordinates by subtracting world
+    *y -= world_y;                                  // coords of current object
 }