diff --git a/Import/GacUI.cpp b/Import/GacUI.cpp index d3326e03..982b2c5e 100644 --- a/Import/GacUI.cpp +++ b/Import/GacUI.cpp @@ -44002,7 +44002,7 @@ IGuiResourceResolverManager return true; } - vint GetMaxPrecompilePassIndex() + vint GetMaxPrecompilePassIndex()override { vint maxPass = -1; FOREACH(Ptr, resolver, typeResolvers.Values()) @@ -44019,7 +44019,7 @@ IGuiResourceResolverManager return maxPass; } - vint GetMaxInitializePassIndex() + vint GetMaxInitializePassIndex()override { vint maxPass = -1; FOREACH(Ptr, resolver, typeResolvers.Values()) @@ -44149,7 +44149,7 @@ Image Type Resolver (Image) } } - Ptr ResolveResourcePrecompiled(stream::IStream& stream, collections::List& errors) + Ptr ResolveResourcePrecompiled(stream::IStream& stream, collections::List& errors)override { stream::internal::Reader reader(stream); MemoryStream memoryStream; @@ -44247,7 +44247,7 @@ Text Type Resolver (Text) } } - Ptr ResolveResourcePrecompiled(stream::IStream& stream, collections::List& errors) + Ptr ResolveResourcePrecompiled(stream::IStream& stream, collections::List& errors)override { stream::internal::Reader reader(stream); WString text; @@ -44351,7 +44351,7 @@ Xml Type Resolver (Xml) return 0; } - Ptr ResolveResourcePrecompiled(stream::IStream& stream, collections::List& errors) + Ptr ResolveResourcePrecompiled(stream::IStream& stream, collections::List& errors)override { stream::internal::Reader reader(stream); WString text; diff --git a/Import/GacUI.h b/Import/GacUI.h index f7885feb..96c5823a 100644 --- a/Import/GacUI.h +++ b/Import/GacUI.h @@ -8074,7 +8074,7 @@ Basic Construction virtual void SetVisible(bool value); /// Get the Alt-combined shortcut key associated with this control. /// The Alt-combined shortcut key associated with this control. - virtual const WString& GetAlt(); + virtual const WString& GetAlt()override; /// Associate a Alt-combined shortcut key with this control. /// Returns true if this operation succeeded. /// The Alt-combined shortcut key to associate. Only zero, sigle or multiple upper case letters are legal. @@ -10851,7 +10851,7 @@ Predefined ItemProvider class ListProvider : public ItemProviderBase, public ItemsBase { protected: - void NotifyUpdateInternal(vint start, vint count, vint newCount) + void NotifyUpdateInternal(vint start, vint count, vint newCount)override { InvokeOnItemModified(start, count, newCount); } @@ -16110,7 +16110,7 @@ Datagrid ContentProvider void NotifyCloseEditor(); void NotifySelectCell(vint row, vint column); - void RequestSaveData(); + void RequestSaveData()override; IDataEditor* OpenEditor(vint row, vint column, IDataEditorFactory* editorFactory); void CloseEditor(bool forOpenNewEditor); public: diff --git a/Import/GacUIReflection.cpp b/Import/GacUIReflection.cpp index 1ad5ccaa..6d22456f 100644 --- a/Import/GacUIReflection.cpp +++ b/Import/GacUIReflection.cpp @@ -542,7 +542,7 @@ GuiDefaultInstanceLoader return GetDefaultConstructor(typeInfo.typeDescriptor) != 0; } - Ptr CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List& errors) + Ptr CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List& errors)override { auto create = MakePtr(); create->type = GetTypeFromTypeInfo(GetDefaultConstructor(typeInfo.typeDescriptor)->GetReturn()); @@ -560,7 +560,7 @@ GuiDefaultInstanceLoader return stat; } - Ptr AssignParameters(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List& errors) + Ptr AssignParameters(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List& errors)override { auto block = MakePtr(); @@ -645,7 +645,7 @@ GuiDefaultInstanceLoader return nullptr; } - Ptr GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List& errors) + Ptr GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List& errors)override { auto refValue = MakePtr(); refValue->name.value = variableName.ToString(); @@ -1175,7 +1175,7 @@ GuiEvalInstanceEventBinder (eval) return GlobalStringKey::_Eval; } - Ptr GenerateInstallStatement(GlobalStringKey variableName, description::IEventInfo* eventInfo, const WString& code, collections::List& errors) + Ptr GenerateInstallStatement(GlobalStringKey variableName, description::IEventInfo* eventInfo, const WString& code, collections::List& errors)override { if (auto statement = Workflow_ParseStatement(code, errors)) { @@ -2876,7 +2876,7 @@ GuiTableCompositionInstanceLoader propertyNames.Add(_Columns); } - void GetPairedProperties(const PropertyInfo& propertyInfo, collections::List& propertyNames) + void GetPairedProperties(const PropertyInfo& propertyInfo, collections::List& propertyNames)override { if (propertyInfo.propertyName == _Rows || propertyInfo.propertyName == _Columns) { @@ -3169,12 +3169,12 @@ GuiDocumentItemInstanceLoader } - bool CanCreate(const TypeInfo& typeInfo) + bool CanCreate(const TypeInfo& typeInfo)override { return typeName == typeInfo.typeName; } - Ptr CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List& errors) + Ptr CreateInstance(const TypeInfo& typeInfo, GlobalStringKey variableName, ArgumentMap& arguments, collections::List& errors)override { if (typeInfo.typeName == GetTypeName()) { @@ -5239,7 +5239,7 @@ GuiToolstripButtonInstanceLoader return BASE_TYPE::GetPropertyType(propertyInfo); } - Ptr GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List& errors) + Ptr GetParameter(const PropertyInfo& propertyInfo, GlobalStringKey variableName, collections::List& errors)override { if (propertyInfo.propertyName == _SubMenu) { diff --git a/Import/GacUIReflection.h b/Import/GacUIReflection.h index 3eb75aa4..e47bbbbc 100644 --- a/Import/GacUIReflection.h +++ b/Import/GacUIReflection.h @@ -1707,7 +1707,7 @@ Interface Proxy INVOKE_INTERFACE_PROXY(SetTabAlt, index, value, host); } - compositions::IGuiAltAction* GetTabAltAction(vint index) + compositions::IGuiAltAction* GetTabAltAction(vint index)override { return INVOKEGET_INTERFACE_PROXY(GetTabAltAction, index); } @@ -1770,7 +1770,7 @@ Interface Proxy INVOKE_INTERFACE_PROXY_NOPARAMS(InitializeNativeWindowProperties); } - void SetSizeState(INativeWindow::WindowSizeState value) + void SetSizeState(INativeWindow::WindowSizeState value)override { INVOKE_INTERFACE_PROXY(SetSizeState, value); } diff --git a/Import/Vlpp.h b/Import/Vlpp.h index edb64cc5..3dd486e7 100644 --- a/Import/Vlpp.h +++ b/Import/Vlpp.h @@ -10600,18 +10600,18 @@ GeneralValueSerializer { } - ITypeDescriptor* GetOwnerTypeDescriptor() + ITypeDescriptor* GetOwnerTypeDescriptor()override { return ownedTypeDescriptor; } - bool Validate(const WString& text) + bool Validate(const WString& text)override { T output; return Deserialize(text, output); } - bool Parse(const WString& input, Value& output) + bool Parse(const WString& input, Value& output)override { T value; if(Deserialize(input, value)) @@ -10652,7 +10652,7 @@ GeneralValueSerializer return false; } - bool Serialize(const T& input, Value& output) + bool Serialize(const T& input, Value& output)override { WString text; if(Serialize(input, text)) @@ -10663,7 +10663,7 @@ GeneralValueSerializer return false; } - bool Deserialize(const Value& input, T& output) + bool Deserialize(const Value& input, T& output)override { if(input.GetValueType()!=Value::Text) { @@ -10688,7 +10688,7 @@ TypedValueSerializer protected: T defaultValue; - T GetDefaultValue() + T GetDefaultValue()override { return defaultValue; } diff --git a/Import/VlppWorkflow.cpp b/Import/VlppWorkflow.cpp index 7edb43b3..6df3d83e 100644 --- a/Import/VlppWorkflow.cpp +++ b/Import/VlppWorkflow.cpp @@ -18260,7 +18260,8 @@ Serialization (TypeImpl) static void IO(Writer& writer, WfTypeImpl& value) { - bool hasTypeImpl = &value != nullptr; + auto pvalue = &value; // clang++: -Wtautological-undefined-compare + bool hasTypeImpl = pvalue != nullptr; writer << hasTypeImpl; if (hasTypeImpl) { diff --git a/Tools/GacGen.exe b/Tools/GacGen.exe index e9bb2b97..538b62ad 100644 Binary files a/Tools/GacGen.exe and b/Tools/GacGen.exe differ diff --git a/Tools/ParserGen.exe b/Tools/ParserGen.exe index 2bccc953..9310f4f8 100644 Binary files a/Tools/ParserGen.exe and b/Tools/ParserGen.exe differ diff --git a/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin b/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin index 660e1d49..02199812 100644 Binary files a/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin and b/Tutorial/GacUI_HelloWorlds/UIRes/MVVM.bin differ