tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make default getters and setters non-virtual" 

This reverts commit 50eb774a0f.

refs #5759
This commit is contained in:
Michael Friedrich 2018-01-16 10:41:48 +01:00
parent 2901c77d65
commit fba838c7ef
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/mkclass/class_lexer.ll
View File

@ -148,9 +148,6 @@ no_storage { yylval->num = FANoStorage; return T_FIELD_ATTRIBUTE; }
no_user_modify { yylval->num = FANoUserModify; return T_FIELD_ATTRIBUTE; }
no_user_view { yylval->num = FANoUserView; return T_FIELD_ATTRIBUTE; }
deprecated { yylval->num = FADeprecated; return T_FIELD_ATTRIBUTE; }
get_virtual { yylval->num = FAGetVirtual; return T_FIELD_ATTRIBUTE; }
set_virtual { yylval->num = FASetVirtual; return T_FIELD_ATTRIBUTE; }
virtual { yylval->num = FAGetVirtual | FASetVirtual; return T_FIELD_ATTRIBUTE; }
navigation { return T_NAVIGATION; }
validator { return T_VALIDATOR; }
required { return T_REQUIRED; }

25
tools/mkclass/classcompiler.cpp
View File

@ -706,7 +706,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
/* NotifyField */
m_Header << "public:" << std::endl
<< "\t" << "void NotifyField(int id, const Value& cookie = Empty) override;" << std::endl;
<< "\t" << "virtual void NotifyField(int id, const Value& cookie = Empty) override;" << std::endl;
m_Impl << "void ObjectImpl<" << klass.Name << ">::NotifyField(int id, const Value& cookie)" << std::endl
<< "{" << std::endl;
@ -784,12 +784,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
prot = "public";
m_Header << prot << ":" << std::endl
<< "\t";
if (field.Attributes & FAGetVirtual || field.PureGetAccessor)
m_Header << "virtual ";
m_Header << field.Type.GetRealType() << " Get" << field.GetFriendlyName() << "(void) const";
<< "\t" << "virtual " << field.Type.GetRealType() << " Get" << field.GetFriendlyName() << "(void) const";
if (field.PureGetAccessor) {
m_Header << " = 0;" << std::endl;
@ -818,12 +813,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
prot = "public";
m_Header << prot << ":" << std::endl
<< "\t";
if (field.Attributes & FASetVirtual || field.PureSetAccessor)
m_Header << "virtual ";
m_Header << "void Set" << field.GetFriendlyName() << "(" << field.Type.GetArgumentType() << " value, bool suppress_events = false, const Value& cookie = Empty)";
<< "\t" << "virtual void Set" << field.GetFriendlyName() << "(" << field.Type.GetArgumentType() << " value, bool suppress_events = false, const Value& cookie = Empty)";
if (field.PureSetAccessor) {
m_Header << " = 0;" << std::endl;
@ -869,7 +859,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
needs_tracking = true;
m_Header << "\t" << "void Track" << field.GetFriendlyName() << "(" << field.Type.GetArgumentType() << " oldValue, " << field.Type.GetArgumentType() << " newValue);" << std::endl;
m_Header << "\t" << "virtual void Track" << field.GetFriendlyName() << "(" << field.Type.GetArgumentType() << " oldValue, " << field.Type.GetArgumentType() << " newValue);";
m_Impl << "void ObjectImpl<" << klass.Name << ">::Track" << field.GetFriendlyName() << "(" << field.Type.GetArgumentType() << " oldValue, " << field.Type.GetArgumentType() << " newValue)" << std::endl
<< "{" << std::endl;
@ -940,7 +930,7 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
continue;
m_Header << "public:" << std::endl
<< "\t" << "Object::Ptr Navigate" << field.GetFriendlyName() << "(void) const";
<< "\t" << "virtual Object::Ptr Navigate" << field.GetFriendlyName() << "(void) const";
if (field.PureNavigateAccessor) {
m_Header << " = 0;" << std::endl;
@ -961,9 +951,8 @@ void ClassCompiler::HandleClass(const Klass& klass, const ClassDebugInfo&)
/* start/stop */
if (needs_tracking) {
m_Header << "protected:" << std::endl
<< "\tvirtual void Start(bool runtimeCreated = false) override;" << std::endl
<< "\tvirtual void Stop(bool runtimeRemoved = false) override;" << std::endl;
m_Header << "virtual void Start(bool runtimeCreated = false) override;" << std::endl
<< "virtual void Stop(bool runtimeRemoved = false) override;" << std::endl;
m_Impl << "void ObjectImpl<" << klass.Name << ">::Start(bool runtimeCreated)" << std::endl
<< "{" << std::endl

4
tools/mkclass/classcompiler.hpp
View File

@ -73,9 +73,7 @@ enum FieldAttribute
FANavigation = 512,
FANoUserModify = 1024,
FANoUserView = 2048,
FADeprecated = 4096,
FAGetVirtual = 8192,
FASetVirtual = 16384
FADeprecated = 4096
};
struct FieldType