Merge "Rename emulator_config_xxx to user_config_xxx"

4 files changed, 10 insertions, 10 deletions

diff --git a/android/main-common.c b/android/main-common.c
index bcae501..bb07943 100644
--- a/android/main-common.c
+++ b/android/main-common.c
@@ -57,14 +57,14 @@
 static AUserConfig*  userConfig;
 
 void
-emulator_config_init( void )
+user_config_init( void )
 {
     userConfig = auserConfig_new( android_avdInfo );
 }
 
 /* only call this function on normal exits, so that ^C doesn't save the configuration */
 void
-emulator_config_done( void )
+user_config_done( void )
 {
     int  win_x, win_y;
 
@@ -79,7 +79,7 @@ emulator_config_done( void )
 }
 
 void
-emulator_config_get_window_pos( int *window_x, int *window_y )
+user_config_get_window_pos( int *window_x, int *window_y )
 {
     *window_x = *window_y = 10;
 
@@ -293,7 +293,7 @@ const char*  skin_network_delay = NULL;
 
 static void sdl_at_exit(void)
 {
-    emulator_config_done();
+    user_config_done();
     qemulator_done(qemulator_get());
     SDL_Quit();
 }
@@ -507,7 +507,7 @@ init_sdl_ui(AConfig*         skinConfig,
     }
     atexit(sdl_at_exit);
 
-    emulator_config_get_window_pos(&win_x, &win_y);
+    user_config_get_window_pos(&win_x, &win_y);
 
     if ( qemulator_init(qemulator_get(), skinConfig, skinPath, win_x, win_y, opts) < 0 ) {
         fprintf(stderr, "### Error: could not load emulator skin from '%s'\n", skinPath);
diff --git a/android/main-common.h b/android/main-common.h
index b797f6a..c5131df 100644
--- a/android/main-common.h
+++ b/android/main-common.h
@@ -22,10 +22,10 @@
 /** Emulator user configuration (e.g. last window position)
  **/
 
-void emulator_config_init( void );
-void emulator_config_done( void );
+void user_config_init( void );
+void user_config_done( void );
 
-void emulator_config_get_window_pos( int *window_x, int *window_y );
+void user_config_get_window_pos( int *window_x, int *window_y );
 
 #define  ONE_MB  (1024*1024)
 
diff --git a/android/main-ui.c b/android/main-ui.c
index 9e511c7..ca83a9a 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -875,7 +875,7 @@ int main(int argc, char **argv)
     }
 
 
-    emulator_config_init();
+    user_config_init();
     parse_skin_files(opts->skindir, opts->skin, opts,
                      &skinConfig, &skinPath);
 
diff --git a/android/main.c b/android/main.c
index 63e6b84..919810b 100644
--- a/android/main.c
+++ b/android/main.c
@@ -666,7 +666,7 @@ int main(int argc, char **argv)
     }
 
 
-    emulator_config_init();
+    user_config_init();
     parse_skin_files(opts->skindir, opts->skin, opts,
                      &skinConfig, &skinPath);