Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35fbd60457d1e51e6a0df5d181d1a0f00ad75a2c)

6 files changed, 63 insertions, 63 deletions

diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index af301000..3ed864bc 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -119,11 +119,11 @@ void PHPCodeCompletion::setActiveEditorPart(KParts::Part *part)
    }
 
    disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice
-//  connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged()));
-   connect( part, TQT_SIGNAL(textChanged()), this, TQT_SLOT(cursorPositionChanged()) );
-   connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHided()));
-   connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxHided()));
-   connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHided()));
+//  connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged()));
+   connect( part, TQ_SIGNAL(textChanged()), this, TQ_SLOT(cursorPositionChanged()) );
+   connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHided()));
+   connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxHided()));
+   connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHided()));
 }
 
 void PHPCodeCompletion::cursorPositionChanged(){
diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp
index 6cddabdf..ac9a8531 100644
--- a/languages/php/phpconfigwidget.cpp
+++ b/languages/php/phpconfigwidget.cpp
@@ -129,8 +129,8 @@ void PHPConfigWidget::slotAboutClicked()
    proc << exe_edit->text();
    proc << "-m";
 
-   connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)),
-            this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int)));
+   connect( &proc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)),
+            this, TQ_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int)));
    proc.start(TDEProcess::Block,TDEProcess::Stdout);
    PHPInfoDlg dlg(this,"phpinfo",true);
    dlg.php_edit->setText(m_phpInfo);
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 2ee5bbf3..85cbf4e7 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -136,12 +136,12 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char*
     m_gridLayout->addWidget(m_filterLabel,0,1,TQt::AlignRight);
     m_gridLayout->addWidget(m_filterEdit,0,2,TQt::AlignLeft);
 
-    connect( m_filterEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotFilter()) );
-    connect( m_filterEdit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotFilter()) );
-    connect( m_tabBar, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotTabSelected(int)) );
-    connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
-    connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part*)) );
-    connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part*)) );
+    connect( m_filterEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotFilter()) );
+    connect( m_filterEdit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotFilter()) );
+    connect( m_tabBar, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotTabSelected(int)) );
+    connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) );
+    connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part*)) );
+    connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part*)) );
 
     slotActivePartChanged( part->partController()->activePart() );
 }
@@ -186,11 +186,11 @@ void PHPErrorView::InitListView(TDEListView* listview)
     listview->addColumn( i18n("Problem") );
     listview->setAllColumnsShowFocus( TRUE );
 
-    connect( listview, TQT_SIGNAL(executed(TQListViewItem*)),
-             this, TQT_SLOT(slotSelected(TQListViewItem*)) );
+    connect( listview, TQ_SIGNAL(executed(TQListViewItem*)),
+             this, TQ_SLOT(slotSelected(TQListViewItem*)) );
 
-    connect( listview, TQT_SIGNAL(returnPressed(TQListViewItem*)),
-             this, TQT_SLOT(slotSelected(TQListViewItem* )) );
+    connect( listview, TQ_SIGNAL(returnPressed(TQListViewItem*)),
+             this, TQ_SLOT(slotSelected(TQListViewItem* )) );
 
 }
 
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 92d2fc4c..a9861678 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -44,9 +44,9 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName)
 
    /*
    phpCheckProc = new KShellProcess("/bin/sh");
-   connect(phpCheckProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int)));
-   connect(phpCheckProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int)));
-   connect(phpCheckProc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPHPCheckExited(TDEProcess*)));
+   connect(phpCheckProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int)));
+   connect(phpCheckProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int)));
+   connect(phpCheckProc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPHPCheckExited(TDEProcess*)));
    */
 }
 
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 061bb956..f7836514 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -49,13 +49,13 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString
  
   
   m_baseClassEdit->setCompletionObject( comp ); /// @todo change it to KLineEdit
