refactor: remove dc prefix from keyring and keyhistory

This commit is contained in:
dignifiedquire
2019-05-27 09:35:03 +02:00
parent 22868abe0e
commit 2d3eae4e1e
7 changed files with 6 additions and 6 deletions

View File

@@ -17,13 +17,13 @@ use mmime::{mailmime_substitute, MAILIMF_NO_ERROR, MAIL_NO_ERROR};
use crate::aheader::*; use crate::aheader::*;
use crate::context::Context; use crate::context::Context;
use crate::dc_keyring::*;
use crate::dc_log::*; use crate::dc_log::*;
use crate::dc_mimeparser::*; use crate::dc_mimeparser::*;
use crate::dc_securejoin::*; use crate::dc_securejoin::*;
use crate::dc_sqlite3::*; use crate::dc_sqlite3::*;
use crate::dc_tools::*; use crate::dc_tools::*;
use crate::key::*; use crate::key::*;
use crate::keyring::*;
use crate::peerstate::*; use crate::peerstate::*;
use crate::pgp::*; use crate::pgp::*;
use crate::types::*; use crate::types::*;

View File

@@ -11,7 +11,6 @@ use crate::dc_chat::*;
use crate::dc_configure::*; use crate::dc_configure::*;
use crate::dc_imex::*; use crate::dc_imex::*;
use crate::dc_jobthread::*; use crate::dc_jobthread::*;
use crate::dc_keyhistory::*;
use crate::dc_location::*; use crate::dc_location::*;
use crate::dc_log::*; use crate::dc_log::*;
use crate::dc_loginparam::*; use crate::dc_loginparam::*;
@@ -21,6 +20,7 @@ use crate::dc_param::*;
use crate::dc_sqlite3::*; use crate::dc_sqlite3::*;
use crate::dc_tools::*; use crate::dc_tools::*;
use crate::imap::*; use crate::imap::*;
use crate::keyhistory::*;
use crate::types::*; use crate::types::*;
use crate::x::*; use crate::x::*;

View File

@@ -27,6 +27,8 @@ pub mod constants;
pub mod context; pub mod context;
pub mod imap; pub mod imap;
pub mod key; pub mod key;
pub mod keyhistory;
pub mod keyring;
pub mod oauth2; pub mod oauth2;
pub mod peerstate; pub mod peerstate;
pub mod pgp; pub mod pgp;
@@ -44,8 +46,6 @@ pub mod dc_e2ee;
pub mod dc_imex; pub mod dc_imex;
pub mod dc_job; pub mod dc_job;
pub mod dc_jobthread; pub mod dc_jobthread;
pub mod dc_keyhistory;
pub mod dc_keyring;
pub mod dc_location; pub mod dc_location;
pub mod dc_loginparam; pub mod dc_loginparam;
pub mod dc_lot; pub mod dc_lot;

View File

@@ -12,9 +12,9 @@ use pgp::types::{CompressionAlgorithm, KeyTrait, SecretKeyTrait, StringToKey};
use rand::thread_rng; use rand::thread_rng;
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use crate::dc_keyring::*;
use crate::dc_tools::*; use crate::dc_tools::*;
use crate::key::*; use crate::key::*;
use crate::keyring::*;
use crate::types::*; use crate::types::*;
use crate::x::*; use crate::x::*;

View File

@@ -11,7 +11,6 @@ use deltachat::context::*;
use deltachat::dc_array::*; use deltachat::dc_array::*;
use deltachat::dc_configure::*; use deltachat::dc_configure::*;
use deltachat::dc_imex::*; use deltachat::dc_imex::*;
use deltachat::dc_keyring::*;
use deltachat::dc_location::*; use deltachat::dc_location::*;
use deltachat::dc_lot::*; use deltachat::dc_lot::*;
use deltachat::dc_mimeparser::*; use deltachat::dc_mimeparser::*;
@@ -23,6 +22,7 @@ use deltachat::dc_strbuilder::*;
use deltachat::dc_strencode::*; use deltachat::dc_strencode::*;
use deltachat::dc_tools::*; use deltachat::dc_tools::*;
use deltachat::key::*; use deltachat::key::*;
use deltachat::keyring::*;
use deltachat::oauth2::*; use deltachat::oauth2::*;
use deltachat::pgp::*; use deltachat::pgp::*;
use deltachat::types::*; use deltachat::types::*;