summaryrefslogtreecommitdiffstats
path: root/languages/php
diff options
context:
space:
mode:
Diffstat (limited to 'languages/php')
-rw-r--r--languages/php/phpcodecompletion.cpp48
-rw-r--r--languages/php/phpcodecompletion.h2
-rw-r--r--languages/php/phpconfigdata.cpp2
-rw-r--r--languages/php/phpconfigdata.h2
-rw-r--r--languages/php/phpconfigwidget.cpp8
-rw-r--r--languages/php/phpconfigwidget.h2
-rw-r--r--languages/php/phpconfigwidgetbase.ui7
-rw-r--r--languages/php/phperrorview.cpp22
-rw-r--r--languages/php/phperrorview.h2
-rw-r--r--languages/php/phpfile.cpp226
-rw-r--r--languages/php/phpfile.h6
-rw-r--r--languages/php/phphtmlview.h2
-rw-r--r--languages/php/phpnewclassdlg.cpp18
-rw-r--r--languages/php/phpnewclassdlg.h2
-rw-r--r--languages/php/phpparser.cpp2
-rw-r--r--languages/php/phpsupport_event.h8
-rw-r--r--languages/php/phpsupportpart.cpp102
-rw-r--r--languages/php/phpsupportpart.h2
18 files changed, 230 insertions, 233 deletions
diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp
index af301000..0a286653 100644
--- a/languages/php/phpcodecompletion.cpp
+++ b/languages/php/phpcodecompletion.cpp
@@ -22,8 +22,8 @@
#include "phpconfigdata.h"
#include <kdevcore.h>
-#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdeinstance.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tqfile.h>
@@ -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(){
@@ -159,7 +159,7 @@ void PHPCodeCompletion::cursorPositionChanged(){
}
if (m_config->getCodeCompletion()) {
- if (m_completionBoxShow == true) {
+ if (m_completionBoxShow) {
return;
}
@@ -204,7 +204,7 @@ bool PHPCodeCompletion::showCompletionBox(TQValueList<KTextEditor::CompletionEnt
return false;
}
m_completionBoxShow = true;
- m_codeInterface->showCompletionBox(list, max, FALSE);
+ m_codeInterface->showCompletionBox(list, max, false);
return true;
}
return false;
@@ -218,7 +218,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) {
return false;
TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
- Class.setCaseSensitive(FALSE);
+ Class.setCaseSensitive(false);
if (Class.search(line) != -1) {
TQString classname = Class.cap(1);
@@ -234,7 +234,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) {
for (funcIt = funcList.begin(); funcIt != funcList.end(); ++funcIt) {
FunctionDom nFunc = *funcIt;
- if ((function.isEmpty() || nFunc->name().startsWith(function, FALSE)) && nFunc->isStatic()) {
+ if ((function.isEmpty() || nFunc->name().startsWith(function, false)) && nFunc->isStatic()) {
KTextEditor::CompletionEntry e;
e.prefix = nClass->name() + " ::";
e.text = nFunc->name();
@@ -267,11 +267,11 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){
kdDebug(9018) << "checkForNew" << endl;
TQValueList<KTextEditor::CompletionEntry> list;
- if (line.find("new ", 0, FALSE) == -1)
+ if (line.find("new ", 0, false) == -1)
return false;
TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
- New.setCaseSensitive(FALSE);
+ New.setCaseSensitive(false);
if (New.search(line) != -1) {
list = getClasses( New.cap(1) );
@@ -297,11 +297,11 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){
kdDebug(9018) << "checkForExtends" << endl;
TQValueList<KTextEditor::CompletionEntry> list;
- if (line.find("extends", 0, FALSE) == -1)
+ if (line.find("extends", 0, false) == -1)
return false;
TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)");
- extends.setCaseSensitive(FALSE);
+ extends.setCaseSensitive(false);
if (extends.search(line) != -1) {
list = getClasses(extends.cap(1));
@@ -362,7 +362,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString
ClassList::Iterator classIt;
for (classIt = classList.begin(); classIt != classList.end(); ++classIt) {
ClassDom nClass = *classIt;
- if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, FALSE)) {
+ if (name == NULL || name.isEmpty() || nClass->name().startsWith(name, false)) {
KTextEditor::CompletionEntry e;
TQStringList::Iterator it = added.find(nClass->name());
@@ -383,7 +383,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
if (classname.isEmpty()) {
TQValueList<FunctionCompletionEntry>::Iterator it;
for( it = m_globalFunctions.begin(); it != m_globalFunctions.end(); ++it ) {
- if((*it).text.startsWith(function, FALSE)){
+ if((*it).text.startsWith(function, false)){
KTextEditor::CompletionEntry e;
e = (*it);
list.append(e);
@@ -393,7 +393,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
FunctionList methodList = m_model->globalNamespace()->functionList();
FunctionList::Iterator methodIt;
for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) {
- if ((*methodIt)->name().startsWith(function, FALSE)){
+ if ((*methodIt)->name().startsWith(function, false)){
KTextEditor::CompletionEntry e;
e.text = (*methodIt)->name();
ArgumentDom pArg = (*methodIt)->argumentList().first();
@@ -416,7 +416,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
FunctionList::Iterator methodIt;
for (methodIt = methodList.begin(); methodIt != methodList.end(); ++methodIt) {
FunctionDom pMethod = *methodIt;
- if (function.isEmpty() || pMethod->name().startsWith(function, FALSE)) {
+ if (function.isEmpty() || pMethod->name().startsWith(function, false)) {
KTextEditor::CompletionEntry e;
ArgumentDom arg = pMethod->argumentList().first();
@@ -430,7 +430,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getFunctionsAndVars
VariableList::Iterator attrIt;
for (attrIt = attrList.begin(); attrIt != attrList.end(); ++attrIt) {
VariableDom pVar = *attrIt;
- if (function.isEmpty() || pVar->name().startsWith(function, FALSE)) {
+ if (function.isEmpty() || pVar->name().startsWith(function, false)) {
KTextEditor::CompletionEntry e;
e.prefix = nClass->name() + " ::";
e.text = pVar->name();
@@ -517,7 +517,7 @@ TQStringList PHPCodeCompletion::getArguments(TQString classname, TQString functi
TQString PHPCodeCompletion::getCurrentClassName() {
kdDebug(9018) << "getCurrentClassName" << endl;
TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$");
- Class.setCaseSensitive(FALSE);
+ Class.setCaseSensitive(false);
for(int i = m_currentLine; i >= 0; i--){
TQString line = m_editInterface->textLine(i);
@@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) {
for(int i = m_currentLine; i >= 0; i--){
TQString line = m_editInterface->textLine(i);
- if (!line.isNull() && line.find(varName,0 , FALSE) != -1) {
+ if (!line.isNull() && line.find(varName,0 , false) != -1) {
if (createmember.search(line) != -1) {
TQString right = createmember.cap(1).stripWhiteSpace();
@@ -637,12 +637,12 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) {
TQValueList<KTextEditor::CompletionEntry> list;
TQStringList argsList;
- if (m_argWidgetShow == true)
+ if (m_argWidgetShow)
return false;
if (line.find("::") != -1) {
TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
- Static.setCaseSensitive(FALSE);
+ Static.setCaseSensitive(false);
if (Static.search(line) != -1) {
TQString classname = Static.cap(1);
diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h
index 65905878..3277a64d 100644
--- a/languages/php/phpcodecompletion.h
+++ b/languages/php/phpcodecompletion.h
@@ -46,7 +46,7 @@ public:
};
class PHPCodeCompletion : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/languages/php/phpconfigdata.cpp b/languages/php/phpconfigdata.cpp
index 9c89f7db..4de70deb 100644
--- a/languages/php/phpconfigdata.cpp
+++ b/languages/php/phpconfigdata.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
#include "phpconfigdata.h"
#include "domutil.h"
#include <iostream>
diff --git a/languages/php/phpconfigdata.h b/languages/php/phpconfigdata.h
index 40cf07f8..e5840034 100644
--- a/languages/php/phpconfigdata.h
+++ b/languages/php/phpconfigdata.h
@@ -29,7 +29,7 @@
*/
class PHPConfigData : public TQObject {
-Q_OBJECT
+TQ_OBJECT
signals:
diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp
index 6cddabdf..15006bf9 100644
--- a/languages/php/phpconfigwidget.cpp
+++ b/languages/php/phpconfigwidget.cpp
@@ -1,5 +1,5 @@
#include "domutil.h"
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <klineedit.h>
#include <tqcheckbox.h>
#include <tqmultilineedit.h>
@@ -8,7 +8,7 @@
#include <tqradiobutton.h>
#include <tdefiledialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "phpinfodlg.h"
#include "phpconfigwidget.h"
@@ -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/phpconfigwidget.h b/languages/php/phpconfigwidget.h
index 185740fe..8ff34195 100644
--- a/languages/php/phpconfigwidget.h
+++ b/languages/php/phpconfigwidget.h
@@ -8,7 +8,7 @@ class PHPConfigData;
class PHPConfigWidget : public PHPConfigWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui
index 02228756..4213cca5 100644
--- a/languages/php/phpconfigwidgetbase.ui
+++ b/languages/php/phpconfigwidgetbase.ui
@@ -52,9 +52,6 @@
<property name="text">
<string>Use current file in editor</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -547,12 +544,12 @@ the internal web browser. Please make sure that the webserver was compiled with
<tabstop>zend_edit</tabstop>
<tabstop>zend_button</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>slotAboutClicked()</slot>
<slot>slotPHPExeButtonClicked()</slot>
<slot>slotPHPIniButtonClicked()</slot>
<slot>slotZendButtonClicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 2ee5bbf3..5d8dccdc 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() );
}
@@ -184,13 +184,13 @@ void PHPErrorView::InitListView(TDEListView* listview)
listview->addColumn( i18n("Line") );
listview->addColumn( i18n("Column") );
listview->addColumn( i18n("Problem") );
- listview->setAllColumnsShowFocus( TRUE );
+ 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/phperrorview.h b/languages/php/phperrorview.h
index ced798a6..d7f2e73b 100644
--- a/languages/php/phperrorview.h
+++ b/languages/php/phperrorview.h
@@ -55,7 +55,7 @@ enum Errors
};
class PHPErrorView: public TQWidget {
-Q_OBJECT
+TQ_OBJECT
public:
PHPErrorView( PHPSupportPart* part, TQWidget* parent=0, const char* name=0 );
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 92d2fc4c..8bc0ba0a 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -22,7 +22,7 @@
#include <tqregexp.h>
#include <urlutil.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdebug.h>
#include <kdevpartcontroller.h>
@@ -39,14 +39,14 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName)
m_fileinfo = new TQFileInfo(fileName);
m_part = phpSupport;
modified = true;
- inClass = FALSE;
- inMethod = FALSE;
+ inClass = false;
+ inMethod = false;
/*
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*)));
*/
}
@@ -71,7 +71,7 @@ TQStringList PHPFile::readFromEditor()
{
TQStringList contents;
- kapp->lock();
+ tdeApp->lock();
TQPtrList<KParts::Part> parts( *m_part->partController()->parts() );
TQPtrListIterator<KParts::Part> it( parts );
while( it.current() ){
@@ -85,7 +85,7 @@ TQStringList PHPFile::readFromEditor()
contents = TQStringList::split("\n", editIface->text().ascii(), true);
break;
}
- kapp->unlock();
+ tdeApp->unlock();
return contents;
}
@@ -120,8 +120,8 @@ void PHPFile::Analyse() {
postEvent( new FileParseEvent( Event_StartParse, this->fileName() ) );
- inClass = FALSE;
- inMethod = FALSE;
+ inClass = false;
+ inMethod = false;
/*
m_contents = readFromEditor();
@@ -138,36 +138,36 @@ void PHPFile::Analyse() {
}
bool PHPFile::ParseClass(TQString line, int lineNo) {
- if (line.find("class ", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("class ", 0, false) == -1)
+ return false;
TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$");
- Class.setCaseSensitive(FALSE);
+ Class.setCaseSensitive(false);
if (Class.search(line) != -1) {
- if (AddClass(Class.cap(2), Class.cap(4), lineNo) == FALSE)
- return FALSE;
+ if (!AddClass(Class.cap(2), Class.cap(4), lineNo))
+ return false;
/// @fixme Activate when it exists in ClassModel
// if (Class.cap(1).lower() == "abstract")
// SetClass("abstract");
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool PHPFile::ParseFunction(TQString line, int lineNo) {
- if (line.find("function", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("function", 0, false) == -1)
+ return false;
TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$");
- function.setCaseSensitive(FALSE);
+ function.setCaseSensitive(false);
if (function.search(line) != -1) {
- if (AddFunction(function.cap(4), function.cap(5), lineNo) == FALSE)
- return FALSE;
+ if (!AddFunction(function.cap(4), function.cap(5), lineNo))
+ return false;
if (function.cap(3).lower() == "static" || function.cap(1).lower() == "static")
SetFunction("static");
@@ -175,7 +175,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) {
if (function.cap(1).lower() == "abstract") {
SetFunction("abstract");
CloseFunction( lineNo );
- return FALSE;
+ return false;
}
/// @fixme Activate when it exists in FunctionModel
@@ -191,22 +191,22 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) {
if (function.cap(2).lower() == "protected")
SetFunction("protected");
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool PHPFile::ParseVariable(TQString line, int lineNo) {
if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1)
- return FALSE;
+ return false;
TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$");
- variable.setCaseSensitive(FALSE);
+ variable.setCaseSensitive(false);
if (variable.search(line) != -1) {
- if (AddVariable(variable.cap(2), "", lineNo) == FALSE)
- return FALSE;
+ if (!AddVariable(variable.cap(2), "", lineNo))
+ return false;
if (variable.cap(1).lower() == "private")
SetVariable( "private" );
@@ -220,117 +220,117 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) {
if (variable.cap(1).lower() == "static")
SetVariable( "static" );
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool PHPFile::ParseThisMember(TQString line, int lineNo) {
- if (line.find("$this->", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("$this->", 0, false) == -1)
+ return false;
TQRegExp createthis;
- createthis.setCaseSensitive(FALSE);
+ createthis.setCaseSensitive(false);
createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;");
if (createthis.search(line) != -1) {
- if (AddVariable(createthis.cap(1), "integer", lineNo, TRUE) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createthis.cap(1), "integer", lineNo, true))
+ return false;
+ return true;
}
- if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) {
+ if (line.find("true", 0, false) != -1 || line.find("false", 0, false) != -1) {
createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;");
if (createthis.search(line) != -1) {
- if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createthis.cap(1), "boolean", lineNo, true))
+ return false;
+ return true;
}
}
- if (line.find("new", 0, FALSE) != -1) {
+ if (line.find("new", 0, false) != -1) {
createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
if (createthis.search(line) != -1) {
- if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createthis.cap(1), createthis.cap(2), lineNo, true))
+ return false;
+ return true;
}
}
- if (line.find("array", 0, FALSE) != -1) {
+ if (line.find("array", 0, false) != -1) {
createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+");
if (createthis.search(line) != -1) {
- if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createthis.cap(1), "array", lineNo, true))
+ return false;
+ return true;
}
}
- return FALSE;
+ return false;
}
bool PHPFile::ParseMember(TQString line, int lineNo) {
- if (line.find("$", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("$", 0, false) == -1)
+ return false;
/// @todo Ajouter plus de test ....
TQRegExp createmember;
- createmember.setCaseSensitive(FALSE);
+ createmember.setCaseSensitive(false);
createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*([0-9]*)[ \t]*;");
if (createmember.search(line) != -1) {
- if (AddVariable(createmember.cap(1), "integer", lineNo) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createmember.cap(1), "integer", lineNo))
+ return false;
+ return true;
}
createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*[\"']+(.*)[\"']+[ \t]*;");
if (createmember.search(line) != -1) {
- if (AddVariable(createmember.cap(1), "string", lineNo) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createmember.cap(1), "string", lineNo))
+ return false;
+ return true;
}
- if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) {
+ if (line.find("true", 0, false) != -1 || line.find("false", 0, false) != -1) {
createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;");
if (createmember.search(line) != -1) {
- if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createmember.cap(1), "boolean", lineNo))
+ return false;
+ return true;
}
}
- if (line.find("new", 0, FALSE) != -1) {
+ if (line.find("new", 0, false) != -1) {
createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)");
if (createmember.search(line) != -1) {
- if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createmember.cap(1), createmember.cap(2), lineNo))
+ return false;
+ return true;
}
}
- if (line.find("array", 0, FALSE) != -1) {
+ if (line.find("array", 0, false) != -1) {
createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+");
if (createmember.search(line) != -1) {
- if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE)
- return FALSE;
- return TRUE;
+ if (!AddVariable(createmember.cap(1), "array", lineNo))
+ return false;
+ return true;
}
}
- return FALSE;
+ return false;
}
bool PHPFile::ParseReturn(TQString line, int lineNo) {
TQString rettype;
- if (line.find("return", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("return", 0, false) == -1)
+ return false;
TQRegExp typeex;
- typeex.setCaseSensitive(FALSE);
+ typeex.setCaseSensitive(false);
typeex.setPattern("return[ \t]*(\\(|)([a-zA-Z_\x7f-\xff$][a-zA-Z0-9_\x7f-\xff]*)(\\)|)[ \t]*;");
if (typeex.search(line) != -1) {
@@ -362,37 +362,37 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) {
}
SetFunction("result", rettype);
- return TRUE;
+ return true;
}
bool PHPFile::ParseTodo(TQString line, int lineNo) {
- if (line.find("todo", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("todo", 0, false) == -1)
+ return false;
TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$");
- todo.setCaseSensitive(FALSE);
+ todo.setCaseSensitive(false);
if (todo.search(line) != -1) {
AddTodo( todo.cap(2), lineNo );
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool PHPFile::ParseFixme(TQString line, int lineNo) {
- if (line.find("fixme", 0, FALSE) == -1)
- return FALSE;
+ if (line.find("fixme", 0, false) == -1)
+ return false;
TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$");
- fixme.setCaseSensitive(FALSE);
+ fixme.setCaseSensitive(false);
if (fixme.search(line) != -1) {
AddFixme( fixme.cap(2), lineNo );
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void PHPFile::ParseSource() {
@@ -405,13 +405,13 @@ void PHPFile::ParseSource() {
TQRegExp includere("^[ \t]*(include|require|include_once|require_once)[ \t]*(\\(|)[ \t]*[\"'](.*)[\"'][ \t]*(\\)|)[ \t]*;$");
- includere.setCaseSensitive(FALSE);
+ includere.setCaseSensitive(false);
for ( TQStringList::Iterator it = m_contents.begin(); it != m_contents.end(); ++it ) {
line = (*it).local8Bit();
if (!line.isNull()) {
- if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1) {
+ if (line.find("include", 0, false) != -1 || line.find("require", 0, false) != -1) {
if (includere.search(line) != -1) {
TQStringList include_path;
include_path = include_path.split(":", m_part->getIncludePath());
@@ -431,7 +431,7 @@ void PHPFile::ParseSource() {
}
- if ( inMethod == TRUE ) {
+ if ( inMethod ) {
bracketFuncOpen += line.contains("{");
bracketFuncClose += line.contains("}");
if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) {
@@ -439,31 +439,31 @@ void PHPFile::ParseSource() {
}
}
- if ( inMethod == FALSE ) {
+ if ( !inMethod ) {
bracketOpen += line.contains("{");
bracketClose += line.contains("}");
- if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) {
+ if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass) {
CloseClass( lineNo );
}
}
- if ( inClass == FALSE ) {
- if (ParseClass(line, lineNo) == TRUE) {
+ if ( !inClass ) {
+ if (ParseClass(line, lineNo)) {
bracketOpen = line.contains("{");
bracketClose = line.contains("}");
}
}
- if ( inClass == TRUE ) {
+ if ( inClass ) {
ParseThisMember(line, lineNo);
}
- if (ParseFunction(line, lineNo) == TRUE) {
+ if (ParseFunction(line, lineNo)) {
bracketFuncOpen = line.contains("{");
bracketFuncClose = line.contains("}");
}
- if ( inMethod == TRUE )
+ if ( inMethod )
ParseReturn(line, lineNo);
ParseVariable(line, lineNo);
@@ -480,7 +480,7 @@ void PHPFile::PHPCheck() {
// int status = 0;
m_phpCheckOutput = "";
-/// @todo try with kprocess in futur version actually this create zombie
+/// @todo try with tdeprocess in futur version actually this create zombie
/*
phpCheckProc->clearArguments();
@@ -582,58 +582,58 @@ void PHPFile::postEvent(FileParseEvent *event) {
bool PHPFile::AddClass(TQString name, TQString extends, int start) {
postEvent( new FileParseEvent( Event_AddClass, this->fileName(), name, extends, start ) );
- inClass = TRUE;
- return TRUE;
+ inClass = true;
+ return true;
}
bool PHPFile::SetClass(TQString arguments) {
postEvent( new FileParseEvent( Event_SetClass, this->fileName(), "", arguments ) );
- return TRUE;
+ return true;
}
bool PHPFile::CloseClass(int end) {
postEvent( new FileParseEvent( Event_CloseClass, this->fileName(), end ) );
- inClass = FALSE;
- return TRUE;
+ inClass = false;
+ return true;
}
bool PHPFile::AddFunction(TQString name, TQString arguments, int start) {
postEvent( new FileParseEvent( Event_AddFunction, this->fileName(), name, arguments, start ) );
- inMethod = TRUE;
- return TRUE;
+ inMethod = true;
+ return true;
}
bool PHPFile::SetFunction(TQString name, TQString arguments) {
postEvent( new FileParseEvent( Event_SetFunction, this->fileName(), name, arguments ) );
- return TRUE;
+ return true;
}
bool PHPFile::CloseFunction(int end) {
postEvent( new FileParseEvent( Event_CloseFunction, this->fileName(), end ) );
- inMethod = FALSE;
- return TRUE;
+ inMethod = false;
+ return true;
}
bool PHPFile::AddVariable(TQString name, TQString type, int position, bool classvar) {
postEvent( new FileParseEvent( Event_AddVariable, this->fileName(), name, type, position, classvar ) );
- return TRUE;
+ return true;
}
bool PHPFile::SetVariable(TQString arguments) {
postEvent( new FileParseEvent( Event_SetVariable, this->fileName(), "", arguments ) );
- return TRUE;
+ return true;
}
bool PHPFile::AddTodo(TQString arguments, int position) {
postEvent( new FileParseEvent( Event_AddTodo, this->fileName(), "", arguments, position ) );
- inClass = TRUE;
- return TRUE;
+ inClass = true;
+ return true;
}
bool PHPFile::AddFixme(TQString arguments, int position) {
postEvent( new FileParseEvent( Event_AddFixme, this->fileName(), "", arguments, position ) );
- inClass = TRUE;
- return TRUE;
+ inClass = true;
+ return true;
}
#include "phpfile.moc"
diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h
index ac5a4525..2db93552 100644
--- a/languages/php/phpfile.h
+++ b/languages/php/phpfile.h
@@ -27,7 +27,7 @@
#include <tqthread.h>
#include <urlutil.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdebug.h>
#include <kdevproject.h>
@@ -46,7 +46,7 @@
@author Escuder Nicolas
*/
class PHPFile : public TQObject {
-Q_OBJECT
+TQ_OBJECT
public:
@@ -98,7 +98,7 @@ private:
bool SetFunction(TQString name, TQString arguments = "");
bool CloseFunction(int end);
- bool AddVariable(TQString name, TQString type, int position, bool classvar = FALSE);
+ bool AddVariable(TQString name, TQString type, int position, bool classvar = false);
bool SetVariable(TQString arguments);
bool AddTodo(TQString arguments, int position);
diff --git a/languages/php/phphtmlview.h b/languages/php/phphtmlview.h
index e55be392..77ab302d 100644
--- a/languages/php/phphtmlview.h
+++ b/languages/php/phphtmlview.h
@@ -26,7 +26,7 @@
class PHPSupportPart;
class PHPHTMLView : public KDevHTMLPart {
-Q_OBJECT
+TQ_OBJECT
public:
PHPHTMLView(PHPSupportPart *part);
diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp
index 061bb956..58316af2 100644
--- a/languages/php/phpnewclassdlg.cpp
+++ b/languages/php/phpnewclassdlg.cpp
@@ -24,8 +24,8 @@
#include <tqregexp.h>
#include <tqtextedit.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
#include <kdebug.h>
using namespace std;
@@ -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/phpnewclassdlg.h b/languages/php/phpnewclassdlg.h
index 91c832e4..bf1a10e5 100644
--- a/languages/php/phpnewclassdlg.h
+++ b/languages/php/phpnewclassdlg.h
@@ -26,7 +26,7 @@
*/
class PHPNewClassDlg : public PHPNewClassDlgBase {
- Q_OBJECT
+ TQ_OBJECT
public:
PHPNewClassDlg(const TQStringList& baseClassNames,const TQString& directory,TQWidget *parent=0, const char *name=0);
diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp
index 6b725dc8..99bc4b71 100644
--- a/languages/php/phpparser.cpp
+++ b/languages/php/phpparser.cpp
@@ -150,7 +150,7 @@ void PHPParser::close()
m_canParse.wakeAll();
while (running()) {
- kapp->processEvents();
+ tdeApp->processEvents();
}
}
diff --git a/languages/php/phpsupport_event.h b/languages/php/phpsupport_event.h
index 28713efb..c3dfcd02 100644
--- a/languages/php/phpsupport_event.h
+++ b/languages/php/phpsupport_event.h
@@ -51,7 +51,7 @@ public:
m_name = "";
m_arguments = "";
m_position = 0;
- m_global = FALSE;
+ m_global = false;
}
FileParseEvent(long event, const TQString& fileName, int position )
@@ -59,20 +59,20 @@ public:
{
m_name = "";
m_arguments = "";
- m_global = FALSE;
+ m_global = false;
}
FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments )
: TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments )
{
m_position = 0;
- m_global = FALSE;
+ m_global = false;
}
FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position )
: TQCustomEvent(event), m_fileName( fileName ), m_name( name ), m_arguments( arguments ), m_position( position )
{
- m_global = FALSE;
+ m_global = false;
}
FileParseEvent(long event, const TQString& fileName, const TQString& name, const TQString& arguments, int position, bool global )
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index c189cc5c..ab73766c 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -38,7 +38,7 @@
#include <tdehtmlview.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kregexp.h>
#include <kstatusbar.h>
#include <tdeparts/browserextension.h>
@@ -66,11 +66,11 @@
using namespace std;
-static const KDevPluginInfo data("kdevphpsupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) )
+static const KDevPluginInfo pluginData("kdevphpsupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) )
PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &)
- : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart")
+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart")
{
m_htmlView = 0;
m_parser = 0;
@@ -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( )
@@ -426,7 +426,7 @@ bool PHPSupportPart::parseProject()
kdDebug(9018) << "parseProject()" << endl;
mainWindow() ->statusBar() ->message( i18n( "Updating..." ) );
- kapp->setOverrideCursor( waitCursor );
+ tdeApp->setOverrideCursor( waitCursor );
_jd = new JobData;
@@ -442,15 +442,15 @@ bool PHPSupportPart::parseProject()
_jd->it = _jd->files.begin();
_jd->dir.setPath( project()->projectDirectory() );
- TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
- return TRUE;
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
+ return true;
}
void PHPSupportPart::slotParseFiles()
{
kdDebug(9018) << "slotParseFiles()" << endl;
- kapp->lock();
+ tdeApp->lock();
if ( _jd->it != _jd->files.end() )
{
@@ -470,11 +470,11 @@ void PHPSupportPart::slotParseFiles()
++( _jd->it );
}
- TQTimer::singleShot( 0, this, TQT_SLOT( slotParseFiles() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) );
}
else // finished or interrupted
{
- kapp->restoreOverrideCursor();
+ tdeApp->restoreOverrideCursor();
mainWindow()->statusBar()->removeWidget( _jd->progressBar );
mainWindow()->statusBar()->message( i18n( "Done" ), 2000 );
@@ -486,7 +486,7 @@ void PHPSupportPart::slotParseFiles()
_jd = 0;
}
- kapp->unlock();
+ tdeApp->unlock();
}
void PHPSupportPart::addedFilesToProject(const TQStringList &fileList)
@@ -570,7 +570,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev )
if ( ev->type() < Event_AddFile || ev->type() > Event_AddFixme )
return;
- kapp->lock();
+ tdeApp->lock();
FileParseEvent* event = (FileParseEvent*) ev;
NamespaceDom ns = codeModel()->globalNamespace();
@@ -609,7 +609,7 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev )
nClass->setStartPosition( event->posititon(), 0);
m_file->addClass( nClass );
- if ( event->arguments().isEmpty() != TRUE )
+ if ( !event->arguments().isEmpty() )
nClass->addBaseClass( event->arguments() );
ns->addClass( nClass );
@@ -690,10 +690,10 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev )
nVariable->setStartPosition( event->posititon(), 0 );
nVariable->setAccess(VariableModel::Public);
- if ( event->arguments().isEmpty() != TRUE )
+ if ( !event->arguments().isEmpty() )
nVariable->setType( event->arguments() );
- if ( LastClass != NULL && ( LastMethod == NULL || event->global() == TRUE ) ) {
+ if ( LastClass != NULL && ( LastMethod == NULL || event->global() ) ) {
// kdDebug(9018) << "AddVariable To Class " << LastClass->name() << " " << nVariable->name() << endl;
LastClass->addVariable(nVariable);
} else {
@@ -736,8 +736,8 @@ void PHPSupportPart::customEvent( TQCustomEvent* ev )
}
- kapp->unlock();
- kapp->processEvents();
+ tdeApp->unlock();
+ tdeApp->processEvents();
}
PHPErrorView *PHPSupportPart::ErrorView( ) {
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index 4dca877b..a3f0e9e8 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -43,7 +43,7 @@ class PHPFile;
class PHPSupportPart : public KDevLanguageSupport
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 23:32:00 +0000