-  connect(m_baseClassEdit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
-  connect(m_classNameEdit,TQT_SIGNAL(textChanged(const TQString&)),
-	  this,TQT_SLOT(classNameTextChanged(const TQString&)));
-  connect(m_fileNameEdit,TQT_SIGNAL(textChanged(const TQString&)),
-	  this,TQT_SLOT(fileNameTextChanged(const TQString&)));
-  connect(m_dirButton,TQT_SIGNAL(clicked()),
-	  this,TQT_SLOT(slotDirButtonClicked()));
+  connect(m_baseClassEdit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&)));
+  connect(m_classNameEdit,TQ_SIGNAL(textChanged(const TQString&)),
+	  this,TQ_SLOT(classNameTextChanged(const TQString&)));
+  connect(m_fileNameEdit,TQ_SIGNAL(textChanged(const TQString&)),
+	  this,TQ_SLOT(fileNameTextChanged(const TQString&)));
+  connect(m_dirButton,TQ_SIGNAL(clicked()),
+	  this,TQ_SLOT(slotDirButtonClicked()));
 }
 PHPNewClassDlg::~PHPNewClassDlg(){
 }
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 252b2167..cf498060 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -79,23 +79,23 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
 
    setXMLFile("kdevphpsupport.rc");
 
-   connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
-   connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
-   connect( partController(), TQT_SIGNAL(savedFile(const KURL&)),
-            this, TQT_SLOT(savedFile(const KURL&)) );
-   connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
-            this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
+   connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) );
+   connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) );
+   connect( partController(), TQ_SIGNAL(savedFile(const KURL&)),
+            this, TQ_SLOT(savedFile(const KURL&)) );
+   connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)),
+            this, TQ_SLOT(projectConfigWidget(KDialogBase*)) );
 
    TDEAction *action;
 
    action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,
-   this, TQT_SLOT(slotRun()),
+   this, TQ_SLOT(slotRun()),
    actionCollection(), "build_execute" );
    action->setToolTip(i18n("Run"));
    action->setWhatsThis(i18n("<b>Run</b><p>Executes script on a terminal or a webserver."));
 
    action = new TDEAction( i18n("&New Class..."),0,
-   this, TQT_SLOT(slotNewClass()),
+   this, TQ_SLOT(slotNewClass()),
    actionCollection(), "project_new_class" );
    action->setToolTip(i18n("New class"));
    action->setWhatsThis(i18n("<b>New class</b><p>Runs New Class wizard."));
@@ -107,29 +107,29 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
    mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems"));
 
    phpExeProc = new KShellProcess("/bin/sh");
-   connect( phpExeProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)),
-            this, TQT_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int)));
-   connect( phpExeProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)),
-            this, TQT_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int)));
-   connect( phpExeProc, TQT_SIGNAL(processExited(TDEProcess*)),
-            this, TQT_SLOT(slotPHPExeExited(TDEProcess*)));
+   connect( phpExeProc, TQ_SIGNAL(receivedStdout (TDEProcess*, char*, int)),
+            this, TQ_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int)));
+   connect( phpExeProc, TQ_SIGNAL(receivedStderr (TDEProcess*, char*, int)),
+            this, TQ_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int)));
+   connect( phpExeProc, TQ_SIGNAL(processExited(TDEProcess*)),
+            this, TQ_SLOT(slotPHPExeExited(TDEProcess*)));
 
    m_htmlView = new PHPHTMLView(this);
    mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP"));
-   connect( m_htmlView,  TQT_SIGNAL(started(TDEIO::Job*)),
-            this, TQT_SLOT(slotWebJobStarted(TDEIO::Job*)));
+   connect( m_htmlView,  TQ_SIGNAL(started(TDEIO::Job*)),
+            this, TQ_SLOT(slotWebJobStarted(TDEIO::Job*)));
 
    configData = new PHPConfigData(projectDom());
