rename files, use new prefix

cmdline/cmdline.c

@@ -25,11 +25,11 @@ your library */
 
 
 #include <dirent.h>
-#include "../src/mrmailbox_internal.h"
+#include "../src/dc_context.h"
-#include "../src/mraheader.h"
+#include "../src/dc_aheader.h"
-#include "../src/mrapeerstate.h"
+#include "../src/dc_apeerstate.h"
-#include "../src/mrkey.h"
+#include "../src/dc_key.h"
-#include "../src/mrpgp.h"
+#include "../src/dc_pgp.h"
 
 
 

cmdline/main.c

@@ -30,8 +30,8 @@ all further options can be set using the set-command (type ? for help). */
 
 #include <string.h>
 #include <unistd.h>
-#include "../src/mrmailbox.h"
+#include "../src/deltachat.h"
-#include "../src/mrmailbox_internal.h"
+#include "../src/dc_context.h"
 #include "cmdline.h"
 #include "stress.h"
 

cmdline/stress.c

@@ -28,14 +28,14 @@ $ valgrind --leak-check=full --tool=memcheck ./deltachat-core <db>
 
 #include <ctype.h>
 #include <assert.h>
-#include "../src/mrmailbox_internal.h"
+#include "../src/dc_context.h"
-#include "../src/mrsimplify.h"
+#include "../src/dc_simplify.h"
-#include "../src/mrmimeparser.h"
+#include "../src/dc_mimeparser.h"
-#include "../src/mrmimefactory.h"
+#include "../src/dc_mimefactory.h"
-#include "../src/mrpgp.h"
+#include "../src/dc_pgp.h"
-#include "../src/mrapeerstate.h"
+#include "../src/dc_apeerstate.h"
-#include "../src/mraheader.h"
+#include "../src/dc_aheader.h"
-#include "../src/mrkeyring.h"
+#include "../src/dc_keyring.h"
 
 
 /* some data used for testing

deltachat-core.cbp

@@ -423,126 +423,121 @@
 		<Unit filename="libs/sqlite/sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mraheader.c">
+		<Unit filename="src/dc_aheader.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrapeerstate.c">
+		<Unit filename="src/dc_apeerstate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrarray.c">
+		<Unit filename="src/dc_array.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrchat.c">
+		<Unit filename="src/dc_chat.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrchatlist.c">
+		<Unit filename="src/dc_chatlist.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrcontact.c">
+		<Unit filename="src/dc_configure.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrdehtml.c">
+		<Unit filename="src/dc_contact.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrevent.h" />
+		<Unit filename="src/dc_context.c">
-		<Unit filename="src/mrhash.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrimap.c">
+		<Unit filename="src/dc_dehtml.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrjob.c">
+		<Unit filename="src/dc_e2ee.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrkey.c">
+		<Unit filename="src/dc_hash.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrkeyring.c">
+		<Unit filename="src/dc_imap.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrloginparam.c">
+		<Unit filename="src/dc_imex.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrlot.c">
+		<Unit filename="src/dc_job.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox.c">
+		<Unit filename="src/dc_key.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox.h" />
+		<Unit filename="src/dc_keyhistory.c">
-		<Unit filename="src/mrmailbox_configure.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_e2ee.c">
+		<Unit filename="src/dc_keyring.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_imex.c">
+		<Unit filename="src/dc_log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_internal.h" />
+		<Unit filename="src/dc_loginparam.c">
-		<Unit filename="src/mrmailbox_keyhistory.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_log.c">
+		<Unit filename="src/dc_lot.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_qr.c">
+		<Unit filename="src/dc_mimefactory.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_receive_imf.c">
+		<Unit filename="src/dc_mimeparser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmailbox_securejoin.c">
+		<Unit filename="src/dc_msg.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmimefactory.c">
+		<Unit filename="src/dc_param.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmimeparser.c">
+		<Unit filename="src/dc_pgp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrmsg.c">
+		<Unit filename="src/dc_qr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrosnative.c">
+		<Unit filename="src/dc_receive_imf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrparam.c">
+		<Unit filename="src/dc_saxparser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrpgp.c">
+		<Unit filename="src/dc_securejoin.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrsaxparser.c">
+		<Unit filename="src/dc_simplify.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrsimplify.c">
+		<Unit filename="src/dc_smtp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrsmtp.c">
+		<Unit filename="src/dc_sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrsqlite3.c">
+		<Unit filename="src/dc_stock.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrstock.c">
+		<Unit filename="src/dc_strbuilder.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrstrbuilder.c">
+		<Unit filename="src/dc_strencode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrstrencode.c">
+		<Unit filename="src/dc_token.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrtoken.c">
+		<Unit filename="src/dc_tools.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/mrtools.c">
+		<Unit filename="src/dc_uudecode.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/mruudecode.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/deltachat.h" />
 		<Extensions>
 			<envvars />
 			<code_completion />

src/dc_aheader.c

@@ -21,10 +21,10 @@
 
 
 #include <ctype.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mraheader.h"
+#include "dc_aheader.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
-#include "mrmimeparser.h"
+#include "dc_mimeparser.h"
 
 
 /**

src/dc_aheader.h

@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 
-#include "mrkey.h"
+#include "dc_key.h"
 
 
 /**

src/dc_apeerstate.c

@@ -20,10 +20,10 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
-#include "mraheader.h"
+#include "dc_aheader.h"
-#include "mrhash.h"
+#include "dc_hash.h"
 
 
 /*******************************************************************************

src/dc_apeerstate.h

@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 
-#include "mrkey.h"
+#include "dc_key.h"
 
 
 typedef struct mraheader_t mraheader_t;

src/dc_array.c

@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrarray-private.h"
+#include "dc_array.h"
 
 #define MR_ARRAY_MAGIC 0x000a11aa
 

src/dc_chat.c

@@ -20,12 +20,12 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrapeerstate.h"
+#include "dc_job.h"
-#include "mrjob.h"
+#include "dc_smtp.h"
-#include "mrsmtp.h"
+#include "dc_imap.h"
-#include "mrimap.h"
+#include "dc_mimefactory.h"
-#include "mrmimefactory.h"
+
 
 #define MR_CHAT_MAGIC 0xc4a7c4a7
 

src/dc_chatlist.c

@@ -20,7 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
+
 
 #define MR_CHATLIST_MAGIC 0xc4a71157
 

src/dc_configure.c

@@ -22,13 +22,12 @@
 
 #include <dirent.h>
 #include <unistd.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrloginparam.h"
+#include "dc_loginparam.h"
-#include "mrimap.h"
+#include "dc_imap.h"
-#include "mrsmtp.h"
+#include "dc_smtp.h"
-#include "mrosnative.h"
+#include "dc_saxparser.h"
-#include "mrsaxparser.h"
+#include "dc_job.h"
-#include "mrjob.h"
 
 
 /*******************************************************************************

src/dc_contact.c

@@ -20,9 +20,10 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrcontact.h"
+#include "dc_contact.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
+
 
 #define MR_CONTACT_MAGIC 0x0c047ac7
 

src/dc_context.c

@@ -25,15 +25,15 @@
 #include <unistd.h>    /* for getpid() */
 #include <openssl/opensslv.h>
 #include <assert.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrimap.h"
