Rename fixary.h and fixvec.h.

14 files changed, 16 insertions, 16 deletions

diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index 793fccc2c8..b8cace2155 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -8,8 +8,8 @@
 #ifndef DUNGEON_H
 #define DUNGEON_H
 
-#include "fixvec.h"
-#include "fixary.h"
+#include "fixedvector.h"
+#include "fixedarray.h"
 #include "externs.h"
 #include "terrain.h"
 #include "travel.h"
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index c53d9b8559..e7ec27bf64 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -20,7 +20,7 @@
 
 #include "defines.h"
 #include "enum.h"
-#include "fixary.h"
+#include "fixedarray.h"
 #include "libutil.h"
 #include "mpr.h"
 #include "store.h"
diff --git a/crawl-ref/source/files.h b/crawl-ref/source/files.h
index 23cb9d3041..2854bfac74 100644
--- a/crawl-ref/source/files.h
+++ b/crawl-ref/source/files.h
@@ -9,7 +9,7 @@
 #define FILES_H
 
 #include "externs.h"
-#include "fixary.h"
+#include "fixedarray.h"
 #include "player.h"
 #include <stdio.h>
 #include <string>
diff --git a/crawl-ref/source/fixary.h b/crawl-ref/source/fixedarray.h
index faf35b7c38..c1dabfd040 100644
--- a/crawl-ref/source/fixary.h
+++ b/crawl-ref/source/fixedarray.h
@@ -1,5 +1,5 @@
 /*
- *  File:       fixary.h
+ *  File:       fixedarray.h
  *  Summary:    Fixed size 2D vector class that asserts if you do something bad.
  *  Written by: Jesse Jones
  */
@@ -7,7 +7,7 @@
 #ifndef FIXARY_H
 #define FIXARY_H
 
-#include "fixvec.h"
+#include "fixedvector.h"
 
 
 // ==========================================================================
diff --git a/crawl-ref/source/fixvec.h b/crawl-ref/source/fixedvector.h
index 476eded773..3afacd0898 100644
--- a/crawl-ref/source/fixvec.h
+++ b/crawl-ref/source/fixedvector.h
@@ -1,5 +1,5 @@
 /*
- *  File:       fixvec.h
+ *  File:       fixedvector.h
  *  Summary:    Fixed size vector class that asserts if you do something bad.
  *  Written by: Jesse Jones
  */
diff --git a/crawl-ref/source/maps.h b/crawl-ref/source/maps.h
index afaac0695e..77a86b941a 100644
--- a/crawl-ref/source/maps.h
+++ b/crawl-ref/source/maps.h
@@ -9,7 +9,7 @@
 #define MAPS_H
 
 #include "dlua.h"
-#include "fixvec.h"
+#include "fixedvector.h"
 #include "dungeon.h"
 
 #include <vector>
diff --git a/crawl-ref/source/mon-grow.h b/crawl-ref/source/mon-grow.h
index 5201421019..0f60bff722 100644
--- a/crawl-ref/source/mon-grow.h
+++ b/crawl-ref/source/mon-grow.h
@@ -7,7 +7,7 @@
 #ifndef __MGROW_H__
 #define __MGROW_H__
 
-#include "fixvec.h"
+#include "fixedvector.h"
 
 // Monster level-up data.
 
diff --git a/crawl-ref/source/mon-place.h b/crawl-ref/source/mon-place.h
index a0211692bb..533f0943dc 100644
--- a/crawl-ref/source/mon-place.h
+++ b/crawl-ref/source/mon-place.h
@@ -11,7 +11,7 @@
 #include "coord.h"
 #include "enum.h"
 #include "dungeon.h"
-#include "fixvec.h"
+#include "fixedvector.h"
 
 enum band_type
 {
diff --git a/crawl-ref/source/ray.h b/crawl-ref/source/ray.h
index adca5003dd..242c8f76f2 100644
--- a/crawl-ref/source/ray.h
+++ b/crawl-ref/source/ray.h
@@ -6,7 +6,7 @@
 #ifndef RAY_H
 #define RAY_H
 
-#include "fixary.h"
+#include "fixedarray.h"
 #include "geom2d.h"
 
 typedef SquareArray<bool,1> reflect_grid;
diff --git a/crawl-ref/source/show.h b/crawl-ref/source/show.h
index a7b31033b7..f21e24ece8 100644
--- a/crawl-ref/source/show.h
+++ b/crawl-ref/source/show.h
@@ -1,7 +1,7 @@
 #ifndef SHOW_H
 #define SHOW_H
 
-#include "fixary.h"
+#include "fixedarray.h"
 
 enum show_item_type
 {
diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h
index d4ab7630f3..908f42df31 100644
--- a/crawl-ref/source/spl-book.h
+++ b/crawl-ref/source/spl-book.h
@@ -9,7 +9,7 @@
 #define SPL_BOOK_H
 
 #include "externs.h"
-#include "fixvec.h"
+#include "fixedvector.h"
 
 #define SPELLBOOK_SIZE 8
 
diff --git a/crawl-ref/source/tilesdl.h b/crawl-ref/source/tilesdl.h
index e7cede1863..f20ca14813 100644
--- a/crawl-ref/source/tilesdl.h
+++ b/crawl-ref/source/tilesdl.h
@@ -10,7 +10,7 @@
 
 #include "debug.h"
 #include "externs.h"
-#include "fixvec.h"
+#include "fixedvector.h"
 #include "tilereg.h"
 
 // This struct defines all of the state that any particular rendering needs.
diff --git a/crawl-ref/source/transfor.h b/crawl-ref/source/transfor.h
index 8d9bc85285..52cc7e9391 100644
--- a/crawl-ref/source/transfor.h
+++ b/crawl-ref/source/transfor.h
@@ -10,7 +10,7 @@
 
 #include <set>
 
-#include "fixvec.h"
+#include "fixedvector.h"
 #include "enum.h"
 
 enum transformation_type
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 060191bb50..18ab3969be 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -12,7 +12,7 @@
 #include "coord.h"
 #include "coordit.h"
 #include "files.h"
-#include "fixary.h"
+#include "fixedarray.h"
 #include "branch.h"
 #include "command.h"
 #include "cio.h"