summaryrefslogtreecommitdiffstats
path: root/nsplugins/viewer
diff options
context:
space:
mode:
Diffstat (limited to 'nsplugins/viewer')
-rw-r--r--nsplugins/viewer/CMakeLists.txt2
-rw-r--r--nsplugins/viewer/glibevents.cpp2
-rw-r--r--nsplugins/viewer/glibevents.h4
-rw-r--r--nsplugins/viewer/nsplugin.cpp79
-rw-r--r--nsplugins/viewer/nsplugin.h12
-rw-r--r--nsplugins/viewer/qxteventloop.cpp18
-rw-r--r--nsplugins/viewer/qxteventloop.h2
-rw-r--r--nsplugins/viewer/viewer.cpp8
8 files changed, 63 insertions, 64 deletions
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index 08a3778d7..48a71ed80 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -31,6 +31,6 @@ tde_add_executable( nspluginviewer AUTOMOC
../NSPluginCallbackIface.stub NSPluginClassIface.skel
nsplugin.cpp viewer.cpp qxteventloop.cpp
glibevents.cpp
- LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt ${DL_LIBRARIES}
+ LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt ${CMAKE_DL_LIBS}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/nsplugins/viewer/glibevents.cpp b/nsplugins/viewer/glibevents.cpp
index fe059d1ee..e8bc766a1 100644
--- a/nsplugins/viewer/glibevents.cpp
+++ b/nsplugins/viewer/glibevents.cpp
@@ -24,7 +24,7 @@
GlibEvents::GlibEvents()
{
g_main_context_ref( g_main_context_default());
- connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( process()));
+ connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( process()));
// TODO Poll for now
timer.start( 10 );
}
diff --git a/nsplugins/viewer/glibevents.h b/nsplugins/viewer/glibevents.h
index 396273a85..379fc4722 100644
--- a/nsplugins/viewer/glibevents.h
+++ b/nsplugins/viewer/glibevents.h
@@ -26,9 +26,9 @@
#include <glib.h>
class GlibEvents
- : public QWidget
+ : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GlibEvents();
virtual ~GlibEvents();
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 4f3cb3094..5a873c45d 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -49,9 +49,9 @@
#include <tdeio/netaccess.h>
#include <klibloader.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeprotocolmanager.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kurl.h>
@@ -616,7 +616,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs,
memcpy(&_pluginFuncs, pluginFuncs, sizeof(_pluginFuncs));
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+ connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
kdDebug(1431) << "NSPluginInstance::NSPluginInstance" << endl;
kdDebug(1431) << "pdata = " << _npp->pdata << endl;
@@ -809,8 +809,8 @@ void NSPluginInstance::timer()
if (req.post) {
// create stream
NSPluginStream *s = new NSPluginStream( this );
- connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
- TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+ connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+ TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
_streams.append( s );
kdDebug() << "posting to " << url << endl;
@@ -828,8 +828,8 @@ void NSPluginInstance::timer()
} else {
// create stream
NSPluginStream *s = new NSPluginStream( this );
- connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
- TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+ connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+ TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
_streams.append( s );
kdDebug() << "getting " << url << endl;
@@ -1026,8 +1026,8 @@ void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
Request *req = i.data();
_jsrequests.remove( i );
NSPluginStream *s = new NSPluginStream( this );
- connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)),
- TQT_SLOT(streamFinished(NSPluginStreamBase*)) );
+ connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)),
+ TQ_SLOT(streamFinished(NSPluginStreamBase*)) );
_streams.append( s );
int len = result.length();
@@ -1233,7 +1233,7 @@ void NSPluginInstance::gotFocusOut()
// Prevent plugins from polling the keyboard regardless of focus.
static int (*real_xquerykeymap)( Display*, char[32] ) = NULL;
-extern "C" KDE_EXPORT
+extern "C" TDE_EXPORT
int XQueryKeymap( Display* dpy, char k[32] )
{
if( real_xquerykeymap == NULL )
@@ -1254,9 +1254,9 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId,
{
_classes.setAutoDelete( true );
connect(TDEApplication::dcopClient(),
- TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ TQ_SIGNAL(applicationRemoved(const TQCString&)),
this,
- TQT_SLOT(appUnregistered(const TQCString&)));
+ TQ_SLOT(appUnregistered(const TQCString&)));
}
@@ -1323,7 +1323,7 @@ DCOPRef NSPluginViewer::newClass( TQString plugin )
_classes.insert( plugin, cls );
}
- return DCOPRef( kapp->dcopClient()->appId(), cls->objId() );
+ return DCOPRef( tdeApp->dcopClient()->appId(), cls->objId() );
}
@@ -1348,7 +1348,7 @@ NSPluginClass::NSPluginClass( const TQString &library,
_NP_Shutdown = 0;
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) );
+ connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) );
// check lib handle
if (!_handle) {
@@ -1566,7 +1566,7 @@ DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 emb
}
_instances.append( inst );
- return DCOPRef(kapp->dcopClient()->appId(), inst->objId());
+ return DCOPRef(tdeApp->dcopClient()->appId(), inst->objId());
}
@@ -1574,7 +1574,7 @@ void NSPluginClass::destroyInstance( NSPluginInstance* inst )
{
// mark for destruction
_trash.append( inst );
- timer(); //_timer->start( 0, TRUE );
+ timer(); //_timer->start( 0, true );
}
/****************************************************************************/
@@ -1642,7 +1642,7 @@ void NSPluginStreamBase::inform()
// stream into temporary file (use lower() in case the
// filename as an upper case X in it)
_tempFile = new KTempFile;
- _tempFile->setAutoDelete( TRUE );
+ _tempFile->setAutoDelete( true );
_fileURL = _tempFile->name();
kdDebug() << "saving into " << _fileURL << endl;
}
@@ -1832,7 +1832,7 @@ NSPluginBufStream::NSPluginBufStream( class NSPluginInstance *instance )
: NSPluginStreamBase( instance )
{
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) );
+ connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) );
}
@@ -1878,7 +1878,7 @@ NSPluginStream::NSPluginStream( NSPluginInstance *instance )
: NSPluginStreamBase( instance ), _job(0)
{
_resumeTimer = new TQTimer( this );
- connect(_resumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resume()));
+ connect(_resumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resume()));
}
@@ -1902,15 +1902,15 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
if (reload) {
_job->addMetaData("cache", "reload");
}
- connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
- connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
- connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
- TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
- connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
- TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
- connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
- TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+ connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+ connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+ connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+ TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+ connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+ TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+ connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+ TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
}
return false;
@@ -1928,15 +1928,15 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
_job->addMetaData("errorPage", "false");
_job->addMetaData("PropagateHttpHeader", "true");
_job->addMetaData("AllowCompressedPage", "false");
- connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- TQT_SLOT(data(TDEIO::Job *, const TQByteArray &)));
- connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *)));
- connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
- TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
- connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
- TQT_SLOT(mimetype(TDEIO::Job *, const TQString &)));
- connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
- TQT_SLOT(redirection(TDEIO::Job *, const KURL&)));
+ connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ TQ_SLOT(data(TDEIO::Job *, const TQByteArray &)));
+ connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *)));
+ connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )),
+ TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t)));
+ connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+ TQ_SLOT(mimetype(TDEIO::Job *, const TQString &)));
+ connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)),
+ TQ_SLOT(redirection(TDEIO::Job *, const KURL&)));
}
return false;
@@ -1949,7 +1949,7 @@ void NSPluginStream::data(TDEIO::Job * job, const TQByteArray &data)
queue( data );
if ( !pump() ) {
_job->suspend();
- _resumeTimer->start( 100, TRUE );
+ _resumeTimer->start( 100, true );
}
}
@@ -1986,7 +1986,7 @@ void NSPluginStream::resume()
_job->resume();
} else {
kdDebug(1431) << "restart timer" << endl;
- _resumeTimer->start( 100, TRUE );
+ _resumeTimer->start( 100, true );
}
}
@@ -1999,4 +1999,3 @@ void NSPluginStream::result(TDEIO::Job *job)
}
#include "nsplugin.moc"
-// vim: ts=4 sw=4 et
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 96bb1da15..ead4a07e3 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -65,7 +65,7 @@ class TQTimer;
class NSPluginStreamBase : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
friend class NSPluginInstance;
public:
NSPluginStreamBase( class NSPluginInstance *instance );
@@ -115,7 +115,7 @@ private:
class NSPluginStream : public NSPluginStreamBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
NSPluginStream( class NSPluginInstance *instance );
@@ -140,7 +140,7 @@ protected:
class NSPluginBufStream : public NSPluginStreamBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
NSPluginBufStream( class NSPluginInstance *instance );
@@ -159,7 +159,7 @@ protected:
class NSPluginInstance : public TQObject, public virtual NSPluginInstanceIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -275,7 +275,7 @@ private:
class NSPluginClass : public TQObject, virtual public NSPluginClassIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
NSPluginClass( const TQString &library, TQObject *parent, const char *name=0 );
@@ -325,7 +325,7 @@ private:
class NSPluginViewer : public TQObject, virtual public NSPluginViewerIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
NSPluginViewer( TQCString dcopId, TQObject *parent, const char *name=0 );
virtual ~NSPluginViewer();
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index 1f112ba08..b8b4329b2 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -93,8 +93,8 @@ bool QXtEventLoop::redeliverEvent( XEvent *event )
{
// redeliver the event to Xt, NOT through Qt
if ( static_d->dispatchers[ event->type ]( event ) )
- return TRUE;
- return FALSE;
+ return true;
+ return false;
}
@@ -108,7 +108,7 @@ XEvent* QXtEventLoop::lastEvent()
QXtEventLoopPrivate::QXtEventLoopPrivate()
: appContext(NULL), ownContext(NULL),
- activate_timers(FALSE), timerid(0)
+ activate_timers(false), timerid(0)
{
}
@@ -181,18 +181,18 @@ Boolean qmotif_event_dispatcher( XEvent *event )
case EnterNotify:
case LeaveNotify:
event->xcrossing.focus = False;
- delivered = FALSE;
+ delivered = false;
break;
case XKeyPress:
case XKeyRelease:
- delivered = TRUE;
+ delivered = true;
break;
case XFocusIn:
case XFocusOut:
- delivered = FALSE;
+ delivered = false;
break;
default:
- delivered = FALSE;
+ delivered = false;
break;
}
}
@@ -412,7 +412,7 @@ void QXtEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier )
*/
void qmotif_timeout_handler( XtPointer, XtIntervalId * )
{
- static_d->activate_timers = TRUE;
+ static_d->activate_timers = true;
static_d->timerid = 0;
}
@@ -461,7 +461,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
if ( d->activate_timers ) {
nevents += activateTimers();
}
- d->activate_timers = FALSE;
+ d->activate_timers = false;
return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 );
}
diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h
index 230c8a32c..55c5b8698 100644
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@@ -49,7 +49,7 @@ class QXtEventLoopPrivate;
class QXtEventLoop : public TQEventLoop
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index 6007e5b0e..488168b4d 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -152,7 +152,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
#if defined(CHECK_RANGE)
tqWarning( "TQSocketNotifier: Internal error" );
#endif
- return FALSE;
+ return false;
}
XtPointer inpMask = 0;
@@ -161,7 +161,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
case TQSocketNotifier::Read: inpMask = (XtPointer)XtInputReadMask; break;
case TQSocketNotifier::Write: inpMask = (XtPointer)XtInputWriteMask; break;
case TQSocketNotifier::Exception: inpMask = (XtPointer)XtInputExceptMask; break;
- default: return FALSE;
+ default: return false;
}
if (enable) {
@@ -197,13 +197,13 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
while ( sn && !(sn->obj == obj && sn->fd == sockfd) )
sn = _notifiers[type].next();
if ( !sn ) // not found
- return FALSE;
+ return false;
XtRemoveInput( sn->id );
_notifiers[type].remove();
}
- return TRUE;
+ return true;
}
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 13:49:19 +0000