summaryrefslogtreecommitdiffstats
path: root/common/resourceaccess.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-06-23 10:20:03 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-06-23 10:20:03 +0200
commit5cabc167e646e9d80b70d6617a3f031d77453979 (patch)
treec95e00cb8002f429fc7040da85fdeb91c2b35728 /common/resourceaccess.cpp
parent69954149a432f7a77f2613e348a2089bf5bb2012 (diff)
downloadsink-5cabc167e646e9d80b70d6617a3f031d77453979.tar.gz
sink-5cabc167e646e9d80b70d6617a3f031d77453979.zip
Build with flatbuffers 1.7
There's a new template version that expects methods that QByteArray doesn't have but breaks the implicit conversion to const char *, std::string is safer anyways (doesn't require a null terminated string).
Diffstat (limited to 'common/resourceaccess.cpp')
-rw-r--r--common/resourceaccess.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index cf8b2e0..808d892 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -477,7 +477,7 @@ void ResourceAccess::connected()
477 477
478 { 478 {
479 flatbuffers::FlatBufferBuilder fbb; 479 flatbuffers::FlatBufferBuilder fbb;
480 auto name = fbb.CreateString(QString("PID: %1 ResourceAccess: %2").arg(QCoreApplication::applicationPid()).arg(reinterpret_cast<qlonglong>(this)).toLatin1()); 480 auto name = fbb.CreateString(QString("PID: %1 ResourceAccess: %2").arg(QCoreApplication::applicationPid()).arg(reinterpret_cast<qlonglong>(this)).toLatin1().toStdString());
481 auto command = Sink::Commands::CreateHandshake(fbb, name); 481 auto command = Sink::Commands::CreateHandshake(fbb, name);
482 Sink::Commands::FinishHandshakeBuffer(fbb, command); 482 Sink::Commands::FinishHandshakeBuffer(fbb, command);
483 Commands::write(d->socket.data(), ++d->messageId, Commands::HandshakeCommand, fbb); 483 Commands::write(d->socket.data(), ++d->messageId, Commands::HandshakeCommand, fbb);