diff --git a/src/core/core.cpp b/src/core/core.cpp index a384b4a64..dc9363194 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -119,6 +119,76 @@ bool parseConferenceSendMessageError(Tox_Err_Conference_Send_Message error) return false; } } + +/** + * @brief Print in console text of error. + * @param error Error to handle. + * @return True if no error, false otherwise. + */ +bool parsePeerQueryError(Tox_Err_Conference_Peer_Query error) +{ + switch (error) { + case TOX_ERR_CONFERENCE_PEER_QUERY_OK: + return true; + + case TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND: + qCritical() << "Conference not found"; + return false; + + case TOX_ERR_CONFERENCE_PEER_QUERY_NO_CONNECTION: + qCritical() << "No connection"; + return false; + + case TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND: + qCritical() << "Peer not found"; + return false; + + default: + qCritical() << "Unknown error code:" << error; + return false; + } +} + +/** + * @brief Print in console text of error. + * @param error Error to handle. + * @return True if no error, false otherwise. + */ +bool parseConferenceJoinError(Tox_Err_Conference_Join error) +{ + switch (error) { + case TOX_ERR_CONFERENCE_JOIN_OK: + return true; + + case TOX_ERR_CONFERENCE_JOIN_DUPLICATE: + qCritical() << "Conference duplicate"; + return false; + + case TOX_ERR_CONFERENCE_JOIN_FAIL_SEND: + qCritical() << "Conference join failed to send"; + return false; + + case TOX_ERR_CONFERENCE_JOIN_FRIEND_NOT_FOUND: + qCritical() << "Friend not found"; + return false; + + case TOX_ERR_CONFERENCE_JOIN_INIT_FAIL: + qCritical() << "Init fail"; + return false; + + case TOX_ERR_CONFERENCE_JOIN_INVALID_LENGTH: + qCritical() << "Invalid length"; + return false; + + case TOX_ERR_CONFERENCE_JOIN_WRONG_TYPE: + qCritical() << "Wrong conference type"; + return false; + + default: + qCritical() << "Unknown error code:" << error; + return false; + } +} } // namespace Core::Core(QThread* coreThread) @@ -1092,35 +1162,6 @@ QVector Core::getFriendList() const return friends; } -/** - * @brief Print in console text of error. - * @param error Error to handle. - * @return True if no error, false otherwise. - */ -bool Core::parsePeerQueryError(Tox_Err_Conference_Peer_Query error) const -{ - switch (error) { - case TOX_ERR_CONFERENCE_PEER_QUERY_OK: - return true; - - case TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND: - qCritical() << "Conference not found"; - return false; - - case TOX_ERR_CONFERENCE_PEER_QUERY_NO_CONNECTION: - qCritical() << "No connection"; - return false; - - case TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND: - qCritical() << "Peer not found"; - return false; - - default: - qCritical() << "Unknown error code:" << error; - return false; - } -} - GroupId Core::getGroupPersistentId(uint32_t groupNumber) const { QMutexLocker ml{&coreLoopLock}; @@ -1253,47 +1294,6 @@ bool Core::getGroupAvEnabled(int groupId) const return type == TOX_CONFERENCE_TYPE_AV; } -/** - * @brief Print in console text of error. - * @param error Error to handle. - * @return True if no error, false otherwise. - */ -bool Core::parseConferenceJoinError(Tox_Err_Conference_Join error) const -{ - switch (error) { - case TOX_ERR_CONFERENCE_JOIN_OK: - return true; - - case TOX_ERR_CONFERENCE_JOIN_DUPLICATE: - qCritical() << "Conference duplicate"; - return false; - - case TOX_ERR_CONFERENCE_JOIN_FAIL_SEND: - qCritical() << "Conference join failed to send"; - return false; - - case TOX_ERR_CONFERENCE_JOIN_FRIEND_NOT_FOUND: - qCritical() << "Friend not found"; - return false; - - case TOX_ERR_CONFERENCE_JOIN_INIT_FAIL: - qCritical() << "Init fail"; - return false; - - case TOX_ERR_CONFERENCE_JOIN_INVALID_LENGTH: - qCritical() << "Invalid length"; - return false; - - case TOX_ERR_CONFERENCE_JOIN_WRONG_TYPE: - qCritical() << "Wrong conference type"; - return false; - - default: - qCritical() << "Unknown error code:" << error; - return false; - } -} - /** * @brief Accept a groupchat invite. * @param inviteInfo Object which contains info about group invitation diff --git a/src/core/core.h b/src/core/core.h index 4863f51bc..0ec67cf53 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -217,8 +217,6 @@ private: void sendGroupMessageWithType(int groupId, const QString& message, Tox_Message_Type type); bool sendMessageWithType(uint32_t friendId, const QString& message, Tox_Message_Type type, ReceiptNum& receipt); - bool parsePeerQueryError(Tox_Err_Conference_Peer_Query error) const; - bool parseConferenceJoinError(Tox_Err_Conference_Join error) const; bool checkConnection(); void makeTox(QByteArray savedata, ICoreSettings* s);