abstractmetalang.h   abstractmetalang.h 
skipping to change at line 743 skipping to change at line 743
void setEnclosingClass(const AbstractMetaClass *cls) void setEnclosingClass(const AbstractMetaClass *cls)
{ {
m_class = cls; m_class = cls;
} }
const AbstractMetaFunction *getter() const; const AbstractMetaFunction *getter() const;
const AbstractMetaFunction *setter() const; const AbstractMetaFunction *setter() const;
FieldModificationList modifications() const; FieldModificationList modifications() const;
bool isModifiedRemoved(int types = TypeSystem::All) const;
using AbstractMetaVariable::setDocumentation; using AbstractMetaVariable::setDocumentation;
using AbstractMetaVariable::documentation; using AbstractMetaVariable::documentation;
AbstractMetaField *copy() const; AbstractMetaField *copy() const;
private: private:
mutable AbstractMetaFunction *m_getter; mutable AbstractMetaFunction *m_getter;
mutable AbstractMetaFunction *m_setter; mutable AbstractMetaFunction *m_setter;
const AbstractMetaClass *m_class; const AbstractMetaClass *m_class;
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 typesystem.h   typesystem.h 
skipping to change at line 312 skipping to change at line 312
Readable = 0x0100, Readable = 0x0100,
Writable = 0x0200, Writable = 0x0200,
CodeInjection = 0x1000, CodeInjection = 0x1000,
Rename = 0x2000, Rename = 0x2000,
Deprecated = 0x4000, Deprecated = 0x4000,
ReplaceExpression = 0x8000, ReplaceExpression = 0x8000,
VirtualSlot = 0x10000 | NonFinal VirtualSlot = 0x10000 | NonFinal
}; };
Modification() : modifiers(0) { } Modification() : modifiers(0), removal(TypeSystem::NoLanguage) { }
bool isAccessModifier() const bool isAccessModifier() const
{ {
return modifiers & AccessModifierMask; return modifiers & AccessModifierMask;
} }
Modifiers accessModifier() const Modifiers accessModifier() const
{ {
return Modifiers(modifiers & AccessModifierMask); return Modifiers(modifiers & AccessModifierMask);
} }
bool isPrivate() const bool isPrivate() const
skipping to change at line 370 skipping to change at line 370
} }
QString renamedTo() const QString renamedTo() const
{ {
return renamedToName; return renamedToName;
} }
bool isRenameModifier() const bool isRenameModifier() const
{ {
return modifiers & Rename; return modifiers & Rename;
} }
bool isRemoveModifier() const
{
return removal != TypeSystem::NoLanguage;
}
uint modifiers; uint modifiers;
QString renamedToName; QString renamedToName;
TypeSystem::Language removal;
}; };
struct APIEXTRACTOR_API FunctionModification: public Modification struct APIEXTRACTOR_API FunctionModification: public Modification
{ {
FunctionModification(double vr) : removal(TypeSystem::NoLanguage), m_th read(false), m_allowThread(false), m_version(vr) {} FunctionModification(double vr) : m_thread(false), m_allowThread(false) , m_version(vr) {}
bool isCodeInjection() const bool isCodeInjection() const
{ {
return modifiers & CodeInjection; return modifiers & CodeInjection;
} }
bool isRemoveModifier() const
{
return removal != TypeSystem::NoLanguage;
}
void setIsThread(bool flag) void setIsThread(bool flag)
{ {
m_thread = flag; m_thread = flag;
} }
bool isThread() const bool isThread() const
{ {
return m_thread; return m_thread;
} }
bool allowThread() const bool allowThread() const
{ {
skipping to change at line 415 skipping to change at line 417
} }
bool operator!=(const FunctionModification& other) const; bool operator!=(const FunctionModification& other) const;
bool operator==(const FunctionModification& other) const; bool operator==(const FunctionModification& other) const;
QString toString() const; QString toString() const;
QString signature; QString signature;
QString association; QString association;
CodeSnipList snips; CodeSnipList snips;
TypeSystem::Language removal;
QList<ArgumentModification> argument_mods; QList<ArgumentModification> argument_mods;
private: private:
FunctionModification() {} FunctionModification() {}
bool m_thread; bool m_thread;
bool m_allowThread; bool m_allowThread;
double m_version; double m_version;
skipping to change at line 952 skipping to change at line 953
bool hasNativeConversionRule() const bool hasNativeConversionRule() const
{ {
return m_conversionRule.startsWith(NATIVE_CONVERSION_RULE_FLAG); return m_conversionRule.startsWith(NATIVE_CONVERSION_RULE_FLAG);
} }
bool hasTargetConversionRule() const bool hasTargetConversionRule() const
{ {
return m_conversionRule.startsWith(TARGET_CONVERSION_RULE_FLAG); return m_conversionRule.startsWith(TARGET_CONVERSION_RULE_FLAG);
} }
bool isCppPrimitive() const;
private: private:
QString m_name; QString m_name;
Type m_type; Type m_type;
uint m_codeGeneration; uint m_codeGeneration;
CustomFunction m_customConstructor; CustomFunction m_customConstructor;
CustomFunction m_customDestructor; CustomFunction m_customDestructor;
bool m_preferredConversion; bool m_preferredConversion;
CodeSnipList m_codeSnips; CodeSnipList m_codeSnips;
DocModificationList m_docModifications; DocModificationList m_docModifications;
IncludeList m_extraIncludes; IncludeList m_extraIncludes;
 End of changes. 7 change blocks. 
7 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/