Workaround 5.15 deprecations in QTextStreams

Change-Id: Ifc2b7fd353e7c12346e9716115e830679cea7666
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2020-01-17 14:37:08 +01:00
committed by hjk
parent 37e7b72609
commit 7021b1f078
9 changed files with 55 additions and 56 deletions

View File

@@ -39,8 +39,6 @@
#include <QTextStream>
#include <QTimer>
using namespace Qt;
namespace Gerrit {
namespace Internal {
@@ -152,10 +150,10 @@ bool AuthenticationDialog::setupCredentials()
replaceEntry(line, "login", user);
replaceEntry(line, "password", password);
}
out << line << endl;
out << line << '\n';
}
if (!found)
out << "machine " << m_server->host << " login " << user << " password " << password << endl;
out << "machine " << m_server->host << " login " << user << " password " << password << '\n';
Utils::FileSaver saver(m_netrcFileName, QFile::WriteOnly | QFile::Truncate | QFile::Text);
saver.write(netrcContents.toUtf8());
return saver.finalize();

View File

@@ -55,8 +55,6 @@ enum { debug = 0 };
using namespace VcsBase;
using namespace Qt;
namespace Gerrit {
namespace Internal {
@@ -124,7 +122,10 @@ QString GerritPatchSet::approvalsToHtml() const
str << a.reviewer.fullName;
if (!a.reviewer.email.isEmpty())
str << " <a href=\"mailto:" << a.reviewer.email << "\">" << a.reviewer.email << "</a>";
str << ": " << forcesign << a.approval << noforcesign;
str << ": ";
if (a.approval >= 0)
str << '+';
str << a.approval;
}
str << "</tr>\n";
return result;
@@ -166,7 +167,10 @@ QString GerritPatchSet::approvalsColumn() const
for (TypeReviewMapConstIterator it = reviews.constBegin(); it != cend; ++it) {
if (!result.isEmpty())
str << ' ';
str << it.key() << ": " << forcesign << it.value() << noforcesign;
str << it.key() << ": ";
if (it.value() >= 0)
str << '+';
str << it.value();
}
return result;
}