From ac387f51cca1e79c69f28424db46950ac1fe1502 Mon Sep 17 00:00:00 2001
From: RogueMaster <anifan115@gmail.com>
Date: Fri, 7 Oct 2022 02:40:45 -0400
Subject: [PATCH] ugh

---
 applications/plugins/chip8/chip8.c                   |  2 +-
 applications/plugins/chip8/chip8.h                   |  2 +-
 applications/plugins/tanksgame/tanks_game.c          | 12 ++++++------
 .../services/namechangersrv/namechangersrv.c         |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/applications/plugins/chip8/chip8.c b/applications/plugins/chip8/chip8.c
index 34e70eb07..6ca1a90d7 100644
--- a/applications/plugins/chip8/chip8.c
+++ b/applications/plugins/chip8/chip8.c
@@ -101,7 +101,7 @@ static int32_t chip8_worker(void* context) {
     return 0;
 }
 
-Chip8Emulator* chip8_make_emulator(string_t file_path) {
+Chip8Emulator* chip8_make_emulator(FuriString* file_path) {
     furi_assert(file_path);
     FURI_LOG_I("CHIP8", "make emulator, file_path=", furi_string_get_cstr(file_path));
 
diff --git a/applications/plugins/chip8/chip8.h b/applications/plugins/chip8/chip8.h
index f4785ab3d..f3864201a 100644
--- a/applications/plugins/chip8/chip8.h
+++ b/applications/plugins/chip8/chip8.h
@@ -25,7 +25,7 @@ typedef struct {
     t_chip8_state* t_chip8_state;
 } Chip8State;
 
-Chip8Emulator* chip8_make_emulator(string_t file_path);
+Chip8Emulator* chip8_make_emulator(FuriString* file_path);
 
 void chip8_close_emulator(Chip8Emulator* chip8);
 void chip8_set_back_pressed(Chip8Emulator* chip8);
diff --git a/applications/plugins/tanksgame/tanks_game.c b/applications/plugins/tanksgame/tanks_game.c
index d26631902..b8e2b1b13 100644
--- a/applications/plugins/tanksgame/tanks_game.c
+++ b/applications/plugins/tanksgame/tanks_game.c
@@ -1600,7 +1600,7 @@ int32_t tanks_game_app(void* p) {
                             subghz_tx_rx_worker_write(
                                 subghz_txrx,
                                 (uint8_t*)string_get_cstr(goesUp),
-                                strlen(string_get_cstr(goesUp)));
+                                strlen(furi_string_get_cstr(goesUp)));
 
                         } else {
                             tanks_state->p1->moving = true;
@@ -1624,7 +1624,7 @@ int32_t tanks_game_app(void* p) {
                             subghz_tx_rx_worker_write(
                                 subghz_txrx,
                                 (uint8_t*)string_get_cstr(goesDown),
-                                strlen(string_get_cstr(goesDown)));
+                                strlen(furi_string_get_cstr(goesDown)));
                         } else {
                             tanks_state->p1->moving = true;
                             tanks_state->p1->direction = DirectionDown;
@@ -1641,7 +1641,7 @@ int32_t tanks_game_app(void* p) {
                             subghz_tx_rx_worker_write(
                                 subghz_txrx,
                                 (uint8_t*)string_get_cstr(goesRight),
-                                strlen(string_get_cstr(goesRight)));
+                                strlen(furi_string_get_cstr(goesRight)));
                         } else {
                             tanks_state->p1->moving = true;
                             tanks_state->p1->direction = DirectionRight;
@@ -1658,7 +1658,7 @@ int32_t tanks_game_app(void* p) {
                             subghz_tx_rx_worker_write(
                                 subghz_txrx,
                                 (uint8_t*)string_get_cstr(goesLeft),
-                                strlen(string_get_cstr(goesLeft)));
+                                strlen(furi_string_get_cstr(goesLeft)));
                         } else {
                             tanks_state->p1->moving = true;
                             tanks_state->p1->direction = DirectionLeft;
@@ -1691,7 +1691,7 @@ int32_t tanks_game_app(void* p) {
                             subghz_tx_rx_worker_write(
                                 subghz_txrx,
                                 (uint8_t*)string_get_cstr(shoots),
-                                strlen(string_get_cstr(shoots)));
+                                strlen(furi_string_get_cstr(shoots)));
                         } else {
                             tanks_state->p1->shooting = true;
                         }
@@ -1753,7 +1753,7 @@ int32_t tanks_game_app(void* p) {
                     subghz_tx_rx_worker_write(
                         subghz_txrx,
                         (uint8_t*)string_get_cstr(serializedData),
-                        strlen(string_get_cstr(serializedData)));
+                        strlen(furi_string_get_cstr(serializedData)));
 
                     tanks_state->sent++;
                 } else if(tanks_state->state == GameStateSingle) {
diff --git a/applications/services/namechangersrv/namechangersrv.c b/applications/services/namechangersrv/namechangersrv.c
index 64a2adf1c..3b8a53421 100644
--- a/applications/services/namechangersrv/namechangersrv.c
+++ b/applications/services/namechangersrv/namechangersrv.c
@@ -165,7 +165,7 @@ void namechanger_on_system_start() {
                 furi_string_free(name);
             } else {
                 //set name from file
-                furi_hal_version_set_custom_name(string_get_cstr(data));
+                furi_hal_version_set_custom_name(furi_string_get_cstr(data));
             }
         }