diff options
author | Eric Hameleers <alien@slackware.com> | 2014-12-22 15:23:54 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2014-12-22 15:23:54 +0100 |
commit | b1b35d20ce6b70330b23a9d056dcb44b58795bd6 (patch) | |
tree | d393ca76dae97b64e8de58184a15f60ca1a7412a /deps/soprano/soprano_tcpclient_stub.diff | |
parent | f0e6e91722ec10bf7aa6a4bf53d1aedd8aee4c74 (diff) | |
download | ktown-b1b35d20ce6b70330b23a9d056dcb44b58795bd6.tar.gz ktown-b1b35d20ce6b70330b23a9d056dcb44b58795bd6.tar.xz |
KDE 5 for Slackware current (post-14.1) (16sep2014)5
The KDE 5 Software Compilation no longer exists as such.
The components are now:
- Frameworks 5.2.0
- Plasma 5.0.2
These packages need to be installed on top of the most recent KDE 4.14.x
because Applications tarballs which build on top of Frameworks and
Plasma have not yet been released.
Diffstat (limited to '')
-rw-r--r-- | deps/soprano/soprano_tcpclient_stub.diff | 196 |
1 files changed, 0 insertions, 196 deletions
diff --git a/deps/soprano/soprano_tcpclient_stub.diff b/deps/soprano/soprano_tcpclient_stub.diff deleted file mode 100644 index 2b04f66..0000000 --- a/deps/soprano/soprano_tcpclient_stub.diff +++ /dev/null @@ -1,196 +0,0 @@ -commit ed17a950a9c6f83590fa62cb97e7278ba7f3e234 -Author: Aaron Seigo <aseigo@kde.org> -Date: Wed May 30 10:18:52 2012 +0200 - - restore SC / BC with a stub impl of tcpclient - -diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 2689568..4e73e3c 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -14,6 +14,8 @@ include_directories( - ) - - set(soprano_client_SRC -+ ${soprano_server_SOURCE_DIR}/datastream.cpp -+ tcpclient.cpp - socket.cpp - socketstream.cpp - localsocketclient.cpp -@@ -94,6 +96,7 @@ INSTALL(TARGETS sopranoclient - - install( - FILES -+ tcpclient.h - localsocketclient.h - DESTINATION include/soprano - ) -diff --git a/client/tcpclient.cpp b/client/tcpclient.cpp -index 796ca59..01dce0e 100644 ---- a/client/tcpclient.cpp -+++ b/client/tcpclient.cpp -@@ -33,151 +33,58 @@ Q_DECLARE_METATYPE( QAbstractSocket::SocketError ) - const quint16 Soprano::Client::TcpClient::DEFAULT_PORT = 5000; - - --namespace Soprano { -- namespace Client { -- class TcpClientConnection : public ClientConnection -- { -- public: -- TcpClientConnection( const QHostAddress& address, int port, QObject* parent ); -- ~TcpClientConnection(); -- -- protected: -- QIODevice* newConnection(); -- bool isConnected( QIODevice* ); -- -- private: -- QHostAddress m_address; -- int m_port; -- }; -- -- TcpClientConnection::TcpClientConnection( const QHostAddress& address, int port, QObject* parent ) -- : ClientConnection( parent ), -- m_address( address ), -- m_port( port ) -- { -- } -- -- TcpClientConnection::~TcpClientConnection() -- { -- } -- -- QIODevice* TcpClientConnection::newConnection() -- { -- clearError(); -- -- QTcpSocket* socket = new QTcpSocket; -- socket->connectToHost( m_address, m_port ); -- if ( socket->waitForConnected() ) { -- QObject::connect( socket, SIGNAL(error(QAbstractSocket::SocketError)), -- parent(), SLOT(slotError(QAbstractSocket::SocketError)) ); -- return socket; -- } -- else { -- setError( socket->errorString() ); -- delete socket; -- return 0; -- } -- } -- -- bool TcpClientConnection::isConnected( QIODevice* device ) { -- return device ? ( static_cast<QTcpSocket*>( device )->state() == QAbstractSocket::ConnectedState ) : false; -- } -- } --} -- -- --class Soprano::Client::TcpClient::Private --{ --public: -- Private() -- : connection( 0 ) { -- } -- -- TcpClientConnection* connection; --}; -- -- - Soprano::Client::TcpClient::TcpClient( QObject* parent ) - : QObject( parent ), -- d( new Private() ) -+ d( 0 ) - { -- qRegisterMetaType<QAbstractSocket::SocketError>(); -+ qWarning() << "This class is deprecated, and the implementation is only a stub now. DO NOT USE IT IN YOUR APPLICATION."; - } - - - Soprano::Client::TcpClient::~TcpClient() - { -- disconnect(); -- delete d; -+ //delete d; - } - - - bool Soprano::Client::TcpClient::connect( const QHostAddress& address, int port ) - { -- if ( !isConnected() ) { -- if ( !d->connection ) -- d->connection = new TcpClientConnection( address, port, this ); -- if ( d->connection->connect() && -- d->connection->checkProtocolVersion() ) { -- return true; -- } -- else { -- disconnect(); -- return false; -- } -- } -- else { -- setError( "Already connected" ); -- return false; -- } -+ Q_UNUSED(address) -+ Q_UNUSED(port) -+ return false; - } - - - bool Soprano::Client::TcpClient::isConnected() - { -- return d->connection ? d->connection->isConnected() : false; -+ return false; - } - - - void Soprano::Client::TcpClient::disconnect() - { -- delete d->connection; -- d->connection = 0; - } - - - Soprano::Model* Soprano::Client::TcpClient::createModel( const QString& name, const QList<BackendSetting>& settings ) - { -- if ( d->connection ) { -- int modelId = d->connection->createModel( name, settings ); -- setError( d->connection->lastError() ); -- if ( modelId > 0 ) { -- StorageModel* model = new ClientModel( 0, modelId, d->connection ); -- return model; -- } -- } -- else { -- setError( "Not connected" ); -- } -- -+ Q_UNUSED(name) -+ Q_UNUSED(settings) -+ setError( "Not connected" ); - return 0; - } - - - void Soprano::Client::TcpClient::removeModel( const QString& name ) - { -- if ( d->connection ) { -- d->connection->removeModel( name ); -- setError( d->connection->lastError() ); -- } -- else { -- setError( "Not connected" ); -- } -+ Q_UNUSED(name) -+ setError( "Not connected" ); - } - - - void Soprano::Client::TcpClient::slotError( QAbstractSocket::SocketError error ) - { -+ Q_UNUSED(error) - qDebug() << "Error: " << error; - } - |