1 files changed, 14 insertions, 18 deletions

diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp
index ccb2673..bfacb94 100644
--- a/src/gui/accessible/qaccessible_win.cpp
+++ b/src/gui/accessible/qaccessible_win.cpp
@@ -177,14 +177,14 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
         return;
     }
 
-    QByteArray soundName;
+    QString soundName;
     switch (reason) {
     case PopupMenuStart:
-        soundName = "MenuPopup";
+        soundName = QLatin1String("MenuPopup");
         break;
 
     case MenuCommand:
-        soundName = "MenuCommand";
+        soundName = QLatin1String("MenuCommand");
         break;
 
     case Alert:
@@ -194,13 +194,13 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
             if (mb) {
                 switch (mb->icon()) {
                 case QMessageBox::Warning:
-                    soundName = "SystemExclamation";
+                    soundName = QLatin1String("SystemExclamation");
                     break;
                 case QMessageBox::Critical:
-                    soundName = "SystemHand";
+                    soundName = QLatin1String("SystemHand");
                     break;
                 case QMessageBox::Information:
-                    soundName = "SystemAsterisk";
+                    soundName = QLatin1String("SystemAsterisk");
                     break;
                 default:
                     break;
@@ -208,7 +208,7 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
             } else
 #endif // QT_NO_MESSAGEBOX
             {
-                soundName = "SystemAsterisk";
+                soundName = QLatin1String("SystemAsterisk");
             }
 
         }
@@ -219,20 +219,16 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
 
     if (soundName.size()) {
 #ifndef QT_NO_SETTINGS
-        QSettings settings(QLatin1String("HKEY_CURRENT_USER\\AppEvents\\Schemes\\Apps\\.Default\\") +
-                                         QString::fromLatin1(soundName.constData()), QSettings::NativeFormat);
+        QSettings settings(QLatin1String("HKEY_CURRENT_USER\\AppEvents\\Schemes\\Apps\\.Default\\") + soundName,
+                           QSettings::NativeFormat);
         QString file = settings.value(QLatin1String(".Current/.")).toString();
 #else
-		QString file;
+        QString file;
 #endif
-		if (!file.isEmpty()) {
-	        QT_WA({
-				PlaySoundW(reinterpret_cast<const wchar_t *> (QString::fromLatin1(soundName).utf16()), 0, SND_ALIAS | SND_ASYNC | SND_NODEFAULT | SND_NOWAIT );
-			} , {
-				PlaySoundA(soundName.constData(), 0, SND_ALIAS | SND_ASYNC | SND_NODEFAULT | SND_NOWAIT );
-			});
-		}
-	}
+        if (!file.isEmpty()) {
+				    PlaySound(reinterpret_cast<const wchar_t *>(soundName.utf16()), 0, SND_ALIAS | SND_ASYNC | SND_NODEFAULT | SND_NOWAIT);
+        }
+    }
 
     if (!isActive())
         return;