Refactor: Switched materialarchive.c to C++

skyjake · Jan 6, 2013 · 1395bdc · 1395bdc
1 parent d9694cf
commit 1395bdc
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 107 deletions.
diff --git a/doomsday/engine/api/api_materialarchive.h b/doomsday/engine/api/api_materialarchive.h
@@ -49,19 +49,19 @@ DENG_API_TYPEDEF(MaterialArchive)
     /**
      * @param useSegments  If @c true, a serialized archive will be preceded by a segment id number.
      */
-    MaterialArchive* (*New)(int useSegments);
+    MaterialArchive *(*New)(int useSegments);
 
     /**
      * @param useSegments  If @c true, a serialized archive will be preceded by a segment id number.
      */
-    MaterialArchive* (*NewEmpty)(int useSegments);
+    MaterialArchive *(*NewEmpty)(int useSegments);
 
-    void (*Delete)(MaterialArchive* arc);
+    void (*Delete)(MaterialArchive *arc);
 
     /**
      * @return A new (unused) SerialId for the specified material.
      */
-    materialarchive_serialid_t (*FindUniqueSerialId)(MaterialArchive* arc, struct material_s* mat);
+    materialarchive_serialid_t (*FindUniqueSerialId)(MaterialArchive *arc, struct material_s *mat);
 
     /**
      * Finds and returns a material with the identifier @a serialId.
@@ -72,22 +72,22 @@ DENG_API_TYPEDEF(MaterialArchive)
      *
      * @return  Pointer to a material instance. Ownership not given.
      */
-    struct material_s* (*Find)(MaterialArchive* arc, materialarchive_serialid_t serialId, int group);
+    struct material_s *(*Find)(MaterialArchive *arc, materialarchive_serialid_t serialId, int group);
 
     /**
      * Returns the number of materials in the archive.
      *
      * @param arc  MaterialArchive instance.
      */
-    size_t (*Count)(MaterialArchive* arc);
+    size_t (*Count)(MaterialArchive *arc);
 
     /**
      * Serializes the state of the archive using @a writer.
      *
      * @param arc  MaterialArchive instance.
      * @param writer  Writer instance.
      */
-    void (*Write)(MaterialArchive* arc, Writer* writer);
+    void (*Write)(MaterialArchive *arc, Writer *writer);
 
     /**
      * Deserializes the state of the archive from @a reader.
@@ -97,7 +97,7 @@ DENG_API_TYPEDEF(MaterialArchive)
      *                       version is encountered.
      * @param reader  Reader instance.
      */
-    void (*Read)(MaterialArchive* arc, int forcedVersion, Reader* reader);
+    void (*Read)(MaterialArchive *arc, int forcedVersion, Reader *reader);
 }
 DENG_API_T(MaterialArchive);
 

diff --git a/doomsday/engine/engine.pro b/doomsday/engine/engine.pro
@@ -583,7 +583,7 @@ SOURCES += \
     src/resource/hq2x.c \
     src/resource/image.cpp \
     src/resource/material.cpp \
-    src/resource/materialarchive.c \
+    src/resource/materialarchive.cpp \
     src/resource/materialbind.cpp \
     src/resource/materials.cpp \
     src/resource/materialscheme.cpp \