+#include "dc_imap.h"
-#include "mrsmtp.h"
+#include "dc_smtp.h"
-#include "mrmimefactory.h"
+#include "dc_mimefactory.h"
-#include "mrtools.h"
+#include "dc_tools.h"
-#include "mrjob.h"
+#include "dc_job.h"
-#include "mrkey.h"
+#include "dc_key.h"
-#include "mrpgp.h"
+#include "dc_pgp.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
 
 
 /*******************************************************************************

src/dc_context.h

@@ -27,6 +27,27 @@ extern "C" {
 #endif
 
 
+/* Includes that are used frequently.  This file may also be used to create predefined headers. */
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+#include <libetpan/libetpan.h>
+#include "deltachat.h"
+#include "mrmailbox.h"
+#include "dc_sqlite3.h"
+#include "dc_tools.h"
+#include "dc_strbuilder.h"
+#include "dc_strencode.h"
+#include "dc_param.h"
+#include "dc_stock.h"
+#include "dc_array.h"
+#include "dc_chat.h"
+#include "dc_chatlist.h"
+#include "dc_lot.h"
+#include "dc_msg.h"
+#include "dc_contact.h"
+
+
 typedef struct mrimap_t       mrimap_t;
 typedef struct mrsmtp_t       mrsmtp_t;
 typedef struct mrsqlite3_t    mrsqlite3_t;

src/dc_dehtml.c

@@ -22,11 +22,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "mrmailbox.h"
+#include "dc_context.h"
-#include "mrdehtml.h"
+#include "dc_dehtml.h"
-#include "mrsaxparser.h"
+#include "dc_saxparser.h"
-#include "mrtools.h"
+#include "dc_tools.h"
-#include "mrstrbuilder.h"
+#include "dc_strbuilder.h"
 
 
 

