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 --- extensions/nsplugin/examples/grapher/grapher.cpp | 18 +-- extensions/nsplugin/examples/trivial/trivial.cpp | 6 +- extensions/nsplugin/src/ntqnp.h | 186 +++++++++++++++++++++++ extensions/nsplugin/src/qnp.cpp | 30 ++-- extensions/nsplugin/src/qnp.h | 186 ----------------------- extensions/nsplugin/src/qnp.pro | 4 +- 6 files changed, 215 insertions(+), 215 deletions(-) create mode 100644 extensions/nsplugin/src/ntqnp.h delete mode 100644 extensions/nsplugin/src/qnp.h (limited to 'extensions') diff --git a/extensions/nsplugin/examples/grapher/grapher.cpp b/extensions/nsplugin/examples/grapher/grapher.cpp index 305c60e4d..afd444534 100644 --- a/extensions/nsplugin/examples/grapher/grapher.cpp +++ b/extensions/nsplugin/examples/grapher/grapher.cpp @@ -1,15 +1,15 @@ // Include TQt Netscape Plugin classes. -#include "qnp.h" +#include "ntqnp.h" // Include other TQt classes. -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // Include some C library functions. #include diff --git a/extensions/nsplugin/examples/trivial/trivial.cpp b/extensions/nsplugin/examples/trivial/trivial.cpp index ec3660fa6..3223ed741 100644 --- a/extensions/nsplugin/examples/trivial/trivial.cpp +++ b/extensions/nsplugin/examples/trivial/trivial.cpp @@ -1,7 +1,7 @@ // TQt stuff -#include "qnp.h" -#include -#include +#include "ntqnp.h" +#include +#include class Trivial : public TQNPWidget { Q_OBJECT diff --git a/extensions/nsplugin/src/ntqnp.h b/extensions/nsplugin/src/ntqnp.h new file mode 100644 index 000000000..0b34a21e0 --- /dev/null +++ b/extensions/nsplugin/src/ntqnp.h @@ -0,0 +1,186 @@ +/**************************************************************************** +** +** Definition of TQt extension classes for Netscape Plugin support. +** +** Created : 970601 +** +** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. +** +** This file is part of the TQt GUI Toolkit. +** +** 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. +** +** This file may be used under the terms of the Q Public License as +** defined by Trolltech ASA and appearing in the file LICENSE.TQPL +** included in the packaging of this file. 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 TQNP_H +#define TQNP_H + +#ifndef QT_H +#include "ntqwidget.h" +#endif // QT_H + + +struct _NPInstance; +struct _NPStream; +class TQNPInstance; + +class TQNPStream { +public: + ~TQNPStream(); + + const char* url() const; + uint end() const; + uint lastModified() const; + + const char* type() const; + bool seekable() const; + bool okay() const; + bool complete() const; + + void requestRead(int offset, uint length); + int write( int len, void* buffer ); + + TQNPInstance* instance() { return inst; } + TQNPStream(TQNPInstance*,const char*,_NPStream*,bool); + void setOkay(bool); + void setComplete(bool); + +private: + TQNPInstance* inst; + _NPStream* stream; + TQString mtype; + int seek:1; + int isokay:1; + int iscomplete:1; +}; + +class TQNPWidget : public TQWidget { + Q_OBJECT +public: + TQNPWidget(); + ~TQNPWidget(); + void enterEvent(TQEvent*); + void leaveEvent(TQEvent*); + + virtual void enterInstance(); + virtual void leaveInstance(); + + TQNPInstance* instance(); + +private: + _NPInstance* pi; +}; + +class TQNPInstance : public TQObject { + Q_OBJECT +public: + ~TQNPInstance(); + + // Arguments passed to EMBED + int argc() const; + const char* argn(int) const; + const char* argv(int) const; + enum Reason { + ReasonDone = 0, + ReasonBreak = 1, + ReasonError = 2, + ReasonUnknown = -1 + }; + const char* arg(const char* name) const; + enum InstanceMode { Embed=1, Full=2, Background=3 }; + InstanceMode mode() const; + + // The browser's name + const char* userAgent() const; + + // Your window. + virtual TQNPWidget* newWindow(); + TQNPWidget* widget(); + + // Incoming streams (SRC=... tag). + // Defaults ignore data. + enum StreamMode { Normal=1, Seek=2, AsFile=3, AsFileOnly=4 }; + virtual bool newStreamCreated(TQNPStream*, StreamMode& smode); + virtual int writeReady(TQNPStream*); + virtual int write(TQNPStream*, int offset, int len, void* buffer); + virtual void streamDestroyed(TQNPStream*); + + void status(const char* msg); + void getURLNotify(const char* url, const char* window=0, void*data=0); + + void getURL(const char* url, const char* window=0); + void postURL(const char* url, const char* window, + uint len, const char* buf, bool file); + + TQNPStream* newStream(const char* mimetype, const char* window, + bool as_file=FALSE); + virtual void streamAsFile(TQNPStream*, const char* fname); + + void* getJavaPeer() const; + + virtual void notifyURL(const char* url, Reason r, void* notifyData); + virtual bool printFullPage(); + virtual void print(TQPainter*); + +protected: + TQNPInstance(); + +private: + friend class TQNPStream; + _NPInstance* pi; +}; + + +class TQNPlugin { +public: + // Write this to return your TQNPlugin derived class. + static TQNPlugin* create(); + + static TQNPlugin* actual(); + + virtual ~TQNPlugin(); + + void getVersionInfo(int& plugin_major, int& plugin_minor, + int& browser_major, int& browser_minor); + + virtual TQNPInstance* newInstance()=0; + virtual const char* getMIMEDescription() const=0; + virtual const char* getPluginNameString() const=0; + virtual const char* getPluginDescriptionString() const=0; + + virtual void* getJavaClass(); + virtual void unuseJavaClass(); + void* getJavaEnv() const; + +protected: + TQNPlugin(); +}; + + +#endif // TQNP_H diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp index 75e55e848..e26bb9582 100644 --- a/extensions/nsplugin/src/qnp.cpp +++ b/extensions/nsplugin/src/qnp.cpp @@ -68,16 +68,16 @@ // - Provide the "reason" parameter to streamDestroyed // TQt stuff -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "qnp.h" +#include "ntqnp.h" #include // Must be here for Borland C++ #include @@ -751,7 +751,7 @@ BOOL WINAPI DllMain (HANDLE hInst, /*! - \class TQNPWidget qnp.h + \class TQNPWidget ntqnp.h \brief The TQNPWidget class provides a TQWidget that is a web browser plugin window. \extension Netscape Plugin @@ -871,7 +871,7 @@ TQNPInstance* TQNPWidget::instance() /*! - \class TQNPInstance qnp.h + \class TQNPInstance ntqnp.h \brief The TQNPInstance class provides a TQObject that is a web browser plugin. \extension Netscape Plugin @@ -1272,7 +1272,7 @@ void* TQNPInstance::getJavaPeer() const /*! - \class TQNPStream qnp.h + \class TQNPStream ntqnp.h \brief The TQNPStream class provides a stream of data provided to a TQNPInstance by the browser. \extension Netscape Plugin @@ -1422,7 +1422,7 @@ int TQNPStream::write( int len, void* buffer ) /*! - \class TQNPlugin qnp.h + \class TQNPlugin ntqnp.h \brief The TQNPlugin class provides the main factory for plugin objects. \extension Netscape Plugin @@ -1577,8 +1577,8 @@ void* TQNPlugin::getJavaEnv() const #ifdef Q_WS_X11 -#include -#include +#include +#include // resolve the conflict between X11's FocusIn and TQEvent::FocusIn const int XFocusOut = FocusOut; diff --git a/extensions/nsplugin/src/qnp.h b/extensions/nsplugin/src/qnp.h deleted file mode 100644 index 9cfc7d6a0..000000000 --- a/extensions/nsplugin/src/qnp.h +++ /dev/null @@ -1,186 +0,0 @@ -/**************************************************************************** -** -** Definition of TQt extension classes for Netscape Plugin support. -** -** Created : 970601 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the TQt GUI Toolkit. -** -** 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. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.TQPL -** included in the packaging of this file. 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 TQNP_H -#define TQNP_H - -#ifndef QT_H -#include "qwidget.h" -#endif // QT_H - - -struct _NPInstance; -struct _NPStream; -class TQNPInstance; - -class TQNPStream { -public: - ~TQNPStream(); - - const char* url() const; - uint end() const; - uint lastModified() const; - - const char* type() const; - bool seekable() const; - bool okay() const; - bool complete() const; - - void requestRead(int offset, uint length); - int write( int len, void* buffer ); - - TQNPInstance* instance() { return inst; } - TQNPStream(TQNPInstance*,const char*,_NPStream*,bool); - void setOkay(bool); - void setComplete(bool); - -private: - TQNPInstance* inst; - _NPStream* stream; - TQString mtype; - int seek:1; - int isokay:1; - int iscomplete:1; -}; - -class TQNPWidget : public TQWidget { - Q_OBJECT -public: - TQNPWidget(); - ~TQNPWidget(); - void enterEvent(TQEvent*); - void leaveEvent(TQEvent*); - - virtual void enterInstance(); - virtual void leaveInstance(); - - TQNPInstance* instance(); - -private: - _NPInstance* pi; -}; - -class TQNPInstance : public TQObject { - Q_OBJECT -public: - ~TQNPInstance(); - - // Arguments passed to EMBED - int argc() const; - const char* argn(int) const; - const char* argv(int) const; - enum Reason { - ReasonDone = 0, - ReasonBreak = 1, - ReasonError = 2, - ReasonUnknown = -1 - }; - const char* arg(const char* name) const; - enum InstanceMode { Embed=1, Full=2, Background=3 }; - InstanceMode mode() const; - - // The browser's name - const char* userAgent() const; - - // Your window. - virtual TQNPWidget* newWindow(); - TQNPWidget* widget(); - - // Incoming streams (SRC=... tag). - // Defaults ignore data. - enum StreamMode { Normal=1, Seek=2, AsFile=3, AsFileOnly=4 }; - virtual bool newStreamCreated(TQNPStream*, StreamMode& smode); - virtual int writeReady(TQNPStream*); - virtual int write(TQNPStream*, int offset, int len, void* buffer); - virtual void streamDestroyed(TQNPStream*); - - void status(const char* msg); - void getURLNotify(const char* url, const char* window=0, void*data=0); - - void getURL(const char* url, const char* window=0); - void postURL(const char* url, const char* window, - uint len, const char* buf, bool file); - - TQNPStream* newStream(const char* mimetype, const char* window, - bool as_file=FALSE); - virtual void streamAsFile(TQNPStream*, const char* fname); - - void* getJavaPeer() const; - - virtual void notifyURL(const char* url, Reason r, void* notifyData); - virtual bool printFullPage(); - virtual void print(TQPainter*); - -protected: - TQNPInstance(); - -private: - friend class TQNPStream; - _NPInstance* pi; -}; - - -class TQNPlugin { -public: - // Write this to return your TQNPlugin derived class. - static TQNPlugin* create(); - - static TQNPlugin* actual(); - - virtual ~TQNPlugin(); - - void getVersionInfo(int& plugin_major, int& plugin_minor, - int& browser_major, int& browser_minor); - - virtual TQNPInstance* newInstance()=0; - virtual const char* getMIMEDescription() const=0; - virtual const char* getPluginNameString() const=0; - virtual const char* getPluginDescriptionString() const=0; - - virtual void* getJavaClass(); - virtual void unuseJavaClass(); - void* getJavaEnv() const; - -protected: - TQNPlugin(); -}; - - -#endif // TQNP_H diff --git a/extensions/nsplugin/src/qnp.pro b/extensions/nsplugin/src/qnp.pro index 1aedef531..60cc240e8 100644 --- a/extensions/nsplugin/src/qnp.pro +++ b/extensions/nsplugin/src/qnp.pro @@ -7,8 +7,8 @@ DESTDIR = ../../../lib VERSION = 0.4 SOURCES = qnp.cpp -unix:HEADERS += qnp.h -win32:HEADERS = ../../../include/qnp.h +unix:HEADERS += ntqnp.h +win32:HEADERS = ../../../include/ntqnp.h win32:LIBS += -lqtmain MOC_DIR = . DESTINCDIR = ../../../include -- cgit v1.2.1