Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 15647)
+++ trunk/src/buffer.c	(revision 15648)
@@ -410,6 +410,7 @@
 	pcb_layergrp_id_t sgroup, cgroup;
 	pcb_layer_t swap;
 
+#warning subc TODO: rewrite
 #if 0
 	PCB_ELEMENT_LOOP(Buffer->Data);
 	{
@@ -419,16 +420,19 @@
 	PCB_END_LOOP;
 #endif
 
-#warning subc TODO
 
 	/* set buffer offset to 'mark' position */
 	Buffer->X = PCB_SWAP_X(Buffer->X);
 	Buffer->Y = PCB_SWAP_Y(Buffer->Y);
+
+#warning padstack TODO: rewrite
+#if 0
 	PCB_VIA_LOOP(Buffer->Data);
 	{
 		pcb_via_flip_side(Buffer->Data, via);
 	}
 	PCB_END_LOOP;
+#endif
 	PCB_LINE_ALL_LOOP(Buffer->Data);
 	{
 		pcb_line_flip_side(layer, line);
@@ -481,6 +485,8 @@
 			Buffer->Data->Layer[cnumber] = swap;
 			k++;
 			/* move the thermal flags with the layers */
+#warning padstack TODO: rewrite
+#if 0
 			PCB_PIN_ALL_LOOP(Buffer->Data);
 			{
 				t1 = PCB_FLAG_THERM_TEST(snumber, pin);
@@ -497,6 +503,7 @@
 				PCB_FLAG_THERM_ASSIGN(cnumber, t1, via);
 			}
 			PCB_END_LOOP;
+#endif
 		}
 	}
 	pcb_set_buffer_bbox(Buffer);
Index: trunk/src/find_print.c
===================================================================
--- trunk/src/find_print.c	(revision 15647)
+++ trunk/src/find_print.c	(revision 15648)
@@ -224,6 +224,8 @@
 	pcb_reset_conns(pcb_true);
 	pcb_conn_lookup_init();
 
+#warning subc TODO: rewrite
+#if 0
 	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/* break if abort dialog returned pcb_true;
@@ -233,6 +235,7 @@
 			break;
 	}
 	PCB_END_LOOP;
+#endif
 
 	if (conf_core.editor.beep_when_finished)
 		pcb_gui->beep();
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 15647)
+++ trunk/src/netlist_act.c	(revision 15648)
@@ -54,6 +54,8 @@
 	int ret = -1;
 	pcb_lib_menu_t *nets[2];
 
+#warning subc TODO: rewrite
+#if 0
 	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PCB_PIN_LOOP(element);
@@ -76,6 +78,7 @@
 		PCB_END_LOOP;
 	}
 	PCB_END_LOOP;
+#endif
 
 	if (next < 2) {
 		pcb_message(PCB_MSG_ERROR, "Exactly two pins should be selected for swap (less than 2 selected at the moment)\n");
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 15647)
+++ trunk/src/obj_elem.h	(revision 15648)
@@ -71,12 +71,5 @@
 #define PCB_ELEM_TEXT_REFDES(e)      ((e)->Name[PCB_ELEMNAME_IDX_REFDES])
 #define PCB_ELEM_TEXT_VALUE(e)       ((e)->Name[PCB_ELEMNAME_IDX_VALUE])
 
-/*** loops ***/
-
-#define PCB_ELEMENT_LOOP(top) do {                                  \
-	pcb_element_t *element = NULL;                                    \
-	{
-
-
 #endif
 
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 15647)
+++ trunk/src/select.c	(revision 15648)
@@ -611,6 +611,7 @@
 	PCB_ENDALL_LOOP;
 
 #warning subc TODO: rewrite
+#if 0
 	if (pcb_silk_on(pcb) && (Type & PCB_TYPE_ELEMENT))
 		PCB_ELEMENT_LOOP(pcb->Data);
 	{
@@ -617,7 +618,6 @@
 		if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element)
 				&& ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == PCB_SWAP_IDENT || pcb->InvisibleObjectsOn)
 				&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) != Flag) {
-#if 0
 			const char* name = PCB_ELEM_NAME_VISIBLE(PCB, element);
 			if (name && REGEXEC(name)) {
 				pcb_undo_add_obj_to_flag(element);
@@ -644,10 +644,10 @@
 				pcb_elem_invalidate_draw(element);
 				changed = pcb_true;
 			}
-#endif
 		}
 	}
 	PCB_END_LOOP;