src/dc_e2ee.c

@@ -20,12 +20,12 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrpgp.h"
+#include "dc_pgp.h"
-#include "mrapeerstate.h"
+#include "dc_aheader.h"
-#include "mraheader.h"
+#include "dc_keyring.h"
-#include "mrkeyring.h"
+#include "dc_mimeparser.h"
-#include "mrmimeparser.h"
+#include "dc_apeerstate.h"
 
 
 /*******************************************************************************

src/dc_hash.c

@@ -20,13 +20,13 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <memory.h>
 #include <string.h>
 #include <stdint.h>
-#include "mrhash.h"
+#include "dc_context.h"
+#include "dc_hash.h"
 
 
 /*

src/dc_imap.c

@@ -24,12 +24,11 @@
 #include <libetpan/libetpan.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <unistd.h> /* for sleep() */
+#include <unistd.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrimap.h"
+#include "dc_imap.h"
-#include "mrjob.h"
+#include "dc_job.h"
-#include "mrosnative.h"
+#include "dc_loginparam.h"
-#include "mrloginparam.h"
 
 
 static int  setup_handle_if_needed__ (mrimap_t*);

src/dc_imex.c

@@ -26,14 +26,13 @@
 #include <openssl/rand.h>
 #include <libetpan/mmapstring.h>
 #include <netpgp-extra.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrmimeparser.h"
+#include "dc_mimeparser.h"
-#include "mrosnative.h"
+#include "dc_loginparam.h"
-#include "mrloginparam.h"
+#include "dc_aheader.h"
-#include "mraheader.h"
+#include "dc_apeerstate.h"
-#include "mrapeerstate.h"
+#include "dc_pgp.h"
-#include "mrpgp.h"
+#include "dc_mimefactory.h"
-#include "mrmimefactory.h"
 
 
 /*******************************************************************************

src/dc_job.c

@@ -22,12 +22,12 @@
 
 #include <stdarg.h>
 #include <unistd.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrloginparam.h"
+#include "dc_loginparam.h"
-#include "mrjob.h"
+#include "dc_job.h"
-#include "mrimap.h"
+#include "dc_imap.h"
-#include "mrsmtp.h"
+#include "dc_smtp.h"
-#include "mrmimefactory.h"
+#include "dc_mimefactory.h"
 
 
 /*******************************************************************************

src/dc_key.c

@@ -22,10 +22,10 @@
 
 #include <ctype.h>
 #include <memory.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrkey.h"
+#include "dc_key.h"
-#include "mrpgp.h"
+#include "dc_pgp.h"
-#include "mrtools.h"
+#include "dc_tools.h"
 
 
 /*******************************************************************************

src/dc_keyhistory.c

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
 
 
 void mrmailbox_add_to_keyhistory__(mrmailbox_t* mailbox, const char* rfc724_mid, time_t sending_time, const char* addr, const char* fingerprint)

src/dc_keyring.c

@@ -20,11 +20,11 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
 #include <memory.h>
-#include "mrkey.h"
+#include "dc_context.h"
-#include "mrkeyring.h"
+#include "dc_key.h"
-#include "mrtools.h"
+#include "dc_keyring.h"
+#include "dc_tools.h"
 
 
 /*******************************************************************************

src/dc_log.c

@@ -31,7 +31,7 @@ are usually logged by mrmailbox_log_warning(). */
 
 #include <stdarg.h>
 #include <memory.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
 
 
 /*******************************************************************************

src/dc_loginparam.c

@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrloginparam.h"
+#include "dc_loginparam.h"
 
 
 /*******************************************************************************

src/dc_lot.c

@@ -20,7 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
+
 
 #define MR_LOT_MAGIC 0x00107107
 

src/dc_mimefactory.c

@@ -20,9 +20,10 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrmimefactory.h"
+#include "dc_mimefactory.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
+
 
 #define LINEEND "\r\n" /* lineend used in IMF */
 

src/dc_mimeparser.c

