diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2016-09-03 16:45:15 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2016-09-03 16:45:26 +0200 |
commit | 158536ecd751217cd1c6d5435e59feab800e3a1e (patch) | |
tree | 827b496dfa44250a49d904839b5409c47076ec99 /kopete | |
parent | 87dd3d631f3464a964f740744489a43721401e92 (diff) | |
download | tdenetwork-158536ecd751217cd1c6d5435e59feab800e3a1e.tar.gz tdenetwork-158536ecd751217cd1c6d5435e59feab800e3a1e.zip |
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3960494a9e4c642beef587020f05b42de5b1f758)
Diffstat (limited to 'kopete')
-rw-r--r-- | kopete/libkopete/kopeteaccount.cpp | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 4ea6909c..ac072f40 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -257,7 +257,7 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") ); - return false; + return 0; } bool isTemporary = mode == Temporary; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp index 39b2c57f..4b296bb6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp @@ -83,7 +83,7 @@ TQByteArray Base64::decode(const TQByteArray &s) // 64 specifies eof // everything else specifies data - char tbl[] = { + signed char tbl[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, |