+#endif
 
 #warning padstack TODO: rewrite
 #if 0
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 15647)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 15648)
@@ -943,6 +943,8 @@
 {
 	int i;
 
+#warning padstack TODO: check if the subc loop below does this
+#if 0
 	/* add pins and pads of elements */
 	PCB_PIN_ALL_LOOP(data);
 	{
@@ -952,6 +954,8 @@
 			AddPin(layergroupboxes, pin, pcb_false, rd->styles[rd->max_styles]);
 	}
 	PCB_ENDALL_LOOP;
+#endif
+
 	PCB_PADSTACK_LOOP(data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_DRC, padstack))
@@ -960,15 +964,6 @@
 			AddPstk(layergroupboxes, padstack, rd->styles[rd->max_styles]);
 	}
 	PCB_END_LOOP;
-	/* add all vias */
-	PCB_VIA_LOOP(data);
-	{
-		if (PCB_FLAG_TEST(PCB_FLAG_DRC, via))
-			PCB_FLAG_CLEAR(PCB_FLAG_DRC, via);
-		else
-			AddPin(layergroupboxes, via, pcb_true, rd->styles[rd->max_styles]);
-	}
-	PCB_END_LOOP;
 
 	for (i = 0; i < data->LayerN; i++) {
 		pcb_layergrp_id_t layergroup;
Index: trunk/src_plugins/distaligntext/distaligntext.c
===================================================================
--- trunk/src_plugins/distaligntext/distaligntext.c	(revision 15647)
+++ trunk/src_plugins/distaligntext/distaligntext.c	(revision 15648)
@@ -168,6 +168,9 @@
 		return ntexts_by_pos;
 	if (op == K_aligntext)
 		dir = dir == K_X ? K_Y : K_X;	/* see above */
+
+#warning subc TODO: subc floaters?
+#if 0
 	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_text_t *text;
@@ -177,6 +180,8 @@
 		nsel++;
 	}
 	PCB_END_LOOP;
+#endif
+
 	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
@@ -189,6 +194,8 @@
 	texts_by_pos = malloc(nsel * sizeof(*texts_by_pos));
 	ntexts_by_pos = nsel;
 	nsel = 0;
+#warning subc TODO: check for floaters
+#if 0
 	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_text_t *text;
@@ -200,6 +207,7 @@
 		texts_by_pos[nsel++].pos = coord(text, dir, point);
 	}
 	PCB_END_LOOP;
+#endif
 	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
@@ -360,6 +368,8 @@
 	q = reference_coord(K_aligntext, pcb_crosshair.X, pcb_crosshair.Y, dir, point, reference);
 	/* move all selected elements to the new coordinate */
 	/* selected text part of an element */
+#warning subc TODO: check if subc floaters are handled
+#if 0
 	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_text_t *text;
@@ -388,6 +398,8 @@
 		}
 	}
 	PCB_END_LOOP;
+#endif
+
 	/* Selected bare text objects */
 	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 15647)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 15648)
@@ -519,6 +519,8 @@
 
 	bboard_init_board_cairo(PCB->MaxWidth, PCB->MaxHeight, bboard_bgcolor, options[HA_antialias].int_value);
 
+#warning subc TODO: rewrite
+#if 0
 	/* write out components on solder side */
 	PCB_ELEMENT_LOOP(PCB->Data);
 	if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) {
@@ -532,6 +534,7 @@
 		bboard_export_element_cairo(element, 0);
 	}
 	PCB_END_LOOP;
+#endif
 
 	/* draw all wires from all valid layers */
 	for (i = pcb_max_layer; i >= 0; i--) {
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 15647)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 15648)
@@ -571,6 +571,8 @@
 
 int IPCD356_SanityCheck()
 {
+#warning subc TODO: rewrite
+#if 0
 	PCB_ELEMENT_LOOP(PCB->Data);
 	if (element->Name[1].TextString == '\0') {
 		pcb_message(PCB_MSG_ERROR, "Error: Found unnamed element. All elements need to be named to create an IPC-D-356 netlist.\n");
@@ -577,6 +579,7 @@
 		return 1;
 	}
 	PCB_END_LOOP;											/* Element. */
+#endif
 	return 0;
 }
 
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 15647)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 15648)
@@ -382,7 +382,8 @@
 		}
 		PCB_END_LOOP;
 
-#warning subc TODO
+#warning subc TODO: rewrite
+#if 0
 		/* and now the pins */
 		PCB_ELEMENT_LOOP(PCB->Data);
 		{
@@ -419,6 +420,7 @@
 			}
 		}
 		PCB_END_LOOP;
+#endif
 
 		pcb_message(PCB_MSG_INFO, _("Updated %ld drill sizes out of %ld total\n"), (long)changed, (long)tot);