rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile warnings

This commit is contained in:
Konstantinos Sideris 2018-09-18 18:48:14 +03:00
parent 2db7717385
commit 3e49afd6ba
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/CMakeLists.txt vendored
View File

@ -39,10 +39,10 @@ set(BOOST_SHA256
set( set(
MTXCLIENT_URL MTXCLIENT_URL
https://github.com/mujx/mtxclient/archive/49a3ffddc13482902b73312a4a6d2e62dddaef64.tar.gz https://github.com/mujx/mtxclient/archive/99ca7480d15a82a7b8c5099be5f076c0ceecc9f7.tar.gz
) )
set(MTXCLIENT_HASH set(MTXCLIENT_HASH
181b5d99cdf4639336f54af369f3a2feef089608716adccff9412440eac1e8b1) e88a8c4473b6bc37c046779ea2345da00abb88a755447b9ac77ed76c89975e9d)
set( set(
TWEENY_URL TWEENY_URL

4
src/UserSettingsPage.cpp
View File

@ -503,7 +503,7 @@ UserSettingsPage::importSessionKeys()
auto sessions = mtx::crypto::decrypt_exported_sessions( auto sessions = mtx::crypto::decrypt_exported_sessions(
mtx::crypto::base642bin(payload), password.toStdString()); mtx::crypto::base642bin(payload), password.toStdString());
cache::client()->importSessionKeys(std::move(sessions)); cache::client()->importSessionKeys(std::move(sessions));
} catch (const std::exception &e) { } catch (const mtx::crypto::sodium_exception &e) {
QMessageBox::warning(this, tr("Error"), e.what()); QMessageBox::warning(this, tr("Error"), e.what());
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
QMessageBox::warning(this, tr("Error"), e.what()); QMessageBox::warning(this, tr("Error"), e.what());
@ -547,7 +547,7 @@ UserSettingsPage::exportSessionKeys()
auto b64 = mtx::crypto::bin2base64(encrypted_blob); auto b64 = mtx::crypto::bin2base64(encrypted_blob);
file.write(b64.data(), b64.size()); file.write(b64.data(), b64.size());
} catch (const std::exception &e) { } catch (const mtx::crypto::sodium_exception &e) {
QMessageBox::warning(this, tr("Error"), e.what()); QMessageBox::warning(this, tr("Error"), e.what());
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
QMessageBox::warning(this, tr("Error"), e.what()); QMessageBox::warning(this, tr("Error"), e.what());

8
src/Utils.cpp
View File

@ -314,11 +314,13 @@ utils::linkifyMessage(const QString &body)
if (xml.name() == "html") if (xml.name() == "html")
break; break;
textString += "<" + xml.name(); textString += QString("<%1").arg(xml.name().toString());
const auto attrs = xml.attributes(); const auto attrs = xml.attributes();
for (const auto &e : attrs) for (const auto &e : attrs)
textString += QString(" %1=\"%2\"").arg(e.name()).arg(e.value()); textString += QString(" %1=\"%2\"")
.arg(e.name().toString())
.arg(e.value().toString());
textString += ">"; textString += ">";
@ -328,7 +330,7 @@ utils::linkifyMessage(const QString &body)
if (xml.name() == "html") if (xml.name() == "html")
break; break;
textString += "</" + xml.name() + ">"; textString += QString("</%1>").arg(xml.name().toString());
break; break;
} }
default: { default: {