Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-02-20 18:25:30 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-05-08 17:45:52 +0300
commitcd6b532cfd82524cb9a1b87fbe1da4e7a63429e6 (patch)
treedbd385c3485531dd87ec8279fe0e69f0fd475a6a /src/murmur/RPC.cpp
parent9128351b5c6028ead9a9855690dc0b10fbc4fb31 (diff)
grpc: fix implicit QString conversions in setChannelStateGRPC.
Diffstat (limited to 'src/murmur/RPC.cpp')
-rw-r--r--src/murmur/RPC.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp
index 56b7eb787..2cf828008 100644
--- a/src/murmur/RPC.cpp
+++ b/src/murmur/RPC.cpp
@@ -110,12 +110,12 @@ bool Server::setChannelStateGRPC(const MumbleProto::ChannelState &cs, QString &e
bool updated = false;
if (!cs.has_channel_id()) {
- err = "missing channel ID";
+ err = QLatin1String("missing channel ID");
return false;
}
Channel *channel = qhChannels.value(cs.channel_id());
if (!channel) {
- err = "invalid channel";
+ err = QLatin1String("invalid channel");
return false;
}
mpcs.set_channel_id(cs.channel_id());
@@ -127,7 +127,7 @@ bool Server::setChannelStateGRPC(const MumbleProto::ChannelState &cs, QString &e
for (int i = 0; i < cs.links_size(); i++) {
Channel *link = qhChannels.value(cs.links(i));
if (!link) {
- err = "invalid channel link";
+ err = QLatin1String("invalid channel link");
return false;
}
newLinksSet.insert(link);
@@ -136,20 +136,20 @@ bool Server::setChannelStateGRPC(const MumbleProto::ChannelState &cs, QString &e
if (cs.has_parent()) {
Channel *parent = qhChannels.value(cs.parent());
if (!parent) {
- err = "invalid parent channel";
+ err = QLatin1String("invalid parent channel");
return false;
}
if (parent != channel->cParent) {
Channel *p = parent;
while (p) {
if (p == channel) {
- err = "parent channel cannot be a descendant of channel";
+ err = QLatin1String("parent channel cannot be a descendant of channel");
return false;
}
p = p->cParent;
}
if (!canNest(parent, channel)) {
- err = "channel cannot be nested in the given parent";
+ err = QLatin1String("channel cannot be nested in the given parent");
return false;
}
channel->cParent->removeChannel(channel);