COMMON: Rename base-str.* to str-base.* for consistency and file grouping

common/module.mk

@@ -2,7 +2,6 @@ MODULE := common
 
 MODULE_OBJS := \
 	archive.o \
-	base-str.o \
 	concatstream.o \
 	config-manager.o \
 	coroutines.o \
@@ -29,6 +28,7 @@ MODULE_OBJS := \
 	str.o \
 	stream.o \
 	streamdebug.o \
+	str-base.o \
 	str-enc.o \
 	encodings/singlebyte.o \
 	system.o \

common/str-base.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/base-str.h"
+#include "common/str-base.h"
 #include "common/hash-str.h"
 #include "common/list.h"
 #include "common/memorypool.h"

common/str-base.h

@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef COMMON_BASE_STRING_H
+#ifndef COMMON_STR_BASE_H
-#define COMMON_BASE_STRING_H
+#define COMMON_STR_BASE_H
 
 #include "common/scummsys.h"
 #include "common/str-enc.h"

common/str.h

@@ -25,7 +25,7 @@
 #include "common/scummsys.h"
 #include "common/str-enc.h"
 #include "common/ustr.h"
-#include "common/base-str.h"
+#include "common/str-base.h"
 
 #include <stdarg.h>
 

common/ustr.h

@@ -25,7 +25,7 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 #include "common/str-enc.h"
-#include "common/base-str.h"
+#include "common/str-base.h"
 
 namespace Common {