From d3c24d241e10ae36e768b93607fd3226c48751c6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Sat, 29 Sep 2012 16:00:04 +0200 Subject: remove tests/auto/network/socket/qlocalsocket/example The programs in the example isn't used in the test. Examples should be in the right directory and be of a certain quality. Change-Id: Id77bd1295efb3387fa54c379eb9c882cdc5b88bd Reviewed-by: Friedemann Kleint Reviewed-by: Shane Kearns --- .../socket/qlocalsocket/example/client/client.pro | 5 -- .../socket/qlocalsocket/example/client/main.cpp | 84 ------------------- .../socket/qlocalsocket/example/example.pro | 3 - .../socket/qlocalsocket/example/server/main.cpp | 97 ---------------------- .../socket/qlocalsocket/example/server/server.pro | 6 -- .../network/socket/qlocalsocket/qlocalsocket.pro | 1 - 6 files changed, 196 deletions(-) delete mode 100644 tests/auto/network/socket/qlocalsocket/example/client/client.pro delete mode 100644 tests/auto/network/socket/qlocalsocket/example/client/main.cpp delete mode 100644 tests/auto/network/socket/qlocalsocket/example/example.pro delete mode 100644 tests/auto/network/socket/qlocalsocket/example/server/main.cpp delete mode 100644 tests/auto/network/socket/qlocalsocket/example/server/server.pro (limited to 'tests') diff --git a/tests/auto/network/socket/qlocalsocket/example/client/client.pro b/tests/auto/network/socket/qlocalsocket/example/client/client.pro deleted file mode 100644 index 16744d3caf..0000000000 --- a/tests/auto/network/socket/qlocalsocket/example/client/client.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += console -QT = core network - -SOURCES += main.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/network/socket/qlocalsocket/example/client/main.cpp b/tests/auto/network/socket/qlocalsocket/example/client/main.cpp deleted file mode 100644 index 1273f06194..0000000000 --- a/tests/auto/network/socket/qlocalsocket/example/client/main.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include -#include -#include - -#include -#include -#include - -#include "qlocalsocket.h" - -#define SOCK_PATH "echo_socket" - -int main(void) -{ - QLocalSocket socket; - socket.connectToServer(SOCK_PATH); - socket.open(QIODevice::ReadWrite); - - printf("Connected.\n"); - char str[100]; - while(printf("> "), fgets(str, 100, stdin), !feof(stdin)) { - if (socket.write(str, strlen(str)) == -1) { - perror("send"); - return EXIT_FAILURE; - } - - int t; - if ((t = socket.read(str, 100)) > 0) { - str[t] = '\0'; - printf("echo> %s", str); - } else { - if (t < 0) - perror("recv"); - else - printf("Server closed connection.\n"); - return EXIT_FAILURE; - } - } - - return EXIT_SUCCESS; -} - diff --git a/tests/auto/network/socket/qlocalsocket/example/example.pro b/tests/auto/network/socket/qlocalsocket/example/example.pro deleted file mode 100644 index 8c678cd05a..0000000000 --- a/tests/auto/network/socket/qlocalsocket/example/example.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = client server - diff --git a/tests/auto/network/socket/qlocalsocket/example/server/main.cpp b/tests/auto/network/socket/qlocalsocket/example/server/main.cpp deleted file mode 100644 index 0328c85bce..0000000000 --- a/tests/auto/network/socket/qlocalsocket/example/server/main.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "qlocalserver.h" -#include "qlocalsocket.h" - -#include -#include - -class EchoServer : public QLocalServer -{ -public: - void incomingConnection(int socketDescriptor) { - QLocalServer::incomingConnection(socketDescriptor); - QLocalSocket *socket = nextPendingConnection(); - socket->open(QIODevice::ReadWrite); - - qDebug() << "server connection"; - - do { - const int Timeout = 5 * 1000; - while (!socket->canReadLine()) { - if (!socket->waitForReadyRead(Timeout)) { - return; - } - } - char str[100]; - int n = socket->readLine(str, 100); - if (n < 0) { - perror("recv"); - break; - } - if (n == 0) - break; - qDebug() << "Read" << str; - if (!qstrcmp(str, "exit")) - qApp->quit(); - - if (socket->write(str, 100) < 0) { - perror("send"); - break; - } - } while (true); - } -}; - -#define SOCK_PATH "echo_socket" - -int main(int argc, char *argv[]) -{ - QCoreApplication application(argc, argv); - - EchoServer echoServer; - echoServer.listen(SOCK_PATH); - - return application.exec(); -} - diff --git a/tests/auto/network/socket/qlocalsocket/example/server/server.pro b/tests/auto/network/socket/qlocalsocket/example/server/server.pro deleted file mode 100644 index 1d1cbd1b91..0000000000 --- a/tests/auto/network/socket/qlocalsocket/example/server/server.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += console - -QT = core network - -SOURCES += main.cpp -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro index 5b86ec9463..fb09dd6adb 100644 --- a/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro +++ b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs SUBDIRS = test # lackey should be moved to the QtScript module -!wince*: SUBDIRS += example -- cgit v1.2.3