From ea318d1431c89e647598c510c4245c6571aa5f46 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 26 Jan 2012 23:32:43 -0600 Subject: Update to latest tqt3 automated conversion --- tools/assistant/lib/lib.pro | 2 +- tools/assistant/lib/ntqassistantclient.h | 80 ++++++++++++++++++++++++++++++++ tools/assistant/lib/qassistantclient.cpp | 12 ++--- tools/assistant/lib/qassistantclient.h | 80 -------------------------------- 4 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 tools/assistant/lib/ntqassistantclient.h delete mode 100644 tools/assistant/lib/qassistantclient.h (limited to 'tools/assistant/lib') diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro index 09beced51..af1b1c6ce 100644 --- a/tools/assistant/lib/lib.pro +++ b/tools/assistant/lib/lib.pro @@ -7,7 +7,7 @@ CONFIG += staticlib CONFIG -= dll SOURCES = qassistantclient.cpp -HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h +HEADERS += $$QT_SOURCE_TREE/include/ntqassistantclient.h DEFINES += QT_INTERNAL_NETWORK diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h new file mode 100644 index 000000000..28fd6693e --- /dev/null +++ b/tools/assistant/lib/ntqassistantclient.h @@ -0,0 +1,80 @@ +/********************************************************************** +** Copyright (C) 2005-2008 Trolltech ASA. All rights reserved. +** +** This file is part of the TQAssistantClient library. +** +** This file may be used under the terms of the GNU General +** Public License versions 2.0 or 3.0 as published by the Free +** Software Foundation and appearing in the files LICENSE.GPL2 +** and LICENSE.GPL3 included in the packaging of this file. +** Alternatively you may (at your option) use any later version +** of the GNU General Public License if such license has been +** publicly approved by Trolltech ASA (or its successors, if any) +** and the KDE Free TQt Foundation. +** +** Please review the following information to ensure GNU General +** Public Licensing requirements will be met: +** http://trolltech.com/products/qt/licenses/licensing/opensource/. +** If you are unsure which license is appropriate for your use, please +** review the following information: +** http://trolltech.com/products/qt/licenses/licensing/licensingoverview +** or contact the sales department at sales@trolltech.com. +** +** Licensees holding valid TQt Commercial licenses may use this file in +** accordance with the TQt Commercial License Agreement provided with +** the Software. +** +** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, +** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted +** herein. +** +**********************************************************************/ + +#ifndef TQASSISTANTCLIENT_H +#define TQASSISTANTCLIENT_H + +#include + +class TQSocket; +class TQProcess; + +class TQAssistantClient : public TQObject +{ + Q_OBJECT + Q_PROPERTY( bool open READ isOpen ) + +public: + TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 ); + ~TQAssistantClient(); + + bool isOpen() const; + + void setArguments( const TQStringList &args ); + +public slots: + virtual void openAssistant(); + virtual void closeAssistant(); + virtual void showPage( const TQString &page ); + +signals: + void assistantOpened(); + void assistantClosed(); + void error( const TQString &msg ); + +private slots: + void socketConnected(); + void socketConnectionClosed(); + void readPort(); + void socketError( int ); + void readStdError(); + +private: + TQSocket *socket; + TQProcess *proc; + Q_UINT16 port; + TQString host, assistantCommand, pageBuffer; + bool opened; +}; + +#endif diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp index d6acac3c9..b0fc0df39 100644 --- a/tools/assistant/lib/qassistantclient.cpp +++ b/tools/assistant/lib/qassistantclient.cpp @@ -31,13 +31,13 @@ ** **********************************************************************/ -#include "qassistantclient.h" +#include "ntqassistantclient.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include class TQAssistantClientPrivate { diff --git a/tools/assistant/lib/qassistantclient.h b/tools/assistant/lib/qassistantclient.h deleted file mode 100644 index 891dc1bab..000000000 --- a/tools/assistant/lib/qassistantclient.h +++ /dev/null @@ -1,80 +0,0 @@ -/********************************************************************** -** Copyright (C) 2005-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the TQAssistantClient library. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQASSISTANTCLIENT_H -#define TQASSISTANTCLIENT_H - -#include - -class TQSocket; -class TQProcess; - -class TQAssistantClient : public TQObject -{ - Q_OBJECT - Q_PROPERTY( bool open READ isOpen ) - -public: - TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 ); - ~TQAssistantClient(); - - bool isOpen() const; - - void setArguments( const TQStringList &args ); - -public slots: - virtual void openAssistant(); - virtual void closeAssistant(); - virtual void showPage( const TQString &page ); - -signals: - void assistantOpened(); - void assistantClosed(); - void error( const TQString &msg ); - -private slots: - void socketConnected(); - void socketConnectionClosed(); - void readPort(); - void socketError( int ); - void readStdError(); - -private: - TQSocket *socket; - TQProcess *proc; - Q_UINT16 port; - TQString host, assistantCommand, pageBuffer; - bool opened; -}; - -#endif -- cgit v1.2.3