summaryrefslogtreecommitdiffstats
path: root/deps/soprano/soprano_tcpclient_stub.diff
blob: 2b04f668033bcfdfcf331e696f11543369352f2e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
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;
 }