[X2Go-Commits] [x2goclient] 03/04: src/pulsemanager.cpp: use QByteArray's constData () instead of data (), since we'll never modify the data anyway.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 14 04:12:22 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit c416343c0f618d045ce4634b36033d05dc4b02ef
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Jun 14 03:36:22 2018 +0200
src/pulsemanager.cpp: use QByteArray's constData () instead of data (), since we'll never modify the data anyway.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a64afa5..da8f2c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,8 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
chgrp.
- src/onmainwindow.cpp: fix user-facing error messages in Windows X.Org
Server startup functions.
+ - src/pulsemanager.cpp: use QByteArray's constData () instead of data (),
+ since we'll never modify the data anyway.
* x2goclient.spec:
- Remove plugin references.
* debian/rules:
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 342579d..90d0ac3 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -363,7 +363,7 @@ void PulseManager::fetch_pulseaudio_version () {
if (tmp_server.waitForFinished ()) {
/* Read stdout and split it up on newlines. */
QByteArray ba (tmp_server.readAllStandardOutput ());
- QString stdout_data (ba.data ());
+ QString stdout_data (ba.constData ());
QStringList stdout_list (stdout_data.split ("\n"));
x2goDebug << "pulseaudio --version returned:" << stdout_data << endl;
@@ -784,10 +784,10 @@ void PulseManager::slot_on_pulse_finished (int exit_code) {
shutdown_state_ = false;
x2goDebug << "Pulseaudio finished with code:"<<exit_code;
QByteArray ba (pulse_server_->readAllStandardOutput ());
- char *data = ba.data ();
+ const char *data = ba.constData ();
x2goDebug << data;
ba = pulse_server_->readAllStandardError ();
- data = ba.data ();
+ data = ba.constData ();
x2goDebug << data;
// Clean up
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list