Changeset 519Tweet

Timestamp:

Apr 20, 2011, 11:39:47 PM (12 years ago)

Author:

Sam Hocevar

Message:

core: fix a few useless casts.

Location:

abuse/trunk/src

Files:

• imlib/event.h (modified) (1 diff)
• imlib/image.cpp (modified) (5 diffs)
• imlib/linked.h (modified) (3 diffs)
• imlib/palette.cpp (modified) (3 diffs)
• imlib/sprite.cpp (modified) (2 diffs)
• objects.cpp (modified) (2 diffs)
• sdlport/event.cpp (modified) (2 diffs)
• sdlport/video.cpp (modified) (1 diff)
• unixnfc.cpp (modified) (1 diff)

abuse/trunk/src/imlib/event.h

@@ -68 +68 @@
     } else x=y=button=0;
   }
-  void push_event(event *ev) { events.add_end((linked_node *)ev); }
+  void push_event(event *ev) { events.add_end(ev); }
   void flush_screen();
   int has_mouse() { return mouse->exsist(); }

abuse/trunk/src/imlib/image.cpp

@@ -116 +116 @@
     }
 
-    image_list.unlink((linked_node *)this);
+    image_list.unlink(this);
     DeletePage();
     delete m_special;
@@ -155 +155 @@
         m_special = NULL;
     MakePage(size, page_buffer);
-    image_list.add_end((linked_node *)this);
+    image_list.add_end(this);
     m_locked = false;
 }
@@ -168 +168 @@
     for (int i = 0; i < m_size.y; i++)
         fp->read(scan_line(i), m_size.x);
-    image_list.add_end((linked_node *) this);
+    image_list.add_end(this);
     m_locked = false;
 }
@@ -180 +180 @@
     for (int i = 0; i < m_size.y; i++)
         fp->read(scan_line(i), m_size.x);
-    image_list.add_end((linked_node *) this);
+    image_list.add_end(this);
     m_locked = false;
 }
@@ -209 +209 @@
   {
     im=(image *)image_list.first();
-    image_list.unlink((linked_node *)im);
+    image_list.unlink(im);
     delete im;
   } */

abuse/trunk/src/imlib/linked.h

@@ -28 +28 @@
 #include <string.h>
 
-#define loop(controll,first,inside) { (linked_node *)controll=first; \
-  if (first) do { inside (linked_node *) controll=controll->next(); } \
-  while ((linked_node *) controll!=first); }
+#define loop(controll,first,inside) { controll=first; \
+  if (first) do { inside controll=controll->next(); } \
+  while (controll!=first); }
 
 #define loopt(type,controll,first,inside) { controll=(type *)(first); \
@@ -37 +37 @@
 
 
-#define loop_rev(controll,last,inside) { (linked_node *)controll=last; \
-  if (first) do { inside (linked_node *) controll=controll->last(); } \
-  while ((linked_node *) controll!=last); }
+#define loop_rev(controll,last,inside) { controll=last; \
+  if (first) do { inside controll=controll->last(); } \
+  while (controll!=last); }
 
 #define loopct(type,controll,first,cond,inside) { controll=(type *)first; \
@@ -73 +73 @@
 // openly use the functions listed after the keyword PUBLIC
 // type conversions may be nessary if you derive a class of nodes of your own
-// for example shape is an class derived from linked_node.
-// to add a shape to linked lis I have to say
-// mylist.add_end( (linked_node *) myshape_pointer);
+// for example shape is an class derived from linked_node. to add a shape to
+// linked list I have to say mylist.add_end(myshape_pointer);
 // unlink removes a node from the list via pointers but does not deallocate
 // it from the heap

abuse/trunk/src/imlib/palette.cpp

@@ -385 +385 @@
       CONDITION(lev<8,"Levl > 7");
       re_delete(who->children[x],lev+1);
-      level[lev].unlink((linked_node *)who->children[x]);
+      level[lev].unlink(who->children[x]);
       delete who->children[x];
     }
@@ -408 +408 @@
         pruned=1;                   //  I have a brother! stop
        p=(quant_node *)p->next();
-      } while ((linked_node *) p!=level[lev-1].first() && !pruned);
+      } while (p != level[lev-1].first() && !pruned);
     }
   }
@@ -447 +447 @@
     printf("h");
       (*p)=new quant_node(lev,fat);
-      level[lev-1].add_end((linked_node *)(*p));
+      level[lev-1].add_end(*p);
     }
 

abuse/trunk/src/imlib/sprite.cpp

@@ -49 +49 @@
 
 void sprite_controller::add_sprite(sprite *sp)
-{ sprites.add_end((linked_node *)sp); }
+{ sprites.add_end(sp); }
 
 void sprite_controller::remove_sprites()
@@ -74 +74 @@
 void sprite_controller::bring_front(sprite *sp)
 {
-  ERROR(sprites.unlink((linked_node *)sp),"unlink failure");
-  sprites.add_end((linked_node *)sp);
+  ERROR(sprites.unlink(sp),"unlink failure");
+  sprites.add_end(sp);
 }
 
 void sprite_controller::delete_sprite(sprite *sp)
 {
-  ERROR(sprites.unlink((linked_node *)sp),"unlink failure");
+  ERROR(sprites.unlink(sp),"unlink failure");
   delete sp;
 }

abuse/trunk/src/objects.cpp

@@ -1552 +1552 @@
 game_object::game_object(int Type, int load)
 {
+  lvars = NULL;
+
   if (Type<0xffff)
   {
-    int t=figures[Type]->tv;
+    int t = figures[Type]->tv;
     if (t)
     {
-      lvars=(int32_t *)malloc(t * 4);
-      memset(lvars,0,t*4);
-    }
-    else lvars=NULL;
-  } else lvars=NULL;
+      lvars = (int32_t *)malloc(t * sizeof(int32_t));
+      memset(lvars, 0, t * sizeof(int32_t));
+    }
+  }
 
   otype=Type;
@@ -1614 +1615 @@
 void game_object::change_type(int new_type)
 {
-  if (lvars) free(lvars);     // free old variable
+  free(lvars);     // free old variable
+  lvars = NULL;
 
   if (otype<0xffff)
   {
-    int t=figures[new_type]->tv;
+    int t = figures[new_type]->tv;
     if (t)
     {
-      lvars=(int32_t *)malloc(t*4);
-      memset(lvars,0,t*4);
-    }
-    else lvars=NULL;
-  } else return;
+      lvars = (int32_t *)malloc(t * sizeof(int32_t));
+      memset(lvars, 0, t * sizeof(int32_t));
+    }
+  }
+  else return;
   otype=new_type;
 

abuse/trunk/src/sdlport/event.cpp

@@ -121 +121 @@
     ev->redraw.y2 = Y2;
     ev->redraw.start = Start;
-    events.add_end( (linked_node *)ev );
+    events.add_end(ev);
 }
 
@@ -143 +143 @@
     {
         ev = *ep;
-        events.unlink( (linked_node *)ep );
+        events.unlink(ep);
         delete ep;
         ewaiting = events.first() != NULL;

abuse/trunk/src/sdlport/video.cpp

@@ -372 +372 @@
             q = dr;
             dr = (dirty_rect *)(dr->next());
-            im->m_special->dirties.unlink((linked_node *)q);
+            im->m_special->dirties.unlink(q);
             delete q;
             count--;

abuse/trunk/src/unixnfc.cpp

@@ -599 +599 @@
       {
     event *ev=(event *)input.first();
-    input.unlink((linked_node *)ev);
+    input.unlink(ev);
     wm->push_event(ev);
       }