nrl.h   nrl.h 
skipping to change at line 118 skipping to change at line 118
SOPRANO_EXPORT QUrl GraphView(); SOPRANO_EXPORT QUrl GraphView();
/** /**
* http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Ins tanceBase * http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Ins tanceBase
* *
* Represents a named graph containing instance data * Represents a named graph containing instance data
*/ */
SOPRANO_EXPORT QUrl InstanceBase(); SOPRANO_EXPORT QUrl InstanceBase();
/** /**
* http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Dis
cardableInstanceBase
*
* A named graph containing instance data that can be recreated
* by analyzing the original resources. Intended to be used by
* metadata extractors.
*/
SOPRANO_EXPORT QUrl DiscardableInstanceBase();
/**
* http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Inv erseFunctionalProperty * http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Inv erseFunctionalProperty
* *
* A marker class to identify inverse functional properties * A marker class to identify inverse functional properties
*/ */
SOPRANO_EXPORT QUrl InverseFunctionalProperty(); SOPRANO_EXPORT QUrl InverseFunctionalProperty();
/** /**
* http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Kno wledgeBase * http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#Kno wledgeBase
* *
* Represents a named graph containing both schematic and insta nce * Represents a named graph containing both schematic and insta nce
 End of changes. 1 change blocks. 
10 lines changed or deleted 0 lines changed or added


 servercore.h   servercore.h 
skipping to change at line 37 skipping to change at line 37
#include "error.h" #include "error.h"
#include "soprano_export.h" #include "soprano_export.h"
namespace Soprano { namespace Soprano {
class Backend; class Backend;
class Model; class Model;
class BackendSetting; class BackendSetting;
namespace Server { namespace Server {
class ServerCorePrivate;
/** /**
* \class ServerCore servercore.h Soprano/Server/ServerCore * \class ServerCore servercore.h Soprano/Server/ServerCore
* *
* \brief Central %Soprano server class. * \brief Central %Soprano server class.
* *
* The %ServerCore provides a %Soprano server which maintains a set * The %ServerCore provides a %Soprano server which maintains a set
* of named Model instances that can be accessed by clients over * of named Model instances that can be accessed by clients over
* a tcp connection through Server::BackendPlugin. * a tcp connection through Server::BackendPlugin.
* *
* Creating a server is very simple: Either derive from ServerCore or * Creating a server is very simple: Either derive from ServerCore or
skipping to change at line 227 skipping to change at line 224
* *
* Use Client::DBusClient to connect. * Use Client::DBusClient to connect.
* *
* In case Soprano is compiled without D-Bus support this metho d does nothing. * In case Soprano is compiled without D-Bus support this metho d does nothing.
* *
* D-Bus clients will be served in a separate thread. * D-Bus clients will be served in a separate thread.
*/ */
void registerAsDBusObject( const QString& objectPath = QString( ) ); void registerAsDBusObject( const QString& objectPath = QString( ) );
private Q_SLOTS: private Q_SLOTS:
void slotNewTcpConnection();
void slotNewSocketConnection();
void serverConnectionFinished(); void serverConnectionFinished();
protected: protected:
/** /**
* Create a new Model. The default implementation uses the conf igured Backend * Create a new Model. The default implementation uses the conf igured Backend
* with the configured settings to create a new Model. This met hod can be * with the configured settings to create a new Model. This met hod can be
* reimplemented to create specialized Model, for example in co mbination with * reimplemented to create specialized Model, for example in co mbination with
* some FilterModel. * some FilterModel.
* *
* \param settings The settings to use (a reimplementation may choose to ignore the * \param settings The settings to use (a reimplementation may choose to ignore the
* settings.) * settings.)
* *
* \return A newly create Model. * \return A newly create Model.
*/ */
// FIXME: 3.0: this method should be const // FIXME: 3.0: this method should be const
virtual Model* createModel( const QList<BackendSetting>& settin gs ); virtual Model* createModel( const QList<BackendSetting>& settin gs );
private: private:
ServerCorePrivate* const d; class Private;
Private* const d;
Q_PRIVATE_SLOT( d, void _s_localSocketError( QLocalSocket::Loca
lSocketError ) )
Q_PRIVATE_SLOT( d, void _s_tcpSocketError( QAbstractSocket::Soc
ketError ) )
}; };
} }
} }
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 9 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.4.62" #define SOPRANO_VERSION_STRING "2.4.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 4 #define SOPRANO_VERSION_MINOR 4
/// @brief The Soprano release version number at compile time /// @brief The Soprano release version number at compile time
#define SOPRANO_VERSION_RELEASE 62 #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/