apiextractor.h   apiextractor.h 
skipping to change at line 50 skipping to change at line 50
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);
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;
int classCount() const; int classCount() const;
bool run(); bool run();
private: private:
QString m_typeSystemFileName; QString m_typeSystemFileName;
QString m_cppFileName; QString m_cppFileName;
QStringList m_includePaths; QStringList m_includePaths;
AbstractMetaBuilder* m_builder; AbstractMetaBuilder* m_builder;
QString m_logDirectory;
// disable copy // disable copy
ApiExtractor(const ApiExtractor&); ApiExtractor(const ApiExtractor&);
ApiExtractor& operator=(const ApiExtractor&); ApiExtractor& operator=(const ApiExtractor&);
}; };
#endif // APIEXTRACTOR_H #endif // APIEXTRACTOR_H
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 typesystem.h   typesystem.h 
skipping to change at line 1709 skipping to change at line 1709
struct TypeRejection struct TypeRejection
{ {
QString class_name; QString class_name;
QString function_name; QString function_name;
QString field_name; QString field_name;
QString enum_name; QString enum_name;
}; };
class TypeDatabase class TypeDatabase
{ {
public:
TypeDatabase(); TypeDatabase();
TypeDatabase(const TypeDatabase&);
TypeDatabase& operator=(const TypeDatabase&);
public:
static TypeDatabase *instance(); /**
* Return the type system instance.
* \param newInstance This parameter is usefull just for unit testing, b
ecause singletons causes
* too many side effects on unit testing.
*/
static TypeDatabase *instance(bool newInstance = false);
QStringList requiredTargetImports() QStringList requiredTargetImports()
{ {
return m_requiredTargetImports; return m_requiredTargetImports;
} }
void addRequiredTargetImport(const QString &moduleName) void addRequiredTargetImport(const QString &moduleName)
{ {
if (!m_requiredTargetImports.contains(moduleName)) if (!m_requiredTargetImports.contains(moduleName))
m_requiredTargetImports << moduleName; m_requiredTargetImports << moduleName;
 End of changes. 3 change blocks. 
2 lines changed or deleted 10 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/