pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

chore(cleanup): replace remaining deprecated toxcore enums with newer versions 

Fix #5997
reviewable/pr6034/r2
Anthony Bilinski 5 years ago
parent
f373107f63
commit
5ae738f818
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/core/coreav.cpp
  2. 34
      src/core/toxencrypt.cpp

8
src/core/coreav.cpp
Unescape View File

@ -107,7 +107,7 @@ void CoreAV::connectCallbacks(ToxAV& toxav)
*/ */
CoreAV::CoreAVPtr CoreAV::makeCoreAV(Tox* core, QMutex &toxCoreLock) CoreAV::CoreAVPtr CoreAV::makeCoreAV(Tox* core, QMutex &toxCoreLock)
{ {
TOXAV_ERR_NEW err; Toxav_Err_New err;
std::unique_ptr<ToxAV, ToxAVDeleter> toxav{toxav_new(core, &err)}; std::unique_ptr<ToxAV, ToxAVDeleter> toxav{toxav_new(core, &err)};
switch (err) { switch (err) {
case TOXAV_ERR_NEW_OK: case TOXAV_ERR_NEW_OK:
@ -248,7 +248,7 @@ bool CoreAV::answerCall(uint32_t friendNum, bool video)
qDebug() << QString("Answering call %1").arg(friendNum); qDebug() << QString("Answering call %1").arg(friendNum);
auto it = calls.find(friendNum); auto it = calls.find(friendNum);
assert(it != calls.end()); assert(it != calls.end());
TOXAV_ERR_ANSWER err; Toxav_Err_Answer err;
const uint32_t videoBitrate = video ? VIDEO_DEFAULT_BITRATE : 0; const uint32_t videoBitrate = video ? VIDEO_DEFAULT_BITRATE : 0;
if (toxav_answer(toxav.get(), friendNum, Settings::getInstance().getAudioBitrate(), if (toxav_answer(toxav.get(), friendNum, Settings::getInstance().getAudioBitrate(),
@ -346,7 +346,7 @@ bool CoreAV::sendCallAudio(uint32_t callId, const int16_t* pcm, size_t samples,
} }
// TOXAV_ERR_SEND_FRAME_SYNC means toxav failed to lock, retry 5 times in this case // TOXAV_ERR_SEND_FRAME_SYNC means toxav failed to lock, retry 5 times in this case
TOXAV_ERR_SEND_FRAME err; Toxav_Err_Send_Frame err;
int retries = 0; int retries = 0;
do { do {
if (!toxav_audio_send_frame(toxav.get(), callId, pcm, samples, chans, rate, &err)) { if (!toxav_audio_send_frame(toxav.get(), callId, pcm, samples, chans, rate, &err)) {
@ -398,7 +398,7 @@ void CoreAV::sendCallVideo(uint32_t callId, std::shared_ptr<VideoFrame> vframe)
// TOXAV_ERR_SEND_FRAME_SYNC means toxav failed to lock, retry 5 times in this case // TOXAV_ERR_SEND_FRAME_SYNC means toxav failed to lock, retry 5 times in this case
// We don't want to be dropping iframes because of some lock held by toxav_iterate // We don't want to be dropping iframes because of some lock held by toxav_iterate
TOXAV_ERR_SEND_FRAME err; Toxav_Err_Send_Frame err;
int retries = 0; int retries = 0;
do { do {
if (!toxav_video_send_frame(toxav.get(), callId, frame.width, frame.height, frame.y, if (!toxav_video_send_frame(toxav.get(), callId, frame.width, frame.height, frame.y,

34
src/core/toxencrypt.cpp
Unescape View File

@ -26,10 +26,10 @@
#include <memory> #include <memory>
// functions for nice debug output // functions for nice debug output
static QString getKeyDerivationError(TOX_ERR_KEY_DERIVATION error); static QString getKeyDerivationError(Tox_Err_Key_Derivation error);
static QString getEncryptionError(TOX_ERR_ENCRYPTION error); static QString getEncryptionError(Tox_Err_Encryption error);
static QString getDecryptionError(TOX_ERR_DECRYPTION error); static QString getDecryptionError(Tox_Err_Decryption error);
static QString getSaltError(TOX_ERR_GET_SALT error); static QString getSaltError(Tox_Err_Get_Salt error);
/** /**
* @class ToxEncrypt * @class ToxEncrypt
@ -95,7 +95,7 @@ QByteArray ToxEncrypt::encryptPass(const QString& password, const QByteArray& pl
QByteArray pass = password.toUtf8(); QByteArray pass = password.toUtf8();
QByteArray ciphertext(plaintext.length() + TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00); QByteArray ciphertext(plaintext.length() + TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00);
TOX_ERR_ENCRYPTION error; Tox_Err_Encryption error;
tox_pass_encrypt(reinterpret_cast<const uint8_t*>(plaintext.constData()), tox_pass_encrypt(reinterpret_cast<const uint8_t*>(plaintext.constData()),
static_cast<size_t>(plaintext.size()), static_cast<size_t>(plaintext.size()),
reinterpret_cast<const uint8_t*>(pass.constData()), reinterpret_cast<const uint8_t*>(pass.constData()),
@ -130,7 +130,7 @@ QByteArray ToxEncrypt::decryptPass(const QString& password, const QByteArray& ci
QByteArray pass = password.toUtf8(); QByteArray pass = password.toUtf8();
QByteArray plaintext(ciphertext.length() - TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00); QByteArray plaintext(ciphertext.length() - TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00);
TOX_ERR_DECRYPTION error; Tox_Err_Decryption error;
tox_pass_decrypt(reinterpret_cast<const uint8_t*>(ciphertext.constData()), tox_pass_decrypt(reinterpret_cast<const uint8_t*>(ciphertext.constData()),
static_cast<size_t>(ciphertext.size()), static_cast<size_t>(ciphertext.size()),
reinterpret_cast<const uint8_t*>(pass.constData()), reinterpret_cast<const uint8_t*>(pass.constData()),
@ -156,7 +156,7 @@ QByteArray ToxEncrypt::decryptPass(const QString& password, const QByteArray& ci
std::unique_ptr<ToxEncrypt> ToxEncrypt::makeToxEncrypt(const QString& password) std::unique_ptr<ToxEncrypt> ToxEncrypt::makeToxEncrypt(const QString& password)
{ {
const QByteArray pass = password.toUtf8(); const QByteArray pass = password.toUtf8();
TOX_ERR_KEY_DERIVATION error; Tox_Err_Key_Derivation error;
Tox_Pass_Key* const passKey = tox_pass_key_derive( Tox_Pass_Key* const passKey = tox_pass_key_derive(
reinterpret_cast<const uint8_t*>(pass.constData()), reinterpret_cast<const uint8_t*>(pass.constData()),
static_cast<size_t>(pass.length()), &error); static_cast<size_t>(pass.length()), &error);
@ -223,7 +223,7 @@ QByteArray ToxEncrypt::encrypt(const QByteArray& plaintext) const
} }
QByteArray ciphertext(plaintext.length() + TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00); QByteArray ciphertext(plaintext.length() + TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00);
TOX_ERR_ENCRYPTION error; Tox_Err_Encryption error;
tox_pass_key_encrypt(passKey, reinterpret_cast<const uint8_t*>(plaintext.constData()), tox_pass_key_encrypt(passKey, reinterpret_cast<const uint8_t*>(plaintext.constData()),
static_cast<size_t>(plaintext.size()), static_cast<size_t>(plaintext.size()),
reinterpret_cast<uint8_t*>(ciphertext.data()), &error); reinterpret_cast<uint8_t*>(ciphertext.data()), &error);
@ -250,7 +250,7 @@ QByteArray ToxEncrypt::decrypt(const QByteArray& ciphertext) const
} }
QByteArray plaintext(ciphertext.length() - TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00); QByteArray plaintext(ciphertext.length() - TOX_PASS_ENCRYPTION_EXTRA_LENGTH, 0x00);
TOX_ERR_DECRYPTION error; Tox_Err_Decryption error;
tox_pass_key_decrypt(passKey, reinterpret_cast<const uint8_t*>(ciphertext.constData()), tox_pass_key_decrypt(passKey, reinterpret_cast<const uint8_t*>(ciphertext.constData()),
static_cast<size_t>(ciphertext.size()), static_cast<size_t>(ciphertext.size()),
reinterpret_cast<uint8_t*>(plaintext.data()), &error); reinterpret_cast<uint8_t*>(plaintext.data()), &error);
@ -264,11 +264,11 @@ QByteArray ToxEncrypt::decrypt(const QByteArray& ciphertext) const
} }
/** /**
* @brief Gets the error string for TOX_ERR_KEY_DERIVATION errors. * @brief Gets the error string for Tox_Err_Key_Derivation errors.
* @param error The error number. * @param error The error number.
* @return The verbose error message. * @return The verbose error message.
*/ */
QString getKeyDerivationError(TOX_ERR_KEY_DERIVATION error) QString getKeyDerivationError(Tox_Err_Key_Derivation error)
{ {
switch (error) { switch (error) {
case TOX_ERR_KEY_DERIVATION_OK: case TOX_ERR_KEY_DERIVATION_OK:
@ -285,11 +285,11 @@ QString getKeyDerivationError(TOX_ERR_KEY_DERIVATION error)
} }
/** /**
* @brief Gets the error string for TOX_ERR_ENCRYPTION errors. * @brief Gets the error string for Tox_Err_Encryption errors.
* @param error The error number. * @param error The error number.
* @return The verbose error message. * @return The verbose error message.
*/ */
QString getEncryptionError(TOX_ERR_ENCRYPTION error) QString getEncryptionError(Tox_Err_Encryption error)
{ {
switch (error) { switch (error) {
case TOX_ERR_ENCRYPTION_OK: case TOX_ERR_ENCRYPTION_OK:
@ -308,11 +308,11 @@ QString getEncryptionError(TOX_ERR_ENCRYPTION error)
} }
/** /**
* @brief Gets the error string for TOX_ERR_DECRYPTION errors. * @brief Gets the error string for Tox_Err_Decryption errors.
* @param error The error number. * @param error The error number.
* @return The verbose error message. * @return The verbose error message.
*/ */
QString getDecryptionError(TOX_ERR_DECRYPTION error) QString getDecryptionError(Tox_Err_Decryption error)
{ {
switch (error) { switch (error) {
case TOX_ERR_DECRYPTION_OK: case TOX_ERR_DECRYPTION_OK:
@ -335,11 +335,11 @@ QString getDecryptionError(TOX_ERR_DECRYPTION error)
} }
/** /**
* @brief Gets the error string for TOX_ERR_GET_SALT errors. * @brief Gets the error string for Tox_Err_Get_Salt errors.
* @param error The error number. * @param error The error number.
* @return The verbose error message. * @return The verbose error message.
*/ */
QString getSaltError(TOX_ERR_GET_SALT error) QString getSaltError(Tox_Err_Get_Salt error)
{ {
switch (error) { switch (error) {
case TOX_ERR_GET_SALT_OK: case TOX_ERR_GET_SALT_OK:

Write Preview
Loading…
Cancel
Save