apiextractormacros.h   apiextractormacros.h 
#ifndef APIEXTRACTORMACROS_H #ifndef APIEXTRACTORMACROS_H
#define APIEXTRACTORMACROS_H #define APIEXTRACTORMACROS_H
// APIEXTRACTOR_API is used for the public API symbols. // APIEXTRACTOR_API is used for the public API symbols.
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
#if APIEXTRACTOR_BUILD #if APIEXTRACTOR_EXPORTS
#define APIEXTRACTOR_API __declspec(dllexport) #define APIEXTRACTOR_API __declspec(dllexport)
#else #else
#define APIEXTRACTOR_API __declspec(dllimport) #define APIEXTRACTOR_API
#endif #endif
#else #else
#if __GNUC__ >= 4 #if __GNUC__ >= 4
#define APIEXTRACTOR_API __attribute__ ((visibility("default"))) #define APIEXTRACTOR_API __attribute__ ((visibility("default")))
#else #else
#define APIEXTRACTOR_API #define APIEXTRACTOR_API
#endif #endif
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 typesystem.h   typesystem.h 
skipping to change at line 403 skipping to change at line 403
} }
void setAllowThread(bool allow) void setAllowThread(bool allow)
{ {
m_allowThread = allow; m_allowThread = allow;
} }
double version() const double version() const
{ {
return m_version; return m_version;
} }
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; TypeSystem::Language removal;
QList<ArgumentModification> argument_mods; QList<ArgumentModification> argument_mods;
private: private:
skipping to change at line 1376 skipping to change at line 1379
}; };
ComplexTypeEntry(const QString &name, Type t, double vr) ComplexTypeEntry(const QString &name, Type t, double vr)
: TypeEntry(QString(name).replace(".*::", ""), t, vr), : TypeEntry(QString(name).replace(".*::", ""), t, vr),
m_qualifiedCppName(name), m_qualifiedCppName(name),
m_qobject(false), m_qobject(false),
m_polymorphicBase(false), m_polymorphicBase(false),
m_genericClass(false), m_genericClass(false),
m_typeFlags(0), m_typeFlags(0),
m_copyableFlag(Unknown), m_copyableFlag(Unknown),
m_hashFunction("") m_hashFunction(""),
m_baseContainerType(0)
{ {
} }
bool isComplex() const bool isComplex() const
{ {
return true; return true;
} }
ComplexTypeEntry *copy() const ComplexTypeEntry *copy() const
{ {
ComplexTypeEntry *centry = new ComplexTypeEntry(name(), type(), ver sion()); ComplexTypeEntry *centry = new ComplexTypeEntry(name(), type(), ver sion());
centry->setInclude(include()); centry->setInclude(include());
centry->setExtraIncludes(extraIncludes()); centry->setExtraIncludes(extraIncludes());
centry->setAddedFunctions(addedFunctions()); centry->setAddedFunctions(addedFunctions());
centry->setFunctionModifications(functionModifications()); centry->setFunctionModifications(functionModifications());
centry->setFieldModifications(fieldModifications()); centry->setFieldModifications(fieldModifications());
centry->setQObject(isQObject()); centry->setQObject(isQObject());
centry->setDefaultSuperclass(defaultSuperclass()); centry->setDefaultSuperclass(defaultSuperclass());
centry->setCodeSnips(codeSnips()); centry->setCodeSnips(codeSnips());
centry->setTargetLangPackage(targetLangPackage()); centry->setTargetLangPackage(targetLangPackage());
centry->setBaseContainerType(baseContainerType());
return centry; return centry;
} }
void setLookupName(const QString &name) void setLookupName(const QString &name)
{ {
m_lookupName = name; m_lookupName = name;
} }
virtual QString lookupName() const virtual QString lookupName() const
skipping to change at line 1575 skipping to change at line 1580
QString hashFunction() const QString hashFunction() const
{ {
return m_hashFunction; return m_hashFunction;
} }
void setHashFunction(QString hashFunction) void setHashFunction(QString hashFunction)
{ {
m_hashFunction = hashFunction; m_hashFunction = hashFunction;
} }
void setBaseContainerType(const ComplexTypeEntry *baseContainer)
{
m_baseContainerType = baseContainer;
}
const ComplexTypeEntry* baseContainerType() const
{
return m_baseContainerType;
}
private: private:
AddedFunctionList m_addedFunctions; AddedFunctionList m_addedFunctions;
FunctionModificationList m_functionMods; FunctionModificationList m_functionMods;
FieldModificationList m_fieldMods; FieldModificationList m_fieldMods;
QString m_package; QString m_package;
QString m_defaultSuperclass; QString m_defaultSuperclass;
QString m_qualifiedCppName; QString m_qualifiedCppName;
QString m_targetLangName; QString m_targetLangName;
uint m_qobject : 1; uint m_qobject : 1;
skipping to change at line 1596 skipping to change at line 1611
uint m_genericClass : 1; uint m_genericClass : 1;
QString m_polymorphicIdValue; QString m_polymorphicIdValue;
QString m_heldTypeValue; QString m_heldTypeValue;
QString m_lookupName; QString m_lookupName;
QString m_targetType; QString m_targetType;
ExpensePolicy m_expensePolicy; ExpensePolicy m_expensePolicy;
TypeFlags m_typeFlags; TypeFlags m_typeFlags;
CopyableFlag m_copyableFlag; CopyableFlag m_copyableFlag;
QString m_hashFunction; QString m_hashFunction;
const ComplexTypeEntry* m_baseContainerType;
}; };
class APIEXTRACTOR_API ContainerTypeEntry : public ComplexTypeEntry class APIEXTRACTOR_API ContainerTypeEntry : public ComplexTypeEntry
{ {
public: public:
enum Type { enum Type {
NoContainer, NoContainer,
ListContainer, ListContainer,
StringListContainer, StringListContainer,
LinkedListContainer, LinkedListContainer,
 End of changes. 5 change blocks. 
1 lines changed or deleted 18 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/