summaryrefslogtreecommitdiffstats
path: root/nsplugins
diff options
context:
space:
mode:
Diffstat (limited to 'nsplugins')
-rw-r--r--nsplugins/README4
-rw-r--r--nsplugins/kcm_nsplugins.cpp4
-rw-r--r--nsplugins/nspluginloader.cpp14
-rw-r--r--nsplugins/nspluginloader.h4
-rw-r--r--nsplugins/plugin_part.cpp8
-rw-r--r--nsplugins/plugin_part.h8
-rw-r--r--nsplugins/sdk/jni_md.h2
-rw-r--r--nsplugins/sdk/jri.h1
-rw-r--r--nsplugins/sdk/jri_md.h1
-rw-r--r--nsplugins/sdk/jritypes.h1
-rw-r--r--nsplugins/sdk/npapi.h1
-rw-r--r--nsplugins/sdk/npruntime.h1
-rw-r--r--nsplugins/sdk/npupp.h1
-rw-r--r--nsplugins/sdk/obsolete/protypes.h1
-rw-r--r--nsplugins/sdk/prcpucfg.h93
-rw-r--r--nsplugins/sdk/prtypes.h1
-rw-r--r--nsplugins/test/testnsplugin.cpp10
-rw-r--r--nsplugins/test/testnsplugin.h2
-rw-r--r--nsplugins/viewer/glibevents.cpp2
-rw-r--r--nsplugins/viewer/glibevents.h4
-rw-r--r--nsplugins/viewer/nsplugin.cpp61
-rw-r--r--nsplugins/viewer/nsplugin.h12
-rw-r--r--nsplugins/viewer/qxteventloop.h2
23 files changed, 159 insertions, 79 deletions
diff --git a/nsplugins/README b/nsplugins/README
index d465ddc24..769b3ee08 100644
--- a/nsplugins/README
+++ b/nsplugins/README
@@ -79,11 +79,11 @@ it can be resized, focused and unfocused with standard X11 functions
as long as we know its' window ID.
PluginPart gets a NSPluginInstance (from NSPluginLoader::newInstance),
-which it sees as a regular QWidget. e.g. it can resize the QWidget and
+which it sees as a regular TQWidget. e.g. it can resize the TQWidget and
nspluginviewer's window will resize.
This magic happens thanks to KJavaEmbed which NSPluginInstance inherits.
-KJavaEmbed inherits QWidget and hooks up to QWidget's events, mapping
+KJavaEmbed inherits TQWidget and hooks up to TQWidget's events, mapping
those events to the appropriate X11 window operations.
Resizing, focusing in and out is about all PluginPart could ever do
with the nspluginviewer.
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 037798cb2..da6c5d780 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -69,9 +69,9 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
TQDateTime current = lastChanged( *it );
// store non-existent directory as "N" string rather than empty string, TDEConfig
// has a bug with storing a list of empty items
- if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate ))
+ if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, TQt::ISODate ))
changed = true;
- currentTimestamps.append( current.isNull() ? "N" : current.toString( Qt::ISODate ));
+ currentTimestamps.append( current.isNull() ? "N" : current.toString( TQt::ISODate ));
}
if( changed )
{
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 8c9e6fe2c..2df8ed163 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -69,7 +69,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
if (cfg.readBoolEntry("demandLoad", false)) {
_button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
_layout->addWidget(_button, 0, 0);
- connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin()));
+ connect(_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadPlugin()));
show();
} else {
_button = 0L;
@@ -80,7 +80,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
// and use 'resize_count' to wait for that one more resize to come (plus a timer
// for a possible timeout). Only then flash is actually initialized ('inited' is true).
resize_count = 1;
- TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin()));
+ TQTimer::singleShot( 1000, this, TQ_SLOT( doLoadPlugin()));
}
}
@@ -203,8 +203,8 @@ NSPluginLoader::NSPluginLoader()
// trap dcop register events
kapp->dcopClient()->setNotifications(true);
TQObject::connect(kapp->dcopClient(),
- TQT_SIGNAL(applicationRegistered(const TQCString&)),
- this, TQT_SLOT(applicationRegistered(const TQCString&)));
+ TQ_SIGNAL(applicationRegistered(const TQCString&)),
+ this, TQ_SLOT(applicationRegistered(const TQCString&)));
// load configuration
TDEConfig cfg("kcmnspluginrc", false);
@@ -337,8 +337,8 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType)
int pid = (int)getpid();
_dcopid.sprintf("nspluginviewer-%d", pid);
- connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(processTerminated(TDEProcess*)) );
+ connect( _process, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(processTerminated(TDEProcess*)) );
// find the external viewer process
TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer");
@@ -524,5 +524,3 @@ NSPluginInstance *NSPluginLoader::newInstance(TQWidget *parent, TQString url,
return plugin;
}
-
-// vim: ts=4 sw=4 et
diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h
index 988697848..a0c55c00a 100644
--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@@ -45,7 +45,7 @@ class TQGridLayout;
class NSPluginInstance : public EMBEDCLASS
{
- Q_OBJECT
+ TQ_OBJECT
public:
NSPluginInstance(TQWidget *parent);
@@ -80,7 +80,7 @@ private: // wrappers
class NSPluginLoader : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
NSPluginLoader();
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 99cbc780f..3e5530f3a 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -217,7 +217,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
// Only create this if we have no parent since the parent part is
// responsible for "Save As" then
if (!parent || !parent->inherits("Part")) {
- new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument");
+ new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQ_SLOT(saveAs()), actionCollection(), "saveDocument");
setXMLFile("nspluginpart.rc");
}
@@ -228,12 +228,12 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
// create a canvas to insert our widget
_canvas = new PluginCanvasWidget( parentWidget, widgetName );
//_canvas->setFocusPolicy( TQWidget::ClickFocus );
- _canvas->setFocusPolicy( TQ_WheelFocus );
+ _canvas->setFocusPolicy( TQWidget::WheelFocus );
_canvas->setBackgroundMode( TQWidget::NoBackground );
setWidget(_canvas);
_canvas->show();
- TQObject::connect( _canvas, TQT_SIGNAL(resized(int,int)),
- this, TQT_SLOT(pluginResized(int,int)) );
+ TQObject::connect( _canvas, TQ_SIGNAL(resized(int,int)),
+ this, TQ_SLOT(pluginResized(int,int)) );
}
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index f3fa68984..e124aabd0 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -61,7 +61,7 @@ private:
class PluginFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
PluginFactory();
@@ -84,7 +84,7 @@ private:
class PluginCanvasWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PluginCanvasWidget(TQWidget *parent=0, const char *name=0)
@@ -100,7 +100,7 @@ signals:
class PluginPart: public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
const char *name, const TQStringList &args = TQStringList());
@@ -137,7 +137,7 @@ private:
class PluginLiveConnectExtension : public KParts::LiveConnectExtension
{
-Q_OBJECT
+TQ_OBJECT
public:
PluginLiveConnectExtension(PluginPart* part);
virtual ~PluginLiveConnectExtension();
diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h
index c0aa11159..58738bbd0 100644
--- a/nsplugins/sdk/jni_md.h
+++ b/nsplugins/sdk/jni_md.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h
index f29945b94..d80654f6b 100644
--- a/nsplugins/sdk/jri.h
+++ b/nsplugins/sdk/jri.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index 5ae741ed3..8234addd4 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/jritypes.h b/nsplugins/sdk/jritypes.h
index ddeb6331c..ed7769be7 100644
--- a/nsplugins/sdk/jritypes.h
+++ b/nsplugins/sdk/jritypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h
index 16c71b97a..18992ae0d 100644
--- a/nsplugins/sdk/npapi.h
+++ b/nsplugins/sdk/npapi.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h
index 45f3f0a9a..b5d656352 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright � 2004, Apple Computer, Inc. and The Mozilla Foundation.
* All rights reserved.
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index dff545d9f..769897dc6 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h
index e96cfcf67..5d9190aa2 100644
--- a/nsplugins/sdk/obsolete/protypes.h
+++ b/nsplugins/sdk/obsolete/protypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
diff --git a/nsplugins/sdk/prcpucfg.h b/nsplugins/sdk/prcpucfg.h
index a8dd53fa1..71fd9f658 100644
--- a/nsplugins/sdk/prcpucfg.h
+++ b/nsplugins/sdk/prcpucfg.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@@ -650,6 +649,98 @@
#define PR_BYTES_PER_WORD_LOG2 3
#define PR_BYTES_PER_DWORD_LOG2 3
+#elif defined(__riscv) && (__riscv_xlen == 32)
+
+#undef IS_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#undef IS_64
+
+#define PR_BYTES_PER_BYTE 1
+#define PR_BYTES_PER_SHORT 2
+#define PR_BYTES_PER_INT 4
+#define PR_BYTES_PER_INT64 8
+#define PR_BYTES_PER_LONG 4
+#define PR_BYTES_PER_FLOAT 4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD 4
+#define PR_BYTES_PER_DWORD 8
+
+#define PR_BITS_PER_BYTE 8
+#define PR_BITS_PER_SHORT 16
+#define PR_BITS_PER_INT 32
+#define PR_BITS_PER_INT64 64
+#define PR_BITS_PER_LONG 32
+#define PR_BITS_PER_FLOAT 32
+#define PR_BITS_PER_DOUBLE 64
+#define PR_BITS_PER_WORD 32
+
+#define PR_BITS_PER_BYTE_LOG2 3
+#define PR_BITS_PER_SHORT_LOG2 4
+#define PR_BITS_PER_INT_LOG2 5
+#define PR_BITS_PER_INT64_LOG2 6
+#define PR_BITS_PER_LONG_LOG2 5
+#define PR_BITS_PER_FLOAT_LOG2 5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2 5
+
+#define PR_ALIGN_OF_SHORT 2
+#define PR_ALIGN_OF_INT 4
+#define PR_ALIGN_OF_LONG 4
+#define PR_ALIGN_OF_INT64 8
+#define PR_ALIGN_OF_FLOAT 4
+#define PR_ALIGN_OF_DOUBLE 8
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD 4
+
+#define PR_BYTES_PER_WORD_LOG2 2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
+#elif defined(__riscv) && (__riscv_xlen == 64)
+
+#undef IS_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#define IS_64
+
+#define PR_BYTES_PER_BYTE 1
+#define PR_BYTES_PER_SHORT 2
+#define PR_BYTES_PER_INT 4
+#define PR_BYTES_PER_INT64 8
+#define PR_BYTES_PER_LONG 8
+#define PR_BYTES_PER_FLOAT 4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD 8
+#define PR_BYTES_PER_DWORD 8
+
+#define PR_BITS_PER_BYTE 8
+#define PR_BITS_PER_SHORT 16
+#define PR_BITS_PER_INT 32
+#define PR_BITS_PER_INT64 64
+#define PR_BITS_PER_LONG 64
+#define PR_BITS_PER_FLOAT 32
+#define PR_BITS_PER_DOUBLE 64
+#define PR_BITS_PER_WORD 64
+
+#define PR_BITS_PER_BYTE_LOG2 3
+#define PR_BITS_PER_SHORT_LOG2 4
+#define PR_BITS_PER_INT_LOG2 5
+#define PR_BITS_PER_INT64_LOG2 6
+#define PR_BITS_PER_LONG_LOG2 6
+#define PR_BITS_PER_FLOAT_LOG2 5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2 6
+
+#define PR_ALIGN_OF_SHORT 2
+#define PR_ALIGN_OF_INT 4
+#define PR_ALIGN_OF_LONG 8
+#define PR_ALIGN_OF_INT64 8
+#define PR_ALIGN_OF_FLOAT 4
+#define PR_ALIGN_OF_DOUBLE 8
+#define PR_ALIGN_OF_POINTER 8
+#define PR_ALIGN_OF_WORD 8
+
+#define PR_BYTES_PER_WORD_LOG2 3
+#define PR_BYTES_PER_DWORD_LOG2 3
+
#else
#error "Unknown CPU architecture"
diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h
index b68361082..842013ee8 100644
--- a/nsplugins/sdk/prtypes.h
+++ b/nsplugins/sdk/prtypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index daccd1bcf..7ac24ee2c 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -44,9 +44,9 @@ TestNSPlugin::TestNSPlugin()
m_layout = new TQHBoxLayout( m_client );
// file menu
- KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection());
- KStdAction::close( this, TQT_SLOT(closeView()), actionCollection());
- KStdAction::quit( kapp, TQT_SLOT(quit()), actionCollection());
+ KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection());
+ KStdAction::close( this, TQ_SLOT(closeView()), actionCollection());
+ KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection());
createGUI( "testnspluginui.rc" );
}
@@ -88,8 +88,8 @@ void TestNSPlugin::newView()
if ( win )
{
m_plugins.append( win );
- connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)),
- this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) );
+ connect( win, TQ_SIGNAL(destroyed(NSPluginInstance *)),
+ this, TQ_SLOT(viewDestroyed(NSPluginInstance *)) );
m_layout->addWidget( win );
win->show();
} else
diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 252cea2c8..3c1b2bdc3 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -34,7 +34,7 @@ class NSPluginInstance;
class TestNSPlugin : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
TestNSPlugin();
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..2495556e4 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -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();
@@ -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&)));
}
@@ -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) {
@@ -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;
@@ -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.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:
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 13:43:24 +0000