abstractmetalang.h   abstractmetalang.h 
skipping to change at line 1300 skipping to change at line 1300
AbstractMetaClass *enclosingClass() const AbstractMetaClass *enclosingClass() const
{ {
return m_class; return m_class;
} }
void setEnclosingClass(AbstractMetaClass *c) void setEnclosingClass(AbstractMetaClass *c)
{ {
m_class = c; m_class = c;
} }
bool isAnonymous() const
{
return m_typeEntry->isAnonymous();
}
private: private:
AbstractMetaEnumValueList m_enumValues; AbstractMetaEnumValueList m_enumValues;
EnumTypeEntry *m_typeEntry; EnumTypeEntry *m_typeEntry;
AbstractMetaClass *m_class; AbstractMetaClass *m_class;
uint m_hasQenumsDeclaration : 1; uint m_hasQenumsDeclaration : 1;
uint m_reserved : 31; uint m_reserved : 31;
}; };
typedef QList<AbstractMetaEnum *> AbstractMetaEnumList; typedef QList<AbstractMetaEnum *> AbstractMetaEnumList;
skipping to change at line 1374 skipping to change at line 1379
m_hasNonPrivateConstructor(false), m_hasNonPrivateConstructor(false),
m_functionsFixed(false), m_functionsFixed(false),
m_hasPrivateDestructor(false), m_hasPrivateDestructor(false),
m_hasProtectedDestructor(false), m_hasProtectedDestructor(false),
m_hasVirtualDestructor(false), m_hasVirtualDestructor(false),
m_forceShellClass(false), m_forceShellClass(false),
m_hasHashFunction(false), m_hasHashFunction(false),
m_hasEqualsOperator(false), m_hasEqualsOperator(false),
m_hasCloneOperator(false), m_hasCloneOperator(false),
m_isTypeAlias(false), m_isTypeAlias(false),
m_hasToStringCapability(false),
m_enclosingClass(0), m_enclosingClass(0),
m_baseClass(0), m_baseClass(0),
m_templateBaseClass(0), m_templateBaseClass(0),
m_extractedInterface(0), m_extractedInterface(0),
m_primaryInterfaceImplementor(0), m_primaryInterfaceImplementor(0),
m_typeEntry(0), m_typeEntry(0),
//m_qDebugStreamFunction(0)
m_stream(false) m_stream(false)
{ {
} }
virtual ~AbstractMetaClass(); virtual ~AbstractMetaClass();
AbstractMetaClass *extractInterface(); AbstractMetaClass *extractInterface();
void fixFunctions(); void fixFunctions();
AbstractMetaFunctionList functions() const AbstractMetaFunctionList functions() const
skipping to change at line 1708 skipping to change at line 1713
void setHasHashFunction(bool on) void setHasHashFunction(bool on)
{ {
m_hasHashFunction = on; m_hasHashFunction = on;
} }
bool hasHashFunction() const bool hasHashFunction() const
{ {
return m_hasHashFunction; return m_hasHashFunction;
} }
#if 0
void setToStringCapability(FunctionModelItem fun)
{
m_qDebugStreamFunction = fun;
}
FunctionModelItem hasToStringCapability() const
{
return m_qDebugStreamFunction;
}
#endif
virtual bool hasDefaultToStringFunction() const; virtual bool hasDefaultToStringFunction() const;
void setHasEqualsOperator(bool on) void setHasEqualsOperator(bool on)
{ {
m_hasEqualsOperator = on; m_hasEqualsOperator = on;
} }
bool hasEqualsOperator() const bool hasEqualsOperator() const
{ {
return m_hasEqualsOperator; return m_hasEqualsOperator;
skipping to change at line 1866 skipping to change at line 1860
void setStream(bool stream) void setStream(bool stream)
{ {
m_stream = stream; m_stream = stream;
} }
bool isStream() const bool isStream() const
{ {
return m_stream; return m_stream;
} }
void setToStringCapability(bool value)
{
m_hasToStringCapability = value;
}
bool hasToStringCapability() const
{
return m_hasToStringCapability;
}
private: private:
uint m_namespace : 1; uint m_namespace : 1;
uint m_qobject : 1; uint m_qobject : 1;
uint m_hasVirtuals : 1; uint m_hasVirtuals : 1;
uint m_isPolymorphic : 1; uint m_isPolymorphic : 1;
uint m_hasNonpublic : 1; uint m_hasNonpublic : 1;
uint m_hasVirtualSlots : 1; uint m_hasVirtualSlots : 1;
uint m_hasNonPrivateConstructor : 1; uint m_hasNonPrivateConstructor : 1;
uint m_functionsFixed : 1; uint m_functionsFixed : 1;
uint m_hasPrivateDestructor : 1; uint m_hasPrivateDestructor : 1;
uint m_hasProtectedDestructor : 1; uint m_hasProtectedDestructor : 1;
uint m_hasVirtualDestructor : 1; uint m_hasVirtualDestructor : 1;
uint m_forceShellClass : 1; uint m_forceShellClass : 1;
uint m_hasHashFunction : 1; uint m_hasHashFunction : 1;
uint m_hasEqualsOperator : 1; uint m_hasEqualsOperator : 1;
uint m_hasCloneOperator : 1; uint m_hasCloneOperator : 1;
uint m_isTypeAlias : 1; uint m_isTypeAlias : 1;
uint m_reserved : 18; uint m_hasToStringCapability : 1;
uint m_reserved : 17;
const AbstractMetaClass *m_enclosingClass; const AbstractMetaClass *m_enclosingClass;
AbstractMetaClass *m_baseClass; AbstractMetaClass *m_baseClass;
const AbstractMetaClass *m_templateBaseClass; const AbstractMetaClass *m_templateBaseClass;
AbstractMetaFunctionList m_functions; AbstractMetaFunctionList m_functions;
AbstractMetaFieldList m_fields; AbstractMetaFieldList m_fields;
AbstractMetaEnumList m_enums; AbstractMetaEnumList m_enums;
AbstractMetaClassList m_interfaces; AbstractMetaClassList m_interfaces;
AbstractMetaClassList m_orphanInterfaces; AbstractMetaClassList m_orphanInterfaces;
AbstractMetaClass *m_extractedInterface; AbstractMetaClass *m_extractedInterface;
 End of changes. 6 change blocks. 
13 lines changed or deleted 17 lines changed or added


 docparser.h   docparser.h 
skipping to change at line 45 skipping to change at line 45
class APIEXTRACTOR_API DocParser class APIEXTRACTOR_API DocParser
{ {
public: public:
DocParser(); DocParser();
virtual ~DocParser(); virtual ~DocParser();
virtual void fillDocumentation(AbstractMetaClass* metaClass) = 0; virtual void fillDocumentation(AbstractMetaClass* metaClass) = 0;
/** /**
* Process and retrieves documentation concerning the entire * Process and retrieves documentation concerning the entire
* module or library. * module or library.
* /return object containing module/library documentation information * \return object containing module/library documentation information
*/ */
virtual Documentation retrieveModuleDocumentation() = 0; virtual Documentation retrieveModuleDocumentation() = 0;
void setDocumentationDataDirectory(const QString& dir) void setDocumentationDataDirectory(const QString& dir)
{ {
m_docDataDir = dir; m_docDataDir = dir;
} }
/** /**
* Informs the location of the XML data generated by the tool * Informs the location of the XML data generated by the tool
* (e.g.: DoxyGen, qdoc) used to extract the library's documentation * (e.g.: DoxyGen, qdoc) used to extract the library's documentation
* comment. * comment.
* /return the path for the directory containing the XML data created * \return the path for the directory containing the XML data created
* from the library's documentation beign parsed. * from the library's documentation beign parsed.
*/ */
QString documentationDataDirectory() const QString documentationDataDirectory() const
{ {
return m_docDataDir; return m_docDataDir;
} }
void setLibrarySourceDirectory(const QString& dir) void setLibrarySourceDirectory(const QString& dir)
{ {
m_libSourceDir = dir; m_libSourceDir = dir;
} }
/** /**
* Informs the location of the library being parsed. The library * Informs the location of the library being parsed. The library
* source code is parsed for the documentation comments. * source code is parsed for the documentation comments.
* /return the path for the directory containing the source code of * \return the path for the directory containing the source code of
* the library beign parsed. * the library beign parsed.
*/ */
QString librarySourceDirectory() const QString librarySourceDirectory() const
{ {
return m_libSourceDir; return m_libSourceDir;
} }
void setPackageName(const QString& packageName) void setPackageName(const QString& packageName)
{ {
m_packageName = packageName; m_packageName = packageName;
} }
/** /**
* Retrieves the name of the package (or module or library) being par sed. * Retrieves the name of the package (or module or library) being par sed.
* /return the name of the package (module/library) being parsed * \return the name of the package (module/library) being parsed
*/ */
QString packageName() const QString packageName() const
{ {
return m_packageName; return m_packageName;
} }
/**
* Process and retrieves documentation concerning the entire
* module or library.
* \param name module name
* \return object containing module/library documentation information
* \todo Merge with retrieveModuleDocumentation() on next ABI change.
*/
virtual Documentation retrieveModuleDocumentation(const QString& name)
= 0;
protected: protected:
QString getDocumentation(QXmlQuery& xquery, const QString& query, QString getDocumentation(QXmlQuery& xquery, const QString& query,
const DocModificationList& mods) const; const DocModificationList& mods) const;
private: private:
QString m_packageName; QString m_packageName;
QString m_docDataDir; QString m_docDataDir;
QString m_libSourceDir; QString m_libSourceDir;
QString execXQuery(QXmlQuery& xquery, const QString& query) const; QString execXQuery(QXmlQuery& xquery, const QString& query) const;
 End of changes. 5 change blocks. 
4 lines changed or deleted 14 lines changed or added


 qtdocparser.h   qtdocparser.h 
skipping to change at line 35 skipping to change at line 35
#define QTDOCPARSER_H #define QTDOCPARSER_H
#include "docparser.h" #include "docparser.h"
class APIEXTRACTOR_API QtDocParser : public DocParser class APIEXTRACTOR_API QtDocParser : public DocParser
{ {
public: public:
QtDocParser() {} QtDocParser() {}
virtual void fillDocumentation(AbstractMetaClass* metaClass); virtual void fillDocumentation(AbstractMetaClass* metaClass);
virtual Documentation retrieveModuleDocumentation(); virtual Documentation retrieveModuleDocumentation();
virtual Documentation retrieveModuleDocumentation(const QString& name);
}; };
#endif // QTDOCPARSER_H #endif // QTDOCPARSER_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 typesystem.h   typesystem.h 
skipping to change at line 35 skipping to change at line 35
#define TYPESYSTEM_H #define TYPESYSTEM_H
#include <QtCore/QHash> #include <QtCore/QHash>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include "apiextractormacros.h" #include "apiextractormacros.h"
#include "include.h" #include "include.h"
//Used to identify the conversion rule to avoid break API
#define TARGET_CONVERSION_RULE_FLAG "0"
#define NATIVE_CONVERSION_RULE_FLAG "1"
class Indentor; class Indentor;
class AbstractMetaType; class AbstractMetaType;
class QTextStream; class QTextStream;
class EnumTypeEntry; class EnumTypeEntry;
class FlagsTypeEntry; class FlagsTypeEntry;
typedef QMap<int, QString> ArgumentMap; typedef QMap<int, QString> ArgumentMap;
skipping to change at line 913 skipping to change at line 917
Include include() const Include include() const
{ {
return m_include; return m_include;
} }
void setInclude(const Include &inc) void setInclude(const Include &inc)
{ {
m_include = inc; m_include = inc;
} }
// Replace conversionRule arg to CodeSnip in future version
/// Set the type convertion rule /// Set the type convertion rule
void setConversionRule(const QString& conversionRule) void setConversionRule(const QString& conversionRule)
{ {
m_conversionRule = conversionRule; m_conversionRule = conversionRule;
} }
/// Returns the type convertion rule /// Returns the type convertion rule
QString conversionRule() const QString conversionRule() const
{ {
return m_conversionRule; //skip conversions flag
return m_conversionRule.mid(1);
} }
/// Returns true if there are any conversiton rule for this type, false otherwise. /// Returns true if there are any conversiton rule for this type, false otherwise.
bool hasConversionRule() const bool hasConversionRule() const
{ {
return !m_conversionRule.isEmpty(); return !m_conversionRule.isEmpty();
} }
double version() const double version() const
{ {
return m_version; return m_version;
} }
bool hasNativeConversionRule() const
{
return m_conversionRule.startsWith(NATIVE_CONVERSION_RULE_FLAG);
}
bool hasTargetConversionRule() const
{
return m_conversionRule.startsWith(TARGET_CONVERSION_RULE_FLAG);
}
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;
skipping to change at line 1262 skipping to change at line 1278
bool forceInteger() const bool forceInteger() const
{ {
return m_forceInteger; return m_forceInteger;
} }
void setForceInteger(bool force) void setForceInteger(bool force)
{ {
m_forceInteger = force; m_forceInteger = force;
} }
bool isAnonymous() const
{
return m_anonymous;
}
void setAnonymous(bool anonymous)
{
m_anonymous = anonymous;
}
private: private:
QString m_packageName; QString m_packageName;
QString m_qualifier; QString m_qualifier;
QString m_targetLangName; QString m_targetLangName;
QString m_lowerBound; QString m_lowerBound;
QString m_upperBound; QString m_upperBound;
QStringList m_rejectedEnums; QStringList m_rejectedEnums;
QList<EnumValueRedirection> m_enumRedirections; QList<EnumValueRedirection> m_enumRedirections;
FlagsTypeEntry *m_flags; FlagsTypeEntry *m_flags;
bool m_extensible; bool m_extensible;
bool m_forceInteger; bool m_forceInteger;
bool m_anonymous;
}; };
class APIEXTRACTOR_API EnumValueTypeEntry : public TypeEntry class APIEXTRACTOR_API EnumValueTypeEntry : public TypeEntry
{ {
public: public:
EnumValueTypeEntry(const QString& name, const QString& value, const Enu mTypeEntry* enclosingEnum, double vr) EnumValueTypeEntry(const QString& name, const QString& value, const Enu mTypeEntry* enclosingEnum, double vr)
: TypeEntry(name, TypeEntry::EnumValue, vr), m_value(value), m_encl osingEnum(enclosingEnum) : TypeEntry(name, TypeEntry::EnumValue, vr), m_value(value), m_encl osingEnum(enclosingEnum)
{ {
} }
 End of changes. 6 change blocks. 
1 lines changed or deleted 27 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/