abstractmetalang.h   abstractmetalang.h 
skipping to change at line 327 skipping to change at line 327
AbstractMetaType(); AbstractMetaType();
~AbstractMetaType(); ~AbstractMetaType();
QString package() const QString package() const
{ {
return m_typeEntry->targetLangPackage(); return m_typeEntry->targetLangPackage();
} }
QString name() const QString name() const
{ {
return QString(m_typeEntry->targetLangName()).split("::").last(); if (m_name.isNull())
m_name = m_typeEntry->targetLangName().split("::").last();
return m_name;
} }
QString fullName() const QString fullName() const
{ {
return m_typeEntry->qualifiedTargetLangName(); return m_typeEntry->qualifiedTargetLangName();
} }
void setTypeUsagePattern(TypeUsagePattern pattern) void setTypeUsagePattern(TypeUsagePattern pattern)
{ {
m_pattern = pattern; m_pattern = pattern;
} }
skipping to change at line 593 skipping to change at line 595
} }
const AbstractMetaType *originalTemplateType() const const AbstractMetaType *originalTemplateType() const
{ {
return m_originalTemplateType; return m_originalTemplateType;
} }
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_cachedCppSignature;
QString m_originalTypeDescription; QString m_originalTypeDescription;
int m_arrayElementCount; int m_arrayElementCount;
const AbstractMetaType *m_arrayElementType; const AbstractMetaType *m_arrayElementType;
const AbstractMetaType *m_originalTemplateType; const AbstractMetaType *m_originalTemplateType;
TypeUsagePattern m_pattern; TypeUsagePattern m_pattern;
uint m_constant : 1; uint m_constant : 1;
uint m_reference : 1; uint m_reference : 1;
uint m_cppInstantiation : 1; uint m_cppInstantiation : 1;
skipping to change at line 1159 skipping to change at line 1163
} }
void setTypeEntry(FunctionTypeEntry* typeEntry) void setTypeEntry(FunctionTypeEntry* typeEntry)
{ {
m_typeEntry = typeEntry; m_typeEntry = typeEntry;
} }
private: private:
QString m_name; QString m_name;
QString m_originalName; QString m_originalName;
mutable QString m_cachedMinimalSignature; mutable QString m_cachedMinimalSignature;
mutable QString m_cachedSignature;
mutable QString m_cachedModifiedName; mutable QString m_cachedModifiedName;
FunctionTypeEntry* m_typeEntry; FunctionTypeEntry* m_typeEntry;
FunctionType m_functionType; FunctionType m_functionType;
AbstractMetaType *m_type; AbstractMetaType *m_type;
const AbstractMetaClass *m_class; const AbstractMetaClass *m_class;
const AbstractMetaClass *m_implementingClass; const AbstractMetaClass *m_implementingClass;
const AbstractMetaClass *m_declaringClass; const AbstractMetaClass *m_declaringClass;
const AbstractMetaClass *m_interfaceClass; const AbstractMetaClass *m_interfaceClass;
QPropertySpec *m_propertySpec; QPropertySpec *m_propertySpec;
 End of changes. 3 change blocks. 
1 lines changed or deleted 6 lines changed or added


 apiextractor.h   apiextractor.h 
skipping to change at line 52 skipping to change at line 52
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); void setApiVersion(double version);
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;
const AbstractMetaEnum* findAbstractMetaEnum(const TypeEntry* typeEntry ) const; const AbstractMetaEnum* findAbstractMetaEnum(const TypeEntry* typeEntry ) const;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 typedatabase.h   typedatabase.h 
skipping to change at line 183 skipping to change at line 183
return m_apiVersion; return m_apiVersion;
} }
void setApiVersion(double version) void setApiVersion(double version)
{ {
m_apiVersion = version; m_apiVersion = version;
} }
bool supportedApiVersion(double version) const; bool supportedApiVersion(double version) const;
const QStringList& dropTypeEntries() const
{
return m_dropTypeEntries;
}
bool hasDroppedTypeEntries() const
{
return !m_dropTypeEntries.isEmpty();
}
bool shouldDropTypeEntry(const QString& fullTypeName) const;
void setDropTypeEntries(QStringList dropTypeEntries);
private: private:
bool m_suppressWarnings; bool m_suppressWarnings;
TypeEntryHash m_entries; TypeEntryHash m_entries;
SingleTypeEntryHash m_flagsEntries; SingleTypeEntryHash m_flagsEntries;
TemplateEntryHash m_templates; TemplateEntryHash m_templates;
QStringList m_suppressedWarnings; QStringList m_suppressedWarnings;
AddedFunctionList m_globalUserFunctions; AddedFunctionList m_globalUserFunctions;
FunctionModificationList m_functionMods; FunctionModificationList m_functionMods;
QStringList m_requiredTargetImports; QStringList m_requiredTargetImports;
QStringList m_typesystemPaths; QStringList m_typesystemPaths;
QHash<QString, bool> m_parsedTypesystemFiles; QHash<QString, bool> m_parsedTypesystemFiles;
QList<TypeRejection> m_rejections; QList<TypeRejection> m_rejections;
QStringList m_rebuildClasses; QStringList m_rebuildClasses;
double m_apiVersion; double m_apiVersion;
QStringList m_dropTypeEntries;
}; };
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 lines changed or added


 typesystem.h   typesystem.h 
skipping to change at line 112 skipping to change at line 112
QString varName; QString varName;
}; };
struct ArgumentOwner struct ArgumentOwner
{ {
enum Action { enum Action {
Invalid = 0x00, Invalid = 0x00,
Add = 0x01, Add = 0x01,
Remove = 0x02 Remove = 0x02
}; };
ArgumentOwner() : action(ArgumentOwner::Invalid), index(-2) {} enum {
InvalidIndex = -2,
ThisIndex = -1,
ReturnIndex = 0,
FirstArgumentIndex = 1
};
ArgumentOwner() : action(ArgumentOwner::Invalid), index(ArgumentOwner::
InvalidIndex) {}
Action action; Action action;
int index; int index;
}; };
class APIEXTRACTOR_API CodeSnipFragment class APIEXTRACTOR_API CodeSnipFragment
{ {
private: private:
QString m_code; QString m_code;
TemplateInstance *m_instance; TemplateInstance *m_instance;
 End of changes. 1 change blocks. 
1 lines changed or deleted 8 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/