4 files changed, 23 insertions, 22 deletions
diff --git a/view/bintxt/src/ihex.rs b/view/bintxt/src/ihex.rs
index bb694941..b1cbfb80 100644
--- a/view/bintxt/src/ihex.rs
+++ b/view/bintxt/src/ihex.rs
@@ -1,15 +1,15 @@
-use binaryninja::binaryview::*;
-use binaryninja::custombinaryview::*;
-use binaryninja::rc::Ref;
-use binaryninja::segment::SegmentBuilder;
-use ihex::Record;
-use binaryninja::platform::Platform;
-use binaryninja::settings::Settings;
 use crate::segment_after_address;
 use crate::segment_from_address;
 use crate::sort_and_merge_segments;
 use crate::MergedSegment;
 use crate::UnmergedSegment;
+use binaryninja::binary_view::*;
+use binaryninja::custom_binary_view::*;
+use binaryninja::platform::Platform;
+use binaryninja::rc::Ref;
+use binaryninja::segment::SegmentBuilder;
+use binaryninja::settings::{QueryOptions, Settings};
+use ihex::Record;
 
 fn parse_ihex(string: &str) -> Result<(Vec<u8>, IHexViewData)> {
     let mut reader = ihex::Reader::new(&string);
@@ -101,7 +101,7 @@ impl CustomBinaryViewType for IHexViewConstructor {
         parent: &BinaryView,
         builder: CustomViewBuilder<'builder, Self>,
     ) -> Result<CustomView<'builder>> {
-        let bytes = parent.len();
+        let bytes = parent.len() as usize;
         let mut buf = vec![0; bytes];
         let bytes_read = parent.read(&mut buf, 0);
         if bytes_read != bytes {
@@ -216,15 +216,16 @@ unsafe impl CustomBinaryView for IHexView {
                     .contains_code(true),
             );
         }
-        
+
         // TODO: Because we detached from the raw view this setting will never be set.
+        let mut settings_query_opts = QueryOptions::new_with_view(&self.core);
         let _ = self.core.load_settings(self.type_name()).map(|s| {
-            let platform_name = s.get_string("loader.platform", Some(&self.core), None);
+            let platform_name = s.get_string_with_opts("loader.platform", &mut settings_query_opts);
             if let Some(platform) = Platform::by_name(platform_name) {
                 self.set_default_platform(&platform);
             }
         });
-        
+
         Ok(())
     }
 }
diff --git a/view/bintxt/src/lib.rs b/view/bintxt/src/lib.rs
index 392fe4ce..4627c654 100644
--- a/view/bintxt/src/lib.rs
+++ b/view/bintxt/src/lib.rs
@@ -7,24 +7,24 @@ use ihex::*;
 use srec::*;
 use titxt::*;
 
-use std::ops::Range;
-use log::LevelFilter;
 use binaryninja::logger::Logger;
+use log::LevelFilter;
+use std::ops::Range;
 
 #[no_mangle]
 #[allow(non_snake_case)]
 pub extern "C" fn CorePluginInit() -> bool {
     Logger::new("BINTXT").with_level(LevelFilter::Info).init();
 
-    binaryninja::custombinaryview::register_view_type(c"ti-txt", c"TI-TXT", |core| {
+    binaryninja::custom_binary_view::register_view_type(c"ti-txt", c"TI-TXT", |core| {
         TiTxtViewConstructor { core }
     });
 
-    binaryninja::custombinaryview::register_view_type(c"srec", c"Motorola S-record", |core| {
+    binaryninja::custom_binary_view::register_view_type(c"srec", c"Motorola S-record", |core| {
         SRecViewConstructor { core }
     });
 
-    binaryninja::custombinaryview::register_view_type(c"ihex", c"Intel HEX", |core| {
+    binaryninja::custom_binary_view::register_view_type(c"ihex", c"Intel HEX", |core| {
         IHexViewConstructor { core }
     });
 
diff --git a/view/bintxt/src/srec.rs b/view/bintxt/src/srec.rs
index d11e5fd5..beba98b0 100644
--- a/view/bintxt/src/srec.rs
+++ b/view/bintxt/src/srec.rs
@@ -1,5 +1,5 @@
-use binaryninja::binaryview::{BinaryView, BinaryViewBase, BinaryViewExt};
-use binaryninja::custombinaryview::{
+use binaryninja::binary_view::{BinaryView, BinaryViewBase, BinaryViewExt};
+use binaryninja::custom_binary_view::{
     BinaryViewType, BinaryViewTypeBase, CustomBinaryView, CustomBinaryViewType, CustomView,
     CustomViewBuilder,
 };
@@ -212,7 +212,7 @@ impl CustomBinaryViewType for SRecViewConstructor {
         parent: &BinaryView,
         builder: CustomViewBuilder<'builder, Self>,
     ) -> Result<CustomView<'builder>, ()> {
-        let bytes = parent.len();
+        let bytes = parent.len() as usize;
         let mut buf = vec![0; bytes];
         let bytes_read = parent.read(&mut buf, 0);
         if bytes_read != bytes {
diff --git a/view/bintxt/src/titxt.rs b/view/bintxt/src/titxt.rs
index 6cb006ab..d9b766e4 100644
--- a/view/bintxt/src/titxt.rs
+++ b/view/bintxt/src/titxt.rs
@@ -1,5 +1,5 @@
-use binaryninja::binaryview::{BinaryView, BinaryViewBase, BinaryViewExt};
-use binaryninja::custombinaryview::{
+use binaryninja::binary_view::{BinaryView, BinaryViewBase, BinaryViewExt};
+use binaryninja::custom_binary_view::{
     BinaryViewType, BinaryViewTypeBase, CustomBinaryView, CustomBinaryViewType, CustomView,
     CustomViewBuilder,
 };
@@ -172,7 +172,7 @@ impl CustomBinaryViewType for TiTxtViewConstructor {
         parent: &BinaryView,
         builder: CustomViewBuilder<'builder, Self>,
     ) -> Result<CustomView<'builder>, ()> {
-        let bytes = parent.len();
+        let bytes = parent.len() as usize;
         let mut buf = vec![0; bytes];
         let bytes_read = parent.read(&mut buf, 0);
         if bytes_read != bytes {