summaryrefslogtreecommitdiffstats
path: root/tdehtml/java
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/java')
-rw-r--r--tdehtml/java/kjavaapplet.h2
-rw-r--r--tdehtml/java/kjavaappletcontext.cpp2
-rw-r--r--tdehtml/java/kjavaappletcontext.h2
-rw-r--r--tdehtml/java/kjavaappletserver.cpp24
-rw-r--r--tdehtml/java/kjavaappletserver.h4
-rw-r--r--tdehtml/java/kjavaappletviewer.cpp18
-rw-r--r--tdehtml/java/kjavaappletviewer.h10
-rw-r--r--tdehtml/java/kjavaappletwidget.cpp12
-rw-r--r--tdehtml/java/kjavaappletwidget.h4
-rw-r--r--tdehtml/java/kjavadownloader.cpp24
-rw-r--r--tdehtml/java/kjavadownloader.h6
-rw-r--r--tdehtml/java/kjavaprocess.cpp16
-rw-r--r--tdehtml/java/kjavaprocess.h8
13 files changed, 66 insertions, 66 deletions
diff --git a/tdehtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h
index bb4b20890..dd13100f7 100644
--- a/tdehtml/java/kjavaapplet.h
+++ b/tdehtml/java/kjavaapplet.h
@@ -48,7 +48,7 @@ class KJavaAppletPrivate;
class KJavaApplet : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
// states describing the life cycle of an applet.
diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index b644b67ca..6d8af4667 100644
--- a/tdehtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -54,7 +54,7 @@ KJavaAppletContext::KJavaAppletContext()
{
d = new KJavaAppletContextPrivate;
server = KJavaAppletServer::allocateJavaServer();
- connect(server->javaProcess(), TQT_SIGNAL(exited(int)), this, TQT_SLOT(javaProcessExited(int)));
+ connect(server->javaProcess(), TQ_SIGNAL(exited(int)), this, TQ_SLOT(javaProcessExited(int)));
id = contextCount;
server->createContext( id, this );
diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h
index 166c00f15..2ce7585ee 100644
--- a/tdehtml/java/kjavaappletcontext.h
+++ b/tdehtml/java/kjavaappletcontext.h
@@ -42,7 +42,7 @@ class KJavaAppletContextPrivate;
class KJavaAppletContext : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
KJavaAppletContext();
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 23e805577..6b546196b 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -30,7 +30,7 @@
#include <tdelocale.h>
#include <tdeparts/browserextension.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/job.h>
#include <tdeio/tdeprotocolmanager.h>
@@ -136,8 +136,8 @@ KJavaAppletServer::KJavaAppletServer()
d = new KJavaAppletServerPrivate;
process = new KJavaProcess();
- connect( process, TQT_SIGNAL(received(const TQByteArray&)),
- this, TQT_SLOT(slotJavaRequest(const TQByteArray&)) );
+ connect( process, TQ_SIGNAL(received(const TQByteArray&)),
+ this, TQ_SLOT(slotJavaRequest(const TQByteArray&)) );
setupJava( process );
@@ -198,7 +198,7 @@ void KJavaAppletServer::freeJavaServer()
if( config.readBoolEntry( "ShutdownAppletServer", true ) )
{
const int value = config.readNumEntry( "AppletServerTimeout", 60 );
- TQTimer::singleShot( value*1000, self, TQT_SLOT( checkShutdown() ) );
+ TQTimer::singleShot( value*1000, self, TQ_SLOT( checkShutdown() ) );
}
}
}
@@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
KSSLCertChain chain;
chain.setChain( certs );
if ( chain.isValid() )
- answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] );
+ answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] );
}
}
sl.push_front( TQString(answer) );
@@ -726,7 +726,7 @@ void KJavaAppletServer::waitForReturnData(JSStackFrame * frame) {
killTimers();
startTimer(15000);
while (!frame->exit)
- kapp->eventLoop()->processEvents (TQEventLoop::AllEvents | TQEventLoop::WaitForMore);
+ tdeApp->eventLoop()->processEvents (TQEventLoop::AllEvents | TQEventLoop::WaitForMore);
if (d->jsstack.size() <= 1)
killTimers();
kdDebug(6100) << "<KJavaAppletServer::waitForReturnData stacksize:" << d->jsstack.size() << endl;
@@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent )
{}
TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) {
- TQGuardedPtr<TQDialog> dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog");
+ TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog");
dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
dialog->setModal( true );
@@ -810,10 +810,10 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
dialog->resize( dialog->minimumSizeHint() );
//clearWState( WState_Polished );
- connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
- connect( reject, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
- connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
- connect( grant, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+ connect( no, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+ connect( reject, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+ connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+ connect( grant, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
dialog->exec();
delete dialog;
@@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog()
void PermissionDialog::clicked()
{
- m_button = TQT_TQOBJECT_CONST(sender())->name();
+ m_button = sender()->name();
static_cast<const TQWidget*>(sender())->parentWidget()->close();
}
diff --git a/tdehtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h
index 5b82e01a1..ec8a7ed01 100644
--- a/tdehtml/java/kjavaappletserver.h
+++ b/tdehtml/java/kjavaappletserver.h
@@ -39,7 +39,7 @@ class JSStackFrame;
class KJavaAppletServer : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
/**
@@ -161,7 +161,7 @@ private:
class PermissionDialog : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
PermissionDialog( TQWidget* );
~PermissionDialog();
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index f80690aa9..237d74408 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -79,7 +79,7 @@ public:
void setServer (KJavaAppletServer * s);
TQGuardedPtr <KJavaAppletServer> server;
private:
- typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> >
+ typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> >
ContextMap;
ContextMap m_contextmap;
};
@@ -303,7 +303,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
// check codebase first
const KURL kbaseURL( baseurl );
const KURL newURL(kbaseURL, codebase);
- if (kapp->authorizeURLAction("redirect", KURL(baseurl), newURL))
+ if (tdeApp->authorizeURLAction("redirect", KURL(baseurl), newURL))
applet->setCodeBase (newURL.url());
applet->setAppletClass (classname);
KJavaAppletContext* const cxt = serverMaintainer->getContext (parent, baseurl);
@@ -329,7 +329,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
TQDataStream stream(params, IO_WriteOnly);
stream << info << m_view->topLevelWidget()->winId();
- if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
+ if (!tdeApp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(TDEIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
} else if ( replyType == "TDEIO::AuthInfo" ) {
TQDataStream stream2( reply, IO_ReadOnly );
@@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
setInstance (KJavaAppletViewerFactory::instance ());
KParts::Part::setWidget (m_view);
- connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded()));
- connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&)));
- connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &)));
- connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &)));
+ connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded()));
+ connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&)));
+ connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &)));
+ connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &)));
}
bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
@@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
KJavaAppletViewer::~KJavaAppletViewer () {
m_view = 0L;
- serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl);
+ serverMaintainer->releaseContext (parent(), baseurl);
if (m_statusbar_icon) {
m_statusbar->removeStatusBarItem (m_statusbar_icon);
delete m_statusbar_icon;
@@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
if (applet->size().width() > 0 || m_view->isVisible())
w->showApplet ();
else
- TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ()));
+ TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ()));
if (!applet->failed ())
emit started (0L);
return url.isValid ();
diff --git a/tdehtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h
index bb1d6e921..e00839d49 100644
--- a/tdehtml/java/kjavaappletviewer.h
+++ b/tdehtml/java/kjavaappletviewer.h
@@ -43,7 +43,7 @@ class TDEConfig;
class CoverWidget;
class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
- Q_OBJECT
+ TQ_OBJECT
public:
KJavaAppletViewerBrowserExtension (KJavaAppletViewer *parent);
void urlChanged (const TQString & url);
@@ -57,7 +57,7 @@ public slots:
};
class KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension {
- Q_OBJECT
+ TQ_OBJECT
public:
KJavaAppletViewerLiveConnectExtension(KJavaAppletViewer * parent);
@@ -78,7 +78,7 @@ private:
};
class KJavaAppletViewer : public KParts::ReadOnlyPart {
- Q_OBJECT
+ TQ_OBJECT
public:
KJavaAppletViewer (TQWidget * wparent, const char * wname,
TQObject * parent, const char * name, const TQStringList &args);
@@ -116,7 +116,7 @@ private:
};
class KJavaAppletViewerFactory : public KParts::Factory {
- Q_OBJECT
+ TQ_OBJECT
public:
KJavaAppletViewerFactory ();
virtual ~KJavaAppletViewerFactory ();
@@ -130,7 +130,7 @@ private:
};
class AppletParameterDialog : public KDialogBase {
- Q_OBJECT
+ TQ_OBJECT
public:
AppletParameterDialog (KJavaAppletWidget * parent);
protected slots:
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index a1f5b8f11..83485019c 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -46,11 +46,11 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
m_applet = new KJavaApplet( this );
d = new KJavaAppletWidgetPrivate;
- m_kwm = new KWinModule( TQT_TQOBJECT(this) );
+ m_kwm = new KWinModule( this );
d->tmplabel = new TQLabel( this );
d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
- d->tmplabel->setAlignment( Qt::AlignCenter | TQt::WordBreak );
+ d->tmplabel->setAlignment( TQt::AlignCenter | TQt::WordBreak );
d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->tmplabel->show();
@@ -66,8 +66,8 @@ KJavaAppletWidget::~KJavaAppletWidget()
void KJavaAppletWidget::showApplet()
{
- connect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ),
- this, TQT_SLOT( setWindow( WId ) ) );
+ connect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ),
+ this, TQ_SLOT( setWindow( WId ) ) );
m_kwm->doNotManage( m_swallowTitle );
@@ -89,8 +89,8 @@ void KJavaAppletWidget::setWindow( WId w )
d->tmplabel = 0;
// disconnect from KWM events
- disconnect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ),
- this, TQT_SLOT( setWindow( WId ) ) );
+ disconnect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ),
+ this, TQ_SLOT( setWindow( WId ) ) );
embed( w );
diff --git a/tdehtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h
index 872188769..4912af125 100644
--- a/tdehtml/java/kjavaappletwidget.h
+++ b/tdehtml/java/kjavaappletwidget.h
@@ -23,7 +23,7 @@
#define KJAVAAPPLETWIDGET_H
#include <tqwidget.h>
-#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded
+#ifndef TQ_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded
#include "java/kjavaappletcontext.h"
#include "java/kjavaapplet.h"
#include <qxembed.h>
@@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate;
class KJavaAppletWidget : public QXEmbed
{
- Q_OBJECT
+ TQ_OBJECT
public:
KJavaAppletWidget( TQWidget* parent=0, const char* name=0 );
diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index 5b1c55324..b58465d7f 100644
--- a/tdehtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
@@ -81,14 +81,14 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
d->job = TDEIO::get( *d->url, false, false );
d->job->addMetaData("PropagateHttpHeader", "true");
- connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
- this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
- this, TQT_SLOT(slotConnected(TDEIO::Job*)));
- connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
- this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
- connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotResult(TDEIO::Job*)) );
+ connect( d->job, TQ_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
+ this, TQ_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
+ connect( d->job, TQ_SIGNAL(connected(TDEIO::Job*)),
+ this, TQ_SLOT(slotConnected(TDEIO::Job*)));
+ connect( d->job, TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
+ this, TQ_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
+ connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotResult(TDEIO::Job*)) );
}
KJavaDownloader::~KJavaDownloader()
@@ -215,10 +215,10 @@ void KJavaUploader::start()
// create a suspended job
d->job = TDEIO::put( *d->url, -1, false, false, false );
d->job->suspend();
- connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
- this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
- connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
- this, TQT_SLOT(slotResult(TDEIO::Job*)) );
+ connect( d->job, TQ_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
+ this, TQ_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
+ connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)),
+ this, TQ_SLOT(slotResult(TDEIO::Job*)) );
server->sendURLData( d->loaderID, CONNECTED, d->file );
KJavaAppletServer::freeJavaServer();
}
diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index 4e3b893e8..eb9765769 100644
--- a/tdehtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
@@ -42,7 +42,7 @@ class KJavaUploaderPrivate;
class KJavaTDEIOJob : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
virtual ~KJavaTDEIOJob();
virtual void jobCommand( int cmd ) = 0;
@@ -51,7 +51,7 @@ public:
class KJavaDownloader : public KJavaTDEIOJob
{
-Q_OBJECT
+TQ_OBJECT
public:
KJavaDownloader( int ID, const TQString& url );
@@ -71,7 +71,7 @@ private:
class KJavaUploader : public KJavaTDEIOJob
{
-Q_OBJECT
+TQ_OBJECT
public:
KJavaUploader( int ID, const TQString& url );
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 6b505c343..7f3a93e0a 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -54,12 +54,12 @@ KJavaProcess::KJavaProcess() : TDEProcess()
javaProcess = this; //new TDEProcess();
- connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
- this, TQT_SLOT( slotWroteData() ) );
- connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
- this, TQT_SLOT( slotReceivedData(int, int&) ) );
- connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ),
- this, TQT_SLOT( slotExited (TDEProcess *) ) );
+ connect( javaProcess, TQ_SIGNAL( wroteStdin( TDEProcess * ) ),
+ this, TQ_SLOT( slotWroteData() ) );
+ connect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ),
+ this, TQ_SLOT( slotReceivedData(int, int&) ) );
+ connect( javaProcess, TQ_SIGNAL( processExited (TDEProcess *) ),
+ this, TQ_SLOT( slotExited (TDEProcess *) ) );
d->jvmPath = "java";
d->mainClass = "-help";
@@ -319,8 +319,8 @@ bool KJavaProcess::invokeJVM()
void KJavaProcess::killJVM()
{
d->processKilled = true;
- disconnect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
- this, TQT_SLOT( slotReceivedData(int, int&) ) );
+ disconnect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ),
+ this, TQ_SLOT( slotReceivedData(int, int&) ) );
javaProcess->kill();
}
diff --git a/tdehtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h
index a479b8128..e035c0bec 100644
--- a/tdehtml/java/kjavaprocess.h
+++ b/tdehtml/java/kjavaprocess.h
@@ -22,7 +22,7 @@
#ifndef KJAVAPROCESS_H
#define KJAVAPROCESS_H
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tqcstring.h>
/**
@@ -37,9 +37,9 @@
*/
class KJavaProcessPrivate;
-class KJavaProcess : public TDEProcess //QObject
+class KJavaProcess : public TDEProcess //TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
/**
@@ -110,7 +110,7 @@ public:
/**
* Sends a command to the KJAS Applet Server by building a QByteArray
- * out of the data, and then writes it standard out. It adds each QString
+ * out of the data, and then writes it standard out. It adds each TQString
* in the arg list, and then adds the data array.
*/
void send( char cmd_code, const TQStringList& args, const TQByteArray& data );
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-18 11:13:22 +0000