Consistently use camel case enum names.

Including in tests and implementation files.

1 files changed, 8 insertions, 8 deletions

diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index 824592c6..647b649d 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -33,7 +33,7 @@ typedef struct State {
 #include "run_auto_test.h"
 
 static void handle_self_connection_status(
-    Tox *tox, TOX_CONNECTION connection_status, void *user_data)
+    Tox *tox, Tox_Connection connection_status, void *user_data)
 {
     const State *state = (State *)user_data;
 
@@ -45,7 +45,7 @@ static void handle_self_connection_status(
 }
 
 static void handle_friend_connection_status(
-    Tox *tox, uint32_t friendnumber, TOX_CONNECTION connection_status, void *user_data)
+    Tox *tox, uint32_t friendnumber, Tox_Connection connection_status, void *user_data)
 {
     const State *state = (State *)user_data;
 
@@ -57,13 +57,13 @@ static void handle_friend_connection_status(
 }
 
 static void handle_conference_invite(
-    Tox *tox, uint32_t friendnumber, TOX_CONFERENCE_TYPE type,
+    Tox *tox, uint32_t friendnumber, Tox_Conference_Type type,
     const uint8_t *data, size_t length, void *user_data)
 {
     const State *state = (State *)user_data;
     ck_assert_msg(type == TOX_CONFERENCE_TYPE_TEXT, "tox #%u: wrong conference type: %d", state->index, type);
 
-    TOX_ERR_CONFERENCE_JOIN err;
+    Tox_Err_Conference_Join err;
     uint32_t g_num = tox_conference_join(tox, friendnumber, data, length, &err);
 
     ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK, "tox #%u: error joining group: %d", state->index, err);
@@ -84,7 +84,7 @@ static void handle_conference_connected(
         return;
     }
 
-    TOX_ERR_CONFERENCE_INVITE err;
+    Tox_Err_Conference_Invite err;
     tox_conference_invite(tox, 1, 0, &err);
     ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox #%u failed to invite next friend: err = %d", state->index, err);
     printf("tox #%u: invited next friend\n", state->index);
@@ -94,7 +94,7 @@ static void handle_conference_connected(
 static uint16_t num_recv;
 
 static void handle_conference_message(
-    Tox *tox, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
+    Tox *tox, uint32_t groupnumber, uint32_t peernumber, Tox_Message_Type type,
     const uint8_t *message, size_t length, void *user_data)
 {
     if (length == (sizeof(GROUP_MESSAGE) - 1) && memcmp(message, GROUP_MESSAGE, sizeof(GROUP_MESSAGE) - 1) == 0) {
@@ -211,7 +211,7 @@ static void run_conference_tests(Tox **toxes, State *state)
         iterate_all_wait(NUM_GROUP_TOX, toxes, state, ITERATION_INTERVAL);
     }
 
-    TOX_ERR_CONFERENCE_SEND_MESSAGE err;
+    Tox_Err_Conference_Send_Message err;
     ck_assert_msg(
         tox_conference_send_message(
             toxes[random_u32() % NUM_GROUP_TOX], 0, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)GROUP_MESSAGE,
@@ -301,7 +301,7 @@ static void test_many_group(Tox **toxes, State *state)
         iterate_all_wait(NUM_GROUP_TOX, toxes, state, ITERATION_INTERVAL);
 
         for (uint16_t i = 0; i < NUM_GROUP_TOX; ++i) {
-            TOX_ERR_CONFERENCE_PEER_QUERY err;
+            Tox_Err_Conference_Peer_Query err;
             uint32_t peer_count = tox_conference_peer_count(toxes[i], 0, &err);
 
             if (err != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {