summaryrefslogtreecommitdiffstats
path: root/nsplugins/viewer/nsplugin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'nsplugins/viewer/nsplugin.cpp')
-rw-r--r--nsplugins/viewer/nsplugin.cpp78
1 files changed, 39 insertions, 39 deletions
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 5b6b9267f..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 );
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 05:00:05 +0000