diff options
Diffstat (limited to 'languages')
37 files changed, 198 insertions, 198 deletions
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 66966f33..19588b66 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -88,7 +88,7 @@ ProblemReporter::ProblemReporter( AdaSupportPart* part, TQWidget* parent, const addColumn( i18n("File") ); addColumn( i18n("Line") ); //addColumn( i18n("Column") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); @@ -246,7 +246,7 @@ void ProblemReporter::configure() kdDebug() << "ProblemReporter::configure()" << endl; TDEConfig* config = kapp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnableAdaBgParser", TRUE ); + m_active = config->readBoolEntry( "EnableAdaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 25ef4197..28904447 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -183,7 +183,7 @@ void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString(), program, TRUE); + appFrontend->startAppCommand(TQString(), program, true); } diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index 1d1e61fd..81782fd7 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -32,7 +32,7 @@ class AddAttributeDialog : public AddAttributeDialogBase public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index 0362eae1..20275400 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -32,7 +32,7 @@ class AddMethodDialog : public AddMethodDialogBase public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); diff --git a/languages/cpp/app_templates/cppcurseshello/main.cpp b/languages/cpp/app_templates/cppcurseshello/main.cpp index 3e23a5df..7d900513 100644 --- a/languages/cpp/app_templates/cppcurseshello/main.cpp +++ b/languages/cpp/app_templates/cppcurseshello/main.cpp @@ -25,7 +25,7 @@ int main() initscr(); start_color(); cbreak(); - keypad(stdscr, TRUE); + keypad(stdscr, true); noecho(); init_pair(1, COLOR_BLACK, COLOR_CYAN); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index a1196404..428c2bc3 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -16,7 +16,7 @@ bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here - return TRUE; + return true; } KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index 57b57cb6..a8ffdd5e 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -15,7 +15,7 @@ class %{APPNAME}Part : public KoDocument public: %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 2cf5ff06..fed33236 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -32,7 +32,7 @@ void %{APPNAME}View::paintEvent( TQPaintEvent* ev ) /// @todo Scaling // Let the document do the drawing - koDocument()->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument()->paintEverything( painter, ev->rect(), false, this ); painter.end(); } diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index f963714e..24f12236 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -185,7 +185,7 @@ void %{APPNAME}::fileOpen() KURL url = KFileDialog::getOpenURL( TQString(), TQString(), this ); - if (url.isEmpty() == false) + if (!url.isEmpty()) { // About this function, the style guide ( // http://developer.kde.org/documentation/standards/kde/style/basics/index.html ) diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index f4f866b1..21681fcd 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -82,7 +82,7 @@ bool %{APPNAME}Part::openFile() { // m_file is always local so we can use TQFile on it TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) + if (!file.open(IO_ReadOnly)) return false; // our example widget is text-based, so we use TQTextStream instead @@ -106,12 +106,12 @@ bool %{APPNAME}Part::openFile() bool %{APPNAME}Part::saveFile() { // if we aren't read-write, return immediately - if (isReadWrite() == false) + if (!isReadWrite()) return false; // m_file is always local, so we use TQFile TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) + if (!file.open(IO_WriteOnly)) return false; // use TQTextStream to dump the text to the file @@ -130,7 +130,7 @@ void %{APPNAME}Part::fileOpen() // button is clicked TQString file_name = KFileDialog::getOpenFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) openURL(file_name); } @@ -138,7 +138,7 @@ void %{APPNAME}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) saveAs(file_name); } diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index daa8b078..4c12b424 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -96,7 +96,7 @@ bool %{APPNAMELC}Part::openFile() { // m_file is always local so we can use TQFile on it TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) + if (!file.open(IO_ReadOnly)) return false; // our example widget is text-based, so we use TQTextStream instead @@ -120,12 +120,12 @@ bool %{APPNAMELC}Part::openFile() bool %{APPNAMELC}Part::saveFile() { // if we aren't read-write, return immediately - if (isReadWrite() == false) + if (!isReadWrite()) return false; // m_file is always local, so we use TQFile TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) + if (!file.open(IO_WriteOnly)) return false; // use TQTextStream to dump the text to the file @@ -144,7 +144,7 @@ void %{APPNAMELC}Part::fileOpen() // button is clicked TQString file_name = KFileDialog::getOpenFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) openURL(file_name); } @@ -152,7 +152,7 @@ void %{APPNAMELC}Part::fileSaveAs() { // this slot is called whenever the File->Save As menu is selected, TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) + if (!file_name.isEmpty()) saveAs(file_name); } diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp index 8ce81310..a3b82a79 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.cpp @@ -157,7 +157,7 @@ void %{APPNAME}::load( const TQString &fileName ) TQTextStream ts( &f ); e->setText( ts.read() ); - e->setModified( FALSE ); + e->setModified( false ); setCaption( fileName ); statusBar()->message( tr("Loaded document %1").arg(fileName), 2000 ); } @@ -182,7 +182,7 @@ void %{APPNAME}::save() t << text; f.close(); - e->setModified( FALSE ); + e->setModified( false ); setCaption( filename ); diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp index 168cd8c4..869dfe96 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -34,7 +34,7 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters %{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) - : %{APPNAME}UI( parent, name, TRUE ) + : %{APPNAME}UI( parent, name, true ) { /// @todo //Connect your signals and slots here to configure the screen saver. diff --git a/languages/cpp/app_templates/wxhello/app.cpp b/languages/cpp/app_templates/wxhello/app.cpp index 6bcb3d47..1c761616 100644 --- a/languages/cpp/app_templates/wxhello/app.cpp +++ b/languages/cpp/app_templates/wxhello/app.cpp @@ -14,9 +14,9 @@ bool { %{APPNAME}Frame *frame = new %{APPNAME}Frame( wxT( "Hello World" ), wxPoint(50,50), wxSize(450,340) ); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } %{APPNAME}Frame::%{APPNAME}Frame( const wxString& title, const wxPoint& pos, const wxSize& size ) @@ -40,7 +40,7 @@ bool void %{APPNAME}Frame::OnQuit( wxCommandEvent& WXUNUSED( event ) ) { - Close(TRUE); + Close(true); } void diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index a1ad79b0..4c9dbd6e 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -32,7 +32,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) e.postfix + " "; if ( map.find( key ) == map.end() ) { - map[ key ] = TRUE; + map[ key ] = true; l << e; } } diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index f65db442..bcf805e5 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -83,7 +83,7 @@ void ConfigureProblemReporter::accept() void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) { delaySlider->setEnabled( b ); - if ( b == TRUE ) + if ( b ) delayLabel->show(); else delayLabel->hide(); diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index d09602c0..56cd0b50 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -256,7 +256,7 @@ static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) { e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); if ( map.find( key ) == map.end() ) { - map[ key ] = TRUE; + map[ key ] = true; l << e; } } @@ -271,7 +271,7 @@ static TQStringList unique( const TQStringList& entryList ) { while ( it != entryList.end() ) { TQString e = *it++; if ( map.find( e ) == map.end() ) { - map[ e ] = TRUE; + map[ e ] = true; l << e; } } @@ -287,7 +287,7 @@ static TQStringList unique( const TQValueList<TQStringList>& entryList ) { TQStringList li = ( *it++ ); TQString e = li.join( "\n" ); if ( map.find( e ) == map.end() ) { - map[ e ] = TRUE; + map[ e ] = true; l += li; } } @@ -2419,7 +2419,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { - showArguments = TRUE; + showArguments = true; } EvaluationResult type; diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 9aab172b..df303173 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -24,7 +24,7 @@ class CreatePCSDialog : public CreatePCSDialogBase public: - CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 517430da..c4b3023b 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -150,7 +150,7 @@ STTY::~STTY() int STTY::findTTY() { int ptyfd = -1; - bool needGrantPty = TRUE; + bool needGrantPty = true; // Find a master pty that we can open //////////////////////////////// @@ -163,7 +163,7 @@ int STTY::findTTY() strncpy(tty_slave, ptsname(ptyfd), 50); grantpt(ptyfd); unlockpt(ptyfd); - needGrantPty = FALSE; + needGrantPty = false; #endif // first we try UNIX PTY's @@ -177,7 +177,7 @@ int STTY::findTTY() struct stat sbuf; sprintf(tty_slave,"/dev/pts/%d",ptyno); if (stat(tty_slave,&sbuf) == 0 && S_ISCHR(sbuf.st_mode)) - needGrantPty = FALSE; + needGrantPty = false; else { close(ptyfd); ptyfd = -1; @@ -222,7 +222,7 @@ int STTY::findTTY() } if (ptyfd >= 0) { - if (needGrantPty && !chownpty(ptyfd, TRUE)) { + if (needGrantPty && !chownpty(ptyfd, true)) { fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave); fprintf(stderr," : This means the session can be eavesdroped.\n"); fprintf(stderr," : Make sure konsole_grantpty is installed and setuid root.\n"); diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 34a7fd9e..cb33ed94 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -223,7 +223,7 @@ void ProblemReporter::InitListView(TDEListView* listview) listview->addColumn( i18n("Line") ); listview->addColumn( i18n("Column") ); listview->addColumn( i18n("Problem") ); - listview->setAllColumnsShowFocus( TRUE ); + listview->setAllColumnsShowFocus( true ); connect( listview, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotSelected(TQListViewItem*)) ); diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 96ec6385..c670e95d 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -313,7 +313,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index 93fe9279..ee3a05d4 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase public: SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); ~SubclassingDlg(); private: diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 7c63a63f..7034560e 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -48,7 +48,7 @@ public: { if( !m_readFromDisk ){ //kdDebug(9013) << "-------> kapp is locked = " << kapp->locked() << endl; - bool needToLock = kapp->locked() == false; + bool needToLock = !kapp->locked(); if( needToLock ) kapp->lock(); diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h index ef0510d3..d135b418 100644 --- a/languages/java/configproblemreporter.ui.h +++ b/languages/java/configproblemreporter.ui.h @@ -37,7 +37,7 @@ void ConfigureProblemReporter::accept() void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b ) { delaySlider->setEnabled( b ); - if ( b == TRUE ) + if ( b ) delayLabel->show(); else delayLabel->hide(); diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e5a158b6..15184a40 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -93,7 +93,7 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const addColumn( i18n("Line") ); addColumn( i18n("Column") ); addColumn( i18n("Problem") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); @@ -229,7 +229,7 @@ void ProblemReporter::configure() kdDebug(9013) << "ProblemReporter::configure()" << endl; TDEConfig* config = kapp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnableJavaBgParser", TRUE ); + m_active = config->readBoolEntry( "EnableJavaBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 34d1f682..1106f7a6 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -332,7 +332,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false"); replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h index 651120b0..43c4ba6d 100644 --- a/languages/kjssupport/subclassingdlg.h +++ b/languages/kjssupport/subclassingdlg.h @@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase public: SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 ); + bool modal = false, WFlags fl = 0 ); /* SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy, TQWidget* parent = 0, const char* name = 0, - bool modal = FALSE, WFlags fl = 0 );*/ + bool modal = false, WFlags fl = 0 );*/ ~SubclassingDlg(); private: diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index d88599e0..9218ef35 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -82,7 +82,7 @@ ProblemReporter::ProblemReporter( PascalSupportPart* part, TQWidget* parent, con addColumn( i18n("File") ); addColumn( i18n("Line") ); //addColumn( i18n("Column") ); - setAllColumnsShowFocus( TRUE ); + setAllColumnsShowFocus( true ); m_timer = new TQTimer( this ); @@ -252,7 +252,7 @@ void ProblemReporter::configure() kdDebug(9007) << "ProblemReporter::configure()" << endl; TDEConfig* config = kapp->config(); config->setGroup( "General Options" ); - m_active = config->readBoolEntry( "EnablePascalBgParser", TRUE ); + m_active = config->readBoolEntry( "EnablePascalBgParser", true ); m_delay = config->readNumEntry( "BgParserDelay", 500 ); } diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index 3ed864bc..a50335a1 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -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/phperrorview.cpp b/languages/php/phperrorview.cpp index 85cbf4e7..5d8dccdc 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -184,7 +184,7 @@ 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, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotSelected(TQListViewItem*)) ); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index a9861678..d20bde2a 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -39,8 +39,8 @@ 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"); @@ -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); @@ -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 da4da636..6dbf4a13 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -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/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 cf498060..25de7864 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -443,7 +443,7 @@ bool PHPSupportPart::parseProject() _jd->dir.setPath( project()->projectDirectory() ); TQTimer::singleShot( 0, this, TQ_SLOT( slotParseFiles() ) ); - return TRUE; + return true; } void PHPSupportPart::slotParseFiles() @@ -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 { diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 0fcd2a17..bebf3fbe 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -155,7 +155,7 @@ STTY::~STTY() int STTY::findTTY() { int ptyfd = -1; - bool needGrantPty = TRUE; + bool needGrantPty = true; // Find a master pty that we can open //////////////////////////////// @@ -168,7 +168,7 @@ int STTY::findTTY() strncpy(tty_slave, ptsname(ptyfd), 50); grantpt(ptyfd); unlockpt(ptyfd); - needGrantPty = FALSE; + needGrantPty = false; #endif // first we try UNIX PTY's @@ -182,7 +182,7 @@ int STTY::findTTY() struct stat sbuf; sprintf(tty_slave,"/dev/pts/%d",ptyno); if (stat(tty_slave,&sbuf) == 0 && S_ISCHR(sbuf.st_mode)) - needGrantPty = FALSE; + needGrantPty = false; else { close(ptyfd); ptyfd = -1; @@ -227,7 +227,7 @@ int STTY::findTTY() } if (ptyfd >= 0) { - if (needGrantPty && !chownpty(ptyfd, TRUE)) { + if (needGrantPty && !chownpty(ptyfd, true)) { fprintf(stderr,"tdevelop: chownpty failed for device %s::%s.\n",pty_master,tty_slave); fprintf(stderr," : This means the session can be eavesdroped.\n"); fprintf(stderr," : Make sure konsole_grantpty is installed and setuid root.\n"); diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 79cbac07..2f920df6 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -518,7 +518,7 @@ void RubySupportPart::parse(const TQString &fileName) void RubySupportPart::slotRun () { // if we can't save all parts, then the user canceled - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; TQFileInfo program(mainProgram()); if (mainProgram().endsWith("script/server")) { @@ -875,7 +875,7 @@ void RubySupportPart::slotSwitchToView() void RubySupportPart::slotRunTestUnderCursor() { // if we can't save all parts, then the user canceled - if ( partController()->saveAllFiles() == false ) + if ( !partController()->saveAllFiles() ) return; KParts::ReadOnlyPart *ro_part = dynamic_cast<KParts::ReadOnlyPart*>(partController()->activePart()); diff --git a/languages/sql/sqloutputwidget.cpp b/languages/sql/sqloutputwidget.cpp index d845e6e0..83b8e74e 100644 --- a/languages/sql/sqloutputwidget.cpp +++ b/languages/sql/sqloutputwidget.cpp @@ -27,7 +27,7 @@ class TQCustomSqlCursor: public TQSqlCursor { public: - TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = TRUE, TQSqlDatabase* db = 0 ) : + TQCustomSqlCursor( const TQString & query = TQString(), bool autopopulate = true, TQSqlDatabase* db = 0 ) : TQSqlCursor( TQString(), autopopulate, db ) { exec( query ); @@ -42,15 +42,15 @@ public: TQCustomSqlCursor( const TQCustomSqlCursor & other ): TQSqlCursor( other ) {} bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } - TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const + TQSqlIndex primaryIndex( bool /*prime*/ = true ) const { return TQSqlIndex(); } - int insert( bool /*invalidate*/ = TRUE ) - { return FALSE; } - int update( bool /*invalidate*/ = TRUE ) - { return FALSE; } - int del( bool /*invalidate*/ = TRUE ) - { return FALSE; } - void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} + int insert( bool /*invalidate*/ = true ) + { return false; } + int update( bool /*invalidate*/ = true ) + { return false; } + int del( bool /*invalidate*/ = true ) + { return false; } + void setName( const TQString& /*name*/, bool /*autopopulate*/ = true ) {} }; |