Fix a number of compiler warnings/errors when using gcc

Change-Id: Ifa7bcd4507948cd61909a11af203852ee1586787
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 6 insertions, 8 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index b3c8dea44..5ec944013 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -56,9 +56,6 @@
 static QString toString(QAudioFormat::SampleFormat sampleFormat)
 {
     switch (sampleFormat) {
-    case QAudioFormat::Unknown:
-    case QAudioFormat::NSampleFormats:
-        return "Unknown";
     case QAudioFormat::UInt8:
         return "Unsigned 8 bit";
     case QAudioFormat::Int16:
@@ -67,6 +64,8 @@ static QString toString(QAudioFormat::SampleFormat sampleFormat)
         return "Signed 32 bit";
     case QAudioFormat::Float:
         return "Float";
+    default:
+        return "Unknown";
     }
 }
 
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index cfdd28116..ce43c7079 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -61,9 +61,6 @@
 QString formatToString(QAudioFormat::SampleFormat sampleFormat)
 {
     switch (sampleFormat) {
-    case QAudioFormat::Unknown:
-    case QAudioFormat::NSampleFormats:
-        return "Unknown";
     case QAudioFormat::UInt8:
         return "UInt8";
     case QAudioFormat::Int16:
@@ -72,18 +69,20 @@ QString formatToString(QAudioFormat::SampleFormat sampleFormat)
         return "Int32";
     case QAudioFormat::Float:
         return "Float";
+    default:
+        return "Unknown";
     }
 }
 
 QString positionToString(QCameraInfo::Position position)
 {
     switch (position) {
-        case QCameraInfo::UnspecifiedPosition:
-            return "Unspecified";
         case QCameraInfo::BackFace:
             return "BackFace";
         case QCameraInfo::FrontFace:
             return "FrontFace";
+        default:
+            return "Unspecified";
     }
 }