diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 36c36b53a129509d56fdaa0a7c9fcbcacd0c5826 (patch) | |
tree | 629d3942958745660e36c30b0d6139af9459c0f8 /quanta | |
parent | 929d7ae4f69d62b8f1f6d3506adf75f017753935 (diff) | |
download | tdewebdev-36c36b53a129509d56fdaa0a7c9fcbcacd0c5826.tar.gz tdewebdev-36c36b53a129509d56fdaa0a7c9fcbcacd0c5826.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta')
107 files changed, 875 insertions, 875 deletions
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index fc4399bb..3dfd357b 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -93,7 +93,7 @@ KLineEdit * colorRequester::lineEdit() const{ void colorRequester::setInitialValue(/*const TQString& s*/){ TQString temp = d->edit->text(); temp.remove(" "); - if( temp.tqcontains("#") != 0){ + if( temp.contains("#") != 0){ temp.remove("#"); if(temp.length() == 3) { TQString temp2; @@ -113,7 +113,7 @@ void colorRequester::setInitialValue(/*const TQString& s*/){ } else - if( temp.tqcontains("rgb(") != 0){ + if( temp.contains("rgb(") != 0){ temp.remove("rgb(").remove(")"); TQStringList rgbValues = TQStringList::split(",",temp); // bool ok; diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index afe90315..07fc1815 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -136,19 +136,19 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ } void CSSEditor::setCurrentPropOn(const TQString& s){ - if( (m_currentProp = static_cast<myCheckListItem*>(lvVisual->tqfindItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvVisual->findItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvAll->tqfindItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvAll->findItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvAural->tqfindItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvAural->findItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvInteractive->tqfindItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvInteractive->findItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvPaged->tqfindItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvPaged->findItem( s,0 )) )) m_currentProp->setOn(true); if( m_currentProp && m_currentProp->depth() ) { @@ -167,14 +167,14 @@ void CSSEditor::setCurrentPropOn(const TQString& s){ } void CSSEditor::setSidesOfPropertyBorderOn(const TQString& s){ - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-top",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-right",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-bottom",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-left",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-top-"+s,0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-right-"+s,0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-bottom-"+s,0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-left-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-top",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-right",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-bottom",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-left",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-top-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-right-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-bottom-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->findItem( "border-left-"+s,0 ))->setOn(true); } void CSSEditor::hidePreviewer(){ @@ -266,7 +266,7 @@ void CSSEditor::initialize(){ const TQString propertyName((*it).section(":",0,0).stripWhiteSpace()); const TQString propertyValue((*it).section(":",1)); - if( ShorthandFormer::SHFormList().tqcontains(propertyName)==0 ) { + if( ShorthandFormer::SHFormList().contains(propertyName)==0 ) { temp+= propertyName + " : " + propertyValue +";\n\t"; addAndSetPropertyOn(propertyName,propertyValue); } @@ -323,12 +323,12 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ m_ps->setComboBox(); TQStringList values = TQStringList::split(",",curr.attribute("value")); m_ps->ComboBox()->insertStringList(values); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) - if( values.tqcontains(m_currentProp->text(0))) + if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if( values.contains(m_currentProp->text(0))) m_ps->ComboBox()->setCurrentText(m_properties[m_currentProp->text(0)]); if(curr.attribute("editable") == "yes"){ m_ps->ComboBox()->setEditable(true); - /*if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + /*if(m_properties.contains(m_currentProp->text(0)) !=0 ) m_ps->ComboBox()->setEditText(m_properties[m_currentProp->text(0)]); */ } } @@ -344,7 +344,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "number") m_ps->setLineEdit(); else if( valueTypeName == "integer") { - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) { + if(m_properties.contains(m_currentProp->text(0)) !=0 ) { if(!curr.attribute("minValue").isNull()) m_ps->setSpinBox(m_properties[m_currentProp->text(0)],curr.attribute("minValue")); else @@ -359,7 +359,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "length") { lengthEditor *editor = new lengthEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + if(m_properties.contains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else editor->setInitialValue(TQString()); @@ -367,7 +367,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ } else if( valueTypeName == "percentage") { - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ + if(m_properties.contains(m_currentProp->text(0)) !=0 ){ percentageEditor *editor = new percentageEditor(m_properties[m_currentProp->text(0)],m_ps); m_ps->installMiniEditor(editor); } @@ -380,7 +380,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "doubleLength") { doubleLengthEditor *editor = new doubleLengthEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ + if(m_properties.contains(m_currentProp->text(0)) !=0 ){ TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()), sx(temp.section(" ",0,0)), dx(temp.section(" ",1,1)); @@ -394,7 +394,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "doublePercentage") { doublePercentageEditor *editor = new doublePercentageEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ + if(m_properties.contains(m_currentProp->text(0)) !=0 ){ TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()), sx(temp.section(" ",0,0)), dx(temp.section(" ",1,1)); @@ -407,7 +407,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "frequency") { frequencyEditor *editor = new frequencyEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + if(m_properties.contains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else editor->setInitialValue(TQString()); @@ -416,7 +416,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "time") { timeEditor *editor = new timeEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + if(m_properties.contains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else editor->setInitialValue(TQString()); @@ -425,7 +425,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "angle") { angleEditor *editor = new angleEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + if(m_properties.contains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else editor->setInitialValue(TQString()); @@ -454,7 +454,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "colors") { RGBcolorSlider *RGBeditor = new RGBcolorSlider(m_ps); colorRequester *CReditor = new colorRequester(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ + if(m_properties.contains(m_currentProp->text(0)) !=0 ){ CReditor->lineEdit()->setText(m_properties[m_currentProp->text(0)]); CReditor->setInitialValue(); @@ -474,7 +474,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "fontDialog" ){ fontEditor *editor = new fontEditor(m_ps); - if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ + if(m_properties.contains(m_currentProp->text(0)) !=0 ){ editor->setInitialValue(m_properties[m_currentProp->text(0)]); } else editor->setInitialValue(TQString()); diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index 3e9e1ca2..bd0eac48 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -34,12 +34,12 @@ void mySpinBox::checkSuffix(const TQString&){// check if the suffix is present a if(!suffix().isEmpty()){ const TQString suf(suffix()); TQString t(editor()->text()); - if( t.tqcontains(suf) ==0 ) { + if( t.contains(suf) ==0 ) { editor()->setText( t + suf); editor()->setCursorPosition(editor()->cursorPosition() - 1); } else - if( t.tqcontains(suf) >1 ) { + if( t.contains(suf) >1 ) { editor()->setText( t.remove(suf) + suf); editor()->setCursorPosition(editor()->cursorPosition() - 1); } diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 2598336c..316a8db4 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -324,15 +324,15 @@ void CSSSelector::loadCSSContent(const TQString& s){ for ( it = m_currentStylesheetStructure.begin(); it != m_currentStylesheetStructure.end(); ++it ) { if(!it.key().startsWith("@rule") && !it.key().startsWith("/*")){ TQListViewItem *item; - if(it.key().tqcontains(":")){ + if(it.key().contains(":")){ item = new TQListViewItem(lvPseudo); } else - if(it.key().tqcontains("#")){ + if(it.key().contains("#")){ item = new TQListViewItem(lvIDs); } else - if(it.key().tqcontains(".")){ + if(it.key().contains(".")){ item = new TQListViewItem(lvClasses); } else { diff --git a/quanta/components/csseditor/cssshpropertyparser.cpp b/quanta/components/csseditor/cssshpropertyparser.cpp index b523a1b4..d117b5f5 100644 --- a/quanta/components/csseditor/cssshpropertyparser.cpp +++ b/quanta/components/csseditor/cssshpropertyparser.cpp @@ -61,7 +61,7 @@ TQString CSSSHPropertyParser::extractQuotedStringList(){ unsigned int i=0; while(!stop && i<m_propertyToParse.length() ){ if( m_propertyToParse[i] == ' ' ){ - if( ( temp.tqcontains("\"") + temp.tqcontains("\'") )%2 == 0 ) stop = true; + if( ( temp.contains("\"") + temp.contains("\'") )%2 == 0 ) stop = true; else temp += m_propertyToParse[i]; } else temp += m_propertyToParse[i]; @@ -89,32 +89,32 @@ TQStringList CSSSHPropertyParser::parse(){ temp+=m_propertyToParse[i]; } - if(temp.tqcontains("url(") !=0 ){ + if(temp.contains("url(") !=0 ){ TQString foundURIList = extractURIList(); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundURIList)); tokenList.append(foundURIList); } else - if(temp.tqcontains("(")!=0){ + if(temp.contains("(")!=0){ TQString foundFunctionList = extractFunctionList(); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundFunctionList)); tokenList.append(foundFunctionList); } else - if(temp.tqcontains("'")!=0 || temp.tqcontains("\"")!=0 || temp.tqcontains(",")!=0){ + if(temp.contains("'")!=0 || temp.contains("\"")!=0 || temp.contains(",")!=0){ TQString foundQuotedStringList = extractQuotedStringList(); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundQuotedStringList)); tokenList.append(foundQuotedStringList); } else - if(temp.tqcontains("/")!=0){ //treat the presence of line-height in font shorthand form + if(temp.contains("/")!=0){ //treat the presence of line-height in font shorthand form m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(temp)); tokenList.append(temp.section("/",0,0)); tokenList.append("/"+temp.section("/",1,1)); } else { tokenList.append(temp); - int tempPos = m_propertyToParse.tqfind(temp); + int tempPos = m_propertyToParse.find(temp); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(tempPos,temp.length())); } if( m_propertyToParse.isEmpty() ) stop = true; diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 08f24ed5..fe494713 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -45,7 +45,7 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* tqparent, const char *name) : fon TQFontDatabase fdb; TQStringList families = fdb.tqfamilies(); for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) { - if( (*it).tqcontains('[') !=0 ) + if( (*it).contains('[') !=0 ) it = families.remove(it); } @@ -100,9 +100,9 @@ void fontFamilyChooser::updatePreview(const TQString& s){ void fontFamilyChooser::addFont(){ lbSelected->insertItem( m_currentSelectedFont ); switch(m_fontOrigin) { - case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->tqfindItem(m_currentSelectedFont))); + case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->findItem(m_currentSelectedFont))); break; - case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->tqfindItem(m_currentSelectedFont))); + case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->findItem(m_currentSelectedFont))); break; } } @@ -156,7 +156,7 @@ TQStringList fontFamilyChooser::fontList(){ TQStringList list; TQListBoxItem *item = lbSelected->firstItem(); while( item != 0 ){ - if( item->text().tqcontains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" ); + if( item->text().contains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" ); else list.append( item->text() ); item = item->next(); } diff --git a/quanta/components/csseditor/shorthandformer.cpp b/quanta/components/csseditor/shorthandformer.cpp index 4843986c..95b06d99 100644 --- a/quanta/components/csseditor/shorthandformer.cpp +++ b/quanta/components/csseditor/shorthandformer.cpp @@ -52,167 +52,167 @@ static const TQStringList backgroundRepeatValueList = TQStringList::split(",",ba ShorthandFormer::ShorthandFormer( TQMap<TQString,TQString> m){ m_properties = m; - if(m_properties.tqcontains("cue-after")){ + if(m_properties.contains("cue-after")){ cue_after= m_properties["cue-after"]; m_properties.remove("cue-after"); } - if(m_properties.tqcontains("cue-before")){ + if(m_properties.contains("cue-before")){ cue_before = m_properties["cue-before"]; m_properties.remove("cue-before"); } - if(m_properties.tqcontains("pause-before")){ + if(m_properties.contains("pause-before")){ pause_before= m_properties["pause-before"]; m_properties.remove("pause-before"); } - if(m_properties.tqcontains("pause-after")){ + if(m_properties.contains("pause-after")){ pause_after = m_properties["pause-after"]; m_properties.remove("pause-after"); } - if(m_properties.tqcontains("background-color")){ + if(m_properties.contains("background-color")){ background_color = m_properties["background-color"]; m_properties.remove("background-color"); } - if(m_properties.tqcontains("background-image")){ + if(m_properties.contains("background-image")){ background_image = m_properties["background-image"]; m_properties.remove("background-image"); } - if(m_properties.tqcontains("background-repeat")){ + if(m_properties.contains("background-repeat")){ background_repeat = m_properties["background-repeat"]; m_properties.remove("background-repeat"); } - if(m_properties.tqcontains("background-attachment")){ + if(m_properties.contains("background-attachment")){ background_attachment = m_properties["background-attachment"]; m_properties.remove("background-attachment"); } - if(m_properties.tqcontains("background-position")){ + if(m_properties.contains("background-position")){ background_position = m_properties["background-position"]; m_properties.remove("background-position"); } - if(m_properties.tqcontains("border-top-style")){ + if(m_properties.contains("border-top-style")){ border_top_style = m_properties["border-top-style"]; m_properties.remove("border-top-style"); } - if(m_properties.tqcontains("border-top-color")){ + if(m_properties.contains("border-top-color")){ border_top_color = m_properties["border-top-color"]; m_properties.remove("border-top-color"); } - if(m_properties.tqcontains("border-top-width")){ + if(m_properties.contains("border-top-width")){ border_top_width = m_properties["border-top-width"]; m_properties.remove("border-top-width"); } - if(m_properties.tqcontains("border-left-style")){ + if(m_properties.contains("border-left-style")){ border_left_style = m_properties["border-left-style"]; m_properties.remove("border-left-style"); } - if(m_properties.tqcontains("border-left-color")){ + if(m_properties.contains("border-left-color")){ border_left_color = m_properties["border-left-color"]; m_properties.remove("border-left-color"); } - if(m_properties.tqcontains("border-left-width")){ + if(m_properties.contains("border-left-width")){ border_left_width = m_properties["border-left-width"]; m_properties.remove("border-left-width"); } - if(m_properties.tqcontains("border-right-style")){ + if(m_properties.contains("border-right-style")){ border_right_style = m_properties["border-right-style"]; m_properties.remove("border-right-style"); } - if(m_properties.tqcontains("border-right-color")){ + if(m_properties.contains("border-right-color")){ border_right_color = m_properties["border-right-color"]; m_properties.remove("border-right-color"); } - if(m_properties.tqcontains("border-right-width")){ + if(m_properties.contains("border-right-width")){ border_right_width= m_properties["border-right-width"]; m_properties.remove("border-right-width"); } - if(m_properties.tqcontains("border-bottom-style")){ + if(m_properties.contains("border-bottom-style")){ border_bottom_style = m_properties["border-bottom-style"]; m_properties.remove("border-bottom-style"); } - if(m_properties.tqcontains("border-bottom-color")){ + if(m_properties.contains("border-bottom-color")){ border_bottom_color = m_properties["border-bottom-color"]; m_properties.remove("border-bottom-color"); } - if(m_properties.tqcontains("border-bottom-width")){ + if(m_properties.contains("border-bottom-width")){ border_bottom_width = m_properties["border-bottom-width"]; m_properties.remove("border-bottom-width"); } - if(m_properties.tqcontains("outline-style")){ + if(m_properties.contains("outline-style")){ outline_style = m_properties["outline-style"]; m_properties.remove("outline-style"); } - if(m_properties.tqcontains("outline-color")){ + if(m_properties.contains("outline-color")){ outline_color = m_properties["outline-color"]; m_properties.remove("outline-color"); } - if(m_properties.tqcontains("outline-width")){ + if(m_properties.contains("outline-width")){ outline_width = m_properties["outline-width"]; m_properties.remove("outline-width"); } - if(m_properties.tqcontains("list-style-type")){ + if(m_properties.contains("list-style-type")){ list_style_type= m_properties["list-style-type"]; m_properties.remove("list-style-type"); } - if(m_properties.tqcontains("list-style-image")){ + if(m_properties.contains("list-style-image")){ list_style_image = m_properties["list-style-image"]; m_properties.remove("list-style-image"); } - if(m_properties.tqcontains("list-style-position")){ + if(m_properties.contains("list-style-position")){ list_style_position = m_properties["list-style-position"]; m_properties.remove("list-style-position"); } - if(m_properties.tqcontains("font-style")){ + if(m_properties.contains("font-style")){ font_style = m_properties["font-style"]; m_properties.remove("font-style"); } - if(m_properties.tqcontains("font-variant")){ + if(m_properties.contains("font-variant")){ font_variant = m_properties["font-variant"]; m_properties.remove("font-variant"); } - if(m_properties.tqcontains("font-weight")){ + if(m_properties.contains("font-weight")){ font_weight = m_properties["font-weight"]; m_properties.remove("font-weight"); } - if(m_properties.tqcontains("font-size")){ + if(m_properties.contains("font-size")){ font_size = m_properties["font-size"]; m_properties.remove("font-size"); } - if(m_properties.tqcontains("line-height")){ + if(m_properties.contains("line-height")){ line_height= m_properties["line-height"]; m_properties.remove("line-height"); } - if(m_properties.tqcontains("font-family")){ + if(m_properties.contains("font-family")){ font_family = m_properties["font-family"]; m_properties.remove("font-family"); } - if(m_properties.tqcontains("margin-top")){ + if(m_properties.contains("margin-top")){ margin_top = m_properties["margin-top"]; m_properties.remove("margin-top"); } - if(m_properties.tqcontains("margin-bottom")){ + if(m_properties.contains("margin-bottom")){ margin_bottom = m_properties["margin-bottom"]; m_properties.remove("margin-bottom"); } - if(m_properties.tqcontains("margin-left")){ + if(m_properties.contains("margin-left")){ margin_left = m_properties["margin-left"]; m_properties.remove("margin-left"); } - if(m_properties.tqcontains("margin-right")){ + if(m_properties.contains("margin-right")){ margin_right = m_properties["margin-right"]; m_properties.remove("margin-right"); } - if(m_properties.tqcontains("padding-top")){ + if(m_properties.contains("padding-top")){ padding_top = m_properties["padding-top"]; m_properties.remove("padding-top"); } - if(m_properties.tqcontains("padding-bottom")){ + if(m_properties.contains("padding-bottom")){ padding_bottom = m_properties["padding-bottom"]; m_properties.remove("padding-bottom"); } - if(m_properties.tqcontains("padding-left")){ + if(m_properties.contains("padding-left")){ padding_left = m_properties["padding-left"]; m_properties.remove("padding-left"); } - if(m_properties.tqcontains("padding-right")){ + if(m_properties.contains("padding-right")){ padding_right = m_properties["padding-right"]; m_properties.remove("padding-right"); } @@ -517,11 +517,11 @@ TQMap<TQString,TQString> ShorthandFormer::expandBackgroundProp(const TQStringLi while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ){ + if( (*it).contains("url(") || temp == "none" || temp == "inherit" ){ expandedProps["background-image"] = (*it); } else - if( backgroundRepeatValueList.tqcontains(temp)!=0 ) { + if( backgroundRepeatValueList.contains(temp)!=0 ) { expandedProps["background-repeat"] = (*it); } else @@ -529,12 +529,12 @@ TQMap<TQString,TQString> ShorthandFormer::expandBackgroundProp(const TQStringLi expandedProps["background-attachment"] = (*it); } else - if( (*it).tqcontains("rgb(") || (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit" ){ + if( (*it).contains("rgb(") || (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit" ){ expandedProps["background-color"] = (*it); } else - if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).tqcontains(globalPercentagePattern) || (*it).tqcontains(globalLengthPattern) || temp == "inherit"){ - if( expandedProps.tqcontains("background-position") ) + if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).contains(globalPercentagePattern) || (*it).contains(globalLengthPattern) || temp == "inherit"){ + if( expandedProps.contains("background-position") ) expandedProps["background-position"] = ( expandedProps["background-position"] + " " + (*it) ); else expandedProps["background-position"] = (*it); @@ -590,7 +590,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandFontProp(const TQStringList& l) fontPseudoSHFormValues.append("message-box"); fontPseudoSHFormValues.append("small-caption"); fontPseudoSHFormValues.append("status-bar"); - if( l.count()==1 && fontPseudoSHFormValues.tqcontains(l[0]) != 0) { + if( l.count()==1 && fontPseudoSHFormValues.contains(l[0]) != 0) { expandedProps["font"] = l[0]; return expandedProps; } @@ -599,18 +599,18 @@ TQMap<TQString,TQString> ShorthandFormer::expandFontProp(const TQStringList& l) while ( it != l.end() ) { TQString currentIt = (*it); TQString temp(currentIt.stripWhiteSpace()); - if( fontStyleValueList.tqcontains(temp)!=0 ) expandedProps["font-style"] = (*it); + if( fontStyleValueList.contains(temp)!=0 ) expandedProps["font-style"] = (*it); else - if( fontVariantValueList.tqcontains(temp)!=0 ) expandedProps["font-variant"] = currentIt ; + if( fontVariantValueList.contains(temp)!=0 ) expandedProps["font-variant"] = currentIt ; else - if( fontWeightValueList.tqcontains(temp)!=0) expandedProps["font-weight"] = currentIt; + if( fontWeightValueList.contains(temp)!=0) expandedProps["font-weight"] = currentIt; else - if( (fontSizeValueList.tqcontains(temp)!=0 || currentIt.tqcontains(globalPercentagePattern)!=0 || currentIt.tqcontains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() ) + if( (fontSizeValueList.contains(temp)!=0 || currentIt.contains(globalPercentagePattern)!=0 || currentIt.contains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() ) { expandedProps["font-size"] = currentIt; } else - if( currentIt.tqcontains(percentagePattern)!=0 || currentIt.tqcontains(numberPattern)!=0 || currentIt.tqcontains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" ) + if( currentIt.contains(percentagePattern)!=0 || currentIt.contains(numberPattern)!=0 || currentIt.contains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" ) { expandedProps["line-height"] = (currentIt.remove('/')); } @@ -640,7 +640,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandListstyleProp( const TQStringLis TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( listTypeValueList.tqcontains(temp)!=0) { + if( listTypeValueList.contains(temp)!=0) { expandedProps["list-style-type"] = (*it) ; } else @@ -648,7 +648,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandListstyleProp( const TQStringLis expandedProps["list-style-position"] = (*it); } else - if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ) + if( (*it).contains("url(") || temp == "none" || temp == "inherit" ) expandedProps["list-style-image"] = (*it); ++it; @@ -661,12 +661,12 @@ TQMap<TQString,TQString> ShorthandFormer::expandOutlineProp( const TQStringList TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps["outline-style"] = (*it); + if( borderStyleValueList.contains(temp)!=0 ) expandedProps["outline-style"] = (*it); else - if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "invert" || temp == "inherit") + if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "invert" || temp == "inherit") expandedProps["outline-color"] = (*it) ; else - if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0) + if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0) expandedProps["outline-width"] = (*it); ++it; } @@ -679,12 +679,12 @@ TQMap<TQString,TQString> ShorthandFormer::expandBoxSide(const TQString& subProp TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it); + if( borderStyleValueList.contains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it); else - if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit") + if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit") expandedProps[subPropName + "-color"] = (*it) ; else - if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0) + if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0) expandedProps[subPropName + "-width"] = (*it); ++it; } @@ -696,21 +696,21 @@ TQMap<TQString,TQString> ShorthandFormer::expandBorderProp(const TQStringList& TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.tqcontains(temp)!=0 ){ + if( borderStyleValueList.contains(temp)!=0 ){ expandedProps["border-top-style"] = (*it); expandedProps["border-left-style"] = (*it); expandedProps["border-right-style"] = (*it); expandedProps["border-bottom-style"] = (*it); } else - if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit"){ + if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit"){ expandedProps["border-top-color"] = (*it); expandedProps["border-left-color"] = (*it); expandedProps["border-right-color"] = (*it); expandedProps["border-bottom-color"] = (*it); } else - if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0){ + if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0){ expandedProps["border-top-width"] = (*it); expandedProps["border-left-width"] = (*it); expandedProps["border-right-width"] = (*it); diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp index 06e7600a..0a573925 100644 --- a/quanta/components/csseditor/stylesheetparser.cpp +++ b/quanta/components/csseditor/stylesheetparser.cpp @@ -151,21 +151,21 @@ void stylesheetParser::parseSelector(){ int closingParentheses = 1, openingParentheses = 0; while(true){ - openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).tqcontains("{"); + openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).contains("{"); if(openingParentheses==closingParentheses){ - TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/).stripWhiteSpace(), - selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/+1, closingParenthesisPos - m_styleSheet.tqfind("{") -1); + TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/).stripWhiteSpace(), + selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/+1, closingParenthesisPos - m_styleSheet.find("{") -1); selectorName.remove("\n").remove("\t"); selectorValue.remove("\n").remove("\t"); TQPair<TQString,unsigned int> tmp(selectorValue,++m_orderNumber); - if (m_stylesheetStructure.tqcontains(selectorName)) + if (m_stylesheetStructure.contains(selectorName)) { uint i = 2; TQString s = selectorName + TQString("-v%1").tqarg(i); - while (m_stylesheetStructure.tqcontains(s)) + while (m_stylesheetStructure.contains(s)) { i++; s = selectorName + TQString("-v%1").tqarg(i); @@ -176,7 +176,7 @@ void stylesheetParser::parseSelector(){ break; } else { - closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.tqfind("}",closingParenthesisPos+1)*/; + closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.find("}",closingParenthesisPos+1)*/; closingParentheses++; } } @@ -188,13 +188,13 @@ void stylesheetParser::parseSelector(){ void stylesheetParser::parseAtRules1(){ //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs - if(m_styleSheet.tqfind("{") == -1) { + if(m_styleSheet.find("{") == -1) { m_stopProcessing = true; emit errorOccurred(m_styleSheet.mid(0,20) + "...\n " + msg2); return; } - int closingParenthesisPos = m_styleSheet.tqfind("}"), + int closingParenthesisPos = m_styleSheet.find("}"), closingParentheses = 0; if(closingParenthesisPos==-1) return; @@ -202,12 +202,12 @@ void stylesheetParser::parseAtRules1(){ int openingParentheses=0; while(true){ - openingParentheses = m_styleSheet.left(closingParenthesisPos+1).tqcontains("{"); + openingParentheses = m_styleSheet.left(closingParenthesisPos+1).contains("{"); if(openingParentheses==closingParentheses) break; else { - closingParenthesisPos = m_styleSheet.tqfind("}",closingParenthesisPos+1); + closingParenthesisPos = m_styleSheet.find("}",closingParenthesisPos+1); if( closingParenthesisPos!= -1 ) closingParentheses++; else { @@ -227,7 +227,7 @@ void stylesheetParser::parseAtRules1(){ void stylesheetParser::parseAtRules2(){ //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs - int semicolonPos = m_styleSheet.tqfind(";"); + int semicolonPos = m_styleSheet.find(";"); if(semicolonPos==-1) { m_stopProcessing = true; diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 9dfeb5a6..055512da 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -56,7 +56,7 @@ ConditionalBreakpointDialog::~ConditionalBreakpointDialog() void ConditionalBreakpointDialog::slotExpressionChanged() { - if(comboExpression->currentText().tqfind( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) + if(comboExpression->currentText().find( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) ledWarning->on(); else ledWarning->off(); diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index d5ce7b86..584e71f0 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -262,7 +262,7 @@ void DBGpNetwork::slotReadyRead() // If datalen == -1, we didnt read the size yet, otherwise we're reading data. if(m_datalen == -1) { - bytes = m_fifo.tqfind('\0'); + bytes = m_fifo.find('\0'); if(bytes < 0) break; diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index c76e00c2..e9bbc249 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -23,7 +23,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { - textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); } diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 6a52ac39..578fedb9 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -38,7 +38,7 @@ TQString TQByteArrayFifo::retrieve( ) for(size_t cnt = 0; cnt < m_size; cnt++) m_array[cnt] = m_array[cnt + size]; - // Resize array, needed for tqfind() to work + // Resize array, needed for find() to work m_array.resize(m_size); return str; @@ -60,13 +60,13 @@ bool TQByteArrayFifo::append(const char * chars, size_t size ) return true; } -long TQByteArrayFifo::tqfind( char character ) +long TQByteArrayFifo::find( char character ) { - // If size is 0, tqfind() outputs a warning for some reason + // If size is 0, find() outputs a warning for some reason if(m_size == 0) return -1; - return m_array.tqfind(character); + return m_array.find(character); } TQString TQByteArrayFifo::base64Encoded() diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.h b/quanta/components/debugger/dbgp/qbytearrayfifo.h index 2f46df76..9672c619 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.h +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.h @@ -31,7 +31,7 @@ class TQByteArrayFifo bool append(const char * chars, size_t size); TQString retrieve(); TQString base64Encoded(); - long tqfind(char character); + long find(char character); size_t length() { return m_size; } private: diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index ac3793bd..44071116 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node) // Type isnt currently correct with xdebug // type = (attribute(child, "type") == "file" ? File : Eval); typestr = attribute(child, "filename"); - if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) + if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) type = Eval; else type = File; @@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerDBGp::addWatch(const TQString & variable) { - if(m_watchlist.tqfind(variable) == m_watchlist.end()) + if(m_watchlist.find(variable) == m_watchlist.end()) m_watchlist.append(variable); m_network.sendCommand("property_get", "-n " + variable); } // Remove watch void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.tqfind(variable->name())); + if(m_watchlist.find(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.find(variable->name())); } // Show conditional breakpoint state @@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen() void QuantaDebuggerDBGp::profilerOpen(bool forceopen) { TQString profileroutput = m_profilerFilename; - profileroutput.tqreplace("%a", m_appid); - profileroutput.tqreplace("%c", m_initialscript); + profileroutput.replace("%a", m_appid); + profileroutput.replace("%c", m_initialscript); if(m_profilerMapFilename) profileroutput = mapServerPathToLocal( profileroutput); diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp index 2d18309f..6a47d296 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.cpp +++ b/quanta/components/debugger/debuggerbreakpointlist.cpp @@ -50,7 +50,7 @@ void DebuggerBreakpointList::add(DebuggerBreakpoint* bp) void DebuggerBreakpointList::remove(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = tqfind(*bp); + BreakpointList_t::iterator it = find(*bp); if(it == m_breakpointList->end()) return; @@ -113,7 +113,7 @@ void DebuggerBreakpointList::clear() bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = tqfind(*bp); + BreakpointList_t::iterator it = find(*bp); if(it == m_breakpointList->end()) return false; @@ -124,7 +124,7 @@ bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) } -BreakpointList_t::iterator DebuggerBreakpointList::tqfind(const DebuggerBreakpoint &bp) +BreakpointList_t::iterator DebuggerBreakpointList::find(const DebuggerBreakpoint &bp) { BreakpointList_t::iterator it; @@ -180,7 +180,7 @@ void DebuggerBreakpointList::updateBreakpointKey( const DebuggerBreakpoint & bp, { //DebuggerBreakpoint *bpp = new DebuggerBreakpoint(bp); BreakpointList_t::iterator it; - it = tqfind(bp); + it = find(bp); if(it != m_breakpointList->end()) { (*it)->setKey(newkey); diff --git a/quanta/components/debugger/debuggerbreakpointlist.h b/quanta/components/debugger/debuggerbreakpointlist.h index ef9233bc..aa6cd803 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.h +++ b/quanta/components/debugger/debuggerbreakpointlist.h @@ -31,7 +31,7 @@ class DebuggerBreakpointList private: BreakpointList_t* m_breakpointList; BreakpointList_t::iterator m_current; - BreakpointList_t::iterator tqfind(const DebuggerBreakpoint &bp); + BreakpointList_t::iterator find(const DebuggerBreakpoint &bp); public: DebuggerBreakpointList(); diff --git a/quanta/components/debugger/gubed/gubedsettings.cpp b/quanta/components/debugger/gubed/gubedsettings.cpp index b6df9b25..9464dc81 100644 --- a/quanta/components/debugger/gubed/gubedsettings.cpp +++ b/quanta/components/debugger/gubed/gubedsettings.cpp @@ -22,7 +22,7 @@ GubedSettings::GubedSettings(const TQString &protocolversion) : GubedSettingsS(0, "GubedSettings", false, 0) { - textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); } GubedSettings::~GubedSettings() diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index e14ca894..7b84380d 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -383,13 +383,13 @@ void QuantaDebuggerGubed::slotReadyRead() // If datalen == -1, we didnt read the command yet, otherwise were reading data. if(m_datalen == -1) { - bytes = m_buffer.tqfind(";"); + bytes = m_buffer.find(";"); if(bytes < 0) break; data = m_buffer.left(bytes); m_buffer.remove(0, bytes + 1); - bytes = data.tqfind(":"); + bytes = data.find(":"); m_command = data.left(bytes); data.remove(0, bytes + 1); m_datalen = data.toLong(); @@ -445,7 +445,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) long argcnt = args["args"].toLong(); TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) - msg.tqreplace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); + msg.replace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); debuggerInterface()->showtqStatus(msg, false); } @@ -768,15 +768,15 @@ void QuantaDebuggerGubed::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerGubed::addWatch(const TQString &variable) { - if(m_watchlist.tqfind(variable) == m_watchlist.end()) + if(m_watchlist.find(variable) == m_watchlist.end()) m_watchlist.append(variable); sendCommand("getwatch", "variable", variable.ascii(), (char*)0L); } // Remove watch void QuantaDebuggerGubed::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.tqfind(variable->name())); + if(m_watchlist.find(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.find(variable->name())); //sendCommand("unwatchvariable", var->name()); } @@ -1038,13 +1038,13 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) return ca; } - cnt = args.mid(2, args.tqfind("{") - 3).toLong(); - TQString data = args.mid(args.tqfind("{") + 1); + cnt = args.mid(2, args.find("{") - 3).toLong(); + TQString data = args.mid(args.find("{") + 1); TQString tmp, func; while(cnt > 0) { - tmp = data.left(data.tqfind("\"")); + tmp = data.left(data.find("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); func = data.mid(tmp.length() + 1, length); @@ -1053,8 +1053,8 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) if(data.left(1) == "i") { // Integer data - tmp = data.mid(data.tqfind(":") + 1); - tmp = tmp.left(tmp.tqfind(";")); + tmp = data.mid(data.find(":") + 1); + tmp = tmp.left(tmp.find(";")); ca[func] = tmp; data = data.mid(tmp.length() + 3); // kdDebug(24002) << k_funcinfo << "**i " << func << ": " << ca[func] << endl; @@ -1062,7 +1062,7 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) else { // String data - tmp = data.left(data.tqfind("\"")); + tmp = data.left(data.find("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); ca[func] = data.mid(tmp.length() + 1, length); @@ -1098,8 +1098,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) if(type == "s") { // Get length of key - tempstring = str.left(str.tqfind(':')); - str.remove(0, str.tqfind(':') + 1); + tempstring = str.left(str.find(':')); + str.remove(0, str.find(':') + 1); length = tempstring.toUInt(); key = str.left(length + 1); @@ -1108,8 +1108,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) } else if(type == "i") { - key = str.left(str.tqfind(';')); - str.remove(0, str.tqfind(';') + 1); + key = str.left(str.find(';')); + str.remove(0, str.find(';') + 1); } @@ -1122,8 +1122,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:4:"$row";i:6; */ - data = str.left(str.tqfind(';')); - str.remove(0, str.tqfind(';') + 1); + data = str.left(str.find(';')); + str.remove(0, str.find(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Integer); } @@ -1132,9 +1132,9 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:8:"$boolvar";b:1; */ - data = str.left(str.tqfind(';')); + data = str.left(str.find(';')); data = (data == "0" ? i18n("False"): i18n("True")); - str.remove(0, str.tqfind(';') + 1); + str.remove(0, str.find(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Boolean); } else if(type == "N") @@ -1151,8 +1151,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of string - tempstring = str.left(str.tqfind(':')); - str.remove(0, str.tqfind(':') + 1); + tempstring = str.left(str.find(':')); + str.remove(0, str.find(':') + 1); length = tempstring.toUInt(); data = str.left(length + 1); @@ -1168,8 +1168,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.tqfind(':')); - str.remove(0, str.tqfind(':') + 2); + tempstring = str.left(str.find(':')); + str.remove(0, str.find(':') + 2); length = tempstring.toUInt(); TQPtrList<DebuggerVariable> vars ; @@ -1193,13 +1193,13 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.tqfind(':')); - str.remove(0, str.tqfind(':') + 2); - tempstring = str.mid(str.tqfind(':') + 1); - tempstring = tempstring.left(tempstring.tqfind(':')); + tempstring = str.left(str.find(':')); + str.remove(0, str.find(':') + 2); + tempstring = str.mid(str.find(':') + 1); + tempstring = tempstring.left(tempstring.find(':')); length = tempstring.toUInt(); - str.remove(0, str.tqfind('{') + 1); + str.remove(0, str.find('{') + 1); TQPtrList<DebuggerVariable> vars ; while(length > 0) @@ -1220,8 +1220,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:9:"$floatvar";d:12.5600000000000004973799150320701301097869873046875;" */ - data = str.left(str.tqfind(';')); - str.remove(0, str.tqfind(';') + 1); + data = str.left(str.find(';')); + str.remove(0, str.find(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Float); } diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index be930d17..83eb582c 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -86,20 +86,20 @@ const TQString QuantaDebuggerInterface::activeFileParts(const TQString & str) // n/d/p = name/dir/path // Filename, filedir and filepath - newstr.tqreplace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); - newstr.tqreplace("%afd", ViewManager::ref()->activeDocument()->url().directory()); - newstr.tqreplace("%afp", ViewManager::ref()->activeDocument()->url().path()); + newstr.replace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); + newstr.replace("%afd", ViewManager::ref()->activeDocument()->url().directory()); + newstr.replace("%afp", ViewManager::ref()->activeDocument()->url().path()); // filedir and filepath relative to project root - newstr.tqreplace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); - newstr.tqreplace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.replace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); + newstr.replace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); // filedir and filepath relative to document root - newstr.tqreplace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); - newstr.tqreplace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.replace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); + newstr.replace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); - newstr.tqreplace("%apd", Project::ref()->projectBaseURL().path()); - newstr.tqreplace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); + newstr.replace("%apd", Project::ref()->projectBaseURL().path()); + newstr.replace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); kdDebug(24002) << k_funcinfo << ", BaseURL " << Project::ref()->projectBaseURL().path() << ", active doc : " << ViewManager::ref()->activeDocument()->url().path() << ", documentFolderForURL" << Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()) << ", newstr" << newstr << endl; diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index ecf42bf8..592d33d5 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -98,7 +98,7 @@ void tree::refreshGeometries(treeNode *n){ treeNode* tree::findNode(const TQString &l){ if(l==m_root->label()) return m_root; - return m_nodeList.tqfind(l); + return m_nodeList.find(l); } TQString tree::addChildNode(const TQString &l){ diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index a1d568a6..428a381f 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -46,7 +46,7 @@ class treeNode { void setLabel(const TQString &l) { m_label = l; } void removeChildren() { m_tqchildrenList.clear(); } void setParentLabel(const TQString &s){ m_parentLabel = s;} - int childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); } + int childPosition(treeNode* n){ return m_tqchildrenList.find(n); } bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); } TQString label() const { return m_label; } TQString parentLabel() const { return m_parentLabel; } diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 3795a3ce..215bdf63 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -109,9 +109,9 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ // then every asterisk must be assigned a percentage of 10% so the real percentage // notation is cols="40%,50%,10%" for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if(!(*it).tqcontains("%") && !(*it).tqcontains("*")) leftPercentage -= ( (*it).toInt()*100 )/d; - if((*it).tqcontains("%")) leftPercentage -= (*it).section("%",0,0).toInt(); - if((*it).tqcontains("*")) { + if(!(*it).contains("%") && !(*it).contains("*")) leftPercentage -= ( (*it).toInt()*100 )/d; + if((*it).contains("%")) leftPercentage -= (*it).section("%",0,0).toInt(); + if((*it).contains("*")) { int weight= (*it).section("*",0,0).toInt(); if( weight==0 ) weight=1; weightAsteriskCounter += weight; @@ -125,7 +125,7 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ // a quelli effettivamente generati dal metodo build che opera un'altra normalizzazione. // In genere la differenza �dell' 1% for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if((*it).tqcontains("*")){ + if((*it).contains("*")){ int weight= (*it).section("*",0,0).toInt(); if(weight==0) weight=1; int newPercentage = weight*leftPercentageDistributedAmongAsterisks; @@ -138,9 +138,9 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ TQString line = m_existingStructure.first(); - if(line.tqcontains("<frameset")) { - if(line.tqcontains("rows")) { - split(tqparent,(line.tqcontains(",")+1),HORIZONTAL); + if(line.contains("<frameset")) { + if(line.contains("rows")) { + split(tqparent,(line.contains(",")+1),HORIZONTAL); TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); @@ -148,7 +148,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); - int dummyDimension=dummy.height()-cancelledPixels(line.tqcontains(",")+1); + int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList(); TQPtrListIterator<treeNode> it( list ); @@ -157,7 +157,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ ++it; TQRect newGeometry(dummy); double newDimension; - if(percentages.first().tqcontains("%")) + if(percentages.first().contains("%")) newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0; else newDimension=(double)percentages.first().toInt(); newGeometry.setHeight( proxInt(newDimension) ); @@ -166,15 +166,15 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ } } else - if(line.tqcontains("cols")) { - split(tqparent,(line.tqcontains(",")+1),VERTICAL); + if(line.contains("cols")) { + split(tqparent,(line.contains(",")+1),VERTICAL); TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); - int dummyDimension=dummy.width()-cancelledPixels(line.tqcontains(",")+1); + int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList(); TQPtrListIterator<treeNode> it( list ); @@ -183,7 +183,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ ++it; TQRect newGeometry(dummy); double newDimension; - if(percentages.first().tqcontains("%")) + if(percentages.first().contains("%")) newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0; else newDimension=(double)percentages.first().toInt(); newGeometry.setWidth( proxInt(newDimension) ); @@ -201,7 +201,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ } else { TQMap<TQString,TQString> attributeMap; - if( line.tqcontains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize"; + if( line.contains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize"; else attributeMap["noresize"] = TQString(); TQRegExp srcPattern("\\s+src\\s*=\\s*\"([%-\\w\\s\\./_\\+\\d]*)\""); //search for files @@ -287,7 +287,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){ if(n->hasChildren()) { TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10)); TQSplitter *splitter = new TQSplitter(tqparent,splitterName.ascii()); - if(SIZES.tqcontains(splitterName)) splitter->setSizes( SIZES[splitterName] ); + if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] ); switch( n->splitType() ){ case VERTICAL : splitter->setOrientation(Qt::Horizontal);break; case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break; @@ -421,9 +421,9 @@ TQString VisualFrameEditor::formatStructure(){ TQString s; int tabNum = 0; for ( TQStringList::Iterator it = nonFormattedStructure.begin(); it != nonFormattedStructure.end(); ++it ) { - if((*it).tqcontains("<frameset")) tabNum++; + if((*it).contains("<frameset")) tabNum++; else - if((*it).tqcontains("</frameset>")) { + if((*it).contains("</frameset>")) { tabNum--; s.truncate(s.length()-1); } @@ -441,9 +441,9 @@ TQString VisualFrameEditor::framesetStructure() { } void VisualFrameEditor::setMarkupLanguage(const TQString& s){ - if( s.tqcontains("xhtml",false)!=0 ) m_markupLanguage = XHTML; + if( s.contains("xhtml",false)!=0 ) m_markupLanguage = XHTML; else - if( s.tqcontains("html",false)!=0 ) m_markupLanguage = HTML; + if( s.contains("html",false)!=0 ) m_markupLanguage = HTML; } #include "visualframeeditor.moc" diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index e9475242..c49d2be0 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -152,7 +152,7 @@ void TableEditor::slotContextMenuRequested( int row, int col, const TQPoint & po TQTableSelection selection = m_dataTable->selection(m_dataTable->currentSelection()); TQRect rect(TQPoint(selection.topRow(), selection.leftCol()) , TQPoint(selection.bottomRow(), selection.rightCol())); - if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.tqcontains(m_row, m_col)) { + if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.contains(m_row, m_col)) { m_popup->setItemVisible(m_mergeCellsId, true); m_popup->setItemVisible(m_mergeSeparatorId, true); } @@ -919,7 +919,7 @@ void TableEditor::slotRemoveRow() if ((*it3).merged) { TableNode *mainTableNode = &((*m_tableTags)[(*it3).mergedRow][(*it3).mergedCol]); - if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode)) + if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode)) { int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt(); rowspan--; @@ -970,7 +970,7 @@ void TableEditor::slotRemoveCol() if ((*it2).merged) { TableNode *mainTableNode = &((*m_tableTags)[(*it2).mergedRow][(*it2).mergedCol]); - if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode)) + if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode)) { int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt(); colspan--; @@ -1163,7 +1163,7 @@ void TableEditor::slotEditChildTable() table = *it; if (table.row == m_row && table.col == m_col) { TQString cellData = m_dataTable->text(table.row, table.col); - int pos = cellData.tqfind(table.nestedData); + int pos = cellData.find(table.nestedData); if (pos == -1) { KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table")); error = true; @@ -1182,9 +1182,9 @@ void TableEditor::slotEditChildTable() baseNode = localParser->parse(w); tempDocCreated = true; //try to find the child table position - int pos2 = tableData.tqfind(cellData); + int pos2 = tableData.find(cellData); if (pos2 != -1) - pos2 = tableData.tqfind(table.nestedData, pos2); + pos2 = tableData.find(table.nestedData, pos2); else { KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table")); error = true; @@ -1192,8 +1192,8 @@ void TableEditor::slotEditChildTable() break; } tableData = tableData.left(pos2); - table.bLine = tableData.tqcontains('\n'); - pos2 = tableData.tqfindRev('\n'); + table.bLine = tableData.contains('\n'); + pos2 = tableData.findRev('\n'); if (pos2 != -1) { table.bCol = tableData.length() - pos2; } else { @@ -1214,7 +1214,7 @@ void TableEditor::slotEditChildTable() if (editor.exec()) { int length = table.nestedData.length(); (*it).nestedData = editor.readModifiedTable(); - cellData.tqreplace(pos, length, (*it).nestedData); + cellData.replace(pos, length, (*it).nestedData); setCellText(m_dataTable, table.row, table.col, cellData); } //cleanup on success diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 0ac7ede2..562d74ed 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -89,7 +89,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); - toolbarName.tqreplace(r, ""); + toolbarName.replace(r, ""); item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8())); actionTreeView->insertItem(item); @@ -106,13 +106,13 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldActionItem = new KListViewItem(item, oldActionItem, action->text().tqreplace(r,""), action->shortcut().toString(), action->name()); + oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name()); oldActionItem->setPixmap(0, SmallIcon(action->icon()) ); } } node = node.nextSibling(); } - if (tb->label(tb->currentPageIndex()).tqreplace(r, "") == toolbarName) + if (tb->label(tb->currentPageIndex()).replace(r, "") == toolbarName) { item->setOpen(true); if (item->firstChild()) @@ -142,7 +142,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, for (uint i = 0; i < acCount; i++) { action = ac->action(i); - item = new KListViewItem(allActionsItem, action->text().tqreplace(r, ""), action->shortcut().toString(), action->name()); + item = new KListViewItem(allActionsItem, action->text().replace(r, ""), action->shortcut().toString(), action->name()); item->setPixmap(0, SmallIcon(action->icon()) ); } allActionsItem->sortChildItems(0, true); @@ -168,7 +168,7 @@ void ActionConfigDialog::slotAddToolbar() for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); - if (!actionTreeView->tqfindItem(toolbarName, 0)) + if (!actionTreeView->findItem(toolbarName, 0)) { item = actionTreeView->lastItem(); if (item->tqparent()) @@ -231,7 +231,7 @@ void ActionConfigDialog::slotEditToolbar() ToolbarEntry *p_toolbar = m_toolbarList[toolbarId]; if (p_toolbar) { - oldItem = actionTreeView->tqfindItem(toolbarName, 0); + oldItem = actionTreeView->findItem(toolbarName, 0); item = new KListViewItem(actionTreeView, oldItem, toolbarName); item->setOpen(oldItem->isOpen()); delete oldItem; @@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar() action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldItem = new KListViewItem(item, oldItem, action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); + oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); oldItem->setPixmap(0, SmallIcon(action->icon())); } } @@ -309,7 +309,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) actionIcon->setIcon(s); } TQString actionText = el.attribute("text"); - actionText.tqreplace(TQRegExp("\\&(?!\\&)"),""); + actionText.replace(TQRegExp("\\&(?!\\&)"),""); lineText->setText(actionText); lineToolTip->setText( el.attribute("tooltip") ); selectedShortcut = action->shortcut(); @@ -406,7 +406,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) { outputBox->setCurrentItem(2); } else - if (s == "tqreplace") + if (s == "replace") { outputBox->setCurrentItem(3); } else @@ -431,7 +431,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) { errorBox->setCurrentItem(2); } else - if (s == "tqreplace") + if (s == "replace") { errorBox->setCurrentItem(3); } else @@ -472,7 +472,7 @@ void ActionConfigDialog::saveCurrentAction() currentAction->setIcon(s); TQString oldText = el.attribute("text"); s = lineText->text(); - s.tqreplace('&', "&&"); + s.replace('&', "&&"); el.setAttribute("text", s); currentAction->setText(s); s = lineToolTip->text(); @@ -549,7 +549,7 @@ void ActionConfigDialog::saveCurrentAction() case 2:{ item.setAttribute("output", "selection"); break; } - case 3:{ item.setAttribute("output", "tqreplace"); + case 3:{ item.setAttribute("output", "replace"); break; } case 4:{ item.setAttribute("output", "new"); @@ -570,7 +570,7 @@ void ActionConfigDialog::saveCurrentAction() case 2:{ item.setAttribute("error", "selection"); break; } - case 3:{ item.setAttribute("error", "tqreplace"); + case 3:{ item.setAttribute("error", "replace"); break; } case 4:{ item.setAttribute("error", "new"); @@ -618,7 +618,7 @@ void ActionConfigDialog::saveCurrentAction() if (p_toolbar) { TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild(); - bool placeOnToolbar = toolbarListBox->tqfindItem(toolbarName, TQt::ExactMatch); + bool placeOnToolbar = toolbarListBox->findItem(toolbarName, TQt::ExactMatch); while (!node.isNull()) { if (node.nodeName() == "Action" && @@ -658,7 +658,7 @@ void ActionConfigDialog::saveCurrentAction() item.setAttribute("name",el.attribute("name")); p_toolbar->guiClient->domDocument().firstChild().firstChild().appendChild(item); //put it also in the treeview - listItem = actionTreeView->tqfindItem(toolbarName, 0); + listItem = actionTreeView->findItem(toolbarName, 0); if (listItem) { TQListViewItem *after = listItem->firstChild(); @@ -698,29 +698,29 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) { TQString shortcutText = shortcut.toString(); TQString shortcutText2; - int pos = shortcutText.tqfind(';'); + int pos = shortcutText.find(';'); if (pos != -1) { shortcutText2 = shortcutText.mid(pos + 1); shortcutText = shortcutText.left(pos); } TQString s = shortcutText; - s.tqreplace('+', "\\+"); + s.replace('+', "\\+"); TQRegExp shortcutRx("\\(" + s + "\\)|" + s + "$|" + s + ";"); s = shortcutText2; - s.tqreplace('+', "\\+"); + s.replace('+', "\\+"); TQRegExp shortcutRx2("\\(" + s + "\\)|" + s + "$|" + s + ";"); TQString global; //check for conflicting global shortcuts TQMap<TQString, TQString>::Iterator it; for ( it = globalShortcuts.begin(); it != globalShortcuts.end(); ++it ) { - if (it.data().tqcontains(shortcutRx)) + if (it.data().contains(shortcutRx)) { global = it.key(); break; } - if (!shortcutText2.isEmpty() && it.data().tqcontains(shortcutRx2)) + if (!shortcutText2.isEmpty() && it.data().contains(shortcutRx2)) { shortcutText = shortcutText2; global = it.key(); @@ -737,12 +737,12 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) for (uint i = 0; i < ac->count(); i++) { KAction *action = ac->action(i); - if (action != currentAction && action->shortcut().toString().tqcontains(shortcutRx)) + if (action != currentAction && action->shortcut().toString().contains(shortcutRx)) { global = action->text(); break; } - if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().tqcontains(shortcutRx)) + if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().contains(shortcutRx)) { shortcutText = shortcutText2; global = action->text(); @@ -761,7 +761,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) selectedShortcut = shortcut; } else { - global.tqreplace('&',""); + global.replace('&',""); TQString s = i18n("The '%1' key combination has already been allocated " "to the \"%2\" action.\n" "Please choose a unique key combination."). @@ -876,7 +876,7 @@ void ActionConfigDialog::slotAddContainerToolbar() TQStringList lst; for (i = 0; i < tb->count(); i++) { - if (!toolbarListBox->tqfindItem(tb->label(i), TQt::ExactMatch)) + if (!toolbarListBox->findItem(tb->label(i), TQt::ExactMatch)) lst << tb->label(i); } diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index 88201b3d..7a6120e4 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -94,7 +94,7 @@ void DTEPEditDlg::readGeneral() TQString inherits = m_config->readEntry("Inherits"); TQStringList lst(DTDs::ref()->nameList()); inheritsCombo->insertStringList(lst); - int idx = lst.tqfindIndex(inherits); + int idx = lst.findIndex(inherits); if (idx == -1) inheritsCombo->insertItem(inherits, 0); else diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 1167f46e..8c223417 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -1302,7 +1302,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Comma separated list of the local scope defining keywords</string> </property> <property name="whatsThis" stdset="0"> - <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> + <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> </property> </widget> <widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3"> @@ -1313,7 +1313,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Comma separated list of the local scope defining keywords</string> </property> <property name="whatsThis" stdset="0"> - <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> + <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> </property> </widget> <widget class="KLineEdit" row="2" column="1" rowspan="1" colspan="3"> diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index b7813f8d..bcec6363 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -250,7 +250,7 @@ Example (simplified):<br> <b>DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;<br> TypeRx=new\\s([a-zA-Z]+);</b><br><br> -This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will tqfind <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> +This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will find <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> So the type of <b>$fooObj</b> is <b>foo</b>.</string> </property> </widget> @@ -298,7 +298,7 @@ Example 3:<br> Example (simplified):<br> <b>DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;<br> TypeRx=new\\s([a-zA-Z]+);</b><br><br> -This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will tqfind <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> +This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will find <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> So the type of <b>$fooObj</b> is <b>foo</b>.</string> </property> </widget> diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 1f1728ae..f41a98a1 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -76,8 +76,8 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName) for ( it = m_currentAbbrev->abbreviations.constBegin(); it != m_currentAbbrev->abbreviations.constEnd(); ++it ) { templateStr = it.key(); - templateName = templateStr.mid(templateStr.tqfind(' ') + 1); - templateStr = templateStr.left(templateStr.tqfind(' ')); + templateName = templateStr.mid(templateStr.find(' ') + 1); + templateStr = templateStr.left(templateStr.find(' ')); new KListViewItem(templatesList, templateStr, templateName); } for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit ) @@ -95,7 +95,7 @@ void AbbreviationDlg::slotNewGroup() TQString groupName = KInputDialog::getText(i18n("New Abbreviation Group"), i18n("Group name:"), "", &ok, this); if (ok && !groupName.isEmpty()) { - if (qConfig.abbreviations.tqcontains(groupName)) + if (qConfig.abbreviations.contains(groupName)) { KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").tqarg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); @@ -248,7 +248,7 @@ void AbbreviationDlg::saveTemplates() el.setAttribute("code", it.data()); s = it.key(); s2 = ""; - pos = s.tqfind(' '); + pos = s.find(' '); if (pos != -1) { s2 = s.mid(pos+1); diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index 04593921..58a601e8 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -43,12 +43,12 @@ void FileMasks::setToDefault() for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (name.tqcontains("text")) + if (name.contains("text")) { - if (!markup.tqcontains(name) && !script.tqcontains(name)) + if (!markup.contains(name) && !script.contains(name)) text += name+"; "; } - if (name.tqcontains("image")) + if (name.contains("image")) { image += name +"; "; } diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index 2caa497e..f8697123 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -52,7 +52,7 @@ void SpecialCharDialog::filterChars(const TQString& filter) CharsListBox->insertStringList(charList); else { for (TQStringList::ConstIterator it = charList.begin(); it != charList.end(); ++it) - if ( (*it).tqcontains(filter, false) ) + if ( (*it).contains(filter, false) ) CharsListBox->insertItem(*it); } if (CharsListBox->currentItem() == -1 && CharsListBox->count()) @@ -67,8 +67,8 @@ TQString SpecialCharDialog::selection() void SpecialCharDialog::insertCode() { TQString selected = CharsListBox->text(CharsListBox->currentItem()); - int begin = selected.tqfind("(&")+1; - int length = selected.tqfind(";)") - begin + 1; + int begin = selected.find("(&")+1; + int length = selected.find(";)") - begin + 1; m_selection = selected.mid(begin, length); done(TQDialog::Accepted); } diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp index f45eea8f..815ecdf2 100644 --- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp +++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp @@ -48,13 +48,13 @@ void CoreWidgetDlg::writeAttributes( TQDict<TQString> *d ) dict = d; TQString *t; // value of attr. - if (( t=d->tqfind("id") )) setValue(*t, lineId); - if (( t=d->tqfind("class") )) setValue(*t, lineClass); - if (( t=d->tqfind("style") )) setValue(*t, lineStyle); - if (( t=d->tqfind("title") )) setValue(*t, lineTitle); + if (( t=d->find("id") )) setValue(*t, lineId); + if (( t=d->find("class") )) setValue(*t, lineClass); + if (( t=d->find("style") )) setValue(*t, lineStyle); + if (( t=d->find("title") )) setValue(*t, lineTitle); - if (( t=d->tqfind("lang") )) setValue(*t, lineLang); - if (( t=d->tqfind("dir") )) setValue(*t, lineDir); + if (( t=d->find("lang") )) setValue(*t, lineLang); + if (( t=d->find("dir") )) setValue(*t, lineDir); } diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index 1ab0bdde..be05c44f 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -50,7 +50,7 @@ Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) TQString method = el.attribute("method"); TQString interface = el.attribute("interface", "QuantaIf"); TQString arguments = el.attribute("arguments"); - arguments.tqreplace("%tagname%", m_dtdTag->name()); + arguments.replace("%tagname%", m_dtdTag->name()); DCOPReply reply = QuantaCommon::callDCOPMethod(interface, method, arguments); if (reply.isValid()) { @@ -87,7 +87,7 @@ void Attr_list::setValue(const TQString &value) } -TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ) +TQDomNode findChild( TQDomNode &tqparent, const TQString &name ) { for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() ) if ( n.nodeName() == name ) diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h index c9567eda..2206f896 100644 --- a/quanta/dialogs/tagdialogs/tagattr.h +++ b/quanta/dialogs/tagdialogs/tagattr.h @@ -37,7 +37,7 @@ class TQWidget; class TQTag; -TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ); +TQDomNode findChild( TQDomNode &tqparent, const TQString &name ); class Attr diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 7a7ea593..ac9c8ffc 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -226,7 +226,7 @@ void TagDialog::parseTag() { TQDomNode node = nodeList.item(j); TQString nodeTagName = node.toElement().attribute("name"); - if (groupList.tqcontains(nodeTagName) && dtdTag->commonGroups.tqcontains(nodeTagName)) //add the attributes of this common tag to a new tab + if (groupList.contains(nodeTagName) && dtdTag->commonGroups.contains(nodeTagName)) //add the attributes of this common tag to a new tab { TQString s; TQTextStream str(&s, IO_ReadWrite); @@ -325,11 +325,11 @@ TQString TagDialog::getAttributeString() TQString TagDialog::getAttribute(const TQString& attr) { TQString attrStr = getAttributeString()+" "; - int pos = attrStr.upper().tqfind(attr.upper()); + int pos = attrStr.upper().find(attr.upper()); if (pos != -1) { - pos = attrStr.tqfind("=",pos+1) + 1; - return attrStr.mid(pos, attrStr.tqfind(" ",pos) - pos); + pos = attrStr.find("=",pos+1) + 1; + return attrStr.mid(pos, attrStr.find(" ",pos) - pos); } else { diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index b52d3be9..95c41e4e 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -145,7 +145,7 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d ) dict = d; TQString *t; // value of attr. - if (( t=d->tqfind("src") )) + if (( t=d->find("src") )) { lineImgSource->setText(*t); KURL url = baseURL; @@ -153,18 +153,18 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d ) url = QExtFileInfo::toAbsolute(url, baseURL); slotImageSet( url ); } - if ( (t=d->tqfind("alt")) ) + if ( (t=d->find("alt")) ) setValue(*t, lineAltText); - if ( (t=d->tqfind("width")) && lineWidth ) + if ( (t=d->find("width")) && lineWidth ) setValue(*t, lineWidth); - if ( (t=d->tqfind("height")) && lineHeight ) + if ( (t=d->find("height")) && lineHeight ) setValue(*t, lineHeight); - if ( (t=d->tqfind("hspace")) && lineHSpace) + if ( (t=d->find("hspace")) && lineHSpace) setValue(*t, lineHSpace); - if ( (t=d->tqfind("vspace")) && lineVSpace ) + if ( (t=d->find("vspace")) && lineVSpace ) setValue(*t, lineVSpace); - if ( (t=d->tqfind("align")) && comboAlign ) + if ( (t=d->find("align")) && comboAlign ) setValue(*t, comboAlign); - if ( (t=d->tqfind("border")) && spinBorder ) + if ( (t=d->find("border")) && spinBorder ) setValue(*t, spinBorder); } diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index 07a44394..a761d62c 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -34,7 +34,7 @@ void TagImgDlg::initDialog(){ buttonImgSource->setText(i18n("...")); grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4); - TQTag *imgTag = m_dtd->tagsList->tqfind("img"); + TQTag *imgTag = m_dtd->tagsList->find("img"); if (!imgTag) return; diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index 0aa689d2..96cef91e 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -68,18 +68,18 @@ void TagMailDlg::slotSelectAddress() n = n.simplifyWhiteSpace(); for( unsigned int i = 0; i < emails.count(); ++i ) { if (!emails[i].isEmpty()) { - if (n.isEmpty() || (emails[i].tqfind( "<" ) != -1)) + if (n.isEmpty() || (emails[i].find( "<" ) != -1)) addr = ""; else { /* do we really need quotes around this name ? */ - if (n.tqfind(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) + if (n.find(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) addr = qConfig.attrValueQuotation + n + qConfig.attrValueQuotation + " "; else addr = n + " "; } email = emails[i]; - if (!addr.isEmpty() && (email.tqfind( "<" ) == -1) - && (email.tqfind( ">" ) == -1) - && (email.tqfind( "," ) == -1)) + if (!addr.isEmpty() && (email.find( "<" ) == -1) + && (email.find( ">" ) == -1) + && (email.find( "," ) == -1)) addr += "<" + email + ">"; else addr += email; diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp index 4eb79f24..f461e3a9 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.cpp +++ b/quanta/dialogs/tagdialogs/tagwidget.cpp @@ -47,7 +47,7 @@ void TagWidget::updateDict(const TQString &attr, TQComboBox *combo ) delete s; } else - dict->tqreplace(attr, s); + dict->replace(attr, s); } void TagWidget::setValue(const TQString &val, TQComboBox *combo) @@ -92,7 +92,7 @@ void TagWidget::updateDict(const TQString &attr, TQLineEdit *line ) delete s; } else - dict->tqreplace(attr, s); + dict->replace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) @@ -104,7 +104,7 @@ void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) delete s; } else - dict->tqreplace(attr, s); + dict->replace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) @@ -113,7 +113,7 @@ void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) dict->remove(attr); else { - if (!dict->tqfind(attr)) + if (!dict->find(attr)) dict->insert(attr, new TQString("")); } } diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index a8428b20..0015c35e 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -56,7 +56,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) //parse the tag XML file, in order to build up the dialog for ( TQDomNode n = d.firstChild(); !n.isNull(); n = n.nextSibling() ) { - TQDomNode location = tqfindChild(n,"location"); + TQDomNode location = findChild(n,"location"); if ( location.isNull() ) continue; @@ -69,7 +69,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) int colspan = el.attribute("colspan","1").toInt()-1; int rowspan = el.attribute("rowspan","1").toInt()-1; - location = tqfindChild(n,"textlocation"); + location = findChild(n,"textlocation"); el = location.toElement(); int textrow = el.attribute("row","0").toInt(); int textcol = el.attribute("col","0").toInt(); @@ -79,7 +79,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) // qDebug("%s col:%d row:%d cs:%d, rs:%d", n.nodeName().data(), col,row,colspan,rowspan ); TQString tip; - TQDomNode tooltip = tqfindChild( n ,"tooltip" ); + TQDomNode tooltip = findChild( n ,"tooltip" ); if ( !tooltip.isNull() ) { if ( tooltip.firstChild().isText() ) { TQDomText text = tooltip.firstChild().toText(); @@ -87,7 +87,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) } } TQString whatsThis; - TQDomNode what = tqfindChild( n ,"whatsthis" ); + TQDomNode what = findChild( n ,"whatsthis" ); if ( !what.isNull() ) { if ( what.firstChild().isText() ) { TQDomText text = what.firstChild().toText(); @@ -98,7 +98,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) if ( n.nodeName() == "label" ) //a static label { TQLabel *label = new TQLabel(this); - TQDomElement ltext = tqfindChild(n,"text").toElement(); + TQDomElement ltext = findChild(n,"text").toElement(); if ( !ltext.isNull() ) label->setText( ltext.text().isEmpty() ? TQString("") : (ltext.text()+":") ); @@ -116,7 +116,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) TQDomElement el(n.toElement()); TQString type = el.attribute("type","input"); - TQDomElement ltext = tqfindChild(n,"text").toElement(); + TQDomElement ltext = findChild(n,"text").toElement(); if ( !ltext.isNull() && (type != "check") ) //if there is a text label for the attribute { TQLabel *label = new TQLabel(this); @@ -152,7 +152,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) TQCheckBox *w = new TQCheckBox(this); grid->addMultiCellWidget( w, row, row+rowspan, col, col+colspan ); - TQDomElement ltext = tqfindChild(n,"text").toElement(); + TQDomElement ltext = findChild(n,"text").toElement(); if ( !ltext.isNull() ) w->setText( ltext.text() ); if ( !tip.isNull() ) @@ -270,10 +270,10 @@ void Tagxml::readAttributes( TQDict<TQString> *d ) { if (m_dtd->booleanAttributes == "simple") { - d->tqreplace(name, new TQString("") ); + d->replace(name, new TQString("") ); } else { - d->tqreplace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all + d->replace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all } } else @@ -283,16 +283,16 @@ void Tagxml::readAttributes( TQDict<TQString> *d ) /* } else { value = (value == "checked")?m_dtd->booleanTrue:m_dtd->booleanFalse; - d->tqreplace(name, new TQString(value)); + d->replace(name, new TQString(value)); } */ } else if (dynamic_cast<Attr_file *>(attr)) { // value = KURL::encode_string(value); - d->tqreplace(name, new TQString(value)); + d->replace(name, new TQString(value)); } else { - value.tqreplace(TQRegExp("&(?!amp;)"), "&"); - d->tqreplace(name, new TQString(value) ); + value.replace(TQRegExp("&(?!amp;)"), "&"); + d->replace(name, new TQString(value) ); } } @@ -313,9 +313,9 @@ void Tagxml::writeAttributes( TQDict<TQString> *d ) name = attr->attrName(); - TQString *v = d->tqfind(name); + TQString *v = d->find(name); if ( v ) { - v->tqreplace("&","&"); + v->replace("&","&"); if ( dynamic_cast<Attr_check *>(attr) ) // checkbox value = "checked"; else diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 0bca2cf2..57a8e84c 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -85,7 +85,7 @@ void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, con { line++; TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first); - s.tqreplace('\n', ' '); + s.replace('\n', ' '); m_currentFileAnnotations->showMessage(line, 1, fileName, s); } @@ -148,13 +148,13 @@ void AnnotationOutput::readAnnotations() KURL u = baseURL; QuantaCommon::setUrl(u, fileName); u = QExtFileInfo::toAbsolute(u, baseURL); - if (Project::ref()->tqcontains(u)) + if (Project::ref()->contains(u)) { bool ok; int line = el.attribute("line").toInt(&ok, 10); TQString text = el.attribute("text"); TQString receiver = el.attribute("receiver"); - text.tqreplace('\n',' '); + text.replace('\n',' '); TQString lineText = TQString("%1").tqarg(line); if (lineText.length() < 20) { @@ -170,12 +170,12 @@ void AnnotationOutput::readAnnotations() m_fileNames[fileIt] = u.url(); } KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); - if (openedItems.tqcontains(fileName)) + if (openedItems.contains(fileName)) fileIt->setOpen(true); m_fileNames[it] = u.url(); m_lines[it] = line; - if (!yourself.isEmpty() && (receiver == yourself || roles.tqcontains(receiver))) + if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver))) { m_yourAnnotationsNum++; KListViewItem *fileIt = m_yourFileItems[fileName]; @@ -186,7 +186,7 @@ void AnnotationOutput::readAnnotations() m_yourFileNames[fileIt] = u.url(); } KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); - if (yourOpenedItems.tqcontains(fileName)) + if (yourOpenedItems.contains(fileName)) fileIt->setOpen(true); m_yourFileNames[it] = u.url(); m_yourLines[it] = line; @@ -234,7 +234,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui TQString text = el.attribute("text"); bool ok; int line = el.attribute("line").toInt(&ok, 10); - if (!annotations.tqcontains(line) || (annotations[line].first != text)) + if (!annotations.contains(line) || (annotations[line].first != text)) { n.parentNode().removeChild(n); modified = true; @@ -307,7 +307,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) while (!stream.atEnd()) { line = stream.readLine(); - int pos = line.tqfind("@annotation"); + int pos = line.find("@annotation"); if (pos != -1) { TQString receiver; @@ -315,7 +315,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) if (line[pos] == '(') { int p = pos; - pos = line.tqfind(')'); + pos = line.find(')'); if (pos != -1) { receiver = line.mid(p + 1, pos - p - 1); @@ -323,7 +323,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) } } else pos++; - int pos2 = line.tqfind(rx); + int pos2 = line.find(rx); annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); } ++i; diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp index ab8c1ef1..dc1c7ad8 100644 --- a/quanta/messages/messageitem.cpp +++ b/quanta/messages/messageitem.cpp @@ -31,7 +31,7 @@ int MessageItem::line() } else { // try to find first number in text TQString s = text(); - int pos = s.tqfind( TQRegExp("[0-9]")); + int pos = s.find( TQRegExp("[0-9]")); if ( pos == -1 ) return lineNumber; int pos2 = pos; @@ -70,10 +70,10 @@ TQString MessageItem::fileName() { TQString fname; TQString s = text(); - int pos = s.tqfind(i18n("File: ")); + int pos = s.find(i18n("File: ")); if (pos != -1) { - int pos2 = s.tqfind(i18n(", "), pos); + int pos2 = s.find(i18n(", "), pos); if (pos2 != -1) fname = s.mid(pos, pos2-pos); else diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 666d98d3..43050d55 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -85,7 +85,7 @@ void MessageOutput::showMessage(int line, int col, const TQString &fileName, con int endPos; if ( !count() || (!append && !text(count()-1).stripWhiteSpace().isEmpty()) ) it = insertItem(""); - while ( ( endPos = message.tqfind('\n') ) != -1 ) { + while ( ( endPos = message.find('\n') ) != -1 ) { if (it) { it->setLine(line); diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 2783acca..5008dcff 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -51,7 +51,7 @@ TQStringList DTD::getTags() AttributeList* DTD::getTagAttributes(TQString tag) { - return tagAttributes.tqfind(tag); + return tagAttributes.find(tag); } @@ -195,14 +195,14 @@ void DTD::parseDTDEntity(TQString line) { TQString name; TQString *value; - line.tqreplace("\\end", " "); + line.replace("\\end", " "); name = line.mid(11); - int firstSpace = name.tqfind(' '); + int firstSpace = name.find(' '); name = name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(11+firstSpace)); - value->remove(0, value->tqfind("\"")+1); - value->remove(value->tqfindRev("\""), value->length()); + value->remove(0, value->find("\"")+1); + value->remove(value->findRev("\""), value->length()); parseDTDReplace(value); stripSpaces(value); @@ -217,14 +217,14 @@ void DTD::parseDTDElement(const TQString &l) { TQString *value; TQString line = l; - line.tqreplace("\\end", " "); + line.replace("\\end", " "); name = line.mid(10); - int firstSpace = name.tqfind(' '); + int firstSpace = name.find(' '); name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(10+firstSpace)); - //value->remove(0, value->tqfind("\"")+1); - value->remove(value->tqfind(">"), 10000); + //value->remove(0, value->find("\"")+1); + value->remove(value->find(">"), 10000); parseDTDReplace(&name); parseDTDReplace(value); @@ -254,14 +254,14 @@ void DTD::parseDTDAttlist(const TQString &l) { TQString *value; TQString line = l; - line.tqreplace("\\end", " "); + line.replace("\\end", " "); name = line.mid(10); - int firstSpace = name.tqfind(' '); + int firstSpace = name.find(' '); name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(10+firstSpace)); - //value->remove(0, value->tqfind("\"")+1); - value->remove(value->tqfind(">"), 10000); + //value->remove(0, value->find("\"")+1); + value->remove(value->find(">"), 10000); parseDTDReplace(&name); parseDTDReplace(value); @@ -362,51 +362,51 @@ void DTD::parseTagAttributeValues(const TQString &name, TQString *value) { void DTD::parseDTDReplace(TQString *value) { int begin, end; - begin = value->tqfind("%"); - end = value->tqfind(";"); + begin = value->find("%"); + end = value->find(";"); while (begin != -1 && end != -1) { TQString replaceText = value->mid(begin+1, end-begin-1); - TQString *replaceValue = entities.tqfind(replaceText); + TQString *replaceValue = entities.find(replaceText); if (replaceValue != 0L) { - value->tqreplace(begin, end-begin+1, *replaceValue); + value->replace(begin, end-begin+1, *replaceValue); } else { kdDebug(24000) << "Can not find entity: " << replaceText << endl; return; } - begin = value->tqfind("%"); - end = value->tqfind(";"); + begin = value->find("%"); + end = value->find(";"); } } void DTD::stripSpaces(TQString *value) { int index=-1; - while ( (index=value->tqfind(' ',++index)) != -1 ) { - if ( value->tqfindRev('(',index) != -1 && value->tqfind(')',index) != -1) + while ( (index=value->find(' ',++index)) != -1 ) { + if ( value->findRev('(',index) != -1 && value->find(')',index) != -1) value->remove(index,1); } } void DTD::removeComments(TQString &value) { int begin, end; - begin = value.tqfind("<!--"); - end = value.tqfind("-->",begin+2); + begin = value.find("<!--"); + end = value.find("-->",begin+2); while (begin != -1 && end != -1) { value.remove(begin, end-begin+3); - begin = value.tqfind("<!--"); - end = value.tqfind("-->",begin+2); + begin = value.find("<!--"); + end = value.find("-->",begin+2); } - begin = value.tqfind("--"); - end = value.tqfind("--",begin+2); + begin = value.find("--"); + end = value.find("--",begin+2); while (begin != -1 && end != -1) { value.remove(begin, end-begin+2); - begin = value.tqfind("--"); - end = value.tqfind("--",begin+2); + begin = value.find("--"); + end = value.find("--",begin+2); } - value.tqreplace(TQRegExp("<!>"), ""); + value.replace(TQRegExp("<!>"), ""); } bool DTD::parseDTD() diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 8b4ec503..72e7ea18 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -123,8 +123,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) m_name = w.dtdName->text(); m_nickName = w.nickName->text(); m_doctype = w.doctype->text(); - m_doctype.tqreplace(TQRegExp("<!doctype", false), ""); - m_doctype = m_doctype.left(m_doctype.tqfindRev(">")); + m_doctype.replace(TQRegExp("<!doctype", false), ""); + m_doctype = m_doctype.left(m_doctype.findRev(">")); m_dtdURLLine = w.dtdURL->text(); m_defaultExtension = w.defaultExtension->text(); m_caseSensitive = w.caseSensitive->isChecked(); diff --git a/quanta/parsers/node.cpp b/quanta/parsers/node.cpp index ef7599b8..591b557e 100644 --- a/quanta/parsers/node.cpp +++ b/quanta/parsers/node.cpp @@ -48,7 +48,7 @@ Node::Node(Node *tqparent) m_leafNode = 0L; m_groupElements.clear(); NN++; -// if (nodes.tqcontains(this) == 0) +// if (nodes.contains(this) == 0) nodes[this] = 1; // else // { @@ -60,7 +60,7 @@ bool Node::deleteNode(Node *node) { if (!node) return true; - if (!nodes.tqcontains(node)) + if (!nodes.contains(node)) { kdDebug(24000) << "Trying to delete a node with address " << node << " that was not allocated!" << endl; return false; @@ -71,7 +71,7 @@ bool Node::deleteNode(Node *node) Node::~Node() { -// if (!nodes.tqcontains(this)) +// if (!nodes.contains(this)) // { // kdError(24000) << "No node with this address " << this << " was allocated!" << endl; // return; @@ -520,7 +520,7 @@ void Node::operator =(Node* node) void Node::detachNode() { - if (nodes.tqcontains(this) == 0) + if (nodes.contains(this) == 0) { kdError(24000) << "No node with this address " << this << " was allocated!" << endl; return; diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index c795f11e..b8e5e619 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -137,8 +137,8 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No nodeFound = false; goUp = false; //find the first "<" and the first special area start definition in this line - tagStartPos = textLine.tqfind('<', col); - specialStartPos = specialAreaCount ? textLine.tqfind(m_dtd->specialAreaStartRx, col): -1; + tagStartPos = textLine.find('<', col); + specialStartPos = specialAreaCount ? textLine.find(m_dtd->specialAreaStartRx, col): -1; //if the special area start definition is before the first "<" it means //that we have found a special area if ( specialStartPos != -1 && @@ -263,7 +263,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No tag->name.truncate(tag->name.length() - 1); } //the tag we found indicates the beginning of a special area, like <script type=... > - if (m_dtd->specialTags.tqcontains(tag->name.lower()) && !tag->single) + if (m_dtd->specialTags.contains(tag->name.lower()) && !tag->single) { //TODO: handle goUp here Node *node = new Node(parentNode); @@ -283,17 +283,17 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No rootNode = node; //find the DTD that needs to be used for the special area TQString tmpStr = m_dtd->specialTags[tag->name.lower()]; - int defPos = tmpStr.tqfind('['); + int defPos = tmpStr.find('['); TQString defValue; if (defPos != 0) { - defValue = tmpStr.mid(defPos+1, tmpStr.tqfindRev(']')-defPos-1).stripWhiteSpace(); + defValue = tmpStr.mid(defPos+1, tmpStr.findRev(']')-defPos-1).stripWhiteSpace(); tmpStr = tmpStr.left(defPos); } TQString s = tag->attributeValue(tmpStr); if (s.isEmpty()) s = defValue; - const DTDStruct *dtd = DTDs::ref()->tqfind(s); + const DTDStruct *dtd = DTDs::ref()->find(s); if (!dtd) dtd = m_dtd; //a trick here: replace the node's DTD with this one //Note: with the new SAParser, the top level nodes must be Tag::ScriptTag-s! @@ -327,7 +327,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No { TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper(); searchFor.remove('/'); - if ( qTag->stoppingTags.tqcontains(searchFor)) + if ( qTag->stoppingTags.contains(searchFor)) { parentNode->tag->closingMissing = true; //tqparent is single... goUp = true; @@ -370,7 +370,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No qTag = QuantaCommon::tagFromDTD(m_dtd, n->tag->name); if ( qTag ) { - if ( qTag->stoppingTags.tqcontains(searchFor) ) + if ( qTag->stoppingTags.contains(searchFor) ) { n->tag->closingMissing = true; //tqparent is single... if (n->tqparent) @@ -1143,7 +1143,7 @@ Node *Parser::rebuild(Document *w) { TQString searchFor = (m_dtd->caseSensitive)?lastNode->tag->name:lastNode->tag->name.upper(); searchFor.remove('/'); - if ( qTag->stoppingTags.tqcontains( searchFor ) ) + if ( qTag->stoppingTags.contains( searchFor ) ) { node->tqparent->tag->closingMissing = true; //tqparent is single... goUp = true; @@ -1178,7 +1178,7 @@ Node *Parser::rebuild(Document *w) qTag = QuantaCommon::tagFromDTD(m_dtd, n->tag->name); if ( qTag ) { - if ( qTag->stoppingTags.tqcontains(searchFor) ) + if ( qTag->stoppingTags.contains(searchFor) ) { n->tag->closingMissing = true; //tqparent is single... if (n->tqparent) @@ -1217,7 +1217,7 @@ Node *Parser::rebuild(Document *w) lastNode = lastNode->nextNotChild(); //For some reason this can happen, the lastNode can point to an invalid place. //To avoid crashes, forget the rebuild and do a full parse instead. - if (!nodes.tqcontains(lastNode)) + if (!nodes.contains(lastNode)) { kdDebug(24000) << "Lastnode is invalid, do a full reparse!" << endl; logReparse(modifs, w); @@ -1433,12 +1433,12 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) TQString specialEndStr; while (areaPos != -1) { - areaPos = content.tqfind(dtd->specialAreaStartRx, lastAreaPos); + areaPos = content.find(dtd->specialAreaStartRx, lastAreaPos); if (areaPos != -1) { foundStr = dtd->specialAreaStartRx.cap(); specialEndStr = dtd->specialAreas[foundStr]; - int areaPos2 = content.tqfind(specialEndStr, areaPos); + int areaPos2 = content.find(specialEndStr, areaPos); if (areaPos2 == -1) { areaPos2 = content.length(); @@ -1456,7 +1456,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) int structPos = 0; while (structPos !=-1) { - structPos = foundStr.tqfind(dtd->structBeginStr, structPos); + structPos = foundStr.find(dtd->structBeginStr, structPos); if (structPos != -1) { structPositions.append(structPos); @@ -1494,14 +1494,14 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) foundStr = foundStr.left(pos); TQString spaces; spaces.fill(' ', pos - structPos + 1); - foundStr.tqreplace(structPos, pos - structPos + 1, spaces); + foundStr.replace(structPos, pos - structPos + 1, spaces); //FIXME: This code replaces the content between ( ) with //empty spaces. This is quite PHP (or functions) //specific, and it's done in order to not find variables //declared as function arguments. A generic way is needed //to exclude unwanted areas. - int openBracketPos = foundStr.tqfindRev(dtd->structKeywordsRx, structPos); - openBracketPos = foundStr.tqfind('(', openBracketPos); + int openBracketPos = foundStr.findRev(dtd->structKeywordsRx, structPos); + openBracketPos = foundStr.find('(', openBracketPos); openNum = 1; if (openBracketPos != -1) { @@ -1517,7 +1517,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) } closeBracketPos--; spaces.fill(' ', closeBracketPos - openBracketPos); - foundStr.tqreplace(openBracketPos, closeBracketPos - openBracketPos, spaces); + foundStr.replace(openBracketPos, closeBracketPos - openBracketPos, spaces); } //now check which groups are present in this area @@ -1548,15 +1548,15 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) } TQString s = content.mid(areaPos + pos, l); pos += l; - if (!(*elements)[group.name].tqcontains(s)) + if (!(*elements)[group.name].contains(s)) { Tag *tag = new Tag(); tag->name = s; tag->setDtd(dtd); tag->setWrite(write); TQString s2 = content.left(areaPos + pos); - int newLineNum = s2.tqcontains('\n'); - int tmpCol = s2.length() - s2.tqfindRev('\n') - 1; + int newLineNum = s2.contains('\n'); + int tmpCol = s2.length() - s2.findRev('\n') - 1; tag->setTagPosition(newLineNum, tmpCol - s.length(), newLineNum, tmpCol); Node *node = new Node(0L); node->tag = tag; @@ -1586,11 +1586,11 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) if (group.appendToTags) { TQTag *qTag = new TQTag(); - qTag->setName(s.left(s.tqfind('('))); + qTag->setName(s.left(s.find('('))); qTag->className = ""; if (groupElement->parentNode) qTag->className = groupElement->parentNode->tag->name; - write->userTagList.tqreplace(s.lower(), qTag); + write->userTagList.replace(s.lower(), qTag); } } } @@ -1606,7 +1606,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) void Parser::slotIncludedFileChanged(const TQString& fileName) { - int pos = ParserCommon::includedFiles.tqfindIndex(fileName); + int pos = ParserCommon::includedFiles.findIndex(fileName); if (pos != -1) { const DTDStruct *dtd = ParserCommon::includedFilesDTD.at(pos); @@ -1635,7 +1635,7 @@ void Parser::slotIncludedFileChanged(const TQString& fileName) void Parser::parseForXMLGroup(Node *node) { - xmlGroupIt = node->tag->dtd()->xmlStructTreeGroups.tqfind(node->tag->name.lower()); + xmlGroupIt = node->tag->dtd()->xmlStructTreeGroups.find(node->tag->name.lower()); if (xmlGroupIt != node->tag->dtd()->xmlStructTreeGroups.end()) { XMLStructGroup group = xmlGroupIt.data(); @@ -1690,17 +1690,17 @@ bool Parser::parseScriptInsideTag(Node *startNode) while (pos != -1) { - pos = text.tqfind(dtd->specialAreaStartRx, col); + pos = text.find(dtd->specialAreaStartRx, col); if (pos != -1) { foundText = dtd->specialAreaStartRx.cap(); //Calculate the beginning coordinates s = text.left(pos); - n = s.tqcontains('\n'); + n = s.contains('\n'); bl = node_bl + n; if (n > 0) { - bc = pos - s.tqfindRev('\n') - 1; + bc = pos - s.findRev('\n') - 1; } else { bc = node_bc + pos; diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp index 469bedd6..860b46e0 100644 --- a/quanta/parsers/parsercommon.cpp +++ b/quanta/parsers/parsercommon.cpp @@ -169,7 +169,7 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin tag->setTagPosition(area); tag->setStr(areaName); tag->setWrite(write); - const DTDStruct *d = DTDs::ref()->tqfind(dtd->specialAreaNames[areaName]); + const DTDStruct *d = DTDs::ref()->find(dtd->specialAreaNames[areaName]); if (d) tag->setDtd(d); else @@ -216,9 +216,9 @@ void coutTree(Node *node, int indent) node->tag->beginPos(bLine, bCol); node->tag->endPos(eLine, eCol); if (node->tag->type != Tag::Text) - output += node->tag->name.tqreplace('\n'," "); + output += node->tag->name.replace('\n'," "); else - output+= node->tag->tagStr().tqreplace('\n'," "); + output+= node->tag->tagStr().replace('\n'," "); kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " << bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->tqparent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl; /* for(j = 0; j < node->tag->attrCount(); j++) diff --git a/quanta/parsers/qtag.cpp b/quanta/parsers/qtag.cpp index 6a98c3b1..ae61152e 100644 --- a/quanta/parsers/qtag.cpp +++ b/quanta/parsers/qtag.cpp @@ -105,7 +105,7 @@ bool TQTag::isAttribute(const TQString &attrName) //Check in the common attributes for(i = 0; i < (signed)commonGroups.count(); i++) { - groupAttrs = parentDTD->commonAttrs->tqfind(commonGroups[i]); + groupAttrs = parentDTD->commonAttrs->find(commonGroups[i]); if(groupAttrs) { for(a = groupAttrs->first(); a; a = groupAttrs->next()) @@ -206,9 +206,9 @@ bool TQTag::isChild(const TQString& tag, bool trueIfNoChildsDefined) TQString tagName = tag; tagName = parentDTD->caseSensitive ? tagName : tagName.upper(); if(trueIfNoChildsDefined) - return (childTags.isEmpty() || childTags.tqcontains(tagName)); + return (childTags.isEmpty() || childTags.contains(tagName)); else - return (!childTags.isEmpty() && childTags.tqcontains(tagName)); + return (!childTags.isEmpty() && childTags.contains(tagName)); } bool TQTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesAsText) @@ -220,18 +220,18 @@ bool TQTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodes else if(node->tag->type == Tag::Text) { if(trueIfNoChildsDefined) - return(childTags.isEmpty() || childTags.tqcontains("#text") || childTags.tqcontains("#TEXT")); + return(childTags.isEmpty() || childTags.contains("#text") || childTags.contains("#TEXT")); else - return(!childTags.isEmpty() && (childTags.tqcontains("#text") || childTags.tqcontains("#TEXT"))); + return(!childTags.isEmpty() && (childTags.contains("#text") || childTags.contains("#TEXT"))); } else if(node->tag->type == Tag::Empty && !treatEmptyNodesAsText) return true; else if(node->tag->type == Tag::Empty && treatEmptyNodesAsText) { if(trueIfNoChildsDefined) - return(childTags.isEmpty() || childTags.tqcontains("#text") || childTags.tqcontains("#TEXT")); + return(childTags.isEmpty() || childTags.contains("#text") || childTags.contains("#TEXT")); else - return(!childTags.isEmpty() && (childTags.tqcontains("#text") || childTags.tqcontains("#TEXT"))); + return(!childTags.isEmpty() && (childTags.contains("#text") || childTags.contains("#TEXT"))); } else if(node->tag->type == Tag::XmlTagEnd) { diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index 49973c70..c6c6b57a 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -144,20 +144,20 @@ void SAGroupParser::parseForScriptGroup(Node *node) title = tagStr.mid(pos, group.definitionRx.matchedLength()); node->tag->beginPos(bl, bc); tmpStr = tagStr.left(pos); - int newLines = tmpStr.tqcontains('\n'); + int newLines = tmpStr.contains('\n'); bl += newLines; - int l = tmpStr.tqfindRev('\n'); //the last EOL + int l = tmpStr.findRev('\n'); //the last EOL bc = (l == -1) ? bc + pos : pos - l - 1; - newLines = title.tqcontains('\n'); + newLines = title.contains('\n'); l = title.length(); el = bl + newLines; - ec = (newLines > 0) ? l - title.tqfindRev('\n') : bc + l - 1; + ec = (newLines > 0) ? l - title.findRev('\n') : bc + l - 1; pos += l; AreaStruct area(bl, bc, el, ec); //get the list of elements which are present in this group and //have the same title. For example get the list of all group //element which are variable and the matched string was "$i" - int cap1Pos = str.tqfind(group.definitionRx.cap(1)); + int cap1Pos = str.find(group.definitionRx.cap(1)); TQString s = tagStr.mid(cap1Pos, group.definitionRx.cap(1).length()); groupElementList = & (globalGroupMap[group.name + "|" + s]); //Create a new tag which point to the exact location of the matched string. @@ -204,7 +204,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) { TQTag *qTag = new TQTag(); // The location of the first open bracket '(', also the end of the tag name - int nameEnd = s.tqfind('('); + int nameEnd = s.find('('); qTag->setName(s.left(nameEnd)); qTag->className = ""; if (groupElement->parentNode) @@ -225,18 +225,18 @@ void SAGroupParser::parseForScriptGroup(Node *node) { qTag->type="variable"; // If this tag is a class function argument, it should not belong to the class, so we need to remove it - if(qTag->className.length() != 0 && tagStr.tqcontains('(') && tagStr.tqcontains(')')) + if(qTag->className.length() != 0 && tagStr.contains('(') && tagStr.contains(')')) { // First we want to determine the whole line the tag is on TQString tagWholeLineStr = tagStr; // Remove lines before target line while(tagWholeLineStr.length() > 0) // this stops infinit looping in case something goes wrong! { - int firstNewline = tagWholeLineStr.tqfind('\n'); + int firstNewline = tagWholeLineStr.find('\n'); if(firstNewline == -1) //no new lines so we must be on the last break; TQString checkLineStr = tagWholeLineStr.mid(firstNewline+1,tagWholeLineStr.length()); - if(checkLineStr.tqcontains(s)) + if(checkLineStr.contains(s)) tagWholeLineStr = checkLineStr; else break; @@ -244,23 +244,23 @@ void SAGroupParser::parseForScriptGroup(Node *node) // Remove lines after target line - essentially same as above while(tagWholeLineStr.length() > 0) { - int lastNewLine = tagWholeLineStr.tqfindRev('\n'); + int lastNewLine = tagWholeLineStr.findRev('\n'); if(lastNewLine == -1) break; TQString checkLineStr = tagWholeLineStr.mid(0,lastNewLine); - if(checkLineStr.tqcontains(s)) + if(checkLineStr.contains(s)) tagWholeLineStr = checkLineStr; else break; } // Now we are left with the current line, lets check if the variable is inside parentheses - int lineOpenParenth=tagWholeLineStr.tqfind('('); + int lineOpenParenth=tagWholeLineStr.find('('); if(lineOpenParenth != -1) { - int lineCloseParenth=tagWholeLineStr.tqfind(')'); + int lineCloseParenth=tagWholeLineStr.find(')'); if(lineCloseParenth != -1) { - int lineNameLocation=tagWholeLineStr.tqfind(s); + int lineNameLocation=tagWholeLineStr.find(s); if(lineNameLocation > lineOpenParenth || lineNameLocation < lineCloseParenth) // Write the current tag to the list isArgument=true; } @@ -272,7 +272,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) qTag->type="function"; } if(!isArgument) - m_write->userTagList.tqreplace(s.lower(), qTag); + m_write->userTagList.replace(s.lower(), qTag); } diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 9a30273c..aa9bbd55 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -86,29 +86,29 @@ bool SAParser::slotParseOneLine() //search for different s_contexts if (s_searchContent) //search for quoted strings, comments, groups only in non-comment special areas { - quotedStringPos = s_textLine.tqfind(m_quotesRx, s_col); //quoted strings + quotedStringPos = s_textLine.find(m_quotesRx, s_col); //quoted strings s_searchedString = s_textLine.left(quotedStringPos); - commentPos = s_searchedString.tqfind(s_dtd->commentsStartRx, s_col); //comments + commentPos = s_searchedString.find(s_dtd->commentsStartRx, s_col); //comments s_searchedString = s_textLine.left(commentPos); if (s_fullParse) - groupKeywordPos = s_searchedString.tqfind(s_dtd->structRx, s_col); //groups, like { } + groupKeywordPos = s_searchedString.find(s_dtd->structRx, s_col); //groups, like { } } else s_searchedString = s_textLine; int specialAreaPos = -1; if (s_searchForSpecialAreas) //special area inside special area { s_searchedString = s_textLine.left(groupKeywordPos); - specialAreaPos = s_searchedString.tqfind(s_dtd->specialAreaStartRx, s_col); + specialAreaPos = s_searchedString.find(s_dtd->specialAreaStartRx, s_col); } if (s_searchForAreaEnd) //the end of the special area { s_searchedString = s_textLine.left(specialAreaPos); - areaEndPos = s_searchedString.tqfind(s_areaEndString, s_col); + areaEndPos = s_searchedString.find(s_areaEndString, s_col); } else if (s_searchForForcedAreaEnd) //the end of the special area if a forcing string was specified { s_searchedString = s_textLine.left(specialAreaPos); - areaEndPos = s_searchedString.tqfind(s_forcedAreaRx, s_col); + areaEndPos = s_searchedString.find(s_forcedAreaRx, s_col); if (areaEndPos != -1) s_areaEndString = s_forcedAreaRx.cap(); } @@ -316,11 +316,11 @@ bool SAParser::slotParseOneLine() } else //when we look only for the area end string if (s_searchForAreaEnd) { - areaEndPos = s_textLine.tqfind(s_areaEndString, s_col); + areaEndPos = s_textLine.find(s_areaEndString, s_col); } else if (s_searchForForcedAreaEnd) { - areaEndPos = s_textLine.tqfind(s_forcedAreaRx, s_col); + areaEndPos = s_textLine.find(s_forcedAreaRx, s_col); if (areaEndPos != -1) s_areaEndString = s_forcedAreaRx.cap(); } @@ -487,7 +487,7 @@ bool SAParser::slotParseOneLine() int l = s_textLine.length(); while (p < l) { - p = s_textLine.tqfind(s_currentContext.startString, p); + p = s_textLine.find(s_currentContext.startString, p); if (p != -1) { if (p >= 0) @@ -544,10 +544,10 @@ bool SAParser::slotParseOneLine() } case Comment: { - int pos = s_textLine.tqfind(s_dtd->comments[s_currentContext.startString], s_col); + int pos = s_textLine.find(s_dtd->comments[s_currentContext.startString], s_col); if (pos == -1 && s_dtd->comments[s_currentContext.startString] == "\n") { - int pos2 = s_textLine.tqfind(s_areaEndString, s_col); + int pos2 = s_textLine.find(s_areaEndString, s_col); if (pos2 != -1) { pos = pos2 - 1; @@ -659,7 +659,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, const DTDStruct *parentDTD = m_dtd; if (s_parentNode->tqparent) parentDTD = s_parentNode->tqparent->tag->dtd(); - s_dtd = DTDs::ref()->tqfind(parentDTD->specialAreaNames[areaStartString]); + s_dtd = DTDs::ref()->find(parentDTD->specialAreaNames[areaStartString]); s_areaEndString = parentDTD->specialAreas[areaStartString]; s_searchForAreaEnd = true; } diff --git a/quanta/parsers/tag.cpp b/quanta/parsers/tag.cpp index a2dbcf71..5eebae93 100644 --- a/quanta/parsers/tag.cpp +++ b/quanta/parsers/tag.cpp @@ -209,7 +209,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) pos++; } name = m_tagStr.mid(1, pos - 1); - int nameSpacePos = name.tqfind(':'); + int nameSpacePos = name.find(':'); if (nameSpacePos != -1) { nameSpace = name.left(nameSpacePos); @@ -237,7 +237,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) attr.name = attr.name.left(attr.name.length() - 1).lower(); if (!attr.name.stripWhiteSpace().isEmpty()) { - attr.nameLine = m_tagStr.left(sPos).tqcontains('\n') + m_area.bLine; + attr.nameLine = m_tagStr.left(sPos).contains('\n') + m_area.bLine; if (attr.nameLine == m_area.bLine) attr.nameCol = sPos + m_area.bCol; else @@ -252,7 +252,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) } if (m_dtd && !m_dtd->caseSensitive) attr.name = attr.name.lower(); - attr.nameLine = m_tagStr.left(sPos).tqcontains('\n') + m_area.bLine; + attr.nameLine = m_tagStr.left(sPos).contains('\n') + m_area.bLine; if (attr.nameLine == m_area.bLine) attr.nameCol = sPos + m_area.bCol; else @@ -298,7 +298,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) pos--; attr.value = m_tagStr.mid(valueStartPos, pos - valueStartPos); } - attr.valueLine = m_tagStr.left(valueStartPos).tqcontains('\n') + m_area.bLine; + attr.valueLine = m_tagStr.left(valueStartPos).contains('\n') + m_area.bLine; if (attr.valueLine == m_area.bLine) attr.valueCol = valueStartPos + m_area.bCol; else @@ -322,7 +322,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) if ( !QuantaCommon::isKnownTag(m_dtd->name, tagName) && name[0] != '/' ) { - TQTag *newTag = m_write->userTagList.tqfind(tagName); + TQTag *newTag = m_write->userTagList.find(tagName); bool insertNew = !newTag; if (insertNew) { @@ -340,7 +340,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) } if (insertNew) { - m_write->userTagList.tqreplace(tagName, newTag); + m_write->userTagList.replace(tagName, newTag); } } } @@ -584,7 +584,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict) } for (uint i = 0 ; i < attrs.count(); i++) { - if ( !attrDict->tqfind(attrs[i].name) ) + if ( !attrDict->find(attrs[i].name) ) { attrs.remove(attrs.at(i)); } @@ -660,10 +660,10 @@ bool Tag::isInsideScript(const TQString &str) //This detects if the last char from str is inside a script area or not, to //treat cases like <a href="<? echo "foo" ?>"> correctly //TODO: speed up if you can... - if (str.tqfind(m_dtd->specialAreaStartRx) != -1) + if (str.find(m_dtd->specialAreaStartRx) != -1) { TQString foundString = m_dtd->specialAreaStartRx.cap(); - if (str.tqfind(m_dtd->specialAreas[foundString]) == -1) + if (str.find(m_dtd->specialAreas[foundString]) == -1) { return true; } diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index 23b2655e..d6b38cb7 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -108,7 +108,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceIn while(node) { nodeName = node->tag->name.lower(); - if(nodeName == "?xml" || nodeName.tqcontains("xml pi block")) + if(nodeName == "?xml" || nodeName.contains("xml pi block")) xmlNode = node; if(nodeName == "html") htmlNode = node; @@ -116,7 +116,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceIn headNode = node; if(nodeName == "body") bodyNode = node; - if(nodeName == "!doctype" || nodeName.tqcontains("dtd block")) + if(nodeName == "!doctype" || nodeName.contains("dtd block")) doctypeNode = node; if(nodeName == "title") titleNode = node; @@ -285,10 +285,10 @@ void htmlDocumentProperties::loadCSS(Node *node) if(node->tag->type == Tag::ScriptStructureBegin) { selector = node->tag->tagStr(); - selector = selector.left((uint)selector.tqfind("{")).stripWhiteSpace(); + selector = selector.left((uint)selector.find("{")).stripWhiteSpace(); if(node->child) item = new NodeLinkedViewItem(cssRules, selector, - node->child->tag->tagStr().tqreplace('\n'," ")); + node->child->tag->tagStr().replace('\n'," ")); else item = new NodeLinkedViewItem(cssRules, selector, ""); item->node = node; @@ -602,7 +602,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) QuantaView *view = ViewManager::ref()->activeView(); - if(!xmlNode && view->document()->defaultDTD()->name.tqcontains("XHTML", false)) + if(!xmlNode && view->document()->defaultDTD()->name.contains("XHTML", false)) { //if the xml node is not present and the current DTD is a xhtml like, create it. allTheNodes = baseNode; @@ -618,7 +618,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) if(!doctypeNode) { //if the !doctype node is not present, create it - if(!view->document()->defaultDTD()->name.tqcontains("XHTML", false)) + if(!view->document()->defaultDTD()->name.contains("XHTML", false)) { allTheNodes = baseNode; baseNode = 0L; @@ -645,7 +645,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) //TODO: hardcoded //If it is XML, it add the namespace. - if(view->document()->defaultDTD()->name.tqcontains("XHTML", false)) + if(view->document()->defaultDTD()->name.contains("XHTML", false)) htmlNode->tag->editAttribute("xmlns", "http://www.w3.org/1999/xhtml"); htmlNode->child = allTheNodes; diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp index b15d3c74..daffd656 100644 --- a/quanta/parts/kafka/htmlenhancer.cpp +++ b/quanta/parts/kafka/htmlenhancer.cpp @@ -91,7 +91,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next //THEN if it is the style element, add a DOM::Node::TEXT_NODE child gathering all the CSS //by default, the parser parse it as a script, which can't be translated in DOM::Nodes. if((node->tag->type == Tag::XmlTag && node->tag->name.lower() == "style") || - (node->tag->type == Tag::ScriptTag && node->tag->name.lower().tqcontains("style") != 0)) + (node->tag->type == Tag::ScriptTag && node->tag->name.lower().contains("style") != 0)) { //If the style Node doesn't exists, create it if(!node->rootNode()) @@ -129,10 +129,10 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next TQTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(), parentDNode.nodeName().string()); - //THEN tqreplace, if asked, scripts by a little icon. + //THEN replace, if asked, scripts by a little icon. if(node->tag->type == Tag::ScriptTag && m_showIconForScripts && qTag->isChild("IMG", false)) { - script = node->tag->name.left(node->tag->name.tqfind("block", 0, false) - 1).lower(); + script = node->tag->name.left(node->tag->name.find("block", 0, false) - 1).lower(); #ifdef LIGHT_DEBUG kdDebug(25001)<< "HTMLTranslator::translateNode() - BLOCK:" << script << ":" << endl; #endif diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 26aadd51..8ed413f4 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -770,7 +770,7 @@ int kafkaCommon::getNodeDisplay(Node *node, bool closingNodeToo) closingNodeToo)) { //If we areusing a non (X)HTML DTD, make everything blockDisplay by default - if(node->tag->dtd() && node->tag->dtd()->name.tqcontains("HTML", false) == 0) + if(node->tag->dtd() && node->tag->dtd()->name.contains("HTML", false) == 0) return kafkaCommon::blockDisplay; nodeName = node->tag->name.lower(); @@ -3297,7 +3297,7 @@ void kafkaCommon::getEndPosition(const TQString &tagString, int bLine, int bCol, { /**int result, oldResult; - result = tagString.tqfind("\n", 0); + result = tagString.find("\n", 0); if(result == -1) { eLine = bLine; @@ -3310,7 +3310,7 @@ void kafkaCommon::getEndPosition(const TQString &tagString, int bLine, int bCol, { eLine++; oldResult = result; - result = tagString.tqfind("\n", result + 1); + result = tagString.find("\n", result + 1); } eCol = tagString.length() - oldResult - 2; }*/ @@ -3974,11 +3974,11 @@ void kafkaCommon::coutDomTree(DOM::Node, int) dots.fill('_', indent); output = dots; if (node.nodeType() != DOM::Node::TEXT_NODE) - output += node.nodeName().string().tqreplace('\n'," "); + output += node.nodeName().string().replace('\n'," "); else { output += "\""; - output+= node.nodeValue().string().tqreplace('\n'," "); + output+= node.nodeValue().string().replace('\n'," "); output += "\""; } kdDebug(25001) << output <<" (" << node.nodeType() << ") "<< @@ -4016,11 +4016,11 @@ void kafkaCommon::coutTree(Node *node, int indent) node->tag->endPos(eLine, eCol); if (node->tag->type == Tag::XmlTag || node->tag->type == Tag::XmlTagEnd || node->tag->type == Tag::ScriptTag) - output += node->tag->name.tqreplace('\n',"<return>"); + output += node->tag->name.replace('\n',"<return>"); else { output += "\""; - output+= node->tag->tagStr().tqreplace('\n',"<return>"); + output+= node->tag->tagStr().replace('\n',"<return>"); output += "\""; } kdDebug(25001) << output <<" (" << node->tag->type << ", " << node->tag->cleanStrBuilt() << ", " << diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 91c32106..735e8c51 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -107,9 +107,9 @@ TQString ab = i18n("Ident all"); { tmp = t.readLine(); if(tmp.left(2) == "//") continue;//comments - int begin = tmp.tqfind("(") + 1; + int begin = tmp.find("(") + 1; if(begin == (-1 + 1)) continue;//"(" not found : invalid line - int length = tmp.tqfind(")") - begin; + int length = tmp.find(")") - begin; decodedChars.insert(tmp.left(1), tmp.mid(begin, length)); encodedChars.insert(tmp.mid(begin, length), tmp.left(1)); } @@ -521,7 +521,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) bool canInsertEmptyNode = false; if(node->tag->type == Tag::Empty) { - if(!m_currentDoc->defaultDTD()->name.tqcontains("HTML", false)) + if(!m_currentDoc->defaultDTD()->name.contains("HTML", false)) canInsertEmptyNode = true; else canInsertEmptyNode = kafkaCommon::hasParent(node, "body"); @@ -807,8 +807,8 @@ void KafkaDocument::buildNodeFromKafkaNode(Node *node, DOM::Node domNode) if(domNode.nodeType() == DOM::Node::TEXT_NODE) { TQString text = domNode.nodeValue().string(); - text.tqreplace("<", "<"); - text.tqreplace(">", ">"); + text.replace("<", "<"); + text.replace(">", ">"); node->tag->setStr(text); } else @@ -875,7 +875,7 @@ Node * KafkaDocument::buildNodeFromKafkaNode(DOM::Node domNode, Node *nodeParent TQString KafkaDocument::getDecodedChar(const TQString &encodedChar) { - TQMap<TQString, TQString>::Iterator it = encodedChars.tqfind(encodedChar); + TQMap<TQString, TQString>::Iterator it = encodedChars.find(encodedChar); if(it == encodedChars.end()) { //try this @@ -950,7 +950,7 @@ TQString KafkaDocument::getEncodedChar(const TQString &decodedChar, const TQStri else if(decodedChar[0].isSpace()) //FIXME:for an unknown reason, by default it return ¿ instead of return " "; - TQMap<TQString, TQString>::Iterator it = decodedChars.tqfind(decodedChar); + TQMap<TQString, TQString>::Iterator it = decodedChars.find(decodedChar); if(it == decodedChars.end()) return decodedChar; @@ -1074,10 +1074,10 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in openingNode = node->getOpeningNode(); if(openingNode && openingNode->tag->type == Tag::ScriptTag) { - if(openingNode->tag->name.tqcontains("XML PI", false) || - openingNode->tag->name.tqcontains("PHP", false)) + if(openingNode->tag->name.contains("XML PI", false) || + openingNode->tag->name.contains("PHP", false)) text = "?>"; - else if(openingNode->tag->name.tqcontains("DTD", false)) + else if(openingNode->tag->name.contains("DTD", false)) text = ">"; else text = ">"; @@ -1102,26 +1102,26 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in /** Can't use KGlobal::charsets()->toEntity() : * It translate all chars into entities! */ else if(!hasPreParent) - text = node->tag->tagStr().tqreplace(TQRegExp("\\s+"), " "); + text = node->tag->tagStr().replace(TQRegExp("\\s+"), " "); else text = node->tag->tagStr(); } else if(node->tag->type == Tag::ScriptTag) { //WARNING : HTML SPECIFIC - if(node->tag->name.tqcontains("style", false)) + if(node->tag->name.contains("style", false)) { text = "<" + QuantaCommon::tagCase("style") + ">"; } - else if(node->tag->name.tqcontains("DTD", false)) + else if(node->tag->name.contains("DTD", false)) { text = "<!"; } - else if(node->tag->name.tqcontains("XML PI", false)) + else if(node->tag->name.contains("XML PI", false)) { text = "<?xml"; } - else if(node->tag->name.tqcontains("PHP", false)) + else if(node->tag->name.contains("PHP", false)) { text = "<?php"; } @@ -1832,9 +1832,9 @@ void KafkaDocument::coutLinkTree(Node *, int) dots.fill('*', indent); output = dots; if (node->tag->type != Tag::Text) - output += node->tag->name.tqreplace('\n'," "); + output += node->tag->name.replace('\n'," "); else - output+= node->tag->tagStr().tqreplace('\n'," "); + output+= node->tag->tagStr().replace('\n'," "); output += " ("; output += node->tag->type; output += ") "; diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index bfed02c1..dab6dbd0 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -155,7 +155,7 @@ bool QuantaPlugin::run() } case 3: { KURL url; if ( Project::ref()->hasProject() && - (Project::ref()->tqcontains(view->document()->url()) || + (Project::ref()->contains(view->document()->url()) || view->document()->isUntitled()) ) { diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index db7f73ed..e530ee0c 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -115,10 +115,10 @@ void QuantaPluginEditor::configurePlugin() if(item) key = item->text(0); - if(!key.isNull() && m_plugins.tqfind(key)) + if(!key.isNull() && m_plugins.find(key)) { QuantaPluginConfig *configDlg = new QuantaPluginConfig(this, "pluginConfig"); - QuantaPlugin *curPlugin = m_plugins.tqfind(key); + QuantaPlugin *curPlugin = m_plugins.find(key); PluginConfig *configWidget = static_cast<PluginConfig*>(configDlg->mainWidget()); configWidget->outputWindow->setCurrentText(curPlugin->outputWindow()); @@ -186,7 +186,7 @@ void QuantaPluginEditor::removePlugin() TQListViewItem *currentItem = m_pluginEditorWidget->pluginList->currentItem(); if (currentItem) { - QuantaPlugin *plugin = m_plugins.tqfind(currentItem->text(0)); + QuantaPlugin *plugin = m_plugins.find(currentItem->text(0)); if(plugin) { m_plugins.remove(plugin->pluginName()); diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 73ba5a48..0c93d2ca 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -71,7 +71,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile) // now that we have a list of the plugins, go through and get the details of them for(TQStringList::Iterator it = pList.begin();it != pList.end();++it) { - if (m_plugins.tqfind(*it)) + if (m_plugins.find(*it)) continue; config->setGroup(*it); @@ -176,7 +176,7 @@ bool QuantaPluginInterface::pluginAvailable(const TQString &a_name) { if (a_name.isEmpty()) return false; - QuantaPlugin *availPlugin = m_plugins.tqfind(a_name); + QuantaPlugin *availPlugin = m_plugins.find(a_name); if(availPlugin && QuantaPlugin::validatePlugin(availPlugin)) return true; diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index 4c3edd34..1bba3655 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -221,7 +221,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) if (actionType == QPEvents::ref()->fullActionName("script")) { TQString s = arguments[0]; - if (m_scriptActions.tqcontains(s)) + if (m_scriptActions.contains(s)) s = m_scriptActions[s]; if (argument1Combo->contains(s)) { @@ -249,7 +249,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) if (actionType == QPEvents::ref()->fullActionName("action")) { TQString s = arguments[0]; - if (m_otherActions.tqcontains(s)) + if (m_otherActions.contains(s)) s = m_otherActions[s]; if (argument1Combo->contains(s)) { @@ -363,7 +363,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) action = dynamic_cast<TagAction*>(m_actionCollection->action(i)); if (action && action->type() == "script") { - s = action->text().tqreplace(r, ""); + s = action->text().replace(r, ""); items.append(s); m_scriptActions[action->name()] = s; } @@ -392,7 +392,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) action = dynamic_cast<TagAction*>(a); if (!action || action->type() != "script") { - s = a->text().tqreplace(r, ""); + s = a->text().replace(r, ""); items.append(s); m_otherActions[a->name()] = s; } diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp index 047ff302..075f40c3 100644 --- a/quanta/project/membereditdlg.cpp +++ b/quanta/project/membereditdlg.cpp @@ -123,7 +123,7 @@ void MemberEditDlg::slotMemberSelected() { TQString name = nameCombo->currentText(); TQMap<TQString, TeamMember> members = Project::ref()->allMembers(); - if (members.tqcontains(name)) + if (members.contains(name)) { emailEdit->setText(members[name].email); } diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 98b21135..3cc29461 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -143,13 +143,13 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint ) TQDomElement el; while ( d->baseURL.isParentOf(url) ) { - if ( !d->m_projectFiles.tqcontains(url) ) + if ( !d->m_projectFiles.contains(url) ) { el = d->dom.createElement("item"); el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) )); d->dom.firstChild().firstChild().appendChild( el ); KURL u = url.upURL(); - ProjectURL *parentURL = d->m_projectFiles.tqfind(u); + ProjectURL *parentURL = d->m_projectFiles.find(u); int uploadtqStatus = 1; if (parentURL) uploadtqStatus = parentURL->uploadtqStatus; @@ -364,7 +364,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) ProjectURL * curUrl = it.current(); if ( oldURL == *curUrl || (isFolder && oldURL.isParentOf(*curUrl)) ) { - curUrl->setPath( curUrl->path().tqreplace(oldURL.path(), newURL.path()) ); + curUrl->setPath( curUrl->path().replace(oldURL.path(), newURL.path()) ); el = curUrl->domElement; el.setAttribute("url", d->m_projectFiles.toRelative(*curUrl).path()); // el.setAttribute("upload_time", ""); @@ -826,7 +826,7 @@ void Project::slotOptions() //subprojects without a leader for (uint i = 0; i < d->m_subprojects.count(); i++) { - if (!savedSubprojects.tqcontains(d->m_subprojects[i].name)) + if (!savedSubprojects.contains(d->m_subprojects[i].name)) { el = d->dom.createElement("subproject"); el.setAttribute("name", d->m_subprojects[i].name); @@ -921,16 +921,16 @@ KURL Project::urlWithPrefix(const KURL& url) /*Returns true if url is already in the project.*/ -bool Project::tqcontains(const KURL& url) +bool Project::contains(const KURL& url) { if (d->m_projectFiles.isEmpty()) d->m_projectFiles.readFromXML(d->dom, d->baseURL, d->templateURL, d->excludeRx); - return d->m_projectFiles.tqcontains(url); + return d->m_projectFiles.contains(url); } void Project::slotFileDescChanged(const KURL& url, const TQString& desc) { - ProjectURL *proUrl = d->m_projectFiles.tqfind(url); + ProjectURL *proUrl = d->m_projectFiles.find(url); if (! proUrl) return; @@ -942,7 +942,7 @@ void Project::slotFileDescChanged(const KURL& url, const TQString& desc) void Project::slotUploadStatusChanged(const KURL& url, int status) { - if (! d->m_projectFiles.tqcontains(url)) + if (! d->m_projectFiles.contains(url)) return; TQDomElement el; @@ -962,7 +962,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status) { - ProjectURL *proUrl = d->m_projectFiles.tqfind(url); + ProjectURL *proUrl = d->m_projectFiles.find(url); if (! proUrl) return; @@ -1013,7 +1013,7 @@ void Project::savePassword(const TQString &entry, const TQString &passwd, bool s TQString Project::password(const TQString &entry) { - if (d->m_passwdList.tqcontains(entry)) + if (d->m_passwdList.contains(entry)) return d->m_passwdList[entry]; else { @@ -1187,7 +1187,7 @@ TeamMember Project::teamLeader() TeamMember Project::subprojectLeader(const TQString &name) { - if (d->m_subprojectLeaders.tqcontains(name)) + if (d->m_subprojectLeaders.contains(name)) return d->m_subprojectLeaders[name]; else return TeamMember(); @@ -1195,7 +1195,7 @@ TeamMember Project::subprojectLeader(const TQString &name) TeamMember Project::taskLeader(const TQString &name) { - if (d->m_taskLeaders.tqcontains(name)) + if (d->m_taskLeaders.contains(name)) return d->m_taskLeaders[name]; else return TeamMember(); @@ -1313,7 +1313,7 @@ void Project::slotShowProjectToolbar(bool show) void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { - if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks) + if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks) return; TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; @@ -1337,7 +1337,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { - if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks) + if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks) return; TQStringList markList; TQPtrList<KTextEditor::Mark> marks = markIf->marks(); @@ -1363,7 +1363,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf) { - if (!viewCursorIf || !hasProject() || !tqcontains(url)) + if (!viewCursorIf || !hasProject() || !contains(url)) return; TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item"); TQDomElement el; @@ -1387,7 +1387,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa } KURL u2 = d->baseURL; QuantaCommon::setUrl(u2, el.attribute("url")); - if (!tqcontains(u2)) + if (!contains(u2)) { el.parentNode().removeChild(el); } @@ -1396,7 +1396,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf) { - if (!viewCursorIf || !hasProject() || !tqcontains(url)) + if (!viewCursorIf || !hasProject() || !contains(url)) return; TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item"); TQDomElement el; diff --git a/quanta/project/project.h b/quanta/project/project.h index 6315c058..62b71889 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -87,7 +87,7 @@ public: void loadLastProject(bool reload); /** Returns the relative url with the prefix inserted. */ KURL urlWithPrefix(const KURL& url); - bool tqcontains(const KURL &url); + bool contains(const KURL &url); /** Read property of TQString defaultDTD. */ const TQString& defaultDTD(); const TQString& defaultEncoding(); diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp index 26c3da8a..01416c41 100644 --- a/quanta/project/projectlist.cpp +++ b/quanta/project/projectlist.cpp @@ -72,7 +72,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, url = QExtFileInfo::toAbsolute(url, baseURL); if ( el.nodeName() == "item" ) { - if (excludeRx.exactMatch(path) || tqfind(url.url(-1))) + if (excludeRx.exactMatch(path) || find(url.url(-1))) { el.parentNode().removeChild(el); modified = true; @@ -106,7 +106,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } progressBar->advance(1); } - ProjectURL *proUrl = tqfind(baseURL); + ProjectURL *proUrl = find(baseURL); if (!proUrl) { el = dom.createElement("item"); @@ -126,7 +126,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, bool ProjectList::removeFromListAndXML(const KURL &url) { - ProjectURL *p = tqfind(url); + ProjectURL *p = find(url); if (p) { TQDomElement el = p->domElement; el.parentNode().removeChild(el); @@ -137,15 +137,15 @@ bool ProjectList::removeFromListAndXML(const KURL &url) } -bool ProjectList::tqcontains(const KURL &url) const +bool ProjectList::contains(const KURL &url) const { - return ProjectUrlList::tqfind(url.url(-1)); + return ProjectUrlList::find(url.url(-1)); } -ProjectURL * ProjectList::tqfind(const KURL &url) const +ProjectURL * ProjectList::find(const KURL &url) const { - return ProjectUrlList::tqfind(url.url(-1)); + return ProjectUrlList::find(url.url(-1)); } @@ -157,7 +157,7 @@ void ProjectList::insert(ProjectURL *url) bool ProjectList::isFolder(const KURL &url) const { - ProjectURL *p = tqfind(url); + ProjectURL *p = find(url); return ( p && url.url(-1) != (*p).url() ); } @@ -168,9 +168,9 @@ void ProjectList::insert(const TQString & key, const ProjectURL * item) } -ProjectURL * ProjectList::tqfind ( const TQString & key ) const +ProjectURL * ProjectList::find ( const TQString & key ) const { - return ProjectUrlList::tqfind(key); + return ProjectUrlList::find(key); } @@ -180,8 +180,8 @@ bool ProjectList::remove ( const TQString & key ) } -void ProjectList::tqreplace(const TQString & key, const ProjectURL * item) +void ProjectList::replace(const TQString & key, const ProjectURL * item) { - ProjectUrlList::tqreplace(key, item); + ProjectUrlList::replace(key, item); } diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h index 361c119c..7106e142 100644 --- a/quanta/project/projectlist.h +++ b/quanta/project/projectlist.h @@ -68,11 +68,11 @@ public: /** @return true if url is in container */ - bool tqcontains(const KURL &url) const; + bool contains(const KURL &url) const; /** @return pointer to the entry or 0 if not found */ - ProjectURL * tqfind(const KURL &url) const; + ProjectURL * find(const KURL &url) const; /** Attention: never delete the object you have given here because the @@ -97,9 +97,9 @@ private: /** private because I want to control the key. - use tqfind(const KURL &url) instead. + use find(const KURL &url) instead. */ - ProjectURL *tqfind ( const TQString & key ) const; + ProjectURL *find ( const TQString & key ) const; /** private because I want to control the key. @@ -109,7 +109,7 @@ private: /** private because I want to control the key. */ - void tqreplace(const TQString & key, const ProjectURL * item); + void replace(const TQString & key, const ProjectURL * item); }; #endif // PROJECTFILES_H diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 81c53728..565785d6 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -149,7 +149,7 @@ void ProjectNewGeneral::slotChangeNames( const TQString &text ) { int i; TQString fname = text.lower(); - while( (i=fname.tqfind(" ")) >=0 ) fname.remove(i,1); + while( (i=fname.find(" ")) >=0 ) fname.remove(i,1); linePrjFile->setText( fname+".webprj" ); } diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 5a47a3db..9c81cb51 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -126,9 +126,9 @@ KURL::List ProjectNewLocal::projectFiles() for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (qConfig.markupMimeTypes.tqcontains(name) || - qConfig.scriptMimeTypes.tqcontains(name) || - qConfig.imageMimeTypes.tqcontains(name)) + if (qConfig.markupMimeTypes.contains(name) || + qConfig.scriptMimeTypes.contains(name) || + qConfig.imageMimeTypes.contains(name)) { TQStringList patterns = (*it)->patterns(); for (uint i = 0 ; i < patterns.count(); i++) @@ -156,7 +156,7 @@ void ProjectNewLocal::slotSetFiles(bool) progressBar->setTextEnabled(true); for (uint i = 0; i < files.count(); i++) { - if ( !fileList.tqcontains(files[i])) + if ( !fileList.contains(files[i])) { fileList.append(files[i]); TQListViewItem *it = listView->addItem(files[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -219,7 +219,7 @@ void ProjectNewLocal::slotAddFiles() for (uint i = 0; i < list.count(); i++) { list[i] = QExtFileInfo::toRelative(list[i], baseURL, false); - if (!fileList.tqcontains(list[i])) + if (!fileList.contains(list[i])) { fileList.append(list[i]); TQListViewItem *it = listView->addItem(list[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -300,7 +300,7 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList) for (uint i = 0; i < files.count(); i++) { u = files[i]; - if ( !fileList.tqcontains(u) && u.path() != "." && u.path() != ".." ) + if ( !fileList.contains(u) && u.path() != "." && u.path() != ".." ) { fileList.append(u); listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -329,7 +329,7 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList) for (it = a_urlList.begin(); it != a_urlList.end(); ++it) { u = QExtFileInfo::toRelative(*it, baseURL, false); - if ( !fileList.tqcontains(u)) + if ( !fileList.contains(u)) { fileList.append(u); TQListViewItem *it = listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index ef4ee2b7..f4d4d765 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -178,7 +178,7 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) int pos; TQString basePath = baseURL.path(1); - while ( (pos = output.tqfind("saved")) != -1 ) + while ( (pos = output.find("saved")) != -1 ) { if (KLed1->state() == KLed::Off) { @@ -189,13 +189,13 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) KLed2->setState(KLed::On); KLed1->setState(KLed::Off); } - int begName = output.tqfindRev('`',pos); + int begName = output.findRev('`',pos); if ( begName == -1 ) { output = output.remove(0,pos+1); continue; } - int endName = output.tqfind('\'',begName); + int endName = output.find('\'',begName); if ( endName == -1 || endName > pos ) { output = output.remove(0,pos+1); continue; diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index a481b309..aee0dbec 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -183,7 +183,7 @@ void ProjectPrivate::adjustViewActions() TQString oldItem = openPrjViewAction->currentText(); openPrjViewAction->clear(); openPrjViewAction->setItems(viewList); - int i = viewList.tqfindIndex(oldItem); + int i = viewList.findIndex(oldItem); if (i > -1) openPrjViewAction->setCurrentItem(i); deletePrjViewAction->clear(); @@ -274,14 +274,14 @@ void ProjectPrivate::openCurrentView() KURL::List::Iterator it; for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { - if (urlsInView.tqfindIndex( *it ) == -1) + if (urlsInView.findIndex( *it ) == -1) tqparent->closeFile (*it); } break; } } TQStringList viewList = projectViewList(); - int i = viewList.tqfindIndex(currentProjectView); + int i = viewList.findIndex(currentProjectView); if (i > -1) openPrjViewAction->setCurrentItem(i); adjustViewActions(); @@ -307,7 +307,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) KURL::List::Iterator it; for ( it = files.begin(); it != files.end(); ++it ) { - if (m_projectFiles.tqcontains(*it)) + if (m_projectFiles.contains(*it)) { it = files.erase(it); --it; @@ -322,7 +322,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) url.setPath(url.directory(false)); while ( baseURL.isParentOf(url) ) { - if (!m_projectFiles.tqcontains(url)) + if (!m_projectFiles.contains(url)) { el = dom.createElement("item"); el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false))); @@ -524,9 +524,9 @@ void ProjectPrivate::loadProjectXML() } else if (!excludeStr.endsWith("*")) str = excludeStr + "/*|"+ excludeStr + "$"; - str.tqreplace(".","\\."); - str.tqreplace("*",".*"); - str.tqreplace("?","."); + str.replace(".","\\."); + str.replace("*",".*"); + str.replace("?","."); regExpStr.append(str); if (i+1 < excludeList.count()) regExpStr.append("|"); @@ -564,9 +564,9 @@ void ProjectPrivate::loadProjectXML() line = line + "/*|"+ line + "$"; if (!line.startsWith("*")) line.prepend("^"); - line.tqreplace(".","\\."); - line.tqreplace("*",".*"); - line.tqreplace("?","."); + line.replace(".","\\."); + line.replace("*",".*"); + line.replace("?","."); rxStr += line + "|"; } regExpStr.prepend(rxStr); @@ -595,7 +595,7 @@ void ProjectPrivate::loadProjectXML() if (s != "--not set--" && !s.isEmpty()) ev.arguments << s; } - if (m_events->tqcontains(el.attribute("name"))) + if (m_events->contains(el.attribute("name"))) { (*m_events)[el.attribute("name")].append(ev); } else @@ -936,7 +936,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { KURL url = (*it); - if (m_projectFiles.tqcontains(url)) + if (m_projectFiles.contains(url)) { item = dom.createElement("viewitem"); item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) ); @@ -994,7 +994,7 @@ bool ProjectPrivate::createEmptyDom() KURL sessionURL = projectURL; TQString fileName = projectURL.fileName(); if (fileName.endsWith(".webprj")) - fileName.tqreplace(".webprj", ".session"); + fileName.replace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1170,7 +1170,7 @@ void ProjectPrivate::slotNewProject() TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); TQString defaultDTDName = DTDs::ref()->getDTDNickNameFromName(qConfig.defaultDocType.lower()); - int pos = lst.tqfindIndex(defaultDTDName); + int pos = lst.findIndex(defaultDTDName); if (pos >= 0) pnf->dtdCombo->setCurrentItem(pos); @@ -1374,7 +1374,7 @@ bool ProjectPrivate::loadProject(const KURL &url) KURL sessionURL = url; TQString fileName = url.fileName(); if (fileName.endsWith(".webprj")) - fileName.tqreplace(".webprj", ".session"); + fileName.replace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1556,7 +1556,7 @@ void ProjectPrivate::writeConfig() if (!projectURL.isEmpty()) { TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - if (projectList.tqcontains( projectURL.url() ) == 0) + if (projectList.contains( projectURL.url() ) == 0) { projectList.append( projectURL.url() ); config->writePathEntry("OpenProjects", projectList); @@ -1581,7 +1581,7 @@ void ProjectPrivate::removeFromConfig(const TQString & urlStr) config->reparseConfiguration(); config->setGroup("Projects"); TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - int i = projectList.tqfindIndex( urlStr ); + int i = projectList.findIndex( urlStr ); if ( i > -1) { projectList.remove(projectList.at(i)); @@ -1606,7 +1606,7 @@ bool ProjectPrivate::projectAlreadyOpen(const TQString & urlStr) config->reparseConfiguration(); config->setGroup("Projects"); TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - return (projectList.tqcontains(urlStr) != 0); + return (projectList.contains(urlStr) != 0); } @@ -1618,7 +1618,7 @@ bool ProjectPrivate::uploadProjectFile() KURL sessionURL = projectURL; TQString fileName = projectURL.fileName(); if (fileName.endsWith(".webprj")) - fileName.tqreplace(".webprj", ".session"); + fileName.replace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 74f59ddf..dbd21dbf 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -199,7 +199,7 @@ void ProjectUpload::slotBuildTree() absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1)); /* if (!QExtFileInfo::exists(absUrl)) continue; */ - KFileItem *p_item = projectDirFiles.tqfind(absUrl.url()); + KFileItem *p_item = projectDirFiles.find(absUrl.url()); if (!p_item) continue; KFileItem item(*p_item); @@ -207,7 +207,7 @@ void ProjectUpload::slotBuildTree() if ( it != 0 ) { int uploadedTime = -1; - if (m_uploadTimeList.tqcontains(s)) + if (m_uploadTimeList.contains(s)) uploadedTime = m_uploadTimeList[s]; int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME); el.setAttribute("modified_time", modifiedTime); @@ -338,7 +338,7 @@ void ProjectUpload::startUpload() for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); - if ( selectedList.tqcontains(el.attribute("url"))) + if ( selectedList.contains(el.attribute("url"))) { m_uploadTimeList[el.attribute("url")] = el.attribute("modified_time").toInt(); } @@ -362,7 +362,7 @@ void ProjectUpload::startUpload() if (!ok) return; for (it = needsConfirmation.begin(); it != needsConfirmation.end(); ++it) { - if (!confirmedList.tqcontains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol))) + if (!confirmedList.contains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol))) toUpload.remove(*it); } @@ -437,7 +437,7 @@ void ProjectUpload::upload() dir = to.upURL() ; } - if ( !madeDirs.tqcontains(dir) ) + if ( !madeDirs.contains(dir) ) { madeDirs.append( dir ); if (!QExtFileInfo::createDir(dir, this)) diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 1c97da09..2b4cc8e4 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -123,7 +123,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) found = true; break; } - if (!prjFileList.tqcontains(u) && !found) + if (!prjFileList.contains(u) && !found) { linkItems.append(new KFileItem(item)); } else @@ -137,7 +137,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) itemURL = item.url(); if (item.isDir()) itemURL.adjustPath(+1); - ProjectURL *proUrl = prjFileList.tqfind(itemURL); + ProjectURL *proUrl = prjFileList.find(itemURL); if (!proUrl) { urlEntry.url = prjFileList.toRelative(itemURL); diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp index 13df5eda..cb54c27f 100644 --- a/quanta/project/uploadprofiles.cpp +++ b/quanta/project/uploadprofiles.cpp @@ -55,7 +55,7 @@ void UploadProfiles::readFromXML(const TQDomDocument &dom) bool UploadProfiles::removeFromMapAndXML(const TQString &name) { - UploadProfiles::Iterator it = tqfind(name); + UploadProfiles::Iterator it = find(name); if ( it == end() ) return false; // ok now remove diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 3f547a50..19542589 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -445,7 +445,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="449" type="bool" abstract="0" documentation="" name="evenQuotes" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const QString &" abstract="0" documentation="" name="text" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="451" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tqfind" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="451" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="find" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="452" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="453" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="454" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" /> @@ -457,7 +457,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="459" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findDTDName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="460" value="" type="Tag * *" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="461" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tqfindRev" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="461" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findRev" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="462" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="463" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="464" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" /> @@ -1231,7 +1231,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="tqcontains" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="contains" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1068" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1069" type="void" abstract="0" documentation="" name="insertItem" static="0" scope="200" > @@ -2519,9 +2519,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="815" id="448" label="dirty" /> <listitem open="0" type="814" id="411" label="dtdName" /> <listitem open="0" type="815" id="449" label="evenQuotes" /> - <listitem open="0" type="815" id="451" label="tqfind" /> + <listitem open="0" type="815" id="451" label="find" /> <listitem open="0" type="815" id="459" label="findDTDName" /> - <listitem open="0" type="815" id="461" label="tqfindRev" /> + <listitem open="0" type="815" id="461" label="findRev" /> <listitem open="0" type="815" id="469" label="findWordRev" /> <listitem open="0" type="815" id="471" label="findXMLTag" /> <listitem open="0" type="815" id="476" label="getAttributeCompletions" /> @@ -2803,7 +2803,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="813" id="1055" label="ProjectTreeFolder" > <listitem open="0" type="815" id="1063" label="ProjectTreeFolder" /> <listitem open="0" type="815" id="1059" label="ProjectTreeFolder" /> - <listitem open="0" type="815" id="1067" label="tqcontains" /> + <listitem open="0" type="815" id="1067" label="contains" /> <listitem open="0" type="814" id="1056" label="filesTreeList" /> <listitem open="0" type="815" id="1069" label="insertItem" /> <listitem open="0" type="815" id="1072" label="paintCell" /> diff --git a/quanta/scripts/dwt.pl b/quanta/scripts/dwt.pl index 03a126ac..af823663 100644 --- a/quanta/scripts/dwt.pl +++ b/quanta/scripts/dwt.pl @@ -228,13 +228,13 @@ sub RemoveHtmlTags() { $p1=$p1+6; $templatesource=substr($templatesource,$p1); } else { - print "WARNING: Could not tqfind <head> tag in template $templatename"; + print "WARNING: Could not find <head> tag in template $templatename"; } $p1=index($templatesource,"</body>"); if ($p1>=0) { $templatesource=substr($templatesource,0,$p1); } else { - print "WARNING: Could not tqfind </body> tag in template $templatename"; + print "WARNING: Could not find </body> tag in template $templatename"; } return $templatesource; } @@ -252,13 +252,13 @@ sub AddHtmlTags() { $p1=$p1+6; $hstart=substr($source,0,$p1); } else { - print "WARNING: Could not tqfind <head> tag in $filename"; + print "WARNING: Could not find <head> tag in $filename"; } $p1=index($source,"</body>"); if ($p1>=0) { $hend=substr($source,$p1); } else { - print "WARNING: Could not tqfind </body> tag in $filename"; + print "WARNING: Could not find </body> tag in $filename"; } return "$hstart$templatesource$hend"; } diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr index a73fc003..73047ad1 100755 --- a/quanta/scripts/gubed_install.kmdr +++ b/quanta/scripts/gubed_install.kmdr @@ -276,12 +276,12 @@ fi echo "Cleaning up..." rm /tmp/gubed-install-log cd /tmp/gubed-install -tqfind . | xargs rm -f > /dev/null +find . | xargs rm -f > /dev/null cd /tmp/gubed-install cd $dirName rm -f "docs/Theory of operation" > /dev/null cd /tmp/gubed-install -tqfind . | xargs rmdir -p > /dev/null +find . | xargs rmdir -p > /dev/null rmdir /tmp/gubed-install > /dev/null </string> </stringlist> diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr index 2c01e864..6bea7b90 100755 --- a/quanta/scripts/tidy.kmdr +++ b/quanta/scripts/tidy.kmdr @@ -914,7 +914,7 @@ escape-cdata Boolean y/n, yes/no, t/f, true/false, 1/0 language String - ncr Boolean y/n, yes/no, t/f, true/false, 1/0 output-bom AutoBool auto, y/n, yes/no, t/f, true/false, 1/0 -tqreplace-color Boolean y/n, yes/no, t/f, true/false, 1/0 +replace-color Boolean y/n, yes/no, t/f, true/false, 1/0 css-prefix Name CSS1 selector new-inline-tags Tag names tagX, tagY, ... new-blocklevel-tags Tag names tagX, tagY, ... diff --git a/quanta/src/dcopquanta.cpp b/quanta/src/dcopquanta.cpp index 8dde34bc..149240d6 100644 --- a/quanta/src/dcopquanta.cpp +++ b/quanta/src/dcopquanta.cpp @@ -40,11 +40,11 @@ TQStringList DCOPQuanta::selectors(const TQString& tag) if (key.startsWith("Selectors|")) { TQString selectorName = key.mid(10); - int index = selectorName.tqfind(':'); + int index = selectorName.find(':'); if (index != -1) selectorName = selectorName.mid(0, index); TQString tmpStr; - index = selectorName.tqfind(rx); + index = selectorName.find(rx); if (index != -1) { tmpStr = selectorName.left(index).lower(); @@ -54,8 +54,8 @@ TQStringList DCOPQuanta::selectors(const TQString& tag) } if (tmpStr.isEmpty() || tag.lower() == tmpStr || tmpStr == "*") { - tmpStr = selectorName.mid(index + 1).tqreplace('.',' '); - if (!tmpStr.isEmpty() && !selectorList.tqcontains(tmpStr)) + tmpStr = selectorName.mid(index + 1).replace('.',' '); + if (!tmpStr.isEmpty() && !selectorList.contains(tmpStr)) selectorList << tmpStr; } } @@ -93,11 +93,11 @@ TQStringList DCOPQuanta::groupElements(const TQString& group) if (key.startsWith(group + "|")) { TQString name = key.mid(10); - int index = name.tqfind(':'); + int index = name.find(':'); if (index != -1) name = name.mid(0, index); TQString tmpStr; - index = name.tqfind("|"); + index = name.find("|"); if (index != -1) { tmpStr = name.left(index).lower(); diff --git a/quanta/src/dcopsettings.cpp b/quanta/src/dcopsettings.cpp index c640b956..504eca84 100644 --- a/quanta/src/dcopsettings.cpp +++ b/quanta/src/dcopsettings.cpp @@ -28,9 +28,9 @@ DCOPSettings::DCOPSettings() : DCOPObject("SettingsIf") TQString DCOPSettings::encoding() { TQString encoding = quantaApp->defaultEncoding(); - encoding.tqreplace("iso ", "iso-"); //it's said that "iso-8859-x" is the valid format - encoding.tqreplace("utf", "utf-"); //it's said that "utf-x" is the valid format - encoding.tqreplace("cp ", "windows-"); + encoding.replace("iso ", "iso-"); //it's said that "iso-8859-x" is the valid format + encoding.replace("utf", "utf-"); //it's said that "utf-x" is the valid format + encoding.replace("cp ", "windows-"); return encoding; } diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 9b136e58..4e715a4a 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -461,8 +461,8 @@ void Document::insertText(const TQString &a_text, bool adjustCursor, bool repars } if (insideQuotes && closeQuotationFound) { - text.tqreplace("\\\"", "\""); - text.tqreplace("\"", "\\\""); + text.replace("\\\"", "\""); + text.replace("\"", "\\\""); } } @@ -669,8 +669,8 @@ TQString Document::getTagNameAt(int line, int col ) while (line >= 0) { QuantaCommon::removeCommentsAndQuotes(textLine, completionDTD); - int pos = textLine.tqfindRev("<"); - int pos2 = textLine.tqfindRev(">"); + int pos = textLine.findRev("<"); + int pos2 = textLine.findRev(">"); if (pos != -1 && pos2 < pos) { textLine.remove(0, pos + 1); @@ -680,7 +680,7 @@ TQString Document::getTagNameAt(int line, int col ) textLine[pos] != '>') pos++; name = textLine.left(pos).stripWhiteSpace(); - pos = name.tqfind(":"); + pos = name.find(":"); if (pos != -1) name = name.mid(pos + 1); break; @@ -778,7 +778,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T { kdDebug(24000) << *string << endl; kdDebug(24000) << completion->userdata << endl; - int pos = completion->userdata.tqfind("|"); + int pos = completion->userdata.find("|"); TQString s = completion->userdata.left(pos); completion->userdata.remove(0,pos+1); string->remove(0, s.length()); @@ -791,7 +791,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T viewCursorIf->cursorPositionReal(&line, &col); TQString s2 = editIf->textLine(line).left(col); kdDebug(24000) << s2 << endl; - int pos = s2.tqfindRev('&'); + int pos = s2.findRev('&'); if (pos != -1) { s2 = s2.mid(pos + 1); @@ -820,7 +820,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T s = *string; string->remove(0, string->length()); TQString s2 = TQString("public \""+DTDs::ref()->getDTDNameFromNickName(s)+"\""); - const DTDStruct *dtd = DTDs::ref()->tqfind(DTDs::ref()->getDTDNameFromNickName(s)); + const DTDStruct *dtd = DTDs::ref()->find(DTDs::ref()->getDTDNameFromNickName(s)); if (dtd && !dtd->url.isEmpty()) { s2 += " \""+dtd->url+"\""; @@ -942,7 +942,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) tagName = getTagNameAt(line, column); tag = QuantaCommon::tagFromDTD(completionDTD, tagName); if (!tag && !tagName.isEmpty()) - tag = userTagList.tqfind(tagName.lower()); + tag = userTagList.find(tagName.lower()); TQString s = editIf->textLine(line).left(column + 1); bool namespacecompletion = false; @@ -984,7 +984,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) if (node->tag->type == Tag::XmlTag && (!node->next || !QuantaCommon::closesTag(node->tag, node->next->tag))) { TQString name = node->tag->name; - name = name.left(name.tqfind(" | ")); + name = name.left(name.find(" | ")); if (!node->tag->nameSpace.isEmpty()) name.prepend(node->tag->nameSpace + ":"); editIf->insertText(line, column + 1, name + ">"); @@ -1052,10 +1052,10 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) { //we need to find the attribute name TQString textLine = editIf->textLine(line).left(column-1); - TQString attribute = textLine.mid(textLine.tqfindRev(' ')+1); - if (attribute == "style" && completionDTD->insideDTDs.tqcontains("css")) + TQString attribute = textLine.mid(textLine.findRev(' ')+1); + if (attribute == "style" && completionDTD->insideDTDs.contains("css")) { - completionDTD = DTDs::ref()->tqfind("text/css"); + completionDTD = DTDs::ref()->find("text/css"); completionRequested = true; return scriptAutoCompletion(line, column + 1, string); } @@ -1068,20 +1068,20 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) //check if we are inside a style attribute, and use css autocompletion if we are TQString textLine = editIf->textLine(line); textLine = textLine.left(column); - int pos = textLine.tqfindRev('"'); + int pos = textLine.findRev('"'); if (pos != -1) { - pos = textLine.tqfindRev(' ', pos); + pos = textLine.findRev(' ', pos); if (pos != -1) { textLine = textLine.mid(pos + 1); - pos = textLine.tqfind('='); + pos = textLine.find('='); if (pos != -1) { TQString attribute = textLine.left(pos); - if (attribute == "style" && completionDTD->insideDTDs.tqcontains("css")) + if (attribute == "style" && completionDTD->insideDTDs.contains("css")) { - completionDTD = DTDs::ref()->tqfind("text/css"); + completionDTD = DTDs::ref()->find("text/css"); completionRequested = true; return scriptAutoCompletion(line, column + 1, string); } @@ -1089,7 +1089,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) } } TQString s = editIf->textLine(line).left(column + 1); - pos = s.tqfindRev('&'); + pos = s.findRev('&'); if (pos != -1) { //complete character codes @@ -1169,7 +1169,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n bool Document::isDerivatedFrom(const TQString& className, const TQString &baseClass) { - if (className.isEmpty() || !completionDTD->classInheritance.tqcontains(className)) + if (className.isEmpty() || !completionDTD->classInheritance.contains(className)) return false; TQString parentClass = completionDTD->classInheritance[className]; @@ -1179,7 +1179,7 @@ bool Document::isDerivatedFrom(const TQString& className, const TQString &baseCl result = 1; //className extends baseClass else { - if (completionDTD->classInheritance.tqcontains(parentClass)) + if (completionDTD->classInheritance.contains(parentClass)) parentClass = completionDTD->classInheritance[parentClass]; else result = -1;//nothing was found in the inheritance list @@ -1366,7 +1366,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, // Here we actually append the completion type completion.type = type[tagNameList[i]]; // And here is out sorting... - if(completion.type.tqcontains("variable")) + if(completion.type.contains("variable")) { // Insert after the last variable variableIt++; @@ -1374,7 +1374,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, } else { - if(completion.type.tqcontains("script")) + if(completion.type.contains("script")) { //Scripts can go at the end of the list completions->append(completion); @@ -1407,7 +1407,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con TQTag *tag = QuantaCommon::tagFromDTD(completionDTD, tagName); if (!tag) { - tag = userTagList.tqfind(tagName.lower()); + tag = userTagList.find(tagName.lower()); } TQString startsWith = a_startsWith.upper(); if (tag) @@ -1438,7 +1438,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con //list common attributes for this tag for (TQStringList::Iterator it = tag->commonGroups.begin(); it != tag->commonGroups.end(); ++it) { - AttributeList *attrs = tag->parentDTD->commonAttrs->tqfind(*it); + AttributeList *attrs = tag->parentDTD->commonAttrs->find(*it); for (uint j = 0; j < attrs->count(); j++) { TQString name = attrs->at(j)->name; @@ -1452,7 +1452,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con } } - if (tag->name().tqcontains("!doctype",false)) //special case, list all the known document types + if (tag->name().contains("!doctype",false)) //special case, list all the known document types { TQStringList nickNames = DTDs::ref()->nickNameList(true); for ( TQStringList::Iterator it = nickNames.begin(); it != nickNames.end(); ++it ) @@ -1538,7 +1538,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeValueCompletion } if (deleteValues) delete values; - int andSignPos = startsWith.tqfind('&'); + int andSignPos = startsWith.find('&'); if (andSignPos != -1) { TQValueList<KTextEditor::CompletionEntry> *charCompletions = getCharacterCompletions(startsWith.mid(andSignPos + 1)); @@ -1557,7 +1557,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con TQMap<TQString, KTextEditor::CompletionEntry> completionMap; //first search for entities defined in the document - const DTDStruct *dtdDTD = DTDs::ref()->tqfind("dtd"); + const DTDStruct *dtdDTD = DTDs::ref()->find("dtd"); if (dtdDTD) { StructTreeGroup group; @@ -1616,10 +1616,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con for ( TQStringList::Iterator it = charList.begin(); it != charList.end(); ++it ) { completion.text = *it; - int begin = completion.text.tqfind("(&") + 2; + int begin = completion.text.find("(&") + 2; if (begin == 1) continue; - int length = completion.text.tqfind(";)") - begin + 1; + int length = completion.text.find(";)") - begin + 1; TQString s = completion.text.mid(begin, length - 1); completion.text = s + " : " + completion.text.left(begin -2) + " - " + completion.text.mid(begin + length + 1); if (s.startsWith(startsWith)) @@ -1661,9 +1661,9 @@ const DTDStruct* Document::currentDTD(bool fallback) /** Get a pointer to the default DTD (document, or app). */ const DTDStruct* Document::defaultDTD() const { - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); - if (!dtd) dtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD()); - if (!dtd) dtd = DTDs::ref()->tqfind(qConfig.defaultDocType); //this will always exists + const DTDStruct* dtd = DTDs::ref()->find(dtdName); + if (!dtd) dtd = DTDs::ref()->find(Project::ref()->defaultDTD()); + if (!dtd) dtd = DTDs::ref()->find(qConfig.defaultDocType); //this will always exists return dtd; } @@ -1682,17 +1682,17 @@ TQString Document::findDTDName(Tag **tag) { text = editIf->textLine(i); //search for !DOCTYPE tags - pos = text.tqfind("!doctype",0,false); + pos = text.find("!doctype",0,false); if (pos != -1) //parse the found !DOCTYPE tag { int bl, bc, el, ec; line = i; bl = line; - startPos = text.tqfindRev('<',pos); + startPos = text.findRev('<',pos); while (startPos == -1 && line >=0) { text = editIf->textLine(line); - startPos = text.tqfindRev('<'); + startPos = text.findRev('<'); bl = line; line--; } @@ -1704,12 +1704,12 @@ TQString Document::findDTDName(Tag **tag) bc = startPos; line = i; text = editIf->textLine(i); - startPos = text.tqfind('>',pos); + startPos = text.find('>',pos); el = line; while (startPos == -1 && line < endLine) { text = editIf->textLine(line); - startPos = text.tqfind('>'); + startPos = text.find('>'); el = line; line++; } @@ -1724,17 +1724,17 @@ TQString Document::findDTDName(Tag **tag) text = this->text(bl, bc, el, ec); (*tag)->parse(text, this); (*tag)->type = Tag::XmlTag; - text.tqreplace("\\\"", "\""); - pos = text.tqfind("public",0,false); + text.replace("\\\"", "\""); + pos = text.find("public",0,false); if (pos == -1) //if no PUBLIC info, use the word after !DOCTYPE as the doc.type { foundText = (*tag)->attribute(0); } else { //use the quoted string after PUBLIC as doc. type - pos = text.tqfind("\"", pos+1); + pos = text.find("\"", pos+1); if (pos !=-1) { - int endPos = text.tqfind("\"",pos+1); + int endPos = text.find("\"",pos+1); foundText = text.mid(pos+1, endPos-pos-1); } } @@ -1797,7 +1797,7 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert TQValueList<TQTag *> tags; if (!word.isEmpty()) { - tags.append(userTagList.tqfind(word.lower())); + tags.append(userTagList.find(word.lower())); TQDictIterator<TQTag> it(*(completionDTD->tagsList)); for( ; it.current(); ++it ) { @@ -1907,7 +1907,7 @@ TQString Document::text(const AreaStruct &area) const return text(area.bLine, area.bCol, area.eLine, area.eCol); } -TQString Document::tqfind(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) +TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) { TQRegExp rx = regExp; @@ -1937,11 +1937,11 @@ TQString Document::tqfind(const TQRegExp& regExp, int sLine, int sCol, int& fbLi { foundText = rx.cap(); TQString s = textToSearch.left(pos); - int linesUntilFound = s.tqcontains("\n"); + int linesUntilFound = s.contains("\n"); fbLine = sLine + linesUntilFound; - fbCol = s.length()-s.tqfindRev("\n")-1; - int linesInFound = foundText.tqcontains("\n"); - feCol = foundText.length()-foundText.tqfindRev("\n")-2; + fbCol = s.length()-s.findRev("\n")-1; + int linesInFound = foundText.contains("\n"); + feCol = foundText.length()-foundText.findRev("\n")-2; feLine = fbLine + linesInFound; if (linesUntilFound == 0) { @@ -1965,7 +1965,7 @@ TQString Document::tqfind(const TQRegExp& regExp, int sLine, int sCol, int& fbLi return foundText; } -TQString Document::tqfindRev(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) +TQString Document::findRev(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) { TQRegExp rx = regExp; TQString foundText = ""; @@ -1993,8 +1993,8 @@ TQString Document::tqfindRev(const TQRegExp& regExp, int sLine, int sCol, int& f foundText = rx.cap(); fbLine = line; fbCol = pos; - int linesInFound = foundText.tqcontains("\n"); - feCol = foundText.length()-foundText.tqfindRev("\n")-2; + int linesInFound = foundText.contains("\n"); + feCol = foundText.length()-foundText.findRev("\n")-2; feLine = fbLine + linesInFound; if (linesInFound == 0) { @@ -2047,7 +2047,7 @@ void Document::handleCodeCompletion() { completionDTD = defaultDTD(); TQString s = text(line, 0, line, col).stripWhiteSpace(); - if (s.tqfindRev("<") != -1) + if (s.findRev("<") != -1) { //showCodeCompletions(getTagCompletions(line, col + 1)); @@ -2079,8 +2079,8 @@ void Document::codeCompletionHintRequested() if (completionDTD->family == Script) { // TQString textLine = editIf->textLine(line).left(col); -// int pos = textLine.tqfindRev("("); -// int pos2 = textLine.tqfindRev(")"); +// int pos = textLine.findRev("("); +// int pos2 = textLine.findRev(")"); //if (pos > pos2 ) hintRequested = true; scriptAutoCompletion(line, col - 1, ""); @@ -2093,8 +2093,8 @@ TQString Document::currentWord() uint line, col; viewCursorIf->cursorPositionReal(&line, &col); TQString textLine = editIf->textLine(line); - int startPos = textLine.tqfindRev(TQRegExp("\\W"), col); - int endPos = textLine.tqfind(TQRegExp("\\W"), col); + int startPos = textLine.findRev(TQRegExp("\\W"), col); + int endPos = textLine.find(TQRegExp("\\W"), col); if (startPos == -1) startPos = 0; else @@ -2114,7 +2114,7 @@ TQString Document::findWordRev(const TQString& textToSearch, const DTDStruct *dt int pos; bool end = false; do{ - pos = t.tqfindRev(TQRegExp("\\W"), startPos); + pos = t.findRev(TQRegExp("\\W"), startPos); if (t[pos] == '_' || (dtd && dtd->minusAllowedInWord && t[pos] == '-')) { @@ -2155,9 +2155,9 @@ bool Document::xmlCodeCompletion(int line, int col) if (index != -1) //inside a value { s = tag->attribute(index); - if (s == "style" && completionDTD->insideDTDs.tqcontains("css")) + if (s == "style" && completionDTD->insideDTDs.contains("css")) { - completionDTD = DTDs::ref()->tqfind("text/css"); + completionDTD = DTDs::ref()->find("text/css"); return scriptAutoCompletion(line, col, ""); } else { @@ -2190,7 +2190,7 @@ bool Document::xmlCodeCompletion(int line, int col) if (!handled) { TQString s = editIf->textLine(line).left(col); - int pos = s.tqfindRev('&'); + int pos = s.findRev('&'); if (pos != -1) { s = s.mid(pos + 1); @@ -2338,7 +2338,7 @@ void Document::enableGroupsForDTEP(const TQString& dtepName, bool enable) m_groupsForDTEPs = m_DTEPList; if (enable) { - if (m_groupsForDTEPs.tqcontains(dtepName) == 0) + if (m_groupsForDTEPs.contains(dtepName) == 0) m_groupsForDTEPs.append(dtepName); } else { @@ -2354,7 +2354,7 @@ void Document::resetGroupsForDTEPList() /** Returns true if the number of " (excluding \") inside text is even. */ bool Document::evenQuotes(const TQString &text) { - int num = text.tqcontains(TQRegExp("[^\\\\]\"")); + int num = text.contains(TQRegExp("[^\\\\]\"")); return (num /2 *2 == num); } @@ -2521,7 +2521,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri { TQStringList *values = 0L; deleteResult = true; - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd) { TQString searchForAttr = (dtd->caseSensitive) ? attribute : attribute.upper(); @@ -2691,7 +2691,7 @@ void Document::createBackup(KConfig* config) config->setGroup("General Options"); TQStringList backedupFilesEntryList = QuantaCommon::readPathListEntry(config, "List of backedup files"); //the files that were backedup TQStringList autosavedFilesEntryList = QuantaCommon::readPathListEntry(config, "List of autosaved files"); //the list of actual backup files inside $KDEHOME/share/apps/quanta/backups - if (!autosavedFilesEntryList.tqcontains(backupPathValueURL)) //not yet backed up, add an entry for this file + if (!autosavedFilesEntryList.contains(backupPathValueURL)) //not yet backed up, add an entry for this file { autosavedFilesEntryList.append(backupPathValueURL); config->writePathEntry("List of autosaved files", autosavedFilesEntryList); @@ -2943,11 +2943,11 @@ void Document::processDTD(const TQString& documentType) } } - if (!DTDs::ref()->tqfind(foundName)) + if (!DTDs::ref()->find(foundName)) { //try to find the closest matching DTD TQString s = foundName.lower(); - uint spaceNum = s.tqcontains(' '); + uint spaceNum = s.contains(' '); TQStringList dtdList = DTDs::ref()->nameList(); TQStringList lastDtdList; for (uint i = 0; i <= spaceNum && !dtdList.empty(); i++) @@ -3006,7 +3006,7 @@ void Document::processDTD(const TQString& documentType) { qConfig.showDTDSelectDialog = !dtdWidget->useClosestMatching->isChecked(); setDTDIdentifier(DTDs::ref()->getDTDNameFromNickName(dtdWidget->dtdCombo->currentText())); - const DTDStruct *dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct *dtd = DTDs::ref()->find(dtdName); if (dtdWidget->convertDTD->isChecked() && dtd->family == Xml) { int bLine, bCol, eLine, eCol; @@ -3024,12 +3024,12 @@ void Document::processDTD(const TQString& documentType) TQString dtdId = DTDs::ref()->DTDforURL(u)->name; // if (dtdId == "empty") { - const DTDStruct * dtd = DTDs::ref()->tqfind(projectDTD); + const DTDStruct * dtd = DTDs::ref()->find(projectDTD); if (DTDs::canHandle(dtd, u)) dtdId = projectDTD; else { - dtd = DTDs::ref()->tqfind(qConfig.defaultDocType); + dtd = DTDs::ref()->find(qConfig.defaultDocType); if (DTDs::canHandle(dtd, u)) dtdId = qConfig.defaultDocType; } @@ -3083,7 +3083,7 @@ void Document::resetDTEPs() void Document::addDTEP(const TQString &dtepName) { - if (m_DTEPList.tqcontains(dtepName) == 0) + if (m_DTEPList.contains(dtepName) == 0) { m_DTEPList.append(dtepName); } @@ -3099,7 +3099,7 @@ TQStringList Document::groupsForDTEPs() TQString Document::annotationText(uint line) { - TQMap<uint, TQPair<TQString, TQString> >::Iterator it = m_annotations.tqfind(line); + TQMap<uint, TQPair<TQString, TQString> >::Iterator it = m_annotations.find(line); if (it != m_annotations.end()) return it.data().first; else diff --git a/quanta/src/document.h b/quanta/src/document.h index 639ff27d..360b9a4c 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -103,8 +103,8 @@ public: bool insertChildTags(TQTag *tag, TQTag* lastTag = 0L); TQPoint getGlobalCursorPos(); - TQString tqfind(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); - TQString tqfindRev(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); + TQString find(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); + TQString findRev(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); /** Get the view of the document */ KTextEditor::View* view(); /** Get the KTextEditor::Document of the document */ diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index d6bdd9e1..7b26bc7a 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -120,9 +120,9 @@ DTDs::DTDs(TQObject *tqparent) DTDStruct * dtd = it.current(); for (uint i = 0; i < dtd->insideDTDs.count(); i++) { - const DTDStruct *insideDTD = m_dict->tqfind(dtd->insideDTDs[i]); // search but don't load + const DTDStruct *insideDTD = m_dict->find(dtd->insideDTDs[i]); // search but don't load if (!insideDTD) - insideDTD = m_dict->tqfind(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load + insideDTD = m_dict->find(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load if (insideDTD && !insideDTD->toplevel) dtd->mimeTypes += insideDTD->mimeTypes; } @@ -168,7 +168,7 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll) KConfig *dtdConfig = new KConfig(tmpStr, true); dtdConfig->setGroup("General"); TQString dtdName = dtdConfig->readEntry("Name", "Unknown"); - if (m_dict->tqfind(dtdName.lower())) + if (m_dict->find(dtdName.lower())) { delete dtdConfig; kdDebug(24000) << "dtds::readTagDir from " << dirName @@ -205,8 +205,8 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll) for (uint i = 0; i < tmpStrList.count(); i++) { tmpStr = tmpStrList[i].stripWhiteSpace(); - int pos = tmpStr.tqfind('('); - dtd->definitionTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.tqfindRev(')')-pos-1).stripWhiteSpace(); + int pos = tmpStr.find('('); + dtd->definitionTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.findRev(')')-pos-1).stripWhiteSpace(); } //Which DTD can be present in this one? dtd->insideDTDs = dtdConfig->readListEntry("MayContain"); @@ -317,7 +317,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) tag->setName(TQString(extraTagsList.at(i)).stripWhiteSpace()); tmpStr = (dtd->caseSensitive) ? tag->name() : tag->name().upper(); - if (tagList->tqfind(tmpStr)) //the tag is already defined in a .tag file + if (tagList->find(tmpStr)) //the tag is already defined in a .tag file { delete tag; continue; //skip this tag @@ -422,8 +422,8 @@ bool DTDs::readTagDir2(DTDStruct *dtd) for (uint i = 0; i < tmpStrList.count(); i++) { tmpStr = tmpStrList[i].stripWhiteSpace(); - int pos = tmpStr.tqfind('('); - dtd->specialTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.tqfindRev(')')-pos-1).stripWhiteSpace(); + int pos = tmpStr.find('('); + dtd->specialTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.findRev(')')-pos-1).stripWhiteSpace(); } //static const TQString quotationStr = "\\\\\"|\\\\'"; @@ -595,7 +595,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) attrRx.search(tagStr); tmpStr = attrRx.cap(); tmpStrList = TQStringList::split(',', tmpStr.mid(1, tmpStr.length()-2)); - tagName = tagStr.left(tagStr.tqfind('(')).lower(); + tagName = tagStr.left(tagStr.find('(')).lower(); group.attributes.clear(); for (uint i = 0; i < tmpStrList.count(); i++) group.attributes += tmpStrList[i].stripWhiteSpace(); @@ -620,13 +620,13 @@ void DTDs::resolveInherited (DTDStruct *dtd) //Resolve the inheritence if (!dtd->inheritsTagsFrom.isEmpty()) { - DTDStruct *tqparent = (DTDStruct *) tqfind(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory + DTDStruct *tqparent = (DTDStruct *) find(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory TQDictIterator<TQTag> tag_it(*(tqparent->tagsList)); for ( ; tag_it.current(); ++tag_it) { TQTag *tag = tag_it.current(); TQString searchForTag = (dtd->caseSensitive) ? tag->name() : tag->name().upper(); - if (!dtd->tagsList->tqfind(searchForTag)) + if (!dtd->tagsList->find(searchForTag)) { TQTag *newTag = new TQTag(*tag); dtd->tagsList->insert(searchForTag, newTag); @@ -642,9 +642,9 @@ void DTDs::resolveInherited (DTDStruct *dtd) specialAreaStartRxStr += "|"; for (uint i = 0; i < dtd->insideDTDs.count(); i++) { - const DTDStruct *insideDTD = m_dict->tqfind(dtd->insideDTDs[i]); // search but don't load + const DTDStruct *insideDTD = m_dict->find(dtd->insideDTDs[i]); // search but don't load if (!insideDTD) - insideDTD = m_dict->tqfind(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load + insideDTD = m_dict->find(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load if (insideDTD) { for (mapIt = insideDTD->definitionAreas.begin(); mapIt != insideDTD->definitionAreas.end(); ++mapIt) @@ -725,10 +725,10 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList { if (parentDTD->caseSensitive) { - tagList->tqreplace(tag->name(), tag); //append the tag to the list for this DTD + tagList->replace(tag->name(), tag); //append the tag to the list for this DTD } else { - tagList->tqreplace(tag->name().upper(), tag); + tagList->replace(tag->name().upper(), tag); } } } @@ -912,7 +912,7 @@ void DTDs::slotLoadDTD() dtdcfg.setGroup("General"); TQString dtdName = dtdcfg.readEntry("Name"); TQString nickName = dtdcfg.readEntry("NickName", dtdName); - DTDStruct * dtd = m_dict->tqfind(dtdName) ; + DTDStruct * dtd = m_dict->find(dtdName) ; if (dtd && KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { @@ -944,7 +944,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) dtdcfg.setGroup("General"); TQString dtdName = dtdcfg.readEntry("Name"); TQString nickName = dtdcfg.readEntry("NickName", dtdName); - DTDStruct * dtd = m_dict->tqfind(dtdName) ; + DTDStruct * dtd = m_dict->find(dtdName) ; if ( dtd && KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { @@ -987,12 +987,12 @@ void DTDs::slotLoadEntities() if (w) { TQString nickName = DTDs::ref()->getDTDNickNameFromName(w->getDTDIdentifier()); - entitiesWidget.targetDTEPCombo->setCurrentItem(lst.tqfindIndex(nickName)); + entitiesWidget.targetDTEPCombo->setCurrentItem(lst.findIndex(nickName)); } dlg.setMainWidget(&entitiesWidget); if (dlg.exec()) { - DTDStruct * dtd = m_dict->tqfind(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText())); + DTDStruct * dtd = m_dict->find(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText())); DTDParser dtdParser(KURL::fromPathOrURL(entitiesWidget.sourceDTDRequester->url()), KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep"); TQString dtdDir = TQFileInfo(dtd->fileName).dirPath(); if (dtdParser.parse(dtdDir, true)) @@ -1077,7 +1077,7 @@ const DTDStruct * DTDs::DTDforURL(const KURL &url) } } if (foundList.isEmpty()) - return tqfind("empty"); + return find("empty"); else { TQString path = url.path(); @@ -1093,7 +1093,7 @@ const DTDStruct * DTDs::DTDforURL(const KURL &url) bool DTDs::canHandle(const DTDStruct *dtd, const KURL &url) { TQString mimetype = KMimeType::findByURL(url)->name(); - if (dtd->mimeTypes.tqcontains(mimetype)) + if (dtd->mimeTypes.contains(mimetype)) return true; if (url.path().endsWith('.' + dtd->defaultExtension)) return true; diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h index 4f351182..0ecf30cb 100644 --- a/quanta/src/dtds.h +++ b/quanta/src/dtds.h @@ -44,7 +44,7 @@ struct DTDStruct; /** @short This class manages the DTD's for Quanta. * * The constructor only loads the necessary information from the description.rc file. - * The rest is later loaded on demand of the tqfind() function. + * The rest is later loaded on demand of the find() function. */ class DTDs : public TQObject { @@ -73,10 +73,10 @@ public: * @param dtdName name of the dtd, will be converted to lowercase inside * @return the found dtd structure */ - const DTDStruct * tqfind (const TQString &dtdName) + const DTDStruct * find (const TQString &dtdName) { -// kdDebug(24000) << "dtds::tqfind " << dtdName << endl; - DTDStruct *dtd = m_dict->tqfind(dtdName.lower()) ; +// kdDebug(24000) << "dtds::find " << dtdName << endl; + DTDStruct *dtd = m_dict->find(dtdName.lower()) ; if (dtd && ! dtd->loaded ) readTagDir2(dtd); return dtd; } @@ -93,7 +93,7 @@ public: */ TQString getDTDNickNameFromName(const TQString& name) { - DTDStruct *dtd = m_dict->tqfind(name); + DTDStruct *dtd = m_dict->find(name); if ( dtd ) return dtd->nickName; else diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 0323d2c0..07ac5a1e 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -203,7 +203,7 @@ void KQApplicationPrivate::init() { TQString arg = args->url(i).url(); - if(arg.tqfindRev(TQRegExp(".+\\.webprj")) != -1) + if(arg.findRev(TQRegExp(".+\\.webprj")) != -1) initialProject = arg; else initialFiles += arg; diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index cb4795a3..27391537 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -320,7 +320,7 @@ QuantaApp::~QuantaApp() tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) { - if (tmpDirs[i].tqcontains("kde-")) + if (tmpDirs[i].contains("kde-")) tmpDir = tmpDirs[i]; } TQString infoCss = tmpDir; @@ -522,7 +522,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) if (QuantaCommon::checkOverwrite(saveUrl, this) && view->saveDocument(saveUrl)) { oldURL = saveUrl; - if (Project::ref()->hasProject() && !Project::ref()->tqcontains(saveUrl) && + if (Project::ref()->hasProject() && !Project::ref()->contains(saveUrl) && KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add")) ) { @@ -761,7 +761,7 @@ void QuantaApp::slotRepaintPreview() TQString noFramesText = w->text(0,0, bl, bc - 1); noFramesText += noframearea[0]; noFramesText += w->text(el, ec + 1, w->editIf->numLines() - 1, w->editIf->lineLength(w->editIf->numLines() - 1)); - noFramesText.tqreplace(TQRegExp("</?noframes[^>]*>", false), ""); + noFramesText.replace(TQRegExp("</?noframes[^>]*>", false), ""); //kdDebug(24000) << "NOFRAMES: " << noFramesText << endl; if (w->isUntitled()) m_htmlPart->begin(Project::ref()->projectBaseURL(), xOffset, yOffset); @@ -876,7 +876,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) } else { TQString mimetype = KMimeType::findByURL(url)->name(); - if (mimetype.tqcontains("image")) + if (mimetype.contains("image")) { TQString imgFileName; KIO::NetAccess::download(url, imgFileName, this); @@ -965,7 +965,7 @@ void QuantaApp::slotOptionsConfigureKeys() for( TQPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it ) { - if (toolbarGuiClients.tqcontains(*it) <= 0) //no need to insert the collections of the toolbars as they are present in the main actionCollection + if (toolbarGuiClients.contains(*it) <= 0) //no need to insert the collections of the toolbars as they are present in the main actionCollection dlg.insert((*it)->actionCollection()); } if (dlg.configure() == KKeyDialog::Accepted) @@ -1911,14 +1911,14 @@ void QuantaApp::slotContextMenuAboutToShow() name = tagStr.mid(pos, group.definitionRx.matchedLength()); node->tag->beginPos(bl, bc); TQString tmpStr = tagStr.left(pos); - int newLines = tmpStr.tqcontains('\n'); + int newLines = tmpStr.contains('\n'); bl += newLines; - int l = tmpStr.tqfindRev('\n'); //the last EOL + int l = tmpStr.findRev('\n'); //the last EOL bc = (l == -1) ? bc+pos : pos - l - 1; - newLines = name.tqcontains('\n'); + newLines = name.contains('\n'); l = name.length(); el = bl + newLines; - ec = (newLines > 0) ? l - name.tqfindRev('\n') : bc + l - 1; + ec = (newLines > 0) ? l - name.findRev('\n') : bc + l - 1; pos += l; int p = group.definitionRx.search(cleanName); if (p != -1) @@ -1942,7 +1942,7 @@ void QuantaApp::slotContextMenuAboutToShow() } } else { - TQMap<TQString, XMLStructGroup>::ConstIterator it = node->tag->dtd()->xmlStructTreeGroups.tqfind(node->tag->name.lower()); + TQMap<TQString, XMLStructGroup>::ConstIterator it = node->tag->dtd()->xmlStructTreeGroups.find(node->tag->name.lower()); if (it != node->tag->dtd()->xmlStructTreeGroups.constEnd()) { @@ -1979,7 +1979,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("upload_file"); if (action) { - action->setEnabled(Project::ref()->tqcontains(w->url())); + action->setEnabled(Project::ref()->contains(w->url())); } // If we have a debugger session active... @@ -1997,16 +1997,16 @@ void QuantaApp::slotContextMenuAboutToShow() { // Otherwise, find the word under the cursor word = w->editIf->textLine(w->viewCursorIf->cursorLine()); - startpos = word.tqfindRev(TQRegExp("$|[^a-zA-Z0-9_]"), w->viewCursorIf->cursorColumn()); + startpos = word.findRev(TQRegExp("$|[^a-zA-Z0-9_]"), w->viewCursorIf->cursorColumn()); word.remove(0, startpos); if(word.left(1) != "$") word.remove(0, 1); - word = word.left(word.tqfind(TQRegExp("[^a-zA-Z0-9_]"), 1)); + word = word.left(word.find(TQRegExp("[^a-zA-Z0-9_]"), 1)); } // If we have a linebreak, take everything before the break - startpos = word.tqfind("\n"); + startpos = word.find("\n"); if(startpos > 0) word = word.left(startpos); @@ -2195,12 +2195,12 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) TQString s = i18nName.lower(); TQString toolbarId = s; TQRegExp rx("\\s|\\."); - toolbarId.tqreplace(rx, "_"); + toolbarId.replace(rx, "_"); int n = 1; - while (m_toolbarList.tqfind(toolbarId) != 0L) + while (m_toolbarList.find(toolbarId) != 0L) { toolbarId = s + TQString("%1").tqarg(n); - toolbarId.tqreplace(rx, "_"); + toolbarId.replace(rx, "_"); n++; } @@ -2250,7 +2250,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) //Compatility code (read the action shortcuts from quantaui.rc) //TODO: Remove after upgrade from 3.1 is not supported - if (oldShortcuts.tqcontains(actionName)) + if (oldShortcuts.contains(actionName)) { tagAction->setModified(true); tagAction->data().setAttribute("shortcut", oldShortcuts[actionName]); @@ -2598,7 +2598,7 @@ void QuantaApp::slotAddToolbar() TQString toolbarId = name; int n = 1; - while (m_toolbarList.tqfind(toolbarId) != 0L) + while (m_toolbarList.find(toolbarId) != 0L) { toolbarId = name + TQString("%1").tqarg(n); n++; @@ -2936,7 +2936,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_ { KAction *action = 0L; TQString actionName = a_actionName; - actionName.tqreplace('&',"&&"); + actionName.replace('&',"&&"); KActionCollection *ac = actionCollection(); uint actionCount = ac->count(); TQString str; @@ -3014,10 +3014,10 @@ void QuantaApp::setDtep(const TQString& dtepName, bool convert) if (w) { TQString dtep = DTDs::ref()->getDTDNameFromNickName(dtepName); - if (!DTDs::ref()->tqfind(dtep)) + if (!DTDs::ref()->find(dtep)) return; w->setDTDIdentifier(dtep); - const DTDStruct *dtd = DTDs::ref()->tqfind(w->getDTDIdentifier()); + const DTDStruct *dtd = DTDs::ref()->find(w->getDTDIdentifier()); if (convert && dtd->family == Xml) { Tag *tag = 0L; @@ -3096,7 +3096,7 @@ void QuantaApp::slotEditDTD() bool ok = false; TQString res = KInputDialog::getItem( i18n( "Edit DTD" ), - i18n( "Please select a DTD:" ), lst, lst.tqfindIndex(nickName), false, &ok, this ); + i18n( "Please select a DTD:" ), lst, lst.findIndex(nickName), false, &ok, this ); TQString s = i18n("Create a new DTEP description"); s = i18n("Load DTEP description from disk"); @@ -3106,7 +3106,7 @@ void QuantaApp::slotEditDTD() TQString dtdName = DTDs::ref()->getDTDNameFromNickName(res); KDialogBase editDlg(this, "edit_dtep", true, i18n("Configure DTEP"), KDialogBase::Ok | KDialogBase::Cancel); - DTEPEditDlg dtepDlg(DTDs::ref()->tqfind(dtdName)->fileName, &editDlg); + DTEPEditDlg dtepDlg(DTDs::ref()->find(dtdName)->fileName, &editDlg); editDlg.setMainWidget(&dtepDlg); if (editDlg.exec()) { @@ -3166,17 +3166,17 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName) if (!currentToolbarDTD.isEmpty()) { - oldDtd = DTDs::ref()->tqfind(currentToolbarDTD); + oldDtd = DTDs::ref()->find(currentToolbarDTD); if (!oldDtd) - oldDtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD()); + oldDtd = DTDs::ref()->find(Project::ref()->defaultDTD()); } TQString fileName; - const DTDStruct *newDtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct *newDtd = DTDs::ref()->find(dtdName); if (!newDtd) { - newDtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD()); + newDtd = DTDs::ref()->find(Project::ref()->defaultDTD()); if (!newDtd) - newDtd = DTDs::ref()->tqfind(qConfig.defaultDocType); //extreme case + newDtd = DTDs::ref()->find(qConfig.defaultDocType); //extreme case } ToolbarEntry *p_toolbar; @@ -3225,7 +3225,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName) KURL urlLocal; fileName = locateLocal("data", resourceDir + "toolbars/"+oldDtd->toolbars[i]); QuantaCommon::setUrl(urlLocal, fileName); - if (newToolbars.tqcontains(url) == 0) + if (newToolbars.contains(url) == 0) { TQDictIterator<ToolbarEntry> iter(m_toolbarList); for( ; iter.current(); ++iter ) @@ -3309,8 +3309,8 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) name1.remove(" tab"); TQString name2 = name1; name2.remove(TQRegExp("[\\s]\\([0-9]+\\)")); - s2.tqreplace(name1, name2); - s2.tqreplace(name1.lower(), name2.lower()); + s2.replace(name1, name2); + s2.replace(name1.lower(), name2.lower()); } bool useToolbarGUI = true; if ( s1 != s2 /*|| actionsModified */) @@ -3559,7 +3559,7 @@ TQString QuantaApp::createDTEPTarball() bool ok = false; TQString res = KInputDialog::getItem( i18n( "Send DTD" ), - i18n( "Please select a DTD:" ), lst, lst.tqfindIndex(nickName), false, &ok, this ); + i18n( "Please select a DTD:" ), lst, lst.findIndex(nickName), false, &ok, this ); if (!ok) return TQString(); @@ -3570,14 +3570,14 @@ TQString QuantaApp::createDTEPTarball() KTempDir* tempDir = new KTempDir(tmpDir); tempDir->setAutoDelete(true); tempDirList.append(tempDir); - TQString tempFileName=tempDir->name() +"/"+ DTDs::ref()->getDTDNickNameFromName(dtdName).tqreplace(TQRegExp("\\s|\\."), "_") + ".tgz"; + TQString tempFileName=tempDir->name() +"/"+ DTDs::ref()->getDTDNickNameFromName(dtdName).replace(TQRegExp("\\s|\\."), "_") + ".tgz"; //pack the .tag files and the description.rc into a .tgz file KTar tar(tempFileName, "application/x-gzip"); tar.open(IO_WriteOnly); KURL dirURL; - dirURL.setPath(DTDs::ref()->tqfind(dtdName)->fileName); + dirURL.setPath(DTDs::ref()->find(dtdName)->fileName); dirURL.setPath(dirURL.directory(false)); KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this); @@ -3664,7 +3664,7 @@ void QuantaApp::slotSmartTagInsertion() if(!action) return; if(!ViewManager::ref()->activeDocument() || !ViewManager::ref()->activeView() || - ViewManager::ref()->activeDocument()->defaultDTD()->name.tqcontains("HTML", false) == 0) + ViewManager::ref()->activeDocument()->defaultDTD()->name.contains("HTML", false) == 0) { KMessageBox::error(this, "Smart Tag Insertion is available only for (X)HTML for the moment."); qConfig.smartTagInsertion = false; @@ -3736,7 +3736,7 @@ void QuantaApp::documentProperties(bool forceInsertionOfMinimalTree) Document *w = ViewManager::ref()->activeDocument(); if (w) { - if (w->defaultDTD()->name.tqcontains("HTML", false) == 0) + if (w->defaultDTD()->name.contains("HTML", false) == 0) { KMessageBox::information(this, i18n("The Document Properties Dialog is only for HTML and XHTML.")); return; @@ -3808,7 +3808,7 @@ void QuantaApp::slotExpandAbbreviation() { bool found = false; Abbreviation abbrev = it.data(); - if (abbrev.dteps.tqcontains(dtd->name)) + if (abbrev.dteps.contains(dtd->name)) { TQMap<TQString, TQString>::ConstIterator it2; for (it2 = abbrev.abbreviations.constBegin(); it2 != abbrev.abbreviations.constEnd(); ++it2) @@ -3830,20 +3830,20 @@ void QuantaApp::slotExpandAbbreviation() w->editIf->removeText(line, col - text.length() + 1, line, col); w->activateParser(true); col -= (text.length() - 1); - int pos = textToInsert.tqfind('|'); + int pos = textToInsert.find('|'); if (pos != -1) { text = textToInsert.left(pos); - if (text.tqcontains('\n')) + if (text.contains('\n')) { - line += text.tqcontains('\n'); - col = text.length() - text.tqfindRev('\n') - 1; + line += text.contains('\n'); + col = text.length() - text.findRev('\n') - 1; } else { col += pos; } } - textToInsert.tqreplace('|',""); + textToInsert.replace('|',""); w->insertText(textToInsert, false); w->viewCursorIf->setCursorPositionReal(line, col); } @@ -4040,7 +4040,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) } Tag *commentTag = n->tag; TQString text = commentTag->tagStr(); - int pos = text.tqfind("@annotation"); + int pos = text.find("@annotation"); if (pos != -1) { pos += 11; @@ -4048,7 +4048,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) if (text[pos] == '(') { int p = pos; - pos = text.tqfind(')'); + pos = text.find(')'); if (pos != -1) { receiver = text.mid(p + 1, pos - p - 1); @@ -4297,10 +4297,10 @@ void QuantaApp::slotEditCurrentTag() if (dtd->family == Xml) { TQString currentLine = w->editIf->textLine(line); - int sPos = currentLine.tqfindRev('<', col); + int sPos = currentLine.findRev('<', col); if (sPos != -1) { - int ePos = currentLine.tqfind('>', col); + int ePos = currentLine.find('>', col); if (ePos != -1) { AreaStruct area(line, sPos, line, ePos); @@ -4469,7 +4469,7 @@ void QuantaApp::slotInsertCSS() styleNode->next->tag->beginPos(eLine, eCol); TQString styleTagContent(w->text(bLine, bCol+1, eLine, eCol-1).remove("<!--").remove("-->"));// <style></style> block content - kdDebug(24000) << "Style tag tqcontains: " << endl << styleTagContent << endl; + kdDebug(24000) << "Style tag contains: " << endl << styleTagContent << endl; CSSSelector *dlg = new CSSSelector; dlg->setCallingFrom("XHTML"); @@ -4845,10 +4845,10 @@ void QuantaApp::slotPasteHTMLQuoted() if ( ( !text.isNull() ) && (!text.isEmpty() ) ) { - text.tqreplace( "&", "&" ); - text.tqreplace( "<", "<" ); - text.tqreplace( "\"", """ ); - text.tqreplace( ">", ">" ); + text.replace( "&", "&" ); + text.replace( "<", "<" ); + text.replace( "\"", """ ); + text.replace( ">", ">" ); //TODO: Replace only the chars not present in the current encoding. TQString encoding = defaultEncoding(); @@ -4860,16 +4860,16 @@ void QuantaApp::slotPasteHTMLQuoted() for ( TQStringList::Iterator it = charList.begin(); it != charList.end(); ++it ) { TQString s = *it; - int begin = s.tqfind("(&#") + 3; + int begin = s.find("(&#") + 3; if (begin == 1) continue; - int length = s.tqfind(";)") - begin + 1; + int length = s.find(";)") - begin + 1; s = s.mid(begin, length - 1); bool ok; int code = s.toInt(&ok); if (!ok || code < 191) continue; - text.tqreplace(TQChar(code), TQString("&#%1;").tqarg(s)); + text.replace(TQChar(code), TQString("&#%1;").tqarg(s)); } } unsigned int line, col; @@ -5120,7 +5120,7 @@ void QuantaApp::slotFileClosed(Document *w) if (w) { KURL url = w->url(); - if (Project::ref()->hasProject() && Project::ref()->tqcontains(url)) + if (Project::ref()->hasProject() && Project::ref()->contains(url)) { KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); m_annotationOutput->writeAnnotations(QuantaCommon::qUrl(u), w->annotations()); @@ -5134,7 +5134,7 @@ void QuantaApp::slotCVSCommandExecuted(const TQString& command, const TQStringLi for (uint i = 0; i < files.count(); i++) { file = files[i]; - if (Project::ref()->tqcontains(KURL::fromPathOrURL(file))) + if (Project::ref()->contains(KURL::fromPathOrURL(file))) { emit eventHappened("after_" + command, file, TQString()); } diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index d188adee..15e1abdd 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -138,7 +138,7 @@ void QuantaInit::initQuanta() tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) { - if (tmpDirs[i].tqcontains("kde-")) + if (tmpDirs[i].contains("kde-")) tmpDir = tmpDirs[i]; } dir.mkdir(tmpDir + "quanta"); @@ -154,9 +154,9 @@ void QuantaInit::initQuanta() //defaultDocType must be read before the Project object is created!! m_config->setGroup("General Options"); qConfig.defaultDocType = m_config->readEntry("Default DTD",DEFAULT_DTD); - if (! DTDs::ref()->tqfind(qConfig.defaultDocType)) + if (! DTDs::ref()->find(qConfig.defaultDocType)) qConfig.defaultDocType = DEFAULT_DTD; - DTDs::ref()->tqfind("dtd"); //load on startup + DTDs::ref()->find("dtd"); //load on startup initView(); initDocument(); // after initView because of init of treeViews @@ -296,10 +296,10 @@ void QuantaInit::initQuanta() { s = t.readLine(); charList << i18n(s.utf8()); // line excluding '\n' - int begin = s.tqfind("(&") + 1; + int begin = s.find("(&") + 1; if (begin == 1) continue; - int length = s.tqfind(";)") - begin + 1; + int length = s.find(";)") - begin + 1; TQString s2 = s.mid(begin, length - 1); replacementMap[s[0].tqunicode()] = s2; } @@ -307,7 +307,7 @@ void QuantaInit::initQuanta() } TQString infoCss = tmpDir; - infoCss.tqreplace(TQRegExp("/quanta$"),""); + infoCss.replace(TQRegExp("/quanta$"),""); infoCss += "/info.css"; QExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss)); @@ -772,7 +772,7 @@ void QuantaInit::initActions() // Edit actions (void) new KAction( i18n( "Find in Files..." ), - SmallIcon("filetqfind"), CTRL+ALT+Key_F, + SmallIcon("filefind"), CTRL+ALT+Key_F, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ), TQT_TQOBJECT(ac), "find_in_files" ); @@ -1140,7 +1140,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) { // when quanta crashes and file autoreloading option is on // then if user restarts quanta, the backup copies will reload - TQString backedUpFileName = (*backedUpUrlsIt).left((*backedUpUrlsIt).tqfindRev(".")); //the filename without the PID + TQString backedUpFileName = (*backedUpUrlsIt).left((*backedUpUrlsIt).findRev(".")); //the filename without the PID bool notFound; TQString autosavedPath = searchPathListEntry(backedUpFileName, autosavedUrlsList, notFound); if (!autosavedPath.isEmpty()) //the current item was autosaved and is not in use by another Quanta @@ -1347,8 +1347,8 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) /** Retrieves hashed path from the name of a backup file */ TQString QuantaInit::retrieveHashedPath(const TQString& filename) { - int lastPoint = filename.tqfindRev("."); - int Ppos = filename.tqfind("P", lastPoint); + int lastPoint = filename.findRev("."); + int Ppos = filename.find("P", lastPoint); return filename.mid(lastPoint + 1, Ppos - lastPoint); } @@ -1358,10 +1358,10 @@ TQString QuantaInit::retrieveHashedPath(const TQString& filename) TQString QuantaInit::retrievePID(const TQString& filename) { TQString strPID = TQString(); - strPID = filename.mid(filename.tqfindRev("P") + 1); + strPID = filename.mid(filename.findRev("P") + 1); if (strPID.isEmpty()) - strPID = filename.mid(filename.tqfindRev("N") + 1); + strPID = filename.mid(filename.findRev("N") + 1); if (strPID.endsWith("U")) strPID = strPID.left(strPID.length() - 1); @@ -1569,7 +1569,7 @@ void QuantaInit::readAbbreviations() TQStringList::Iterator it; for (it = filenameList.begin(); it != filenameList.end(); ++it) { - int pos =(*it).tqfind('|'); + int pos =(*it).find('|'); TQString dirName = (*it).mid(pos + 1); TQString dtepName = (*it).left(pos); KURL dirURL(dirName); diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 4bebfcc3..aba09d7d 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -281,7 +281,7 @@ void QuantaDoc::slotAttribPopup() { name = list->at(i)->name; attribMenu->insertItem( name , i);//list->findIndex(*item) ); - if (attrList.tqcontains(name.ascii())) + if (attrList.contains(name.ascii())) { attribMenu->setItemEnabled( i , false ); } @@ -292,12 +292,12 @@ void QuantaDoc::slotAttribPopup() for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it) { TQPopupMenu* popUpMenu = new TQPopupMenu(attribMenu, (*it).latin1()); - AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it); + AttributeList *attrs = qtag->parentDTD->commonAttrs->find(*it); for (uint j = 0; j < attrs->count(); j++) { name = attrs->at(j)->name; popUpMenu->insertItem(name, ++menuId); - if (attrList.tqcontains(name.ascii())) + if (attrList.contains(name.ascii())) { popUpMenu->setItemEnabled( menuId , false ); } @@ -348,7 +348,7 @@ void QuantaDoc::slotInsertAttrib( int id ) TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName); for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it) { - AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it); + AttributeList *attrs = qtag->parentDTD->commonAttrs->find(*it); menuId += attrs->count(); if (id <= menuId) { diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 45b06603..dbbb6578 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -393,7 +393,7 @@ void QuantaView::slotSetSourceAndVPLLayout() KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" ); - if (m_document->defaultDTD()->name.tqcontains("HTML", false) == 0) + if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); @@ -442,7 +442,7 @@ void QuantaView::slotSetVPLOnlyLayout() KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" ); - if (m_document->defaultDTD()->name.tqcontains("HTML", false) == 0) + if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); @@ -1028,7 +1028,7 @@ void QuantaView::activated() //TEMP : If the activated document is not a (X)HTML document, disable smartTagInsertion //Will be removed when VPL will support every DTD KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion"); - if(action && m_document->defaultDTD()->name.tqcontains("HTML", false) == 0) + if(action && m_document->defaultDTD()->name.contains("HTML", false) == 0) { qConfig.smartTagInsertion = false; (static_cast<KToggleAction* >(action))->setChecked(false); diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index b2c598c6..eb7ef971 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -295,7 +295,7 @@ void ViewManager::slotCloseOtherTabs() Document *w = qView->document(); if (w) { - if (filesToSave.tqcontains(w->url())) + if (filesToSave.contains(w->url())) if (!qView->saveModified(false)) { return; //save aborted @@ -463,7 +463,7 @@ bool ViewManager::closeAll(bool createNew) Document *w = view->document(); if (w) { - if (filesToSave.tqcontains(w->url())) + if (filesToSave.contains(w->url())) if (!view->saveModified(false)) { emit filesClosed(false); @@ -604,7 +604,7 @@ void ViewManager::slotTabContextMenu(TQWidget *widget, const TQPoint& point) m_separatorVisible = true; m_tabPopup->insertSeparator(SEPARATOR_INDEX); } - if (Project::ref()->hasProject() && Project::ref()->tqcontains(w->url())) + if (Project::ref()->hasProject() && Project::ref()->contains(w->url())) m_tabPopup->setItemVisible(UPLOAD_ID, true); else m_tabPopup->setItemVisible(UPLOAD_ID, false); @@ -647,7 +647,7 @@ void ViewManager::slotTabContextMenu(TQWidget *widget, const TQPoint& point) m_tabPopup->insertSeparator(); m_cvsMenuId = m_tabPopup->insertItem(SmallIcon("cervisia"), i18n("CVS"), CVSService::ref()->menu()); } - if (Project::ref()->tqcontains(w->url())) + if (Project::ref()->contains(w->url())) CVSService::ref()->setRepository(Project::ref()->projectBaseURL().path()); else CVSService::ref()->setRepository(w->url().directory()); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 61a71be5..7145ab69 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -452,7 +452,7 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) fsize=qfile.size(); //html file size TQString mimetype = KMimeType::findByFileContent(nameForInfo)->name(); - if (mimetype.tqcontains("text")) + if (mimetype.contains("text")) { qfile.open(IO_ReadOnly); TQString imgname,imgpath; @@ -462,23 +462,23 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) { imgname = stream.readLine(); ct++; - position=imgname.tqfind("<img",0,false); //check for images + position=imgname.find("<img",0,false); //check for images if (position!=-1) { imgname.remove(0,position+4); - position=imgname.tqfind("src=",0,false); //extract images names + position=imgname.find("src=",0,false); //extract images names imgname.remove(0,position+4); if (imgname.startsWith("\"")) imgname.remove(0,1); if (imgname.startsWith("'")) imgname.remove(0,1); - position=imgname.tqfind(" ",0,false); + position=imgname.find(" ",0,false); if (position!=-1) imgname=imgname.left(position); - position=imgname.tqfind(">",0,false); + position=imgname.find(">",0,false); if (position!=-1) imgname=imgname.left(position); - position=imgname.tqfind("\"",0,false); + position=imgname.find("\"",0,false); if (position!=-1) imgname=imgname.left(position); - position=imgname.tqfind("'",0,false); + position=imgname.find("'",0,false); if (position!=-1) imgname=imgname.left(position); - if (!quantaFileProperties->imageList->tqfindItem(imgname,TQt::ExactMatch)) //check if image was already counted + if (!quantaFileProperties->imageList->findItem(imgname,TQt::ExactMatch)) //check if image was already counted { KURL v(KURL::fromPathOrURL( path ),imgname); imgpath=v.path(); @@ -499,7 +499,7 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").tqarg(fimgsize)); quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").tqarg(fsize+fimgsize)); } - else if (mimetype.tqcontains("image")) + else if (mimetype.contains("image")) { // assume it's an image file TQImage imagefile=TQImage(nameForInfo); quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height())); @@ -565,7 +565,7 @@ void BaseTreeView::slotOpenWithApplication() void BaseTreeView::slotOpenWithActivated(int id) { - if (m_pluginIds.tqcontains(id)) + if (m_pluginIds.contains(id)) { QuantaPlugin *plugin = m_pluginIds[id]; plugin->unload(true); diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 0541b25b..99f1f4bd 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -138,11 +138,11 @@ void DocTreeView::clickItem( TQListViewItem *) TQString * DocTreeView::contextHelp(const TQString &keyword) { - TQString word = keyword.mid(keyword.tqfind("|")); - if (contextHelpDict->tqfind(keyword)) - return contextHelpDict->tqfind(keyword); + TQString word = keyword.mid(keyword.find("|")); + if (contextHelpDict->find(keyword)) + return contextHelpDict->find(keyword); else - return contextHelpDict->tqfind(word); //to support old documentation packages + return contextHelpDict->find(word); //to support old documentation packages } void DocTreeView::slotDoubleClicked(TQListViewItem *item ) @@ -156,7 +156,7 @@ void DocTreeView::slotDoubleClicked(TQListViewItem *item ) void DocTreeView::slotAddProjectDoc(const KURL& url) { TQString path = url.path(); - int pos = path.tqfind("/doc/"); + int pos = path.find("/doc/"); path = path.mid(pos + 5); new DocItem(projectDocFolder, path, url.url()); } diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 6aaca415..4008d408 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -59,7 +59,7 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *na { url = KURL(); QuantaCommon::setUrl(url, topStrList[i]); - if (!topURLList.tqcontains(url)) + if (!topURLList.contains(url)) { topURLList.append(url); if (i < topStrAliasList.count()) @@ -74,11 +74,11 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *na { url = KURL(); url.setPath("/"); - if (!topURLList.tqcontains(url)) + if (!topURLList.contains(url)) topURLList.append(url); url = KURL(); url.setPath(QExtFileInfo::homeDirPath() + "/"); - if (!topURLList.tqcontains(url)) + if (!topURLList.contains(url)) topURLList.append(url); } @@ -161,7 +161,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url) TQString s = url.fileName(); if (s.isEmpty()) s = "/"; - if (topURLAliases.tqcontains(url.url())) + if (topURLAliases.contains(url.url())) s = topURLAliases[url.url()]; s += " [" + url.prettyURL() + "]"; newBrnch = new BaseTreeBranch(this, url, s, SmallIcon(fileItem.iconName()), true); @@ -180,7 +180,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ Q_UNUSED(listView); #ifdef ENABLE_CVSSERVICE KURL url = currentURL(); - if (Project::ref()->tqcontains(url)) + if (Project::ref()->contains(url)) CVSService::ref()->setRepository(Project::ref()->projectBaseURL().path()); else CVSService::ref()->setRepository(url.directory()); @@ -227,7 +227,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ { m_folderMenu->changeItem( m_menuTop, i18n("&Add Folder to Top")); url.adjustPath(+1); - m_folderMenu->setItemVisible(m_menuTop, (topURLList.tqfindIndex(url) == -1)); + m_folderMenu->setItemVisible(m_menuTop, (topURLList.findIndex(url) == -1)); m_folderMenu->setItemVisible(m_reloadMenuId, false); } m_folderMenu->popup( point); @@ -251,7 +251,7 @@ void FilesTreeView::slotAddToTop() url.adjustPath(+1); if ( curItem != curItem->branch()->root() ) //it is not a top folder { // add - if (topURLList.tqfindIndex(url) == -1) + if (topURLList.findIndex(url) == -1) { topURLList.append(url); bool ok; @@ -277,7 +277,7 @@ void FilesTreeView::slotNewTopFolder() KURL url = KFileDialog::getExistingURL(TQString(), this, i18n("Choose Local or Remote Folder")); if (url.isEmpty()) return; url.adjustPath(+1); - if (topURLList.tqfindIndex(url) == -1) + if (topURLList.findIndex(url) == -1) { bool ok; TQString aliasName = KInputDialog::getText(i18n("Set Alias"), i18n("Alternative folder name:"), url.fileName(), &ok, this); @@ -313,13 +313,13 @@ void FilesTreeView::slotChangeAlias() url.adjustPath(+1); if ( curItem == curItem->branch()->root() ) //it is not a top folder { - if (topURLList.tqfindIndex(url) != -1) + if (topURLList.findIndex(url) != -1) { bool ok; TQString aliasName = KInputDialog::getText(i18n("Change Alias"), i18n("Alternative folder name:"), topURLAliases[url.url()], &ok, this); if (ok) { - topURLAliases.tqreplace(url.url(), aliasName); + topURLAliases.replace(url.url(), aliasName); removeBranch(curItem->branch()); newBranch(url); } diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 21c3f345..8508b452 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -90,7 +90,7 @@ KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqpa // we assume there are childs tvi->setExpandable(tvi->isDir()); if (urlList) { - tvi->setVisible(urlList->tqcontains(fileItem->url())); // only listelements + tvi->setVisible(urlList->contains(fileItem->url())); // only listelements } } } @@ -261,7 +261,7 @@ void ProjectTreeView::slotMenu(KListView *listView, TQListViewItem *item, const m_fileMenu->popup(point); } else { - if (m_documentFolderList.tqcontains(url)) + if (m_documentFolderList.contains(url)) m_folderMenu->setItemChecked(m_setDocumentRootId, true); else m_folderMenu->setItemChecked(m_setDocumentRootId, false); @@ -345,7 +345,7 @@ void ProjectTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, for ( ; iter.current(); ++iter ) { item = dynamic_cast <KFileTreeViewItem*> (iter.current()); - item->setVisible(m_projectFiles->tqcontains(item->url()) || item == rootItem); + item->setVisible(m_projectFiles->contains(item->url()) || item == rootItem); } rootItem->setEnabled(true); } @@ -525,7 +525,7 @@ void ProjectTreeView::slotAlwaysUpload() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL) + if (m_projectFiles->contains(url) || url == m_projectBaseURL) { emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); } @@ -539,7 +539,7 @@ void ProjectTreeView::slotNeverUpload() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL) + if (m_projectFiles->contains(url) || url == m_projectBaseURL) { emit changeUploadtqStatus(url, ProjectURL::NeverUpload); } @@ -553,7 +553,7 @@ void ProjectTreeView::slotConfirmUpload() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL) + if (m_projectFiles->contains(url) || url == m_projectBaseURL) { emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload); } @@ -570,7 +570,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - ProjectURL *proUrl = m_projectFiles->tqfind( url ); + ProjectURL *proUrl = m_projectFiles->find( url ); if (proUrl) { switch (proUrl->uploadtqStatus) @@ -603,7 +603,7 @@ void ProjectTreeView::slotChangeDocumentFoldertqStatus() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (!m_documentFolderList.tqcontains(currentURL())) + if (!m_documentFolderList.contains(currentURL())) { m_documentFolderList.append(currentURL()); emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); @@ -618,7 +618,7 @@ void ProjectTreeView::slotChangeDocumentFoldertqStatus() bool ProjectTreeView::isDocumentFolder(const KURL &url) { - return (m_documentFolderList.tqcontains(url) > 0); + return (m_documentFolderList.contains(url) > 0); } diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 1652cf18..55b36c81 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -224,8 +224,8 @@ void ScriptTreeView::slotAssignAction() TQString execApp = infoOptionValue(infoURL, "interpreter"); if (execApp.isEmpty()) execApp = "sh"; - url.setPath(url.path().tqreplace(locateLocal("data", resourceDir + "scripts/"), "%scriptdir/")); - url.setPath(url.path().tqreplace(qConfig.globalDataDir + resourceDir + "scripts/", "%scriptdir/")); + url.setPath(url.path().replace(locateLocal("data", resourceDir + "scripts/"), "%scriptdir/")); + url.setPath(url.path().replace(qConfig.globalDataDir + resourceDir + "scripts/", "%scriptdir/")); emit assignActionToScript(url, execApp); } } diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 1543c37d..22c2407d 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -49,7 +49,7 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, KURL relURL = baseURL; relURL.setPath(QExtFileInfo::toRelative(url(), branch()->url()).path()); KURL url = QExtFileInfo::toAbsolute(relURL, baseURL); - if ( !Project::ref()->tqcontains(url) ) + if ( !Project::ref()->contains(url) ) { TQFont f = p->font(); f.setItalic(true); diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index fbd41228..fb0573a4 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -111,7 +111,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper(); int line, col; node->tag->beginPos(line, col); - if (parentTQTag && !parentTQTag->childTags.tqcontains(qTagName) && + if (parentTQTag && !parentTQTag->childTags.contains(qTagName) && !parentTQTag->childTags.isEmpty()) { node->tag->write()->setErrorMark(line); @@ -143,7 +143,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri { title = tag->tagStr(); title = title.left(70).stripWhiteSpace(); - title.tqreplace( nbspRx," "); + title.replace( nbspRx," "); break; } case Tag::Comment: @@ -151,7 +151,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri setPixmap( 0, UserIcon("tag_comm") ); title = tag->tagStr(); title = title.left(70).stripWhiteSpace(); - title.tqreplace( nbspRx," "); + title.replace( nbspRx," "); break; } case Tag::ScriptTag: @@ -195,7 +195,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQStri title = a_title; } - title.tqreplace(newLineRx," "); + title.replace(newLineRx," "); setText(0, title); node->listItems.append(this); } @@ -213,5 +213,5 @@ StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title ) StructTreeTag::~StructTreeTag(){ if (node) - node->listItems.remove(node->listItems.tqfind(this)); + node->listItems.remove(node->listItems.find(this)); } diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index f2154208..c6c23fde 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -236,14 +236,14 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) for (TQValueList<GroupElement*>::ConstIterator it = currentNode->m_groupElements.constBegin(); it != currentNode->m_groupElements.constEnd(); ++it) { GroupElement *groupElement = (*it); - if (!groupIds.tqcontains(groupElement->group->name + dtd->name)) + if (!groupIds.contains(groupElement->group->name + dtd->name)) continue; StructTreeTag *groupItem = groups[groupIds[groupElement->group->name + dtd->name]]; TQListViewItem* insertAfter = 0L; TQListViewItem* insertUnder = groupItem; - if (groupItems.tqcontains(groupElement->group->name + groupElement->tag->name)) + if (groupItems.contains(groupElement->group->name + groupElement->tag->name)) insertUnder = groupItems[groupElement->group->name + groupElement->tag->name]; - if (lastItemInGroup.tqcontains(groupElement->group->name)) + if (lastItemInGroup.contains(groupElement->group->name)) insertAfter = lastItemInGroup[groupElement->group->name]; StructTreeTag *item = new StructTreeTag(static_cast<StructTreeTag*>(insertUnder), currentNode, groupElement->tag->name, insertAfter); @@ -979,7 +979,7 @@ void StructTreeView::setParsingDTDs(const TQStringList &parsingDTDList) if (dtdList[i] == dtdNickName) dtdMenu->setItemChecked(i, true); } - m_parsingDTDList.append(DTDs::ref()->tqfind(*it)); + m_parsingDTDList.append(DTDs::ref()->find(*it)); } } diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 0d80311a..1483e98d 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -395,7 +395,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* tqp if (!attr->interface.isEmpty()) interface = attr->interface; TQString arguments = attr->arguments; - arguments.tqreplace("%tagname%", node->tag->name); + arguments.replace("%tagname%", node->tag->name); DCOPReply reply = QuantaCommon::callDCOPMethod(interface, attr->method, arguments); if (reply.isValid()) { @@ -434,7 +434,7 @@ void AttributeListItem::showEditor(int) Attribute *attr = qTag->attribute(text(0)); if (attr) { - index = attr->values.tqfindIndex(text(1)); + index = attr->values.findIndex(text(1)); } } if (index != -1) diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 981aea04..d143caa7 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -333,7 +333,7 @@ void TagAttributeTree::setCurrentNode(Node *node) for (uint i = 0; i < qTag->commonGroups.count(); i++) { group = new TopLevelItem(this, group, i18n(qTag->commonGroups[i].utf8())); - AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->tqfind(qTag->commonGroups[i]); + AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->find(qTag->commonGroups[i]); for (uint j = 0; j < groupAttrs->count(); j++) { Attribute *attr = groupAttrs->at(j); diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 2f061462..51928bcf 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -285,13 +285,13 @@ void TemplatesTreeView::slotMenu(KListView*, TQListViewItem *item, const TQPoint TQString menuText = ""; - if (m_dirInfo.mimeType.upper().tqcontains("TEXT")) + if (m_dirInfo.mimeType.upper().contains("TEXT")) menuText = i18n(textMenu.utf8()); - else if (m_dirInfo.mimeType.upper().tqcontains("FILE")) + else if (m_dirInfo.mimeType.upper().contains("FILE")) menuText = i18n(binaryMenu.utf8()); - else if (m_dirInfo.mimeType.upper().tqcontains("TEMPLATE")) + else if (m_dirInfo.mimeType.upper().contains("TEMPLATE")) menuText = i18n(docMenu.utf8()); - else if (m_dirInfo.mimeType.upper().tqcontains("SITE")) + else if (m_dirInfo.mimeType.upper().contains("SITE")) menuText = i18n(siteMenu.utf8()); if (menuText.isEmpty()) @@ -350,17 +350,17 @@ void TemplatesTreeView::slotSelectFile(TQListViewItem *item) if ( !kftvItem->isDir() ) { m_dirInfo = readDirInfo(); -/* if (m_dirInfo.mimeType.upper().tqcontains("SITE")) +/* if (m_dirInfo.mimeType.upper().contains("SITE")) { slotExtractSiteTemplate(); return; }*/ if (expandArchiv(kftvItem)) return; - if (m_dirInfo.mimeType.upper().tqcontains("TEXT")) + if (m_dirInfo.mimeType.upper().contains("TEXT")) slotInsertInDocument(); - else if (m_dirInfo.mimeType.upper().tqcontains("FILE")) + else if (m_dirInfo.mimeType.upper().contains("FILE")) slotInsertTag(); - else if (m_dirInfo.mimeType.upper().tqcontains("TEMPLATE")) + else if (m_dirInfo.mimeType.upper().contains("TEMPLATE")) slotNewDocument(); } } @@ -652,7 +652,7 @@ void TemplatesTreeView::slotProperties() TQString type = el.attribute("type", "tag"); if (type == "script") { - tmpStr = action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""); + tmpStr = action->text().replace(TQRegExp("\\&(?!\\&)"),""); m_quantaProperties->actionCombo->insertItem(tmpStr); if (tmpStr == name) pos = j; @@ -783,7 +783,7 @@ void TemplatesTreeView::slotDragInsert(TQDropEvent *e) { if(m_dirInfo.mimeType == "text/all") // default to inserting in document { - if(!mimeType.tqcontains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) + if(!mimeType.contains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) { return; } @@ -798,7 +798,7 @@ void TemplatesTreeView::slotDragInsert(TQDropEvent *e) else if(m_dirInfo.mimeType == "template/all") { - if(!mimeType.tqcontains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) + if(!mimeType.contains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) { return; } @@ -911,7 +911,7 @@ KURL TemplatesTreeView::filterTemplate() TQDomElement el = action->data(); TQString type = el.attribute("type", "tag"); tmpStr = action->text(); - tmpStr.tqreplace(TQRegExp("\\&(?!\\&)"),""); + tmpStr.replace(TQRegExp("\\&(?!\\&)"),""); if (type == "script" && tmpStr == name) { filterAction = action; diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 3b07b112..4318a096 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -276,7 +276,7 @@ TQListViewItem* UploadTreeView::findItem(const TQString& path ) TQString item = path; UploadTreeFolder *it = 0; int i; - while ( ( i = item.tqfind('/') ) >= 0 ) + while ( ( i = item.find('/') ) >= 0 ) { it = findFolder( it, item.left(i) ); if ( it == 0 ) @@ -306,7 +306,7 @@ UploadTreeFile* UploadTreeView::addItem(const KURL &a_url, const KFileItem& a_fi uint col = 0; UploadTreeFolder *it = 0; KURL u; - while ( ( i = item.tqfind('/', col) ) >= 0 ) + while ( ( i = item.find('/', col) ) >= 0 ) { if ( i!=0 ) { diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index 52be21ba..f41384c1 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -76,7 +76,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 return; EventActions *events = Project::ref()->events(); if (!events) return; - if (events->tqcontains(name)) + if (events->contains(name)) { m_eventName = name; TQValueList<EventAction> evList = (*events)[name]; @@ -96,7 +96,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 KURL url2 = KURL::fromPathOrURL(argument2); if (url.isValid()) { - bool inProject = Project::ref()->tqcontains(url); + bool inProject = Project::ref()->contains(url); if (inProject) { if (name == "upload_requested") @@ -220,7 +220,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 } } } - if (!m_eventNames.tqcontains(name)) + if (!m_eventNames.contains(name)) KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").tqarg(name), i18n("Event Handling Error")); } @@ -346,7 +346,7 @@ bool QPEvents::handleEvent(const EventAction& ev) TQString QPEvents::fullEventName(const TQString &name) { - if (m_eventNames.tqcontains(name)) + if (m_eventNames.contains(name)) return m_eventNames[name]; else return name; @@ -354,7 +354,7 @@ TQString QPEvents::fullEventName(const TQString &name) TQString QPEvents::fullActionName(const TQString& name) { - if (m_actionNames.tqcontains(name)) + if (m_actionNames.contains(name)) return m_actionNames[name]; else return name; diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 9b91220d..ad0f3327 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -182,14 +182,14 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse TQString bText = KStringHandler::rEmSqueeze ( doc->editIf->textLine( (*it)->line ), menu.fontMetrics(), 32 ); - bText.tqreplace(re, "&&"); // kill undesired accellerators! - bText.tqreplace('\t', ' '); // kill tabs, as they are interpreted as shortcuts + bText.replace(re, "&&"); // kill undesired accellerators! + bText.replace('\t', ' '); // kill tabs, as they are interpreted as shortcuts if ( m_sorting == Position ) { sortArray[i] = (*it)->line; ssort( sortArray, i ); - idx = sortArray.tqfind( (*it)->line ); + idx = sortArray.find( (*it)->line ); if (insertNavigationItems) idx += 3; i++; @@ -396,4 +396,4 @@ void QuantaBookmarks::marksChanged () #include "quantabookmarks.moc" -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h index 7dac33d5..a613aa9c 100644 --- a/quanta/utility/quantabookmarks.h +++ b/quanta/utility/quantabookmarks.h @@ -96,5 +96,5 @@ class QuantaBookmarks : public TQObject #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; // vim: noet ts=2 diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index 7846fa15..bc279dc9 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -144,11 +144,11 @@ bool QuantaCommon::isSingleTag(const TQString& dtdName, const TQString& tag) if(tag.lower() == "!doctype" || tag.lower() == "?xml") return true; - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - TQTag* qtag = dtd->tagsList->tqfind(searchForTag); + TQTag* qtag = dtd->tagsList->find(searchForTag); if (qtag) single = qtag->isSingle(); } @@ -161,11 +161,11 @@ bool QuantaCommon::isOptionalTag(const TQString& dtdName, const TQString& tag) { bool optional = false; - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - TQTag* qtag = dtd->tagsList->tqfind(searchForTag); + TQTag* qtag = dtd->tagsList->find(searchForTag); if (qtag) optional = qtag->isOptional(); } @@ -177,11 +177,11 @@ bool QuantaCommon::isKnownTag(const TQString& dtdName, const TQString& tag) { bool known = false; - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - if (dtd->tagsList->tqfind(searchForTag)) + if (dtd->tagsList->find(searchForTag)) known = true; } @@ -192,11 +192,11 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri { AttributeList* attrs = 0L; - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct* dtd = DTDs::ref()->find(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - TQTag* qtag = dtd->tagsList->tqfind(searchForTag); + TQTag* qtag = dtd->tagsList->find(searchForTag); if (qtag) attrs = qtag->attributes(); } @@ -207,7 +207,7 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri /** Returns the TQTag object for the tag "tag" from the DTD named "dtdname". */ TQTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag) { - const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + const DTDStruct* dtd = DTDs::ref()->find(dtdName); return tagFromDTD(dtd, tag); } @@ -218,7 +218,7 @@ TQTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag) if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - qtag = dtd->tagsList->tqfind(searchForTag); + qtag = dtd->tagsList->find(searchForTag); } return qtag; @@ -311,7 +311,7 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const TQString& group) mimetype = mimetype.section('/',-1); for ( it = list.begin(); it != list.end(); ++it ) { - if ( ((*it)->name().tqcontains(group)) && ((*it)->name().tqfind(mimetype) != -1) + if ( ((*it)->name().contains(group)) && ((*it)->name().find(mimetype) != -1) ) { status = true; break; @@ -410,7 +410,7 @@ TQString QuantaCommon::makeRxCompatible(const TQString& s) TQString str = s; for (uint i = 0; i < max - 1; i++) { - str.tqreplace(rxs[i], strs[i]); + str.replace(rxs[i], strs[i]); } return str; @@ -488,7 +488,7 @@ void QuantaCommon::removeCommentsAndQuotes(TQString &str, const DTDStruct *dtd) } else { s = dtd->comments[s]; - l = str.tqfind(s, pos); + l = str.find(s, pos); l = (l == -1) ? str.length() : l; for (int i = pos; i < l ; i++) { @@ -554,7 +554,7 @@ bool QuantaCommon::insideCommentsOrQuotes(int position, const TQString &string, } else { s = dtd->comments[s]; - l = str.tqfind(s, pos); + l = str.find(s, pos); l = (l == -1) ? str.length() : l; for (int i = pos; i < l ; i++) { @@ -633,12 +633,12 @@ void QuantaCommon::normalizeStructure(TQString f,TQStringList& l) f.remove("\n"); f.remove("\r"); - while(f.tqcontains("<")) + while(f.contains("<")) { TQString z(f); - z.truncate(z.tqfind(">")+1); - z.remove(0,z.tqfind("<")); - f.remove(0,f.tqfind(">")+1); + z.truncate(z.find(">")+1); + z.remove(0,z.find("<")); + f.remove(0,f.find(">")+1); l.append(z); } } @@ -745,7 +745,7 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey) TQString QuantaCommon::encodedChar(uint code) { - if (replacementMap.tqcontains(code)) + if (replacementMap.contains(code)) return TQString("%1;").tqarg(replacementMap[code]); else return TQString("&#%1;").tqarg(code); diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index ec110499..5486c352 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -176,7 +176,7 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b if ( !Project::ref()->hasProject()) return; KURL saveUrl = adjustURL(target); KURL baseURL = Project::ref()->projectBaseURL(); - if ( baseURL.isParentOf(saveUrl) && !Project::ref()->tqcontains(saveUrl) ) + if ( baseURL.isParentOf(saveUrl) && !Project::ref()->contains(saveUrl) ) { if (confirm) { @@ -201,7 +201,7 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool if ( !Project::ref()->hasProject() ) return true; KURL url = adjustURL(src); KURL baseURL = Project::ref()->projectBaseURL(); - if ( baseURL.isParentOf(url) && Project::ref()->tqcontains(url) ) + if ( baseURL.isParentOf(url) && Project::ref()->contains(url) ) { if (confirm) { @@ -224,7 +224,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co KURL url = adjustURL(src); if ( Project::ref()->hasProject() ) { - if ( Project::ref()->projectBaseURL().isParentOf(url) && Project::ref()->tqcontains(url) ) + if ( Project::ref()->projectBaseURL().isParentOf(url) && Project::ref()->contains(url) ) { if (confirm) { diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 3030d661..a4a58a43 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -332,16 +332,16 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto TQString fname = w->url().url(); if ( w->url().protocol() == "file") fname = w->url().path(); - command.tqreplace("%f", fname ); + command.replace("%f", fname ); } pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.tqreplace("%pid", TQString("unique %1").tqarg(pid)); + command.replace("%pid", TQString("unique %1").tqarg(pid)); } else { - command.tqreplace("%pid", TQString("%1").tqarg(pid)); + command.replace("%pid", TQString("%1").tqarg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -352,9 +352,9 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto if ( inputType == "selected" && w->selectionIf) { buffer = w->selectionIf->selection(); } - command.tqreplace("%input", buffer); + command.replace("%input", buffer); command = command.stripWhiteSpace(); - int pos = command.tqfind(' '); + int pos = command.find(' '); TQString args; if (pos != -1) { @@ -374,46 +374,46 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto pos = 0; while (pos != -1 ) { - pos = args.tqfind("%scriptdir"); + pos = args.find("%scriptdir"); TQString scriptname; if (pos != -1) { - int begin = args.tqfindRev('"', pos); + int begin = args.findRev('"', pos); int end = -1; if (begin == -1) { - begin = args.tqfindRev('\'', pos); + begin = args.findRev('\'', pos); if (begin != -1) - end = args.tqfind('\'', pos); + end = args.find('\'', pos); } else { - end = args.tqfind('"', pos); + end = args.find('"', pos); } if (begin == -1 || end != -1) { - begin = args.tqfindRev(' ', pos); + begin = args.findRev(' ', pos); if (begin == -1) begin = 0; - end = args.tqfind(' ', pos); + end = args.find(' ', pos); if (end == -1) end = args.length(); } scriptname = args.mid(begin, end - begin).stripWhiteSpace(); - scriptname.tqreplace("%scriptdir","scripts"); + scriptname.replace("%scriptdir","scripts"); // kdDebug(24000) << "Script name is: |" << scriptname << "|" << endl; scriptname = " " + locate("appdata", scriptname); // kdDebug(24000) << "Script found at: " << scriptname << endl; - args.tqreplace(begin, end - begin, scriptname); + args.replace(begin, end - begin, scriptname); // kdDebug(24000) << "Modified argument list: " << args << endl; } } - int pos = args.tqfind("%projectbase"); + int pos = args.find("%projectbase"); if (pos != -1) { TQString s; if (Project::ref()->hasProject()) s = Project::ref()->projectBaseURL().url(); - args.tqreplace("%projectbase", s); + args.replace("%projectbase", s); } TQStringList argsList1 = TQStringList::split(' ', args); TQStringList argsList; @@ -586,16 +586,16 @@ bool TagAction::slotActionActivated() TQString fname = w->url().url(); if ( w->url().protocol() == "file") fname = w->url().path(); - command.tqreplace("%f", fname ); + command.replace("%f", fname ); } pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.tqreplace("%pid", TQString("unique %1").tqarg(pid)); + command.replace("%pid", TQString("unique %1").tqarg(pid)); } else { - command.tqreplace("%pid", TQString("%1").tqarg(pid)); + command.replace("%pid", TQString("%1").tqarg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -606,9 +606,9 @@ bool TagAction::slotActionActivated() if ( inputType == "selected" && w->selectionIf) { buffer = w->selectionIf->selection(); } - command.tqreplace("%input", buffer); + command.replace("%input", buffer); command = command.stripWhiteSpace(); - int pos = command.tqfind(' '); + int pos = command.find(' '); TQString args; if (pos != -1) { @@ -628,46 +628,46 @@ bool TagAction::slotActionActivated() pos = 0; while (pos != -1 ) { - pos = args.tqfind("%scriptdir"); + pos = args.find("%scriptdir"); TQString scriptname; if (pos != -1) { - int begin = args.tqfindRev('"', pos); + int begin = args.findRev('"', pos); int end = -1; if (begin == -1) { - begin = args.tqfindRev('\'', pos); + begin = args.findRev('\'', pos); if (begin != -1) - end = args.tqfind('\'', pos); + end = args.find('\'', pos); } else { - end = args.tqfind('"', pos); + end = args.find('"', pos); } if (begin == -1 || end != -1) { - begin = args.tqfindRev(' ', pos); + begin = args.findRev(' ', pos); if (begin == -1) begin = 0; - end = args.tqfind(' ', pos); + end = args.find(' ', pos); if (end == -1) end = args.length(); } scriptname = args.mid(begin, end - begin).stripWhiteSpace(); - scriptname.tqreplace("%scriptdir","scripts"); + scriptname.replace("%scriptdir","scripts"); // kdDebug(24000) << "Script name is: |" << scriptname << "|" << endl; scriptname = " " + locate("appdata", scriptname); // kdDebug(24000) << "Script found at: " << scriptname << endl; - args.tqreplace(begin, end - begin, scriptname); + args.replace(begin, end - begin, scriptname); // kdDebug(24000) << "Modified argument list: " << args << endl; } } - int pos = args.tqfind("%projectbase"); + int pos = args.find("%projectbase"); if (pos != -1) { TQString s; if (Project::ref()->hasProject()) s = Project::ref()->projectBaseURL().url(); - args.tqreplace("%projectbase", s); + args.replace("%projectbase", s); } TQStringList argsList1 = TQStringList::split(' ', args); TQStringList argsList; @@ -767,7 +767,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen ) } w->insertTag( text ); } else - if ( scriptOutputDest == "tqreplace" ) + if ( scriptOutputDest == "replace" ) { if ( firstOutput ) w->editIf->clear(); @@ -827,7 +827,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen ) } w->insertTag( text ); } else - if ( scriptErrorDest == "tqreplace" ) + if ( scriptErrorDest == "replace" ) { if ( firstError ) w->editIf->clear(); @@ -874,7 +874,7 @@ void TagAction::setInputFileName(const TQString& fileName) TQString TagAction::actionText() { TQString t = tag.attribute("text"); - int pos = t.tqfind('&'); + int pos = t.find('&'); if (pos < (int)t.length()-1 && t[pos+1] != '&') return t.remove(pos, 1); else diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index b11525ec..88eb0d08 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -78,6 +78,6 @@ void TagActionManager::fillWithTagActions(TQWidget* widget, DOM::Node const& nod bool TagActionManager::canIndentDTD(TQString const& dtd) { - return (dtd.tqcontains("HTML", false) || - dtd.tqcontains("XML", false)); + return (dtd.contains("HTML", false) || + dtd.contains("XML", false)); } diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 90602623..d519faf3 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -118,7 +118,7 @@ TQString ToolbarTabWidget::id(int index) const TQWidget* ToolbarTabWidget::page(const TQString& id) { - TQWidget *w = toolbarList.tqfind(id).data(); + TQWidget *w = toolbarList.find(id).data(); return w; } @@ -169,7 +169,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e ) TQRect r = tab->rect(); TQPoint p1 = mapToGlobal(r.topLeft()); TQPoint p2 = mapToGlobal(r.bottomRight()); - if (TQRect(p1, p2).tqcontains(p)) + if (TQRect(p1, p2).contains(p)) break; else tab = 0L; @@ -313,11 +313,11 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i))); TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); - if (TQRect(p1, p2).tqcontains(p)) + if (TQRect(p1, p2).contains(p)) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.tqreplace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); m_popupMenu->insertItem(i18n("Edit Action - %1").tqarg(actionName), this, TQT_SLOT(slotEditAction())); break; } |