C++ the second round.

Group chats were changed and now need to be updated. This change got
lost in the merge.

2 files changed, 36 insertions, 28 deletions

diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake
index b963e0de..fa3779c3 100644
--- a/cmake/ModulePackage.cmake
+++ b/cmake/ModulePackage.cmake
@@ -4,11 +4,19 @@ option(COMPILE_AS_CXX "Compile all C code as C++ code" OFF)
 
 find_package(PkgConfig REQUIRED)
 
-function(add_c_executable exec)
+function(set_source_language)
   if(COMPILE_AS_CXX)
-    set_source_files_properties(${ARGN} PROPERTIES LANGUAGE CXX)
+    foreach(srcfile ${ARGN})
+      get_filename_component(srcext ${srcfile} EXT)
+      if(${srcext} STREQUAL ".c")
+        set_source_files_properties(${srcfile} PROPERTIES LANGUAGE CXX)
+      endif()
+    endforeach()
   endif()
+endfunction()
 
+function(add_c_executable exec)
+  set_source_language(${ARGN})
   add_executable(${exec} ${ARGN})
 endfunction()
 
@@ -22,9 +30,7 @@ function(pkg_use_module mod)
 endfunction()
 
 function(add_module lib)
-  if(COMPILE_AS_CXX)
-    set_source_files_properties(${ARGN} PROPERTIES LANGUAGE CXX)
-  endif()
+  set_source_language(${ARGN})
 
   if(ENABLE_SHARED)
     add_library(${lib}_shared SHARED ${ARGN})
