[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [soprano] /: Disable the TCP client/server support.
From:       Sebastian Trueg <trueg () kde ! org>
Date:       2012-04-30 18:42:40
Message-ID: 20120430184240.A7F4DA60BB () git ! kde ! org
[Download RAW message or body]

Git commit 5dde64227186d405f86bf66256705fbceabcf1e2 by Sebastian Trueg.
Committed on 30/04/2012 at 20:41.
Pushed by trueg into branch 'master'.

Disable the TCP client/server support.

The TCP client/server thingi would have to be ported to the new Socket
class also. Since I do not use it and it has no security anyway I see
no point in doing so.
For now I am leaving the code.

M  +0    -6    test/CMakeLists.txt
M  +5    -0    tools/sopranocmd.cpp

http://commits.kde.org/soprano/5dde64227186d405f86bf66256705fbceabcf1e2

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 204ee50..7b7409b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -170,12 +170,6 @@ if(BUILD_CLUCENE_INDEX)
   add_test(indexmodelmultithreadingtest \
${EXECUTABLE_OUTPUT_PATH}/indexmodelmultithreadingtest)  endif(BUILD_CLUCENE_INDEX)
 
-# Server test
-qt4_automoc(sopranodclienttest sopranodclienttest.cpp)
-add_executable(sopranodclienttest sopranodclienttest.cpp)
-target_link_libraries(sopranodclienttest sopranomodeltest sopranoclient \
                ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY})
-add_test(sopranodclienttest ${EXECUTABLE_OUTPUT_PATH}/sopranodclienttest)
-
 # LocalSocketClient multithreading test
 qt4_automoc(localsocketmultithreadtest localsocketmultithreadingtest.cpp)
 add_executable(localsocketmultithreadtest localsocketmultithreadingtest.cpp)
diff --git a/tools/sopranocmd.cpp b/tools/sopranocmd.cpp
index 3a6c9bf..29c9163 100644
--- a/tools/sopranocmd.cpp
+++ b/tools/sopranocmd.cpp
@@ -757,6 +757,7 @@ int main( int argc, char *argv[] )
 #endif
     if ( args.hasSetting( "port" ) &&
               !args.hasSetting( "backend" ) ) {
+        /*
         QHostAddress host = QHostAddress::LocalHost;
         quint16 port = Soprano::Client::TcpClient::DEFAULT_PORT;
         port = args.getSetting( "port" ).toInt();
@@ -777,6 +778,10 @@ int main( int argc, char *argv[] )
             return 2;
         }
         isRemoteModel = true;
+        */
+        errStream << "TCP client/server support has been disabled in Soprano 2.8 due \
to internal changes" << endl +                  << "and the lack of interest and time \
from the developers." << endl; +        return 1;
     }
     else if ( args.hasSetting( "socket" ) ) {
         QString socketPath = args.getSetting( "socket" );


[prev in list] [next in list] [prev in thread] [next in thread]