-   connect( configData,  TQT_SIGNAL(configStored()),
-            this, TQT_SLOT(slotConfigStored()));
+   connect( configData,  TQ_SIGNAL(configStored()),
+            this, TQ_SLOT(slotConfigStored()));
 
    m_codeCompletion = new  PHPCodeCompletion(this, configData);
 
-   new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text");
+   new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQ_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text");
 
-   connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
-            this, TQT_SLOT(slotActivePartChanged(KParts::Part *)));
-   connect( this, TQT_SIGNAL(fileParsed( PHPFile* )), this, TQT_SLOT(slotfileParsed( PHPFile* )));
+   connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+            this, TQ_SLOT(slotActivePartChanged(KParts::Part *)));
+   connect( this, TQ_SIGNAL(fileParsed( PHPFile* )), this, TQ_SLOT(slotfileParsed( PHPFile* )));
 }
 
 PHPSupportPart::~PHPSupportPart()
@@ -180,7 +180,7 @@ void PHPSupportPart::slotActivePartChanged(KParts::Part *part) {
    if (m_editInterface) { // connect to the editor
       disconnect(part, 0, this, 0 ); // to make sure that it is't connected twice
       if (configData->getRealtimeParsing()) {
-         connect(part,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged()));
+         connect(part,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged()));
       }
       m_codeCompletion->setActiveEditorPart(part);
    }
@@ -210,7 +210,7 @@ void PHPSupportPart::slotConfigStored() {
 void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) {
    TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "text-x-src", TDEIcon::SizeMedium ));
    PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget");
-   connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
+   connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) );
 }
 
 void PHPSupportPart::slotNewClass() {
@@ -242,7 +242,7 @@ bool PHPSupportPart::validateConfig() {
 
       TQVBox *vbox = dlg.addVBoxPage(i18n("PHP Settings"));
       PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget");
-      connect( &dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
+      connect( &dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) );
       dlg.exec();
    }
    if (configData->validateConfig()) {
@@ -298,10 +298,10 @@ void PHPSupportPart::slotWebJobStarted(TDEIO::Job* job) {
    if (job && job->className() == TQString("TDEIO::TransferJob")) {
       kdDebug(9018) << endl << "job started" << job->progressId();
       TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>(job);
-      connect( tjob,  TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
-               this, TQT_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&)));
-      connect( tjob,  TQT_SIGNAL(result(TDEIO::Job*)),
-               this, TQT_SLOT(slotWebResult(TDEIO::Job*)));
+      connect( tjob,  TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+               this, TQ_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&)));
+      connect( tjob,  TQ_SIGNAL(result(TDEIO::Job*)),
+               this, TQ_SLOT(slotWebResult(TDEIO::Job*)));
    }
 }
 
@@ -381,10 +381,10 @@ void PHPSupportPart::projectOpened()
 {
     kdDebug(9018) << "projectOpened()" << endl;
 
-    connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)),
-             this, TQT_SLOT(addedFilesToProject(const TQStringList &)) );
-    connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)),
-             this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) );
+    connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)),
+             this, TQ_SLOT(addedFilesToProject(const TQStringList &)) );
+    connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)),
+             this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) );
 
     if (!m_parser) {
        m_parser = new  PHPParser( this );
@@ -393,7 +393,7 @@ void PHPSupportPart::projectOpened()
 
     // We want to parse only after all components have been
     // properly initialized
-    TQTimer::singleShot(500, this, TQT_SLOT( initialParse() ) );
+    TQTimer::singleShot(500, this, TQ_SLOT( initialParse() ) );
 }
 
 void PHPSupportPart::initialParse( )
@@ -442,7 +442,7 @@ bool PHPSupportPart::parseProject()
    _jd->it = _jd->files.begin();
    _jd->dir.setPath( project()->projectDirectory() );
 
-   TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
+   TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
    return TRUE;
 }
 
@@ -470,7 +470,7 @@ void PHPSupportPart::slotParseFiles()
 
          ++( _jd->it );
       }
-      TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
+      TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
    }
    else // finished or interrupted
    {