* Finish modularization

include/Athena/ALTTPFileWriter.hpp

@@ -36,7 +36,7 @@ namespace io
  */
 class ALTTPFileWriter : protected BinaryWriter
 {
-    BINARYWRITER_BASE
+    BINARYWRITER_BASE();
 
 public:
     /*! \brief This constructor takes an existing buffer to write to.

include/Athena/BinaryReader.hpp

@@ -167,13 +167,13 @@ public:
      *
      * \return Uint8* The buffer at the current position from the given length.
      */
-    atInt8* readBytes(atInt64 length);
+    atInt8* readBytes(atUint64 length);
 
     /*! \brief Reads a byte at the current position and advances the current position.
      *
      * \return Int8* The buffer at the current position from the given length.
      */
-    atUint8* readUBytes(atInt64 length);
+    atUint8* readUBytes(atUint64 length);
 
     /*! \brief Reads a Int16 and swaps to proper endianness depending on platform
      *  and Stream settings, and advances the current position

include/Athena/BinaryWriter.hpp

@@ -292,8 +292,8 @@ private:
 }
 
 #ifndef BINARYWRITER_BASE
-#define BINARYWRITER_BASE \
+#define BINARYWRITER_BASE() \
     private: \
-        typedef Athena::io::BinaryWriter base;
+        typedef Athena::io::BinaryWriter base
 #endif // BINARYWRITER_BASE
 #endif // __BINARY_WRITER_HPP__

include/Athena/MCFileWriter.hpp

@@ -37,7 +37,7 @@ namespace io
  */
 class MCFileWriter : protected BinaryWriter
 {
-    BINARYWRITER_BASE
+    BINARYWRITER_BASE();
 public:
     /*!
      * \brief This constructor takes an existing buffer to write to.

include/Athena/SkywardSwordFileWriter.hpp

@@ -28,8 +28,7 @@ namespace io
 
 class SkywardSwordFileWriter : public BinaryWriter
 {
-    // Why does this fuck up my formatting in Qt Creator?
-    BINARYWRITER_BASE
+    BINARYWRITER_BASE();
 public:
     SkywardSwordFileWriter(atUint8* data, atUint64 len);
     SkywardSwordFileWriter(const std::string& filename);

include/Athena/SpriteFileWriter.hpp

@@ -31,7 +31,7 @@ namespace io
 
 class SpriteFileWriter : public BinaryWriter
 {
-    BINARYWRITER_BASE;
+    BINARYWRITER_BASE();
 public:
     SpriteFileWriter(atUint8* data, atUint64 length);
 

include/Athena/WiiSaveWriter.hpp

@@ -38,7 +38,7 @@ namespace io
  */
 class WiiSaveWriter : protected BinaryWriter
 {
-    BINARYWRITER_BASE
+    BINARYWRITER_BASE();
 public:
     /*! \brief This constructor creates an instance from a file on disk.
      *

include/Athena/ZQuestFileWriter.hpp

@@ -31,7 +31,7 @@ namespace io
  */
 class ZQuestFileWriter : protected BinaryWriter
 {
-    BINARYWRITER_BASE
+    BINARYWRITER_BASE();
 
 public:
     /*!