summaryrefslogtreecommitdiffstats
path: root/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
diff options
context:
space:
mode:
authorPasi Keränen <pasi.keranen@qt.io>2018-09-10 13:49:54 +0300
committerPasi Keränen <pasi.keranen@qt.io>2018-09-11 05:45:19 +0000
commit627879ea6e025c8335727867ef50a3b13183d7a0 (patch)
treeb412e27620440c785617c6c991b28296be7f3441 /src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
parent1880495b000c3bc4eac819120c2dccfb03e4ce52 (diff)
Fix switch-cases not handling all possible values
Add default handling for switch cases missing it and remove the switch case related warning suppression with clang builds. Task-number: QT3DS-2243 Change-Id: Ib87d51468bbfa00284c6849363751ccb056f7eb7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp')
-rw-r--r--src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
index 289152db..ca89031b 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp
@@ -314,7 +314,10 @@ const wchar_t *ComposerObjectTypes::Convert(ComposerObjectTypes::Enum inType)
return QT3DS_WCHAR_T_##name;
ITERATE_COMPOSER_OBJECT_TYPES
#undef HANDLE_COMPOSER_OBJECT_TYPE
+ default:
+ break;
}
+
QT3DS_ASSERT(false);
return L"Unknown";
}
@@ -522,7 +525,10 @@ bool SComposerObjectDefinitions::IsA(Qt3DSDMInstanceHandle inInstance,
return m_DataCore.IsInstanceOrDerivedFrom(inInstance, m_##name.m_Instance);
ITERATE_COMPOSER_OBJECT_TYPES
#undef HANDLE_COMPOSER_OBJECT_TYPE
+ default:
+ break;
}
+
QT3DS_ASSERT(false);
return false;
}
@@ -559,7 +565,10 @@ SComposerObjectDefinitions::GetInstanceForType(ComposerObjectTypes::Enum inType)
return m_##name.m_Instance;
ITERATE_COMPOSER_OBJECT_TYPES
#undef HANDLE_COMPOSER_OBJECT_TYPE
+ default:
+ break;
}
+
QT3DS_ASSERT(false);
return 0;
}