diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index c919d660d..2d654ba03 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -1043,7 +1043,7 @@ pub unsafe extern "C" fn dc_send_locations_to_chat( assert!(!context.is_null()); let context = &*context; - dc_location::dc_send_locations_to_chat(context, chat_id, seconds as i64) + location::dc_send_locations_to_chat(context, chat_id, seconds as i64) } #[no_mangle] @@ -1054,7 +1054,7 @@ pub unsafe extern "C" fn dc_is_sending_locations_to_chat( assert!(!context.is_null()); let context = &*context; - dc_location::dc_is_sending_locations_to_chat(context, chat_id) as libc::c_int + location::dc_is_sending_locations_to_chat(context, chat_id) as libc::c_int } #[no_mangle] @@ -1067,7 +1067,7 @@ pub unsafe extern "C" fn dc_set_location( assert!(!context.is_null()); let context = &*context; - dc_location::dc_set_location(context, latitude, longitude, accuracy) + location::dc_set_location(context, latitude, longitude, accuracy) } #[no_mangle] @@ -1081,7 +1081,7 @@ pub unsafe extern "C" fn dc_get_locations( assert!(!context.is_null()); let context = &*context; - let res = dc_location::dc_get_locations( + let res = location::dc_get_locations( context, chat_id, contact_id, @@ -1096,7 +1096,7 @@ pub unsafe extern "C" fn dc_delete_all_locations(context: *mut dc_context_t) { assert!(!context.is_null()); let context = &*context; - dc_location::dc_delete_all_locations(context); + location::dc_delete_all_locations(context); } // dc_array_t diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs index cbb06289b..3cded24ff 100644 --- a/examples/repl/cmdline.rs +++ b/examples/repl/cmdline.rs @@ -9,11 +9,11 @@ use deltachat::constants::*; use deltachat::contact::*; use deltachat::context::*; use deltachat::dc_imex::*; -use deltachat::dc_location::*; use deltachat::dc_receive_imf::*; use deltachat::dc_tools::*; use deltachat::error::Error; use deltachat::job::*; +use deltachat::location::*; use deltachat::lot::LotState; use deltachat::message::*; use deltachat::peerstate::*; diff --git a/src/dc_array.rs b/src/dc_array.rs index a69bab3e2..c3e2dcbe0 100644 --- a/src/dc_array.rs +++ b/src/dc_array.rs @@ -1,4 +1,4 @@ -use crate::dc_location::Location; +use crate::location::Location; use crate::types::*; /* * the structure behind dc_array_t */ diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs index 4919f9963..fc146214c 100644 --- a/src/dc_mimefactory.rs +++ b/src/dc_mimefactory.rs @@ -16,10 +16,10 @@ use crate::constants::*; use crate::contact::*; use crate::context::{dc_get_version_str, Context}; use crate::dc_e2ee::*; -use crate::dc_location::*; use crate::dc_strencode::*; use crate::dc_tools::*; use crate::error::Error; +use crate::location::*; use crate::message::*; use crate::param::*; use crate::stock::StockMessage; diff --git a/src/dc_mimeparser.rs b/src/dc_mimeparser.rs index 7dbb875fa..8109f8673 100644 --- a/src/dc_mimeparser.rs +++ b/src/dc_mimeparser.rs @@ -14,10 +14,10 @@ use mmime::other::*; use crate::contact::*; use crate::context::Context; use crate::dc_e2ee::*; -use crate::dc_location::*; use crate::dc_simplify::*; use crate::dc_strencode::*; use crate::dc_tools::*; +use crate::location::*; use crate::param::*; use crate::stock::StockMessage; use crate::types::*; diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 5fbf179a2..43d3add6a 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -14,7 +14,6 @@ use crate::chat::{self, Chat}; use crate::constants::*; use crate::contact::*; use crate::context::Context; -use crate::dc_location::*; use crate::dc_mimeparser::*; use crate::dc_move::*; use crate::dc_securejoin::*; @@ -22,6 +21,7 @@ use crate::dc_strencode::*; use crate::dc_tools::*; use crate::error::Result; use crate::job::*; +use crate::location::*; use crate::message::*; use crate::param::*; use crate::peerstate::*; diff --git a/src/job.rs b/src/job.rs index e98dae1ab..e7286c711 100644 --- a/src/job.rs +++ b/src/job.rs @@ -10,11 +10,11 @@ use crate::configure::*; use crate::constants::*; use crate::context::Context; use crate::dc_imex::*; -use crate::dc_location::*; use crate::dc_loginparam::*; use crate::dc_mimefactory::*; use crate::dc_tools::*; use crate::imap::*; +use crate::location::*; use crate::message::*; use crate::param::*; use crate::sql; diff --git a/src/lib.rs b/src/lib.rs index ee0766149..cfb4ca51c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,6 +35,7 @@ pub mod job; mod job_thread; pub mod key; pub mod keyring; +pub mod location; pub mod lot; pub mod message; pub mod oauth2; @@ -52,7 +53,6 @@ pub mod dc_array; mod dc_dehtml; mod dc_e2ee; pub mod dc_imex; -pub mod dc_location; mod dc_loginparam; mod dc_mimefactory; pub mod dc_mimeparser; diff --git a/src/dc_location.rs b/src/location.rs similarity index 100% rename from src/dc_location.rs rename to src/location.rs