diff --git a/toxcore/tox.c b/toxcore/tox.c
index bf664b41..df2fde53 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -1219,34 +1219,36 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback)
 void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback)
 {
     Messenger *m = tox;
-    g_callback_group_invite(m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t,
+    g_callback_group_invite((Group_Chats *)m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *,
+                            size_t,
                             void *))callback);
 }
 
 void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback)
 {
     Messenger *m = tox;
-    g_callback_group_message(m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *,
+    g_callback_group_message((Group_Chats *)m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int,
+                             const uint8_t *,
                              size_t, void *))callback);
 }
 
 void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback)
 {
     Messenger *m = tox;
-    g_callback_group_title(m->group_chat_object, callback);
+    g_callback_group_title((Group_Chats *)m->group_chat_object, callback);
 }
 
 void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback)
 {
     Messenger *m = tox;
-    g_callback_group_namelistchange(m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t,
+    g_callback_group_namelistchange((Group_Chats *)m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t,
                                     void *))callback);
 }
 
 uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error)
 {
     Messenger *m = tox;
-    int ret = add_groupchat(m->group_chat_object, GROUPCHAT_TYPE_TEXT);
+    int ret = add_groupchat((Group_Chats *)m->group_chat_object, GROUPCHAT_TYPE_TEXT);
 
     if (ret == -1) {
         SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_NEW_INIT);
@@ -1260,7 +1262,7 @@ uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error)
 bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_DELETE *error)
 {
     Messenger *m = tox;
-    int ret = del_groupchat(m->group_chat_object, conference_number);
+    int ret = del_groupchat((Group_Chats *)m->group_chat_object, conference_number);
 
     if (ret == -1) {
         SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND);
@@ -1274,7 +1276,7 @@ bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERE
 uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_PEER_QUERY *error)
 {
     const Messenger *m = tox;
-    int ret = group_number_peers(m->group_chat_object, conference_number);
+    int ret = group_number_peers((Group_Chats *)m->group_chat_object, conference_number);
 
     if (ret == -1) {
         SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND);
@@ -1289,7 +1291,7 @@ size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t conference_num
         TOX_ERR_CONFERENCE_PEER_QUERY *error)
 {
     const Messenger *m = tox;
-    int ret = group_peername_size(m->group_chat_object, conference_number, peer_number);
+    int ret = group_peername_size((Group_Chats *)m->group_chat_object, conference_number, peer_number);
 
     switch (ret) {
         case -1:
@@ -1309,7 +1311,7 @@ bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, ui
                                   TOX_ERR_CONFERENCE_PEER_QUERY *error)
 {
     const Messenger *m = tox;
-    int ret = group_peername(m->group_chat_object, conference_number, peer_number, name);
+    int ret = group_peername((Group_Chats *)m->group_chat_object, conference_number, peer_number, name);
 
     switch (ret) {
         case -1:
@@ -1329,7 +1331,7 @@ bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_numb
                                         uint8_t *public_key, TOX_ERR_CONFERENCE_PEER_QUERY *error)
 {
     const Messenger *m = tox;
-    int ret = group_peer_pubkey(m->group_chat_object, conference_number, peer_number, public_key);
+    int ret = group_peer_pubkey((Group_Chats *)m->group_chat_object, conference_number, peer_number, public_key);
 
     switch (ret) {
         case -1:
@@ -1349,7 +1351,7 @@ bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_numb
                                         TOX_ERR_CONFERENCE_PEER_QUERY *error)
 {
     const Messenger *m = tox;
-    int ret = group_peernumber_is_ours(m->group_chat_object, conference_number, peer_number);
+    int ret = group_peernumber_is_ours((Group_Chats *)m->group_chat_object, conference_number, peer_number);
 
     switch (ret) {
         case -1:
@@ -1373,7 +1375,7 @@ bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference
                            TOX_ERR_CONFERENCE_INVITE *error)
 {
     Messenger *m = tox;
-    int ret = invite_friend(m->group_chat_object, friend_number, conference_number);
+    int ret = invite_friend((Group_Chats *)m->group_chat_object, friend_number, conference_number);
 
     switch (ret) {
         case -1:
@@ -1393,7 +1395,7 @@ uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *co
                              TOX_ERR_CONFERENCE_JOIN *error)
 {
     Messenger *m = tox;
-    int ret = join_groupchat(m->group_chat_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length);
+    int ret = join_groupchat((Group_Chats *)m->group_chat_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length);
 
     switch (ret) {
         case -1:
@@ -1432,9 +1434,9 @@ bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSA
     int ret = 0;
 
     if (type == TOX_MESSAGE_TYPE_NORMAL) {
-        ret = group_message_send(m->group_chat_object, conference_number, message, length);
+        ret = group_message_send((Group_Chats *)m->group_chat_object, conference_number, message, length);
     } else {
-        ret = group_action_send(m->group_chat_object, conference_number, message, length);
+        ret = group_action_send((Group_Chats *)m->group_chat_object, conference_number, message, length);
     }
 
     switch (ret) {
@@ -1462,7 +1464,7 @@ bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSA
 size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_TITLE *error)
 {
     const Messenger *m = tox;
-    int ret = group_title_get_size(m->group_chat_object, conference_number);
+    int ret = group_title_get_size((Group_Chats *)m->group_chat_object, conference_number);
 
     switch (ret) {
         case -1:
@@ -1482,7 +1484,7 @@ bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_
                               TOX_ERR_CONFERENCE_TITLE *error)
 {
     const Messenger *m = tox;
-    int ret = group_title_get(m->group_chat_object, conference_number, title);
+    int ret = group_title_get((Group_Chats *)m->group_chat_object, conference_number, title);
 
     switch (ret) {
         case -1:
@@ -1502,7 +1504,7 @@ bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_
                               TOX_ERR_CONFERENCE_TITLE *error)
 {
     Messenger *m = tox;
-    int ret = group_title_send(m->group_chat_object, conference_number, title, length);
+    int ret = group_title_send((Group_Chats *)m->group_chat_object, conference_number, title, length);
 
     switch (ret) {
         case -1:
@@ -1525,29 +1527,29 @@ bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_
 size_t tox_conference_get_chatlist_size(const Tox *tox)
 {
     const Messenger *m = tox;
-    return count_chatlist(m->group_chat_object);
+    return count_chatlist((Group_Chats *)m->group_chat_object);
 }
 
 void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist)
 {
     const Messenger *m = tox;
     size_t list_size = tox_conference_get_chatlist_size(tox);
-    copy_chatlist(m->group_chat_object, chatlist, list_size);
+    copy_chatlist((Group_Chats *)m->group_chat_object, chatlist, list_size);
 }
 
 TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t conference_number,
         TOX_ERR_CONFERENCE_GET_TYPE *error)
 {
     const Messenger *m = tox;
-    int ret = group_get_type(m->group_chat_object, conference_number);
+    int ret = group_get_type((Group_Chats *)m->group_chat_object, conference_number);
 
     if (ret == -1) {
         SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND);
-        return -1;
+        return (TOX_CONFERENCE_TYPE)ret;
     }
 
     SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_OK);
-    return ret;
+    return (TOX_CONFERENCE_TYPE)ret;
 }
 
 static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error)