diff options
Diffstat (limited to 'tqtinterface/qt4/tools/designer/plugins')
16 files changed, 156 insertions, 156 deletions
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp index 00dca68..82b1447 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp @@ -59,12 +59,12 @@ void CppEditorBrowser::showHelp( const TQString &w ) return; } - if ( word.tqfind( '(' ) != -1 ) { - TQString txt = "::" + word.left( word.tqfind( '(' ) ); + if ( word.find( '(' ) != -1 ) { + TQString txt = "::" + word.left( word.find( '(' ) ); TQTextDocument *doc = curEditor->document(); TQTextParagraph *p = doc->firstParagraph(); while ( p ) { - if ( p->string()->toString().tqfind( txt ) != -1 ) { + if ( p->string()->toString().find( txt ) != -1 ) { curEditor->setCursorPosition( p->paragId(), 0 ); return; } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp index 46cd56e..f49e2d8 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp @@ -49,9 +49,9 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) return FALSE; TQString object( objName ); int i = -1; - if ( ( i = object.tqfindRev( "->" ) ) != -1 ) + if ( ( i = object.findRev( "->" ) ) != -1 ) object = object.mid( i + 2 ); - if ( ( i = object.tqfindRev( "." ) ) != -1 ) + if ( ( i = object.findRev( "." ) ) != -1 ) object = object.mid( i + 1 ); object = object.simplifyWhiteSpace(); TQObject *obj = 0; @@ -69,7 +69,7 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) if ( !obj->childrenListObject().isEmpty() ) { for ( TQObjectListIt cit( obj->childrenListObject() ); cit.current(); ++cit ) { TQString s( cit.current()->name() ); - if ( s.tqfind( " " ) == -1 && s.tqfind( "qt_" ) == -1 && s.tqfind( "unnamed" ) == -1 ) { + if ( s.find( " " ) == -1 && s.find( "qt_" ) == -1 && s.find( "unnamed" ) == -1 ) { CompletionEntry c; c.type = "variable"; c.text = s; @@ -92,19 +92,19 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) ce.text = f; ce.postfix = "()"; - if ( lst.tqfind( ce ) == lst.end() ) + if ( lst.find( ce ) == lst.end() ) lst << ce; } TQStrList slts = obj->tqmetaObject()->slotNames( TRUE ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); - f = f.left( f.tqfind( "(" ) ); + f = f.left( f.find( "(" ) ); CompletionEntry c; c.type = "slot"; c.text = f; c.postfix = "()"; - if ( lst.tqfind( c ) == lst.end() ) + if ( lst.find( c ) == lst.end() ) lst << c; } @@ -127,16 +127,16 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin TQString objName; int i = -1; - i = expr.tqfindRev( "->" ); + i = expr.findRev( "->" ); if ( i == -1 ) - i = expr.tqfindRev( "." ); + i = expr.findRev( "." ); else ++i; if ( i == -1 ) { - i = expr.tqfindRev( " " ); + i = expr.findRev( " " ); if ( i == -1 ) - i = expr.tqfindRev( "\t" ); + i = expr.findRev( "\t" ); else objName = ths->name(); @@ -155,16 +155,16 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin if ( ex[ (int)ex.length() - 1 ] == '-' ) ex.remove( ex.length() - 1, 1 ); int j = -1; - j = ex.tqfindRev( "->" ); + j = ex.findRev( "->" ); if ( j == -1 ) - j = ex.tqfindRev( "." ); + j = ex.findRev( "." ); else ++j; if ( j == -1 ) { - j = ex.tqfindRev( " " ); + j = ex.findRev( " " ); if ( j == -1 ) - j = ex.tqfindRev( "\t" ); + j = ex.findRev( "\t" ); else objName = ths->name(); @@ -188,11 +188,11 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin TQStrList slts = obj->tqmetaObject()->slotNames( TRUE ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); - f = f.left( f.tqfind( "(" ) ); + f = f.left( f.find( "(" ) ); if ( f == func ) { f = TQString( sit.current() ); - f.remove( (uint)0, f.tqfind( "(" ) + 1 ); - f = f.left( f.tqfind( ")" ) ); + f.remove( (uint)0, f.find( "(" ) + 1 ); + f = f.left( f.find( ")" ) ); TQStringList lst = TQStringList::split( ',', f ); if ( !lst.isEmpty() ) { TQValueList<TQStringList> l; @@ -204,7 +204,7 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin const TQMetaProperty *prop = obj->tqmetaObject()-> - property( obj->tqmetaObject()->tqfindProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); + property( obj->tqmetaObject()->findProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); if ( prop ) { TQValueList<TQStringList> l; l << TQStringList( prop->type() ); diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 736b082..9d34421 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -165,40 +165,40 @@ void EditorInterfaceImpl::selectAll() ( (CppEditor*)viewManager->currentView() )->selectAll(); } -bool EditorInterfaceImpl::tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) +bool EditorInterfaceImpl::find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) { if ( !viewManager || !viewManager->currentView() ) return FALSE; CppEditor *e = (CppEditor*)viewManager->currentView(); if ( startAtCursor ) - return e->tqfind( expr, cs, wo, forward ); + return e->find( expr, cs, wo, forward ); int dummy = 0; - return e->tqfind( expr, cs, wo, forward, &dummy, &dummy ); + return e->find( expr, cs, wo, forward, &dummy, &dummy ); } -bool EditorInterfaceImpl::tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, - bool forward, bool startAtCursor, bool tqreplaceAll ) +bool EditorInterfaceImpl::replace( const TQString &find, const TQString &replace, bool cs, bool wo, + bool forward, bool startAtCursor, bool replaceAll ) { if ( !viewManager || !viewManager->currentView() ) return FALSE; CppEditor *e = (CppEditor*)viewManager->currentView(); bool ok = FALSE; if ( startAtCursor ) { - ok = e->tqfind( tqfind, cs, wo, forward ); + ok = e->find( find, cs, wo, forward ); } else { int dummy = 0; - ok = e->tqfind( tqfind, cs, wo, forward, &dummy, &dummy ); + ok = e->find( find, cs, wo, forward, &dummy, &dummy ); } if ( ok ) { e->removeSelectedText(); - e->insert( tqreplace, FALSE, FALSE ); + e->insert( replace, FALSE, FALSE ); } - if ( !tqreplaceAll || !ok ) { + if ( !replaceAll || !ok ) { if ( ok ) e->setSelection( e->textCursor()->paragraph()->paragId(), - e->textCursor()->index() - tqreplace.length(), + e->textCursor()->index() - replace.length(), e->textCursor()->paragraph()->paragId(), e->textCursor()->index() ); return ok; @@ -206,10 +206,10 @@ bool EditorInterfaceImpl::tqreplace( const TQString &tqfind, const TQString &tqr bool ok2 = TRUE; while ( ok2 ) { - ok2 = e->tqfind( tqfind, cs, wo, forward ); + ok2 = e->find( find, cs, wo, forward ); if ( ok2 ) { e->removeSelectedText(); - e->insert( tqreplace, FALSE, FALSE ); + e->insert( replace, FALSE, FALSE ); } } @@ -249,7 +249,7 @@ void EditorInterfaceImpl::scrollTo( const TQString &txt, const TQString & ) TQTextDocument *doc = ( (CppEditor*)viewManager->currentView() )->document(); TQTextParagraph *p = doc->firstParagraph(); while ( p ) { - if ( p->string()->toString().tqfind( txt ) != -1 ) { + if ( p->string()->toString().find( txt ) != -1 ) { ( (CppEditor*)viewManager->currentView() )->setCursorPosition( p->paragId() + 2, 0 ); break; } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 997a99b..5bae764 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -66,8 +66,8 @@ public: void copy(); void paste(); void selectAll(); - bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ); - bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool tqreplaceAll ); + bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ); + bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ); void gotoLine( int line ); void indent(); void scrollTo( const TQString &txt, const TQString &first ); diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp index 14489c5..da857b5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp @@ -93,9 +93,9 @@ void LanguageInterfaceImpl::functions( const TQString &code, TQValueList<Functio Function func; func.name = (*it).prototype(); func.name.remove( 0, (*it).returnType().length() ); - if ( func.name.tqfind( "::" ) == -1 ) + if ( func.name.find( "::" ) == -1 ) continue; - func.name.remove( (uint)0, func.name.tqfind( "::" ) + 2 ); + func.name.remove( (uint)0, func.name.find( "::" ) + 2 ); func.body = (*it).body(); func.returnType = (*it).returnType(); func.start = (*it).functionStartLineNum(); @@ -194,7 +194,7 @@ TQString LanguageInterfaceImpl::projectKeyForExtension( const TQString &extensio { // also handle something like foo.ut.cpp TQString ext = extension; - int i = ext.tqfindRev('.'); + int i = ext.findRev('.'); if ( i > -1 && i < (int)(ext.length()-1) ) ext = ext.mid( i + 1 ); if ( ext[ 0 ] == 'c' || ext[ 0 ] == 'C' ) diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h index 72aea91..9902c17 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h @@ -36,10 +36,10 @@ void CppProjectSettings::reInit( TQUnknownInterface *iface ) const TQString platforms[] = { "(all)", "win32", "unix", "mac", TQString() }; for ( int i = 0; platforms[ i ] != TQString(); ++i ) { - config.tqreplace( platforms[ i ], project->config( platforms[ i ] ) ); - libs.tqreplace( platforms[ i ], project->libs( platforms[ i ] ) ); - defines.tqreplace( platforms[ i ], project->defines( platforms[ i ] ) ); - includes.tqreplace( platforms[ i ], project->includePath( platforms[ i ] ) ); + config.replace( platforms[ i ], project->config( platforms[ i ] ) ); + libs.replace( platforms[ i ], project->libs( platforms[ i ] ) ); + defines.replace( platforms[ i ], project->defines( platforms[ i ] ) ); + includes.replace( platforms[ i ], project->includePath( platforms[ i ] ) ); } editConfig->setText( config[ "(all)" ] ); editLibs->setText( libs[ "(all)" ] ); @@ -67,22 +67,22 @@ void CppProjectSettings::save( TQUnknownInterface *iface ) void CppProjectSettings::configChanged( const TQString &str ) { - config.tqreplace( comboConfig->currentText(), str ); + config.replace( comboConfig->currentText(), str ); } void CppProjectSettings::libsChanged( const TQString &str ) { - libs.tqreplace( comboLibs->currentText(), str ); + libs.replace( comboLibs->currentText(), str ); } void CppProjectSettings::definesChanged( const TQString &str ) { - defines.tqreplace( comboDefines->currentText(), str ); + defines.replace( comboDefines->currentText(), str ); } void CppProjectSettings::includesChanged( const TQString &str ) { - includes.tqreplace( comboInclude->currentText(), str ); + includes.replace( comboInclude->currentText(), str ); } void CppProjectSettings::configPlatformChanged( const TQString &plat ) diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index fe84703..5d3c96f 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -100,7 +100,7 @@ SourceTemplateInterface::Source SourceTemplateInterfaceImpl::create( const TQStr formFileName( dia.listForms->text( dia.listForms->currentItem() ) ); include.remove( include.length() - 2, 2 ); include += "h"; - int slashFind = include.tqfindRev('/'); + int slashFind = include.findRev('/'); if (slashFind != -1) include = include.mid(slashFind+1); src.code = generateMainCppCode( dia.listForms->text( dia.listForms->currentItem() ), diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index 251e2b5..0217682 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp @@ -153,7 +153,7 @@ SyntaxHighlighter_CPP::SyntaxHighlighter_CPP() int len; for ( int i = 0; keywords[ i ]; ++i ) { len = (int)strlen( keywords[ i ] ); - if ( !wordMap->tqcontains( len ) ) + if ( !wordMap->contains( len ) ) wordMap->insert( len, TQMap<TQString, int >() ); TQMap<TQString, int> &map = wordMap->operator[]( len ); map[ keywords[ i ] ] = Keyword; @@ -330,11 +330,11 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin break; case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': - if ( alphabeth.tqfind( lastChar ) != -1 && - ( mathChars.tqfind( lastChar ) == -1 || numbers.tqfind( string->at( i - 1 )->c ) == -1 ) ) { + if ( alphabeth.find( lastChar ) != -1 && + ( mathChars.find( lastChar ) == -1 || numbers.find( string->at( i - 1 )->c ) == -1 ) ) { input = InputAlpha; } else { - if ( input == InputAlpha && numbers.tqfind( lastChar ) != -1 ) + if ( input == InputAlpha && numbers.find( lastChar ) != -1 ) input = InputAlpha; else input = InputNumber; @@ -381,9 +381,9 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin if ( buffer[ 0 ] == 'Q' ) { string->setFormat( i - buffer.length(), buffer.length(), formatType, FALSE ); } else { - TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->tqfind( len ); + TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->find( len ); if ( it != wordMap->end() ) { - TQMap<TQString, int >::Iterator it2 = ( *it ).tqfind( buffer ); + TQMap<TQString, int >::Iterator it2 = ( *it ).find( buffer ); if ( it2 != ( *it ).end() ) string->setFormat( i - buffer.length(), buffer.length(), format( ( *it2 ) ), FALSE ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp index ab69cce..e1b41b5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp @@ -180,10 +180,10 @@ static int getToken() qDebug()'s here and there. */ if ( yyCurPos >= 0 ) { - int lineStart = yyIn->tqfindRev( TQChar('\n'), yyCurPos ) + 1; + int lineStart = yyIn->findRev( TQChar('\n'), yyCurPos ) + 1; TQString line = yyIn->mid( lineStart, yyCurPos - lineStart + 2 ); - int commentStart = line.tqfind( TQString("//") ); + int commentStart = line.find( TQString("//") ); if ( commentStart != -1 ) { yyCurPos = lineStart + commentStart - 1; yyPos = yyCurPos + 2; @@ -392,7 +392,7 @@ TQString CppFunction::prototype() const /* The parser follows. We are not really parsing C++, just trying to - tqfind the start and end of function definitions. + find the start and end of function definitions. One important pitfall is that the parsed code needs not be valid. Parsing from right to left helps cope with that, as explained in @@ -654,7 +654,7 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) functions and one that relates to the following function. One good heuristic is to assume that a comment immediately followed by a function with no blank line in between relates to the - function, but there's no easy way to tqfind that out with a + function, but there's no easy way to find that out with a tokenizer. */ #if 0 @@ -689,7 +689,7 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) printf( " world!\n" ); } - The parser first tqfinds bar(). Then it tqfinds "void foo() {" and + The parser first finds bar(). Then it finds "void foo() {" and naively expects the body to extend up to "void bar()". This function's job is to count braces and make sure "int n;" is not counted as part of the body. @@ -733,8 +733,8 @@ static void setBody( CppFunction *func, const TQString& somewhatBody ) } The parser looks for left braces and tries to parse a function - prototype backwards. First it tqfinds "void bar() {". Then it works - up and tqfinds "void foo() {". + prototype backwards. First it finds "void bar() {". Then it works + up and finds "void foo() {". */ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) { @@ -763,11 +763,11 @@ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) Compute important line numbers. */ int functionStartLineNo = 1 + TQConstString( yyIn->tqunicode(), yyPos ) - .string().tqcontains( TQChar('\n') ); + .string().contains( TQChar('\n') ); int startLineNo = functionStartLineNo + TQConstString( yyIn->tqunicode() + yyPos, startBody - yyPos ) - .string().tqcontains( TQChar('\n') ); - int endLineNo = startLineNo + body.tqcontains( TQChar('\n') ); + .string().contains( TQChar('\n') ); + int endLineNo = startLineNo + body.contains( TQChar('\n') ); func.setLineNums( functionStartLineNo, startLineNo, endLineNo ); flist->prepend( func ); diff --git a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp index cb71661..6f45017 100644 --- a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp @@ -254,17 +254,17 @@ static AttributeMap attribute( const TQString& name, const TQString& val ) static TQString entitize( const TQString& str ) { TQString t = str; - t.tqreplace( '&', TQString("&") ); - t.tqreplace( '>', TQString(">") ); - t.tqreplace( '<', TQString("<") ); - t.tqreplace( '"', TQString(""") ); - t.tqreplace( '\'', TQString("'") ); + t.replace( '&', TQString("&") ); + t.replace( '>', TQString(">") ); + t.replace( '<', TQString("<") ); + t.replace( '"', TQString(""") ); + t.replace( '\'', TQString("'") ); return t; } TQString Dlg2Ui::alias( const TQString& name ) const { - if ( yyAliasMap.tqcontains(name) ) + if ( yyAliasMap.contains(name) ) return yyAliasMap[name]; else return name; @@ -318,8 +318,8 @@ TQString Dlg2Ui::getTextValue( const TQDomNode& node ) return TQString(); } TQString t = child.data().stripWhiteSpace(); - t.tqreplace( "\\\\", "\\" ); - t.tqreplace( "\\n", "\n" ); + t.replace( "\\\\", "\\" ); + t.replace( "\\n", "\n" ); return t; } @@ -549,7 +549,7 @@ void Dlg2Ui::emitClosingLayout( bool needsWidget, const TQString& layoutKind ) bool Dlg2Ui::isWidgetType( const TQDomElement& e ) { - return yyWidgetTypeSet.tqcontains( e.tagName() ); + return yyWidgetTypeSet.contains( e.tagName() ); } void Dlg2Ui::emitSpacer( int spacing, int stretch ) @@ -583,7 +583,7 @@ TQString Dlg2Ui::filteredFlags( const TQString& flags, const TQRegExp& filter ) TQRegExp evil( TQString("[^0-9A-Z_a-z|]") ); TQString f = flags; - f.tqreplace( evil, TQString() ); + f.replace( evil, TQString() ); TQStringList splitted = TQStringList::split( TQChar('|'), f ); return splitted.grep( filter ).join( TQChar('|') ); } @@ -679,7 +679,7 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted ) } else { TQString tagName = n.toElement().tagName(); - TQMap<TQString, int>::ConstIterator p = pp.tqfind( tagName ); + TQMap<TQString, int>::ConstIterator p = pp.find( tagName ); if ( p == pp.end() ) { /* These properties are not in the propertyDefs table, @@ -1245,7 +1245,7 @@ void Dlg2Ui::matchLayoutWidget( const TQDomElement& layoutWidget ) } if ( !widget.isEmpty() ) { - TQMap<TQString, TQDomElement>::Iterator w = yyWidgetMap.tqfind( widget ); + TQMap<TQString, TQDomElement>::Iterator w = yyWidgetMap.find( widget ); if ( w == yyWidgetMap.end() ) { syntaxError(); } else { @@ -1412,7 +1412,7 @@ void Dlg2Ui::matchWidget( const TQDomElement& widget ) if ( name.isEmpty() ) name = TQString( "Widget%1" ).arg( uniqueWidget++ ); - if ( yyWidgetMap.tqcontains(name) ) + if ( yyWidgetMap.contains(name) ) syntaxError(); yyWidgetMap.insert( name, widget ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp index 4571cf5..88375b0 100644 --- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp @@ -236,11 +236,11 @@ static AttributeMap attribute( const TQString& name, const TQString& val ) static TQString entitize( const TQString& str ) { TQString t = str; - t.tqreplace( '&', TQString("&") ); - t.tqreplace( '>', TQString(">") ); - t.tqreplace( '<', TQString("<") ); - t.tqreplace( '"', TQString(""") ); - t.tqreplace( '\'', TQString("'") ); + t.replace( '&', TQString("&") ); + t.replace( '>', TQString(">") ); + t.replace( '<', TQString("<") ); + t.replace( '"', TQString(""") ); + t.replace( '\'', TQString("'") ); return t; } @@ -446,9 +446,9 @@ void Glade2Ui::emitAttribute( const TQString& prop, const TQVariant& val, static TQString accelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; - qtLabel.tqreplace( '&', TQString("&&") ); + qtLabel.replace( '&', TQString("&&") ); // close but not quite right - qtLabel.tqreplace( TQChar('_'), TQChar('&') ); + qtLabel.replace( TQChar('_'), TQChar('&') ); return qtLabel; } @@ -456,7 +456,7 @@ static TQString decelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; // ditto - qtLabel.tqreplace( '_', TQString() ); + qtLabel.replace( '_', TQString() ); return qtLabel; } @@ -591,17 +591,17 @@ int Glade2Ui::matchAccelOnActivate( const TQDomElement& accel ) if ( key.length() == 5 ) { flags = key[4].upper().latin1(); - } else if ( yyKeyMap.tqcontains(key.mid(4)) ) { + } else if ( yyKeyMap.contains(key.mid(4)) ) { flags = yyKeyMap[key.mid(4)]; } else { return 0; } - if ( modifiers.tqcontains(TQString("_CONTROL_")) ) + if ( modifiers.contains(TQString("_CONTROL_")) ) flags |= TQt::CTRL; - if ( modifiers.tqcontains(TQString("_SHIFT_")) ) + if ( modifiers.contains(TQString("_SHIFT_")) ) flags |= TQt::SHIFT; - if ( modifiers.tqcontains(TQString("_MOD1_")) ) + if ( modifiers.contains(TQString("_MOD1_")) ) flags |= TQt::ALT; return flags; } @@ -838,9 +838,9 @@ void Glade2Ui::emitPushButton( const TQString& text, const TQString& name ) attribute(TQString("class"), TQString("TQPushButton")) ); emitProperty( TQString("name"), name.latin1() ); emitProperty( TQString("text"), text ); - if ( name.tqcontains(TQString("ok")) > 0 ) { + if ( name.contains(TQString("ok")) > 0 ) { emitProperty( TQString("default"), TQVariant(TRUE, 0) ); - } else if ( name.tqcontains(TQString("help")) > 0 ) { + } else if ( name.contains(TQString("help")) > 0 ) { emitProperty( TQString("accel"), (int) TQt::Key_F1 ); } emitClosing( TQString("widget") ); @@ -1662,7 +1662,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, button label. */ label = getTextValue( n ); - int k = label.tqfindRev( TQChar('_') ); + int k = label.findRev( TQChar('_') ); if ( k != -1 ) label = label.mid( k + 1 ); if ( !label.isEmpty() && label != TQString("OK") ) @@ -1880,7 +1880,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, gtk2qtSelectionMode(selectionMode), TQString("enum") ); if ( !shadowType.endsWith(TQString("_NONE")) ) { - TQString tqshape = shadowType.tqcontains( TQString("_ETCHED_") ) > 0 ? + TQString tqshape = shadowType.contains( TQString("_ETCHED_") ) > 0 ? TQString( "Box" ) : TQString( "WinPanel" ); TQString shadow = shadowType.endsWith( TQString("_IN") ) ? TQString( "Sunken" ) : TQString( "Raised" ); @@ -2106,7 +2106,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) char *data = new char[maxLength]; TQString dir = yyFileName; - dir.truncate( dir.tqfindRev(TQChar('/')) + 1 ); + dir.truncate( dir.findRev(TQChar('/')) + 1 ); dir += yyPixmapDirectory; emitOpening( TQString("images") ); @@ -2173,7 +2173,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) emitFooter(); TQString outFileName = fileName; - int k = outFileName.tqfindRev( "." ); + int k = outFileName.findRev( "." ); if ( k != -1 ) outFileName.truncate( k ); if ( widgetNo != 0 ) diff --git a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp index 0030ab8..3c03e6d 100644 --- a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp @@ -181,20 +181,20 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) TQString shadow = "NoFrame"; TQString tqshape = "StyledPanel"; int width = 2; - if ( styles.tqcontains( "WS_EX_STATICEDGE" ) ) { + if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_CLIENTEDGE" ) ) { + if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_DLGMODALFRAME" ) ) { + if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; defineFrame = TRUE; } - if ( !styles.tqcontains( "WS_BORDER" ) ) { + if ( !styles.contains( "WS_BORDER" ) ) { tqshape = "NoFrame"; defineFrame = TRUE; } @@ -206,13 +206,13 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) } } - if ( styles.tqcontains("WS_DISABLED") ) + if ( styles.contains("WS_DISABLED") ) writeBool("enabled", FALSE ); - if ( styles.tqcontains("WS_EX_ACCEPTFILES") ) + if ( styles.contains("WS_EX_ACCEPTFILES") ) writeBool("acceptDrops", TRUE ); - if ( styles.tqcontains("WS_EX_TRANSPARENT") ) + if ( styles.contains("WS_EX_TRANSPARENT") ) writeBool("autoMask", TRUE ); - if ( !styles.tqcontains("WS_TABSTOP") ) + if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -283,11 +283,11 @@ bool KDEVDLG2UI::parse( TQStringList& get ) void KDEVDLG2UI::cleanString( TQString * text ) { if ( !text ) return; - text->tqreplace( "\\n", "\n" ); - text->tqreplace( "\\t", "\t" ); - text->tqreplace( "&", "&" ); - text->tqreplace( "<", "<" ); - text->tqreplace( ">", ">" ); + text->replace( "\\n", "\n" ); + text->replace( "\\t", "\t" ); + text->replace( "&", "&" ); + text->replace( "<", "<" ); + text->replace( ">", ">" ); } /*! diff --git a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp index 9ecac6e..fd2df40 100644 --- a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp @@ -93,7 +93,7 @@ TQStringList KDevDlgFilter::import( const TQString &, const TQString& filename ) TQTextStream in; in.setDevice( &file ); - TQString name = filename.right( filename.length() - filename.tqfindRev( TQDir::separator() ) - 1 ).section( ".", 0, 0 ); + TQString name = filename.right( filename.length() - filename.findRev( TQDir::separator() ) - 1 ).section( ".", 0, 0 ); KDEVDLG2UI c( &in, name ); TQStringList files; c.parse(); diff --git a/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp index a9e87b0..7f7d3f3 100644 --- a/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp @@ -63,8 +63,8 @@ TQStringList RC2UI::splitStyles( const TQString& styles, char sep ) TQString s = styles; TQString style; TQStringList l; - while ( s.tqfind( sep ) > -1 ) { - style = s.left( s.tqfind( sep ) ); + while ( s.find( sep ) > -1 ) { + style = s.left( s.find( sep ) ); l << style.stripWhiteSpace(); s = s.right( s.length() - style.length() -1 ); } @@ -75,7 +75,7 @@ TQStringList RC2UI::splitStyles( const TQString& styles, char sep ) TQString RC2UI::parseNext( TQString& arg, char sep ) { - TQString next = arg.left( arg.tqfind(sep) ); + TQString next = arg.left( arg.find(sep) ); arg = arg.right( arg.length() - next.length() - 1 ); return next; } @@ -164,20 +164,20 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) TQString shadow = "NoFrame"; TQString tqshape = "StyledPanel"; int width = 2; - if ( styles.tqcontains( "WS_EX_STATICEDGE" ) ) { + if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_CLIENTEDGE" ) ) { + if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_DLGMODALFRAME" ) ) { + if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; defineFrame = TRUE; } - if ( !styles.tqcontains( "WS_BORDER" ) ) { + if ( !styles.contains( "WS_BORDER" ) ) { tqshape = "NoFrame"; defineFrame = TRUE; } @@ -189,13 +189,13 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) } } - if ( styles.tqcontains("WS_DISABLED") ) + if ( styles.contains("WS_DISABLED") ) writeBool("enabled", FALSE ); - if ( styles.tqcontains("WS_EX_ACCEPTFILES") ) + if ( styles.contains("WS_EX_ACCEPTFILES") ) writeBool("acceptDrops", TRUE ); - if ( styles.tqcontains("WS_EX_TRANSPARENT") ) + if ( styles.contains("WS_EX_TRANSPARENT") ) writeBool("autoMask", TRUE ); - if ( !styles.tqcontains("WS_TABSTOP") ) + if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -297,7 +297,7 @@ TQString RC2UI::useName( const TQString& start ) TQString name = start; int id = 1; - while ( usedNames.tqcontains( name ) ) { + while ( usedNames.contains( name ) ) { name = start + TQString( "%1" ).arg( id ); id++; } @@ -359,19 +359,19 @@ bool RC2UI::makeDialog() } while ( line[(int)line.length()-1] == '|' || line[(int)line.length()-1] == ',' ); count = sscanf( line, "%s", property ); - line = line.right( line.length() - line.tqfind(" ") -1 ); + line = line.right( line.length() - line.find(" ") -1 ); if ( TQString(property) == "STYLE" ) { styles = splitStyles(line); - if ( styles.tqcontains( "WS_CAPTION" ) ) + if ( styles.contains( "WS_CAPTION" ) ) baseClass = "TQDialog"; else baseClass = "TQWidget"; } else if ( TQString(property) == "CAPTION" ) { caption = stripQM( line ); } else if ( TQString(property) == "FONT" ) { - TQString pt = line.left( line.tqfind(",") ); + TQString pt = line.left( line.find(",") ); pointsize = pt.toInt(); - fontname = stripQM(line.right( line.length() - line.tqfind(",") - 2 )); + fontname = stripQM(line.right( line.length() - line.find(",") - 2 )); } } while ( line != "BEGIN" ); @@ -462,10 +462,10 @@ bool RC2UI::makeDialog() if ( controlType == "Static" ) { ID = IDLabel; } else if ( controlType == "Button" ) { - if ( styles.tqcontains("BS_AUTOCHECKBOX") || - styles.tqcontains("BS_3STATE") ) + if ( styles.contains("BS_AUTOCHECKBOX") || + styles.contains("BS_3STATE") ) ID = IDCheckBox; - else if ( styles.tqcontains("BS_AUTORADIOBUTTON") ) + else if ( styles.contains("BS_AUTORADIOBUTTON") ) ID = IDRadioButton; } else if ( controlType == "msctls_updown32" ) { ID = IDSpinBox; @@ -514,7 +514,7 @@ bool RC2UI::makeDialog() extendedStyles = splitStyles(parseNext( arguments )); for ( uint i = 0; i < extendedStyles.count(); i++ ) styles << (*extendedStyles.at(i)); - } while ( arguments.tqfind(',') > -1 ); + } while ( arguments.find(',') > -1 ); switch ( ID ) { case IDWidget: @@ -537,7 +537,7 @@ bool RC2UI::makeDialog() writeRect( "geometry", x,y,w,h ); writeString( "text", widgetText ); TQString align; - if ( !styles.tqcontains("SS_CENTERIMAGE") ) + if ( !styles.contains("SS_CENTERIMAGE") ) align += "|AlignTop"; else align += "|AlignVCenter"; @@ -557,7 +557,7 @@ bool RC2UI::makeDialog() writeCString("name", useName("CheckBox_"+widgetID) ); writeRect("geometry", x,y,w,h); writeString("text", widgetText ); - if ( styles.tqcontains( "BS_3STATE" ) ) + if ( styles.contains( "BS_3STATE" ) ) writeBool( "tristate", TRUE ); } break; @@ -576,13 +576,13 @@ bool RC2UI::makeDialog() writeCString( "name", useName("GroupBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); writeString( "title", widgetText ); - if ( !styles.tqcontains( "WS_BORDER" ) ) + if ( !styles.contains( "WS_BORDER" ) ) styles.append( "WS_BORDER" ); } break; case IDLineEdit: { - if ( !styles.tqcontains("ES_MULTILINE") ) { + if ( !styles.contains("ES_MULTILINE") ) { writeClass("TQLineEdit"); writeCString( "name", useName("LineEdit_"+widgetID) ); } else { @@ -591,9 +591,9 @@ bool RC2UI::makeDialog() } writeRect( "geometry", x,y,w,h ); TQString align = "AlignTop"; - if ( styles.tqcontains("ES_CENTER") ) + if ( styles.contains("ES_CENTER") ) align+="|AlignHCenter"; - else if ( styles.tqcontains("ES_RIGHT") ) + else if ( styles.contains("ES_RIGHT") ) align+="|AlignRight"; else align+="|AlignLeft"; @@ -613,9 +613,9 @@ bool RC2UI::makeDialog() writeClass("TQIconView"); writeCString("name", useName("IconView_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( !styles.tqcontains( "LVS_SINGLESEL" ) ) + if ( !styles.contains( "LVS_SINGLESEL" ) ) writeEnum( "selectionMode", "Extended" ); - if ( styles.tqcontains( "LVS_NOLABELWRAP" ) ) + if ( styles.contains( "LVS_NOLABELWRAP" ) ) writeBool("wordWrapIconText", FALSE ); } break; @@ -625,9 +625,9 @@ bool RC2UI::makeDialog() writeClass("TQListView"); writeCString("name", useName("ListView_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains( "TVS_LINESATROOT" ) ) + if ( styles.contains( "TVS_LINESATROOT" ) ) writeBool( "rootIsDecorated", TRUE ); - if ( styles.tqcontains( "TVS_FULLROWSELECT" ) ) + if ( styles.contains( "TVS_FULLROWSELECT" ) ) writeBool( "allColumnsShowFocus", TRUE ); } break; @@ -637,7 +637,7 @@ bool RC2UI::makeDialog() writeClass("TQProgressBar"); writeCString("name", useName("ProgressBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("TBS_VERT") ) + if ( styles.contains("TBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); @@ -670,11 +670,11 @@ bool RC2UI::makeDialog() writeClass("TQSlider"); writeCString("name", useName("Slider_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("TBS_VERT") ) + if ( styles.contains("TBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); - if ( !styles.tqcontains("TBS_NOTICKS") ) + if ( !styles.contains("TBS_NOTICKS") ) writeEnum("tickmarks", "Left" ); } break; @@ -694,23 +694,23 @@ bool RC2UI::makeDialog() writeClass("TQListBox"); writeCString("name", useName("ListBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); - if ( styles.tqcontains("WS_HSCROLL") ) + if ( styles.contains("WS_HSCROLL") ) writeEnum("hScrollBarMode", "Auto"); else writeEnum("hScrollBarMode", "AlwaysOff"); - if ( styles.tqcontains("WS_VSCROLL") ) + if ( styles.contains("WS_VSCROLL") ) writeEnum("vScrollBarMode", "Auto"); else writeEnum("vScrollBarMode", "AlwaysOff"); - if ( styles.tqcontains("LBS_EXTENDEDSEL") ) + if ( styles.contains("LBS_EXTENDEDSEL") ) writeEnum("selectionMode", "Extended"); - else if ( styles.tqcontains("LBS_MULTIPLESEL") ) + else if ( styles.contains("LBS_MULTIPLESEL") ) writeEnum("selectionMode", "Multi"); - else if ( styles.tqcontains("LBS_NOSEL") ) + else if ( styles.contains("LBS_NOSEL") ) writeEnum("selectionMode", "NoSelection"); else writeEnum("selectionMode", "Single"); - if ( !styles.tqcontains( "NO WS_BORDER" ) ) + if ( !styles.contains( "NO WS_BORDER" ) ) styles.append( "WS_BORDER" ); } break; @@ -719,7 +719,7 @@ bool RC2UI::makeDialog() writeClass("TQScrollBar"); writeCString("name", useName("ScrollBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("SBS_VERT") ) + if ( styles.contains("SBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h index 3865d12..5c3a29c 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h @@ -156,7 +156,7 @@ void MainWindowWizardBase::accept() getPixmap( "editpaste", pix ); TQAction *editPasteAction = dfw->createAction( tr( "Paste" ), pix, tr( "&Paste" ), CTRL + Key_V, 0, "editPasteAction" ); actions.insert( tr( "Paste" ), editPasteAction ); - getPixmap( "searchtqfind", pix ); + getPixmap( "searchfind", pix ); TQAction *editFindAction = dfw->createAction( tr( "Find" ), pix, tr( "&Find..." ), CTRL + Key_F, 0, "editFindAction" ); actions.insert( tr( "Find" ), editFindAction ); @@ -236,19 +236,19 @@ void MainWindowWizardBase::accept() dfw->addToolBarSeparator( "toolBar" ); continue; } - TQAction *a = actions.tqfind( listToolbar->text( i ) ); + TQAction *a = actions.find( listToolbar->text( i ) ); if ( !a ) continue; dfw->addToolBarAction( "toolBar", a ); dfw->addAction( a ); - if ( usedActions.tqfindRef( a ) == -1 ) + if ( usedActions.findRef( a ) == -1 ) usedActions.append( a ); } } for ( TQAction *ac = usedActions.first(); ac; ac = usedActions.next() ) { - if ( TQString( ac->name() ).tqfind( "file" ) != -1 && checkCreateConnectionsFile->isChecked() || - TQString( ac->name() ).tqfind( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() || - TQString( ac->name() ).tqfind( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) { + if ( TQString( ac->name() ).find( "file" ) != -1 && checkCreateConnectionsFile->isChecked() || + TQString( ac->name() ).find( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() || + TQString( ac->name() ).find( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) { TQString slot = ac->name(); slot.remove( slot.length() - 6, 6 ); slot += "()"; diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index e4d1d61..f8f2dd3 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -150,7 +150,7 @@ void SqlFormWizard::autoPopulate( bool populate ) if ( d->name() == listBoxConnection->currentText() || ( ( d->name() == "(default)" || d->name().isEmpty() ) && listBoxConnection->currentText() == "(default)" ) ) { - TQStringList lst = *d->fields().tqfind( listBoxTable->currentText() ); + TQStringList lst = *d->fields().find( listBoxTable->currentText() ); // remove primary index fields, if any listBoxSortField->insertStringList( lst ); d->open( FALSE ); |