diff options
Diffstat (limited to 'languages/php')
-rw-r--r-- | languages/php/phpconfigwidget.cpp | 8 | ||||
-rw-r--r-- | languages/php/phpconfigwidget.h | 4 | ||||
-rw-r--r-- | languages/php/phpfile.cpp | 14 | ||||
-rw-r--r-- | languages/php/phpfile.h | 6 | ||||
-rw-r--r-- | languages/php/phpnewclassdlg.cpp | 4 | ||||
-rw-r--r-- | languages/php/phpsupportpart.cpp | 20 | ||||
-rw-r--r-- | languages/php/phpsupportpart.h | 8 |
7 files changed, 32 insertions, 32 deletions
diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 5be07acb..01cd950c 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -129,16 +129,16 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPInfo (KProcess*, char*, int))); - proc.start(KProcess::Block,KProcess::Stdout); + connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); + proc.start(TDEProcess::Block,TDEProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); dlg.exec(); m_phpInfo = ""; } -void PHPConfigWidget::slotReceivedPHPInfo (KProcess* /*proc*/, char* buffer, int buflen){ +void PHPConfigWidget::slotReceivedPHPInfo (TDEProcess* /*proc*/, char* buffer, int buflen){ m_phpInfo += TQCString(buffer,buflen+1); } diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index 5f1efdd6..185740fe 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -3,7 +3,7 @@ #include "phpconfigwidgetbase.h" #include <tqstring.h> -class KProcess; +class TDEProcess; class PHPConfigData; class PHPConfigWidget : public PHPConfigWidgetBase @@ -21,7 +21,7 @@ public slots: virtual void slotPHPExeButtonClicked(); virtual void slotPHPIniButtonClicked(); void accept(); - void slotReceivedPHPInfo (KProcess* proc, char* buffer, int buflen); + void slotReceivedPHPInfo (TDEProcess* proc, char* buffer, int buflen); private: TQDomDocument* dom; diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 29c6ea9b..7a95bc98 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 (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (KProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (KProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPHPCheckExited(KProcess*))); + 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*))); */ } @@ -487,7 +487,7 @@ void PHPFile::PHPCheck() { *phpCheckProc << m_phpSupport->getExePath(); *phpCheckProc << "-l -f" << KShellProcess::quote(fileName()); - phpCheckProc->start(KProcess::DontCare, KProcess::All); + phpCheckProc->start(TDEProcess::DontCare, TDEProcess::All); */ /* @@ -505,17 +505,17 @@ void PHPFile::PHPCheck() { } /* -void PHPFile::slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen) { +void PHPFile::slotReceivedPHPCheckStdout (TDEProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } -void PHPFile::slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen) { +void PHPFile::slotReceivedPHPCheckStderr (TDEProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } -void PHPFile::slotPHPCheckExited (KProcess* proc) { +void PHPFile::slotPHPCheckExited (TDEProcess* proc) { kdDebug(v) << "slotPHPExeExited()" << endl; } */ diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index dbf18b63..470e7159 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -67,9 +67,9 @@ public: /* private slots: - void slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen); - void slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen); - void slotPHPCheckExited (KProcess* proc); + void slotReceivedPHPCheckStderr (TDEProcess* proc, char* buffer, int buflen); + void slotReceivedPHPCheckStdout (TDEProcess* proc, char* buffer, int buflen); + void slotPHPCheckExited (TDEProcess* proc); */ private: TQStringList readFromEditor(); diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 314dfcf6..ddc3b507 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -37,7 +37,7 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString m_dirEdit->setText(directory); // load the class template if available - TQString templateFile = KGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); + TQString templateFile = TDEGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); if(!templateFile.isNull()){ TQFile file(templateFile); TQTextStream stream(&file); @@ -86,7 +86,7 @@ void PHPNewClassDlg::accept(){ TQString absFileName = classDir + m_fileNameEdit->text(); // save the template for the next time - TQString templateDir = KGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; + TQString templateDir = TDEGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; TQString templateFile = templateDir + "newclasstemplate.txt"; TQDir dir(templateDir); if(!dir.exists()){ diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 52c9f109..db3aeed7 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -107,12 +107,12 @@ 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 (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStdout (KProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStderr (KProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotPHPExeExited(KProcess*))); + 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*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); @@ -343,12 +343,12 @@ void PHPSupportPart::executeInTerminal() { *phpExeProc << KShellProcess::quote(file); kdDebug(9018) << "" << file.latin1() << endl; - phpExeProc->start(KProcess::NotifyOnExit,KProcess::All); + phpExeProc->start(TDEProcess::NotifyOnExit,TDEProcess::All); // core()->gotoDocumentationFile(KURL("http://www.php.net")); } -void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, int buflen) { +void PHPSupportPart::slotReceivedPHPExeStdout (TDEProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); @@ -358,7 +358,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, m_htmlView->write(buf); } -void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, int buflen) { +void PHPSupportPart::slotReceivedPHPExeStderr (TDEProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); @@ -368,7 +368,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, m_htmlView->write(buf); } -void PHPSupportPart::slotPHPExeExited (KProcess* /*proc*/) { +void PHPSupportPart::slotPHPExeExited (TDEProcess* /*proc*/) { kdDebug(9018) << "slotPHPExeExited()" << endl; m_htmlView->end(); TQString file = getExecuteFile(); diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 8e403f51..d89c3277 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -34,7 +34,7 @@ class TQStringList; class PHPHTMLView; class KShellProcess; -class KProcess; +class TDEProcess; class PHPErrorView; class PHPConfigData; class PHPCodeCompletion; @@ -72,9 +72,9 @@ private slots: void slotRun(); void slotNewClass(); void projectConfigWidget(KDialogBase *dlg); - void slotReceivedPHPExeStderr (KProcess* proc, char* buffer, int buflen); - void slotReceivedPHPExeStdout (KProcess* proc, char* buffer, int buflen); - void slotPHPExeExited (KProcess* proc); + void slotReceivedPHPExeStderr (TDEProcess* proc, char* buffer, int buflen); + void slotReceivedPHPExeStdout (TDEProcess* proc, char* buffer, int buflen); + void slotPHPExeExited (TDEProcess* proc); void slotWebData(KIO::Job* job,const TQByteArray& data); void slotWebResult(KIO::Job* job); void slotWebJobStarted(KIO::Job* job); |