error.h   error.h 
skipping to change at line 46 skipping to change at line 46
* *
* \sa Error::Error::code(), Error::convertErrorCode * \sa Error::Error::code(), Error::convertErrorCode
*/ */
enum ErrorCode { enum ErrorCode {
ErrorNone = 0x0, /**< No error occured, i.e. succes s. */ ErrorNone = 0x0, /**< No error occured, i.e. succes s. */
ErrorInvalidArgument = 0x1, /**< Error indicating that a metho d argument was invalid. For example an invalid Statement in Model::addState ment(). */ ErrorInvalidArgument = 0x1, /**< Error indicating that a metho d argument was invalid. For example an invalid Statement in Model::addState ment(). */
ErrorInvalidStatement = ErrorInvalidArgument, /**< \deprecated: use ErrorInvalidArgument */ ErrorInvalidStatement = ErrorInvalidArgument, /**< \deprecated: use ErrorInvalidArgument */
ErrorNotSupported = 0x2, /**< Error indicating that a certa in functionality is not supported. */ ErrorNotSupported = 0x2, /**< Error indicating that a certa in functionality is not supported. */
ErrorParsingFailed = 0x3, /**< Parsing a query or an RDF ser ialization failed. */ ErrorParsingFailed = 0x3, /**< Parsing a query or an RDF ser ialization failed. */
ErrorPermissionDenied = 0x4, /**< Permission is denied. \since 2.1 */ ErrorPermissionDenied = 0x4, /**< Permission is denied. \since 2.1 */
ErrorTimeout = 0x5, /**< The command timed out. \since 2.7.4 */
ErrorUnknown = 0x1000 /**< An unknown error occured. */ ErrorUnknown = 0x1000 /**< An unknown error occured. */
}; };
/** /**
* Translate an error code into a human-readable error message. * Translate an error code into a human-readable error message.
*/ */
SOPRANO_EXPORT QString errorMessage( ErrorCode ); SOPRANO_EXPORT QString errorMessage( ErrorCode );
/** /**
* Converts a plain error code (as for example used in Error::code( )) * Converts a plain error code (as for example used in Error::code( ))
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 version.h   version.h 
skipping to change at line 28 skipping to change at line 28
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _SOPRANO_VERSION_H_ #ifndef _SOPRANO_VERSION_H_
#define _SOPRANO_VERSION_H_ #define _SOPRANO_VERSION_H_
#include "soprano_export.h" #include "soprano_export.h"
/// @brief Soprano version as string at compile time. /// @brief Soprano version as string at compile time.
#define SOPRANO_VERSION_STRING "2.7.3" #define SOPRANO_VERSION_STRING "2.7.4"
/// @brief The major Soprano version number at compile time /// @brief The major Soprano version number at compile time
#define SOPRANO_VERSION_MAJOR 2 #define SOPRANO_VERSION_MAJOR 2
/// @brief The minor Soprano version number at compile time /// @brief The minor Soprano version number at compile time
#define SOPRANO_VERSION_MINOR 7 #define SOPRANO_VERSION_MINOR 7
/// @brief The Soprano release version number at compile time /// @brief The Soprano release version number at compile time
#define SOPRANO_VERSION_RELEASE 3 #define SOPRANO_VERSION_RELEASE 4
/** /**
* \brief Create a unique number from the major, minor and release number o f a %Soprano version * \brief Create a unique number from the major, minor and release number o f a %Soprano version
* *
* This function can be used for preprocessing. For version information at runtime * This function can be used for preprocessing. For version information at runtime
* use the version methods in the Soprano namespace. * use the version methods in the Soprano namespace.
*/ */
#define SOPRANO_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define SOPRANO_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/