abstractmetalang.h   abstractmetalang.h 
skipping to change at line 591 skipping to change at line 591
void setOriginalTemplateType(const AbstractMetaType *type) void setOriginalTemplateType(const AbstractMetaType *type)
{ {
m_originalTemplateType = type; m_originalTemplateType = type;
} }
const AbstractMetaType *originalTemplateType() const const AbstractMetaType *originalTemplateType() const
{ {
return m_originalTemplateType; return m_originalTemplateType;
} }
/// Decides and sets the proper usage patter for the current meta type.
void decideUsagePattern();
private: private:
const TypeEntry *m_typeEntry; const TypeEntry *m_typeEntry;
AbstractMetaTypeList m_instantiations; AbstractMetaTypeList m_instantiations;
QString m_package; QString m_package;
mutable QString m_name; mutable QString m_name;
mutable QString m_cachedCppSignature; mutable QString m_cachedCppSignature;
QString m_originalTypeDescription; QString m_originalTypeDescription;
int m_arrayElementCount; int m_arrayElementCount;
const AbstractMetaType *m_arrayElementType; const AbstractMetaType *m_arrayElementType;
skipping to change at line 1867 skipping to change at line 1870
const AbstractMetaClass *templateBaseClass() const const AbstractMetaClass *templateBaseClass() const
{ {
return m_templateBaseClass; return m_templateBaseClass;
} }
void setTemplateBaseClass(const AbstractMetaClass *cls) void setTemplateBaseClass(const AbstractMetaClass *cls)
{ {
m_templateBaseClass = cls; m_templateBaseClass = cls;
} }
bool hasTemplateBaseClassInstantiations() const;
AbstractMetaTypeList templateBaseClassInstantiations() const;
void setTemplateBaseClassInstantiations(AbstractMetaTypeList& instantia
tions);
void setTypeAlias(bool typeAlias) void setTypeAlias(bool typeAlias)
{ {
m_isTypeAlias = typeAlias; m_isTypeAlias = typeAlias;
} }
bool isTypeAlias() const bool isTypeAlias() const
{ {
return m_isTypeAlias; return m_isTypeAlias;
} }
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added


 apiextractor.h   apiextractor.h 
skipping to change at line 51 skipping to change at line 51
void setTypeSystem(const QString& typeSystemFileName); void setTypeSystem(const QString& typeSystemFileName);
void setCppFileName(const QString& cppFileName); void setCppFileName(const QString& cppFileName);
void setDebugLevel(ReportHandler::DebugLevel debugLevel); void setDebugLevel(ReportHandler::DebugLevel debugLevel);
void setSuppressWarnings(bool value); void setSuppressWarnings(bool value);
void setSilent(bool value); void setSilent(bool value);
void addTypesystemSearchPath(const QString& path); void addTypesystemSearchPath(const QString& path);
void addTypesystemSearchPath(const QStringList& paths); void addTypesystemSearchPath(const QStringList& paths);
void addIncludePath(const QString& path); void addIncludePath(const QString& path);
void addIncludePath(const QStringList& paths); void addIncludePath(const QStringList& paths);
void setLogDirectory(const QString& logDir); void setLogDirectory(const QString& logDir);
void setApiVersion(double version); APIEXTRACTOR_DEPRECATED(void setApiVersion(double version));
void setApiVersion(const QString& package, const QByteArray& version);
void setDropTypeEntries(QString dropEntries); void setDropTypeEntries(QString dropEntries);
AbstractMetaEnumList globalEnums() const; AbstractMetaEnumList globalEnums() const;
AbstractMetaFunctionList globalFunctions() const; AbstractMetaFunctionList globalFunctions() const;
AbstractMetaClassList classes() const; AbstractMetaClassList classes() const;
PrimitiveTypeEntryList primitiveTypes() const; PrimitiveTypeEntryList primitiveTypes() const;
ContainerTypeEntryList containerTypes() const; ContainerTypeEntryList containerTypes() const;
QSet<QString> qtMetaTypeDeclaredTypeNames() const; QSet<QString> qtMetaTypeDeclaredTypeNames() const;
const AbstractMetaEnum* findAbstractMetaEnum(const EnumTypeEntry* typeE ntry) const; const AbstractMetaEnum* findAbstractMetaEnum(const EnumTypeEntry* typeE ntry) const;
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 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_EXPORTS #if APIEXTRACTOR_EXPORTS
#define APIEXTRACTOR_API __declspec(dllexport) #define APIEXTRACTOR_API __declspec(dllexport)
#else #else
#define APIEXTRACTOR_API #define APIEXTRACTOR_API
#endif #endif
#else #define APIEXTRACTOR_DEPRECATED(func) __declspec(deprecated) func
#if __GNUC__ >= 4 #elif __GNUC__ >= 4
#define APIEXTRACTOR_API __attribute__ ((visibility("default"))) #define APIEXTRACTOR_API __attribute__ ((visibility("default")))
#else #define APIEXTRACTOR_DEPRECATED(func) func __attribute__ ((deprecated))
#define APIEXTRACTOR_API #endif
#endif
#ifndef APIEXTRACTOR_API
#define APIEXTRACTOR_API
#define APIEXTRACTOR_API(func) func
#endif #endif
#endif #endif
 End of changes. 1 change blocks. 
