4 files changed, 30 insertions, 30 deletions

diff --git a/testing/av_test.c b/testing/av_test.c
index a058e869..7dba399b 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -245,7 +245,7 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
     tox_options_set_ipv6_enabled(opts, false);
 
     {
-        TOX_ERR_NEW error;
+        Tox_Err_New error;
 
         tox_options_set_start_port(opts, 33445);
         *bootstrap = tox_new(opts, &error);
@@ -298,7 +298,7 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
     }
 
 
-    TOXAV_ERR_NEW rc;
+    Toxav_Err_New rc;
     *AliceAV = toxav_new(Alice, &rc);
     assert(rc == TOXAV_ERR_NEW_OK);
 
@@ -590,7 +590,7 @@ CHECK_ARG:
         BobCC.arb = rb_new(16);
 
         { /* Call */
-            TOXAV_ERR_CALL rc;
+            Toxav_Err_Call rc;
             toxav_call(AliceAV, 0, 48, 0, &rc);
 
             if (rc != TOXAV_ERR_CALL_OK) {
@@ -604,7 +604,7 @@ CHECK_ARG:
         }
 
         { /* Answer */
-            TOXAV_ERR_ANSWER rc;
+            Toxav_Err_Answer rc;
             toxav_answer(BobAV, 0, 48, 0, &rc);
 
             if (rc != TOXAV_ERR_ANSWER_OK) {
@@ -677,7 +677,7 @@ CHECK_ARG:
             int64_t count = sf_read_short(af_handle, PCM, frame_size);
 
             if (count > 0) {
-                TOXAV_ERR_SEND_FRAME rc;
+                Toxav_Err_Send_Frame rc;
 
                 if (toxav_audio_send_frame(AliceAV, 0, PCM, count / af_info.channels, af_info.channels, af_info.samplerate,
                                            &rc) == false) {
@@ -695,7 +695,7 @@ CHECK_ARG:
         sf_close(af_handle);
 
         { /* Hangup */
-            TOXAV_ERR_CALL_CONTROL rc;
+            Toxav_Err_Call_Control rc;
             toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_CANCEL, &rc);
 
             if (rc != TOXAV_ERR_CALL_CONTROL_OK) {
@@ -737,7 +737,7 @@ CHECK_ARG:
         memset(&BobCC, 0, sizeof(CallControl));
 
         { /* Call */
-            TOXAV_ERR_CALL rc;
+            Toxav_Err_Call rc;
             toxav_call(AliceAV, 0, 0, 2000, &rc);
 
             if (rc != TOXAV_ERR_CALL_OK) {
@@ -751,7 +751,7 @@ CHECK_ARG:
         }
 
         { /* Answer */
-            TOXAV_ERR_ANSWER rc;
+            Toxav_Err_Answer rc;
             toxav_answer(BobAV, 0, 0, 5000, &rc);
 
             if (rc != TOXAV_ERR_ANSWER_OK) {
@@ -801,7 +801,7 @@ CHECK_ARG:
         cvReleaseCapture(&capture);
 
         { /* Hangup */
-            TOXAV_ERR_CALL_CONTROL rc;
+            Toxav_Err_Call_Control rc;
             toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_CANCEL, &rc);
 
             if (rc != TOXAV_ERR_CALL_CONTROL_OK) {
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 360d7a35..8991a222 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -155,7 +155,7 @@ int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
     return argvoffset;
 }
 
-static const char *tox_log_level_name(TOX_LOG_LEVEL level)
+static const char *tox_log_level_name(Tox_Log_Level level)
 {
     switch (level) {
         case TOX_LOG_LEVEL_TRACE:
@@ -177,7 +177,7 @@ static const char *tox_log_level_name(TOX_LOG_LEVEL level)
     return "<unknown>";
 }
 
-void print_debug_log(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
+void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t line, const char *func,
                      const char *message, void *user_data)
 {
     if (level == TOX_LOG_LEVEL_TRACE) {
@@ -188,7 +188,7 @@ void print_debug_log(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t lin
     fprintf(stderr, "[#%u] %s %s:%u\t%s:\t%s\n", index, tox_log_level_name(level), file, line, func, message);
 }
 
-Tox *tox_new_log_lan(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data, bool lan_discovery)
+Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery)
 {
     struct Tox_Options *log_options = options;
 
@@ -212,7 +212,7 @@ Tox *tox_new_log_lan(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_us
     return tox;
 }
 
-Tox *tox_new_log(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data)
+Tox *tox_new_log(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data)
 {
     return tox_new_log_lan(options, err, log_user_data, false);
 }
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index 259525a5..e7060551 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -17,11 +17,11 @@ void to_hex(char *out, uint8_t *in, int size);
 int tox_strncasecmp(const char *s1, const char *s2, size_t n);
 int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled);
 
-void print_debug_log(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
+void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t line, const char *func,
                      const char *message, void *user_data);
 
-Tox *tox_new_log(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data);
-Tox *tox_new_log_lan(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data, bool lan_discovery);
+Tox *tox_new_log(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data);
+Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery);
 
 int use_test_rng(uint32_t seed);
 
diff --git a/testing/random_testing.cc b/testing/random_testing.cc
index 6211630e..463a4fb3 100644
--- a/testing/random_testing.cc
+++ b/testing/random_testing.cc
@@ -119,7 +119,7 @@ struct Global_State : std::vector<Local_State> {
 Global_State::~Global_State() {}
 
 void handle_friend_connection_status(Tox *tox, uint32_t friend_number,
-                                     TOX_CONNECTION connection_status, void *user_data) {
+                                     Tox_Connection connection_status, void *user_data) {
   Local_State *state = static_cast<Local_State *>(user_data);
 
   if (connection_status == TOX_CONNECTION_NONE) {
@@ -130,7 +130,7 @@ void handle_friend_connection_status(Tox *tox, uint32_t friend_number,
   }
 }
 
-void handle_conference_invite(Tox *tox, uint32_t friend_number, TOX_CONFERENCE_TYPE type,
+void handle_conference_invite(Tox *tox, uint32_t friend_number, Tox_Conference_Type type,
                               const uint8_t *cookie, size_t length, void *user_data) {
   Local_State *state = static_cast<Local_State *>(user_data);
 
@@ -138,13 +138,13 @@ void handle_conference_invite(Tox *tox, uint32_t friend_number, TOX_CONFERENCE_T
     std::printf("Tox #%u joins the conference it was invited to\n", state->id());
   }
 
-  TOX_ERR_CONFERENCE_JOIN err;
+  Tox_Err_Conference_Join err;
   tox_conference_join(tox, friend_number, cookie, length, &err);
   assert(err == TOX_ERR_CONFERENCE_JOIN_OK);
 }
 
 void handle_conference_message(Tox *tox, uint32_t conference_number, uint32_t peer_number,
-                               TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length,
+                               Tox_Message_Type type, const uint8_t *message, size_t length,
                                void *user_data) {
   Local_State *state = static_cast<Local_State *>(user_data);
 
@@ -161,7 +161,7 @@ void handle_conference_peer_list_changed(Tox *tox, uint32_t conference_number, v
     std::printf("Tox #%u rebuilds peer list for conference %u\n", state->id(), conference_number);
   }
 
-  TOX_ERR_CONFERENCE_PEER_QUERY err;
+  Tox_Err_Conference_Peer_Query err;
   uint32_t const count = tox_conference_peer_count(tox, conference_number, &err);
   assert(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK);
 
@@ -182,7 +182,7 @@ Global_State make_toxes(std::vector<Action> const &actions) {
   tox_options_set_local_discovery_enabled(options.get(), false);
 
   for (uint32_t i = 0; i < NUM_TOXES; i++) {
-    TOX_ERR_NEW err;
+    Tox_Err_New err;
     toxes.emplace_back(Tox_Ptr(tox_new(options.get(), &err)), i);
     assert(err == TOX_ERR_NEW_OK);
     assert(toxes.back().tox() != nullptr);
@@ -201,7 +201,7 @@ Global_State make_toxes(std::vector<Action> const &actions) {
   const uint16_t dht_port = tox_self_get_udp_port(toxes.front().tox(), nullptr);
 
   for (Local_State const &state : toxes) {
-    TOX_ERR_BOOTSTRAP err;
+    Tox_Err_Bootstrap err;
     tox_bootstrap(state.tox(), "localhost", dht_port, dht_key, &err);
     assert(err == TOX_ERR_BOOTSTRAP_OK);
   }
@@ -211,7 +211,7 @@ Global_State make_toxes(std::vector<Action> const &actions) {
   for (Local_State const &state1 : toxes) {
     for (Local_State const &state2 : toxes) {
       if (state1.tox() != state2.tox()) {
-        TOX_ERR_FRIEND_ADD err;
+        Tox_Err_Friend_Add err;
         uint8_t key[TOX_PUBLIC_KEY_SIZE];
 
         tox_self_get_public_key(state1.tox(), key);
@@ -289,7 +289,7 @@ int main() {
             return tox_conference_get_chatlist_size(state.tox()) < MAX_CONFERENCES_PER_USER;
           },
           [](Local_State *state, Random *rnd, std::mt19937 *rng) {
-            TOX_ERR_CONFERENCE_NEW err;
+            Tox_Err_Conference_New err;
             tox_conference_new(state->tox(), &err);
             assert(err == TOX_ERR_CONFERENCE_NEW_OK);
           },
@@ -303,7 +303,7 @@ int main() {
           [](Local_State *state, Random *rnd, std::mt19937 *rng) {
             size_t chat_count = tox_conference_get_chatlist_size(state->tox());
             assert(chat_count != 0);  // Condition above.
-            TOX_ERR_CONFERENCE_INVITE err;
+            Tox_Err_Conference_Invite err;
             tox_conference_invite(state->tox(), rnd->friend_selector(*rng),
                                   state->next_invite % chat_count, &err);
             state->next_invite++;
@@ -317,7 +317,7 @@ int main() {
             return tox_conference_get_chatlist_size(state.tox()) != 0;
           },
           [](Local_State *state, Random *rnd, std::mt19937 *rng) {
-            TOX_ERR_CONFERENCE_DELETE err;
+            Tox_Err_Conference_Delete err;
             tox_conference_delete(state->tox(), tox_conference_get_chatlist_size(state->tox()) - 1,
                                   &err);
             assert(err == TOX_ERR_CONFERENCE_DELETE_OK);
@@ -335,7 +335,7 @@ int main() {
               byte = rnd->byte_selector(*rng);
             }
 
-            TOX_ERR_CONFERENCE_SEND_MESSAGE err;
+            Tox_Err_Conference_Send_Message err;
             tox_conference_send_message(
                 state->tox(), tox_conference_get_chatlist_size(state->tox()) - 1,
                 TOX_MESSAGE_TYPE_NORMAL, message.data(), message.size(), &err);
@@ -356,7 +356,7 @@ int main() {
               byte = rnd->byte_selector(*rng);
             }
 
-            TOX_ERR_SET_INFO err;
+            Tox_Err_Set_Info err;
             tox_self_set_name(state->tox(), name.data(), name.size(), &err);
             assert(err == TOX_ERR_SET_INFO_OK);
 
@@ -368,7 +368,7 @@ int main() {
           "sets their name to empty",
           [](Local_State const &state) { return true; },
           [](Local_State *state, Random *rnd, std::mt19937 *rng) {
-            TOX_ERR_SET_INFO err;
+            Tox_Err_Set_Info err;
             tox_self_set_name(state->tox(), nullptr, 0, &err);
             assert(err == TOX_ERR_SET_INFO_OK);
           },