2.4 continued (#8092)

Quite a bit of work on 2.4

Co-authored-by: 3djc <Th1sisfmyofmyo>

radio/src/storage/conversions/conversions_218_219.cpp

@@ -336,7 +336,7 @@ void convertModelData_218_to_219(ModelData &model)
   }
 
   for (int zone=0; zone<MAX_LAYOUT_ZONES; zone++) {
-    Topbar::ZonePersistentData * zoneData = &g_model.topbarData.zones[zone];
+    TopBar::ZonePersistentData * zoneData = &g_model.topbarData.zones[zone];
     if (strcmp("Value", zoneData->widgetName))
       continue;
 

radio/src/storage/conversions/datastructs_218.h

@@ -402,7 +402,7 @@ PACK(struct TelemetrySensor_218 {
   });
   #define VIEW_DATA \
     CustomScreenData screenData[MAX_CUSTOM_SCREENS]; \
-    Topbar::PersistentData topbarData; \
+    TopBar::PersistentData topbarData; \
     uint8_t view;
 #elif defined(PCBTARANIS)
   #define VIEW_DATA   uint8_t view;
@@ -527,7 +527,7 @@ PACK(struct ModelData_v218 {
   #define THEME_NAME_LEN 8
   #define THEME_DATA \
     char themeName[THEME_NAME_LEN]; \
-    ThemeBase::PersistentData themeData;
+    OpenTxTheme::PersistentData themeData;
 #else
   #define THEME_DATA
 #endif

radio/src/storage/sdcard_common.cpp

@@ -40,7 +40,7 @@ void storageEraseAll(bool warn)
 
 #if defined(LIBOPENUI)
   // the theme has not been loaded before
-  static_cast<ThemeBase*>(theme)->load();
+  static_cast<OpenTxTheme*>(theme)->load();
 #endif
 
   generalDefault();