6 lines changed or deleted 9 lines changed or added


 typedatabase.h   typedatabase.h 
skipping to change at line 176 skipping to change at line 176
static QString globalNamespaceClassName(const TypeEntry *te); static QString globalNamespaceClassName(const TypeEntry *te);
QString filename() const QString filename() const
{ {
return "typesystem.txt"; return "typesystem.txt";
} }
QString modifiedTypesystemFilepath(const QString& tsFile) const; QString modifiedTypesystemFilepath(const QString& tsFile) const;
bool parseFile(const QString &filename, bool generate = true); bool parseFile(const QString &filename, bool generate = true);
bool parseFile(QIODevice* device, bool generate = true); bool parseFile(QIODevice* device, bool generate = true);
double apiVersion() const APIEXTRACTOR_DEPRECATED(double apiVersion() const)
{ {
return m_apiVersion; return m_apiVersion;
} }
void setApiVersion(double version) APIEXTRACTOR_DEPRECATED(void setApiVersion(double version))
{ {
m_apiVersion = version; m_apiVersion = version;
} }
void setApiVersion(const QString& package, const QByteArray& version);
bool supportedApiVersion(double version) const; APIEXTRACTOR_DEPRECATED(bool supportedApiVersion(double version) const)
;
bool checkApiVersion(const QString& package, const QByteArray& version)
const;
const QStringList& dropTypeEntries() const const QStringList& dropTypeEntries() const
{ {
return m_dropTypeEntries; return m_dropTypeEntries;
} }
bool hasDroppedTypeEntries() const bool hasDroppedTypeEntries() const
{ {
return !m_dropTypeEntries.isEmpty(); return !m_dropTypeEntries.isEmpty();
} }
 End of changes. 4 change blocks. 
3 lines changed or deleted 7 lines changed or added


 typesystem.h   typesystem.h 
skipping to change at line 1140 skipping to change at line 1140
virtual bool preferredTargetLangType() const virtual bool preferredTargetLangType() const
{ {
return m_preferredTargetLangType; return m_preferredTargetLangType;
} }
virtual void setPreferredTargetLangType(bool b) virtual void setPreferredTargetLangType(bool b)
{ {
m_preferredTargetLangType = b; m_preferredTargetLangType = b;
} }
void setTargetLangPackage(const QString& package);
QString targetLangPackage() const;
private: private:
QString m_targetLangName; QString m_targetLangName;
QString m_targetLangApiName; QString m_targetLangApiName;
QString m_defaultConstructor; QString m_defaultConstructor;
uint m_preferredConversion : 1; uint m_preferredConversion : 1;
uint m_preferredTargetLangType : 1; uint m_preferredTargetLangType : 1;
PrimitiveTypeEntry* m_aliasedTypeEntry; PrimitiveTypeEntry* m_aliasedTypeEntry;
}; };
typedef QList<const PrimitiveTypeEntry*> PrimitiveTypeEntryList; typedef QList<const PrimitiveTypeEntry*> PrimitiveTypeEntryList;
skipping to change at line 1436 skipping to change at line 1438
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()); centry->setBaseContainerType(baseContainerType());
centry->setDefaultConstructor(defaultConstructor());
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 1624 skipping to change at line 1627
void setBaseContainerType(const ComplexTypeEntry *baseContainer) void setBaseContainerType(const ComplexTypeEntry *baseContainer)
{ {
m_baseContainerType = baseContainer; m_baseContainerType = baseContainer;
} }
const ComplexTypeEntry* baseContainerType() const const ComplexTypeEntry* baseContainerType() const
{ {
return m_baseContainerType; return m_baseContainerType;
} }
QString defaultConstructor() const;
void setDefaultConstructor(const QString& defaultConstructor);
bool hasDefaultConstructor() const;
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;
 End of changes. 3 change blocks. 
0 lines changed or deleted 7 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/