Rename File & Name specification

base/io_c.h

@@ -1,7 +1,7 @@
 #include "io.h"
 // #include "os.h"
-// #include "bmp_io_init.h"
-#include "png_io_init.h"
+// #include "bmp_io_c.h"
+#include "png_io_c.h"
 #include <stdio.h> /* For fputs() */
 #include <string.h> /* For strcmp() */
 #include <ctype.h> /* For tolower() */

base/png_io.h

@@ -2,8 +2,8 @@
 #ifndef PNG_IO_H
 #define PNG_IO_H
 
-// #include "MMBitmap_init.h"
-// #include "io_init.h"
+// #include "MMBitmap_c.h"
+// #include "io_c.h"
 
 enum _PNGReadError {
 	kPNGGenericError = 0,

base/str_io_c.h

@@ -1,7 +1,7 @@
 #include "str_io.h"
-#include "zlib_util_init.h"
-#include "base64_init.h"
-#include "snprintf_init.h" /* snprintf() */
+#include "zlib_util_c.h"
+#include "base64_c.h"
+#include "snprintf_c.h" /* snprintf() */
 #include <stdio.h> /* fputs() */
 #include <ctype.h> /* isdigit() */
 #include <stdlib.h> /* atoi() */

bitmap/bitmap_find.h

@@ -4,7 +4,7 @@
 
 // #include "../base/types.h"
 #include "../base/MMBitmap.h"
-#include "../base/MMPointArray_init.h"
+#include "../base/MMPointArray_c.h"
 
 /* Convenience wrapper around findBitmapInRect(), where |rect| is the bounds
  * of |haystack|. */

bitmap/bitmap_find_c.h

@@ -1,5 +1,5 @@
 #include "bitmap_find.h"
-#include "../base/UTHashTable_init.h"
+#include "../base/UTHashTable_c.h"
 #include <assert.h>
 
 /* Node to be used in hash table. */

bitmap/goBitmap.h

@@ -20,11 +20,11 @@
 // };
 #include "bitmap_class.h"
 #include "bitmap_find_c.h"
-#include "../base/color_find_init.h"
+#include "../base/color_find_c.h"
 // #include "../screen/screen_c.h"
-#include "../base/io_init.h"
-#include "../base/pasteboard_init.h"
-#include "../base/str_io_init.h"
+#include "../base/io_c.h"
+#include "../base/pasteboard_c.h"
+#include "../base/str_io_c.h"
 #include <assert.h>
 #include <stdio.h>
 

key/keypress_c.h

@@ -1,5 +1,5 @@
 #include "keypress.h"
-// #include "../base/deadbeef_rand_init.h"
+// #include "../base/deadbeef_rand_c.h"
 #include "../base/microsleep.h"
 
 #include <ctype.h> /* For isupper() */
@@ -10,7 +10,7 @@
 	#import <IOKit/hidsystem/ev_keymap.h>
 #elif defined(USE_X11)
 	#include <X11/extensions/XTest.h>
-	// #include "../base/xdisplay_init.h"
+	// #include "../base/xdisplay_c.h"
 #endif
 
 /* Convenience wrappers around ugly APIs. */

mouse/mouse_c.h

@@ -1,7 +1,7 @@
 #include "mouse.h"
 // #include "../screen/screen.h"
-// #include "../screen/screen_init.h"
-#include "../base/deadbeef_rand_init.h"
+// #include "../screen/screen_c.h"
+#include "../base/deadbeef_rand_c.h"
 // #include "../deadbeef_rand.h"
 #include "../base/microsleep.h"
 
@@ -15,7 +15,7 @@
 	#include <X11/Xlib.h>
 	#include <X11/extensions/XTest.h>
 	#include <stdlib.h>
-	// #include "../base/xdisplay_init.h"
+	// #include "../base/xdisplay_c.h"
 #endif
 
 #if !defined(M_SQRT2)

screen/goScreen.h

@@ -11,7 +11,7 @@
 #include "../base/types.h"
 #include "screengrab_c.h"
 #include "screen_c.h"
-// #include "../MMBitmap_init.h"
+// #include "../MMBitmap_c.h"
 
 void padHex(MMRGBHex color, char* hex){
 	//Length needs to be 7 because snprintf includes a terminating null.

screen/screen_c.h

@@ -5,7 +5,7 @@
 	#include <ApplicationServices/ApplicationServices.h>
 #elif defined(USE_X11)
 	#include <X11/Xlib.h>
-	// #include "../base/xdisplay_init.h"
+	// #include "../base/xdisplay_c.h"
 #endif
 
 MMSize getMainDisplaySize(void)

screen/screengrab.h

@@ -3,7 +3,7 @@
 #define SCREENGRAB_H
 
 #include "../base/types.h"
-#include "../base/MMBitmap_init.h"
+#include "../base/MMBitmap_c.h"
 
 #ifdef __cplusplus
 extern "C"

screen/screengrab_c.h

@@ -1,5 +1,5 @@
 #include "screengrab.h"
-#include "../base/bmp_io_init.h"
+#include "../base/bmp_io_c.h"
 #include "../base/endian.h"
 #include <stdlib.h> /* malloc() */
 
@@ -10,7 +10,7 @@
 #elif defined(USE_X11)
 	#include <X11/Xlib.h>
 	#include <X11/Xutil.h>
-	#include "../base/xdisplay_init.h"
+	#include "../base/xdisplay_c.h"
 #elif defined(IS_WINDOWS)
 	// #include "windows.h"
 	// #include <wingdi.h>