Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 37 insertions, 37 deletions

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/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index a83dad118..640473489 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -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() ) );
         }
     }
 }
@@ -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;
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 6145470bf..5a00e14eb 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -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) {
@@ -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/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index 7f1d7f00f..83485019c 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -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/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/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();
 }