| servercore.h | servercore.h | |||
|---|---|---|---|---|
| skipping to change at line 204 | skipping to change at line 204 | |||
| * by it will not emit signals such as Model::statementAdded. A lso no permission handling or | * by it will not emit signals such as Model::statementAdded. A lso no permission handling or | |||
| * any kind of security is implemented at the moment. Thus, if a server is running and is | * any kind of security is implemented at the moment. Thus, if a server is running and is | |||
| * listening on a port, it is open to connections from any clie nt on any computer in the | * listening on a port, it is open to connections from any clie nt on any computer in the | |||
| * network. | * network. | |||
| * | * | |||
| * \return \p true if the server was successfully started, \p f alse otherwise. | * \return \p true if the server was successfully started, \p f alse otherwise. | |||
| */ | */ | |||
| bool listen( quint16 port = DEFAULT_PORT ); | bool listen( quint16 port = DEFAULT_PORT ); | |||
| /** | /** | |||
| * Stops listening on all connections. This includes the local | ||||
| socket | ||||
| * connection, the tcp connection and dbus, depending on which | ||||
| all are listening. | ||||
| * | ||||
| * This does not destroy the internal model | ||||
| */ | ||||
| void stop(); | ||||
| /** | ||||
| * \return The port this server is listening on or 0 if listen has not | * \return The port this server is listening on or 0 if listen has not | |||
| * been called successfully. | * been called successfully. | |||
| * | * | |||
| * \since 2.1 | * \since 2.1 | |||
| */ | */ | |||
| quint16 serverPort() const; | quint16 serverPort() const; | |||
| /** | /** | |||
| * Register the ServerCore as a DBus object. The process needs to be registered | * Register the ServerCore as a DBus object. The process needs to be registered | |||
| * as a DBus service before (QDBusConnection::registerService() ). | * as a DBus service before (QDBusConnection::registerService() ). | |||
| skipping to change at line 227 | skipping to change at line 235 | |||
| * | * | |||
| * 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 serverConnectionFinished(); | void serverConnectionFinished(QObject* obj); | |||
| 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.) | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 11 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.9.0" | #define SOPRANO_VERSION_STRING "2.9.1" | |||
| /// @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 9 | #define SOPRANO_VERSION_MINOR 9 | |||
| /// @brief The Soprano release version number at compile time | /// @brief The Soprano release version number at compile time | |||
| #define SOPRANO_VERSION_RELEASE 0 | #define SOPRANO_VERSION_RELEASE 1 | |||
| /** | /** | |||
| * \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 | |||