Fix compile before current Qt dev

Amends 0120e462b2.

Change-Id: If9f443c03009bf8728497f10c8fb81f37fa1a63d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2019-11-12 13:28:42 +01:00
parent 0120e462b2
commit 2f42e11ac6
6 changed files with 18 additions and 8 deletions

View File

@@ -33,6 +33,7 @@
#endif #endif
using namespace GLSL; using namespace GLSL;
using namespace Qt;
ASTDump::ASTDump(QTextStream &out) ASTDump::ASTDump(QTextStream &out)
: out(out), _depth(0) : out(out), _depth(0)
@@ -52,7 +53,7 @@ bool ASTDump::preVisit(AST *ast)
char *cppId = abi::__cxa_demangle(id, nullptr, nullptr, nullptr); char *cppId = abi::__cxa_demangle(id, nullptr, nullptr, nullptr);
id = cppId; id = cppId;
#endif #endif
out << QByteArray(_depth, ' ') << id << Qt::endl; out << QByteArray(_depth, ' ') << id << endl;
#ifdef Q_CC_GNU #ifdef Q_CC_GNU
free(cppId); free(cppId);
#endif #endif

View File

@@ -42,11 +42,13 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
using namespace Qt;
// Read and write rectangle in X11 resource syntax "12x12+4+3" // Read and write rectangle in X11 resource syntax "12x12+4+3"
static QString rectangleToString(const QRect &r) static QString rectangleToString(const QRect &r)
{ {
QString result; QString result;
QTextStream(&result) << r.width() << 'x' << r.height() << Qt::forcesign << r.x() << r.y(); QTextStream(&result) << r.width() << 'x' << r.height() << forcesign << r.x() << r.y();
return result; return result;
} }

View File

@@ -65,6 +65,8 @@
Q_DECLARE_METATYPE(Core::IFindFilter*) Q_DECLARE_METATYPE(Core::IFindFilter*)
using namespace Qt;
namespace { namespace {
const int MAX_COMPLETIONS = 50; const int MAX_COMPLETIONS = 50;
} }
@@ -82,8 +84,8 @@ QDebug operator<<(QDebug d, const CompletionEntry &e)
QDebugStateSaver saver(d); QDebugStateSaver saver(d);
d.noquote(); d.noquote();
d.nospace(); d.nospace();
d << "CompletionEntry(\"" << e.text << "\", flags=" << Qt::hex d << "CompletionEntry(\"" << e.text << "\", flags=" << hex
<< Qt::showbase << int(e.findFlags) << Qt::dec << Qt::noshowbase << ')'; << showbase << int(e.findFlags) << dec << noshowbase << ')';
return d; return d;
} }

View File

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

View File

@@ -40,6 +40,8 @@
#include <stdio.h> #include <stdio.h>
using namespace Qt;
CompilerOutputProcessor::CompilerOutputProcessor(CompilerType compilerType, QIODevice &source) CompilerOutputProcessor::CompilerOutputProcessor(CompilerType compilerType, QIODevice &source)
: m_compilerType(compilerType) : m_compilerType(compilerType)
, m_source(source) , m_source(source)
@@ -86,5 +88,5 @@ void CompilerOutputProcessor::handleTask(const ProjectExplorer::Task &task)
*m_ostream << ':' << task.line; *m_ostream << ':' << task.line;
*m_ostream << ": "; *m_ostream << ": ";
} }
*m_ostream << task.description << Qt::endl; *m_ostream << task.description << endl;
} }

View File

@@ -49,6 +49,7 @@ void doSleep(int msec)
} }
#endif #endif
using namespace Qt;
using namespace Valgrind::Fake; using namespace Valgrind::Fake;
OutputGenerator::OutputGenerator(QAbstractSocket *output, QIODevice *input) : OutputGenerator::OutputGenerator(QAbstractSocket *output, QIODevice *input) :
@@ -115,7 +116,7 @@ void OutputGenerator::produceRuntimeError()
blockingWrite(m_output, "<</GARBAGE = '\"''asdfaqre"); blockingWrite(m_output, "<</GARBAGE = '\"''asdfaqre");
m_output->flush(); m_output->flush();
} else if (m_wait) { } else if (m_wait) {
qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << Qt::endl; qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << endl;
doSleep(1000 * m_wait); doSleep(1000 * m_wait);
} }
} }