From d7de7785af23a3db0991747a20309f00ad7223a6 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 10 Oct 2018 18:37:07 +0200
Subject: [PATCH] Ref T398, style

---
 src/blackgui/components/audiosetupcomponent.cpp |  5 +++--
 src/blackmisc/audio/audiodeviceinfo.cpp         | 12 ++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/blackgui/components/audiosetupcomponent.cpp b/src/blackgui/components/audiosetupcomponent.cpp
index 20192dc29..aff13eb99 100644
--- a/src/blackgui/components/audiosetupcomponent.cpp
+++ b/src/blackgui/components/audiosetupcomponent.cpp
@@ -45,13 +45,14 @@ namespace BlackGui
             // audio is optional
             const bool audio = this->hasAudio();
             this->setEnabled(audio);
-            ui->le_ExtraInfo->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change.");
 
             bool c = connect(ui->cb_SetupAudioLoopback, &QCheckBox::toggled, this, &CAudioSetupComponent::onLoopbackToggled);
             Q_ASSERT(c);
 
             if (audio)
             {
+                ui->le_ExtraInfo->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change.");
+
                 this->initAudioDeviceLists();
 
                 // default
@@ -146,7 +147,7 @@ namespace BlackGui
             ui->cb_SetupAudioOutputDevice->clear();
             ui->cb_SetupAudioInputDevice->clear();
 
-            for (auto &device : devices)
+            for (const CAudioDeviceInfo &device : devices)
             {
                 if (device.getType() == CAudioDeviceInfo::InputDevice)
                 {
diff --git a/src/blackmisc/audio/audiodeviceinfo.cpp b/src/blackmisc/audio/audiodeviceinfo.cpp
index 2adac61ab..132d6bc7f 100644
--- a/src/blackmisc/audio/audiodeviceinfo.cpp
+++ b/src/blackmisc/audio/audiodeviceinfo.cpp
@@ -9,6 +9,7 @@
 
 #include "blackmisc/audio/audiodeviceinfo.h"
 
+#include <QStringBuilder>
 #include <QHostInfo>
 #include <QtGlobal>
 
@@ -18,7 +19,7 @@ namespace BlackMisc
     {
         CAudioDeviceInfo::CAudioDeviceInfo() :
             m_type(Unknown), m_deviceIndex(invalidDeviceIndex()),
-            m_deviceName(""), m_hostName(QHostInfo::localHostName())
+            m_hostName(QHostInfo::localHostName())
         { }
 
         CAudioDeviceInfo::CAudioDeviceInfo(DeviceType type, const int index, const QString &name) :
@@ -29,13 +30,8 @@ namespace BlackMisc
         QString CAudioDeviceInfo::convertToQString(bool i18n) const
         {
             Q_UNUSED(i18n);
-            if (this->m_hostName.isEmpty()) return m_deviceName;
-            QString s(this->m_deviceName);
-            s.append(" [");
-            s.append(this->getHostName());
-            s.append("]");
-            return s;
+            if (m_hostName.isEmpty()) { return m_deviceName; }
+            return m_deviceName % QStringLiteral(" [") % this->getHostName() % QStringLiteral("]");
         }
-
     } // Voice
 } // BlackMisc