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:
authorStefan Hacker <dd0t@users.sourceforge.net>2015-10-25 22:44:57 +0300
committerStefan Hacker <dd0t@users.sourceforge.net>2015-10-28 21:47:46 +0300
commitf9b2db459b6bb55410279fea904c2ef8391d66ba (patch)
treeeacc8eeb56d5d41414286413a3c72f1abbe0b3f9 /src/mumble/ACLEditor.cpp
parent3206530ffdef5b82cee791b74f9307dec8407a8a (diff)
Fix various shadow warnings in mumble by renaming
Diffstat (limited to 'src/mumble/ACLEditor.cpp')
-rw-r--r--src/mumble/ACLEditor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp
index e24abd5a9..12efb369e 100644
--- a/src/mumble/ACLEditor.cpp
+++ b/src/mumble/ACLEditor.cpp
@@ -273,10 +273,10 @@ void ACLEditor::accept() {
needs_update = true;
}
if (rteChannelDescription->isModified() && (pChannel->qsDesc != rteChannelDescription->text())) {
- const QString &msg = rteChannelDescription->text();
- mpcs.set_description(u8(msg));
+ const QString &descriptionText = rteChannelDescription->text();
+ mpcs.set_description(u8(descriptionText));
needs_update = true;
- Database::setBlob(sha1(msg), msg.toUtf8());
+ Database::setBlob(sha1(descriptionText), descriptionText.toUtf8());
}
if (pChannel->iPosition != qsbChannelPosition->value()) {
mpcs.set_position(qsbChannelPosition->value());