From 14ac2d97911f5056b52f2cc8062a5740a1573c7b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 21 Mar 2015 00:49:55 +0100
Subject: [PATCH] Rename settings_data.h to settings.h

---
 Makefile.common                | 2 +-
 apple/OSX/settings.m           | 2 +-
 apple/common/RetroArch_Apple.h | 2 +-
 apple/iOS/menu.h               | 2 +-
 apple/iOS/platform.m           | 2 +-
 griffin/griffin.c              | 2 +-
 menu/drivers/rmenu.c           | 2 +-
 menu/drivers/rmenu_xui.cpp     | 2 +-
 menu/drivers/shared.h          | 2 +-
 menu/menu_entries.h            | 2 +-
 menu/menu_input.c              | 2 +-
 settings_data.c => settings.c  | 2 +-
 settings_data.h => settings.h  | 0
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename settings_data.c => settings.c (99%)
 rename settings_data.h => settings.h (100%)

diff --git a/Makefile.common b/Makefile.common
index 73930b0f96..4474c5fa0c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -119,7 +119,7 @@ OBJ += frontend/frontend.o \
 		driver.o \
 		configuration.o \
 		settings_list.o \
-		settings_data.o \
+		settings.o \
 		dynamic.o \
 		dynamic_dummy.o \
 		libretro-common/queues/message_queue.o \
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index f3cf913f67..d8aa6dda47 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -17,7 +17,7 @@
 #import <objc/runtime.h>
 #import "../common/RetroArch_Apple.h"
 #include <retro_miscellaneous.h>
-#include "../../settings_data.h"
+#include "../../settings.h"
 #include "../../input/drivers/apple_input.h"
 
 #include "../../driver.h"
diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h
index af01cb44d3..5635db2030 100644
--- a/apple/common/RetroArch_Apple.h
+++ b/apple/common/RetroArch_Apple.h
@@ -21,7 +21,7 @@
 #import <CoreFoundation/CoreFoundation.h>
 
 #include "../../core_info.h"
-#include "../../settings_data.h"
+#include "../../settings.h"
 
 @protocol RetroArch_Platform
 - (void)loadingCore:(NSString*)core withFile:(const char*)file;
diff --git a/apple/iOS/menu.h b/apple/iOS/menu.h
index 6b8894c917..c1286b8326 100644
--- a/apple/iOS/menu.h
+++ b/apple/iOS/menu.h
@@ -19,7 +19,7 @@
 
 #include "../../playlist.h"
 #include "views.h"
-#include "../../settings_data.h"
+#include "../../settings.h"
 
 @protocol RAMenuItemBase
 - (UITableViewCell*)cellForTableView:(UITableView*)tableView;
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index c6c62979fc..515f89372a 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -18,7 +18,7 @@
 
 #include "../common/RetroArch_Apple.h"
 #include "../../input/drivers/apple_input.h"
-#include "../../settings_data.h"
+#include "../../settings.h"
 #include "../common/apple_gamecontroller.h"
 #include "menu.h"
 #include "../../menu/menu.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index be58bfc3f0..5896ed4c82 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -799,7 +799,7 @@ XML
  SETTINGS
 ============================================================ */
 #include "../settings_list.c"
-#include "../settings_data.c"
+#include "../settings.c"
 
 /*============================================================
  AUDIO UTILS
diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index 8e422c6787..a3a655ca10 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -29,7 +29,7 @@
 #include <compat/posix_string.h>
 #include "../../performance.h"
 
-#include "../../settings_data.h"
+#include "../../settings.h"
 #include "../../screenshot.h"
 #include "../../gfx/drivers_font_renderer/bitmap.h"
 
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index 42970cafd7..d1d6b9485a 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -31,7 +31,7 @@
 
 #include "../../gfx/video_context_driver.h"
 
-#include "../../settings_data.h"
+#include "../../settings.h"
 #include "../../general.h"
 
 #include "../../gfx/d3d/d3d.h"
diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h
index 0c5c6f850f..d49193caed 100644
--- a/menu/drivers/shared.h
+++ b/menu/drivers/shared.h
@@ -16,7 +16,7 @@
 #ifndef _DISP_SHARED_H
 #define _DISP_SHARED_H
 
-#include "../../settings_data.h"
+#include "../../settings.h"
 #include <string/string_list.h>
 #include <time.h>
 
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index a06291a6d0..0da1b82af9 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include "menu.h"
 #include <file/file_list.h>
-#include "../settings_data.h"
+#include "../settings.h"
 #ifdef HAVE_LIBRETRODB
 #include "menu_database.h"
 #endif
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 3cb5eb973a..35bbab5ae5 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -29,7 +29,7 @@
 #include "menu_navigation.h"
 #include "../cheats.h"
 #include "../performance.h"
-#include "../settings_data.h"
+#include "../settings.h"
 #include "../input/input_joypad.h"
 #include "../input/input_remapping.h"
 
diff --git a/settings_data.c b/settings.c
similarity index 99%
rename from settings_data.c
rename to settings.c
index 01430036c2..4bfe3b2d6e 100644
--- a/settings_data.c
+++ b/settings.c
@@ -17,7 +17,7 @@
 
 #include "driver.h"
 #include "gfx/video_monitor.h"
-#include "settings_data.h"
+#include "settings.h"
 #include "dynamic.h"
 #include <file/file_path.h>
 #include "input/input_autodetect.h"
diff --git a/settings_data.h b/settings.h
similarity index 100%
rename from settings_data.h
rename to settings.h