@@ -20,12 +20,12 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrmimeparser.h"
+#include "dc_mimeparser.h"
-#include "mrmimefactory.h"
+#include "dc_mimefactory.h"
-#include "mruudecode.h"
+#include "dc_uudecode.h"
-#include "mrpgp.h"
+#include "dc_pgp.h"
-#include "mrsimplify.h"
+#include "dc_simplify.h"
 
 
 /*******************************************************************************

src/dc_mimeparser.h

@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 
-#include "mrhash.h"
+#include "dc_hash.h"
-#include "mrparam.h"
+#include "dc_param.h"
 
 
 typedef struct mrmailbox_e2ee_helper_t mrmailbox_e2ee_helper_t;

src/dc_msg.c

@@ -20,12 +20,12 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrimap.h"
+#include "dc_imap.h"
-#include "mrsmtp.h"
+#include "dc_smtp.h"
-#include "mrjob.h"
+#include "dc_job.h"
-#include "mrpgp.h"
+#include "dc_pgp.h"
-#include "mrmimefactory.h"
+#include "dc_mimefactory.h"
 
 #define MR_MSG_MAGIC 0x11561156
 

src/dc_param.c

@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrtools.h"
+#include "dc_tools.h"
 
 
 static char* find_param(char* ths, int key, char** ret_p2)

src/dc_pgp.c

@@ -41,11 +41,11 @@ one :-) */
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 #include <netpgp-extra.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrkey.h"
+#include "dc_key.h"
-#include "mrkeyring.h"
+#include "dc_keyring.h"
-#include "mrpgp.h"
+#include "dc_pgp.h"
-#include "mrhash.h"
+#include "dc_hash.h"
 
 
 static pgp_io_t s_io;

src/dc_qr.c

@@ -22,8 +22,8 @@
 
 #include <stdarg.h>
 #include <unistd.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
 
 
 #define MAILTO_SCHEME      "mailto:"

src/dc_receive_imf.c

@@ -21,14 +21,14 @@
 
 
 #include <assert.h>
-#include "mrmailbox_internal.h"
-#include "mrmimeparser.h"
-#include "mrmimefactory.h"
-#include "mrapeerstate.h"
-#include "mrimap.h"
-#include "mrjob.h"
-#include "mrarray-private.h"
 #include <netpgp-extra.h>
+#include "dc_context.h"
+#include "dc_mimeparser.h"
+#include "dc_mimefactory.h"
+#include "dc_imap.h"
+#include "dc_job.h"
+#include "dc_array.h"
+#include "dc_apeerstate.h"
 
 
 /*******************************************************************************

src/dc_saxparser.c

@@ -37,9 +37,9 @@ and spits out all text and tags found.
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "mrmailbox.h"
+#include "dc_context.h"
-#include "mrtools.h"
+#include "dc_tools.h"
-#include "mrsaxparser.h"
+#include "dc_saxparser.h"
 
 
 /*******************************************************************************

src/dc_securejoin.c

@@ -22,13 +22,14 @@
 
 #include <stdarg.h>
 #include <unistd.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrkey.h"
+#include "dc_key.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
-#include "mrmimeparser.h"
+#include "dc_mimeparser.h"
-#include "mrmimefactory.h"
+#include "dc_mimefactory.h"
-#include "mrjob.h"
+#include "dc_job.h"
-#include "mrtoken.h"
+#include "dc_token.h"
+
 
 #define      LOCK                 { mrsqlite3_lock  (mailbox->m_sql); locked = 1; }
 #define      UNLOCK  if( locked ) { mrsqlite3_unlock(mailbox->m_sql); locked = 0; }

src/dc_simplify.c

@@ -22,12 +22,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "mrmailbox.h"
+#include "dc_context.h"
-#include "mrsimplify.h"
+#include "dc_simplify.h"
-#include "mrtools.h"
+#include "dc_tools.h"
-#include "mrdehtml.h"
+#include "dc_dehtml.h"
-#include "mrmimeparser.h"
+#include "dc_mimeparser.h"
-#include "mrstrbuilder.h"
+#include "dc_strbuilder.h"
 
 
 /*******************************************************************************

src/dc_smtp.c

@@ -21,9 +21,9 @@
 
 #include <unistd.h>
 #include <libetpan/libetpan.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrsmtp.h"
+#include "dc_smtp.h"
-#include "mrjob.h"
+#include "dc_job.h"
 
 
 #ifndef DEBUG_SMTP

src/dc_smtp.h

@@ -27,7 +27,7 @@ extern "C" {
 #endif
 
 
-#include "mrloginparam.h"
+#include "dc_loginparam.h"
 
 
 /*** library-private **********************************************************/

src/dc_sqlite3.c

