diff options
Diffstat (limited to 'tdehtml/java/kjavaappletserver.cpp')
| -rw-r--r-- | tdehtml/java/kjavaappletserver.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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(); } |