Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 22 insertions, 22 deletions

diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 1a75709f8..27fb181bb 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -384,7 +384,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   TQWidget *contextListContainer = new TQWidget(contextContainer);
   m_contextList = new TQListBox(contextListContainer);
   m_contextList->setMinimumSize(100,200);
-  connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+  connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
 
   TQHBoxLayout *clistLayout = new TQHBoxLayout(contextListContainer);
   clistLayout->addWidget(m_contextList);
@@ -400,11 +400,11 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   TQVBoxLayout *ssdvl = new TQVBoxLayout(sourceSelDisplay);
 
   m_sourceSel = new TQComboBox(toolBar());
-  connect(m_sourceSel,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSourceSelected(int)));
+  connect(m_sourceSel,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSourceSelected(int)));
 
   m_sourceDisplay = new SourceDisplay(this,sourceSelDisplay);
   ssdvl->addWidget(m_sourceDisplay);
-  connect(m_sourceDisplay,TQT_SIGNAL(lineDoubleClicked(int)),TQT_SLOT(slotToggleBreakpoint(int)));
+  connect(m_sourceDisplay,TQ_SIGNAL(lineDoubleClicked(int)),TQ_SLOT(slotToggleBreakpoint(int)));
 
   TQValueList<int> vsplitSizes;
   vsplitSizes.insert(vsplitSizes.end(),120);
@@ -419,7 +419,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   m_evalEdit = new EvalMultiLineEdit(evalContainer);
   m_evalEdit->setWordWrap(TQMultiLineEdit::NoWrap);
   m_evalEdit->setFont(font);
-  connect(m_evalEdit,TQT_SIGNAL(returnPressed()),TQT_SLOT(slotEval()));
+  connect(m_evalEdit,TQ_SIGNAL(returnPressed()),TQ_SLOT(slotEval()));
   m_evalDepth = 0;
 
   TQVBoxLayout *evalLayout = new TQVBoxLayout(evalContainer);
@@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   // Venkman use F12, KDevelop F10
   TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12)));
   scNext.append(KKeySequence(KKey(TQt::Key_F10)));
-  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQT_SLOT(slotNext()),
+  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQ_SLOT(slotNext()),
 				   m_actionCollection,"next");
-  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQT_SLOT(slotStep()),
+  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQ_SLOT(slotStep()),
 				   m_actionCollection,"step");
   // Venkman use F5, Kdevelop F9
   TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
   scCont.append(KKeySequence(KKey(TQt::Key_F9)));
-  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()),
+  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQ_SLOT(slotContinue()),
 				   m_actionCollection,"cont");
-  m_stopAction       = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQT_SLOT(slotStop()),
+  m_stopAction       = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQ_SLOT(slotStop()),
 				   m_actionCollection,"stop");
-  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQT_SLOT(slotBreakNext()),
+  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQ_SLOT(slotBreakNext()),
 				   m_actionCollection,"breaknext");
 
 
@@ -1048,7 +1048,7 @@ void KJSDebugWin::leaveSession()
 
 void KJSDebugWin::updateContextList()
 {
-  disconnect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+  disconnect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
 
   m_contextList->clear();
   for (int i = 0; i < m_execsCount; i++)
@@ -1060,7 +1060,7 @@ void KJSDebugWin::updateContextList()
     setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine());
   }
 
-  connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+  connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
 }
 
 TQString KJSDebugWin::contextStr(const Context &ctx)
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 7acea8dee..3a1f7c897 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -1231,7 +1231,7 @@ void Window::scheduleClose()
 {
   kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl;
   Q_ASSERT(winq);
-  TQTimer::singleShot( 0, winq, TQT_SLOT( timeoutClose() ) );
+  TQTimer::singleShot( 0, winq, TQ_SLOT( timeoutClose() ) );
 }
 
 void Window::closeNow()
@@ -2169,8 +2169,8 @@ WindowQObject::WindowQObject(Window *w)
   if ( !parent->m_frame )
       kdDebug(6070) << "WARNING: null part in " << k_funcinfo << endl;
   else
-      connect( parent->m_frame, TQT_SIGNAL( destroyed() ),
-               this, TQT_SLOT( parentDestroyed() ) );
+      connect( parent->m_frame, TQ_SIGNAL( destroyed() ),
+               this, TQ_SLOT( parentDestroyed() ) );
   pausedTime = 0;
   lastTimerId = 0;
   currentlyDispatching = false;
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index a3d0b2b3d..d5937e9a0 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -420,17 +420,17 @@ void XMLHttpRequest::send(const TQString& _body)
     return;
   }
 
-  qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-		    TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  qObject->connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+		    TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
 #ifdef APPLE_CHANGES
-  qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
-		    TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
+  qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
+		    TQ_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
 #else
-  qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-		    TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+		    TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
 #endif
-  qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
-		    TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
+  qObject->connect( job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+		    TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
 
 #ifdef APPLE_CHANGES
   KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job);