@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrapeerstate.h"
+#include "dc_apeerstate.h"
 
 
 /* This class wraps around SQLite.  Some hints to the underlying database:

src/dc_stock.c

@@ -25,7 +25,7 @@ As the logging functions may use these strings, do not log any
 errors from here. */
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
 
 
 /*******************************************************************************

src/dc_strbuilder.c

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
 
 
 /**

src/dc_strencode.c

@@ -22,8 +22,8 @@
 
 #include <ctype.h>
 #include <libetpan/libetpan.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrstrencode.h"
+#include "dc_strencode.h"
 
 
 /*******************************************************************************

src/dc_token.c

@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mrtoken.h"
+#include "dc_token.h"
 
 
 void mrtoken_save__(mrmailbox_t* mailbox, mrtokennamespc_t namespc, uint32_t foreign_id, const char* token)

src/dc_tools.c

@@ -30,7 +30,7 @@
 #include <openssl/rand.h>
 #include <libetpan/libetpan.h>
 #include <libetpan/mailimap_types.h>
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
 
 
 /*******************************************************************************

src/dc_uudecode.c

@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 
-#include "mrmailbox_internal.h"
+#include "dc_context.h"
-#include "mruudecode.h"
+#include "dc_uudecode.h"
 
 
 /**

src/meson.build

@@ -1,78 +1,68 @@
 lib_src = [
-  'mraheader.c',
+  'dc_aheader.c',
-  'mrapeerstate.c',
+  'dc_apeerstate.c',
-  'mrarray.c',
+  'dc_array.c',
-  'mrchat.c',
+  'dc_chat.c',
-  'mrchatlist.c',
+  'dc_chatlist.c',
-  'mrcontact.c',
+  'dc_contact.c',
-  'mrdehtml.c',
+  'dc_dehtml.c',
-  'mrhash.c',
+  'dc_hash.c',
-  'mrimap.c',
+  'dc_imap.c',
-  'mrjob.c',
+  'dc_job.c',
-  'mrkey.c',
+  'dc_key.c',
-  'mrkeyring.c',
+  'dc_keyring.c',
-  'mrloginparam.c',
+  'dc_loginparam.c',
-  'mrlot.c',
+  'dc_lot.c',
-  'mrmailbox.c',
+  'dc_context.c',
-  'mrmailbox_configure.c',
+  'dc_configure.c',
-  'mrmailbox_connect.c',
+  'dc_e2ee.c',
-  'mrmailbox_e2ee.c',
+  'dc_imex.c',
-  'mrmailbox_imex.c',
+  'dc_keyhistory.c',
-  'mrmailbox_keyhistory.c',
+  'dc_log.c',
-  'mrmailbox_log.c',
+  'dc_qr.c',
-  'mrmailbox_qr.c',
+  'dc_receive_imf.c',
-  'mrmailbox_receive_imf.c',
+  'dc_securejoin.c',
-  'mrmailbox_securejoin.c',
+  'dc_mimefactory.c',
-  'mrmimefactory.c',
+  'dc_mimeparser.c',
-  'mrmimeparser.c',
+  'dc_msg.c',
-  'mrmsg.c',
+  'dc_param.c',
-  'mrosnative.c',
+  'dc_pgp.c',
-  'mrparam.c',
+  'dc_saxparser.c',
-  'mrpgp.c',
+  'dc_simplify.c',
-  'mrsaxparser.c',
+  'dc_smtp.c',
-  'mrsimplify.c',
+  'dc_sqlite3.c',
-  'mrsmtp.c',
+  'dc_stock.c',
-  'mrsqlite3.c',
+  'dc_strbuilder.c',
-  'mrstock.c',
+  'dc_strencode.c',
-  'mrstrbuilder.c',
+  'dc_token.c',
-  'mrstrencode.c',
+  'dc_tools.c',
-  'mrtoken.c',
+  'dc_uudecode.c',
-  'mrtools.c',
-  'mruudecode.c',
 ]
 lib_hdr = [
-  'mraheader.h',
+  'deltachat.h',
-  'mrapeerstate.h',
+  'dc_apeerstate.h',
-  'mrarray.h',
+  'dc_dehtml.h',
-  'mrchat.h',
+  'dc_hash.h',
-  'mrchatlist.h',
+  'dc_imap.h',
-  'mrcontact.h',
+  'dc_job.h',
-  'mrdehtml.h',
+  'dc_key.h',
-  'mrevent.h',
+  'dc_keyring.h',
-  'mrerror.h',
+  'dc_loginparam.h',
-  'mrhash.h',
+  'dc_lot.h',
-  'mrimap.h',
+  'dc_context.h',
-  'mrjob.h',
+  'dc_mimefactory.h',
-  'mrkey.h',
+  'dc_mimeparser.h',
-  'mrkeyring.h',
+  'dc_msg.h',
-  'mrloginparam.h',
+  'dc_param.h',
-  'mrlot.h',
+  'dc_pgp.h',
-  'mrmailbox.h',
+  'dc_saxparser.h',
-  'mrmailbox_internal.h',
+  'dc_simplify.h',
-  'mrmimefactory.h',
+  'dc_smtp.h',
-  'mrmimeparser.h',
+  'dc_sqlite3.h',
-  'mrmsg.h',
+  'dc_stock.h',
-  'mrosnative.h',
+  'dc_strbuilder.h',
-  'mrparam.h',
+  'dc_strencode.h',
-  'mrpgp.h',
+  'dc_tools.h',
-  'mrsaxparser.h',
-  'mrsimplify.h',
-  'mrsmtp.h',
-  'mrsqlite3.h',
-  'mrstock.h',
-  'mrstrbuilder.h',
-  'mrstrencode.h',
-  'mrtools.h',
 ]
 lib_inc = include_directories('.')
 

src/mrarray.h

@@ -1,4 +0,0 @@
-// deprecated file
-
-#include "mrmailbox.h"
-

src/mrchat.h

@@ -1,2 +0,0 @@
-// deprecated
-#include "mrmailbox.h"

src/mrchatlist.h

@@ -1,2 +0,0 @@
-// deprecated
-#include "mrmailbox.h"

src/mrcontact.h

@@ -1,3 +0,0 @@
-// deprecated
-#include "mrmailbox.h"
-

src/mrerror.h

@@ -1,2 +0,0 @@
-// deprecated
-#include "mrmailbox.h"

src/mrevent.h

@@ -1,2 +0,0 @@
-// deprecated
-#include "mrmailbox.h"

src/mrlot.h

@@ -1,2 +0,0 @@
-// deprecated
-#include "mrmailbox.h"

src/mrmailbox_connect.c

@@ -1 +0,0 @@
-// 2018-06-14 13:18 deprecated

src/mrmailbox_internal.h

@@ -1,53 +0,0 @@
-/*******************************************************************************
- *
- *                              Delta Chat Core
- *                      Copyright (C) 2017 Björn Petersen
- *                   Contact: r10s@b44t.com, http://b44t.com
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see http://www.gnu.org/licenses/ .
- *
- ******************************************************************************/
-
-
-#ifndef __MRMAILBOX_INTERNAL_H__
-#define __MRMAILBOX_INTERNAL_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Includes that are used frequently.  This file may also be used to create predefined headers. */
-#include "mrmailbox.h"
-#include <stdlib.h>
-#include <string.h>
-#include "mrsqlite3.h"
-#include "mrtools.h"
-#include "mrstrbuilder.h"
-#include "mrstrencode.h"
-#include "mrparam.h"
-#include "mrstock.h"
-#include "mrarray-private.h"
-#include "mrchat-private.h"
-#include "mrchatlist-private.h"
-#include "mrlot-private.h"
-#include "mrmsg-private.h"
-#include "mrcontact-private.h"
-#include "mrmailbox-private.h"
-
-
-#ifdef __cplusplus
-} /* /extern "C" */
-#endif
-#endif /* __MRMAILBOX_INTERNAL_H__ */
-

src/mrmsg.h

@@ -1,2 +0,0 @@
-// deprecated
-#include "mrmailbox.h"

src/mrosnative.c

@@ -1,32 +0,0 @@
-/*******************************************************************************
- *
- *                              Delta Chat Core
- *                      Copyright (C) 2017 Björn Petersen
- *                   Contact: r10s@b44t.com, http://b44t.com
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see http://www.gnu.org/licenses/ .
- *
- ******************************************************************************/
-
-
-/* Some functions that are called by the backend under certain
-circumstances.  The frontents should create a copy of this file
-and implement the functions as needed, eg. for attaching threads in JNI. */
-
-
-#include <stdlib.h>
-#include "mrmailbox.h"
-#include "mrosnative.h"
-
-

src/mrosnative.h

@@ -1 +0,0 @@
-// deprecated

src/mrpoortext.c

@@ -1,2 +0,0 @@
-/* deprecated */
-

src/mrpoortext.h

@@ -1,2 +0,0 @@
-/* deprecated */
-