diff options
Diffstat (limited to 'tools/designer/plugins')
22 files changed, 286 insertions, 286 deletions
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp index a5643b918..90b2fdbf7 100644 --- a/tools/designer/plugins/cppeditor/cppcompletion.cpp +++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp @@ -46,7 +46,7 @@ CppEditorCompletion::CppEditorCompletion( Editor *e ) bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) { if ( !ths ) - return FALSE; + return false; TQString object( objName ); int i = -1; if ( ( i = object.findRev( "->" ) ) != -1 ) @@ -62,7 +62,7 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) } if ( !obj ) - return FALSE; + return false; TQValueList<CompletionEntry> lst; @@ -79,7 +79,7 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) } } - TQStrList props = obj->metaObject()->propertyNames( TRUE ); + TQStrList props = obj->metaObject()->propertyNames( true ); for ( TQPtrListIterator<char> pit( props ); pit.current(); ++pit ) { TQString f( pit.current() ); TQChar c = f[ 0 ]; @@ -96,7 +96,7 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) lst << ce; } - TQStrList slts = obj->metaObject()->slotNames( TRUE ); + TQStrList slts = obj->metaObject()->slotNames( true ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); f = f.left( f.find( "(" ) ); @@ -109,10 +109,10 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) } if ( lst.isEmpty() ) - return FALSE; + return false; showCompletion( lst ); - return TRUE; + return true; } TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQString &expr, TQChar &separator, @@ -185,7 +185,7 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin if ( !obj ) return TQValueList<TQStringList>(); - TQStrList slts = obj->metaObject()->slotNames( TRUE ); + TQStrList slts = obj->metaObject()->slotNames( true ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); f = f.left( f.find( "(" ) ); @@ -204,7 +204,7 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin const TQMetaProperty *prop = obj->metaObject()-> - property( obj->metaObject()->findProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); + property( obj->metaObject()->findProperty( func[ 3 ].lower() + func.mid( 4 ), true ), true ); if ( prop ) { TQValueList<TQStringList> l; l << TQStringList( prop->type() ); diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp index 8b567ab20..70cffdde4 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -54,7 +54,7 @@ CppEditor::CppEditor( const TQString &fn, TQWidget *parent, const char *name, De browser = new CppEditorBrowser( this ); int j = 0; while ( SyntaxHighlighter_CPP::keywords[ j ] != TQString::null ) - completion->addCompletionEntry( SyntaxHighlighter_CPP::keywords[ j++ ], 0, FALSE ); + completion->addCompletionEntry( SyntaxHighlighter_CPP::keywords[ j++ ], 0, false ); configChanged(); } @@ -82,7 +82,7 @@ void CppEditor::configChanged() } else { if ( hScrollBarMode() != AlwaysOn ) { TQTextFormatterBreakWords *f = new TQTextFormatterBreakWords; - f->setWrapEnabled( FALSE ); + f->setWrapEnabled( false ); document()->setFormatter( f ); setHScrollBarMode( AlwaysOn ); } @@ -112,9 +112,9 @@ TQPopupMenu *CppEditor::createPopupMenu( const TQPoint &p ) int addimplid = m->insertItem( tr( "Add Include File (in Implementation)..." ), this, TQ_SLOT( addInclImpl() ) ); int addforid = m->insertItem( tr( "Add Forward Declaration..." ), this, TQ_SLOT( addForward() ) ); if ( !dIface->currentForm() ) { - m->setItemEnabled( adddeclid, FALSE ); - m->setItemEnabled( addimplid, FALSE ); - m->setItemEnabled( addforid, FALSE ); + m->setItemEnabled( adddeclid, false ); + m->setItemEnabled( addimplid, false ); + m->setItemEnabled( addforid, false ); } return m; } diff --git a/tools/designer/plugins/cppeditor/cppeditor.h b/tools/designer/plugins/cppeditor/cppeditor.h index 6df0d926c..647f175a3 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.h +++ b/tools/designer/plugins/cppeditor/cppeditor.h @@ -54,7 +54,7 @@ public: virtual EditorBrowser *browserManager() { return browser; } void configChanged(); - bool supportsBreakPoints() const { return FALSE; } + bool supportsBreakPoints() const { return false; } #if defined(Q_USING) using TQTextEdit::createPopupMenu; #endif diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 7b7747f3b..0880cb224 100644 --- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -76,7 +76,7 @@ TQWidget *EditorInterfaceImpl::editor( bool readonly, { if ( !viewManager ) { ( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( parent, 0 ); - ( (EditorInterfaceImpl*)this )->viewManager->showMarkerWidget( FALSE ); + ( (EditorInterfaceImpl*)this )->viewManager->showMarkerWidget( false ); if ( iface ) iface->queryInterface( IID_Designer, (TQUnknownInterface**) &dIface ); CppEditor *e = new CppEditor( TQString::null, viewManager, "editor", dIface ); @@ -95,7 +95,7 @@ void EditorInterfaceImpl::setText( const TQString &txt ) CppEditor *e = (CppEditor*)viewManager->currentView(); disconnect( e, TQ_SIGNAL( modificationChanged( bool ) ), this, TQ_SLOT( modificationChanged( bool ) ) ); e->setText( txt ); - e->setModified( FALSE ); + e->setModified( false ); connect( e, TQ_SIGNAL( modificationChanged( bool ) ), this, TQ_SLOT( modificationChanged( bool ) ) ); } @@ -112,14 +112,14 @@ TQString EditorInterfaceImpl::text() const bool EditorInterfaceImpl::isUndoAvailable() const { if ( !viewManager || !viewManager->currentView() ) - return FALSE; + return false; return ( (CppEditor*)viewManager->currentView() )->isUndoAvailable(); } bool EditorInterfaceImpl::isRedoAvailable() const { if ( !viewManager || !viewManager->currentView() ) - return FALSE; + return false; return ( (CppEditor*)viewManager->currentView() )->isRedoAvailable(); } @@ -168,7 +168,7 @@ void EditorInterfaceImpl::selectAll() bool EditorInterfaceImpl::find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) { if ( !viewManager || !viewManager->currentView() ) - return FALSE; + return false; CppEditor *e = (CppEditor*)viewManager->currentView(); if ( startAtCursor ) return e->find( expr, cs, wo, forward ); @@ -180,9 +180,9 @@ bool EditorInterfaceImpl::replace( const TQString &find, const TQString &replace bool forward, bool startAtCursor, bool replaceAll ) { if ( !viewManager || !viewManager->currentView() ) - return FALSE; + return false; CppEditor *e = (CppEditor*)viewManager->currentView(); - bool ok = FALSE; + bool ok = false; if ( startAtCursor ) { ok = e->find( find, cs, wo, forward ); } else { @@ -192,7 +192,7 @@ bool EditorInterfaceImpl::replace( const TQString &find, const TQString &replace if ( ok ) { e->removeSelectedText(); - e->insert( replace, FALSE, FALSE ); + e->insert( replace, false, false ); } if ( !replaceAll || !ok ) { @@ -204,16 +204,16 @@ bool EditorInterfaceImpl::replace( const TQString &find, const TQString &replace return ok; } - bool ok2 = TRUE; + bool ok2 = true; while ( ok2 ) { ok2 = e->find( find, cs, wo, forward ); if ( ok2 ) { e->removeSelectedText(); - e->insert( replace, FALSE, FALSE ); + e->insert( replace, false, false ); } } - return TRUE; + return true; } void EditorInterfaceImpl::gotoLine( int line ) @@ -295,7 +295,7 @@ void EditorInterfaceImpl::setModified( bool m ) bool EditorInterfaceImpl::isModified() const { if ( !viewManager ) - return FALSE; + return false; return ( (CppEditor*)viewManager->currentView() )->isModified(); } @@ -320,7 +320,7 @@ void EditorInterfaceImpl::intervalChanged() { if ( !dIface ) return; - updateTimer->start( 2000, TRUE ); + updateTimer->start( 2000, true ); } void EditorInterfaceImpl::update() diff --git a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp index 1fbd63e0d..1739f38e0 100644 --- a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp @@ -170,10 +170,10 @@ TQString LanguageInterfaceImpl::createEmptyFunction() bool LanguageInterfaceImpl::supports( Support s ) const { if ( s == ReturnType ) - return TRUE; + return true; if ( s == ConnectionsToCustomSlots ) - return TRUE; - return FALSE; + return true; + return false; } TQStringList LanguageInterfaceImpl::fileFilterList() const @@ -243,7 +243,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const { TQStrList sigs; - sigs = obj->metaObject()->signalNames( TRUE ); + sigs = obj->metaObject()->signalNames( true ); sigs.remove( "destroyed()" ); return sigs; } diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index fbf6f059d..87004bc44 100644 --- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -88,7 +88,7 @@ SourceTemplateInterface::Source SourceTemplateInterfaceImpl::create( const TQStr SourceTemplateInterface::Source src; src.type = SourceTemplateInterface::Source::Invalid; if ( templ == "C++ Main-File (main.cpp)" ) { - CppMainFile dia( 0, 0, TRUE ); + CppMainFile dia( 0, 0, true ); dia.setup( appIface ); if ( dia.exec() == TQDialog::Accepted ) { DesignerInterface *dIface = 0; diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index 7607cf730..333843e0d 100644 --- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp @@ -262,13 +262,13 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin int state = StateStandard; if ( string->prev() ) { if ( string->prev()->endState() == -1 ) - process( doc, string->prev(), 0, FALSE ); + process( doc, string->prev(), 0, false ); state = string->prev()->endState(); } int input = -1; int i = 0; - bool lastWasBackSlash = FALSE; - bool makeLastStandard = FALSE; + bool lastWasBackSlash = false; + bool makeLastStandard = false; ParagData *paragData = (ParagData*)string->extraData(); if ( paragData ) @@ -279,7 +279,7 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin TQString alphabeth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; TQString mathChars = "xXeE"; TQString numbers = "0123456789"; - bool questionMark = FALSE; + bool questionMark = false; TQChar lastChar; for (;;) { TQChar c = string->at( i )->c; @@ -348,13 +348,13 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin if ( state == StateStandard && !questionMark && lastChar != ':' && nextChar != ':' ) { for ( int j = 0; j < i; ++j ) { if ( string->at( j )->format() == formatStandard ) - string->setFormat( j, 1, formatLabel, FALSE ); + string->setFormat( j, 1, formatLabel, false ); } } } break; default: { if ( !questionMark && c == '?' ) - questionMark = TRUE; + questionMark = true; if ( c.isLetter() || c == '_' ) input = InputAlpha; else @@ -373,19 +373,19 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin switch ( state ) { case StateStandard: { int len = buffer.length(); - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i, 1, formatStandard, false ); if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; if ( buffer.length() > 0 && input != InputAlpha ) { if ( buffer[ 0 ] == 'Q' ) { - string->setFormat( i - buffer.length(), buffer.length(), formatType, FALSE ); + string->setFormat( i - buffer.length(), buffer.length(), formatType, false ); } else { TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->find( len ); if ( it != wordMap->end() ) { TQMap<TQString, int >::Iterator it2 = ( *it ).find( buffer ); if ( it2 != ( *it ).end() ) - string->setFormat( i - buffer.length(), buffer.length(), format( ( *it2 ) ), FALSE ); + string->setFormat( i - buffer.length(), buffer.length(), format( ( *it2 ) ), false ); } } buffer = TQString::null; @@ -393,102 +393,102 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin } break; case StateCommentStart1: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = TRUE; + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = true; buffer = TQString::null; break; case StateCCommentStart2: - string->setFormat( i - 1, 2, formatComment, FALSE ); - makeLastStandard = FALSE; + string->setFormat( i - 1, 2, formatComment, false ); + makeLastStandard = false; buffer = TQString::null; break; case StateCppCommentStart2: - string->setFormat( i - 1, 2, formatComment, FALSE ); - makeLastStandard = FALSE; + string->setFormat( i - 1, 2, formatComment, false ); + makeLastStandard = false; buffer = TQString::null; break; case StateCComment: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatComment, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatComment, false ); buffer = TQString::null; break; case StateCppComment: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatComment, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatComment, false ); buffer = TQString::null; break; case StateCCommentEnd1: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatComment, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatComment, false ); buffer = TQString::null; break; case StateCCommentEnd2: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatComment, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatComment, false ); buffer = TQString::null; break; case StateStringStart: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatStandard, false ); buffer = TQString::null; break; case StateString: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatString, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatString, false ); buffer = TQString::null; break; case StateStringEnd: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatStandard, false ); buffer = TQString::null; break; case StateString2Start: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatStandard, false ); buffer = TQString::null; break; case StateString2: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatString, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatString, false ); buffer = TQString::null; break; case StateString2End: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatStandard, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatStandard, false ); buffer = TQString::null; break; case StateNumber: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatNumber, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatNumber, false ); buffer = TQString::null; break; case StatePreProcessor: if ( makeLastStandard ) - string->setFormat( i - 1, 1, formatStandard, FALSE ); - makeLastStandard = FALSE; - string->setFormat( i, 1, formatPreProcessor, FALSE ); + string->setFormat( i - 1, 1, formatStandard, false ); + makeLastStandard = false; + string->setFormat( i, 1, formatPreProcessor, false ); buffer = TQString::null; break; } @@ -513,7 +513,7 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin string->setEndState( StateStandard ); } - string->setFirstPreProcess( FALSE ); + string->setFirstPreProcess( false ); TQTextParagraph *p = string->next(); if ( (!!oldEndState || !!string->endState()) && oldEndState != string->endState() && diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h index 45cd01350..b6e6e721b 100644 --- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h +++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h @@ -53,7 +53,7 @@ public: SyntaxHighlighter_CPP(); virtual ~SyntaxHighlighter_CPP(); - void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE ); + void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = true ); void updateStyles( const TQMap<TQString, ConfigStyle> &styles ); static const char * const keywords[]; diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp index 1f06a02e7..0955e896c 100644 --- a/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tools/designer/plugins/cppeditor/yyreg.cpp @@ -159,7 +159,7 @@ static int getToken() if ( yyCh == EOF ) { break; } else if ( isspace(yyCh) ) { - bool metNL = FALSE; + bool metNL = false; do { metNL = ( metNL || yyCh == '\n' ); readChar(); @@ -294,8 +294,8 @@ static int getToken() */ readChar(); if ( yyCh == '*' ) { - bool metAster = FALSE; - bool metAsterSlash = FALSE; + bool metAster = false; + bool metAsterSlash = false; readChar(); @@ -304,11 +304,11 @@ static int getToken() break; if ( yyCh == '*' ) - metAster = TRUE; + metAster = true; else if ( metAster && yyCh == '/' ) - metAsterSlash = TRUE; + metAsterSlash = true; else - metAster = FALSE; + metAster = false; readChar(); } break; @@ -406,8 +406,8 @@ TQString CppFunction::prototype() const static int yyTok; // the current token /* - Returns TRUE if thingy is a constructor or a destructor; otherwise - returns FALSE. + Returns true if thingy is a constructor or a destructor; otherwise + returns false. */ static bool isCtorOrDtor( const TQString& thingy ) { @@ -512,7 +512,7 @@ static TQString matchDataType() Alpha::Beta::Gamma::...::Omega. */ for ( ;; ) { - bool modifierMet = FALSE; + bool modifierMet = false; prependToType( &type, matchTemplateAngles() ); @@ -525,7 +525,7 @@ static TQString matchDataType() prependToType( &type, yyLex ); yyTok = getToken(); if ( yyTok != Tok_const ) - modifierMet = TRUE; + modifierMet = true; } if ( yyTok == Tok_Tilde ) { @@ -578,10 +578,10 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) TQString scopedName; TQStringList params; TQString qualifier; - bool cnst = FALSE; + bool cnst = false; if ( yyTok == Tok_const ) { - cnst = TRUE; + cnst = true; yyTok = getToken(); } @@ -753,7 +753,7 @@ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) // found a left brace yyTok = getToken(); startBody = yyPos; - CppFunction func = matchFunctionPrototype( FALSE ); + CppFunction func = matchFunctionPrototype( false ); if ( !func.scopedName().isEmpty() ) { TQString body = yyIn->mid( startBody, endBody - startBody ); setBody( &func, body ); @@ -794,7 +794,7 @@ TQString canonicalCppProto( const TQString& proto ) { startTokenizer( proto ); yyTok = getToken(); - CppFunction func = matchFunctionPrototype( TRUE ); + CppFunction func = matchFunctionPrototype( true ); stopTokenizer(); return func.prototype(); } diff --git a/tools/designer/plugins/cppeditor/yyreg.h b/tools/designer/plugins/cppeditor/yyreg.h index 5ac3fc2f3..fec27cda2 100644 --- a/tools/designer/plugins/cppeditor/yyreg.h +++ b/tools/designer/plugins/cppeditor/yyreg.h @@ -41,7 +41,7 @@ class CppFunction { public: - CppFunction() : cnst( FALSE ), lineno1( 0 ), lineno2( 0 ) { } + CppFunction() : cnst( false ), lineno1( 0 ), lineno2( 0 ) { } void setReturnType( const TQString& r ) { ret = r; } void setScopedName( const TQString& n ) { nam = n; } @@ -67,7 +67,7 @@ public: int closingBraceLineNum() const { return lineno2; } #if defined(TQ_FULL_TEMPLATE_INSTANTIATION) - bool operator==( const CppFunction& ) const { return FALSE; } + bool operator==( const CppFunction& ) const { return false; } #endif private: diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index 23e18063e..bb425670b 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -523,7 +523,7 @@ void Dlg2Ui::flushWidgets() TQString className = widgetClassName( *yyWidgetMap.begin() ); if ( !widgetForLayout.exactMatch(className) ) { emitOpeningWidget( className ); - emitWidgetBody( *yyWidgetMap.begin(), FALSE ); + emitWidgetBody( *yyWidgetMap.begin(), false ); emitClosing( TQString("widget") ); } yyWidgetMap.remove( yyWidgetMap.begin() ); @@ -827,18 +827,18 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted ) if ( type == TQString("qstring") ) type = TQString( "string" ); - bool omit = FALSE; + bool omit = false; if ( propertyName == TQString("backgroundOrigin") && val.toString() == TQString("WidgetOrigin") ) - omit = TRUE; + omit = true; if ( propertyName == TQString("enabled") && val.toBool() ) - omit = TRUE; + omit = true; if ( propertyName == TQString("minimumSize") && val.toSize() == TQSize(-1, -1) ) - omit = TRUE; + omit = true; if ( propertyName == TQString("maximumSize") && val.toSize() == TQSize(32767, 32767) ) - omit = TRUE; + omit = true; if ( !omit ) emitProperty( propertyName, val, type ); @@ -1013,7 +1013,7 @@ void Dlg2Ui::matchDialogCommon( const TQDomElement& dialogCommon ) TQString dataSource; TQString dataName; TQString windowBaseClass( "TQDialog" ); - bool isCustom = FALSE; + bool isCustom = false; TQString customBaseHeader; TQString windowCaption; @@ -1040,7 +1040,7 @@ void Dlg2Ui::matchDialogCommon( const TQDomElement& dialogCommon ) dataName = val; } else if ( tagName == TQString("WindowBaseClass") ) { if ( val == TQString("Custom") ) - isCustom = TRUE; + isCustom = true; else windowBaseClass = val; } else if ( tagName == TQString("IsModal") ) { @@ -1083,7 +1083,7 @@ void Dlg2Ui::matchBoxLayout( const TQDomElement& boxLayout ) int autoBorder = 5; TQString name; bool needsWidget = needsTQLayoutWidget( boxLayout ); - bool opened = FALSE; + bool opened = false; TQDomNode n = boxLayout.firstChild(); while ( !n.isNull() ) { @@ -1096,7 +1096,7 @@ void Dlg2Ui::matchBoxLayout( const TQDomElement& boxLayout ) if ( !directionStr.isEmpty() ) emitProperty( TQString("direction"), directionStr, TQString("enum") ); - opened = TRUE; + opened = true; } matchLayout( n.toElement() ); } else { @@ -1172,7 +1172,7 @@ void Dlg2Ui::matchGridLayout( const TQDomElement& gridLayout ) TQString name; TQString menu; bool needsWidget = needsTQLayoutWidget( gridLayout ); - bool opened = FALSE; + bool opened = false; TQDomNode n = gridLayout.firstChild(); while ( !n.isNull() ) { @@ -1184,7 +1184,7 @@ void Dlg2Ui::matchGridLayout( const TQDomElement& gridLayout ) autoBorder ); yyGridRow = -1; yyGridColumn = -1; - opened = TRUE; + opened = true; } matchLayout( n.toElement() ); } else { @@ -1307,7 +1307,7 @@ void Dlg2Ui::matchLayoutWidget( const TQDomElement& layoutWidget ) emitClosingLayout( needsWidget, TQString("grid") ); } else { emitOpeningWidget( widgetClassName(*w) ); - emitWidgetBody( *w, TRUE ); + emitWidgetBody( *w, true ); if ( !children.isNull() ) matchLayout( children ); emitClosing( TQString("widget") ); diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp index 70fc9f340..b6a75d5b2 100644 --- a/tools/designer/plugins/dlg/main.cpp +++ b/tools/designer/plugins/dlg/main.cpp @@ -90,7 +90,7 @@ TQStringList DlgFilter::import( const TQString &, const TQString& filename ) bool DlgFilter::init() { - return TRUE; + return true; } void DlgFilter::cleanup() @@ -99,7 +99,7 @@ void DlgFilter::cleanup() bool DlgFilter::canUnload() const { - return TRUE; + return true; } TQ_EXPORT_COMPONENT() diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index b1bbe9ca7..442776e8d 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -270,7 +270,7 @@ Glade2Ui::Glade2Ui() TQString Glade2Ui::imageName( const TQString& fileName ) { return *yyImages.insert( fileName, TQString("image%1").arg(yyImages.count()), - FALSE ); + false ); } TQString Glade2Ui::opening( const TQString& tag, const AttributeMap& attr ) @@ -476,8 +476,8 @@ TQString Glade2Ui::gtk2qtClass( const TQString& gtkClass, if ( gtkClass == TQString("GtkScrolledWindow") ) { if ( childWidgets.count() == 1 ) { TQString g; - bool editable = FALSE; - bool showTitles = TRUE; + bool editable = false; + bool showTitles = true; TQDomNode n = childWidgets.first().firstChild(); while ( !n.isNull() ) { @@ -909,7 +909,7 @@ void Glade2Ui::emitGnomeAbout( TQString copyright, TQString authors, Emit the application name. */ emitOpeningWidget( TQString("TQLabel") ); - emitFontProperty( TQString("font"), 24, TRUE ); + emitFontProperty( TQString("font"), 24, true ); emitProperty( TQString("text"), prog ); emitProperty( TQString("alignment"), TQString("AlignAuto|AlignCenter"), TQString("set") ); @@ -919,7 +919,7 @@ void Glade2Ui::emitGnomeAbout( TQString copyright, TQString authors, Emit the copyright notice. */ emitOpeningWidget( TQString("TQLabel") ); - emitFontProperty( TQString("font"), 12, TRUE ); + emitFontProperty( TQString("font"), 12, true ); emitProperty( TQString("text"), copyright ); emitClosing( TQString("widget") ); @@ -930,14 +930,14 @@ void Glade2Ui::emitGnomeAbout( TQString copyright, TQString authors, emitOpening( TQString("hbox") ); emitOpeningWidget( TQString("TQLabel") ); - emitFontProperty( TQString("font"), 12, TRUE ); + emitFontProperty( TQString("font"), 12, true ); emitProperty( TQString("text"), TQString("Authors:") ); emitProperty( TQString("alignment"), TQString("AlignAuto|AlignTop"), TQString("set") ); emitClosing( TQString("widget") ); emitOpeningWidget( TQString("TQLabel") ); - emitFontProperty( TQString("font"), 12, FALSE ); + emitFontProperty( TQString("font"), 12, false ); emitProperty( TQString("text"), authors ); emitProperty( TQString("alignment"), TQString("AlignAuto|AlignTop"), TQString("set") ); @@ -952,7 +952,7 @@ void Glade2Ui::emitGnomeAbout( TQString copyright, TQString authors, Emit the comments. */ emitOpeningWidget( TQString("TQLabel") ); - emitFontProperty( TQString("font"), 10, FALSE ); + emitFontProperty( TQString("font"), 10, false ); emitProperty( TQString("text"), comments ); emitProperty( TQString("alignment"), TQString("AlignAuto|AlignTop"), TQString("set") ); @@ -1004,7 +1004,7 @@ void Glade2Ui::emitGnomeAppChildWidgetsPass1( } if ( childName == TQString("GnomeDock:contents") ) { - emitWidget( *c, FALSE ); + emitWidget( *c, false ); } else { emitGnomeAppChildWidgetsPass1( grandchildWidgets ); } @@ -1188,7 +1188,7 @@ void Glade2Ui::emitGtkNotebookChildWidgets( tabNames.remove( tabNames.begin() ); emitAttribute( TQString("title"), accelerate(tabLabels.first()) ); tabLabels.remove( tabLabels.begin() ); - emitWidget( *c, FALSE ); + emitWidget( *c, false ); emitClosing( TQString("widget") ); } ++c; @@ -1359,7 +1359,7 @@ void Glade2Ui::emitGtkWindowChildWidgets( const TQValueList<TQDomElement>& childWidgets, const TQString& qtClass ) { if ( childWidgets.count() == 1 && qtClass == TQString("TQWizard") ) { - emitFontProperty( TQString("titleFont"), 18, FALSE ); + emitFontProperty( TQString("titleFont"), 18, false ); TQDomNode n = childWidgets.first().firstChild(); while ( !n.isNull() ) { @@ -1368,7 +1368,7 @@ void Glade2Ui::emitGtkWindowChildWidgets( n = n.nextSibling(); } } else { - emitChildWidgets( childWidgets, FALSE ); + emitChildWidgets( childWidgets, false ); } } @@ -1388,7 +1388,7 @@ bool Glade2Ui::packEnd( const TQDomElement& widget ) } n = n.nextSibling(); } - return FALSE; + return false; } void Glade2Ui::emitChildWidgets( const TQValueList<TQDomElement>& childWidgets, @@ -1436,9 +1436,9 @@ void Glade2Ui::emitOpeningWidget( const TQString& qtClass, int leftAttach, } /* - Returns TRUE if the vbox containing childWidgets should have a + Returns true if the vbox containing childWidgets should have a spacer at the end to prevent it from looking bad, otherwise returns - FALSE. + false. The algorithm is very experimental. */ @@ -1466,10 +1466,10 @@ bool Glade2Ui::shouldPullup( const TQValueList<TQDomElement>& childWidgets ) if ( !gtkSmallWidget.exactMatch(gtkClass) || !shouldPullup(grandchildWidgets) ) - return FALSE; + return false; ++c; } - return TRUE; + return true; } TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, @@ -1492,13 +1492,13 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, int numRows = 0; int numColumns = 0; - bool active = FALSE; + bool active = false; TQString authors; TQString childName; TQString comments; TQString copyright; TQString creationFunction; - bool editable = TRUE; + bool editable = true; TQString filename; TQString focusTarget; TQString hscrollbarPolicy; @@ -1513,21 +1513,21 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, int pageSize = 10; TQString selectionMode; TQString shadowType( "GTK_SHADOW_NONE" ); - bool showText = TRUE; - bool showTitles = TRUE; + bool showText = true; + bool showTitles = true; int step = 1; TQString tabPos; TQString text; int textMaxLength = 0; - bool textVisible = TRUE; + bool textVisible = true; TQString tooltip; TQString type; int upper = 123456789; int value = 123456789; - bool valueInList = TRUE; + bool valueInList = true; TQString vscrollbarPolicy; TQString watermarkImage; - bool wrap = FALSE; + bool wrap = false; bool topLevel = yyFormName.isEmpty(); if ( topLevel ) @@ -1758,7 +1758,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, if ( gtkClass == TQString("GtkHButtonBox") || childName == TQString("Dialog:action_area") ) emitSpacer( orientation ); - emitChildWidgets( childWidgets, TRUE ); + emitChildWidgets( childWidgets, true ); if ( gtkClass == TQString("GtkVButtonBox") || childName == TQString("Dialog:action_area") || @@ -1773,7 +1773,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, if ( layouted ) emitClosing( TQString("widget") ); } else if ( gtkClass == TQString("GtkFixed") && !layouted ) { - emitChildWidgets( childWidgets, FALSE ); + emitChildWidgets( childWidgets, false ); /* Placeholders in a grid are typically needless. */ @@ -1781,7 +1781,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, bool needFakeLayout = ( !layouted && !topLevel && x == 0 && y == 0 && width == 0 && height == 0 ); TQString qtClass = gtk2qtClass( gtkClass, childWidgets ); - bool unknown = FALSE; + bool unknown = false; if ( qtClass == TQString("TQFrame") && !label.isEmpty() ) { qtClass = TQString( "TQButtonGroup" ); @@ -1793,7 +1793,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, yyCustomWidgets.insert( qtClass, TQString::null ); } else if ( qtClass == TQString("Unknown") ) { qtClass = TQString( "TQLabel" ); - unknown = TRUE; + unknown = true; } if ( qtClass.isEmpty() ) { @@ -1940,7 +1940,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, emitGnomeAppChildWidgetsPass1( childWidgets ); } else if ( gtkClass == TQString("GnomePropertyBox") ) { emitOpening( TQString("vbox") ); - emitChildWidgets( childWidgets, TRUE ); + emitChildWidgets( childWidgets, true ); emitOpeningWidget( TQString("TQLayoutWidget") ); emitOpening( TQString("hbox") ); emitPushButton( TQString("&Help"), TQString("helpButton") ); @@ -1975,7 +1975,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, TQString("AlignAuto|AlignCenter"), TQString("set") ); } else if ( qtClass != TQString("TQListBox") ) { - emitChildWidgets( childWidgets, FALSE ); + emitChildWidgets( childWidgets, false ); } emitClosing( TQString("widget") ); @@ -2024,7 +2024,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) TQProgressDialog fremskritt( TQString("Converting Glade files..."), TQString("Abort Conversion"), numWidgets, 0, - "fremskritt", TRUE ); + "fremskritt", true ); n = root.firstChild(); while ( !n.isNull() ) { @@ -2058,7 +2058,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) uniqueToolBar = 1; emitHeader(); - TQString name = emitWidget( n.toElement(), FALSE ); + TQString name = emitWidget( n.toElement(), false ); if ( !yyCustomWidgets.isEmpty() ) { emitOpening( TQString("customwidgets") ); diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp index 8cb0353f5..93af82bcc 100644 --- a/tools/designer/plugins/glade/main.cpp +++ b/tools/designer/plugins/glade/main.cpp @@ -91,7 +91,7 @@ TQStringList GladeFilter::import( const TQString &, const TQString& filename ) bool GladeFilter::init() { - return TRUE; + return true; } void GladeFilter::cleanup() @@ -100,7 +100,7 @@ void GladeFilter::cleanup() bool GladeFilter::canUnload() const { - return TRUE; + return true; } TQ_EXPORT_COMPONENT() diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp index e92301924..0467d7ace 100644 --- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp +++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp @@ -177,26 +177,26 @@ void KDEVDLG2UI::writeColor( const TQString& name, const TQString& value ) void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) { if ( isFrame ) { - bool defineFrame = FALSE; + bool defineFrame = false; TQString shadow = "NoFrame"; TQString shape = "StyledPanel"; int width = 2; if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; - defineFrame = TRUE; + defineFrame = true; } if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; - defineFrame = TRUE; + defineFrame = true; } if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; - defineFrame = TRUE; + defineFrame = true; } if ( !styles.contains( "WS_BORDER" ) ) { shape = "NoFrame"; - defineFrame = TRUE; + defineFrame = true; } if ( defineFrame ) { @@ -207,11 +207,11 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) } if ( styles.contains("WS_DISABLED") ) - writeBool("enabled", FALSE ); + writeBool("enabled", false ); if ( styles.contains("WS_EX_ACCEPTFILES") ) - writeBool("acceptDrops", TRUE ); + writeBool("acceptDrops", true ); if ( styles.contains("WS_EX_TRANSPARENT") ) - writeBool("autoMask", TRUE ); + writeBool("autoMask", true ); if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -223,7 +223,7 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) KDEVDLG2UI::KDEVDLG2UI( TQTextStream* input, const TQString& name ) { className = name; - writeToFile = TRUE; + writeToFile = true; in = input; indentation = 0; out = 0; @@ -263,7 +263,7 @@ bool KDEVDLG2UI::parse() delete out; out = 0; - return TRUE; + return true; } /*! @@ -271,7 +271,7 @@ bool KDEVDLG2UI::parse() */ bool KDEVDLG2UI::parse( TQStringList& get ) { - writeToFile = FALSE; + writeToFile = false; bool result = parse(); get = target; return result; @@ -322,7 +322,7 @@ bool KDEVDLG2UI::writeDialog( const TQString& name ) TQString family = font.section("\"", 1, 1 ); int pointSize = font.section("\"", 3, 3 ).toInt(); //int weight = font.section("\"", 5, 5 ).toInt(); - //bool italic = ( font.section("\"", 7, 7 ) == "TRUE" ); + //bool italic = ( font.section("\"", 7, 7 ) == "true" ); writeFont( family, pointSize ); // weight, italic ? } else if ( line.left( 9 ) == "IsEnabled" ) { bool isEnabled = @@ -519,6 +519,6 @@ bool KDEVDLG2UI::writeDialog( const TQString& name ) //} } *out << "</UI>" << endl; - return TRUE; + return true; } diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp index a9ddde96a..07a7bed78 100644 --- a/tools/designer/plugins/kdevdlg/main.cpp +++ b/tools/designer/plugins/kdevdlg/main.cpp @@ -102,7 +102,7 @@ TQStringList KDevDlgFilter::import( const TQString &, const TQString& filename ) bool KDevDlgFilter::init() { - return TRUE; + return true; } void KDevDlgFilter::cleanup() @@ -111,7 +111,7 @@ void KDevDlgFilter::cleanup() bool KDevDlgFilter::canUnload() const { - return TRUE; + return true; } TQ_EXPORT_COMPONENT() diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp index aebdb0aba..2a18aa70a 100644 --- a/tools/designer/plugins/rc/main.cpp +++ b/tools/designer/plugins/rc/main.cpp @@ -99,7 +99,7 @@ TQStringList RCFilter::import( const TQString &, const TQString& filename ) bool RCFilter::init() { - return TRUE; + return true; } void RCFilter::cleanup() @@ -108,7 +108,7 @@ void RCFilter::cleanup() bool RCFilter::canUnload() const { - return TRUE; + return true; } TQ_EXPORT_COMPONENT() diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp index 3189dde0a..d507d7b16 100644 --- a/tools/designer/plugins/rc/rc2ui.cpp +++ b/tools/designer/plugins/rc/rc2ui.cpp @@ -160,26 +160,26 @@ void RC2UI::writeSet( const TQString& name, const TQString& value ) void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) { if ( isFrame ) { - bool defineFrame = FALSE; + bool defineFrame = false; TQString shadow = "NoFrame"; TQString shape = "StyledPanel"; int width = 2; if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; - defineFrame = TRUE; + defineFrame = true; } if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; - defineFrame = TRUE; + defineFrame = true; } if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; - defineFrame = TRUE; + defineFrame = true; } if ( !styles.contains( "WS_BORDER" ) ) { shape = "NoFrame"; - defineFrame = TRUE; + defineFrame = true; } if ( defineFrame ) { @@ -190,11 +190,11 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) } if ( styles.contains("WS_DISABLED") ) - writeBool("enabled", FALSE ); + writeBool("enabled", false ); if ( styles.contains("WS_EX_ACCEPTFILES") ) - writeBool("acceptDrops", TRUE ); + writeBool("acceptDrops", true ); if ( styles.contains("WS_EX_TRANSPARENT") ) - writeBool("autoMask", TRUE ); + writeBool("autoMask", true ); if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -207,7 +207,7 @@ RC2UI::RC2UI( TQTextStream* input ) : blockStart1( "/////////////////////////////////////////////////////////////////////////////" ), blockStart2( "//" ) { - writeToFile = TRUE; + writeToFile = true; in = input; indentation = 0; out = 0; @@ -231,11 +231,11 @@ bool RC2UI::parse() while ( line != blockStart1 && !in->eof() ) line = in->readLine(); if ( in->eof() ) - return FALSE; + return false; while ( line != blockStart2 && !in->eof() ) line = in->readLine(); if ( in->eof() ) - return FALSE; + return false; line = in->readLine(); @@ -244,37 +244,37 @@ bool RC2UI::parse() if ( in->readLine() == "//" && in->readLine().isEmpty() && !in->eof() ) { if ( type == "Dialog" ) { if ( !makeDialog() ) - return FALSE; + return false; } /* else if ( type == "Bitmap" ) { if ( !makeBitmap() ) - return FALSE; + return false; } else if ( type == "String Table" ) { if ( !makeStringTable() ) - return FALSE; + return false; } else if ( type == "Accelerator" ) { if ( !makeAccelerator() ) - return FALSE; + return false; } else if ( type == "Cursor" ) { if ( !makeCursor() ) - return FALSE; + return false; } else if ( type == "HTML" ) { if ( !makeHTML() ) - return FALSE; + return false; } else if ( type == "Icon" ) { if ( !makeIcon() ) - return FALSE; + return false; } else if ( type == "Version" ) { if ( !makeVersion() ) - return FALSE; + return false; } */ } } else - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -283,7 +283,7 @@ bool RC2UI::parse() bool RC2UI::parse( TQStringList& get ) { - writeToFile = FALSE; + writeToFile = false; bool result = parse(); get = target; return result; @@ -322,7 +322,7 @@ bool RC2UI::makeDialog() TQCString className; uint x, y, w, h; uint endDesc; - bool space = FALSE; + bool space = false; for ( endDesc = 0; endDesc < line.length() ; endDesc++ ) { char c = (TQChar)line.at(endDesc); if ( space && (c >= '0') && (c <= '9') ) @@ -338,7 +338,7 @@ bool RC2UI::makeDialog() count = sscanf( line, "%u, %u, %u, %u", &x, &y, &w, &h ); if ( !count && count == EOF ) - return FALSE; + return false; char property[256]; TQStringList styles; @@ -354,7 +354,7 @@ bool RC2UI::makeDialog() line = ""; do { if ( in->eof() ) - return TRUE; + return true; line += in->readLine(); } while ( line[(int)line.length()-1] == '|' || line[(int)line.length()-1] == ',' ); @@ -398,7 +398,7 @@ bool RC2UI::makeDialog() do { if ( in->eof() ) - return TRUE; + return true; line = in->readLine().stripWhiteSpace(); if ( line == "END" ) @@ -416,30 +416,30 @@ bool RC2UI::makeDialog() TQString controlType; TQString widgetID; TQString widgetText; - bool hasText = FALSE; - bool isControl = FALSE; - bool isFrame = FALSE; + bool hasText = false; + bool isControl = false; + bool isFrame = false; if ( widgetType == "PUSHBUTTON" ) { ID = IDPushButton; - hasText = TRUE; + hasText = true; } else if ( widgetType == "DEFPUSHBUTTON" ) { ID = IDPushButton; - hasText = TRUE; + hasText = true; } else if ( widgetType == "LTEXT" ) { ID = IDLabel; - hasText = TRUE; + hasText = true; } else if ( widgetType == "CTEXT" ) { ID = IDLabel; - hasText = TRUE; + hasText = true; } else if ( widgetType == "RTEXT" ) { ID = IDLabel; - hasText = TRUE; + hasText = true; } else if ( widgetType == "EDITTEXT" ) { ID = IDLineEdit; } else if ( widgetType == "GROUPBOX" ) { ID = IDGroupBox; - hasText = TRUE; + hasText = true; } else if ( widgetType == "COMBOBOX" ) { ID = IDComboBox; } else if ( widgetType == "LISTBOX" ) { @@ -448,12 +448,12 @@ bool RC2UI::makeDialog() ID = IDScrollBar; } else if ( widgetType == "CHECKBOX" ) { ID = IDCheckBox; - hasText = TRUE; + hasText = true; } else if ( widgetType == "RADIOBUTTON" ) { ID = IDRadioButton; - hasText = TRUE; + hasText = true; } else if ( widgetType == "CONTROL" ) { - isControl = TRUE; + isControl = true; widgetText = stripQM(parseNext( arguments )); widgetID = parseNext( arguments ); controlType = stripQM(parseNext( arguments )); @@ -526,12 +526,12 @@ bool RC2UI::makeDialog() writeRect( "geometry", x, y, w, h ); writeString( "text", widgetText ); if ( widgetType == "DEFPUSHBUTTON" ) - writeBool( "default", TRUE ); + writeBool( "default", true ); } break; case IDLabel: { - isFrame = TRUE, + isFrame = true, writeClass("TQLabel"); writeCString( "name", useName("Label_"+widgetID) ); writeRect( "geometry", x,y,w,h ); @@ -558,7 +558,7 @@ bool RC2UI::makeDialog() writeRect("geometry", x,y,w,h); writeString("text", widgetText ); if ( styles.contains( "BS_3STATE" ) ) - writeBool( "tristate", TRUE ); + writeBool( "tristate", true ); } break; case IDRadioButton: @@ -571,7 +571,7 @@ bool RC2UI::makeDialog() break; case IDGroupBox: { - isFrame = TRUE; + isFrame = true; writeClass("TQGroupBox"); writeCString( "name", useName("GroupBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); @@ -609,31 +609,31 @@ bool RC2UI::makeDialog() break; case IDIconView: { - isFrame = TRUE; + isFrame = true; writeClass("TQIconView"); writeCString("name", useName("IconView_"+widgetID) ); writeRect("geometry", x,y,w,h ); if ( !styles.contains( "LVS_SINGLESEL" ) ) writeEnum( "selectionMode", "Extended" ); if ( styles.contains( "LVS_NOLABELWRAP" ) ) - writeBool("wordWrapIconText", FALSE ); + writeBool("wordWrapIconText", false ); } break; case IDListView: { - isFrame = TRUE; + isFrame = true; writeClass("TQListView"); writeCString("name", useName("ListView_"+widgetID) ); writeRect("geometry", x,y,w,h ); if ( styles.contains( "TVS_LINESATROOT" ) ) - writeBool( "rootIsDecorated", TRUE ); + writeBool( "rootIsDecorated", true ); if ( styles.contains( "TVS_FULLROWSELECT" ) ) - writeBool( "allColumnsShowFocus", TRUE ); + writeBool( "allColumnsShowFocus", true ); } break; case IDProgressBar: { - isFrame = TRUE; + isFrame = true; writeClass("TQProgressBar"); writeCString("name", useName("ProgressBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); @@ -659,7 +659,7 @@ bool RC2UI::makeDialog() break; case IDSpinBox: { - isFrame = TRUE; + isFrame = true; writeClass("TQSpinBox"); writeCString("name", useName("SpinBox_"+widgetID) ); writeRect("geometry", x,y,w,h); @@ -690,7 +690,7 @@ bool RC2UI::makeDialog() break; case IDListBox: { - isFrame = TRUE; + isFrame = true; writeClass("TQListBox"); writeCString("name", useName("ListBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); @@ -769,7 +769,7 @@ bool RC2UI::makeDialog() } while ( line != blockStart1 ); - return TRUE; + return true; } /*! Not yet implemented @@ -777,7 +777,7 @@ bool RC2UI::makeDialog() bool RC2UI::makeBitmap() { - return TRUE; + return true; } /*! Not yet implemented @@ -785,7 +785,7 @@ bool RC2UI::makeBitmap() bool RC2UI::makeAccelerator() { - return TRUE; + return true; } /*! Not yet implemented @@ -793,7 +793,7 @@ bool RC2UI::makeAccelerator() bool RC2UI::makeCursor() { - return TRUE; + return true; } /*! Not yet implemented @@ -801,7 +801,7 @@ bool RC2UI::makeCursor() bool RC2UI::makeHTML() { - return TRUE; + return true; } /*! Not yet implemented @@ -809,7 +809,7 @@ bool RC2UI::makeHTML() bool RC2UI::makeIcon() { - return TRUE; + return true; } /*! @@ -820,7 +820,7 @@ bool RC2UI::makeIcon() bool RC2UI::makeStringTable() { if ( !writeToFile ) - return TRUE; + return true; TQFile fileOut; line = in->readLine(); @@ -829,7 +829,7 @@ bool RC2UI::makeStringTable() char discard[12]; sscanf( line, "%s %s", stringtable, discard ); if ( TQString(stringtable) != "STRINGTABLE" ) - return TRUE; + return true; do { line = in->readLine(); } while ( line != "BEGIN" ); @@ -876,7 +876,7 @@ bool RC2UI::makeStringTable() } } while ( line != blockStart1 ); - return TRUE; + return true; } /*! Not yet implemented @@ -884,5 +884,5 @@ bool RC2UI::makeStringTable() bool RC2UI::makeVersion() { - return TRUE; + return true; } diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp index 7a84ef115..b2d33dee5 100644 --- a/tools/designer/plugins/wizards/main.cpp +++ b/tools/designer/plugins/wizards/main.cpp @@ -63,7 +63,7 @@ private: }; StandardTemplateWizardInterface::StandardTemplateWizardInterface() - : inUse( FALSE ) + : inUse( false ) { } @@ -73,7 +73,7 @@ StandardTemplateWizardInterface::~StandardTemplateWizardInterface() bool StandardTemplateWizardInterface::init() { - return TRUE; + return true; } void StandardTemplateWizardInterface::cleanup() @@ -99,23 +99,23 @@ TQStringList StandardTemplateWizardInterface::featureList() const void StandardTemplateWizardInterface::setup( const TQString &templ, TQWidget *widget, DesignerFormWindow *fw, TQUnknownInterface *aIface ) { - inUse = TRUE; + inUse = true; #ifndef TQT_NO_SQL if ( templ == "TQDesignerDataView" || templ == "TQDesignerDataBrowser" || templ == "TQDataView" || templ == "TQDataBrowser" || templ == "TQDataTable" ) { - SqlFormWizard wizard( aIface, widget, tqApp->mainWidget(), fw, 0, TRUE ); + SqlFormWizard wizard( aIface, widget, tqApp->mainWidget(), fw, 0, true ); wizard.exec(); } #endif if ( templ == "TQMainWindow" ) { - MainWindowWizardBase wizard( tqApp->mainWidget(), 0, TRUE ); + MainWindowWizardBase wizard( tqApp->mainWidget(), 0, true ); wizard.setAppInterface( aIface, fw, widget ); wizard.exec(); } - inUse = FALSE; + inUse = false; } TQRESULT StandardTemplateWizardInterface::queryInterface( const TQUuid& uuid, TQUnknownInterface** iface ) diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui.h b/tools/designer/plugins/wizards/mainwindowwizard.ui.h index cc5b1c157..99adbe0c7 100644 --- a/tools/designer/plugins/wizards/mainwindowwizard.ui.h +++ b/tools/designer/plugins/wizards/mainwindowwizard.ui.h @@ -37,10 +37,10 @@ void MainWindowWizardBase::init() dIface = 0; dfw = 0; widget = 0; - setHelpEnabled( menuToolbarPage, FALSE ); - setHelpEnabled( toolbarsPage, FALSE ); - setHelpEnabled( finishPage, FALSE ); - setFinishEnabled( finishPage, TRUE ); + setHelpEnabled( menuToolbarPage, false ); + setHelpEnabled( toolbarsPage, false ); + setHelpEnabled( finishPage, false ); + setFinishEnabled( finishPage, true ); } void MainWindowWizardBase::destroy() @@ -114,7 +114,7 @@ void MainWindowWizardBase::accept() return; } - setFinishEnabled( finishPage, FALSE ); + setFinishEnabled( finishPage, false ); TQPixmap pix; @@ -297,7 +297,7 @@ void MainWindowWizardBase::getPixmap( const TQString & n, TQPixmap & pix ) DesignerProject *pro = dIface->currentProject(); if ( !pro || pro->projectName() == "<No Project>" ) return; - pro->pixmapCollection()->addPixmap( pix, n, FALSE ); + pro->pixmapCollection()->addPixmap( pix, n, false ); } void MainWindowWizardBase::pageSelected( const TQString & ) diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index adb283a79..9ac91ee04 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -66,25 +66,25 @@ SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, { appIface->addRef(); formWindow = fw; - setFinishEnabled( finishPage, TRUE ); + setFinishEnabled( finishPage, true ); /* set mode of operation */ if ( ::tqt_cast<TQDataTable*>(widget) ) { setCaption( "Data Table Wizard" ); mode = Table; - setAppropriate( navigPage, FALSE ); - setAppropriate( layoutPage, FALSE ); - checkBoxAutoEdit->setChecked( FALSE ); + setAppropriate( navigPage, false ); + setAppropriate( layoutPage, false ); + checkBoxAutoEdit->setChecked( false ); } else if ( ::tqt_cast<TQDataBrowser*>(widget) ) { setCaption( "Data Browser Wizard" ); - setAppropriate( tablePropertiesPage, FALSE ); + setAppropriate( tablePropertiesPage, false ); mode = Browser; - checkBoxAutoEdit->setChecked( TRUE ); + checkBoxAutoEdit->setChecked( true ); } else if ( ::tqt_cast<TQDataView*>(widget) ) { setCaption( "Data View Wizard" ); - setAppropriate( tablePropertiesPage, FALSE ); - setAppropriate( navigPage, FALSE ); - setAppropriate( sqlPage, FALSE); + setAppropriate( tablePropertiesPage, false ); + setAppropriate( navigPage, false ); + setAppropriate( sqlPage, false); checkCreateFieldLayout->hide(); checkCreateButtonLayout->hide(); checkBoxAutoEdit->hide(); @@ -104,7 +104,7 @@ SqlFormWizard::~SqlFormWizard() void SqlFormWizard::nextPageClicked() { if ( currentPage() == populatePage ) { - autoPopulate( TRUE ); + autoPopulate( true ); } } @@ -129,9 +129,9 @@ void SqlFormWizard::connectionSelected( const TQString &c ) void SqlFormWizard::tableSelected( const TQString & ) { if ( listBoxTable->currentItem() >= 0 ) { - setNextEnabled( databasePage, TRUE ); + setNextEnabled( databasePage, true ); } else { - setNextEnabled( databasePage, FALSE ); + setNextEnabled( databasePage, false ); } } @@ -153,9 +153,9 @@ void SqlFormWizard::autoPopulate( bool populate ) TQStringList lst = *d->fields().find( listBoxTable->currentText() ); // remove primary index fields, if any listBoxSortField->insertStringList( lst ); - d->open( FALSE ); + d->open( false ); #ifndef TQT_NO_SQL - TQSqlCursor tab( listBoxTable->currentText(), TRUE, d->connection() ); + TQSqlCursor tab( listBoxTable->currentText(), true, d->connection() ); TQSqlIndex pIdx = tab.primaryIndex(); for ( uint i = 0; i < pIdx.count(); i++ ) { listBoxField->insertItem( pIdx.field( i )->name() ); @@ -304,7 +304,7 @@ void SqlFormWizard::setupPage1() if ( lst.count() ) listBoxConnection->setCurrentItem( 0 ); - setNextEnabled( databasePage, FALSE ); + setNextEnabled( databasePage, false ); } static TQPushButton *create_widget( TQWidget *parent, const char *name, @@ -313,8 +313,8 @@ static TQPushButton *create_widget( TQWidget *parent, const char *name, TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", parent, name ); pb->setText( txt ); pb->setGeometry( r ); - fw->setPropertyChanged( pb, "text", TRUE ); - fw->setPropertyChanged( pb, "geometry", TRUE ); + fw->setPropertyChanged( pb, "text", true ); + fw->setPropertyChanged( pb, "geometry", true ); return pb; } @@ -337,12 +337,12 @@ void SqlFormWizard::accept() if ( !conn.isEmpty() && !table.isEmpty() ) { formWindow->setProperty( widget, "database", lst ); - formWindow->setPropertyChanged( widget, "database", TRUE ); + formWindow->setPropertyChanged( widget, "database", true ); } if ( !editFilter->text().isEmpty() ) { widget->setProperty( "filter", editFilter->text() ); - formWindow->setPropertyChanged( widget, "filter", TRUE ); + formWindow->setPropertyChanged( widget, "filter", true ); } if ( listBoxSortedField->count() ) { @@ -350,7 +350,7 @@ void SqlFormWizard::accept() for ( uint i = 0; i < listBoxSortedField->count(); ++i ) lst << listBoxSortedField->text( i ); widget->setProperty( "sort", lst ); - formWindow->setPropertyChanged( widget, "sort", TRUE ); + formWindow->setPropertyChanged( widget, "sort", true ); } TQPtrList<DesignerDatabase> databases = proIface->databaseConnections(); @@ -358,7 +358,7 @@ void SqlFormWizard::accept() for ( DesignerDatabase *d = databases.first(); d; d = databases.next() ) { if ( d->name() == listBoxConnection->currentText() || ( ( d->name() == "(default)" || d->name().isEmpty() ) && listBoxConnection->currentText() == "(default)" ) ) { database = d; - d->open( FALSE ); + d->open( false ); break; } } @@ -366,7 +366,7 @@ void SqlFormWizard::accept() if (!database) { return; } - TQSqlCursor tab( listBoxTable->currentText(), TRUE, database->connection() ); + TQSqlCursor tab( listBoxTable->currentText(), true, database->connection() ); int columns = 2; TQSqlEditorFactory * f = TQSqlEditorFactory::defaultFactory(); @@ -392,8 +392,8 @@ void SqlFormWizard::accept() case Browser: { if ( mode == Browser && !checkBoxAutoEdit->isChecked() ) { - ((TQDataBrowser*)widget)->setAutoEdit( FALSE ); - formWindow->setPropertyChanged( widget, "autoEdit", TRUE ); + ((TQDataBrowser*)widget)->setAutoEdit( false ); + formWindow->setPropertyChanged( widget, "autoEdit", true ); } formWindow->clearSelection(); @@ -423,8 +423,8 @@ void SqlFormWizard::accept() label->setGeometry( SPACING + currentCol*COL_SPACING, row+SPACING, SPACING*3, SPACING ); - formWindow->setPropertyChanged( label, "geometry", TRUE ); - formWindow->setPropertyChanged( label, "text", TRUE ); + formWindow->setPropertyChanged( label, "geometry", true ); + formWindow->setPropertyChanged( label, "text", true ); /* editor */ editorDummy = f->createEditor( widget, field ); @@ -440,7 +440,7 @@ void SqlFormWizard::accept() editor->setGeometry(SPACING * 5 + currentCol*COL_SPACING, row+SPACING, SPACING*3, SPACING ); } - formWindow->setPropertyChanged( editor, "geometry", TRUE ); + formWindow->setPropertyChanged( editor, "geometry", true ); if ( TQString(editor->className()) == "TQLineEdit" && (field->type() == TQVariant::Double || field->type() == TQVariant::Int || @@ -448,16 +448,16 @@ void SqlFormWizard::accept() /* default right-align numerics */ //## ((TQLineEdit*)editor)->setAlignment( TQt::AlignRight ); - formWindow->setPropertyChanged( editor, "alignment", TRUE ); + formWindow->setPropertyChanged( editor, "alignment", true ); } if ( ::tqt_cast<TQSpinBox*>(editor) ) { ( (TQSpinBox*)editor )->setMaxValue( INT_MAX ); - formWindow->setPropertyChanged( editor, "maxValue", TRUE ); + formWindow->setPropertyChanged( editor, "maxValue", true ); } TQStringList lst; lst << conn << table << field->name(); formWindow->setProperty( editor, "database", lst ); - formWindow->setPropertyChanged( editor, "database", TRUE ); + formWindow->setPropertyChanged( editor, "database", true ); /* geometry */ if ( createFieldLayout ) { @@ -567,34 +567,34 @@ void SqlFormWizard::accept() { TQDataTable* sqlTable = ((TQDataTable*)widget); if ( checkBoxAutoEdit->isChecked() ) { - sqlTable->setAutoEdit( TRUE ); - formWindow->setPropertyChanged( sqlTable, "autoEdit", TRUE ); + sqlTable->setAutoEdit( true ); + formWindow->setPropertyChanged( sqlTable, "autoEdit", true ); } if ( checkBoxReadOnly->isChecked() ) { - sqlTable->setReadOnly( TRUE ); - formWindow->setPropertyChanged( sqlTable, "readOnly", TRUE ); + sqlTable->setReadOnly( true ); + formWindow->setPropertyChanged( sqlTable, "readOnly", true ); } else { if ( checkBoxConfirmInserts->isChecked() ) { - sqlTable->setConfirmInsert( TRUE ); - formWindow->setPropertyChanged( sqlTable, "confirmInsert", TRUE ); + sqlTable->setConfirmInsert( true ); + formWindow->setPropertyChanged( sqlTable, "confirmInsert", true ); } if ( checkBoxConfirmUpdates->isChecked() ) { - sqlTable->setConfirmUpdate( TRUE ); - formWindow->setPropertyChanged( sqlTable, "confirmUpdate", TRUE ); + sqlTable->setConfirmUpdate( true ); + formWindow->setPropertyChanged( sqlTable, "confirmUpdate", true ); } if ( checkBoxConfirmDeletes->isChecked() ) { - sqlTable->setConfirmDelete( TRUE ); - formWindow->setPropertyChanged( sqlTable, "confirmDelete", TRUE ); + sqlTable->setConfirmDelete( true ); + formWindow->setPropertyChanged( sqlTable, "confirmDelete", true ); } if ( checkBoxConfirmCancels->isChecked() ) { - sqlTable->setConfirmCancels( TRUE ); - formWindow->setPropertyChanged( sqlTable, "confirmCancels", TRUE ); + sqlTable->setConfirmCancels( true ); + formWindow->setPropertyChanged( sqlTable, "confirmCancels", true ); } } if ( checkBoxSorting->isChecked() ) { - sqlTable->setSorting( TRUE ); - formWindow->setPropertyChanged( sqlTable, "sorting", TRUE ); + sqlTable->setSorting( true ); + formWindow->setPropertyChanged( sqlTable, "sorting", true ); } TQMap<TQString, TQString> columnFields; diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.h b/tools/designer/plugins/wizards/sqlformwizardimpl.h index 1bce4780e..bfc1bd96b 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.h +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.h @@ -45,7 +45,7 @@ class SqlFormWizard : public SqlFormWizardBase public: SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* parent = 0, DesignerFormWindow *fw = 0, - const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + const char* name = 0, bool modal = false, WFlags fl = 0 ); ~SqlFormWizard(); void accept() const; |