summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2016-09-24 23:38:50 +0100
committeriphydf <iphydf@users.noreply.github.com>2016-09-26 00:03:48 +0100
commit621c3fddb289de948c3cf48c5e1625e0f5b11a9d (patch)
tree7410930e5a8b513f055b013639619627319e96cb
parentd369448ace7ab9b77b6f0e644fdb42ff8dc9a31d (diff)
C++ the second round.
Group chats were changed and now need to be updated. This change got lost in the merge.
-rw-r--r--cmake/ModulePackage.cmake16
-rw-r--r--toxcore/tox.c48
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)
4 4
5find_package(PkgConfig REQUIRED) 5find_package(PkgConfig REQUIRED)
6 6
7function(add_c_executable exec) 7function(set_source_language)
8 if(COMPILE_AS_CXX) 8 if(COMPILE_AS_CXX)
9 set_source_files_properties(${ARGN} PROPERTIES LANGUAGE CXX) 9 foreach(srcfile ${ARGN})
10 get_filename_component(srcext ${srcfile} EXT)
11 if(${srcext} STREQUAL ".c")
12 set_source_files_properties(${srcfile} PROPERTIES LANGUAGE CXX)
13 endif()
14 endforeach()
10 endif() 15 endif()
16endfunction()
11 17
18function(add_c_executable exec)
19 set_source_language(${ARGN})
12 add_executable(${exec} ${ARGN}) 20 add_executable(${exec} ${ARGN})
13endfunction() 21endfunction()
14 22
@@ -22,9 +30,7 @@ function(pkg_use_module mod)
22endfunction() 30endfunction()
23 31
24function(add_module lib) 32function(add_module lib)
25 if(COMPILE_AS_CXX) 33 set_source_language(${ARGN})
26 set_source_files_properties(${ARGN} PROPERTIES LANGUAGE CXX)
27 endif()
28 34
29 if(ENABLE_SHARED) 35 if(ENABLE_SHARED)
30 add_library(${lib}_shared SHARED ${ARGN}) 36 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)
1219void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback) 1219void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback)
1220{ 1220{
1221 Messenger *m = tox; 1221 Messenger *m = tox;
1222 g_callback_group_invite(m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t, 1222 g_callback_group_invite((Group_Chats *)m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *,
1223 size_t,
1223 void *))callback); 1224 void *))callback);
1224} 1225}
1225 1226
1226void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback) 1227void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback)
1227{ 1228{
1228 Messenger *m = tox; 1229 Messenger *m = tox;
1229 g_callback_group_message(m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *, 1230 g_callback_group_message((Group_Chats *)m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int,
1231 const uint8_t *,
1230 size_t, void *))callback); 1232 size_t, void *))callback);
1231} 1233}
1232 1234
1233void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback) 1235void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback)
1234{ 1236{
1235 Messenger *m = tox; 1237 Messenger *m = tox;
1236 g_callback_group_title(m->group_chat_object, callback); 1238 g_callback_group_title((Group_Chats *)m->group_chat_object, callback);
1237} 1239}
1238 1240
1239void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback) 1241void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback)
1240{ 1242{
1241 Messenger *m = tox; 1243 Messenger *m = tox;
1242 g_callback_group_namelistchange(m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t, 1244 g_callback_group_namelistchange((Group_Chats *)m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t,
1243 void *))callback); 1245 void *))callback);
1244} 1246}
1245 1247
1246uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error) 1248uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error)
1247{ 1249{
1248 Messenger *m = tox; 1250 Messenger *m = tox;
1249 int ret = add_groupchat(m->group_chat_object, GROUPCHAT_TYPE_TEXT); 1251 int ret = add_groupchat((Group_Chats *)m->group_chat_object, GROUPCHAT_TYPE_TEXT);
1250 1252
1251 if (ret == -1) { 1253 if (ret == -1) {
1252 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_NEW_INIT); 1254 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)
1260bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_DELETE *error) 1262bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_DELETE *error)
1261{ 1263{
1262 Messenger *m = tox; 1264 Messenger *m = tox;
1263 int ret = del_groupchat(m->group_chat_object, conference_number); 1265 int ret = del_groupchat((Group_Chats *)m->group_chat_object, conference_number);
1264 1266
1265 if (ret == -1) { 1267 if (ret == -1) {
1266 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND); 1268 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
1274uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_PEER_QUERY *error) 1276uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_PEER_QUERY *error)
1275{ 1277{
1276 const Messenger *m = tox; 1278 const Messenger *m = tox;
1277 int ret = group_number_peers(m->group_chat_object, conference_number); 1279 int ret = group_number_peers((Group_Chats *)m->group_chat_object, conference_number);
1278 1280
1279 if (ret == -1) { 1281 if (ret == -1) {
1280 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND); 1282 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
1289 TOX_ERR_CONFERENCE_PEER_QUERY *error) 1291 TOX_ERR_CONFERENCE_PEER_QUERY *error)
1290{ 1292{
1291 const Messenger *m = tox; 1293 const Messenger *m = tox;
1292 int ret = group_peername_size(m->group_chat_object, conference_number, peer_number); 1294 int ret = group_peername_size((Group_Chats *)m->group_chat_object, conference_number, peer_number);
1293 1295
1294 switch (ret) { 1296 switch (ret) {
1295 case -1: 1297 case -1:
@@ -1309,7 +1311,7 @@ bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, ui
1309 TOX_ERR_CONFERENCE_PEER_QUERY *error) 1311 TOX_ERR_CONFERENCE_PEER_QUERY *error)
1310{ 1312{
1311 const Messenger *m = tox; 1313 const Messenger *m = tox;
1312 int ret = group_peername(m->group_chat_object, conference_number, peer_number, name); 1314 int ret = group_peername((Group_Chats *)m->group_chat_object, conference_number, peer_number, name);
1313 1315
1314 switch (ret) { 1316 switch (ret) {
1315 case -1: 1317 case -1:
@@ -1329,7 +1331,7 @@ bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_numb
1329 uint8_t *public_key, TOX_ERR_CONFERENCE_PEER_QUERY *error) 1331 uint8_t *public_key, TOX_ERR_CONFERENCE_PEER_QUERY *error)
1330{ 1332{
1331 const Messenger *m = tox; 1333 const Messenger *m = tox;
1332 int ret = group_peer_pubkey(m->group_chat_object, conference_number, peer_number, public_key); 1334 int ret = group_peer_pubkey((Group_Chats *)m->group_chat_object, conference_number, peer_number, public_key);
1333 1335
1334 switch (ret) { 1336 switch (ret) {
1335 case -1: 1337 case -1:
@@ -1349,7 +1351,7 @@ bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_numb
1349 TOX_ERR_CONFERENCE_PEER_QUERY *error) 1351 TOX_ERR_CONFERENCE_PEER_QUERY *error)
1350{ 1352{
1351 const Messenger *m = tox; 1353 const Messenger *m = tox;
1352 int ret = group_peernumber_is_ours(m->group_chat_object, conference_number, peer_number); 1354 int ret = group_peernumber_is_ours((Group_Chats *)m->group_chat_object, conference_number, peer_number);
1353 1355
1354 switch (ret) { 1356 switch (ret) {
1355 case -1: 1357 case -1:
@@ -1373,7 +1375,7 @@ bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference
1373 TOX_ERR_CONFERENCE_INVITE *error) 1375 TOX_ERR_CONFERENCE_INVITE *error)
1374{ 1376{
1375 Messenger *m = tox; 1377 Messenger *m = tox;
1376 int ret = invite_friend(m->group_chat_object, friend_number, conference_number); 1378 int ret = invite_friend((Group_Chats *)m->group_chat_object, friend_number, conference_number);
1377 1379
1378 switch (ret) { 1380 switch (ret) {
1379 case -1: 1381 case -1:
@@ -1393,7 +1395,7 @@ uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *co
1393 TOX_ERR_CONFERENCE_JOIN *error) 1395 TOX_ERR_CONFERENCE_JOIN *error)
1394{ 1396{
1395 Messenger *m = tox; 1397 Messenger *m = tox;
1396 int ret = join_groupchat(m->group_chat_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length); 1398 int ret = join_groupchat((Group_Chats *)m->group_chat_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length);
1397 1399
1398 switch (ret) { 1400 switch (ret) {
1399 case -1: 1401 case -1:
@@ -1432,9 +1434,9 @@ bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSA
1432 int ret = 0; 1434 int ret = 0;
1433 1435
1434 if (type == TOX_MESSAGE_TYPE_NORMAL) { 1436 if (type == TOX_MESSAGE_TYPE_NORMAL) {
1435 ret = group_message_send(m->group_chat_object, conference_number, message, length); 1437 ret = group_message_send((Group_Chats *)m->group_chat_object, conference_number, message, length);
1436 } else { 1438 } else {
1437 ret = group_action_send(m->group_chat_object, conference_number, message, length); 1439 ret = group_action_send((Group_Chats *)m->group_chat_object, conference_number, message, length);
1438 } 1440 }
1439 1441
1440 switch (ret) { 1442 switch (ret) {
@@ -1462,7 +1464,7 @@ bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSA
1462size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_TITLE *error) 1464size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_TITLE *error)
1463{ 1465{
1464 const Messenger *m = tox; 1466 const Messenger *m = tox;
1465 int ret = group_title_get_size(m->group_chat_object, conference_number); 1467 int ret = group_title_get_size((Group_Chats *)m->group_chat_object, conference_number);
1466 1468
1467 switch (ret) { 1469 switch (ret) {
1468 case -1: 1470 case -1:
@@ -1482,7 +1484,7 @@ bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_
1482 TOX_ERR_CONFERENCE_TITLE *error) 1484 TOX_ERR_CONFERENCE_TITLE *error)
1483{ 1485{
1484 const Messenger *m = tox; 1486 const Messenger *m = tox;
1485 int ret = group_title_get(m->group_chat_object, conference_number, title); 1487 int ret = group_title_get((Group_Chats *)m->group_chat_object, conference_number, title);
1486 1488
1487 switch (ret) { 1489 switch (ret) {
1488 case -1: 1490 case -1:
@@ -1502,7 +1504,7 @@ bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_
1502 TOX_ERR_CONFERENCE_TITLE *error) 1504 TOX_ERR_CONFERENCE_TITLE *error)
1503{ 1505{
1504 Messenger *m = tox; 1506 Messenger *m = tox;
1505 int ret = group_title_send(m->group_chat_object, conference_number, title, length); 1507 int ret = group_title_send((Group_Chats *)m->group_chat_object, conference_number, title, length);
1506 1508
1507 switch (ret) { 1509 switch (ret) {
1508 case -1: 1510 case -1:
@@ -1525,29 +1527,29 @@ bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_
1525size_t tox_conference_get_chatlist_size(const Tox *tox) 1527size_t tox_conference_get_chatlist_size(const Tox *tox)
1526{ 1528{
1527 const Messenger *m = tox; 1529 const Messenger *m = tox;
1528 return count_chatlist(m->group_chat_object); 1530 return count_chatlist((Group_Chats *)m->group_chat_object);
1529} 1531}
1530 1532
1531void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist) 1533void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist)
1532{ 1534{
1533 const Messenger *m = tox; 1535 const Messenger *m = tox;
1534 size_t list_size = tox_conference_get_chatlist_size(tox); 1536 size_t list_size = tox_conference_get_chatlist_size(tox);
1535 copy_chatlist(m->group_chat_object, chatlist, list_size); 1537 copy_chatlist((Group_Chats *)m->group_chat_object, chatlist, list_size);
1536} 1538}
1537 1539
1538TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t conference_number, 1540TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t conference_number,
1539 TOX_ERR_CONFERENCE_GET_TYPE *error) 1541 TOX_ERR_CONFERENCE_GET_TYPE *error)
1540{ 1542{
1541 const Messenger *m = tox; 1543 const Messenger *m = tox;
1542 int ret = group_get_type(m->group_chat_object, conference_number); 1544 int ret = group_get_type((Group_Chats *)m->group_chat_object, conference_number);
1543 1545
1544 if (ret == -1) { 1546 if (ret == -1) {
1545 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND); 1547 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND);
1546 return -1; 1548 return (TOX_CONFERENCE_TYPE)ret;
1547 } 1549 }
1548 1550
1549 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_OK); 1551 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_OK);
1550 return ret; 1552 return (TOX_CONFERENCE_TYPE)ret;
1551} 1553}
1552 1554
1553static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error) 1555static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error)