Refactor|Resources: Removed 's' suffix from animgroups.cpp/h

skyjake · Nov 16, 2013 · dffd372 · dffd372
1 parent 5d9c3ff
commit dffd372
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -331,7 +331,7 @@ DENG_HEADERS += \
     include/render/walledge.h \
     include/render/wallspec.h \
     include/resource/abstractfont.h \
-    include/resource/animgroups.h \
+    include/resource/animgroup.h \
     include/resource/bitmapfont.h \
     include/resource/colorpalette.h \
     include/resource/colorpalettes.h \
@@ -688,7 +688,7 @@ SOURCES += \
     src/render/walledge.cpp \
     src/render/wallspec.cpp \
     src/resource/abstractfont.cpp \
-    src/resource/animgroups.cpp \
+    src/resource/animgroup.cpp \
     src/resource/api_material.cpp \
     src/resource/api_resource.cpp \
     src/resource/bitmapfont.cpp \

diff --git a/doomsday/client/include/de_resource.h b/doomsday/client/include/de_resource.h
@@ -23,7 +23,6 @@
 
 #include "resourceclass.h"
 
-#include "resource/animgroups.h"
 #include "resource/colorpalettes.h"
 #include "resource/abstractfont.h"
 #include "Materials"

diff --git a/...sday/client/include/resource/animgroups.h → doomsday/client/include/resource/animgroup.h b/...sday/client/include/resource/animgroups.h → doomsday/client/include/resource/animgroup.h
@@ -1,4 +1,4 @@
-/** @file animgroups.h  Material animation group.
+/** @file animgroup.h  Material animation group.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>

diff --git a/doomsday/client/include/resource/resourcesystem.h b/doomsday/client/include/resource/resourcesystem.h
@@ -21,7 +21,7 @@
 
 #include "def_data.h"
 #include "resourceclass.h"
-#include "resource/animgroups.h"
+#include "resource/animgroup.h"
 #ifdef __CLIENT__
 #  include "Fonts"
 #endif

diff --git a/doomsday/client/src/resource/animgroups.cpp → doomsday/client/src/resource/animgroup.cpp b/doomsday/client/src/resource/animgroups.cpp → doomsday/client/src/resource/animgroup.cpp
@@ -18,7 +18,7 @@
  * 02110-1301 USA</small>
  */
 
-#include "resource/animgroups.h"
+#include "resource/animgroup.h"
 
 #include <de/Log>
 #include <QtAlgorithms>

diff --git a/doomsday/client/src/resource/api_resource.cpp b/doomsday/client/src/resource/api_resource.cpp
@@ -1,8 +1,7 @@
 #define DENG_NO_API_MACROS_RESOURCE
 #include "de_base.h"
 #include "api_resource.h"
-#include "Textures"
-#include "resource/animgroups.h"
+#include "resource/resourcesystem.h"
 #include "gl/gl_tex.h" // averagealpha_analysis_t, etc...
 #ifdef __CLIENT__
 #  include "render/r_draw.h" // Rend_PatchTextureSpec()

diff --git a/doomsday/server/server.pro b/doomsday/server/server.pro
@@ -195,7 +195,7 @@ DENG_HEADERS += \
     $$SRC/include/partition.h \
     $$SRC/include/r_util.h \
     $$SRC/include/render/r_main.h \
-    $$SRC/include/resource/animgroups.h \
+    $$SRC/include/resource/animgroup.h \
     $$SRC/include/resource/colorpalette.h \
     $$SRC/include/resource/colorpalettes.h \
     $$SRC/include/resource/compositetexture.h \
@@ -364,7 +364,7 @@ SOURCES += \
     $$SRC/src/network/net_ping.cpp \
     $$SRC/src/r_util.cpp \
     $$SRC/src/render/r_main.cpp \
-    $$SRC/src/resource/animgroups.cpp \
+    $$SRC/src/resource/animgroup.cpp \
     $$SRC/src/resource/api_material.cpp \
     $$SRC/src/resource/api_resource.cpp \
     $$SRC/src/resource/colorpalette.cpp \