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 | 330c33ab6f97b279737bf9527c9add7bb1475450 (patch) | |
| tree | 85cb998d3077ae295d65944ebb4d0189fc660ead | |
| parent | 093de0db4fea89b3f94a2359c6981f353d035eb7 (diff) | |
| download | tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.tar.gz tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
390 files changed, 2069 insertions, 2069 deletions
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index d747eb00..427f7505 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -249,7 +249,7 @@ TQString AdaProjectPart::mainSource() const void AdaProjectPart::setMainSource(TQString fullPath) { TQString olddir = activeDirectory(); - m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } @@ -266,7 +266,7 @@ TQString AdaProjectPart::projectName() const TQString AdaProjectPart::activeDirectory() const { TQFileInfo fi(mainSource()); - return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),""); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } TQString AdaProjectPart::buildDirectory() const diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index f00a0bb1..1b32c5e8 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -94,7 +94,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config ) ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } void AdaProjectOptionsDlg::readConfig( TQString config ) @@ -128,8 +128,8 @@ void AdaProjectOptionsDlg::readConfig( TQString config ) void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); - bool canRemove = allConfigs.tqcontains(config) && config != "default"; + bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); + bool canRemove = allConfigs.contains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -137,7 +137,7 @@ void AdaProjectOptionsDlg::configComboTextChanged(const TQString &config) void AdaProjectOptionsDlg::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.tqcontains(config)) + if (config == currentConfig || !allConfigs.contains(config)) return; if (!currentConfig.isNull() && dirty) diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index 84ad0a5e..4d95f523 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -229,7 +229,7 @@ TQString AntProjectPart::runDirectory() const if ( directoryRadioString == "custom" ) return DomUtil::readEntry(dom, "/kdevantproject/run/customdirectory"); - int pos = DomMainProgram.tqfindRev('/'); + int pos = DomMainProgram.findRev('/'); if (pos != -1) return buildDirectory() + "/" + DomMainProgram.left(pos); @@ -529,11 +529,11 @@ void AntProjectPart::optionsAccepted() for (int i=0; i<m_antOptionsWidget->Properties->numRows(); ++i) { TQString key = m_antOptionsWidget->Properties->text(i,0); - m_antOptions.m_properties.tqreplace(key, m_antOptionsWidget->Properties->text(i,1)); + m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1)); kdDebug() << "PROP: " << key << " = " << m_antOptionsWidget->Properties->text(i,1); TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0); - m_antOptions.m_defineProperties.tqreplace(key, item->isChecked()); + m_antOptions.m_defineProperties.replace(key, item->isChecked()); } m_classPath = m_classPathWidget->ClassPath->items(); @@ -554,7 +554,7 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context) return; m_contextFileName = url.fileName(); - bool inProject = project()->allFiles().tqcontains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) ); + bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) ); TQString popupstr = TQFileInfo(m_contextFileName).fileName(); if (m_contextFileName.startsWith(projectDirectory()+ "/")) m_contextFileName.remove(0, projectDirectory().length()+1); diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 19d400fb..eaca2161 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -186,7 +186,7 @@ void AddExistingDirectoriesDialog::slotOk() TQString name = *it; // Adjust SUBDIRS variable in containing Makefile.am - if (m_spitem->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) + if (m_spitem->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( m_spitem->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) @@ -196,7 +196,7 @@ void AddExistingDirectoriesDialog::slotOk() subdirsfile.close(); } } - else if (m_spitem->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1) + else if (m_spitem->variables["SUBDIRS"].find("$(AUTODIRS)") != -1) { } else @@ -243,7 +243,7 @@ void AddExistingDirectoriesDialog::slotOk() if ( !m_part->isKDE() ) { TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = dir.path(); - TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); + TQString relpath = subdirectory.replace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -270,7 +270,7 @@ void AddExistingDirectoriesDialog::slotAddSelected() TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().tqcontains( relPath )) ) + if ( (relPath.isEmpty()) || (! m_widget->allSubprojects().contains( relPath )) ) { m_importList.append ( ( *it ) ); } @@ -288,7 +288,7 @@ void AddExistingDirectoriesDialog::slotAddAll() TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), ( *it )->url()); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) ) + if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) { m_importList.append ( ( *it ) ); } @@ -363,7 +363,7 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) TQString relPath = URLUtil::extractPathNameRelative(m_part->projectDirectory(), *it); if (relPath[relPath.length()-1] == '/') relPath = relPath.left(relPath.length()-1); - if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().tqcontains( relPath )) ) + if ( (relPath.isEmpty()) || ( ! m_widget->allSubprojects().contains( relPath )) ) { type = KMimeType::findByURL ( ( *it ) ); diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 407e5109..99e75ebf 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -68,7 +68,7 @@ AddFileDialog::~AddFileDialog() void AddFileDialog::accept() { TQString name = fileEdit->text(); - if (name.tqfind('/') != -1) { + if (name.find('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp index a53b2551..67903ebe 100644 --- a/buildtools/autotools/addservicedlg.cpp +++ b/buildtools/autotools/addservicedlg.cpp @@ -77,7 +77,7 @@ void AddServiceDialog::updateProperties() TQStringList stprops = type->propertyDefNames(); TQStringList::ConstIterator stit; for (stit = stprops.begin(); stit != stprops.end(); ++stit) - if (props.tqfind(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" + if (props.find(*stit) == props.end() && (*stit) != "Name" && (*stit) != "Comment" && (*stit) != "Icon") props.append(*stit); } diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index bb0e5527..d9913af7 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -106,7 +106,7 @@ void AddSubprojectDialog::accept() } // Adjust SUBDIRS variable in containing Makefile.am - if (m_subProject->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) + if (m_subProject->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( m_subProject->path + "/subdirs" ); if ( subdirsfile.open( IO_WriteOnly | IO_Append ) ) @@ -116,7 +116,7 @@ void AddSubprojectDialog::accept() subdirsfile.close(); } } - else if (m_subProject->variables["SUBDIRS"].tqfind("$(AUTODIRS)") != -1) + else if (m_subProject->variables["SUBDIRS"].find("$(AUTODIRS)") != -1) { } else @@ -162,7 +162,7 @@ void AddSubprojectDialog::accept() if ( !m_part->isKDE() ) { TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = dir.path(); - TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); + TQString relpath = subdirectory.replace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 7002b7c8..6f1f56e8 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -587,7 +587,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file " "associated with the selected .ui.")); - if (!fitem->name.tqcontains(TQRegExp("ui$")) || fitem->is_subst == true) + if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true) { popup.removeItem(idUISubclasses); popup.removeItem(idViewUIH); @@ -625,7 +625,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, list << DomUtil::Pair(srcfile_relpath,uifile_relpath); DomUtil::writePairListEntry(dom, "/kdevautoproject/subclassing", "subclass", "sourcefile", "uifile", list); - newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(m_part->projectDirectory()+"/"),""); + newFileNames[i] = newFileNames[i].replace(TQRegExp(m_part->projectDirectory()+"/"),""); } m_subclasslist = DomUtil::readPairListEntry(dom,"/kdevautoproject/subclassing", "subclass","sourcefile", "uifile"); @@ -636,13 +636,13 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, { TQString noext = m_widget->selectedSubproject()->path + "/" + fitem->name; - if (noext.tqfindRev('.')>-1) - noext = noext.left(noext.tqfindRev('.')); + if (noext.findRev('.')>-1) + noext = noext.left(noext.findRev('.')); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if (uifile.tqfindRev('/')>-1) + if (uifile.findRev('/')>-1) { TQStringList uisplit = TQStringList::split('/',uifile); uifile=uisplit[uisplit.count()-1]; diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp index 3fb0bffd..6e96bd4f 100644 --- a/buildtools/autotools/autolistviewitems.cpp +++ b/buildtools/autotools/autolistviewitems.cpp @@ -167,7 +167,7 @@ void FileItem::changeMakefileEntry(const TQString& new_name) if ( SubprojectItem* subProject = lv->m_part->m_widget->selectedSubproject() ) { TQStringList sources = TQStringList::split(TQRegExp("[ \t\n]"), subProject->variables[varname]); - TQStringList::iterator it = sources.tqfind(name); + TQStringList::iterator it = sources.find(name); (*it) = new_name; subProject->variables[varname] = sources.join(" "); replaceMap.insert(varname, subProject->variables[varname]); diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index a2c500a4..15d6bc45 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -525,7 +525,7 @@ void AutoProjectPart::addFiles ( const TQStringList& fileList ) for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).tqfindRev('/'); + int pos = ( *it ).findRev('/'); if (pos != -1) { directory = ( *it ).left(pos); @@ -597,7 +597,7 @@ TQString AutoProjectPart::currentBuildConfig() const TQDomDocument &dom = *projectDom(); TQString config = DomUtil::readEntry(dom, "/kdevautoproject/general/useconfiguration"); - if (config.isEmpty() || !allBuildConfigs().tqcontains(config)) + if (config.isEmpty() || !allBuildConfigs().contains(config)) config = "default"; return config; @@ -732,13 +732,13 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr // These are the internal libraries dependency.remove("$(top_builddir)/"); - if( !alreadyScheduledDeps.tqcontains(*l2it) ) + if( !alreadyScheduledDeps.contains(*l2it) ) { alreadyScheduledDeps << *l2it; tdir = buildDirectory(); if (!tdir.endsWith("/") && !tdir.isEmpty()) tdir += "/"; - int pos = dependency.tqfindRev('/'); + int pos = dependency.findRev('/'); if (pos == -1) { tname = dependency; @@ -782,7 +782,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr tdir = buildDirectory(); if (!tdir.endsWith("/") && !tdir.isEmpty()) tdir += "/"; - int pos = dependency.tqfindRev('/'); + int pos = dependency.findRev('/'); if (pos == -1) { tname = dependency; @@ -1282,7 +1282,7 @@ void AutoProjectPart::slotBuildConfigAboutToShow() { TQStringList l = allBuildConfigs(); buildConfigAction->setItems(l); - buildConfigAction->setCurrentItem(l.tqfindIndex(currentBuildConfig())); + buildConfigAction->setCurrentItem(l.findIndex(currentBuildConfig())); } void AutoProjectPart::restorePartialProjectSession ( const TQDomElement* el ) @@ -1356,7 +1356,7 @@ bool AutoProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; @@ -1386,7 +1386,7 @@ TQStringList recursiveATFind( const TQString &currDir, const TQString &baseDir ) kdDebug(9020) << "Dir " << currDir << endl; TQStringList fileList; - if( !currDir.tqcontains( "/..") && !currDir.tqcontains("/.") ) + if( !currDir.contains( "/..") && !currDir.contains("/.") ) { TQDir dir(currDir); TQStringList dirList = dir.entryList(TQDir::Dirs ); diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 57b63573..ff89fe35 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -225,7 +225,7 @@ TQString AutoProjectWidget::pathForTarget(const TargetItem *titem) const { SubprojectItem* spitem = static_cast<SubprojectItem*>(it.current() ); kdDebug(9020) << "Checking: " << spitem->path << endl; - if (spitem->targets.tqcontainsRef(titem)) + if (spitem->targets.containsRef(titem)) { kdDebug(9020) << "Found it!" << endl; TQString relpath = (spitem->path).mid(prefixLen); @@ -405,7 +405,7 @@ void AutoProjectWidget::addFiles( const TQStringList &list ) for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).tqfindRev('/'); + int pos = ( *it ).findRev('/'); if (pos != -1) fileName = ( *it ).mid(pos+1); else @@ -652,7 +652,7 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name, FileItem *AutoProjectWidget::createFileItem( const TQString &name, SubprojectItem *subproject ) { bool is_subst; - if(name.tqfind("$(") == 0 || name.tqfind("${") == 0) + if(name.find("$(") == 0 || name.find("${") == 0) is_subst = true; else is_subst = false; diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index e1d15d90..f6d22a77 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -60,7 +60,7 @@ namespace AutoProjectPrivate bool isHeader( const TQString& fileName ) { - return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).tqcontains( TQFileInfo(fileName).extension(false) ); + return TQStringList::split( ";", "h;H;hh;hxx;hpp;tcc;h++" ).contains( TQFileInfo(fileName).extension(false) ); } static TQString cleanWhitespace( const TQString &str ) @@ -317,7 +317,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con } int id = popup.insertItem(it.key(), this, TQT_SLOT(slotCustomBuildCommand(int))); m_commandList.append(it.data()); - popup.setItemParameter(id, m_commandList.tqfindIndex(it.data())); + popup.setItemParameter(id, m_commandList.findIndex(it.data())); } popup.insertSeparator(); @@ -440,11 +440,11 @@ void AutoSubprojectView::slotRemoveSubproject() } TQStringList list = TQStringList::split( TQRegExp("[ \t]"), tqparent->variables["SUBDIRS"] ); - TQStringList::Iterator it = list.tqfind( spitem->subdir ); + TQStringList::Iterator it = list.find( spitem->subdir ); TQString subdirToRemove = spitem->subdir; bool topsubdirs = true; - if ((tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") == -1) - && (tqparent->variables["SUBDIRS"].tqfind("$(AUTODIRS)") == -1)) + if ((tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") == -1) + && (tqparent->variables["SUBDIRS"].find("$(AUTODIRS)") == -1)) { topsubdirs = false; if( it == list.end() ){ @@ -483,7 +483,7 @@ void AutoSubprojectView::slotRemoveSubproject() TQString projroot = m_part->projectDirectory() + "/"; TQString subdirectory = spitem->path; - TQString relpath = subdirectory.tqreplace(0, projroot.length(),""); + TQString relpath = subdirectory.replace(0, projroot.length(),""); TQString configureFile = m_part->getAutoConfFile(projroot); @@ -511,7 +511,7 @@ void AutoSubprojectView::slotRemoveSubproject() // Adjust SUBDIRS variable in containing Makefile.am - if (tqparent->variables["SUBDIRS"].tqfind("$(TOPSUBDIRS)") != -1) + if (tqparent->variables["SUBDIRS"].find("$(TOPSUBDIRS)") != -1) { TQFile subdirsfile( tqparent->path + "/subdirs" ); TQStringList topdirs; @@ -563,7 +563,7 @@ void AutoSubprojectView::parsePrimary( SubprojectItem *item, { // Parse line foo_bar = bla bla - int pos = lhs.tqfindRev( '_' ); + int pos = lhs.findRev( '_' ); TQString prefix = lhs.left( pos ); TQString primary = lhs.right( lhs.length() - pos - 1 ); // kdDebug(9020) << "Prefix:" << prefix << ",Primary:" << primary << endl; @@ -707,7 +707,7 @@ void AutoSubprojectView::parseKDEICON( SubprojectItem *item, { // Parse a line foo_ICON = bla bla - int pos = lhs.tqfind( "_ICON" ); + int pos = lhs.find( "_ICON" ); TQString prefix = lhs.left( pos ); if ( prefix == "KDE" ) prefix = "kde_icon"; @@ -766,7 +766,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Take care of KDE hacks: // TOPSUBDIRS is an alias for all directories // listed in the subdirs file - if ( subdirs.tqfind( "$(TOPSUBDIRS)" ) != -1 ) + if ( subdirs.find( "$(TOPSUBDIRS)" ) != -1 ) { TQStringList dirs; TQFile subdirsfile( item->path + "/subdirs" ); @@ -795,18 +795,18 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, } } - subdirs.tqreplace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(TOPSUBDIRS\\)" ), dirs.join( " " ) ); } // AUTODIRS is an alias for all subdirectories - if ( subdirs.tqfind( "$(AUTODIRS)" ) != -1 ) + if ( subdirs.find( "$(AUTODIRS)" ) != -1 ) { TQDir d( item->path ); TQStringList dirs = d.entryList( TQDir::Dirs ); dirs.remove( "." ); dirs.remove( ".." ); dirs.remove( "CVS" ); - subdirs.tqreplace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); + subdirs.replace( TQRegExp( "\\$\\(AUTODIRS\\)" ), dirs.join( " " ) ); } // If there are any variables in the subdirs line then search @@ -822,7 +822,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -832,7 +832,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.tqreplace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); + subdirs.replace( TQRegExp( "\\$\\(\\s*" + varname + "\\s*\\)" ), varvalue ); } //search for AC_SUBST variables and try to replace them with variables @@ -847,7 +847,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, // Search the whole Makefile(.am?) // Note that if the variable isn't found it just disappears // (Perhaps we should add it back in this case?) - TQMap<TQString, TQString>::ConstIterator varit = item->variables.tqfind( varname ); + TQMap<TQString, TQString>::ConstIterator varit = item->variables.find( varname ); if ( varit != item->variables.end() ) { kdDebug( 9020 ) << "Found Makefile var " << varname << ", adding dirs <" << varit.data() << ">" << endl; @@ -857,7 +857,7 @@ void AutoSubprojectView::parseSUBDIRS( SubprojectItem *item, { kdDebug( 9020 ) << "Not found Makefile var " << varname << endl; } - subdirs.tqreplace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); + subdirs.replace( TQRegExp( "\\@" + varname + "\\@" ), varvalue ); } TQStringList l = TQStringList::split( TQRegExp( "[ \t]" ), subdirs ); @@ -914,7 +914,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) parseKDEDOCS( item, lhs, rhs ); else if ( lhs.right( 5 ) == "_ICON" ) parseKDEICON( item, lhs, rhs ); - else if ( lhs.tqfind( '_' ) > 0 ) + else if ( lhs.find( '_' ) > 0 ) parsePrimary( item, lhs, rhs ); else if ( lhs.right( 3 ) == "dir" ) parsePrefix( item, lhs, rhs ); @@ -937,7 +937,7 @@ void AutoSubprojectView::parse( SubprojectItem *item ) TQString fname = *fileIt; ++fileIt; - if( AutoProjectPrivate::isHeader(fname) && !headers.tqcontains(fname) ){ + if( AutoProjectPrivate::isHeader(fname) && !headers.contains(fname) ){ FileItem *fitem = m_widget->createFileItem( fname, item ); noinst_HEADERS_item->sources.append( fitem ); } diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index d09f0a7b..154b72b4 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -128,7 +128,7 @@ ChooseTargetDialog::ChooseTargetDialog ( AutoProjectWidget* widget, AutoProjectP for ( it = fileList.begin(); it != fileList.end(); ++it ) { - int pos = ( *it ).tqfindRev('/'); + int pos = ( *it ).findRev('/'); if (pos != -1) fileName = ( *it ).mid(pos+1); else @@ -246,7 +246,7 @@ void ChooseTargetDialog::slotOk() { bool found = false; - int pos = ( *it ).tqfindRev('/'); + int pos = ( *it ).findRev('/'); if (pos != -1) { directory = ( *it ).left(pos); diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index 1e877a5c..afb6f9b4 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -267,8 +267,8 @@ void ConfigureOptionsWidget::topsourcedirClicked() void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); - bool canRemove = allConfigs.tqcontains(config) && config != "default"; + bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); + bool canRemove = allConfigs.contains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -276,7 +276,7 @@ void ConfigureOptionsWidget::configComboTextChanged(const TQString &config) void ConfigureOptionsWidget::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.tqcontains(config)) + if (config == currentConfig || !allConfigs.contains(config)) return; if (!currentConfig.isNull() && dirty) diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index f67d9295..2a199c3a 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -148,7 +148,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, { if (groupEl.tagName() == "group") { - list << groupEl.attribute("pattern").tqreplace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; + list << groupEl.attribute("pattern").replace ( TQRegExp ( ";" ), " " ) + " (" + groupEl.attribute("name") + ")"; } groupEl = groupEl.nextSibling().toElement(); } diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index d230eee7..b59031df 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -84,7 +84,7 @@ void KFileDnDIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) { return; } e->acceptAction(); // Yes - TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); if ( i && m_useAutoOpenTimer) { // are we over an item ? m_dropItem = i; // set new m_dropItem m_autoOpenTimer.start( m_autoOpenTime ); // restart timer @@ -97,7 +97,7 @@ void KFileDnDIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) { return; } e->acceptAction(); // Yes - TQIconViewItem *i = tqfindItem( contentsToViewport( e->pos() ) ); + TQIconViewItem *i = findItem( contentsToViewport( e->pos() ) ); if( ! m_useAutoOpenTimer ) return; if ( i ) { // are we over an item ? diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index ef2354f1..7e19dd56 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -122,7 +122,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive ) AutoTools::ProjectAST* MakefileHandler::astForFolder( const TQString& folderPath ) { - if ( d->folderToFileMap.tqcontains( folderPath ) ) + if ( d->folderToFileMap.contains( folderPath ) ) { TQString filePath = d->folderToFileMap[folderPath]; return d->projects[filePath]; @@ -152,7 +152,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools:: if ( ( *it )->nodeType() == AutoTools::AST::AssignmentAST ) { AutoTools::AssignmentAST* assignment = static_cast<AutoTools::AssignmentAST*>( ( *it ) ); - if ( variable.tqfind( assignment->scopedID ) != -1 ) + if ( variable.find( assignment->scopedID ) != -1 ) { kdDebug(9020) << k_funcinfo << "Resolving variable '" << variable << "' to '" << assignment->values.join( TQString::null ).stripWhiteSpace() << "'" << endl; diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 9dfffefb..a4162a40 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -238,11 +238,11 @@ void AutoProjectTool::setMakefileam ( const TQString &fileName, TQMap<TQString, if ( re.exactMatch ( s ) ) { TQString lhs = re.cap ( 2 ); - bool notFound = ( variables.tqfind ( lhs ) == variables.end() ); + bool notFound = ( variables.find ( lhs ) == variables.end() ); if ( notFound ) { - if ( seenLhs.tqfind ( lhs ) == seenLhs.end() ) + if ( seenLhs.find ( lhs ) == seenLhs.end() ) { // not interested in this line at all // write it out as is.. @@ -446,7 +446,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri if (re.exactMatch(s)) { TQString lhs = re.cap(2); - TQMap<TQString, bool>* ourRhs = interest.tqfind(lhs); + TQMap<TQString, bool>* ourRhs = interest.find(lhs); if (!ourRhs) { @@ -478,7 +478,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri // add this line to we we want to add to remove duplicates. for (uint index = 0; index < bits.size(); index++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(bits[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(bits[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -490,7 +490,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri } // now write the line out if it is not going to be empty. TQString newLine(lhs); - if (seenLhs.tqfind(lhs) == seenLhs.end()) + if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lhs] = ""; @@ -537,7 +537,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // check if any of these values are down to remove. TQString newLine(lhs); - if (seenLhs.tqfind(lhs) == seenLhs.end()) + if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lhs] = ""; @@ -551,7 +551,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri bool added = false; for (TQStringList::Iterator posIter = bits.begin(); posIter != bits.end();posIter++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -598,7 +598,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // now we have to deal with this multiLine value.. // ourRhs will always be a value, as we only get multiLine if we're interested in it.. - TQMap<TQString, bool>* ourRhs = interest.tqfind(lastLhs); + TQMap<TQString, bool>* ourRhs = interest.find(lastLhs); if (add) { @@ -607,7 +607,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri // add this line to we we want to add to remove duplicates. for (uint index = 0; index < lastRhs.size(); index++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(lastRhs[index]); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(lastRhs[index]); if (findEntry == ourRhs->end()) { // we haven't seen it, so add it, so we don't add it again later.. @@ -619,7 +619,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri } // now write the line out if it is not going to be empty. TQString newLine(lastLhs); - if (seenLhs.tqfind(lastLhs) == seenLhs.end()) + if (seenLhs.find(lastLhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -665,7 +665,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri { // check if any of these values are down to remove. TQString newLine(lastLhs); - if (seenLhs.tqfind(lastLhs) == seenLhs.end()) + if (seenLhs.find(lastLhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -678,7 +678,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri bool added = false; for (TQStringList::Iterator posIter = lastRhs.begin(); posIter != lastRhs.end();posIter++) { - TQMap<TQString, bool>::iterator findEntry = ourRhs->tqfind(*posIter); + TQMap<TQString, bool>::iterator findEntry = ourRhs->find(*posIter); if (findEntry == ourRhs->end()) { // we do not want to remove it.. @@ -724,7 +724,7 @@ void AutoProjectTool::addRemoveMakefileam(const TQString &fileName, TQMap<TQStri TQMap<TQString, bool>* ourRhs = it.current(); TQString newLine(lhs); - if (seenLhs.tqfind(lhs) == seenLhs.end()) + if (seenLhs.find(lhs) == seenLhs.end()) { newLine += " = "; seenLhs[lastLhs] = ""; @@ -814,7 +814,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { if (close.search(line) >= 0) { - line = line.tqreplace(close.search(line), 1, ""); + line = line.replace(close.search(line), 1, ""); list += TQStringList::split(" ", line); break; } @@ -829,11 +829,11 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) } else if (ac_regex.search(line) >= 0) { - line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, ""); + line = line.replace(ac_regex.search(line), ac_match.length() - 1, ""); if (open.search(line) >= 0) { - line = line.tqreplace(open.search(line), 1, ""); + line = line.replace(open.search(line), 1, ""); } if (line.endsWith(cont)) @@ -845,7 +845,7 @@ TQStringList AutoProjectTool::configureinLoadMakefiles(TQString configureinpath) { if (close.search(line) >= 0) { - line = line.tqreplace(close.search(line), 1, ""); + line = line.replace(close.search(line), 1, ""); } } @@ -946,7 +946,7 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m else if (ac_regex.search(line) >= 0) { line = line.stripWhiteSpace(); - line = line.tqreplace(ac_regex.search(line), ac_match.length() - 1, ""); + line = line.replace(ac_regex.search(line), ac_match.length() - 1, ""); if (line.endsWith(cont)) { line.setLength(line.length() - 1); @@ -954,11 +954,11 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m } if (open.search(line) >= 0) { - line = line.tqreplace(open.search(line), 1, ""); + line = line.replace(open.search(line), 1, ""); } if (close.search(line) >= 0) { - line = line.tqreplace(close.search(line), 1, ""); + line = line.replace(close.search(line), 1, ""); } if (!multiLine) diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp index 962a386c..f40452c9 100644 --- a/buildtools/autotools/removetargetdlg.cpp +++ b/buildtools/autotools/removetargetdlg.cpp @@ -96,8 +96,8 @@ void RemoveTargetDialog::init() { TQString canonname = AutoProjectTool::canonicalize ( titem->name ); - if ( spitem->variables[canonname + "_LIBADD"].tqcontains ( m_titem->name ) > 0 || - spitem->variables[canonname + "_LDADD"].tqcontains ( m_titem->name ) > 0 ) + if ( spitem->variables[canonname + "_LIBADD"].contains ( m_titem->name ) > 0 || + spitem->variables[canonname + "_LDADD"].contains ( m_titem->name ) > 0 ) { dependencyListBox->insertItem ( SmallIcon ( "target_kdevelop" ), spitem->path + " (" + titem->name + ")" ); @@ -136,7 +136,7 @@ void RemoveTargetDialog::accept () TQString curCanonname = AutoProjectTool::canonicalize ( titem->name ); TQStringList dependencies; - if ( spitem->variables[curCanonname + "_LIBADD"].tqcontains ( m_titem->name ) ) + if ( spitem->variables[curCanonname + "_LIBADD"].contains ( m_titem->name ) ) curVarname = curCanonname + "_LIBADD"; else curVarname = curCanonname + "_LDADD"; @@ -148,7 +148,7 @@ void RemoveTargetDialog::accept () for ( uint i = 0; i < dependencies.size(); ++i ) { TQString s = dependencies[i]; - if ( s.tqcontains ( m_titem->name ) > 0 ) + if ( s.contains ( m_titem->name ) > 0 ) dependencies.remove ( s ); } @@ -250,7 +250,7 @@ void RemoveTargetDialog::accept () // before removing the files, check if they are mentioned in "noinst_HEADERS = blabla1.h blabla2.h" TQStringList noInstHeaders = TQStringList::split ( TQRegExp ( "[ \t\n]" ), m_spitem->variables["noinst_HEADERS"] ); - if ( noInstHeaders.tqcontains ( fitem->name ) ) + if ( noInstHeaders.contains ( fitem->name ) ) { noInstHeaders.remove ( fitem->name ); diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 14e5ee96..02673c0c 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -79,26 +79,26 @@ TargetOptionsDialog::~TargetOptionsDialog() void TargetOptionsDialog::readConfig() { TQString flagsstr = target->ldflags; - flagsstr.tqreplace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); + flagsstr.replace(TQRegExp("$(KDE_PLUGIN)"), "-avoid-version -module -no-undefined $(KDE_RPATH)"); TQStringList l1 = TQStringList::split(TQRegExp("[ \t]"), flagsstr); TQStringList::Iterator l1it; - l1it = l1.tqfind("-all-static"); + l1it = l1.find("-all-static"); if (l1it != l1.end()) { allstatic_box->setChecked(true); l1.remove(l1it); } - l1it = l1.tqfind("-avoid-version"); + l1it = l1.find("-avoid-version"); if (l1it != l1.end()) { avoidversion_box->setChecked(true); l1.remove(l1it); } - l1it = l1.tqfind("-module"); + l1it = l1.find("-module"); if (l1it != l1.end()) { module_box->setChecked(true); l1.remove(l1it); } - l1it = l1.tqfind("-no-undefined"); + l1it = l1.find("-no-undefined"); if (l1it != l1.end()) { noundefined_box->setChecked(true); l1.remove(l1it); @@ -354,4 +354,4 @@ void TargetOptionsDialog::accept() } #include "targetoptionsdlg.moc" -// kate: indent-mode csands; space-indent on; indent-width 4; tqreplace-tabs on; +// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on; diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index b06ced18..f3111d86 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -96,4 +96,4 @@ void CustomBuildOptionsWidget::makeToggled(bool b) #include "custombuildoptionswidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 492cc8ea..40384f4a 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -44,4 +44,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 6b27994e..d07e6dbe 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -61,8 +61,8 @@ CustomMakeConfigWidget::~CustomMakeConfigWidget() void CustomMakeConfigWidget::envNameChanged(const TQString& envName) { TQStringList allEnvNames = m_part->allMakeEnvironments(); - bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty(); - bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1; + bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); + bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); copyenvs_button->setEnabled(canAdd); removeenvs_button->setEnabled(canRemove); @@ -70,7 +70,7 @@ void CustomMakeConfigWidget::envNameChanged(const TQString& envName) void CustomMakeConfigWidget::envChanged(const TQString& envName) { - if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName)) + if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; // save settings of previously active environment diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index bb31b025..55115a69 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -54,7 +54,7 @@ void CustomManagerWidget::checkUrl(const TQString& url) { kdDebug(9025) << "seems to be non-relative" << endl; TQString relpath = m_part->relativeToProject( url ); - TQListBoxItem* item = m_blacklistBox->listBox()->tqfindItem( url ); + TQListBoxItem* item = m_blacklistBox->listBox()->findItem( url ); m_blacklistBox->listBox()->takeItem( item ); kdDebug(9025) << "relative path:" << relpath << endl; if( !relpath.isEmpty() ) @@ -77,4 +77,4 @@ void CustomManagerWidget::accept() #include "custommanagerwidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 5f63d006..696f06fe 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -39,4 +39,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index b3430e62..3f6ca0dc 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -56,8 +56,8 @@ CustomOtherConfigWidget::~CustomOtherConfigWidget() void CustomOtherConfigWidget::envNameChanged(const TQString& envName) { TQStringList allEnvNames = m_part->allMakeEnvironments(); - bool canAdd = !allEnvNames.tqcontains(envName) && !envName.tqcontains("/") && !envName.isEmpty(); - bool canRemove = allEnvNames.tqcontains(envName) && allEnvNames.count() > 1; + bool canAdd = !allEnvNames.contains(envName) && !envName.contains("/") && !envName.isEmpty(); + bool canRemove = allEnvNames.contains(envName) && allEnvNames.count() > 1; addenvs_button->setEnabled(canAdd); copyenvs_button->setEnabled(canAdd); removeenvs_button->setEnabled(canRemove); @@ -65,7 +65,7 @@ void CustomOtherConfigWidget::envNameChanged(const TQString& envName) void CustomOtherConfigWidget::envChanged(const TQString& envName) { - if (envName == m_currentEnvironment || !m_allEnvironments.tqcontains(envName)) + if (envName == m_currentEnvironment || !m_allEnvironments.contains(envName)) return; // save settings of previously active environment @@ -121,5 +121,5 @@ void CustomOtherConfigWidget::accept() } #include "customotherconfigwidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index a432d3e6..8338e05e 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -54,5 +54,5 @@ protected: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 4511769b..67a56ce0 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -910,7 +910,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t cmdline = DomUtil::readEntry( dom, "/kdevcustomproject/other/otherbin" ); if ( cmdline.isEmpty() ) cmdline = "echo"; - else if ( cmdline.tqfind( "/" ) == -1 ) + else if ( cmdline.find( "/" ) == -1 ) cmdline = "./" + cmdline; cmdline += " " + DomUtil::readEntry( dom, "/kdevcustomproject/other/otheroptions" ); } @@ -1186,7 +1186,7 @@ void CustomProjectPart::putEnvVarsInVarMap() void CustomProjectPart::parseMakefile( const TQString& filename ) { - if ( m_parsedMakefiles.tqcontains( filename ) ) + if ( m_parsedMakefiles.contains( filename ) ) return; m_parsedMakefiles.insert( filename, 1 ); @@ -1218,9 +1218,9 @@ void CustomProjectPart::parseMakefile( const TQString& filename ) while (( offset = variablesRe.search( str, offset + 1 ) ) != -1 ) { TQString variableName = variablesRe.cap( 1 ).simplifyWhiteSpace(); - if ( m_makefileVars.tqcontains( variableName ) ) + if ( m_makefileVars.contains( variableName ) ) { - str.tqreplace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); + str.replace( variablesRe.cap( 0 ), m_makefileVars[variableName] ); } } @@ -1245,17 +1245,17 @@ void CustomProjectPart::parseMakefile( const TQString& filename ) TQString tmpTarget = targetRe.cap( 1 ).simplifyWhiteSpace(); if ( tmpTarget.endsWith( ".o" ) ) { - if ( m_targetsObjectFiles.tqfind( tmpTarget ) == m_targetsObjectFiles.end() ) + if ( m_targetsObjectFiles.find( tmpTarget ) == m_targetsObjectFiles.end() ) m_targetsObjectFiles += tmpTarget; } - else if ( tmpTarget.tqcontains( '.' ) ) + else if ( tmpTarget.contains( '.' ) ) { - if ( m_targetsOtherFiles.tqfind( tmpTarget ) == m_targetsOtherFiles.end() ) + if ( m_targetsOtherFiles.find( tmpTarget ) == m_targetsOtherFiles.end() ) m_targetsOtherFiles += tmpTarget; } else { - if ( m_targets.tqfind( tmpTarget ) == m_targets.end() ) + if ( m_targets.find( tmpTarget ) == m_targets.end() ) m_targets += tmpTarget; } } @@ -1289,7 +1289,7 @@ void CustomProjectPart::updateMakeEnvironmentsMenu() { TQStringList l = allMakeEnvironments(); m_makeEnvironmentsSelector->setItems( l ); - m_makeEnvironmentsSelector->setCurrentItem( l.tqfindIndex( currentMakeEnvironment() ) ); + m_makeEnvironmentsSelector->setCurrentItem( l.findIndex( currentMakeEnvironment() ) ); } else { @@ -1361,7 +1361,7 @@ bool CustomProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if ( it == m_timestamp.end() || *it != t ) { @@ -1401,7 +1401,7 @@ TQString CustomProjectPart::currentMakeEnvironment() const TQStringList allEnvs = allMakeEnvironments(); TQDomDocument &dom = *projectDom(); TQString environment = DomUtil::readEntry( dom, "/kdevcustomproject/make/selectedenvironment" ); - if ( environment.isEmpty() || !allEnvs.tqcontains( environment ) ) + if ( environment.isEmpty() || !allEnvs.contains( environment ) ) environment = allEnvs[0]; return environment; } @@ -1510,11 +1510,11 @@ bool CustomProjectPart::isProjectFileType( const TQString& filename ) const re.setPattern( *it ); int pos = re.search( filename ); uint len = re.matchedLength(); - if ((( *it ).tqfind( "*" ) != -1 || ( *it ).tqfind( "?" ) != -1 ) && pos + len == filename.length() ) + if ((( *it ).find( "*" ) != -1 || ( *it ).find( "?" ) != -1 ) && pos + len == filename.length() ) return true; - else if ( filename.tqfind( "/" ) != -1 && filename.tqfind( *it ) != -1 ) + else if ( filename.find( "/" ) != -1 && filename.find( *it ) != -1 ) return true; - else if ( filename.tqfind( "/" ) == -1 && filename == *it ) + else if ( filename.find( "/" ) == -1 && filename == *it ) return true; } return false; @@ -1555,14 +1555,14 @@ bool CustomProjectPart::isInBlacklist( const TQString& path ) const TQStringList blacklist = this->blacklist(); if ( !TQFileInfo( relpath ).isRelative() ) relpath = relativeToProject( path ); - if ( blacklist.tqfind( relpath ) != blacklist.end() ) + if ( blacklist.find( relpath ) != blacklist.end() ) return true; TQStringList paths = TQStringList::split( "/", relpath ); TQString parentpath; for ( TQStringList::const_iterator it = paths.begin(); it != paths.end(); ++it ) { parentpath += *it; - if ( blacklist.tqfind( parentpath ) != blacklist.end() ) + if ( blacklist.find( parentpath ) != blacklist.end() ) return true; parentpath = parentpath + "/"; } @@ -1607,7 +1607,7 @@ void CustomProjectPart::addNewFilesToProject( const TQStringList& filelist ) { for ( ProjectFilesSet::ConstIterator it2 = m_sourceFilesSet.constBegin(); it2 != m_sourceFilesSet.constEnd(); ++it2 ) { - if ( it2.key().tqfind( *it ) != -1 ) + if ( it2.key().find( *it ) != -1 ) { removeFromExcludes << *it; } @@ -1637,7 +1637,7 @@ void CustomProjectPart::setFiletypes( const TQStringList& l ) */ bool CustomProjectPart::isInProject( const TQString& fileName ) const { - return m_sourceFilesSet.tqcontains( fileName ); + return m_sourceFilesSet.contains( fileName ); } diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index a31276f4..7f4775ad 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -156,4 +156,4 @@ private: }; #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index 622d6012..988bae07 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -128,4 +128,4 @@ TQStringList SelectNewFilesDialog::includedPaths() const #include "selectnewfilesdialog.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index db0eee3d..c38fd761 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -51,4 +51,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/lib/parsers/autotools/autotools.ll b/buildtools/lib/parsers/autotools/autotools.ll index d6f2a9bb..f05f8ff6 100644 --- a/buildtools/lib/parsers/autotools/autotools.ll +++ b/buildtools/lib/parsers/autotools/autotools.ll @@ -98,7 +98,7 @@ rule [\t]+[^\n]* <list>{id_list} { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/autotools/autotools_lex.cpp b/buildtools/lib/parsers/autotools/autotools_lex.cpp index e534d74f..d20bbdb6 100644 --- a/buildtools/lib/parsers/autotools/autotools_lex.cpp +++ b/buildtools/lib/parsers/autotools/autotools_lex.cpp @@ -841,7 +841,7 @@ YY_RULE_SETUP #line 99 "autotools.ll" { yylval.value = yytext; - yylval.value = yylval.value.mid(0, yylval.value.tqfindRev("\\")); + yylval.value = yylval.value.mid(0, yylval.value.findRev("\\")); unput('\\'); BEGIN(INITIAL); return (ID_LIST); diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.hh index 41ec2015..d6247645 100644 --- a/buildtools/lib/parsers/qmake/location.hh +++ b/buildtools/lib/parsers/qmake/location.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.hh index 63fe2d81..6e95eb95 100644 --- a/buildtools/lib/parsers/qmake/position.hh +++ b/buildtools/lib/parsers/qmake/position.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index 75d306d0..a9c0e745 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -359,7 +359,7 @@ function_call : ID_SIMPLE LBRACE function_args RBRACE depth++; //qWarning("%s", $<value>1.ascii()); - if ($<value>1.tqcontains("include")) + if ($<value>1.contains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = $<value>3; diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index 514631bf..fe133946 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -46,4 +46,4 @@ namespace TQMake #endif -// kate: space-indent on; indent-width 4; tab-width: 4; tqreplace-tabs on; auto-insert-doxygen on +// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index 718cb4f5..6824f633 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof @@ -679,7 +679,7 @@ namespace TQMake depth++; //qWarning("%s", $<value>1.ascii()); - if ((yysemantic_stack_[(4) - (1)].value).tqcontains("include")) + if ((yysemantic_stack_[(4) - (1)].value).contains("include")) { IncludeAST *includeAST = new IncludeAST(); includeAST->projectName = (yysemantic_stack_[(4) - (3)].value); diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.hpp index 0b67bb14..9ca20a08 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.hpp @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index c551abef..2c1e5a53 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -165,6 +165,6 @@ void IncludeAST::writeBack(TQString &/*buffer*/) } -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.hh index 07f71922..dfc6c67e 100644 --- a/buildtools/lib/parsers/qmake/stack.hh +++ b/buildtools/lib/parsers/qmake/stack.hh @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 5dd417db..9af86fe7 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -95,7 +95,7 @@ private: TQString replaceWs(TQString s) { - return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); + return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } virtual void processAssignment( TQMake::AssignmentAST* a) diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 7c3a115f..13b1391a 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -23,7 +23,7 @@ TQString EnvVarTools::quote( const TQString & arg ) { TQString res = arg; - res.tqreplace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); + res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 6d26ac60..bbc5037a 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -256,7 +256,7 @@ TQString PascalProjectPart::mainSource() const void PascalProjectPart::setMainSource(TQString fullPath) { TQString olddir = activeDirectory(); - m_mainSource = fullPath.tqreplace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); + m_mainSource = fullPath.replace(TQRegExp(TQString(projectDirectory() + TQString("/"))),""); emit activeDirectoryChanged( olddir, activeDirectory() ); } @@ -273,7 +273,7 @@ TQString PascalProjectPart::projectName() const TQString PascalProjectPart::activeDirectory() const { TQFileInfo fi(mainSource()); - return fi.dirPath(true).tqreplace(TQRegExp(projectDirectory()),""); + return fi.dirPath(true).replace(TQRegExp(projectDirectory()),""); } TQString PascalProjectPart::buildDirectory() const diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index d1ce1f5f..db5517cf 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -96,7 +96,7 @@ void PascalProjectOptionsDlg::saveConfig( TQString config ) ServiceComboBox::currentText(compiler_box, service_names)); DomUtil::writeEntry(dom, prefix + "compileroptions", options_edit->text()); DomUtil::writeEntry(dom, prefix + "compilerexec", exec_edit->text()); - DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().tqreplace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); + DomUtil::writeEntry(dom, prefix + "mainsource", mainSourceUrl->url().replace(TQRegExp(m_part->projectDirectory() + TQString("/")),"")); } void PascalProjectOptionsDlg::readConfig( TQString config ) @@ -130,8 +130,8 @@ void PascalProjectOptionsDlg::readConfig( TQString config ) void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) { - bool canAdd = !allConfigs.tqcontains(config) && !config.tqcontains("/") && !config.isEmpty(); - bool canRemove = allConfigs.tqcontains(config) && config != "default"; + bool canAdd = !allConfigs.contains(config) && !config.contains("/") && !config.isEmpty(); + bool canRemove = allConfigs.contains(config) && config != "default"; addconfig_button->setEnabled(canAdd); removeconfig_button->setEnabled(canRemove); } @@ -139,7 +139,7 @@ void PascalProjectOptionsDlg::configComboTextChanged(const TQString &config) void PascalProjectOptionsDlg::configChanged(const TQString &config) { - if (config == currentConfig || !allConfigs.tqcontains(config)) + if (config == currentConfig || !allConfigs.contains(config)) return; if (!currentConfig.isNull() && dirty) diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index fc0cb068..a5651b27 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -41,7 +41,7 @@ void ChooseSubprojectDlg::accept() ChooseItem *item = dynamic_cast<ChooseItem*>(subprojects_view->currentItem()); if (!item) return; - if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; TQDialog::accept(); @@ -89,7 +89,7 @@ void ChooseSubprojectDlg::itemSelected( TQListViewItem * it ) ChooseItem *item = dynamic_cast<ChooseItem*>(it); if (!item) return; - if ( item->subproject()->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( item->subproject()->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) buttonOk->setEnabled(false); else buttonOk->setEnabled(true); @@ -110,5 +110,5 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) #include "choosesubprojectdlg.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index 3d0ea08b..cf97671f 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -62,4 +62,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index c83e1b7b..2792d0ae 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -58,7 +58,7 @@ void CreateScopeDlg::accept() TQString file = incUrl->url(); if ( !incUrl->url().endsWith( ".pri" ) ) file += ".pri"; - if( file.tqfind("/") == -1 ) + if( file.find("/") == -1 ) file = m_item->scope->projectDir()+"/"+file; // We need to create the file, because getRelativePath checks for existent paths if( !TQFile::exists(file) ) @@ -97,4 +97,4 @@ void CreateScopeDlg::accept() #include "createscopedlg.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 31195c87..781522fe 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -42,5 +42,5 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 161661d5..682fd906 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -47,4 +47,4 @@ TQStringList DisableSubprojectDlg::selectedProjects() #include "disablesubprojectdlg.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 4e8a4a84..296fcd14 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -40,4 +40,4 @@ protected slots: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 0bb85870..713084fd 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -158,21 +158,21 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { if ( radioApplication->isChecked() ) { - if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 ) + if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) { addAppDeps(); removeSharedLibDeps(); removeStaticLibDeps(); } myProjectItem->scope->setEqualOp( "TEMPLATE", "app" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) ); TQString targetname = prjWidget->getCurrentOutputFilename(); - if( targetname.tqfindRev("/") != -1 ) - targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 ); + if( targetname.findRev("/") != -1 ) + targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, m_editRunArguments->text() ); DomUtil::writeEntry( *prjWidget->m_part->projectDom(), @@ -186,7 +186,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() myProjectItem->scope->setEqualOp( "TEMPLATE", "lib" ); if ( staticRadio->isOn() ) { - if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") != -1 ) + if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") != -1 ) { addStaticLibDeps(); removeSharedLibDeps(); @@ -203,14 +203,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration() if ( sharedRadio->isOn() ) { kdDebug(9024) << "Activating debug lib:" << myProjectItem->scope->variableValues("CONFIG") << endl; - if( myProjectItem->scope->variableValues("CONFIG").tqfindIndex("dll") == -1 ) + if( myProjectItem->scope->variableValues("CONFIG").findIndex("dll") == -1 ) { addSharedLibDeps(); removeStaticLibDeps(); } myProjectItem->addValue( "CONFIG", "dll" ); myProjectItem->scope->setEqualOp( "VERSION", m_targetLibraryVersion->text() ); - if ( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) + if ( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) myProjectItem->removeValue( "CONFIG", "staticlib" ); } if ( checkPlugin->isOn() ) @@ -227,15 +227,15 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } else if ( radioSubdirs->isChecked() ) { - if( myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") == -1 ) + if( myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") == -1 ) { removeSharedLibDeps(); removeStaticLibDeps(); removeAppDeps(); } - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" ); - if( myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 ) + if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 ) myProjectItem->scope->removeFromPlusOp( "CONFIG", "staticlib" ); myProjectItem->scope->setEqualOp( "TEMPLATE", "subdirs" ); myProjectItem->setPixmap( 0, SmallIcon( "folder" ) ); @@ -243,8 +243,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } // Buildmode - int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "release" ); - int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).tqfindIndex( "debug" ); + int releaseidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "release" ); + int debugidx = myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "debug" ); if ( radioReleaseMode->isChecked() ) { if( releaseidx != -1 && releaseidx < debugidx ) @@ -414,7 +414,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() TQStringList extraValues = TQStringList::split( " ", editConfigExtra->text() ); for ( TQStringList::iterator it = confValues.begin() ; it != confValues.end() ; ++it ) { - if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 && extraValues.tqfindIndex( *it ) == -1 ) + if ( Scope::KnownConfigValues.findIndex( *it ) == -1 && extraValues.findIndex( *it ) == -1 ) { myProjectItem->scope->removeFromPlusOp( "CONFIG", *it ); } @@ -422,7 +422,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() for ( TQStringList::iterator it = extraValues.begin() ; it != extraValues.end() ; ++it ) { - if ( confValues.tqfindIndex( *it ) == -1 ) + if ( confValues.findIndex( *it ) == -1 ) myProjectItem->scope->addToPlusOp( "CONFIG", *it ); } @@ -431,9 +431,9 @@ void ProjectConfigurationDlg::updateProjectConfiguration() // targetpath = URLUtil::getRelativePath( myProjectItem->scope->projectDir(), targetpath ); if( myProjectItem->scope->scopeType() == Scope::FunctionScope || myProjectItem->scope->scopeType() == Scope::SimpleScope ) { - if( myProjectItem->scope->variableValues("TARGET").tqfindIndex( m_targetOutputFile->text() ) == -1 ) + if( myProjectItem->scope->variableValues("TARGET").findIndex( m_targetOutputFile->text() ) == -1 ) myProjectItem->scope->setEqualOp( "TARGET", TQStringList( m_targetOutputFile->text() ) ); - if( myProjectItem->scope->variableValues("DESTDIR").tqfindIndex( targetpath ) == -1 ) + if( myProjectItem->scope->variableValues("DESTDIR").findIndex( targetpath ) == -1 ) myProjectItem->scope->setEqualOp( "DESTDIR", TQStringList( targetpath ) ); }else { @@ -497,7 +497,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { TQString tmpLib = insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); - if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { //add path if shared lib is linked TQString tmpPath = insideItem->prjItem->getLibAddPath( @@ -550,14 +550,14 @@ void ProjectConfigurationDlg::updateProjectConfiguration() { if ( insideItem->isOn() ) { - if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 - || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex("dll") == -1 - && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).tqfindIndex("lib") != -1 ) ) + if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 + || ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex("dll") == -1 + && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).findIndex("lib") != -1 ) ) { values << insideItem->prjItem->getLibAddObject( myProjectItem->scope->projectDir() ); } - else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + else if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { values << insideItem->prjItem->getSharedLibAddObject( myProjectItem->scope->projectDir() ); @@ -576,7 +576,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() values.clear(); //change build order lvItem = buildorder_listview->firstChild(); - if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( lvItem && lvItem->itemBelow() && myProjectItem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { while ( lvItem ) @@ -648,14 +648,14 @@ void ProjectConfigurationDlg::updateControls() TQStringList templateValues = myProjectItem->scope->variableValues( "TEMPLATE" ); //if( !myProjectItem->isScope ) //{ - if ( templateValues.tqfindIndex( "lib" ) != -1 ) + if ( templateValues.findIndex( "lib" ) != -1 ) { groupLibraries->setEnabled( true ); radioLibrary->setChecked( true ); staticRadio->setChecked( true ); //default - if ( configValues.tqfindIndex( "staticlib" ) != -1 ) + if ( configValues.findIndex( "staticlib" ) != -1 ) { staticRadio->setChecked( true ); checkPlugin->setEnabled( false ); @@ -663,7 +663,7 @@ void ProjectConfigurationDlg::updateControls() } else staticRadio->setChecked( false ); - if ( configValues.tqfindIndex( "dll" ) != -1 ) + if ( configValues.findIndex( "dll" ) != -1 ) { sharedRadio->setChecked( true ); checkPlugin->setEnabled( true ); @@ -684,33 +684,33 @@ void ProjectConfigurationDlg::updateControls() checkDesigner->setEnabled( false ); } - if ( configValues.tqfindIndex( "plugin" ) != -1 ) + if ( configValues.findIndex( "plugin" ) != -1 ) checkPlugin->setChecked( true ); else checkPlugin->setChecked( false ); - if ( configValues.tqfindIndex( "designer" ) != -1 ) + if ( configValues.findIndex( "designer" ) != -1 ) checkDesigner->setChecked( true ); else checkDesigner->setChecked( false ); - if ( configValues.tqfindIndex( "compile_libtool" ) != -1 ) + if ( configValues.findIndex( "compile_libtool" ) != -1 ) checkLibtool->setChecked( true ); else checkLibtool->setChecked( false ); } - else if ( templateValues.tqfindIndex( "subdirs" ) != -1 ) + else if ( templateValues.findIndex( "subdirs" ) != -1 ) { radioSubdirs->setChecked( true ); }else { //Default is app mode radioApplication->setChecked( true ); - if ( configValues.tqfindIndex( "console" ) != -1 ) + if ( configValues.findIndex( "console" ) != -1 ) { checkConsole->setChecked( true ); } TQString targetname = prjWidget->getCurrentOutputFilename(); - if( targetname.tqfindRev("/") != -1 ) - targetname = targetname.right( targetname.length() - targetname.tqfindRev("/") - 1 ); + if( targetname.findRev("/") != -1 ) + targetname = targetname.right( targetname.length() - targetname.findRev("/") - 1 ); m_editRunArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/runarguments/"+targetname, "" ) ); TQString dir = DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/cwd/"+targetname, "" ); @@ -731,15 +731,15 @@ void ProjectConfigurationDlg::updateControls() TQString destdir = myProjectItem->m_widget->getCurrentDestDir(); if( !destdir.startsWith( "/" ) ) destdir = myProjectItem->m_widget->projectDirectory()+"/"+destdir; - m_CWDEdit->setURL( destdir.left( destdir.tqfindRev("/") ) ); - m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.tqfindRev("/") ) ) ); + m_CWDEdit->setURL( destdir.left( destdir.findRev("/") ) ); + m_CWDEdit->fileDialog()->setURL( KURL::fromPathOrURL( destdir.left( destdir.findRev("/") ) ) ); } m_editDebugArguments->setText( DomUtil::readEntry( *prjWidget->m_part->projectDom(), "/kdevtrollproject/run/debugarguments/"+targetname, "" ) ); } // Buildmode - int debugidx = configValues.tqfindIndex( "debug" ); - int releaseidx = configValues.tqfindIndex( "release" ); + int debugidx = configValues.findIndex( "debug" ); + int releaseidx = configValues.findIndex( "release" ); if ( debugidx != -1 && debugidx > releaseidx ) { radioDebugMode->setChecked( true ); @@ -748,59 +748,59 @@ void ProjectConfigurationDlg::updateControls() { radioReleaseMode->setChecked( true ); } - if ( configValues.tqfindIndex( "debug_and_release" ) != -1 ) + if ( configValues.findIndex( "debug_and_release" ) != -1 ) { checkDebugReleaseMode->setChecked( true ); } // Requirements - if ( configValues.tqfindIndex( "qt" ) != -1 ) + if ( configValues.findIndex( "qt" ) != -1 ) checkQt->setChecked( true ); else checkQt->setChecked( false ); - if ( configValues.tqfindIndex( "opengl" ) != -1 ) + if ( configValues.findIndex( "opengl" ) != -1 ) checkOpenGL->setChecked( true ); else checkOpenGL->setChecked( false ); - if ( configValues.tqfindIndex( "thread" ) != -1 ) + if ( configValues.findIndex( "thread" ) != -1 ) checkThread->setChecked( true ); else checkThread->setChecked( false ); - if ( configValues.tqfindIndex( "x11" ) != -1 ) + if ( configValues.findIndex( "x11" ) != -1 ) checkX11->setChecked( true ); else checkX11->setChecked( false ); - if ( configValues.tqfindIndex( "ordered" ) != -1 ) + if ( configValues.findIndex( "ordered" ) != -1 ) checkOrdered->setChecked( true ); else checkOrdered->setChecked( false ); - if ( configValues.tqfindIndex( "exceptions" ) != -1 ) + if ( configValues.findIndex( "exceptions" ) != -1 ) exceptionCheck->setChecked( true ); else exceptionCheck->setChecked( false ); - if ( configValues.tqfindIndex( "stl" ) != -1 ) + if ( configValues.findIndex( "stl" ) != -1 ) stlCheck->setChecked( true ); else stlCheck->setChecked( false ); - if ( configValues.tqfindIndex( "rtti" ) != -1 ) + if ( configValues.findIndex( "rtti" ) != -1 ) rttiCheck->setChecked( true ); else rttiCheck->setChecked( false ); - if ( configValues.tqfindIndex( "precompile_header" ) != -1 ) + if ( configValues.findIndex( "precompile_header" ) != -1 ) checkPCH->setChecked( true ); else checkPCH->setChecked( false ); // Warnings - if ( configValues.tqfindIndex( "warn_on" ) != -1 ) + if ( configValues.findIndex( "warn_on" ) != -1 ) { checkWarning->setChecked( true ); } - if ( configValues.tqfindIndex( "warn_off" ) != -1 ) + if ( configValues.findIndex( "warn_off" ) != -1 ) { checkWarning->setChecked( false ); } - if ( configValues.tqfindIndex( "windows" ) != -1 ) + if ( configValues.findIndex( "windows" ) != -1 ) checkWindows->setChecked( true ); else checkWindows->setChecked( false ); @@ -809,77 +809,77 @@ void ProjectConfigurationDlg::updateControls() if ( prjWidget->m_part->isTQt4Project() ) { - if ( configValues.tqfindIndex( "assistant" ) != -1 ) + if ( configValues.findIndex( "assistant" ) != -1 ) checkAssistant->setChecked( true ); else checkAssistant->setChecked( false ); - if ( configValues.tqfindIndex( "qtestlib" ) != -1 ) + if ( configValues.findIndex( "qtestlib" ) != -1 ) checkTestlib->setChecked( true ); else checkTestlib->setChecked( false ); - if ( configValues.tqfindIndex( "uitools" ) != -1 ) + if ( configValues.findIndex( "uitools" ) != -1 ) checkUiTools->setChecked( true ); else checkUiTools->setChecked( false ); - if ( configValues.tqfindIndex( "dbus" ) != -1 ) + if ( configValues.findIndex( "dbus" ) != -1 ) checkQDBus->setChecked( true ); else checkQDBus->setChecked( false ); - if ( configValues.tqfindIndex( "build_all" ) != -1 ) + if ( configValues.findIndex( "build_all" ) != -1 ) checkBuildAll->setChecked( true ); else checkBuildAll->setChecked( false ); - if ( configValues.tqfindIndex( "help" ) != -1 ) + if ( configValues.findIndex( "help" ) != -1 ) checkQtHelp->setChecked( true ); else checkQtHelp->setChecked( false ); TQStringList qtLibs = myProjectItem->scope->variableValues( "QT" ); - if ( qtLibs.tqfindIndex( "core" ) != -1 ) + if ( qtLibs.findIndex( "core" ) != -1 ) checkQt4Core->setChecked( true ); else checkQt4Core->setChecked( false ); - if ( qtLibs.tqfindIndex( "gui" ) != -1 ) + if ( qtLibs.findIndex( "gui" ) != -1 ) checkQt4Gui->setChecked( true ); else checkQt4Gui->setChecked( false ); - if ( qtLibs.tqfindIndex( "sql" ) != -1 ) + if ( qtLibs.findIndex( "sql" ) != -1 ) checkQt4SQL->setChecked( true ); else checkQt4SQL->setChecked( false ); - if ( qtLibs.tqfindIndex( "xml" ) != -1 ) + if ( qtLibs.findIndex( "xml" ) != -1 ) checkQt4XML->setChecked( true ); else checkQt4XML->setChecked( false ); - if ( qtLibs.tqfindIndex( "network" ) != -1 ) + if ( qtLibs.findIndex( "network" ) != -1 ) checkQt4Network->setChecked( true ); else checkQt4Network->setChecked( false ); - if ( qtLibs.tqfindIndex( "svg" ) != -1 ) + if ( qtLibs.findIndex( "svg" ) != -1 ) checkQt4SVG->setChecked( true ); else checkQt4SVG->setChecked( false ); - if ( qtLibs.tqfindIndex( "opengl" ) != -1 ) + if ( qtLibs.findIndex( "opengl" ) != -1 ) checkQt4OpenGL->setChecked( true ); else checkQt4OpenGL->setChecked( false ); - if ( qtLibs.tqfindIndex( "qt3support" ) != -1 ) + if ( qtLibs.findIndex( "qt3support" ) != -1 ) checkQt3Support->setChecked( true ); else checkQt3Support->setChecked( false ); - if ( qtLibs.tqfindIndex( "script" ) != -1 ) + if ( qtLibs.findIndex( "script" ) != -1 ) checkQtScript->setChecked( true ); else checkQtScript->setChecked( false ); - if ( qtLibs.tqfindIndex( "phonon" ) != -1 ) + if ( qtLibs.findIndex( "phonon" ) != -1 ) checkPhonon->setChecked( true ); else checkPhonon->setChecked( false ); - if ( qtLibs.tqfindIndex( "webkit" ) != -1 ) + if ( qtLibs.findIndex( "webkit" ) != -1 ) checkQtWebKit->setChecked( true ); else checkQtWebKit->setChecked( false ); - if ( qtLibs.tqfindIndex( "xmlpatterns" ) != -1 ) + if ( qtLibs.findIndex( "xmlpatterns" ) != -1 ) checkQtXmlPatterns->setChecked( true ); else checkQtXmlPatterns->setChecked( false ); @@ -895,7 +895,7 @@ void ProjectConfigurationDlg::updateControls() TQStringList extraValues; for ( TQStringList::const_iterator it = configValues.begin() ; it != configValues.end() ; ++it ) { - if ( Scope::KnownConfigValues.tqfindIndex( *it ) == -1 ) + if ( Scope::KnownConfigValues.findIndex( *it ) == -1 ) { extraValues << *it; } @@ -914,7 +914,7 @@ void ProjectConfigurationDlg::updateControls() } makefile_url->setURL( dir ); - if ( myProjectItem->scope->variableValues( "INSTALLS" ).tqfindIndex( "target" ) != -1 ) + if ( myProjectItem->scope->variableValues( "INSTALLS" ).findIndex( "target" ) != -1 ) { checkInstallTarget->setChecked( true ); m_InstallTargetPath->setEnabled( true ); @@ -1070,8 +1070,8 @@ void ProjectConfigurationDlg::updateIncludeControl() QMakeScopeItem *item = itemList.first(); while ( item ) { - if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 || - item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) != -1 ) + if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 || + item->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) != -1 ) { TQString tmpInc = item->getIncAddPath( myProjectItem->scope->projectDir() ); tmpInc = TQDir::cleanDirPath( tmpInc ); @@ -1079,7 +1079,7 @@ void ProjectConfigurationDlg::updateIncludeControl() insideinc_listview->lastItem(), item, this ); items[tmpInc] = newItem; - if ( incList.tqfindIndex( tmpInc ) != -1 ) + if ( incList.findIndex( tmpInc ) != -1 ) { incList.remove( tmpInc ); newItem->setOn( true ); @@ -1128,7 +1128,7 @@ void ProjectConfigurationDlg::updateLibControls() QMakeScopeItem* item = itemList.first(); while ( item ) { - if ( item->scope->variableValues( "TEMPLATE" ).tqfindIndex( "lib" ) != -1 ) + if ( item->scope->variableValues( "TEMPLATE" ).findIndex( "lib" ) != -1 ) { if ( item != myProjectItem ) { @@ -1141,11 +1141,11 @@ void ProjectConfigurationDlg::updateLibControls() items[tmpLib] = newItem; TQString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() ); kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl; - if ( libList.tqfindIndex( "-L" + tmpLibDir ) != -1 ) + if ( libList.findIndex( "-L" + tmpLibDir ) != -1 ) { libList.remove( "-L" + tmpLibDir ); } - if ( libList.tqfindIndex( tmpLib ) != -1 ) + if ( libList.findIndex( tmpLib ) != -1 ) { libList.remove( tmpLib ); newItem->setOn( true ); @@ -1199,20 +1199,20 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) while ( item ) { TQStringList templateval = item->scope->variableValues( "TEMPLATE" ); - if ( templateval.tqfindIndex( "lib" ) != -1 - || templateval.tqfindIndex( "app" ) != -1 ) + if ( templateval.findIndex( "lib" ) != -1 + || templateval.findIndex( "app" ) != -1 ) { TQString tmpLib; TQStringList values = item->scope->variableValues( "CONFIG" ); - if ( templateval.tqfindIndex( "lib" ) != -1 && values.tqfindIndex( "dll" ) != -1 ) + if ( templateval.findIndex( "lib" ) != -1 && values.findIndex( "dll" ) != -1 ) tmpLib = item->getSharedLibAddObject( myProjectItem->scope->projectDir() ); - else if ( templateval.tqfindIndex( "lib" ) != -1 ) + else if ( templateval.findIndex( "lib" ) != -1 ) tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() ); else tmpLib = item->getApplicationObject( myProjectItem->scope->projectDir() ); InsideCheckListItem * newItem = new InsideCheckListItem( intDeps_view, intDeps_view->lastItem(), item, this ); items[tmpLib] = newItem; - if ( depsList.tqfindIndex( tmpLib ) != -1 ) + if ( depsList.findIndex( tmpLib ) != -1 ) { depsList.remove( tmpLib ); newItem->setOn( true ); @@ -1248,7 +1248,7 @@ void ProjectConfigurationDlg::updateDependenciesControl( ) void ProjectConfigurationDlg::updateBuildOrderControl() { //sort build order only if subdirs - if ( myProjectItem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 ) + if ( myProjectItem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 ) { TQPtrList <QMakeScopeItem> itemList; @@ -2042,11 +2042,11 @@ void ProjectConfigurationDlg::removeSharedLibDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_lib"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_lib"]); - if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["shared_libdir"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").findIndex(infos["shared_libdir"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["shared_libdir"]); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["shared_depend"]); @@ -2066,8 +2066,8 @@ void ProjectConfigurationDlg::addStaticLibDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 ) { prjItem->scope->addToPlusOp("LIBS", infos["static_lib"]); prjItem->scope->addToPlusOp("TARGETDEPS", infos["static_depend"]); @@ -2088,9 +2088,9 @@ void ProjectConfigurationDlg::removeStaticLibDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("LIBS").tqfindIndex(infos["static_lib"]) != -1 ) + if( prjItem->scope->variableValues("LIBS").findIndex(infos["static_lib"]) != -1 ) prjItem->scope->removeFromPlusOp("LIBS", infos["static_lib"]); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["static_depend"]); prjItem->scope->saveToFile(); @@ -2108,8 +2108,8 @@ void ProjectConfigurationDlg::addSharedLibDeps() continue; TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { prjItem->scope->addToPlusOp("LIBS", infos["shared_lib"]); prjItem->scope->addToPlusOp("LIBS", infos["shared_libdir"]); @@ -2130,7 +2130,7 @@ void ProjectConfigurationDlg::removeAppDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["app_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["app_depend"]) != -1 ) { prjItem->scope->removeFromPlusOp("TARGETDEPS", infos["app_depend"]); prjItem->scope->saveToFile(); @@ -2149,8 +2149,8 @@ void ProjectConfigurationDlg::addAppDeps() TQMap<TQString, TQString> infos = myProjectItem->getLibInfos(prjItem->scope->projectDir()); - if( prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["shared_depend"]) != -1 - || prjItem->scope->variableValues("TARGETDEPS").tqfindIndex(infos["static_depend"]) != -1 ) + if( prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["shared_depend"]) != -1 + || prjItem->scope->variableValues("TARGETDEPS").findIndex(infos["static_depend"]) != -1 ) { prjItem->scope->addToPlusOp("TARGETDEPS", infos["app_depend"]); @@ -2171,4 +2171,4 @@ void ProjectConfigurationDlg::customVarChanged() activateApply( 0 ); } -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index d8ec5ea7..6ef112d7 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -142,4 +142,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 304bd1e1..55533ef2 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -78,7 +78,7 @@ TQMakeDefaultOpts::~TQMakeDefaultOpts() const TQStringList TQMakeDefaultOpts::variableValues( const TQString& var ) const { // TQStringList result; - if ( m_variables.tqcontains(var) ) + if ( m_variables.contains(var) ) return m_variables[var]; return TQStringList(); } @@ -88,4 +88,4 @@ const TQStringList& TQMakeDefaultOpts::variables() const return m_keys; } -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 121e0cd0..6fee7366 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -46,4 +46,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index 920d2efd..01ac0f7b 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -60,4 +60,4 @@ void QMakeOptionsWidget::accept() #include "qmakeoptionswidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index 159547f8..9db49213 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -35,6 +35,6 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index f3cebef2..9da11ca4 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -338,7 +338,7 @@ TQString QMakeScopeItem::relativePath() return ""; if( scope->scopeType() == Scope::ProjectScope ) { - if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").tqcontains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) ) + if( scope->tqparent() && scope->tqparent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) ) { return URLUtil::relativePathToFile( scope->tqparent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ); }else @@ -360,7 +360,7 @@ TQString QMakeScopeItem::relativePath() TQString QMakeScopeItem::getSharedLibAddObject( TQString basePath ) { - if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); if ( !scope->variableValues( "DESTDIR" ).front().isEmpty() ) @@ -422,7 +422,7 @@ TQString QMakeScopeItem::getApplicationObject( TQString basePath ) TQString QMakeScopeItem::getLibAddObject( TQString basePath ) { - if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) != -1 ) + if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) != -1 ) { TQString target = scope->resolveVariables( scope->variableValues( "TARGET" ).front() ); if ( !target.isEmpty() ) @@ -434,8 +434,8 @@ TQString QMakeScopeItem::getLibAddObject( TQString basePath ) return ( "-l" + scope->projectName() ); } } - else if ( scope->variableValues( "CONFIG" ).tqfindIndex( "staticlib" ) != -1 - || scope->variableValues("TEMPLATE").tqfindIndex("lib") != -1 ) + else if ( scope->variableValues( "CONFIG" ).findIndex( "staticlib" ) != -1 + || scope->variableValues("TEMPLATE").findIndex("lib") != -1 ) { TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); @@ -474,7 +474,7 @@ TQString QMakeScopeItem::getLibAddPath( TQString basePath ) { //PATH only add if shared lib - if ( scope->variableValues( "CONFIG" ).tqfindIndex( "dll" ) == -1 ) return ( "" ); + if ( scope->variableValues( "CONFIG" ).findIndex( "dll" ) == -1 ) return ( "" ); TQString tmpPath = URLUtil::getRelativePath(basePath, scope->projectDir() ); TQString destdir = scope->resolveVariables( scope->variableValues( "DESTDIR" ).front() ); @@ -541,17 +541,17 @@ void QMakeScopeItem::init() TQStringList tmp = scope->variableValues( "TEMPLATE" ); if( scope->isEnabled() ) { - if ( tmp.tqfindIndex( "subdirs" ) != -1 ) + if ( tmp.findIndex( "subdirs" ) != -1 ) setPixmap( 0, SmallIcon( "folder" ) ); - else if ( tmp.tqfindIndex( "lib" ) != -1 ) + else if ( tmp.findIndex( "lib" ) != -1 ) setPixmap( 0, SmallIcon( "qmake_lib" ) ); else setPixmap( 0, SmallIcon( "qmake_app" ) ); }else { - if ( tmp.tqfindIndex( "subdirs" ) != -1 ) + if ( tmp.findIndex( "subdirs" ) != -1 ) setPixmap( 0, SmallIcon( "folder_grey" ) ); - else if ( tmp.tqfindIndex( "lib" ) != -1 ) + else if ( tmp.findIndex( "lib" ) != -1 ) setPixmap( 0, SmallIcon( "qmake_lib_disabled" ) ); else setPixmap( 0, SmallIcon( "qmake_app_disabled" ) ); @@ -578,7 +578,7 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name ) TQString display = name; if( m_widget->showFilenamesOnly() ) { - int dirSepPos = name.tqfindRev( TQChar( TQDir::separator() ) ); + int dirSepPos = name.findRev( TQChar( TQDir::separator() ) ); if ( dirSepPos != - 1 ) display = name.mid( dirSepPos + 1 ); } @@ -596,7 +596,7 @@ FileItem* QMakeScopeItem::createFileItem( const TQString& name ) void QMakeScopeItem::buildGroups() { - if( scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if( scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) return; TQStringList values; @@ -739,12 +739,12 @@ void QMakeScopeItem::addValues( const TQString& var, const TQStringList& values void QMakeScopeItem::removeValue( const TQString& var, const TQString& value ) { - if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) != -1 ) + if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) != -1 ) { - if( scope->variableValuesForOp( var, "+=" ).tqfindIndex(value) != -1 ) + if( scope->variableValuesForOp( var, "+=" ).findIndex(value) != -1 ) { scope->removeFromPlusOp( var, TQStringList( value ) ); - if( scope->variableValues( var ).tqfindIndex( value ) != -1 ) + if( scope->variableValues( var ).findIndex( value ) != -1 ) { scope->addToMinusOp( var, TQStringList( value ) ); } @@ -758,9 +758,9 @@ void QMakeScopeItem::removeValue( const TQString& var, const TQString& value ) void QMakeScopeItem::addValue( const TQString& var, const TQString& value ) { - if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).tqfindIndex( value ) == -1 ) + if( scope->scopeType() != Scope::IncludeScope && scope->variableValues( var ).findIndex( value ) == -1 ) { - if( scope->variableValuesForOp( var, "-=" ).tqfindIndex(value) != -1 ) + if( scope->variableValuesForOp( var, "-=" ).findIndex(value) != -1 ) scope->removeFromMinusOp( var, TQStringList( value ) ); else scope->addToPlusOp( var, TQStringList( value ) ); @@ -776,9 +776,9 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu TQStringList scopeValues = scope->variableValuesForOp( var, "+=" ); for( TQStringList::const_iterator it = curValues.begin(); it != curValues.end(); ++it ) { - if ( values.tqfindIndex( *it ) == -1 ) + if ( values.findIndex( *it ) == -1 ) { - if( scopeValues.tqfindIndex( *it ) != -1 ) + if( scopeValues.findIndex( *it ) != -1 ) { scope->removeFromPlusOp( var, TQStringList( *it ) ); scopeValues.remove( *it ); @@ -788,7 +788,7 @@ void QMakeScopeItem::updateValues( const TQString& var, const TQStringList& valu } for( TQStringList::const_iterator it = values.begin(); it != values.end(); ++it ) { - if ( scopeValues.tqfindIndex( *it ) != -1 ) + if ( scopeValues.findIndex( *it ) != -1 ) { scopeValues.remove(*it); } @@ -843,7 +843,7 @@ void QMakeScopeItem::disableSubprojects( const TQStringList& dirs ) TQStringList::const_iterator it = dirs.begin(); for( ; it != dirs.end() ; ++it) { - if( scope->variableValues("SUBDIRS").tqfindIndex(*it) != -1 ) + if( scope->variableValues("SUBDIRS").findIndex(*it) != -1 ) { Scope* s = scope->disableSubproject(*it); if( !s ) @@ -926,4 +926,4 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) return result; } -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index 4dc1dca2..ec45877e 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -125,4 +125,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index e332edd2..17c360dc 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -121,8 +121,8 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqp { TQString absfilename; TQString tmp = incfile.stripWhiteSpace(); - if( tmp.tqcontains(")" ) ) - tmp = tmp.mid(0, tmp.tqfind(")") ); + if( tmp.contains(")" ) ) + tmp = tmp.mid(0, tmp.find(")") ); if( tmp.startsWith( "\"" ) ) tmp = tmp.mid( 1, tmp.length()-2 ); @@ -315,7 +315,7 @@ TQStringList Scope::variableValues( const TQString& variable, bool checkIncParen if ( !m_root ) return result; - if( m_varCache.tqcontains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) ) + if( m_varCache.contains( variable ) && fetchFromParent && ( checkIncParent || scopeType() != Scope::IncludeScope ) ) { return m_varCache[variable]; } @@ -336,8 +336,8 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re /* For variables that we don't know and which are not QT/CONFIG find the default value */ if( setDefault && m_defaultopts - && m_defaultopts->variables().tqfindIndex(variable) != -1 - && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.tqfindIndex(variable) == -1 || variable == "CONFIG" ) ) + && m_defaultopts->variables().findIndex(variable) != -1 + && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) ) { result = m_defaultopts->variableValues(variable); } @@ -370,7 +370,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re { for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { - if ( result.tqfindIndex( *sit ) == -1 ) + if ( result.findIndex( *sit ) == -1 ) result.append( *sit ); } } @@ -378,7 +378,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re { for ( TQStringList::const_iterator sit = assign->values.begin(); sit != assign->values.end() ; ++sit ) { - if ( result.tqfindIndex( *sit ) != -1 ) + if ( result.findIndex( *sit ) != -1 ) result.remove( *sit ); } } @@ -392,7 +392,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; - if( m_scopes.tqcontains( num ) ) + if( m_scopes.contains( num ) ) { Scope* s = m_scopes[num]; if( s && s->scopeType() == IncludeScope && s->m_incast == iast ) @@ -412,7 +412,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re for( unsigned int i = 0; i < l.count(); ++i ) { int num = l[ i ]; - if( m_scopes.tqcontains( num ) ) + if( m_scopes.contains( num ) ) { Scope* s = m_scopes[num]; if( s && s->m_root == past && s->m_root->scopedID == past->scopedID ) @@ -571,17 +571,17 @@ Scope* Scope::createSubProject( const TQString& projname ) if( !m_root ) return 0; - if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( projname ) != -1 ) + if( variableValuesForOp( "SUBDIRS", "-=").findIndex( projname ) != -1 ) removeFromMinusOp( "SUBDIRS", projname ); TQString realprojname = resolveVariables(projname); - if( variableValuesForOp( "SUBDIRS", "-=").tqfindIndex( realprojname ) != -1 ) + if( variableValuesForOp( "SUBDIRS", "-=").findIndex( realprojname ) != -1 ) removeFromMinusOp( "SUBDIRS", realprojname ); TQDir curdir( projectDir() ); - if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) + if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { TQString filename; if( !realprojname.endsWith(".pro") ) @@ -592,7 +592,7 @@ Scope* Scope::createSubProject( const TQString& projname ) curdir.cd( realprojname ); TQStringList entries = curdir.entryList("*.pro", TQDir::Files); - if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) == -1 ) + if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) == -1 ) filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; @@ -622,13 +622,13 @@ Scope* Scope::createSubProject( const TQString& projname ) bool Scope::deleteFunctionScope( unsigned int num ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; Scope* funcScope = m_scopes[ num ]; if ( funcScope ) { - TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( funcScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -642,13 +642,13 @@ bool Scope::deleteFunctionScope( unsigned int num ) bool Scope::deleteSimpleScope( unsigned int num ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; Scope* simpleScope = m_scopes[ num ]; if ( simpleScope ) { - TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.tqfindIndex( simpleScope->m_root ) ]; + TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ]; if( !ast ) return false; m_scopes.remove( num ); @@ -663,7 +663,7 @@ bool Scope::deleteSimpleScope( unsigned int num ) bool Scope::deleteIncludeScope( unsigned int num ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; Scope * incScope = m_scopes[ num ]; @@ -682,14 +682,14 @@ bool Scope::deleteIncludeScope( unsigned int num ) bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) { - if ( !m_root || !m_scopes.tqcontains( num ) ) + if ( !m_root || !m_scopes.contains( num ) ) return false; TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" ); if ( it != m_root->m_tqchildren.end() ) { TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it ); - if ( tempast->values.tqfindIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) + if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() ) { Scope* project = m_scopes[ num ]; if( !project ) @@ -727,7 +727,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir ) { TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit ); updateValues( ast->values, TQStringList( projdir ), true, ast->indent ); - if( m_varCache.tqcontains( "SUBDIRS" ) ) + if( m_varCache.contains( "SUBDIRS" ) ) m_varCache.erase( "SUBDIRS" ); }else return false; @@ -746,7 +746,7 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue for ( TQStringList::const_iterator it = newValues.begin(); it != newValues.end() ; ++it ) { - if ( origValues.tqfindIndex( *it ) == -1 && !remove ) + if ( origValues.findIndex( *it ) == -1 && !remove ) { while ( !origValues.isEmpty() && origValues.last() == getLineEndingString() ) origValues.pop_back(); @@ -769,17 +769,17 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue origValues.append(" "); TQString newval = *it; TQRegExp re("([^$])\\$([^$\\(\\)\\{\\} /]*)( |\\)|/)"); - newval.tqreplace(re, "\\1$(\\2)\\3"); - if( (newval).tqcontains(" ") || (newval).tqcontains("\t") || (newval).tqcontains( getLineEndingString() ) || (newval).tqcontains("#") ) + newval.replace(re, "\\1$(\\2)\\3"); + if( (newval).contains(" ") || (newval).contains("\t") || (newval).contains( getLineEndingString() ) || (newval).contains("#") ) origValues.append( "\""+newval+"\"" ); else origValues.append( newval ); origValues.append( getLineEndingString() ); - } else if ( origValues.tqfindIndex( *it ) != -1 && remove ) + } else if ( origValues.findIndex( *it ) != -1 && remove ) { - TQStringList::iterator posit = origValues.tqfind( *it ); + TQStringList::iterator posit = origValues.find( *it ); posit = origValues.remove( posit ); - while( posit != origValues.end() && ( (*posit).tqfind( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 + while( posit != origValues.end() && ( (*posit).find( TQRegExp("\\\\[\\s]*"+getLineEndingString() ) ) != -1 || (*posit).stripWhiteSpace() == "" ) ) { posit = origValues.remove( posit ); @@ -790,9 +790,9 @@ void Scope::updateValues( TQStringList& origValues, const TQStringList& newValue || origValues.last() == getLineEndingString() || origValues.last().stripWhiteSpace() == "" ) && !origValues.isEmpty() ) origValues.pop_back(); - if( !origValues.isEmpty() && origValues.last().tqfind( TQRegExp("\\\\[ \t]*#") ) != -1 ) - origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].tqfind( "#") ); - if( !origValues.isEmpty() && origValues.last().tqfind( getLineEndingString() ) == -1 ) + if( !origValues.isEmpty() && origValues.last().find( TQRegExp("\\\\[ \t]*#") ) != -1 ) + origValues[origValues.count()-1] = origValues[origValues.count()-1].mid(origValues[origValues.count()-1].find( "#") ); + if( !origValues.isEmpty() && origValues.last().find( getLineEndingString() ) == -1 ) origValues.append(getLineEndingString()); } @@ -801,7 +801,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const if ( !m_root || listIsEmpty( values ) ) return ; - if( m_varCache.tqcontains( variable ) ) + if( m_varCache.contains( variable ) ) m_varCache.erase( variable ); for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i ) @@ -823,7 +823,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const { for ( TQStringList::const_iterator it = values.begin() ; it != values.end() ; ++it ) { - if ( op == "+=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 ) + if ( op == "+=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { if ( assignment->op == "=" ) { @@ -841,7 +841,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const } } } - else if ( op == "-=" && !removeFromOp && assignment->values.tqfindIndex( *it ) != -1 ) + else if ( op == "-=" && !removeFromOp && assignment->values.findIndex( *it ) != -1 ) { updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) @@ -858,7 +858,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const m_root->removeChildAST( assignment ); delete assignment; } - else if ( assignment->op == "+=" && assignment->values.tqfindIndex( *it ) != -1 ) + else if ( assignment->op == "+=" && assignment->values.findIndex( *it ) != -1 ) { updateValues( assignment->values, TQStringList( *it ), true, assignment->indent ); if ( listIsEmpty( assignment->values ) ) @@ -885,7 +885,7 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const else ast->setDepth( m_root->depth()+1 ); m_root->addChildAST( ast ); - if ( values.tqfindIndex( getLineEndingString() ) == -1 ) + if ( values.findIndex( getLineEndingString() ) == -1 ) { ast->values.append( getLineEndingString() ); } @@ -903,7 +903,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString& if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST ) { TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( *it ); - if ( assignment->scopedID == variable && ops.tqfindIndex( assignment->op ) != -1 ) + if ( assignment->scopedID == variable && ops.findIndex( assignment->op ) != -1 ) { return it; } @@ -942,7 +942,7 @@ void Scope::init() { TQMake::AssignmentAST * m = static_cast<TQMake::AssignmentAST*>( *it ); // Check wether TEMPLATE==subdirs here too! - if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if ( m->scopedID == "SUBDIRS" && variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { for ( TQStringList::const_iterator sit = m->values.begin() ; sit != m->values.end(); ++sit ) { @@ -977,7 +977,7 @@ void Scope::init() }else continue; } - if ( subproject.entryList().isEmpty() || subproject.entryList().tqfindIndex( str + ".pro" ) != -1 ) + if ( subproject.entryList().isEmpty() || subproject.entryList().findIndex( str + ".pro" ) != -1 ) projectfile = (str) + ".pro"; else projectfile = subproject.entryList().first(); @@ -992,16 +992,16 @@ void Scope::init() else { if ( !( - KnownVariables.tqfindIndex( m->scopedID ) != -1 + KnownVariables.findIndex( m->scopedID ) != -1 && ( m->op == "=" || m->op == "+=" || m->op == "-=") ) && !( - ( m->scopedID.tqcontains( ".files" ) || m->scopedID.tqcontains( ".path" ) ) - && variableValues("INSTALLS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) ) + ( m->scopedID.contains( ".files" ) || m->scopedID.contains( ".path" ) ) + && variableValues("INSTALLS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) ) ) && !( - ( m->scopedID.tqcontains( ".subdir" ) ) - && variableValues("SUBDIRS").tqfindIndex(m->scopedID.left( m->scopedID.tqfindRev(".") != -1 ) ) + ( m->scopedID.contains( ".subdir" ) ) + && variableValues("SUBDIRS").findIndex(m->scopedID.left( m->scopedID.findRev(".") != -1 ) ) ) ) { @@ -1056,11 +1056,11 @@ void Scope::updateCustomVariable( unsigned int id, const TQString& name, const T { if( !m_root ) return; - if ( id > 0 && m_customVariables.tqcontains( id ) ) + if ( id > 0 && m_customVariables.contains( id ) ) { m_customVariables[ id ] ->values.clear(); updateValues( m_customVariables[ id ] ->values, newvalues.stripWhiteSpace() ); - if( m_varCache.tqcontains( m_customVariables[ id ]->scopedID ) ) + if( m_varCache.contains( m_customVariables[ id ]->scopedID ) ) m_varCache.erase( m_customVariables[ id ]->scopedID ); m_customVariables[ id ] ->op = newop; m_customVariables[ id ] ->scopedID = name; @@ -1084,7 +1084,7 @@ unsigned int Scope::addCustomVariable( const TQString& var, const TQString& op, void Scope::removeCustomVariable( unsigned int id ) { - if( m_customVariables.tqcontains(id) ) + if( m_customVariables.contains(id) ) { TQMake::AssignmentAST* m = m_customVariables[id]; m_customVariables.remove(id); @@ -1220,20 +1220,20 @@ Scope* Scope::disableSubproject( const TQString& dir) if( !m_root || ( m_root->isProject() && !m_incast ) ) return 0; - if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").tqfindIndex( dir ) != -1 ) + if( scopeType() != Scope::IncludeScope && variableValuesForOp( "SUBDIRS", "+=").findIndex( dir ) != -1 ) removeFromPlusOp( "SUBDIRS", dir ); else if( scopeType() != Scope::IncludeScope ) removeFromPlusOp( "SUBDIRS", dir ); TQDir curdir( projectDir() ); - if ( variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) + if ( variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { curdir.cd(dir); TQString filename; TQStringList entries = curdir.entryList("*.pro", TQDir::Files); - if ( !entries.isEmpty() && entries.tqfindIndex( curdir.dirName()+".pro" ) != -1 ) + if ( !entries.isEmpty() && entries.findIndex( curdir.dirName()+".pro" ) != -1 ) filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+entries.first(); else filename = curdir.absPath() + TQString(TQChar(TQDir::separator()))+curdir.dirName()+".pro"; @@ -1285,7 +1285,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !variables.tqcontains( re.cap(1) ) ) + if( !variables.contains( re.cap(1) ) ) { variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) @@ -1303,7 +1303,7 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !variables.tqcontains( re.cap(1) ) ) + if( !variables.contains( re.cap(1) ) ) { variables[re.cap(1)] = resolveVariables( variableValues( re.cap(1), stopHere ) ); if( variables[re.cap(1)].isEmpty() && re.cap(1) == "TARGET" ) @@ -1322,8 +1322,8 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s pos = re.search( (*it), pos ); if( pos > -1 ) { - if( !envvars.tqcontains( re.cap(1) ) ) - if( m_environment.tqcontains( re.cap(1) ) != -1 ) + if( !envvars.contains( re.cap(1) ) ) + if( m_environment.contains( re.cap(1) ) != -1 ) envvars[re.cap(1)] = m_environment[ re.cap(1) ]; else if ( ::getenv( re.cap(1).local8Bit() ) != 0 ) envvars[re.cap(1)] = TQString::fromLocal8Bit( ::getenv( re.cap(1).local8Bit() ) ); @@ -1332,14 +1332,14 @@ TQStringList Scope::resolveVariables( const TQStringList& values, TQMake::AST* s } for( TQMap<TQString, TQString>::const_iterator it2 = envvars.begin(); it2 != envvars.end(); ++it2 ) { - (*it).tqreplace("$$("+it2.key()+")", it2.data() ); + (*it).replace("$$("+it2.key()+")", it2.data() ); } for( TQMap<TQString, TQStringList>::const_iterator it2 = variables.begin(); it2 != variables.end(); ++it2 ) { for( TQStringList::const_iterator it3 = it2.data().begin(); it3 != it2.data().end(); ++it3 ) { - (*it).tqreplace("$$"+it2.key(), *it3 ); - (*it).tqreplace("$${"+it2.key()+"}", *it3 ); + (*it).replace("$$"+it2.key(), *it3 ); + (*it).replace("$${"+it2.key()+"}", *it3 ); } } } @@ -1353,7 +1353,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res TQString file; TQStringList values; TQString header = ""; - if( variableValues("TEMPLATE",false ).tqfindIndex("subdirs") == -1 ) + if( variableValues("TEMPLATE",false ).findIndex("subdirs") == -1 ) { values = variableValues( "INSTALLS" ,false, false ); TQStringList::const_iterator it; @@ -1368,7 +1368,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res { file = myRelPath + TQString(TQChar(TQDir::separator())) + *filesit; file = resolveVariables( file ); - if( file.tqcontains("*") ) + if( file.contains("*") ) { TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); TQDir absDir = fi.dir( true ); @@ -1408,7 +1408,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res { file = myRelPath + TQString(TQChar(TQDir::separator())) + *it; file = resolveVariables( file ); - if( file.tqcontains("*") ) + if( file.contains("*") ) { TQFileInfo fi( projectDirectory + TQString( TQChar( TQDir::separator() ) ) + file ); TQDir absDir = fi.dir( true ); @@ -1493,7 +1493,7 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res else { header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it; - header.tqreplace(TQRegExp("\\.ui$"),".h"); + header.replace(TQRegExp("\\.ui$"),".h"); if( TQFileInfo(header).exists() ) res.insert( TQDir::cleanDirPath( header ) ); } @@ -1595,13 +1595,13 @@ TQString Scope::getLineEndingString() const TQString Scope::replaceWs(TQString s) { - return s.tqreplace( getLineEndingString(), "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); + return s.replace( getLineEndingString(), "%nl").replace("\t", "%tab").replace(" ", "%spc"); } bool Scope::containsContinue(const TQString& s ) const { - return( s.tqfind( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 - || s.tqfind( TQRegExp( "\\\\\\s*#" ) ) != -1 ); + return( s.find( TQRegExp( "\\\\\\s*"+getLineEndingString() ) ) != -1 + || s.find( TQRegExp( "\\\\\\s*#" ) ) != -1 ); } bool Scope::isComment( const TQString& s) const @@ -1670,7 +1670,7 @@ void Scope::PrintAST::leaveFunctionScope( TQMake::ProjectAST* p ) TQString Scope::PrintAST::replaceWs(TQString s) { - return s.tqreplace("\n", "%nl").tqreplace("\t", "%tab").tqreplace(" ", "%spc"); + return s.replace("\n", "%nl").replace("\t", "%tab").replace(" ", "%spc"); } void Scope::PrintAST::processAssignment( TQMake::AssignmentAST* a) @@ -1707,4 +1707,4 @@ TQString Scope::PrintAST::getIndent() } #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index a01adaad..8140b5e6 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -304,5 +304,5 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 54d31735..5cb9260a 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -479,8 +479,8 @@ TQString TrollProjectPart::runDirectory() const }else { TQString name = m_widget->getCurrentOutputFilename(); - if( name.tqfindRev("/") != -1 ) - name = name.right( name.length()-name.tqfindRev("/")-1 ); + if( name.findRev("/") != -1 ) + name = name.right( name.length()-name.findRev("/")-1 ); cwd = DomUtil::readEntry( dom, "/kdevtrollproject/run/cwd/" + name ); } if( cwd.isEmpty() ) @@ -490,7 +490,7 @@ TQString TrollProjectPart::runDirectory() const { destpath = m_widget->subprojectDirectory() + TQString( TQChar( TQDir::separator() ) ) + destpath; } - destpath = destpath.left( destpath.tqfindRev("/") ); + destpath = destpath.left( destpath.findRev("/") ); cwd = destpath; } @@ -538,7 +538,7 @@ TQString TrollProjectPart::mainProgram() const return TQString(); } - if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").tqfindIndex("app") == -1 ) + if ( m_widget->currentSubproject()->scope->variableValues("TEMPLATE").findIndex("app") == -1 ) { KMessageBox::error( m_widget, "Selected Subproject \""+m_widget->currentSubproject()->scope->projectName()+"\"isn't binary ( " + m_widget->currentSubproject()->scope->variableValues("TEMPLATE").join(" ") + " ) !\n" "Unable to determine the main program. If you want this\n" @@ -715,9 +715,9 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) TQDir d(dir); TQStringList l = d.entryList("*.pro"); - if( l.isEmpty() || ( l.count() && l.tqfindIndex( projectName() + ".pro" ) != -1 ) ) + if( l.isEmpty() || ( l.count() && l.findIndex( projectName() + ".pro" ) != -1 ) ) cmdline += projectName()+".pro"; - else if( l.isEmpty() || (l.count() && l.tqfindIndex( fi.baseName() + ".pro" ) != -1 ) ) + else if( l.isEmpty() || (l.count() && l.findIndex( fi.baseName() + ".pro" ) != -1 ) ) cmdline += fi.baseName() + ".pro"; else cmdline += l[0]; @@ -778,7 +778,7 @@ bool TrollProjectPart::isDirty() TQString fileName = *it; ++it; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( fileName ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( fileName ); TQDateTime t = TQFileInfo( projectDirectory(), fileName ).lastModified(); if( it == m_timestamp.end() || *it != t ){ return true; @@ -813,14 +813,14 @@ void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } @@ -874,8 +874,8 @@ TQStringList recursiveProFind( const TQString &currDir, const TQString &baseDir { TQStringList fileList; - if( !currDir.tqcontains( TQString( TQChar ( TQDir::separator() ) ) +".." ) - && !currDir.tqcontains( TQString( TQChar( TQDir::separator() ) )+".") ) + if( !currDir.contains( TQString( TQChar ( TQDir::separator() ) ) +".." ) + && !currDir.contains( TQString( TQChar( TQDir::separator() ) )+".") ) { TQDir dir(currDir); TQStringList dirList = dir.entryList(TQDir::Dirs ); @@ -926,6 +926,6 @@ void TrollProjectPart::slotBuild() #include "trollprojectpart.moc" -//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 148f8b22..4baf0b6b 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -339,9 +339,9 @@ void TrollProjectWidget::openProject( const TQString &dirName ) TQStringList l = dir.entryList( "*.pro" ); TQString profile; - if( l.count() && l.tqfindIndex( m_part->projectName() + ".pro") != -1 ) + if( l.count() && l.findIndex( m_part->projectName() + ".pro") != -1 ) profile = m_part->projectName()+".pro"; - else if( l.isEmpty() || ( l.count() && l.tqfindIndex( fi.baseName() + ".pro") != -1 ) ) + else if( l.isEmpty() || ( l.count() && l.findIndex( fi.baseName() + ".pro") != -1 ) ) profile = fi.baseName()+".pro"; else profile = l[0]; @@ -362,7 +362,7 @@ void TrollProjectWidget::openProject( const TQString &dirName ) m_rootSubproject->setOpen( true ); - if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 ) + if ( m_rootSubproject->firstChild() && m_rootSubproject->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) { overview->setSelected( m_rootSubproject->firstChild(), true ); } @@ -433,11 +433,11 @@ void TrollProjectWidget::setupContext() TQStringList tmpl = m_shownSubproject->scope->variableValues( "TEMPLATE" ); - if ( tmpl.tqfindIndex( "lib" ) != -1 ) + if ( tmpl.findIndex( "lib" ) != -1 ) { runable = false; } - else if ( tmpl.tqfindIndex( "subdirs" ) != -1 ) + else if ( tmpl.findIndex( "subdirs" ) != -1 ) { hasSubdirs = true; runable = false; @@ -519,7 +519,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename() if ( m_shownSubproject->scope->variableValues( "TARGET", true, true, true ).isEmpty() ) { TQString exe = m_shownSubproject->scope->resolveVariables(m_shownSubproject->scope->fileName()); - return exe.tqreplace( TQRegExp( "\\.pro$" ), "" ); + return exe.replace( TQRegExp( "\\.pro$" ), "" ); } else { @@ -557,7 +557,7 @@ void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView { // Insert all GroupItems and all of their tqchildren into the view - if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).tqfindIndex("subdirs") != -1 ) + if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 ) return ; TQMapIterator<GroupItem::GroupType, GroupItem*> it2 = item->groups.begin(); @@ -669,7 +669,7 @@ void TrollProjectWidget::slotExecuteTarget() // Only run application projects - if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "app" ) == -1 ) + if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() && m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) == -1 ) return ; //only run once @@ -913,7 +913,7 @@ void TrollProjectWidget::addSubprojectToItem( QMakeScopeItem* spitem, const TQSt { spitem->scope->removeFromMinusOp( "SUBDIRS", subdirname ); delete item; - if( spitem->scope->variableValues( "SUBDIRS" ).tqfindIndex( subdirname ) != -1 ) + if( spitem->scope->variableValues( "SUBDIRS" ).findIndex( subdirname ) != -1 ) return; } } @@ -1026,7 +1026,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. " "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); - if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) + if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) ); popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) ); @@ -1051,11 +1051,11 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. " "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be " "defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) ); - if ( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) + if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idAddSubproject, false ); idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) ); popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) ); - if( spitem->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) == -1 ) + if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 ) popup.setItemEnabled( idDisableSubproject, false ); popup.insertSeparator(); idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) ); @@ -1144,7 +1144,7 @@ void TrollProjectWidget::addFileToCurrentSubProject( GroupItem::GroupType gtype, GroupItem *gitem = 0; - if ( m_shownSubproject->groups.tqcontains( gtype ) ) + if ( m_shownSubproject->groups.contains( gtype ) ) gitem = m_shownSubproject->groups[ gtype ]; if ( !gitem ) @@ -1170,12 +1170,12 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo TQString fileName = *it; kdDebug(9024) << "Adding file:" << fileName << " " << relativeToProjectRoot << endl; - if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).tqfindIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) + if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) != -1 && !fileName.endsWith(".pro") ) { ChooseSubprojectDlg dlg( this, false ); if ( dlg.exec() == TQDialog::Accepted ) { - if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").tqfindIndex( "subdirs" ) != -1 ) + if ( dlg.selectedSubproject() && dlg.selectedSubproject()->scope->variableValues("TEMPLATE").findIndex( "subdirs" ) != -1 ) { fileName = URLUtil::getRelativePath( dlg.selectedSubproject()->scope->projectDir() , TQDir::cleanDirPath( @@ -1213,7 +1213,7 @@ void TrollProjectWidget::addFiles( TQStringList &files, bool relativeToProjectRo kdDebug(9024) << "calc filename:" << noPathFileName << endl; // GroupItem *gitem = 0; // GroupItem::GroupType gtype = GroupItem::groupTypeForExtension( ext ); -// if ( m_shownSubproject->groups.tqcontains( gtype ) ) +// if ( m_shownSubproject->groups.contains( gtype ) ) // gitem = m_shownSubproject->groups[ gtype ]; @@ -1307,7 +1307,7 @@ void TrollProjectWidget::slotAddFiles() *proc << files[ i ]; *proc << cleanSubprojectDir; proc->start(KProcess::Block); - TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1333,7 +1333,7 @@ void TrollProjectWidget::slotAddFiles() GroupItem* TrollProjectWidget::getInstallRoot( QMakeScopeItem* item ) { - if ( item->groups.tqcontains( GroupItem::InstallRoot ) ) + if ( item->groups.contains( GroupItem::InstallRoot ) ) return item->groups[ GroupItem::InstallRoot ]; return 0; } @@ -1651,7 +1651,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it *proc << files[ i ]; *proc << cleanSubprojectPath; proc->start(KProcess::Block); - TQString filename = files[ i ].right( files[ i ].length() - files[ i ].tqfindRev( '/' ) - 1 ); + TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); if ( testExist.exists() ) @@ -1776,7 +1776,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard " "and prompts to implement missing in childclass slots and functions." ) ); } - if ( fitem->text( 0 ).tqcontains( ".ui" ) ) + if ( fitem->text( 0 ).contains( ".ui" ) ) { idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) ); popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. " @@ -1827,9 +1827,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it } else if ( r == idViewUIH ) { - kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).tqreplace(".ui","") << endl; + kdDebug(9024) << "Opening:" << fitem->text(0) << ";" << fitem->text(0).replace(".ui","") << endl; m_part->partController() ->editDocument( KURL( m_shownSubproject->scope->projectDir() + TQChar( TQDir::separator() ) + - fitem->localFilePath.tqreplace(".ui","") + ".h" ) ); + fitem->localFilePath.replace(".ui","") + ".h" ) ); } else if ( r == idSubclassWidget ) @@ -1850,7 +1850,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it list << DomUtil::Pair( srcfile_relpath, uifile_relpath ); DomUtil::writePairListEntry( dom, "/kdevtrollproject/subclassing", "subclass", "sourcefile", "uifile", list ); - // newFileNames[i] = newFileNames[i].tqreplace(TQRegExp(projectDirectory()+"/"),""); + // newFileNames[i] = newFileNames[i].replace(TQRegExp(projectDirectory()+"/"),""); qWarning( "new file: %s", newFileNames[ i ].latin1() ); } m_subclasslist = DomUtil::readPairListEntry( dom, "/kdevtrollproject/subclassing" , @@ -1862,11 +1862,11 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it else if ( r == idUpdateWidgetclass ) { TQString noext = fitem->text( 0 ); - if ( noext.tqfindRev( '.' ) > -1 ) - noext = noext.left( noext.tqfindRev( '.' ) ); + if ( noext.findRev( '.' ) > -1 ) + noext = noext.left( noext.findRev( '.' ) ); TQStringList dummy; TQString uifile = fitem->uiFileLink; - if ( uifile.tqfindRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) + if ( uifile.findRev( TQString( TQChar( TQDir::separator() ) ) ) > -1 ) { TQStringList uisplit = TQStringList::split( TQString( TQChar( TQDir::separator() ) ), uifile ); uifile = uisplit[ uisplit.count() - 1 ]; @@ -2426,7 +2426,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) m_filesCached = false; m_allFilesCache.clear(); - if( spitem->scope->variableValues("TEMPLATE").tqfindIndex("subdirs") != -1 ) + if( spitem->scope->variableValues("TEMPLATE").findIndex("subdirs") != -1 ) { TQStringList subdirs = spitem->scope->variableValues( "SUBDIRS" ); DisableSubprojectDlg dlg( subdirs ); @@ -2436,7 +2436,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem ) TQListViewItem* item = spitem->firstChild(); while( item ) { - if( values.tqfindIndex( item->text(0) ) != -1 ) + if( values.findIndex( item->text(0) ) != -1 ) delete item; item = item->nextSibling(); } @@ -2543,5 +2543,5 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const #include "trollprojectwidget.moc" -//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index d5e86a17..5d07c798 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -216,4 +216,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 41683113..0697f5f1 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -76,7 +76,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog() void ScriptNewFileDialog::accept() { TQString fileName = filename_edit->text(); - if (fileName.tqfind('/') != -1) { + if (fileName.find('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } diff --git a/kdevdesigner/LICENSE.GPL b/kdevdesigner/LICENSE.GPL index 2ad70b8b..c13faf0d 100644 --- a/kdevdesigner/LICENSE.GPL +++ b/kdevdesigner/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index f40739f4..c250f60e 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -378,7 +378,7 @@ void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); - else if ( w->isWidgetType() && formWindow->widgets()->tqfind( w ) ) { + else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) { formWindow->clearSelection( FALSE ); formWindow->selectWidget( w ); } @@ -392,7 +392,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * const int ID_DELETE = 1; const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it != actionMap.end() && ::tqqt_cast<QSeparatorAction*>(*it) ) menu.insertItem( i18n( "Delete Separator" ), ID_DELETE ); else @@ -402,11 +402,11 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * menu.insertItem( i18n( "Delete Toolbar" ), ID_DELTOOLBAR ); int res = menu.exec( e->globalPos() ); if ( res == ID_DELETE ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). tqarg( a->name() ).tqarg( caption() ), @@ -416,7 +416,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); TQAction *a = new QSeparatorAction( 0 ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -457,11 +457,11 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) void QDesignerToolBar::removeWidget( TQWidget *w ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( w ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). tqarg( a->name() ).tqarg( caption() ), @@ -478,13 +478,13 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; if ( !a ) return; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ). tqarg( a->name() ).tqarg( caption() ), @@ -499,7 +499,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); if ( ::tqqt_cast<QDesignerAction*>(a) ) { - if ( formWindow->widgets()->tqfind( ( (QDesignerAction*)a )->widget() ) ) + if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) formWindow->selectWidget( ( TQT_TQOBJECT(( (QDesignerAction*)a )->widget())), FALSE ); } if ( !drag->drag() ) { @@ -547,7 +547,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) indicator->hide(); TQAction *a = 0; - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -562,7 +562,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) a = ::tqqt_cast<QDesignerActionGroup*>(ActionDrag::action()); } - if ( actionList.tqfindRef( a ) != -1 ) { + if ( actionList.findRef( a ) != -1 ) { TQMessageBox::warning( MainWindow::self, i18n( "Insert/Move Action" ), i18n( "Action '%1' has already been added to this toolbar.\n" "An Action may only occur once in a given toolbar." ). @@ -693,7 +693,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); QDesignerAction *a = new QDesignerAction( w, tqparent() ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index 8ee705c8..ee3e16ed 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -91,7 +91,7 @@ public: void init(); TQWidget *widget() const { return wid; } - TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); } + TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } int index() const { return idx; } protected: diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp index ae8661b4..3b1e4b45 100644 --- a/kdevdesigner/designer/asciivalidator.cpp +++ b/kdevdesigner/designer/asciivalidator.cpp @@ -85,7 +85,7 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const } } - if ( allowedChars.tqfind( s[ i ] ) != -1 ) + if ( allowedChars.find( s[ i ] ) != -1 ) continue; s[i] = '_'; diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index 63ed9e0a..8d3d5161 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -373,7 +373,7 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { - if ( copyOfWidgets.tqfind( c ) == -1 && formWindow()->widgets()->tqfind( c ) ) { + if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); copyOfWidgets.append(c); @@ -419,7 +419,7 @@ void DeleteCommand::unexecute() w->setName( s ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( TQT_TQOBJECT(w) ); - TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w ); + TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender, @@ -490,7 +490,7 @@ bool SetPropertyCommand::canMerge( Command *c ) if ( !widget ) return FALSE; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; @@ -563,16 +563,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( select ) editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "tqalignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); @@ -1794,7 +1794,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *columnFields.tqfind( col.text ); + col.field = *columnFields.find( col.text ); oldColumns.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -2131,7 +2131,7 @@ void AddActionToPopupCommand::execute() void AddActionToPopupCommand::unexecute() { item->hideMenu(); - int i = menu->tqfind( item->action() ); + int i = menu->find( item->action() ); menu->remove( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2200,7 +2200,7 @@ RenameActionCommand::RenameActionCommand( const TQString &n, void RenameActionCommand::execute() { TQString actionText = newName; - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = newName; action->setText( actionText ); action->setMenuText( menuText ); diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h index 1a2bd1b8..438ed832 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui.h +++ b/kdevdesigner/designer/configtoolboxdialog.ui.h @@ -51,7 +51,7 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.tqfind( grp ); + TQListViewItem *tqparent = groups.find( grp ); if ( !tqparent ) { tqparent = new TQListViewItem( listViewTools ); tqparent->setText( 0, grp ); diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp index efb2406a..d43bb874 100644 --- a/kdevdesigner/designer/connectionitems.cpp +++ b/kdevdesigner/designer/connectionitems.cpp @@ -220,7 +220,7 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -277,7 +277,7 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -453,7 +453,7 @@ void SlotItem::updateSlotList() TQMetaData::Protected) ) && !ignoreSlot( md->tqt_mo_ci_name ) && checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) ) - if ( lst.tqfind( md->tqt_mo_ci_name ) == lst.end() ) + if ( lst.find( md->tqt_mo_ci_name ) == lst.end() ) lst << MetaDataBase::normalizeFunction( md->tqt_mo_ci_name ); } @@ -470,7 +470,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } @@ -487,7 +487,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp index 3a1437ab..a5a270c6 100644 --- a/kdevdesigner/designer/customwidgeteditorimpl.cpp +++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp @@ -363,7 +363,7 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i ) if ( !i ) return 0; - TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.tqfind( i ); + TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.find( i ); if ( it == customWidgets.end() ) return 0; return *it; @@ -461,7 +461,7 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s ) if ( !w || listSignals->currentItem() == -1 ) return; - TQValueList<TQCString>::Iterator it = w->lstSignals.tqfind( listSignals->currentText().latin1() ); + TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); if ( it != w->lstSignals.end() ) w->lstSignals.remove( it ); listSignals->blockSignals( TRUE ); @@ -479,7 +479,7 @@ void CustomWidgetEditor::slotAccessChanged( const TQString &s ) MetaDataBase::Function slot; slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 1, s ); @@ -498,7 +498,7 @@ void CustomWidgetEditor::slotNameChanged( const TQString &s ) slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); slot.type = "slot"; - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 0, s ); @@ -574,7 +574,7 @@ void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 1, s ); @@ -592,7 +592,7 @@ void CustomWidgetEditor::propertyNameChanged( const TQString &s ) MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 0, s ); @@ -671,11 +671,11 @@ static TQString makeIndent2( int indent ) static TQString entitize2( const TQString &s ) { TQString s2 = s; - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); + s2 = s2.replace( "'", "'" ); return s2; } diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp index 0d4a5883..d564cd6c 100644 --- a/kdevdesigner/designer/designerappiface.cpp +++ b/kdevdesigner/designer/designerappiface.cpp @@ -732,7 +732,7 @@ TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIc void DesignerFormWindowImpl::addAction( TQAction *a ) { - if ( formWindow->actionList().tqfindRef( a ) != -1 ) + if ( formWindow->actionList().findRef( a ) != -1 ) return; formWindow->actionList().append( a ); MetaDataBase::addEntry( a ); @@ -770,7 +770,7 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { - int id = o->tqmetaObject()->tqfindProperty( property, TRUE ); + int id = o->tqmetaObject()->findProperty( property, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) o->setProperty( property, value ); @@ -780,7 +780,7 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { - int id = o->tqmetaObject()->tqfindProperty( prop, TRUE ); + int id = o->tqmetaObject()->findProperty( prop, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) return o->property( prop ); diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp index 8a91c9f6..1c3e2bc9 100644 --- a/kdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -175,10 +175,10 @@ void EditFunctions::okClicked() TQString s = function.function; s = s.simplifyWhiteSpace(); bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9'; - bool noParens = s.tqcontains( '(' ) != 1 || s.tqcontains( ')' ) != 1; - bool illegalSpace = s.tqfind( ' ' ) != -1 && s.tqfind( ' ' ) < s.tqfind( '(' ); + bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1; + bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' ); - if ( startNum || noParens || illegalSpace || lst.tqfind( function.function ) != -1 ) { + if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) { invalidFunctions = TRUE; invalidItems.append( (*it) ); continue; @@ -454,7 +454,7 @@ void EditFunctions::currentTypeChanged( const TQString &type ) void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV ) { int itemId; - TQMap<TQListViewItem*, int>::Iterator fit = functionIds.tqfind( item ); + TQMap<TQListViewItem*, int>::Iterator fit = functionIds.find( item ); if ( fit != functionIds.end() ) itemId = *fit; else diff --git a/kdevdesigner/designer/finddialog.ui.h b/kdevdesigner/designer/finddialog.ui.h index 063d9156..126c0a5f 100644 --- a/kdevdesigner/designer/finddialog.ui.h +++ b/kdevdesigner/designer/finddialog.ui.h @@ -41,7 +41,7 @@ void FindDialog::doFind() if ( !editor ) return; - if ( !editor->tqfind( comboFind->currentText(), checkCase->isChecked(), + if ( !editor->find( comboFind->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) ) checkBegin->setChecked( TRUE ); else diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp index 1e9c489d..e485fbb9 100644 --- a/kdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -50,17 +50,17 @@ static TQString make_func_pretty( const TQString &s ) { TQString res = s; - if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 ) + if ( res.find( ")" ) - res.find( "(" ) == 1 ) return res; - res.tqreplace( "(", "( " ); - res.tqreplace( ")", " )" ); - res.tqreplace( "&", " &" ); - res.tqreplace( "*", " *" ); - res.tqreplace( ",", ", " ); - res.tqreplace( ":", " : " ); + res.replace( "(", "( " ); + res.replace( ")", " )" ); + res.replace( "&", " &" ); + res.replace( "*", " *" ); + res.replace( ",", ", " ); + res.replace( ":", " : " ); res = res.simplifyWhiteSpace(); - res.tqreplace( " : : ", "::" ); - res.tqreplace( ">>", "> >" ); + res.replace( " : : ", "::" ); + res.replace( ">>", "> >" ); return res; } @@ -111,7 +111,7 @@ void FormFile::setFileName( const TQString &fn ) return; if ( fn.isEmpty() ) { fileNameTemp = TRUE; - if ( filename.tqfind( "unnamed" ) != 0 ) + if ( filename.find( "unnamed" ) != 0 ) filename = createUnnamedFileName(); return; } else { @@ -249,7 +249,7 @@ bool FormFile::saveAs( bool ignoreModified ) TQString f = pro->makeAbsolute( fileName() ); if ( fileNameTemp && TQT_TQOBJECT(formWindow()) ) { f = TQString( formWindow()->name() ).lower(); - f.tqreplace( "::", "_" ); + f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); } bool saved = FALSE; @@ -745,7 +745,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) int line = 0; int start = 0; while ( line < (*fit).start - 1 ) { - start = sourceCode.tqfind( '\n', start ); + start = sourceCode.find( '\n', start ); if ( start == -1 ) return; start++; @@ -755,7 +755,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) return; int end = start; while ( line < (*fit).end + 1 ) { - end = sourceCode.tqfind( '\n', end ); + end = sourceCode.find( '\n', end ); if ( end == -1 ) { if ( line <= (*fit).end ) end = sourceCode.length() - 1; @@ -777,7 +777,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new { if ( !cod.isEmpty() ) { TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" ); - int i = cod.tqfind( funcStart + oldName ); + int i = cod.find( funcStart + oldName ); if ( i != -1 ) { cod.remove( i + funcStart.length(), oldName.length() ); cod.insert( i + funcStart.length(), newName ); @@ -791,7 +791,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName; TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName; - int i = cod.tqfind( oldFunct ); + int i = cod.find( oldFunct ); if ( i != -1 ) { cod.remove( i, oldFunct.length() ); cod.insert( i, newFunct ); @@ -816,7 +816,7 @@ TQString FormFile::formName() const while ( !ts.eof() ) { line = ts.readLine(); if ( !className.isEmpty() ) { - int end = line.tqfind( "</class>" ); + int end = line.find( "</class>" ); if ( end == -1 ) { className += line; } else { @@ -826,8 +826,8 @@ TQString FormFile::formName() const continue; } int start; - if ( ( start = line.tqfind( "<class>" ) ) != -1 ) { - int end = line.tqfind( "</class>" ); + if ( ( start = line.find( "<class>" ) ) != -1 ) { + int end = line.find( "</class>" ); if ( end == -1 ) { className = line.mid( start + 7 ); } else { diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index 312b543f..6070b378 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -95,7 +95,7 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start ) static void restoreCursors( TQWidget *start, FormWindow *fw ) { - if ( fw->widgets()->tqfind( start ) ) + if ( fw->widgets()->find( start ) ) start->setCursor( MetaDataBase::cursor( start ) ); else start->setCursor( TQt::ArrowCursor ); @@ -258,7 +258,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) TQPixmap grid; TQString grid_name; grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); - if( !TQPixmapCache::tqfind( grid_name, grid ) ) { + if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); TQBitmap tqmask( grid.width(), grid.height() ); @@ -435,10 +435,10 @@ void FormWindow::insertWidget() ++it; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( TQT_TQWIDGET(o) ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) { + insertedWidgets.find( TQT_TQWIDGET(o) ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) { TQRect r2( ( (TQWidget*)o )->pos(), ( (TQWidget*)o )->size() ); - if ( r.tqcontains( r2 ) ) + if ( r.contains( r2 ) ) lst.append( (TQWidget*)o ); } } @@ -542,7 +542,7 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || - !insertedWidgets.tqfind(w) ) ) + !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { e->accept(); @@ -599,7 +599,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; - if ( insertedWidgets.tqfind( (TQWidget*)o ) ) + if ( insertedWidgets.find( (TQWidget*)o ) ) selectWidget( TQT_TQOBJECT(o), FALSE ); } setPropertyShowingBlocked( FALSE ); @@ -619,7 +619,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) ) + ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving @@ -677,7 +677,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) orderedWidgets.removeRef( w ); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -723,7 +723,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) orderedWidgets.clear(); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -757,7 +757,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) ) + ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.find(w ) ) ) w = w->parentWidget(); // calc correct position @@ -863,13 +863,13 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) wid = designerWidget( TQT_TQOBJECT(wid) ); - if ( wid && ( isMainContainer( TQT_TQOBJECT(wid) ) || insertedWidgets.tqfind( wid ) ) && wid->isVisibleTo( this ) ) + if ( wid && ( isMainContainer( TQT_TQOBJECT(wid) ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && - ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.tqfind( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) + ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) endWidget = newendWidget; mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ). arg( endWidget->name() ) ); @@ -896,7 +896,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; - else if ( insertedWidgets.tqfind( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) + else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) ) endWidget = newendWidget; if ( endWidget ) mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ). @@ -930,7 +930,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( widgetPressed && allowMove( w ) ) { // we moved the widget sizePreviewLabel->hide(); - if ( moving.isEmpty() || w->pos() == *moving.tqfind(w) ) + if ( moving.isEmpty() || w->pos() == *moving.find(w) ) break; // restore targetContainer @@ -1163,7 +1163,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING ); if ( !l ) return; - if ( l->tqfind( TQT_TQOBJECT(w) ) != -1 ) + if ( l->find( TQT_TQOBJECT(w) ) != -1 ) e->accept(); delete l; } @@ -1213,7 +1213,7 @@ void FormWindow::selectWidget( TQObject *o, bool select ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) emitShowProperties( propertyWidget ); - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) { s->show(); return; @@ -1233,7 +1233,7 @@ void FormWindow::selectWidget( TQObject *o, bool select ) s->setWidget( w ); emitSelectionChanged(); } else { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->setWidget( 0 ); TQObject *opw = propertyWidget; @@ -1258,7 +1258,7 @@ TQPoint FormWindow::grid() const void FormWindow::updateSelection( TQWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) selectWidget( TQT_TQOBJECT(w), FALSE ); else if ( s ) @@ -1267,14 +1267,14 @@ void FormWindow::updateSelection( TQWidget *w ) void FormWindow::raiseSelection( TQWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->show(); } void FormWindow::repaintSelection( TQWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->update(); } @@ -1373,7 +1373,7 @@ void FormWindow::selectWidgets() TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) ); p = mapFromGlobal( p ); TQRect r( p, ( (TQWidget*)o )->size() ); - if ( r.intersects( currRect ) && !r.tqcontains( currRect ) ) + if ( r.intersects( currRect ) && !r.contains( currRect ) ) selectWidget( TQT_TQOBJECT(o) ); } } @@ -1385,7 +1385,7 @@ void FormWindow::selectWidgets() bool FormWindow::isWidgetSelected( TQObject *w ) { if ( w->isWidgetType() ) - return usedSelections.tqfind( (TQWidget*)w ) != 0; + return usedSelections.find( (TQWidget*)w ) != 0; return FALSE; // #### do stuff for TQObjects } @@ -1428,7 +1428,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { - if ( l->tqfindRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) + if ( l->findRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) it.current()->show(); } delete l; @@ -1440,7 +1440,7 @@ void FormWindow::updateChildSelections( TQWidget *w ) if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) updateSelection( (TQWidget*)o ); } delete l; @@ -1460,7 +1460,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) if ( it.current()->widget() == mainContainer() ) continue; ++it; - if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) { + if ( l->find( TQT_TQOBJECT(sel->widget()) ) == -1 ) { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) sel->setWidget( 0 ); } else { @@ -1569,7 +1569,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry( TQRect &r ) { - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( r ) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { if ( r.left() < rect().left() ) r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) @@ -1782,7 +1782,7 @@ void FormWindow::showOrderIndicators() w->focusPolicy() != TQ_NoFocus ) { OrderIndicator* ind = new OrderIndicator( order++, w, this ); orderIndicators.append( ind ); - if ( stackedWidgets.tqfindRef( w ) == -1 ) + if ( stackedWidgets.findRef( w ) == -1 ) stackedWidgets.append( w ); } } @@ -1881,14 +1881,14 @@ void FormWindow::lowerWidgets() void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) { - int i = txt.tqfind( "&" ); + int i = txt.find( "&" ); if ( i == -1 ) return; TQChar c = txt[ i + 1 ]; if ( c.isNull() || c == '&' ) return; c = c.lower(); - TQMap<TQChar, TQWidgetList >::Iterator it = accels.tqfind( c ); + TQMap<TQChar, TQWidgetList >::Iterator it = accels.find( c ); if ( it == accels.end() ) { TQWidgetList wl; wl.append( w ); @@ -1910,11 +1910,11 @@ void FormWindow::checkAccels() insertedWidgets[ (void*)o ] ) { TQWidget *w = (TQWidget*)o; const TQMetaProperty* text = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); const TQMetaProperty* title = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); const TQMetaProperty* pageTitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( text ) find_accel( w->property( "text" ).toString(), accels, w ); if ( title ) @@ -2060,7 +2060,7 @@ void FormWindow::layoutHorizontalContainer( TQWidget *w ) for ( TQObject *o = l.first(); o; o = l.next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out ChildrenQt::Horizontally" ), @@ -2081,7 +2081,7 @@ void FormWindow::layoutVerticalContainer( TQWidget *w ) for ( TQObject *o = l.first(); o; o = l.next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out ChildrenQt::Vertically" ), @@ -2105,7 +2105,7 @@ void FormWindow::layoutGridContainer( TQWidget *w ) for ( TQObject *o = l.first(); o; o = l.next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out Children in a Grid" ), @@ -2157,7 +2157,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) if ( o->isWidgetType() && !mainWindow()->isAToolBarChild( TQT_TQOBJECT(o) ) && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } return new BreakLayoutCommand( i18n( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets ); @@ -2190,7 +2190,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) { + insertedWidgets.find( (TQWidget*)o ) ) { delete l; return TRUE; } @@ -2204,7 +2204,7 @@ bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { - if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) + if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) return TRUE; w = w->parentWidget(); } @@ -2280,7 +2280,7 @@ void FormWindow::restoreConnectionLine() w = h = 64; r = r.normalize(); - while ( r.tqcontains( p ) ) { + while ( r.contains( p ) ) { unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) ); unclippedPainter->setPen( red ); p.setX( p.x() + dx ); @@ -2451,7 +2451,7 @@ bool FormWindow::isDatabaseWidgetUsed() const TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { TQString c( it.current()->className() ); - if ( dbClasses.tqcontains( c ) > 0 ) { + if ( dbClasses.contains( c ) > 0 ) { return TRUE; } } @@ -2525,7 +2525,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if ( TQT_TQRECT_OBJECT(rect()).tqcontains( mapFromGlobal( pos ) ) ) { + if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); } @@ -2536,7 +2536,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) continue; if ( !it.current()->isVisibleTo( this ) ) continue; - if ( selected.tqfind( it.current() ) != -1 ) + if ( selected.find( it.current() ) != -1 ) continue; if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ) ) ) && it.current() != mainContainer() ) @@ -2545,7 +2545,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { - if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) ) + if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) break; w = w->parentWidget(); } @@ -2553,8 +2553,8 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( it.current()->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) > - ( container->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) ) + if ( ( it.current()->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(it.current()) ) > + ( container->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(container) ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp index 5f747a37..a617ac31 100644 --- a/kdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -257,7 +257,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; - if ( !formWindow->widgets()->tqfind( w ) ) { + if ( !formWindow->widgets()->find( w ) ) { if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); @@ -477,7 +477,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; - if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) { + if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); @@ -488,7 +488,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) stack = (TQWidgetStack*)obj; else stack = (TQWidgetStack*)obj->tqparent(); - if ( widgetStacks->tqfindRef( stack ) != -1 ) + if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); TQObjectList *l2 = stack->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, TRUE, FALSE ); @@ -599,7 +599,7 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) return; if ( !o->isWidgetType() || - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->tqfind( (TQWidget*)o ) ) ) + ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->find( (TQWidget*)o ) ) ) return; TQWidget *w = (TQWidget*)o; diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index b79604bf..cda34aba 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -54,7 +54,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge setWidget(m_widget); setupActions(); - if (args.tqcontains("in shell")) + if (args.contains("in shell")) setXMLFile("kdevdesigner_part_sh.rc"); else setXMLFile("kdevdesigner_part.rc"); diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index 450f4633..8dd642b8 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -197,7 +197,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) formWindow->insertWidget( layoutBase ); formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); TQString n = layoutBase->name(); - if ( n.tqfind( "qt_dead_widget_" ) != -1 ) { + if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); layoutBase->setName( n ); } @@ -250,7 +250,7 @@ void Layout::breakLayout() w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { - TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w ); + TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w ); if ( it != rects.end() ) w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); } diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 87e15a74..8ad20987 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -142,7 +142,7 @@ static TQString textNoAccel( const TQString& text) { TQString t = text; int i; - while ( (i = t.tqfind('&') )>= 0 ) { + while ( (i = t.find('&') )>= 0 ) { t.remove(i,1); } return t; @@ -753,10 +753,10 @@ void MainWindow::helpContents() TQTextStream ts( &f ); while ( !ts.eof() ) { TQString s = ts.readLine(); - int from = s.tqfind( "\"" ); + int from = s.find( "\"" ); if ( from == -1 ) continue; - int to = s.tqfindRev( "\"" ); + int to = s.findRev( "\"" ); if ( to == -1 ) continue; propertyDocumentation[ s.mid( from + 1, to - from - 1 ) ] = s.mid( to + 2 ) + "-prop"; @@ -782,7 +782,7 @@ void MainWindow::helpContents() else source = propertyDocumentation[ "TQObject/name" ]; } else { - while ( mo && !propertyDocumentation.tqcontains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) + while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) mo = mo->tqsuperClass(); if ( mo ) source = "p:" + propertyDocumentation[s]; @@ -945,7 +945,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) } else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) { PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o); PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() ); - if ( m->tqfind( i->action() ) != -1 && !i->isSeparator() ) + if ( m->find( i->action() ) != -1 && !i->isSeparator() ) showProperties( i->action() ); } return TQMainWindow::eventFilter( o, e ); @@ -1262,7 +1262,7 @@ FormWindow *MainWindow::formWindow() if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) ) fw = (FormWindow*)qworkspace->activeWindow(); else if ( lastActiveFormWindow && - qworkspace->windowList().tqfind( lastActiveFormWindow ) != -1) + qworkspace->windowList().find( lastActiveFormWindow ) != -1) fw = lastActiveFormWindow; return fw; } @@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) text = 0; - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) title = 0; const TQMetaProperty* pagetitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pixmap", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE ); if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 ) pixmap = 0; @@ -2132,7 +2132,7 @@ void MainWindow::selectionChanged() static TQString fixArgs( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ',', ';' ); + return s.replace( ',', ';' ); } void MainWindow::writeConfig() @@ -2242,7 +2242,7 @@ void MainWindow::writeConfig() static TQString fixArgs2( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ';', ',' ); + return s.replace( ';', ',' ); } void MainWindow::readConfig() @@ -2290,14 +2290,14 @@ void MainWindow::readConfig() } // We know that the oldSettingsKey() will return 3.1 if ( keybase == DesignerApplication::oldSettingsKey() ) { - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyFiles = config.readListEntry( keybase + "RecentlyOpenedFiles", ',' ); else recentlyFiles = config.readListEntry(keybase + "RecentlyOpenedFiles"); if ( recentlyFiles.count() == 1 && recentlyFiles[0].isNull() ) recentlyFiles.clear(); - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects", ',' ); else recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects"); @@ -2574,7 +2574,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { TQString sig = sigs.at( i ); - if ( sig.left( sig.tqfind( '(' ) ) == defSignal ) { + if ( sig.left( sig.find( '(' ) ) == defSignal ) { fullSignal = sig; break; } @@ -2582,14 +2582,14 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( !fullSignal.isEmpty() ) { TQString signl = fullSignal; - fullSignal = fullSignal.mid( fullSignal.tqfind( '(' ) + 1 ); + fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 ); fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); s += "(" + fullSignal + ")"; if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(f), s.latin1() ) ) MetaDataBase::addFunction( TQT_TQOBJECT(f), s.latin1(), "", "public", "slot", f->project()->language(), "void" ); - s = s.left( s.tqfind( '(' ) ).latin1(); + s = s.left( s.find( '(' ) ).latin1(); if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(f), TQT_TQOBJECT(w), defSignal.latin1(), TQT_TQOBJECT(f->mainContainer()), s.latin1() ) ) { MetaDataBase::Connection conn; conn.sender = TQT_TQOBJECT(w); @@ -2617,8 +2617,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) return TRUE; } - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( text && text->designable(w) ) { bool ok = FALSE; bool oldDoWrap = FALSE; @@ -2804,7 +2804,7 @@ void MainWindow::projectSelected( TQAction *a ) a->setOn( TRUE ); if ( currentProject ) currentProject->setActive( FALSE ); - Project *p = *projects.tqfind( a ); + Project *p = *projects.find( a ); p->setActive( TRUE ); if ( currentProject == p ) return; @@ -2881,9 +2881,9 @@ void MainWindow::showDialogHelp() else if ( ::tqqt_cast<ProjectSettingsBase*>(w) ) link += "dialog-project-settings"; else if ( ::tqqt_cast<FindDialog*>(w) ) - link += "dialog-tqfind-text"; + link += "dialog-find-text"; else if ( ::tqqt_cast<ReplaceDialog*>(w) ) - link += "dialog-tqreplace-text"; + link += "dialog-replace-text"; else if ( ::tqqt_cast<GotoLineDialog*>(w) ) link += "dialog-go-to-line"; // else if ( ::tqqt_cast<ConnectionEditorBase*>(w) ) @@ -3099,7 +3099,7 @@ void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst ) TQFileInfo fi( fn ); fi.convertToAbs(); TQString f = fi.filePath(); - if ( lst.tqfind( f ) != lst.end() ) + if ( lst.find( f ) != lst.end() ) lst.remove( f ); if ( lst.count() >= 10 ) lst.pop_back(); @@ -3210,7 +3210,7 @@ void MainWindow::setModified( bool b, TQWidget *window ) void MainWindow::editorClosed( SourceEditor *e ) { - sourceEditors.take( sourceEditors.tqfindRef( e ) ); + sourceEditors.take( sourceEditors.findRef( e ) ); } void MainWindow::functionsChanged() @@ -3422,7 +3422,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) mblockNewForms = TRUE; if ( !fw ) - openFormWindow( currentProject->makeAbsolute( *qwf_forms->tqfind( (TQWidget*)o ) ) ); + openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else fw->formFile()->showEditor( FALSE ); tqApp->processEvents(); // give all views the chance to get the formwindow @@ -3620,13 +3620,13 @@ TQString MainWindow::whatsThisFrom( const TQString &key ) } } - int i = menuHelpFile.tqfind( key ); + int i = menuHelpFile.find( key ); if ( i == -1 ) return TQString(); int start = i; int end = i; - start = menuHelpFile.tqfindRev( "<li>", i ) + 4; - end = menuHelpFile.tqfind( '\n', i ) - 1; + start = menuHelpFile.findRev( "<li>", i ) + 4; + end = menuHelpFile.find( '\n', i ) - 1; return menuHelpFile.mid( start, end - start + 1 ); } diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 2bf3c798..f701f046 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -1246,16 +1246,16 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co if ( !filename.isEmpty() ) { TQFileInfo fi( filename ); - if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.tqfind( ";pro" ) != -1 ) ) { + if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { addRecentlyOpened( filename, recentlyProjects ); openProject( filename ); - } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.tqfind( ";ui" ) != -1 ) ) { + } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) { if ( !inProject ) setCurrentProject( eProject ); openFormWindow( filename ); addRecentlyOpened( filename, recentlyFiles ); - } else if ( !extension.isEmpty() && extension.tqfind( ";" + fi.extension( FALSE ) ) != -1 || - additionalSources.tqfind( fi.extension( FALSE ) ) != additionalSources.end() ) { + } else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 || + additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) { SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) ); if ( !sf ) sf = new SourceFile( project->makeRelative( filename ), FALSE, project ); @@ -1263,7 +1263,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co } else if ( extension.isEmpty() ) { TQString filter; for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { - if ( (*it2).tqcontains( "." + fi.extension( FALSE ), FALSE ) ) { + if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) { filter = *it2; break; } @@ -1986,7 +1986,7 @@ void MainWindow::searchIncremetalFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, FALSE ); } @@ -1996,7 +1996,7 @@ void MainWindow::searchIncremetalFindNext() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, TRUE ); } diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index e2098b5a..65b55522 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -273,7 +273,7 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item ) int MenuBarEditor::findItem( MenuBarEditorItem * item ) { - return itemList.tqfindRef( item ); + return itemList.findRef( item ); } int MenuBarEditor::findItem( PopupMenuEditor * menu ) @@ -314,7 +314,7 @@ int MenuBarEditor::findItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.at(); addItemSizeToCoords( i, x, y, w ); @@ -334,7 +334,7 @@ int MenuBarEditor::findItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.count(); return itemList.count() + 1; @@ -415,8 +415,8 @@ void MenuBarEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void MenuBarEditor::showLineEdit( int index ) @@ -646,7 +646,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. - itemList.tqfind( draggedItem ); + itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); dropConfirmed = FALSE; d->dragCopy(); // dragevents and stuff happens @@ -1004,7 +1004,7 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ) hideItem(); Command * cmd = 0; - int iidx = itemList.tqfindRef( i ); + int iidx = itemList.findRef( i ); if ( iidx != -1 ) { // internal dnd cmd = new MoveMenuCommand( i18n( "Item Dragged" ), formWnd, this, iidx, idx ); item( iidx )->setVisible( TRUE ); diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 72c2fa2f..5f8ce367 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -126,7 +126,7 @@ void MetaDataBase::addEntry( TQObject *o ) if ( !o ) return; setupDataBase(); - if ( db->tqfind( o ) ) + if ( db->find( o ) ) return; MetaDataBaseRecord *r = new MetaDataBaseRecord; r->object = o; @@ -149,7 +149,7 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo ( (PropertyObject*)o )->mdPropertyChanged( property, changed ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -157,10 +157,10 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo } if ( changed ) { - if ( r->changedProperties.tqfindIndex( property ) == -1 ) + if ( r->changedProperties.findIndex( property ) == -1 ) r->changedProperties.append( property ); } else { - if ( r->changedProperties.tqfindIndex( property ) != -1 ) + if ( r->changedProperties.findIndex( property ) != -1 ) r->changedProperties.remove( property ); } @@ -188,20 +188,20 @@ bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property ) setupDataBase(); if ( o->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdIsPropertyChanged( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } - return r->changedProperties.tqfindIndex( property ) != -1; + return r->changedProperties.findIndex( property ) != -1; } TQStringList MetaDataBase::changedProperties( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -219,7 +219,7 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co ( (PropertyObject*)o )->mdSetPropertyComment( property, comment ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -234,14 +234,14 @@ TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property ) setupDataBase(); if ( o->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPropertyComment( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString(); } - return *r->propertyComments.tqfind( property ); + return *r->propertyComments.find( property ); } void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value ) @@ -251,7 +251,7 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const ( (PropertyObject*)o )->mdSetFakeProperty( property, value ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -265,13 +265,13 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) setupDataBase(); if ( o->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdFakeProperty( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQVariant(); } - TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property ); + TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); @@ -281,7 +281,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -295,7 +295,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -323,7 +323,7 @@ int MetaDataBase::spacing( TQObject *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -338,7 +338,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -380,7 +380,7 @@ int MetaDataBase::margin( TQObject *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -394,7 +394,7 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -411,7 +411,7 @@ TQString MetaDataBase::resizeMode( TQObject *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -424,7 +424,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString TQObject *receiver, const TQCString &slot, bool addCode ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -458,7 +458,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr TQObject *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -487,7 +487,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInterface::Connection> &conns ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -505,8 +505,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte cit != conns.end(); ++cit ) { // #### get the correct sender object out of Bla.Blub.sender TQString senderName = (*cit).sender; - if ( senderName.tqfind( '.' ) != -1 ) - senderName = senderName.mid( senderName.tqfindRev( '.' ) + 1 ); + if ( senderName.find( '.' ) != -1 ) + senderName = senderName.mid( senderName.findRev( '.' ) + 1 ); TQObject *sender = 0; if ( formfile->formWindow() ) sender = formfile->formWindow()->child( senderName ); @@ -535,7 +535,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString TQObject *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -557,7 +557,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -570,7 +570,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ TQObject *receiver ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -592,7 +592,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQObject *object ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -613,7 +613,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ void MetaDataBase::doConnections( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -656,8 +656,8 @@ void MetaDataBase::doConnections( TQObject *o ) TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) continue; TQObject::connect( sender, s, receiver, s2 ); @@ -667,7 +667,7 @@ void MetaDataBase::doConnections( TQObject *o ) bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -676,13 +676,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom if ( !onlyCustom ) { TQStrList slotList = o->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); slotList = o->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; } @@ -711,7 +711,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -732,7 +732,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -746,7 +746,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ f.type = type; f.language = language; f.returnType = returnType; - TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.tqfind( f ); + TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.find( f ); if ( it != r->functionList.end() ) r->functionList.remove( it ); r->functionList.append( f ); @@ -756,7 +756,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ void MetaDataBase::setFunctionList( TQObject *o, const TQValueList<Function> &functionList ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -770,7 +770,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -794,7 +794,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const void MetaDataBase::removeFunction( TQObject *o, const TQString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -812,7 +812,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQString &function ) TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, bool onlyFunctions ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -831,7 +831,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, boo TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -849,7 +849,7 @@ void MetaDataBase::changeFunction( TQObject *o, const TQString &function, const const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -873,7 +873,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -897,7 +897,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -906,13 +906,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl if ( !onlyCustom ) { TQStrList functionList = o->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); functionList = o->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; } @@ -941,7 +941,7 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1034,7 +1034,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className ) void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1047,7 +1047,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1060,7 +1060,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1073,7 +1073,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs ) TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1086,7 +1086,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o ) void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1099,7 +1099,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds ) TQStringList MetaDataBase::forwards( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1112,7 +1112,7 @@ TQStringList MetaDataBase::forwards( TQObject *o ) void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1125,7 +1125,7 @@ void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQString &access ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1140,7 +1140,7 @@ void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQStrin void MetaDataBase::removeVariable( TQObject *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1158,7 +1158,7 @@ void MetaDataBase::removeVariable( TQObject *o, const TQString &name ) TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1171,7 +1171,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o ) bool MetaDataBase::hasVariable( TQObject *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1188,7 +1188,7 @@ bool MetaDataBase::hasVariable( TQObject *o, const TQString &name ) TQString MetaDataBase::extractVariableName( const TQString &name ) { - TQString n = name.right( name.length() - name.tqfindRev( ' ' ) - 1 ); + TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 ); if ( n[ 0 ] == '*' || n[ 0 ] == '&' ) n[ 0 ] = ' '; if ( n[ (int)n.length() - 1 ] == ';' ) @@ -1199,7 +1199,7 @@ TQString MetaDataBase::extractVariableName( const TQString &name ) void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1213,10 +1213,10 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) bool hasSemicolon = s.endsWith( ";" ); if ( hasSemicolon ) s = s.left( s.length() - 1 ); - int p = s.tqfind( '(' ); + int p = s.find( '(' ); if ( p < 0 ) p = s.length(); - int sp = s.tqfind( ' ' ); + int sp = s.find( ' ' ); if ( sp >= 0 && sp < p ) { s = s.mid( sp+1 ); p -= sp + 1; @@ -1232,7 +1232,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) TQStringList MetaDataBase::signalList( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1245,7 +1245,7 @@ TQStringList MetaDataBase::signalList( TQObject *o ) void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1258,7 +1258,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi ) MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1304,7 +1304,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) ( (PropertyObject*)w )->mdSetCursor( c ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1319,7 +1319,7 @@ TQCursor MetaDataBase::cursor( TQWidget *w ) setupDataBase(); if ( w->isA( "PropertyObject" ) ) return ( (PropertyObject*)w )->mdCursor(); - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { w->unsetCursor(); return w->cursor(); @@ -1355,7 +1355,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE ); - if ( sigList.tqfind( signal ) != -1 ) + if ( sigList.find( signal ) != -1 ) return TRUE; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { if ( normalizeFunction( *it ) == normalizeFunction( signal ) ) @@ -1367,7 +1367,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( normalizeFunction( slot ) ) != -1 ) + if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { @@ -1380,7 +1380,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE ); - if ( propList.tqfind( prop ) != -1 ) + if ( propList.find( prop ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { @@ -1395,7 +1395,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1411,14 +1411,14 @@ TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString(); } - return *r->pixmapArguments.tqfind( pixmap ); + return *r->pixmapArguments.find( pixmap ); } void MetaDataBase::clearPixmapArguments( TQObject *o ) @@ -1426,7 +1426,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1446,7 +1446,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg ) ( (PropertyObject*)o )->mdSetPixmapKey( pixmap, arg ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1464,21 +1464,21 @@ TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap ) setupDataBase(); if ( o->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString(); } - TQString s = *r->pixmapKeys.tqfind( pixmap ); + TQString s = *r->pixmapKeys.find( pixmap ); if ( !s.isNull() ) return s; if ( !o->isWidgetType() ) return s; TQWidget *w = (TQWidget*)o; if ( w->icon() ) - return *r->pixmapKeys.tqfind( w->icon()->serialNumber() ); + return *r->pixmapKeys.find( w->icon()->serialNumber() ); return s; } @@ -1487,7 +1487,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1504,7 +1504,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString> if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1519,7 +1519,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *o ) if ( !o ) return TQMap<TQString, TQString>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1536,7 +1536,7 @@ void MetaDataBase::setEditor( const TQStringList &langs ) bool MetaDataBase::hasEditor( const TQString &lang ) { - return editorLangList.tqfind( lang ) != editorLangList.end(); + return editorLangList.find( lang ) != editorLangList.end(); } void MetaDataBase::setupInterfaceManagers( const TQString &plugDir ) @@ -1586,7 +1586,7 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1599,8 +1599,8 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l ) while ( it != r->breakPointConditions.end() ) { int line = it.key(); ++it; - if ( r->breakPoints.tqfind( line ) == r->breakPoints.end() ) - r->breakPointConditions.remove( r->breakPointConditions.tqfind( line ) ); + if ( r->breakPoints.find( line ) == r->breakPoints.end() ) + r->breakPointConditions.remove( r->breakPointConditions.find( line ) ); } } @@ -1609,7 +1609,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQObject *o ) if ( !o ) return TQValueList<uint>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1624,13 +1624,13 @@ void MetaDataBase::setBreakPointCondition( TQObject *o, int line, const TQString if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } - r->breakPointConditions.tqreplace( line, condition ); + r->breakPointConditions.replace( line, condition ); } TQString MetaDataBase::breakPointCondition( TQObject *o, int line ) @@ -1638,13 +1638,13 @@ TQString MetaDataBase::breakPointCondition( TQObject *o, int line ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString(); } - TQMap<int, TQString>::Iterator it = r->breakPointConditions.tqfind( line ); + TQMap<int, TQString>::Iterator it = r->breakPointConditions.find( line ); if ( it == r->breakPointConditions.end() ) return TQString(); return *it; @@ -1659,7 +1659,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString ¯o ) ( (PropertyObject*)o )->mdSetExportMacro( macro ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1676,7 +1676,7 @@ TQString MetaDataBase::exportMacro( TQObject *o ) setupDataBase(); if ( o->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdExportMacro(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -1688,5 +1688,5 @@ TQString MetaDataBase::exportMacro( TQObject *o ) bool MetaDataBase::hasObject( TQObject *o ) { - return !!db->tqfind( o ); + return !!db->find( o ); } diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp index 75eb2acd..20f94f86 100644 --- a/kdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -232,7 +232,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget mlined->setReadOnly( TRUE ); const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property( - mlined->tqmetaObject()->tqfindProperty( "wordWrap", TRUE ), TRUE ); + mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { @@ -321,7 +321,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) { int pfrom, pto, ifrom, ito; TQString tagend( tag.simplifyWhiteSpace() ); - tagend.remove( tagend.tqfind( ' ', 0 ), tagend.length() ); + tagend.remove( tagend.find( ' ', 0 ), tagend.length() ); if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); TQString buf = textEdit->selectedText(); diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 6fae9015..0c90c056 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -138,12 +138,12 @@ static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace ) lst << w->name(); } - if ( lst.tqfindIndex( fw->name() ) == -1 ) + if ( lst.findIndex( fw->name() ) == -1 ) return; TQString origName = fw->name(); TQString n = origName; int i = 1; - while ( lst.tqfindIndex( n ) != -1 ) { + while ( lst.findIndex( n ) != -1 ) { n = origName + TQString::number( i++ ); } fw->setName( n ); @@ -306,7 +306,7 @@ void NewForm::insertTemplates( TQIconView *tView, if ( !fi->isFile() || fi->extension() != "ui" ) continue; TQString name = fi->baseName(); - name = name.tqreplace( '_', ' ' ); + name = name.replace( '_', ' ' ); CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); ci->setDragEnabled( FALSE ); diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp index ec7418db..28f744b0 100644 --- a/kdevdesigner/designer/outputwindow.cpp +++ b/kdevdesigner/designer/outputwindow.cpp @@ -182,7 +182,7 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin setMultiLinesEnabled( TRUE ); TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; - m = m.mid( m.tqfind( ':' ) + 1 ); + m = m.mid( m.find( ':' ) + 1 ); setText( 0, type == Error ? "Error" : "Warning" ); setText( 1, m ); setText( 2, TQString::number( line ) ); diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp index 4d6ad2ed..6992bc77 100644 --- a/kdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -223,7 +223,7 @@ ImageIconProvider::~ImageIconProvider() const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { TQString ext = fi.extension().upper(); - if ( fmts.tqcontains( ext ) ) { + if ( fmts.contains( ext ) ) { return &imagepm; } else { return TQFileIconProvider::pixmap( fi ); diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h index 1865f72f..c999d539 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h @@ -61,7 +61,7 @@ void PixmapCollectionEditor::addPixmap() } updateView(); - TQIconViewItem *item = viewPixmaps->tqfindItem( lastName ); + TQIconViewItem *item = viewPixmaps->findItem( lastName ); if ( item ) { viewPixmaps->setCurrentItem( item ); viewPixmaps->ensureItemVisible( item ); @@ -124,7 +124,7 @@ void PixmapCollectionEditor::setChooserMode( bool c ) void PixmapCollectionEditor::setCurrentItem( const TQString & name ) { - TQIconViewItem *i = viewPixmaps->tqfindItem( name ); + TQIconViewItem *i = viewPixmaps->findItem( name ); if ( i ) { viewPixmaps->setCurrentItem( i ); currentChanged( i ); diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index c5dcd8bf..78fe0aca 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -228,7 +228,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) TQChildEvent * ce = ( TQChildEvent * ) event; TQObject * c = TQT_TQOBJECT(ce->child()); TQAction * action = ::tqqt_cast<TQAction*>( c ); - if ( s->tqfind( action ) != -1 ) // avoid duplicates + if ( s->find( action ) != -1 ) // avoid duplicates return FALSE; TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c ); if ( actionGroup ) @@ -242,7 +242,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) void PopupMenuEditorItem::selfDestruct() { hideMenu(); - int i = m->tqfind( s ); + int i = m->find( s ); if ( i != -1 && i < m->count() ) m->remove( i ); // remove this item a = 0; // the selfDestruct call was caused by the deletion of the action @@ -374,7 +374,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) delete l; } -int PopupMenuEditor::tqfind( const TQAction * action ) +int PopupMenuEditor::find( const TQAction * action ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -385,7 +385,7 @@ int PopupMenuEditor::tqfind( const TQAction * action ) return -1; } -int PopupMenuEditor::tqfind( PopupMenuEditor * menu ) +int PopupMenuEditor::find( PopupMenuEditor * menu ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -414,8 +414,8 @@ void PopupMenuEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void PopupMenuEditor::cut( int index ) @@ -786,7 +786,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. We use node instead. - int idx = itemList.tqfind( draggedItem ); + int idx = itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); d->dragCopy(); // dragevents and stuff happens @@ -1229,7 +1229,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y ) idx++; n = itemList.next(); } - int same = itemList.tqfindRef( i ); + int same = itemList.findRef( i ); AddActionToPopupCommand * cmd = new AddActionToPopupCommand( i18n( "Drop Item" ), formWnd, this, i, idx ); formWnd->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1410,7 +1410,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e ) // new item was created TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx(); TQString actionText = lineEdit->text(); - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = lineEdit->text(); a->setText( actionText ); a->setMenuText( menuText ); @@ -1451,7 +1451,7 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) TQWidget *e = parentEditor(); PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e); if ( p ) { - int idx = p->tqfind( item->m ); + int idx = p->find( item->m ); PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 ); s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) ); } else { diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h index e9e4e1c2..70d7e085 100644 --- a/kdevdesigner/designer/popupmenueditor.h +++ b/kdevdesigner/designer/popupmenueditor.h @@ -117,8 +117,8 @@ public: void insert( PopupMenuEditorItem * item, int index = -1 ); void insert( TQAction * action, int index = -1 ); void insert( TQActionGroup * actionGroup, int index = -1 ); - int tqfind( const TQAction * action ); - int tqfind( PopupMenuEditor * menu ); + int find( const TQAction * action ); + int find( PopupMenuEditor * menu ); int count(); PopupMenuEditorItem * at( int index ); PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); } @@ -153,7 +153,7 @@ public slots: void paste() { paste( currentIndex ); } void remove( int index ); - void remove( TQAction * a ) { remove( tqfind( a ) ); } + void remove( TQAction * a ) { remove( find( a ) ); } void resizeToContents(); void showSubMenu(); diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp index 61143c95..d96bd4dd 100644 --- a/kdevdesigner/designer/project.cpp +++ b/kdevdesigner/designer/project.cpp @@ -108,12 +108,12 @@ bool DatabaseConnection::open( bool suppressDialog ) #ifndef TQT_NO_SQL // register our name, if nec if ( nm == "(default)" ) { - if ( !TQSqlDatabase::tqcontains() ) // default doesn't exists? + if ( !TQSqlDatabase::contains() ) // default doesn't exists? conn = TQSqlDatabase::addDatabase( drv ); else conn = TQSqlDatabase::database(); } else { - if ( !TQSqlDatabase::tqcontains( nm ) ) + if ( !TQSqlDatabase::contains( nm ) ) conn = TQSqlDatabase::addDatabase( drv, nm ); else conn = TQSqlDatabase::database( nm ); @@ -285,8 +285,8 @@ void Project::setFileName( const TQString &fn, bool doClear ) } - if ( proName.tqcontains( '.' ) ) - proName = proName.left( proName.tqfind( '.' ) ); + if ( proName.contains( '.' ) ) + proName = proName.left( proName.find( '.' ) ); if ( !doClear ) return; @@ -424,7 +424,7 @@ void Project::parse() TQStringList::ConstIterator it; - int i = contents.tqfind( "LANGUAGE" ); + int i = contents.find( "LANGUAGE" ); if ( i != -1 ) { lang = ""; is_cpp = FALSE; @@ -433,7 +433,7 @@ void Project::parse() is_cpp = lang == "C++"; } - i = contents.tqfind( "DBFILE" ); + i = contents.find( "DBFILE" ); if ( i != -1 ) { dbFile = ""; TQString part = contents.mid( i + TQString( "DBFILE" ).length() ); @@ -449,7 +449,7 @@ void Project::parse() } - i = contents.tqfind( "TEMPLATE" ); + i = contents.find( "TEMPLATE" ); if ( i != -1 ) { templ = ""; TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() ); @@ -477,12 +477,12 @@ void Project::parse() updateCustomSettings(); for ( it = csList.begin(); it != csList.end(); ++it ) { - i = contents.tqfind( *it ); + i = contents.find( *it ); if ( i != -1 ) { TQString val = ""; TQString part = contents.mid( i + TQString( *it ).length() ); val = parse_part( part ); - customSettings.tqreplace( *it, val ); + customSettings.replace( *it, val ); } } @@ -511,7 +511,7 @@ void Project::clear() bool Project::removeSourceFile( SourceFile *sf ) { - if ( !sourcefiles.tqcontainsRef( sf ) ) + if ( !sourcefiles.containsRef( sf ) ) return FALSE; if ( !sf->close() ) return FALSE; @@ -569,10 +569,10 @@ TQString Project::makeRelative( const TQString &f ) static void remove_contents( TQString &contents, const TQString &s ) { - int i = contents.tqfind( s ); + int i = contents.find( s ); if ( i != -1 ) { int start = i; - int end = contents.tqfind( '\n', i ); + int end = contents.find( '\n', i ); if ( end == -1 ) end = contents.length() - 1; contents.remove( start, end - start + 1 ); @@ -581,7 +581,7 @@ static void remove_contents( TQString &contents, const TQString &s ) static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 ) { - int i = contents.tqfind( s ); + int i = contents.find( s ); if ( strt ) *strt = i; int start = i; @@ -704,7 +704,7 @@ void Project::save( bool onlyProjectFile ) TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() ); TQStringList lst = sourceToKey[ key ]; lst << makeRelative( f->fileName() ); - sourceToKey.tqreplace( key, lst ); + sourceToKey.replace( key, lst ); } for ( TQMap<TQString, TQStringList>::Iterator skit = sourceToKey.begin(); @@ -751,7 +751,7 @@ void Project::save( bool onlyProjectFile ) // custom settings for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) { - TQString val = *customSettings.tqfind( *it ); + TQString val = *customSettings.find( *it ); if ( !val.isEmpty() ) contents += *it + "\t= " + val + "\n"; } @@ -1105,7 +1105,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value ) TQString Project::customSetting( const TQString &key ) const { - return *customSettings.tqfind( key ); + return *customSettings.find( key ); } void Project::updateCustomSettings() @@ -1170,23 +1170,23 @@ void Project::setIncludePath( const TQString &platform, const TQString &path ) { if ( inclPath[platform] == path ) return; - inclPath.tqreplace( platform, path ); + inclPath.replace( platform, path ); modified = TRUE; } void Project::setLibs( const TQString &platform, const TQString &path ) { - lbs.tqreplace( platform, path ); + lbs.replace( platform, path ); } void Project::setDefines( const TQString &platform, const TQString &path ) { - defs.tqreplace( platform, path ); + defs.replace( platform, path ); } void Project::setConfig( const TQString &platform, const TQString &config ) { - cfg.tqreplace( platform, config ); + cfg.replace( platform, config ); } TQString Project::config( const TQString &platform ) const @@ -1233,7 +1233,7 @@ void Project::readPlatformSettings( const TQString &contents, TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - res.tqreplace( key, s ); + res.replace( key, s ); } } @@ -1265,7 +1265,7 @@ void Project::writePlatformSettings( TQString &contents, const TQString &setting TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - TQMap<TQString, TQString>::ConstIterator it = input.tqfind( key ); + TQMap<TQString, TQString>::ConstIterator it = input.find( key ); if ( it == input.end() || (*it).isEmpty() ) continue; contents += p + setting + "\t+= " + *it + "\n"; @@ -1281,7 +1281,7 @@ void Project::addFormFile( FormFile *ff ) bool Project::removeFormFile( FormFile *ff ) { - if ( !formfiles.tqcontainsRef( ff ) ) + if ( !formfiles.containsRef( ff ) ) return FALSE; if ( !ff->close() ) return FALSE; @@ -1352,7 +1352,7 @@ TQObjectList Project::objects() const FormFile *Project::fakeFormFileFor( TQObject *o ) const { - return fakeFormFiles.tqfind( (void*)o ); + return fakeFormFiles.find( (void*)o ); } TQObject *Project::objectForFakeForm( FormWindow *fw ) const @@ -1411,14 +1411,14 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func return; iface->functions( f->text(), &funcs ); TQString func = function; - int i = func.tqfind( '(' ); + int i = func.find( '(' ); if ( i != -1 ) func = func.left( i ); bool found = FALSE; for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - if ( (*it).name.left( (*it).name.tqfind( '(' ) ) == func ) { + if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) { found = TRUE; break; } @@ -1463,7 +1463,7 @@ TQString Project::qualifiedName( TQObject *o ) TQObject *p = o->tqparent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); - if ( objs.tqfindRef( p ) != -1 ) + if ( objs.findRef( p ) != -1 ) break; p = p->tqparent(); } @@ -1547,7 +1547,7 @@ TQString Project::locationOfObject( TQObject *o ) return TQString(); } - TQString s = makeRelative( *qwf_forms->tqfind( (TQWidget*)o ) ); + TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) ); s += " [Source]"; return s; } diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 01ac4295..6535ef7f 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -564,7 +564,7 @@ void PropertyItem::setText( int col, const TQString &t ) { TQString txt( t ); if ( col == 1 ) - txt = txt.tqreplace( "\n", " " ); + txt = txt.replace( "\n", " " ); TQListViewItem::setText( col, txt ); } @@ -2748,7 +2748,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { arrowDown = TRUE; tqrepaint( FALSE ); } @@ -2847,7 +2847,7 @@ void PropertyEnumItem::setValue() enumString += "|" + (*it).key; } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); @@ -2870,7 +2870,7 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst ) } } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); } @@ -3052,10 +3052,10 @@ void PropertyList::setupProperties() for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( it.current(), allProperties), allProperties ); + property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) ) continue; if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) || ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) { @@ -3226,7 +3226,7 @@ void PropertyList::setupProperties() } } if ( item && !p->isSetType() ) { - if ( valueSet.tqfindIndex( item->name() ) == -1 ) { + if ( valueSet.findIndex( item->name() ) == -1 ) { setPropertyValue( item ); valueSet << item->name(); } @@ -3339,7 +3339,7 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, for ( TQValueList<MetaDataBase::Property>::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { - if ( unique.tqcontains( TQString( (*it).property ) ) ) + if ( unique.contains( TQString( (*it).property ) ) ) continue; unique.insert( TQString( (*it).property ), TRUE ); addPropertyItem( item, (*it).property, type_to_variant( (*it).type ) ); @@ -3359,7 +3359,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, l << ""; while ( it.current() ) { if ( editor->formWindow()->canBeBuddy( it.current() ) ) { - if ( l.tqfind( it.current()->name() ) == l.end() ) + if ( l.find( it.current()->name() ) == l.end() ) l << it.current()->name(); } ++it; @@ -3679,9 +3679,9 @@ static void clearAlignList( TQStrList &l ) { if ( l.count() == 1 ) return; - if ( l.tqfind( "AlignAuto" ) != -1 ) + if ( l.find( "AlignAuto" ) != -1 ) l.remove( "AlignAuto" ); - if ( l.tqfind( "WordBreak" ) != -1 ) + if ( l.find( "WordBreak" ) != -1 ) l.remove( "WordBreak" ); } @@ -3693,12 +3693,12 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( i->name(), TRUE), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); @@ -3706,7 +3706,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) } else if ( i->name() == "vAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3870,7 +3870,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) TQString s; s = TQString( mo->className() ) + "::" + prop; TQMap<TQString, TQString>::Iterator it; - if ( ( it = propertyDocs.tqfind( s ) ) != propertyDocs.end() ) { + if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } mo = mo->tqsuperClass(); @@ -3929,15 +3929,15 @@ EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) TQString clean_arguments( const TQString &s ) { TQString slot = s; - TQString arg = slot.mid( slot.tqfind( '(' ) + 1 ); - arg = arg.left( arg.tqfindRev( ')' ) ); + TQString arg = slot.mid( slot.find( '(' ) + 1 ); + arg = arg.left( arg.findRev( ')' ) ); TQStringList args = TQStringList::split( ',', arg ); - slot = slot.left( slot.tqfind( '(' ) + 1 ); + slot = slot.left( slot.find( '(' ) + 1 ); int num = 0; for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) { TQString a = *it; int i; - if ( ( i =a.tqfind( ':' ) ) == -1 ) + if ( ( i =a.find( ':' ) ) == -1 ) slot += a.simplifyWhiteSpace(); else slot += a.mid( i + 1 ).simplifyWhiteSpace(); @@ -3996,7 +3996,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = i->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4035,7 +4035,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4090,9 +4090,9 @@ void EventList::renamed( TQListViewItem *i ) // #### we should look if the specified slot already // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); - if ( funcname.tqfind( '(' ) == -1 ) { // try to create a signature + if ( funcname.find( '(' ) == -1 ) { // try to create a signature TQString sig = i->tqparent()->text( 0 ); - sig = sig.mid( sig.tqfind( '(' ) + 1 ); + sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( iface ) @@ -4110,7 +4110,7 @@ void EventList::renamed( TQListViewItem *i ) /* MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public", "slot", formWindow->project()->language(), "void" ); editor->formWindow()->mainWindow()-> - editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), TRUE );*/ + editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE );*/ cmd->execute(); cmd2->execute(); editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); @@ -4277,7 +4277,7 @@ TQString PropertyEditor::classOfCurrentProperty() const TQMetaObject *mo = o->tqmetaObject(); while ( mo ) { TQStrList props = mo->propertyNames( FALSE ); - if ( props.tqfind( curr.latin1() ) != -1 ) + if ( props.find( curr.latin1() ) != -1 ) return mo->className(); mo = mo->tqsuperClass(); } diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp index 6499c78d..0c7bd57d 100644 --- a/kdevdesigner/designer/qcompletionedit.cpp +++ b/kdevdesigner/designer/qcompletionedit.cpp @@ -180,7 +180,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) void QCompletionEdit::addCompletionEntry( const TQString &entry ) { - if ( compList.tqfind( entry ) == compList.end() ) { + if ( compList.find( entry ) == compList.end() ) { compList << entry; compList.sort(); } @@ -188,7 +188,7 @@ void QCompletionEdit::addCompletionEntry( const TQString &entry ) void QCompletionEdit::removeCompletionEntry( const TQString &entry ) { - TQStringList::Iterator it = compList.tqfind( entry ); + TQStringList::Iterator it = compList.find( entry ); if ( it != compList.end() ) compList.remove( it ); } diff --git a/kdevdesigner/designer/replacedialog.ui.h b/kdevdesigner/designer/replacedialog.ui.h index 3b43488d..63946525 100644 --- a/kdevdesigner/designer/replacedialog.ui.h +++ b/kdevdesigner/designer/replacedialog.ui.h @@ -44,7 +44,7 @@ void ReplaceDialog::doReplace() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) checkBegin->setChecked( TRUE ); else @@ -56,7 +56,7 @@ void ReplaceDialog::doReplaceAll() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) ) checkBegin->setChecked( TRUE ); else diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index e511f7f1..74ef9862 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -97,12 +97,12 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s, bool attribute = FALSE ) { TQString s2 = s; - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); if ( attribute ) { - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "'", "'" ); } return s2; } @@ -742,7 +742,7 @@ TQString Resource::copy() TQWidget *p = w->parentWidget(); bool save = TRUE; while ( p ) { - if ( tmp.tqfindRef( p ) != -1 ) { + if ( tmp.findRef( p ) != -1 ) { save = FALSE; break; } @@ -846,7 +846,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea includeHints << WidgetDatabase::includeFile( classID ); } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -1214,7 +1214,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) if ( isDataTable && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; - ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl; + ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</property>" << endl; } @@ -1399,9 +1399,9 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "tqsizeHint" ) ) + if ( !changed.contains( "tqsizeHint" ) ) changed << "tqsizeHint"; - if ( !changed.tqcontains( "geometry" ) ) + if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w); @@ -1420,9 +1420,9 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) } if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { - if ( changed.tqfindIndex( "geometry" ) == -1 ) + if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; - if ( changed.tqfindIndex( "caption" ) == -1 ) + if ( changed.findIndex( "caption" ) == -1 ) changed << "caption"; } @@ -1434,13 +1434,13 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) + if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) continue; saved << TQString::tqfromLatin1( it.current() ); const TQMetaProperty* p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( it.current(), TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1496,7 +1496,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1509,7 +1509,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; } @@ -1522,7 +1522,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant uint unum; double dob; TQString comment; - if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) || formwindow->actionList().tqfind( (TQAction*)w ) ) + if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { case TQVariant::String: @@ -2143,7 +2143,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE ); if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2404,7 +2404,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( ba, baSize ); - img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')) ); + img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format ); } @@ -2451,9 +2451,9 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; - if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 && + if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 && qstrcmp( conn.sender->name(), "this" ) != 0 ) || - ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 && + ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) && @@ -2581,7 +2581,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 ) + if ( usedCustomWidgets.findIndex( w->className ) == -1 ) continue; ts << makeIndent( indent ) << "<customwidget>" << endl; indent++; @@ -2716,7 +2716,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent ) indent++; for ( TQWidget *w = l.first(); w; w = l.next() ) { - if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 ) + if ( w->testWState( TQt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 ) continue; ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl; } @@ -3235,7 +3235,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) p->insert( a ); } if ( n.tagName() == "item" ) { - PopupMenuEditorItem *i = p->at( p->tqfind( a ) ); + PopupMenuEditorItem *i = p->at( p->find( a ) ); if ( i ) { TQString name = n.attribute( "name" ); formwindow->unify( i, name, TRUE ); diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp index 5b21afa5..7ffb34f0 100644 --- a/kdevdesigner/designer/sourcefile.cpp +++ b/kdevdesigner/designer/sourcefile.cpp @@ -187,10 +187,10 @@ TQString SourceFile::createUnnamedFileName( const TQString &extension ) extensionCounter = new TQMap<TQString, int>; int count = -1; TQMap<TQString, int>::Iterator it; - if ( ( it = extensionCounter->tqfind( extension ) ) != extensionCounter->end() ) { + if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) { count = *it; ++count; - extensionCounter->tqreplace( extension, count ); + extensionCounter->replace( extension, count ); } else { count = 1; extensionCounter->insert( extension, count ); diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp index b95f6bd2..1027615e 100644 --- a/kdevdesigner/designer/tableeditorimpl.cpp +++ b/kdevdesigner/designer/tableeditorimpl.cpp @@ -160,11 +160,11 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) #ifndef TQT_NO_SQL if ( ::tqqt_cast<TQDataTable*>(editTable) ) { - TQString s = *fieldMap.tqfind( listColumns->index( i ) ); + TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); - else if ( comboFields->listBox()->tqfindItem( s ) ) - comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) ); + else if ( comboFields->listBox()->findItem( s ) ) + comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) ); else comboFields->lineEdit()->setText( s ); } @@ -236,7 +236,7 @@ void TableEditor::newColumnClicked() m.insert( table->horizontalHeader()->label( i ), TRUE ); int n = table->numCols() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->horizontalHeader()->setLabel( table->numCols() - 1, t ); listColumns->insertItem( t ); @@ -264,7 +264,7 @@ void TableEditor::newRowClicked() m.insert( table->verticalHeader()->label( i ), TRUE ); int n = table->numRows() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->verticalHeader()->setLabel( table->numRows() - 1, t ); listRows->insertItem( t ); @@ -333,7 +333,7 @@ void TableEditor::applyClicked() col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *fieldMap.tqfind( i ); + col.field = *fieldMap.find( i ); cols.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -423,7 +423,7 @@ void TableEditor::readFromTable() table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) ); listColumns->insertItem( editTable->horizontalHeader()->label( i ) ); } - TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) ); + TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) ); fieldMap.insert( i, cf ); } diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp index bd0ef745..8cbf38f6 100644 --- a/kdevdesigner/designer/variabledialogimpl.cpp +++ b/kdevdesigner/designer/variabledialogimpl.cpp @@ -64,7 +64,7 @@ VariableDialog::~VariableDialog() void VariableDialog::setCurrentItem( TQString text ) { - TQListViewItem *i = varView->tqfindItem( text, 0 ); + TQListViewItem *i = varView->findItem( text, 0 ); if ( i ) varView->setCurrentItem( i ); } diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index c4b0b947..55bb4c0d 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -218,7 +218,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int index = 0; TQRect rect; for ( ; index < tabBar()->count(); index++ ) { - if ( tabBar()->tabAt( index )->rect().tqcontains( de->pos() ) ) { + if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) { rect = tabBar()->tabAt( index )->rect(); break; } @@ -227,7 +227,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) if ( index == tabBar()->count() -1 ) { TQRect rect2 = rect; rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) index++; } @@ -255,20 +255,20 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int newIndex = 0; for ( ; newIndex < tabBar()->count(); newIndex++ ) { - if ( tabBar()->tabAt( newIndex )->rect().tqcontains( de->pos() ) ) + if ( tabBar()->tabAt( newIndex )->rect().contains( de->pos() ) ) break; } if ( newIndex == tabBar()->count() -1 ) { TQRect rect2 = tabBar()->tabAt( newIndex )->rect(); rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) newIndex++; } int oldIndex = 0; for ( ; oldIndex < tabBar()->count(); oldIndex++ ) { - if ( tabBar()->tabAt( oldIndex )->rect().tqcontains( pressPoint ) ) + if ( tabBar()->tabAt( oldIndex )->rect().contains( pressPoint ) ) break; } @@ -329,7 +329,7 @@ void QDesignerWidgetStack::nextPage() int QDesignerWidgetStack::currentPage() const { QDesignerWidgetStack* that = (QDesignerWidgetStack*) this; - return that->pages.tqfind( visibleWidget() ); + return that->pages.find( visibleWidget() ); } void QDesignerWidgetStack::setCurrentPage( int i ) @@ -384,12 +384,12 @@ int QDesignerWidgetStack::insertPage( TQWidget *p, int i ) raiseWidget( p ); TQApplication::sendPostedEvents(); updateButtons(); - return pages.tqfind( p ); + return pages.find( p ); } int QDesignerWidgetStack::removePage( TQWidget *p ) { - int i = pages.tqfind( p ); + int i = pages.find( p ); pages.remove( p ); removeWidget( p ); setCurrentPage( 0 ); @@ -464,7 +464,7 @@ int QDesignerWizard::pageNum( TQWidget *p ) void QDesignerWizard::addPage( TQWidget *p, const TQString &t ) { TQWizard::addPage( p, t ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -477,7 +477,7 @@ void QDesignerWizard::removePage( TQWidget *p ) void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { TQWizard::insertPage( p, t, index ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -505,9 +505,9 @@ void WidgetFactory::saveDefaultProperties( TQObject *w, int id ) var = TQVariant( TQPixmap() ); else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 ) var = TQVariant( TQIconSet() ); - propMap.tqreplace( lst.at( i ), var ); + propMap.replace( lst.at( i ), var ); } - defaultProperties->tqreplace( id, propMap ); + defaultProperties->replace( id, propMap ); } void WidgetFactory::saveChangedProperties( TQObject *w, int id ) @@ -545,9 +545,9 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b return 0; MetaDataBase::addEntry( TQT_TQOBJECT(w) ); - if ( !defaultProperties->tqcontains( id ) ) + if ( !defaultProperties->contains( id ) ) saveDefaultProperties( TQT_TQOBJECT(w), id ); - if ( !changedProperties->tqcontains( id ) ) + if ( !changedProperties->contains( id ) ) saveChangedProperties( TQT_TQOBJECT(w), id ); return w; @@ -1372,13 +1372,13 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) + if ( className.contains( "ListBox" ) ) return TRUE; - if ( className.tqcontains( "ComboBox" ) ) + if ( className.contains( "ComboBox" ) ) return TRUE; - if ( className.tqcontains( "ListView" ) ) + if ( className.contains( "ListView" ) ) return TRUE; - if ( className.tqcontains( "IconView" ) ) + if ( className.contains( "IconView" ) ) return TRUE; if ( className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING ) return TRUE; @@ -1392,8 +1392,8 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) || className.tqcontains( "ListView" ) || - className.tqcontains( "IconView" ) || className.tqcontains( "ComboBox" ) || + if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || + className.contains( "IconView" ) || className.contains( "ComboBox" ) || ::tqqt_cast<TQTable*>(editorWidget) != 0 ) return TRUE; @@ -1404,7 +1404,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) { + if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); @@ -1413,7 +1413,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ComboBox" ) ) { + if ( className.contains( "ComboBox" ) ) { if ( !::tqqt_cast<TQComboBox*>(editWidget) ) return; TQComboBox *cb = (TQComboBox*)editWidget; @@ -1424,7 +1424,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ListView" ) ) { + if ( className.contains( "ListView" ) ) { if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; @@ -1434,7 +1434,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "IconView" ) ) { + if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); @@ -1463,14 +1463,14 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) { if ( propName == "name" || propName == "geometry" ) return FALSE; - TQStringList l = *changedProperties->tqfind( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); - return l.tqfindIndex( propName ) == -1; + TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); + return l.findIndex( propName ) == -1; } bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> - tqfindProperty( propName, TRUE ), TRUE ); + findProperty( propName, TRUE ), TRUE ); if (!p ) return FALSE; return p->reset( w ); @@ -1491,13 +1491,13 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) return TQVariant( -1 ); } - return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName ); + return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName ); } TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { const TQMetaProperty *p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { int v = defaultValue( w, "tqalignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1536,7 +1536,7 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *nam TQVariant WidgetFactory::property( TQObject *w, const char *name ) { - int id = w->tqmetaObject()->tqfindProperty( name, TRUE ); + int id = w->tqmetaObject()->findProperty( name, TRUE ); const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h index b25e506e..43f19f7f 100644 --- a/kdevdesigner/designer/widgetfactory.h +++ b/kdevdesigner/designer/widgetfactory.h @@ -216,7 +216,7 @@ public: void addPage( TQWidget *p, const TQString & ); void removePage( TQWidget *p ); void insertPage( TQWidget *p, const TQString &t, int index ); - bool isPageRemoved( TQWidget *p ) { return (removedPages.tqfind( p ) != 0); } + bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); } bool isModal() const { return modal; } void setModal(bool b) { modal = b; } diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 8668c331..664a586e 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -681,7 +681,7 @@ void Workspace::bufferChosen( const TQString &buffer ) if ( bufferEdit ) bufferEdit->setText( "" ); - if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) { + if ( MainWindow::self->projectFileNames().contains( buffer ) ) { MainWindow::self->setCurrentProjectByFilename( buffer ); return; } diff --git a/kdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h index e0d6fc06..21a76fb1 100644 --- a/kdevdesigner/interfaces/editorinterface.h +++ b/kdevdesigner/interfaces/editorinterface.h @@ -75,8 +75,8 @@ struct EditorInterface : public TQUnknownInterface virtual void copy() = 0; virtual void paste() = 0; virtual void selectAll() = 0; - virtual bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; - virtual bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0; + virtual bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; + virtual bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0; virtual void gotoLine( int line ) = 0; virtual void indent() = 0; virtual void scrollTo( const TQString &txt, const TQString &first ) = 0; diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp index ac4f8326..fb05aaeb 100644 --- a/kdevdesigner/plugins/languageinterfaceimpl.cpp +++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp @@ -86,9 +86,9 @@ void LanguageInterfaceImpl::functions( const TQString &code, TQValueList<Functio Function func; func.name = (*it).prototype(); func.name.remove( 0, (*it).returnType().length() ); - if ( func.name.tqfind( "::" ) == -1 ) + if ( func.name.find( "::" ) == -1 ) continue; - func.name.remove( (uint)0, func.name.tqfind( "::" ) + 2 ); + func.name.remove( (uint)0, func.name.find( "::" ) + 2 ); func.body = (*it).body(); func.returnType = (*it).returnType(); func.start = (*it).functionStartLineNum(); diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp index 03dc57a7..1ba246bd 100644 --- a/kdevdesigner/shared/parser.cpp +++ b/kdevdesigner/shared/parser.cpp @@ -38,9 +38,9 @@ public: TQString Parser::cleanArgs( const TQString &func ) { TQString slot( func ); - int begin = slot.tqfind( "(" ) + 1; + int begin = slot.find( "(" ) + 1; TQString args = slot.mid( begin ); - args = args.left( args.tqfind( ")" ) ); + args = args.left( args.find( ")" ) ); TQStringList lst = TQStringList::split( ',', args ); TQString res = slot.left( begin ); for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { @@ -48,13 +48,13 @@ TQString Parser::cleanArgs( const TQString &func ) res += ","; TQString arg = *it; int pos = 0; - if ( ( pos = arg.tqfind( "&" ) ) != -1 ) { + if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); - } else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) { + } else if ( ( pos = arg.find( "*" ) ) != -1 ) { arg = arg.left( pos + 1 ); } else { arg = arg.simplifyWhiteSpace(); - if ( ( pos = arg.tqfind( ':' ) ) != -1 ) + if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index 7e56dfa1..d4645eaa 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -164,7 +164,7 @@ public: int insert() { return next++; } void setName( int no, const TQString& name ); - int tqfind( const TQString& name, int deflt = -1 ) const; + int find( const TQString& name, int deflt = -1 ) const; int count() const { return next; } private: @@ -181,10 +181,10 @@ void UibIndexMap::setName( int no, const TQString& name ) } } -int UibIndexMap::tqfind( const TQString& name, int deflt ) const +int UibIndexMap::find( const TQString& name, int deflt ) const { - TQMap<TQString, int>::ConstIterator no = nameMap.tqfind( name ); - if ( no == nameMap.end() || conflicts.tqcontains(name) ) { + TQMap<TQString, int>::ConstIterator no = nameMap.find( name ); + if ( no == nameMap.end() || conflicts.contains(name) ) { return deflt; } else { return *no; @@ -232,7 +232,7 @@ static void packString( UibStrTable& strings, TQDataStream& out, static void packStringSplit( UibStrTable& strings, TQDataStream& out, const TQString& str, TQChar sep ) { - int pos = str.tqfind( sep ); + int pos = str.find( sep ); if ( pos == -1 ) pos = str.length(); packString( strings, out, str.left(pos) ); @@ -516,7 +516,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies, if ( tag == "action" ) { if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) { TQString actionName = f.attribute( "name" ); - int no = objects.tqfind( actionName ); + int no = objects.find( actionName ); if ( no != -1 ) { out << (TQ_UINT8) Object_ActionRef; packUInt16( out, no ); @@ -756,7 +756,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( !f.isNull() ) { if ( f.tagName() == "tabstop" ) { TQString widgetName = f.firstChild().toText().data(); - int no = objects.tqfind( widgetName ); + int no = objects.find( widgetName ); if ( no != -1 ) packUInt16( out2, no ); } @@ -791,7 +791,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( a != buddies.end() ) { TQStringList::ConstIterator b = (*a).begin(); while ( b != (*a).end() ) { - int no = objects.tqfind( *b ); + int no = objects.find( *b ); if ( no != -1 ) { packUInt16( out2, a.key() ); packUInt16( out2, no ); @@ -822,8 +822,8 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) } TQString language = f.attribute( "language", "C++" ); - int senderNo = objects.tqfind( argMap["sender"], widgetNo ); - int receiverNo = objects.tqfind( argMap["receiver"], widgetNo ); + int senderNo = objects.find( argMap["sender"], widgetNo ); + int receiverNo = objects.find( argMap["receiver"], widgetNo ); TQString signal = UibHack::normalize( argMap["signal"] ); TQString slot = UibHack::normalize( argMap["slot"] ); diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h index 07607328..9f2090f7 100644 --- a/kdevdesigner/shared/uib.h +++ b/kdevdesigner/shared/uib.h @@ -108,7 +108,7 @@ inline int UibStrTable::insertCString( const char *cstr ) inline int UibStrTable::insertString( const TQString& str ) { - if ( str.tqcontains('\0') || str[0] == TQChar(0x7f) ) { + if ( str.contains('\0') || str[0] == TQChar(0x7f) ) { int nextPos = table.size(); out << (TQ_UINT8) 0x7f; out << str; diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 1950ddbb..80e8c131 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -764,7 +764,7 @@ TQString WidgetDatabase::createWidgetName( int id ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) n = n.mid( 1 ); - int colonColon = n.tqfindRev( "::" ); + int colonColon = n.findRev( "::" ); if ( colonColon != -1 ) n = n.mid( colonColon + 2 ); @@ -783,14 +783,14 @@ int WidgetDatabase::idFromClassName( const TQString &name ) setupDataBase( -1 ); if ( name.isEmpty() ) return 0; - int *i = className2Id->tqfind( name ); + int *i = className2Id->find( name ); if ( i ) return *i; if ( name == "FormWindow" ) return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); #ifdef UIC setupDataBase( -2 ); - i = className2Id->tqfind( name ); + i = className2Id->find( name ); if ( i ) return *i; #endif @@ -799,7 +799,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) bool WidgetDatabase::hasWidget( const TQString &name ) { - return className2Id->tqfind( name ) != 0; + return className2Id->find( name ) != 0; } WidgetDatabaseRecord *WidgetDatabase::at( int index ) @@ -832,7 +832,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->tqfind( g.ascii() ) == -1 ) + if ( wGroups->find( g.ascii() ) == -1 ) wGroups->append( g.ascii() ); return g; } @@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->tqfind( g.ascii() ) == -1; + return invisibleGroups->find( g.ascii() ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index d8930366..842f8a92 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -177,7 +177,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat dataTmp[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( dataTmp ); len = baunzip.size(); - img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.tqfind('.')).ascii() ); + img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')).ascii() ); } else { img.loadFromData( (const uchar*)data.data(), data.size(), format.ascii() ); } @@ -351,7 +351,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge #ifndef TQT_NO_SQL TQMap<TQWidget*, SqlWidgetConnection>::Iterator cit = widgetFactory->sqlWidgetConnections.begin(); for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) { - if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) != + if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; if ( cit.key()->inherits( "QDesignerDataBrowser2" ) ) @@ -367,10 +367,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key().ascii(), TQDATATABLE_OBJECT_NAME_STRING ); if ( !table ) continue; - if ( widgetFactory->noDatabaseWidgets.tqfind( table->name() ) != + if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; - TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.tqfind( table ); + TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.find( table ); TQString conn = (*it)[ 0 ]; TQSqlCursor* c = 0; TQSqlDatabase *db = 0; @@ -1359,7 +1359,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, return toplevel; } -/*! Installs a widget factory \a factory, which normally tqcontains +/*! Installs a widget factory \a factory, which normally contains additional widgets that can then be created using a TQWidgetFactory. See createWidget() for further details. */ @@ -1534,7 +1534,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq if ( iface ) { TQWidget *w = iface->create( className, tqparent, name ); if ( w ) { - d->customWidgets.tqreplace( className.latin1(), new bool(TRUE) ); + d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; } } @@ -1564,7 +1564,7 @@ TQStringList TQWidgetFactory::widgets() bool TQWidgetFactory::supportsWidget( const TQString &widget ) { setupWidgetListAndMap(); - return ( availableWidgetMap->tqfind( widget ) != availableWidgetMap->end() ); + return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, @@ -1627,7 +1627,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS TQString parentClassName = tqparent ? tqparent->className() : 0; - bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE; + bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, TQVariant value ) { - int offset = obj->tqmetaObject()->tqfindProperty( prop.ascii(), TRUE ); + int offset = obj->tqmetaObject()->findProperty( prop.ascii(), TRUE ); if ( offset != -1 ) { if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { @@ -2148,14 +2148,14 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.tqfind( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) { + if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) { slotList = connector->tqmetaObject()->slotNames( TRUE ); receiver = connector; } // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) { + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) { n = n.nextSibling().toElement(); continue; } @@ -2224,8 +2224,8 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx } TQValueList<Field> fieldMap; - if ( fieldMaps.tqfind( table ) != fieldMaps.end() ) { - fieldMap = *fieldMaps.tqfind( table ); + if ( fieldMaps.find( table ) != fieldMaps.end() ) { + fieldMap = *fieldMaps.find( table ); fieldMaps.remove( table ); } diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp index 516218c8..43b94fa7 100644 --- a/languages/ada/ada_utils.cpp +++ b/languages/ada/ada_utils.cpp @@ -30,7 +30,7 @@ TQString ada_spec_filename (const TQString& comp_unit_name) { TQString fn (comp_unit_name.lower ()); - fn.tqreplace (TQRegExp("."), "-"); + fn.replace (TQRegExp("."), "-"); fn += ".ads"; return fn; } diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 35b34c44..c1caf305 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -167,7 +167,7 @@ void AdaSupportPart::maybeParse (const TQString &fileName) { kdDebug () << "AdaSupportPart::maybeParse: " << fileName << endl; - if (!fileExtensions ().tqcontains (TQFileInfo (fileName).extension ())) + if (!fileExtensions ().contains (TQFileInfo (fileName).extension ())) return; // mainWindow ()->statusBar ()->message (i18n ("Parsing file: %1").arg (fileName)); @@ -298,7 +298,7 @@ void AdaSupportPart::savedFile (const KURL& fileName) { kdDebug () << "AdaSupportPart::savedFile ()" << endl; - if (project ()->allFiles ().tqcontains (fileName.path().mid (project ()->projectDirectory ().length () + 1))) { + if (project ()->allFiles ().contains (fileName.path().mid (project ()->projectDirectory ().length () + 1))) { maybeParse (fileName.path()); emit updatedSourceInfo(); } diff --git a/languages/ada/addclass.cpp b/languages/ada/addclass.cpp index 8605e42a..75420266 100644 --- a/languages/ada/addclass.cpp +++ b/languages/ada/addclass.cpp @@ -33,7 +33,7 @@ AddClassInfo::AddClassInfo() TQString AddClassInfo::adaFileName() const { TQString dest = className; - dest.tqreplace(TQRegExp("\\."), "/"); + dest.replace(TQRegExp("\\."), "/"); return sourceDir + "/" + dest + ".ada"; } @@ -206,7 +206,7 @@ bool AddClass::generate() // find class and package name TQString className, packageName; - int i = m_info.className.tqfindRev('.'); + int i = m_info.className.findRev('.'); if (i == -1) { packageName = ""; @@ -322,7 +322,7 @@ bool AddClass::generate() // create directories TQString dest = packageName; - dest.tqreplace(TQRegExp("\\."), "/"); + dest.replace(TQRegExp("\\."), "/"); dest = m_info.sourceDir + "/" + dest; if (!makeDirs(dest)) diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index 1b9b5bc4..23ef2981 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -185,7 +185,7 @@ void ProblemReporter::reparse() } /* Temporarily deactivated (crashes)*/ - if (!m_adaSupport->fileExtensions ().tqcontains (TQFileInfo (m_filename).extension ())) + if (!m_adaSupport->fileExtensions ().contains (TQFileInfo (m_filename).extension ())) { m_bgParser = new BackgroundParser( this, m_editor->text(), m_filename ); m_bgParser->start(); @@ -211,7 +211,7 @@ void ProblemReporter::reportError( TQString message, new ProblemItem( this, "error", - message.tqreplace( TQRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); @@ -223,7 +223,7 @@ void ProblemReporter::reportWarning( TQString message, { new ProblemItem( this, "warning", - message.tqreplace( TQRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); @@ -235,7 +235,7 @@ void ProblemReporter::reportMessage( TQString message, { new TQListViewItem( this, "message", - message.tqreplace( TQRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 7bcd879f..4b167623 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -172,7 +172,7 @@ void BashSupportPart::savedFile(const KURL &fileName) { kdDebug(9014) << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) + if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { parse(fileName.path()); emit addedSourceInfo( fileName.path() ); @@ -418,7 +418,7 @@ void BashCodeCompletion::completionBoxHidden() m_cursorInterface->cursorPositionReal(&line, &col); TQString lineStr = m_editInterface->textLine(line); - start = lineStr.tqfindRev(TQRegExp("[$][\\d\\w]*\\b$")); + start = lineStr.findRev(TQRegExp("[$][\\d\\w]*\\b$")); m_editInterface->removeText ( start, col, line, col ); */ } diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 70dd27b3..84929a22 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -102,7 +102,7 @@ void AddAttributeDialog::accept() TQString access = accessID( *it ); TQPair<int, int> varEndPoint = tqMakePair( varEndLine, varEndColumn ); - if ( !points.tqcontains( access ) || points[ access ] < varEndPoint ) + if ( !points.contains( access ) || points[ access ] < varEndPoint ) { accessList.remove( access ); accessList.push_back( access ); // move 'access' at the end of the list @@ -132,7 +132,7 @@ void AddAttributeDialog::accept() TQString str = variableDeclaration( currentItem ); TQPair<int, int> pt; - if ( points.tqcontains( *it ) ) + if ( points.contains( *it ) ) { pt = points[ *it ]; } @@ -144,7 +144,7 @@ void AddAttributeDialog::accept() } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.tqcontains( TQChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); } } @@ -236,7 +236,7 @@ TQStringList AddAttributeDialog::newAccessList( const TQStringList& accessList ) item = item->nextSibling(); TQString access = currentItem->text( 0 ); - if ( !( accessList.tqcontains( access ) || newAccessList.tqcontains( access ) ) ) + if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) newAccessList.push_back( access ); } diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 71f03b5d..80397074 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -75,7 +75,7 @@ AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, while ( it != m.end() ) { TQString ext = TQFileInfo( it.key() ).extension(); - if ( !headers.tqcontains( ext ) ) + if ( !headers.contains( ext ) ) sourceFile->insertItem( it.key() ); ++it; } @@ -168,7 +168,7 @@ void AddMethodDialog::accept() TQString access = accessID( *it ); TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); - if ( !points.tqcontains( access ) || points[ access ] < funEndPoint ) + if ( !points.contains( access ) || points[ access ] < funEndPoint ) { accessList.remove( access ); accessList.push_back( access ); // move 'access' at the end of the list @@ -199,7 +199,7 @@ void AddMethodDialog::accept() TQString str = isInline ? functionDefinition( currentItem ) : functionDeclaration( currentItem ); TQPair<int, int> pt; - if ( points.tqcontains( *it ) ) + if ( points.contains( *it ) ) { pt = points[ *it ]; } @@ -211,7 +211,7 @@ void AddMethodDialog::accept() } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.tqcontains( TQChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); } } @@ -408,7 +408,7 @@ TQStringList AddMethodDialog::newAccessList( const TQStringList& accessList ) co item = item->nextSibling(); TQString access = currentItem->text( 1 ); - if ( !( accessList.tqcontains( access ) || newAccessList.tqcontains( access ) ) ) + if ( !( accessList.contains( access ) || newAccessList.contains( access ) ) ) newAccessList.push_back( access ); } diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp index 2f569f3c..32f32c65 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp +++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp @@ -33,7 +33,7 @@ void %{APPNAME}::add(TQString arg) bool %{APPNAME}::remove(TQString arg) { - TQStringList::Iterator it = m_List.tqfind(arg); + TQStringList::Iterator it = m_List.find(arg); if (it != m_List.end()) { m_List.remove(it); diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.hh index 7b356a27..ae93336b 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.hh @@ -2,7 +2,7 @@ // newer (non customized) versions of this file go to main_window.hh_new -// you might tqreplace +// you might replace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.hh index 6f9405d0..640e1461 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.hh @@ -2,7 +2,7 @@ // newer (non customized) versions of this file go to main_window.hh_new -// you might tqreplace +// you might replace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am index f118ee10..318e274a 100644 --- a/languages/cpp/app_templates/kapp/src-Makefile.am +++ b/languages/cpp/app_templates/kapp/src-Makefile.am @@ -29,7 +29,7 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am index 42a3cec8..88ba33a8 100644 --- a/languages/cpp/app_templates/kateplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am @@ -16,5 +16,5 @@ plugins_DATA = plugin_%{APPNAMELC}.rc kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am index 14a5dd2a..2dbd9367 100644 --- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am +++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am @@ -16,6 +16,6 @@ plugins_DATA = plugin_%{APPNAMELC}.rc kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kcmodule/src-Makefile.am b/languages/cpp/app_templates/kcmodule/src-Makefile.am index 6efe685a..e5d30776 100644 --- a/languages/cpp/app_templates/kcmodule/src-Makefile.am +++ b/languages/cpp/app_templates/kcmodule/src-Makefile.am @@ -13,5 +13,5 @@ xdg_apps_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `tqfind -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcm%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am index 2a04da7e..737b7399 100644 --- a/languages/cpp/app_templates/kconfig35/src-Makefile.am +++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am index 9b32fb8f..69cbe936 100644 --- a/languages/cpp/app_templates/kdedcop/src-Makefile.am +++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am @@ -10,7 +10,7 @@ noinst_HEADERS = %{APPNAMELC}.h METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot # this is the program that gets installed. it's name is used for all diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index e6b82e21..1ca8f046 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -91,7 +91,7 @@ void %{APPNAME}Part::savedFile(const KURL &fileName) { - if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) + if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { kdDebug(9014) << "parse file " << fileName.path() << endl; emit addedSourceInfo( fileName.path() ); diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am index 4bfee32a..a0395825 100644 --- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kfileplugin/src-Makefile.am @@ -18,5 +18,5 @@ services_DATA = kfile_%{APPNAMELC}.desktop servicesdir = $(kde_servicesdir) messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am index 820f292a..9537dc00 100644 --- a/languages/cpp/app_templates/khello/src-Makefile.am +++ b/languages/cpp/app_templates/khello/src-Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = %{APPNAMELC}.h METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am index 7f9d7125..748c54e3 100644 --- a/languages/cpp/app_templates/khello2/src-Makefile.am +++ b/languages/cpp/app_templates/khello2/src-Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = %{APPNAMELC}.h METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am index 8a46f24d..424062d1 100644 --- a/languages/cpp/app_templates/kicker/src-Makefile.am +++ b/languages/cpp/app_templates/kicker/src-Makefile.am @@ -11,5 +11,5 @@ kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la %{APPNAMELC}dir = $(kde_datadir)/kicker/applets messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/kioslave/src-Makefile.am index b73354f1..957ec330 100644 --- a/languages/cpp/app_templates/kioslave/src-Makefile.am +++ b/languages/cpp/app_templates/kioslave/src-Makefile.am @@ -10,5 +10,5 @@ protocol_DATA = %{APPNAMELC}.protocol protocoldir = $(kde_servicesdir) messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am index a0f702f6..19d38267 100644 --- a/languages/cpp/app_templates/kofficepart/src-Makefile.am +++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am @@ -37,5 +37,5 @@ rc_DATA = %{APPNAMELC}.rc rcdir = $(kde_datadir)/%{APPNAMELC} messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp %{APPNAMELC}_aboutdata.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am index 9b1a14b4..cd5ee2b6 100644 --- a/languages/cpp/app_templates/kpartapp/src-Makefile.am +++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}_part.h METASOURCES = AUTO messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am index 81242777..52e29c09 100644 --- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am @@ -18,5 +18,5 @@ pluginsdir = $(kde_datadir)/khtml/kpartplugins plugins_DATA = plugin_%{APPNAMELC}.rc messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct index 238a05b8..b82de4e1 100644 --- a/languages/cpp/app_templates/kscons_kmdi/SConstruct +++ b/languages/cpp/app_templates/kscons_kmdi/SConstruct @@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS: shutil.copytree(startdir, FOLDER) ## remove our object files first - os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") #os.popen("pushd %s && scons -c " % FOLDER) # TODO ## CVS cleanup - os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") ## Subversion cleanup - os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER) + os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) ## GNU Arch cleanup - os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") ## Create the tarball (coloured output) print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" @@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS: import os, shutil if os.path.isdir(env['CACHEDIR']): shutil.rmtree(env['CACHEDIR']) - os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf") + os.popen("find . -name \"*.pyc\" | xargs rm -rf") env.Default(None) env.Exit(0) diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index efb41c1d..7cc0f221 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -204,7 +204,7 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current ) } // switch to the corresponding document - if ( m_views.tqcontains( (%{APPNAMELC}kmdiView*) current ) ) + if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) ) { %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current; //view->updateCaption(); @@ -243,7 +243,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v) } %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v; - if ( m_views.tqcontains( view ) ) + if ( m_views.contains( view ) ) { m_views.remove( view ); if ( view->part()->queryClose() ) diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh index 7df00263..a36f5c93 100755 --- a/languages/cpp/app_templates/kscons_kmdi/messages.sh +++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh @@ -34,14 +34,14 @@ fi echo "extracting the strings" # process the .ui and .rc files -$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp +$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp # process the tips - $SRCDIR is supposed to be where the tips are living pushd $TIPSDIR; preparetips >tips.cpp; popd -$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot +$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot # remove the intermediate files rm -f $TIPSDIR/tips.cpp diff --git a/languages/cpp/app_templates/kscons_kxt/SConstruct b/languages/cpp/app_templates/kscons_kxt/SConstruct index 238a05b8..b82de4e1 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConstruct +++ b/languages/cpp/app_templates/kscons_kxt/SConstruct @@ -73,20 +73,20 @@ if 'dist' in COMMAND_LINE_TARGETS: shutil.copytree(startdir, FOLDER) ## remove our object files first - os.popen("tqfind "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("tqfind "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") #os.popen("pushd %s && scons -c " % FOLDER) # TODO ## CVS cleanup - os.popen("tqfind "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("tqfind "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") ## Subversion cleanup - os.popen("tqfind %s -name .svn -type d | xargs rm -rf" % FOLDER) + os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) ## GNU Arch cleanup - os.popen("tqfind "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("tqfind "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") ## Create the tarball (coloured output) print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" @@ -105,7 +105,7 @@ if 'distclean' in COMMAND_LINE_TARGETS: import os, shutil if os.path.isdir(env['CACHEDIR']): shutil.rmtree(env['CACHEDIR']) - os.popen("tqfind . -name \"*.pyc\" | xargs rm -rf") + os.popen("find . -name \"*.pyc\" | xargs rm -rf") env.Default(None) env.Exit(0) diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh index 7df00263..a36f5c93 100755 --- a/languages/cpp/app_templates/kscons_kxt/messages.sh +++ b/languages/cpp/app_templates/kscons_kxt/messages.sh @@ -34,14 +34,14 @@ fi echo "extracting the strings" # process the .ui and .rc files -$EXTRACTRC `tqfind $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `tqfind $SRCDIR -iname *.ui` >> rc.cpp +$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp # process the tips - $SRCDIR is supposed to be where the tips are living pushd $TIPSDIR; preparetips >tips.cpp; popd -$XGETTEXT `tqfind $SRCDIR -name "*.cpp"` -o kdissert.pot +$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot # remove the intermediate files rm -f $TIPSDIR/tips.cpp diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am index e11ec0dc..e19ffb77 100644 --- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am +++ b/languages/cpp/app_templates/kscreensaver/src-Makefile.am @@ -20,5 +20,5 @@ desktopdir = $(kde_appsdir)/System/ScreenSavers EXTRA_DIST = $(desktop_DATA) messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am index 2a04da7e..737b7399 100644 --- a/languages/cpp/app_templates/kxt/src-Makefile.am +++ b/languages/cpp/app_templates/kxt/src-Makefile.am @@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot KDE_ICON = AUTO diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am index f7c7b349..95506569 100644 --- a/languages/cpp/app_templates/noatunui/src-Makefile.am +++ b/languages/cpp/app_templates/noatunui/src-Makefile.am @@ -20,5 +20,5 @@ plugins_DATA = %{APPNAMELC}.plugin # kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am index 8f649499..207fd8a8 100644 --- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am +++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am @@ -15,5 +15,5 @@ plugins_DATA = %{APPNAMELC}.plugin # kde_services_DATA = %{APPNAMELC}.desktop messages: rc.cpp - $(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro index 74323c7c..f4111696 100644 --- a/languages/cpp/app_templates/opieapp/app.pro +++ b/languages/cpp/app_templates/opieapp/app.pro @@ -9,8 +9,8 @@ QMAKE_LIBDIR = $(OPIEDIR)/lib OPIE-SPEC=6 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -tqcontains( TEMPLATE, quick-template ){ - tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ +contains( TEMPLATE, quick-template ){ + contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro index 696082d0..e1cc1e3b 100644 --- a/languages/cpp/app_templates/opieapplet/app.pro +++ b/languages/cpp/app_templates/opieapplet/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -tqcontains( TEMPLATE, quick-template ){ - tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ +contains( TEMPLATE, quick-template ){ + contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro index 5a3a7a40..1711c78f 100644 --- a/languages/cpp/app_templates/opieinput/app.pro +++ b/languages/cpp/app_templates/opieinput/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -tqcontains( TEMPLATE, quick-template ){ - tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ +contains( TEMPLATE, quick-template ){ + contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro index f9600bf4..71bc208c 100644 --- a/languages/cpp/app_templates/opiemenu/app.pro +++ b/languages/cpp/app_templates/opiemenu/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -tqcontains( TEMPLATE, quick-template ){ - tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ +contains( TEMPLATE, quick-template ){ + contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro index df87650c..53fb6eea 100644 --- a/languages/cpp/app_templates/opienet/app.pro +++ b/languages/cpp/app_templates/opienet/app.pro @@ -7,8 +7,8 @@ LIBS += -linterfaces QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -tqcontains( TEMPLATE, quick-template ){ - tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ +contains( TEMPLATE, quick-template ){ + contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/app_templates/opienet/simplemodule.cpp b/languages/cpp/app_templates/opienet/simplemodule.cpp index f8e963bd..143e9f90 100644 --- a/languages/cpp/app_templates/opienet/simplemodule.cpp +++ b/languages/cpp/app_templates/opienet/simplemodule.cpp @@ -29,7 +29,7 @@ */ bool %{APPNAME}Module::isOwner( Interface* iface ) { /* check if it is our device */ - return m_interfaces.tqfind( iface ) != -1; + return m_interfaces.find( iface ) != -1; } TQWidget* %{APPNAME}Module::configure( Interface* ) { diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro index 73e03efb..152dc6f6 100644 --- a/languages/cpp/app_templates/opietoday/app.pro +++ b/languages/cpp/app_templates/opietoday/app.pro @@ -6,8 +6,8 @@ TARGET = %{APPNAMELC} QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP) -tqcontains( TEMPLATE, quick-template ){ - tqcontains( QUICK_SPEC_FOO, quick-app-lib ){ +contains( TEMPLATE, quick-template ){ + contains( QUICK_SPEC_FOO, quick-app-lib ){ message( "foo" ) system( rm $$TARGET ) system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET) diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index 4c9d63d1..8db2e754 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -118,7 +118,7 @@ TQString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove if ( !typeSpec ) return TQString(); - return typeSpec->text().tqreplace( TQRegExp( " :: " ), "::" ); + return typeSpec->text().replace( TQRegExp( " :: " ), "::" ); } TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp ) @@ -185,6 +185,6 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += " const"; } - return text.tqreplace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace(); + return text.replace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace(); } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index 4e22dcc7..13b831e0 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -220,7 +220,7 @@ public: return ret; } - bool tqcontains( const TQString& fileName ) const + bool contains( const TQString& fileName ) const { TQMutexLocker locker( &m_mutex ); ListType::const_iterator it = m_fileList.begin(); @@ -283,7 +283,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) TQString fn = deepCopy( fileName ); //bool added = false; - /*if ( !m_fileList->tqcontains( fn ) ) + /*if ( !m_fileList->contains( fn ) ) { m_fileList->push_back( fn, readFromDisk ); added = true; @@ -299,7 +299,7 @@ void BackgroundParser::addFileFront( const TQString& fileName, bool readFromDisk TQString fn = deepCopy( fileName ); bool added = false; - /*if ( m_fileList->tqcontains( fn ) ) + /*if ( m_fileList->contains( fn ) ) m_fileList->remove( fn );*/ m_fileList->push_front( fn, readFromDisk ); @@ -410,7 +410,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { static_cast<KDevSourceProvider*>( m_driver->sourceProvider() ) ->setReadFromDisk( false ); - if ( m_unitDict.tqfind( file.fileName() ) != m_unitDict.end() ) + if ( m_unitDict.find( file.fileName() ) != m_unitDict.end() ) { Unit * u = m_unitDict[ file.fileName() ]; m_unitDict.remove( file.fileName() ); @@ -430,12 +430,12 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { Unit* BackgroundParser::findUnit( const TQString& fileName ) { - TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end() ? *it : 0; } bool BackgroundParser::hasTranslationUnit( const TQString& fileName ) { - TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end(); } diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index c9092969..7bf2601e 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -314,7 +314,7 @@ void CCConfigWidget::slotGetterSetterValuesChanged( ) m_edtExampleSet->setPaletteForegroundColor( TQColor( "black" ) ); } - TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().tqreplace( " ", "" ) ); + TQStringList prefixes = TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ); unsigned int len = 0; TQStringList::ConstIterator theend = prefixes.end(); for ( TQStringList::ConstIterator ci = prefixes.begin(); ci != theend; ++ci ) @@ -355,7 +355,7 @@ void CCConfigWidget::saveGetterSetterTab( ) config->setPrefixGet( m_edtGet->text() ); config->setPrefixSet( m_edtSet->text() ); - config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().tqreplace( " ", "" ) ) ); + config->setPrefixVariable( TQStringList::split( ",", m_edtRemovePrefix->text().replace( " ", "" ) ) ); config->setParameterName( m_edtParameterName->text() ); config->store(); } diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index 3533dd73..b2c3c30c 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -30,7 +30,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) e.text + " " + e.prefix + " " + e.postfix + " "; - if ( map.tqfind( key ) == map.end() ) + if ( map.find( key ) == map.end() ) { map[ key ] = TRUE; l << e; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index 0c287beb..533f6ad7 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -224,21 +224,21 @@ void OptimizationTab::readFlags( TQStringList *list ) optBox->readFlags( list ); TQStringList::Iterator sli; - sli = list->tqfind( "-O0" ); + sli = list->find( "-O0" ); if ( sli != list->end() ) { O0->setChecked( true ); list->remove ( sli ); } - sli = list->tqfind( "-O1" ); + sli = list->find( "-O1" ); if ( sli != list->end() ) { O1->setChecked( true ); list->remove ( sli ); } - sli = list->tqfind( "-O2" ); + sli = list->find( "-O2" ); if ( sli != list->end() ) { O2->setChecked( true ); diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 3d9fcb73..846aec77 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -134,7 +134,7 @@ CppCodeCompletion* cppCompletionInstance = 0; //file global functions, must be before any "using namespace" TQString cleanForMenu( TQString txt ) { - return txt.tqreplace( "&", "&&" ).tqreplace( " ", " " ); + return txt.replace( "&", "&&" ).replace( " ", " " ); } TQString buildSignature( TypePointer currType ) { @@ -254,7 +254,7 @@ static TQValueList<ItemType> unique( const TQValueList<ItemType>& entryList ) { e.prefix + " " + e.text + " " + e.postfix + " " ).simplifyWhiteSpace().stripWhiteSpace(); - if ( map.tqfind( key ) == map.end() ) { + if ( map.find( key ) == map.end() ) { map[ key ] = TRUE; l << e; } @@ -269,7 +269,7 @@ static TQStringList unique( const TQStringList& entryList ) { TQStringList::ConstIterator it = entryList.begin(); while ( it != entryList.end() ) { TQString e = *it++; - if ( map.tqfind( e ) == map.end() ) { + if ( map.find( e ) == map.end() ) { map[ e ] = TRUE; l << e; } @@ -285,7 +285,7 @@ static TQStringList unique( const TQValueList<TQStringList>& entryList ) { while ( it != entryList.end() ) { TQStringList li = ( *it++ ); TQString e = li.join( "\n" ); - if ( map.tqfind( e ) == map.end() ) { + if ( map.find( e ) == map.end() ) { map[ e ] = TRUE; l += li; } @@ -376,7 +376,7 @@ struct PopupFillerHelpStruct { if ( cm && cm->item() ) { TQPopupMenu * m = PopupTracker::createPopup( tqparent ); TQString scope = cm->scope().join("::"); - TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.tqfind( scope ); + TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); if( it != m_namespacePopupCache.end() ) { tqparent->insertItem( "Imported Namespace " + scope, *it ); delete m; @@ -1121,7 +1121,7 @@ void CppCodeCompletion::slotTextChanged() { // !!WARNING!! This is very hackish, but KTE doesn't offer a way // to tell the completion box to _go_away_ if ( ch.simplifyWhiteSpace().isEmpty() && - !strCurLine.simplifyWhiteSpace().tqcontains( "virtual" ) && + !strCurLine.simplifyWhiteSpace().contains( "virtual" ) && m_bCompletionBoxShow ) { TQValueList<KTextEditor::CompletionEntry> entryList; m_bCompletionBoxShow = true; @@ -1139,7 +1139,7 @@ void CppCodeCompletion::slotTextChanged() { // m_codeCompleteCh2Rx completes on "->" and "::" if ( ( argsHint && ch == "(" ) || - ( codeComplete && strCurLine.simplifyWhiteSpace().tqcontains( "virtual" ) ) || + ( codeComplete && strCurLine.simplifyWhiteSpace().contains( "virtual" ) ) || ( codeComplete && ( m_codeCompleteChRx.search( ch ) != -1 || m_codeCompleteCh2Rx.search( ch2 ) != -1 ) ) || ( headComplete && ( ch == "\"" || ch == "<" ) && m_includeRx.search( strCurLine ) != -1 ) ) { @@ -1238,7 +1238,7 @@ TQString CppCodeCompletion::replaceCppComments( const TQString& contents ) { after.fill( ' ', before.length() - 5 ); after.prepend( "/*" ); after.append( "*/" ); - text.tqreplace( pos, before.length() - 1, after ); + text.replace( pos, before.length() - 1, after ); pos += after.length(); } else { pos += m_cppCodeCommentsRx.matchedLength(); @@ -1444,7 +1444,7 @@ EvaluationResult CppCodeCompletion::evaluateExpressionAt( int line, int column , } void CppCodeCompletion::popupAction( int number ) { - PopupActions::iterator it = m_popupActions.tqfind( number ); + PopupActions::iterator it = m_popupActions.find( number ); if ( it != m_popupActions.end() ) { TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if( (*it).startLine == -1 ) { @@ -1459,7 +1459,7 @@ void CppCodeCompletion::popupAction( int number ) { } void CppCodeCompletion::popupDefinitionAction( int number ) { - PopupActions::iterator it = m_popupDefinitionActions.tqfind( number ); + PopupActions::iterator it = m_popupDefinitionActions.find( number ); if ( it != m_popupDefinitionActions.end() ) { TQString fileName = ( *it ).file == "current_file" ? m_activeFileName : ( *it ).file.operator TQString(); if ( !m_pSupport->switchHeaderImpl( fileName, ( *it ).startLine, ( *it ).startCol ) ) @@ -1481,7 +1481,7 @@ void CppCodeCompletion::selectItem( ItemDom item ) { } void CppCodeCompletion::popupClassViewAction( int number ) { - PopupClassViewActions::iterator it = m_popupClassViewActions.tqfind( number ); + PopupClassViewActions::iterator it = m_popupClassViewActions.find( number ); if ( it != m_popupClassViewActions.end() ) { if ( ( *it ) ) selectItem( *it ); @@ -1744,7 +1744,7 @@ bool CppCodeCompletion::isTypeExpression( const TQString& expr ) { bool CppCodeCompletion::mayBeTypeTail( int line, int column, TQString& append, bool inFunction ) { TQString tail = clearComments( m_activeEditor->text( line, column + 1, line + 10 > ( int ) m_activeEditor->numLines() ? ( int ) m_activeEditor->numLines() : line + 10, 0 ) ); - tail.tqreplace( "\n", " " ); + tail.replace( "\n", " " ); SafetyCounter s ( 100 ); bool hadSpace = false; while ( !tail.isEmpty() && s ) { @@ -1830,7 +1830,7 @@ ExpressionInfo CppCodeCompletion::findExpressionAt( int line, int column, int st //make this a regexp TQString e = ret.expr(); - if ( e.tqcontains( "." ) || e.tqcontains( "->" ) || e.tqcontains( "(" ) || e.tqcontains( ")" ) || e.tqcontains( "=" ) || e.tqcontains( "-" ) ) + if ( e.contains( "." ) || e.contains( "->" ) || e.contains( "(" ) || e.contains( ")" ) || e.contains( "=" ) || e.contains( "-" ) ) mayBeType = false; if ( mayBeType ) { @@ -1988,8 +1988,8 @@ bool CppCodeCompletion::functionContains( FunctionDom f , int line, int col ) { if ( t.isEmpty() ) return false; - //int i = t.tqfind( '{' ); - int i = t.tqfind( '(' ); //This now includes the argument-list + //int i = t.find( '{' ); + int i = t.find( '(' ); //This now includes the argument-list if ( i == -1 ) return false; int lineCols = 0; @@ -2017,7 +2017,7 @@ void CppCodeCompletion::getFunctionBody( FunctionDom f , int& line, int& col ) { if ( t.isEmpty() ) return; - int i = t.tqfind( '{' ); + int i = t.find( '{' ); if ( i == -1 ) return; i++; @@ -2673,7 +2673,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { kdDebug(9007) << "------> found virtual keyword for class specifier '" << clazz->text() << "'" << endl; }*/ - } else if ( TQString( "virtual" ).tqfind( keyword ) != -1 ) + } else if ( TQString( "virtual" ).find( keyword ) != -1 ) m_blockForKeyword = true; else m_blockForKeyword = false; @@ -2756,7 +2756,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( ch2 == "::" ) { TQString str = clearComments( expr ); - if ( !str.tqcontains( '.' ) && !str.tqcontains( "->" ) ) ///Necessary, because the expression may also be like user->BaseUser:: + if ( !str.contains( '.' ) && !str.contains( "->" ) ) ///Necessary, because the expression may also be like user->BaseUser:: isInstance = false; } @@ -4417,7 +4417,7 @@ TQString CppCodeCompletion::createTypeInfoString( int line, int column ) if ( type->resolved() ) { TQString scope = type->resolved()->scope().join("::"); - int pos = scope.tqfindRev("::"); + int pos = scope.findRev("::"); if ( scope.isEmpty() || pos == -1 ) { scope = "::"; diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 0912678c..bd727d95 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -49,15 +49,15 @@ TQStringList CppImplementationWidget::createClassFiles() template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n"; TQFileInfo formInfo( m_formName ); - template_h.tqreplace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); - template_h.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); - template_h.tqreplace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_h.tqreplace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); + template_h.replace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" ); + template_h.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_h.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_h.replace( TQRegExp( "\\$DEFTEXT\\$" ), fileNameEdit->text().upper() ); - template_cpp.tqreplace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); - template_cpp.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); - template_cpp.tqreplace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_cpp.tqreplace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".tqmoc" ); + template_cpp.replace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); + template_cpp.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); + template_cpp.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); + template_cpp.replace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".tqmoc" ); template_h = FileTemplate::read( m_part, "h" ) + template_h; template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp; diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index 14d3cd49..db4d0160 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -146,7 +146,7 @@ TQStringList& gres( TQStringList &list, const TQRegExp & rx, const TQString & af TQStringList::Iterator it = list.begin(); while ( it != list.end() ) { - ( *it ).tqreplace( rx, after ); + ( *it ).replace( rx, after ); ++it; } return list; @@ -226,13 +226,13 @@ void CppNewClassDialog::classNameChanged( const TQString &text ) default: ; } - header = header.tqreplace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); + header = header.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); header_edit->setText( header ); } if ( !implementationModified ) { TQString implementation; - if ( str.tqcontains( "template" ) ) + if ( str.contains( "template" ) ) implementation = str + "_impl" + interface_suffix; else implementation = str + implementation_suffix; @@ -247,7 +247,7 @@ void CppNewClassDialog::classNameChanged( const TQString &text ) default: ; } - implementation = implementation.tqreplace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); + implementation = implementation.replace( TQRegExp( "(template *<.*> *)?(class +)?" ), "" ); implementation_edit->setText( implementation ); } } @@ -279,9 +279,9 @@ void CppNewClassDialog::baseclassname_changed( const TQString &text ) } else { - if ( header.tqcontains( TQRegExp( "::" ) ) ) - header = header.mid( header.tqfindRev( TQRegExp( "::" ) ) + 2 ); - header = header.tqreplace( TQRegExp( " *<.*>" ), "" ); + if ( header.contains( TQRegExp( "::" ) ) ) + header = header.mid( header.findRev( TQRegExp( "::" ) ) + 2 ); + header = header.replace( TQRegExp( " *<.*>" ), "" ); header += interface_suffix; switch ( gen_config->superCase() ) @@ -516,23 +516,23 @@ void CppNewClassDialog::remBaseClassOnly() void CppNewClassDialog::remClassFromAdv( TQString text ) { // Strip off namespace qualification - if ( text.tqcontains( "::" ) ) - text = text.mid( text.tqfindRev( "::" ) + 2 ); + if ( text.contains( "::" ) ) + text = text.mid( text.findRev( "::" ) + 2 ); removeTemplateParams( text ); TQListViewItem *it = 0; - if ( ( it = access_view->tqfindItem( text, 0 ) ) ) + if ( ( it = access_view->findItem( text, 0 ) ) ) delete it; - if ( ( it = methods_view->tqfindItem( text, 0 ) ) ) + if ( ( it = methods_view->findItem( text, 0 ) ) ) delete it; - if ( ( it = constructors_view->tqfindItem( text, 0 ) ) ) + if ( ( it = constructors_view->findItem( text, 0 ) ) ) { /// @todo changing constructors text in constructors_cpp_edit // and constructors_h_edit must be implemented /* int *para = new int(1); int *index = new int(1); - if (constructors_cpp_edit->tqfind(text + "(", true, false, true, para, index)) + if (constructors_cpp_edit->find(text + "(", true, false, true, para, index)) { qWarning("%s( found", text.latin1()); if (para) constructors_cpp_edit->removeParagraph(*para); @@ -615,19 +615,19 @@ void CppNewClassDialog::currBaseSelected( TQListViewItem *it ) basename_edit->setText( it->text( 0 ) ); baseinclude_edit->setText( it->text( 3 ) ); scope_box->setCurrentItem( it->text( 2 ).toInt() ); - if ( it->text( 1 ).tqcontains( "private" ) ) + if ( it->text( 1 ).contains( "private" ) ) private_button->setChecked( true ); else private_button->setChecked( false ); - if ( it->text( 1 ).tqcontains( "protected" ) ) + if ( it->text( 1 ).contains( "protected" ) ) protected_button->setChecked( true ); else protected_button->setChecked( false ); - if ( it->text( 1 ).tqcontains( "public" ) ) + if ( it->text( 1 ).contains( "public" ) ) public_button->setChecked( true ); else public_button->setChecked( false ); - if ( it->text( 1 ).tqcontains( "virtual" ) ) + if ( it->text( 1 ).contains( "virtual" ) ) virtual_box->setChecked( true ); else virtual_box->setChecked( false ); @@ -704,7 +704,7 @@ void CppNewClassDialog::updateConstructorsOrder() while ( it.current() ) { - if ( ( c_it = constructors_view->tqfindItem( it.current() ->text( 0 ), 0 ) ) ) + if ( ( c_it = constructors_view->findItem( it.current() ->text( 0 ), 0 ) ) ) { c_it->moveItem( fc_it ); fc_it = c_it; @@ -796,11 +796,11 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) TQStringList clNamespace = currNamespace; bool clFullQualified = false; - if ( clName.tqcontains( "::" ) ) + if ( clName.contains( "::" ) ) { // Full qualified, override imported namespace clFullQualified = true; - int splitpoint = clName.tqfindRev( "::" ); + int splitpoint = clName.findRev( "::" ); clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } @@ -875,13 +875,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.tqcontains( "protected" ) ) + if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.tqcontains( "private" ) ) + else if ( inheritance.contains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.tqcontains( "public" ) ) + else if ( inheritance.contains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_slots, *methodIt, inhModifier ); } @@ -896,13 +896,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) // see what modifier is given for the base class TQString inhModifier; //protected inheritance gives protected methods - if ( inheritance.tqcontains( "protected" ) ) + if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private methods - else if ( inheritance.tqcontains( "private" ) ) + else if ( inheritance.contains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public methods - else if ( inheritance.tqcontains( "public" ) ) + else if ( inheritance.contains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_methods, *methodIt, inhModifier ); } @@ -917,13 +917,13 @@ void CppNewClassDialog::parseClass( TQString clName, TQString inheritance ) { TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.tqcontains( "protected" ) ) + if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.tqcontains( "private" ) ) + else if ( inheritance.contains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.tqcontains( "public" ) ) + else if ( inheritance.contains( "public" ) ) inhModifier = ( *varIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_attrs, *varIt, inhModifier ); } @@ -937,8 +937,8 @@ bool CppNewClassDialog::isConstructor( TQString className, const FunctionDom &me if ( ( className == method->name() ) ) { qWarning( "1x" ); - if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).tqcontains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) ) - // if ( method->asString().tqcontains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) + if ( ( method->argumentList().count() == 1 ) && ( m_part->formatModelItem( method->argumentList() [ 0 ].data() ).contains( TQRegExp( " *(const)? *" + className + " *& *" ) ) ) ) + // if ( method->asString().contains(TQRegExp(className + "\\s*\\(\\s*(const)?\\s*" + className + "\\s*&[A-Za-z_0-9\\s]*\\)", true, false)) ) return false; else return true; @@ -955,7 +955,7 @@ void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, Functio void CppNewClassDialog::addToMethodsList( TQListViewItem *tqparent, FunctionDom method ) { PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); - method->isAbstract() ? it->setText( 1, i18n( "tqreplace" ) ) : it->setText( 1, i18n( "extend" ) ); + method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) ); } void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ) @@ -977,11 +977,11 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) TQStringList clNamespace = currNamespace; bool clFullQualified = false; - if ( clName.tqcontains( "::" ) ) + if ( clName.contains( "::" ) ) { // Full qualified, override imported namespace clFullQualified = true; - int splitpoint = clName.tqfindRev( "::" ); + int splitpoint = clName.findRev( "::" ); clNamespace = TQStringList::split( "::", clName.left( splitpoint ) ); clName = clName.mid( splitpoint + 2 ); } @@ -1034,13 +1034,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.tqcontains( "protected" ) ) + if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.tqcontains( "private" ) ) + else if ( inheritance.contains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.tqcontains( "public" ) ) + else if ( inheritance.contains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_slots, *methodIt, inhModifier ); } @@ -1055,13 +1055,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) //see what modifier is given for the base class TQString inhModifier; //protected inheritance gives protected methods - if ( inheritance.tqcontains( "protected" ) ) + if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private methods - else if ( inheritance.tqcontains( "private" ) ) + else if ( inheritance.contains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public methods - else if ( inheritance.tqcontains( "public" ) ) + else if ( inheritance.contains( "public" ) ) inhModifier = ( *methodIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_methods, *methodIt, inhModifier ); } @@ -1076,13 +1076,13 @@ void CppNewClassDialog::parsePCSClass( TQString clName, TQString inheritance ) { TQString inhModifier; //protected inheritance gives protected attributes - if ( inheritance.tqcontains( "protected" ) ) + if ( inheritance.contains( "protected" ) ) inhModifier = "protected"; //private inheritance gives private attributes - else if ( inheritance.tqcontains( "private" ) ) + else if ( inheritance.contains( "private" ) ) inhModifier = "private"; //public inheritance gives protected and public attributes - else if ( inheritance.tqcontains( "public" ) ) + else if ( inheritance.contains( "public" ) ) inhModifier = ( *varIt ) ->access() == CodeModelItem::Public ? "public" : "protected"; addToUpgradeList( access_attrs, *varIt, inhModifier ); } @@ -1111,7 +1111,7 @@ void CppNewClassDialog::clearConstructorsList( bool clean ) TQListViewItemIterator it( constructors_view ); while ( it.current() ) { - if ( ! currBaseClasses.tqcontains(it.current().text(0)) ) + if ( ! currBaseClasses.contains(it.current().text(0)) ) delete it.current(); ++it; } @@ -1149,7 +1149,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess { TQListViewItem * base; - if ( ( base = access_view->tqfindItem( baseclass, 0 ) ) ) + if ( ( base = access_view->findItem( baseclass, 0 ) ) ) { TQListViewItemIterator it( base ); while ( it.current() ) @@ -1211,7 +1211,7 @@ void CppNewClassDialog::extendFunctionality() void CppNewClassDialog::replaceFunctionality() { if ( methods_view->selectedItem() ) - methods_view->selectedItem() ->setText( 1, i18n( "tqreplace" ) ); + methods_view->selectedItem() ->setText( 1, i18n( "replace" ) ); } void CppNewClassDialog::selectall_button_clicked() @@ -1313,13 +1313,13 @@ bool CppNewClassDialog::ClassGenerator::validateInput() { className = dlg.classname_edit->text().simplifyWhiteSpace(); TQString temp = className; - className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); - templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); - templateStr.tqreplace( TQRegExp( " *class *$" ), "" ); + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + templateStr = temp.replace( TQRegExp( TQRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); templateParams = templateStr; - templateParams.tqreplace( TQRegExp( "^ *template *" ), "" ); - templateParams.tqreplace( TQRegExp( " *class *" ), "" ); + templateParams.replace( TQRegExp( "^ *template *" ), "" ); + templateParams.replace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); if ( className.isEmpty() ) @@ -1342,7 +1342,7 @@ bool CppNewClassDialog::ClassGenerator::validateInput() } /// \FIXME - if ( ( header.tqfind( '/' ) != -1 || implementation.tqfind( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) + if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { KMessageBox::error( &dlg, i18n( "Generated files will always be added to the " "active directory, so you must not give an " @@ -1482,14 +1482,14 @@ void CppNewClassDialog::ClassGenerator::common_text() if ( !dlg.constructors_h_edit->text().isEmpty() ) { advConstructorsHeader = " " + dlg.constructors_h_edit->text(); - advConstructorsHeader.tqreplace( TQRegExp( "\n" ), "\n " ); + advConstructorsHeader.replace( TQRegExp( "\n" ), "\n " ); } if ( !dlg.constructors_cpp_edit->text().isEmpty() ) { advConstructorsSource = dlg.constructors_cpp_edit->text(); } - advConstructorsHeader.tqreplace( TQRegExp( "[\\n ]*$" ), TQString() ); - advConstructorsSource.tqreplace( TQRegExp( "[\\n ]*$" ), TQString() ); + advConstructorsHeader.replace( TQRegExp( "[\\n ]*$" ), TQString() ); + advConstructorsSource.replace( TQRegExp( "[\\n ]*$" ), TQString() ); //advanced method overriding @@ -1572,7 +1572,7 @@ void CppNewClassDialog::ClassGenerator::common_text() *adv_h += "\n\n";*/ TQString methodName = curr_m->item() ->name(); - if ( !methodName.tqcontains( TQRegExp( "^[a-zA-z_]" ) ) ) + if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; *adv_h += " using " + curr_m->tqparent() ->tqparent() ->text( 0 ) + "::" + methodName + ";\n"; } @@ -1581,13 +1581,13 @@ void CppNewClassDialog::ClassGenerator::common_text() } TQRegExp e( "[\\n ]*$" ); - advH_public.tqreplace( e, TQString() ); - advH_public_slots.tqreplace( e, TQString() ); - advH_protected.tqreplace( e, TQString() ); - advH_protected_slots.tqreplace( e, TQString() ); - advH_private.tqreplace( e, TQString() ); - advH_private_slots.tqreplace( e, TQString() ); - advCpp.tqreplace( e, TQString() ); + advH_public.replace( e, TQString() ); + advH_public_slots.replace( e, TQString() ); + advH_protected.replace( e, TQString() ); + advH_protected_slots.replace( e, TQString() ); + advH_private.replace( e, TQString() ); + advH_private_slots.replace( e, TQString() ); + advCpp.replace( e, TQString() ); } void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method, @@ -1596,7 +1596,7 @@ void CppNewClassDialog::ClassGenerator::genMethodDeclaration( FunctionDom method /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ TQString methodName = method->name(); - if ( !methodName.tqcontains( TQRegExp( "^[a-zA-z_]" ) ) ) + if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; *adv_h += " " + ( method->isVirtual() ? TQString( "virtual " ) : TQString( "" ) ) + ( method->isStatic() ? TQString( "static " ) : TQString( "" ) ) @@ -1657,8 +1657,8 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() classImpl = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classImpl.tqreplace( TQRegExp( "\\$MODULE\\$" ), module ); - classImpl.tqreplace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); + classImpl.replace( TQRegExp( "\\$MODULE\\$" ), module ); + classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1689,7 +1689,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() } TQString relPath; - for ( int i = implementation.tqfindRev( '/' ); i != -1; i = implementation.tqfindRev( '/', --i ) ) + for ( int i = implementation.findRev( '/' ); i != -1; i = implementation.findRev( '/', --i ) ) relPath += "../"; TQString constructors = ( advConstructorsSource.isEmpty() ? TQString( "$TEMPLATESTR$\n$CLASSNAME$$TEMPLATEPARAMS$::$CLASSNAME$($ARGS$)\n" @@ -1787,22 +1787,22 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() baseInitializer += "\n"; } - constructors.tqreplace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); - constructors.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.replace( TQRegExp( "\\$BASEINITIALIZER\\$" ), baseInitializer ); + constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); if ( templateStr.isEmpty() ) { - constructors.tqreplace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); - constructors.tqreplace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$\\n" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), "" ); } else { - constructors.tqreplace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); - constructors.tqreplace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); - classImpl.tqreplace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); + constructors.replace( TQRegExp( "\\$TEMPLATESTR\\$" ), templateStr ); + constructors.replace( TQRegExp( "\\$TEMPLATEPARAMS\\$" ), templateParams ); + classImpl.replace( TQRegExp( "#include \"\\$HEADER\\$\"\\n" ), "" ); } // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); - constructors.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsCpp ); + constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsCpp ); // qWarning("NEW CLASS: constructors = %s", constructors.latin1()); @@ -1810,18 +1810,18 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() TQString hp = relPath + header; beautifySource( classImpl, hp, className, namespaceBeg, constructors, advCpp, namespaceEnd, implementation ); - classImpl.tqreplace( TQRegExp( "\\$HEADER\\$" ), relPath + header ); - classImpl.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); - classImpl.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); - classImpl.tqreplace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); - classImpl.tqreplace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp ); - classImpl.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); - classImpl.tqreplace( TQRegExp( "\\$FILENAME\\$" ), implementation ); + classImpl.replace( TQRegExp( "\\$HEADER\\$" ), relPath + header ); + classImpl.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + classImpl.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classImpl.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$" ), constructors ); + classImpl.replace( TQRegExp( "\\$DEFINITIONS\\$" ), advCpp ); + classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation ); if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { TQString tqmoc = header; - tqmoc.tqreplace( TQRegExp( "\\..*" ), ".tqmoc" ); + tqmoc.replace( TQRegExp( "\\..*" ), ".tqmoc" ); classImpl += "#include \"" + tqmoc + "\"\n"; } @@ -1868,8 +1868,8 @@ void CppNewClassDialog::ClassGenerator::gen_interface() classIntf = FileTemplate::read( dlg.m_part, fi.extension( true ) ); } - classIntf.tqreplace( TQRegExp( "\\$MODULE\\$" ), module ); - classIntf.tqreplace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); + classIntf.replace( TQRegExp( "\\$MODULE\\$" ), module ); + classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), basefilename ); if ( objc ) { @@ -1911,21 +1911,21 @@ void CppNewClassDialog::ClassGenerator::gen_interface() switch ( dlg.gen_config->defCase() ) { case ClassGeneratorConfig::UpperCase: - headerGuard = namespaceStr.upper() + header.mid( header.tqfindRev( "/" )+1 ).upper(); + headerGuard = namespaceStr.upper() + header.mid( header.findRev( "/" )+1 ).upper(); break; case ClassGeneratorConfig::LowerCase: - headerGuard = namespaceStr.lower() + header.mid( header.tqfindRev( "/" )+1 ).lower(); + headerGuard = namespaceStr.lower() + header.mid( header.findRev( "/" )+1 ).lower(); break; case ClassGeneratorConfig::SameAsFileCase: - headerGuard = dlg.header_edit->text().mid( dlg.header_edit->text().tqfindRev( "/" )+1 ); + headerGuard = dlg.header_edit->text().mid( dlg.header_edit->text().findRev( "/" )+1 ); break; case ClassGeneratorConfig::SameAsClassCase: - headerGuard = namespaceStr + header.mid( header.tqfindRev( "/" )+1 ); + headerGuard = namespaceStr + header.mid( header.findRev( "/" )+1 ); break; } - headerGuard.tqreplace( TQRegExp( "\\." ), "_" ); - headerGuard.tqreplace( TQRegExp( "::" ), "_" ); + headerGuard.replace( TQRegExp( "\\." ), "_" ); + headerGuard.replace( TQRegExp( "::" ), "_" ); TQString includeBaseHeader; if( dlg.m_part->qtBuildConfig()->isUsed() ) { @@ -1988,13 +1988,13 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { if ( inheritance != " : " ) inheritance += ", "; - if ( it.current() ->text( 1 ).tqcontains( "virtual" ) ) + if ( it.current() ->text( 1 ).contains( "virtual" ) ) inheritance += "virtual "; - if ( it.current() ->text( 1 ).tqcontains( "public" ) ) + if ( it.current() ->text( 1 ).contains( "public" ) ) inheritance += "public "; - if ( it.current() ->text( 1 ).tqcontains( "protected" ) ) + if ( it.current() ->text( 1 ).contains( "protected" ) ) inheritance += "protected "; - if ( it.current() ->text( 1 ).tqcontains( "private" ) ) + if ( it.current() ->text( 1 ).contains( "private" ) ) inheritance += "private "; inheritance += it.current() ->text( 0 ); } @@ -2008,8 +2008,8 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString( " $CLASSNAME$($ARGS$);" ) : advConstructorsHeader ) + TQString( "\n\n ~$CLASSNAME$();" ); - constructors.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); - constructors.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsH ); + constructors.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + constructors.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); TQString qobjectStr; if ( childClass || qobject ) @@ -2026,30 +2026,30 @@ void CppNewClassDialog::ClassGenerator::gen_interface() advH_protected, advH_protected_slots, advH_private, advH_private_slots, namespaceEnd ); - classIntf.tqreplace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); - classIntf.tqreplace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); - classIntf.tqreplace( TQRegExp( "\\$AUTHOR\\$" ), author ); - classIntf.tqreplace( TQRegExp( "\\$DOC\\$" ), doc ); - classIntf.tqreplace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr ); - classIntf.tqreplace( TQRegExp( "\\$CLASSNAME\\$" ), className ); + classIntf.replace( TQRegExp( "\\$HEADERGUARD\\$" ), headerGuard ); + classIntf.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$" ), includeBaseHeader ); + classIntf.replace( TQRegExp( "\\$AUTHOR\\$" ), author ); + classIntf.replace( TQRegExp( "\\$DOC\\$" ), doc ); + classIntf.replace( TQRegExp( "\\$TEMPLATE\\$" ), templateStr ); + classIntf.replace( TQRegExp( "\\$CLASSNAME\\$" ), className ); if ( dlg.baseclasses_view->childCount() > 0 ) - classIntf.tqreplace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); - classIntf.tqreplace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance ); - classIntf.tqreplace( TQRegExp( "\\$TQOBJECT\\$" ), qobjectStr ); - classIntf.tqreplace( TQRegExp( "\\$ARGS\\$" ), argsH ); - classIntf.tqreplace( TQRegExp( "\\$FILENAME\\$" ), header ); - classIntf.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); - classIntf.tqreplace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); - classIntf.tqreplace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); - classIntf.tqreplace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); - classIntf.tqreplace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected ); - classIntf.tqreplace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots ); - classIntf.tqreplace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private ); - classIntf.tqreplace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots ); - classIntf.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); + classIntf.replace( TQRegExp( "\\$BASECLASS\\$" ), dlg.baseclasses_view->firstChild() ->text( 0 ) ); + classIntf.replace( TQRegExp( "\\$INHERITANCE\\$" ), inheritance ); + classIntf.replace( TQRegExp( "\\$TQOBJECT\\$" ), qobjectStr ); + classIntf.replace( TQRegExp( "\\$ARGS\\$" ), argsH ); + classIntf.replace( TQRegExp( "\\$FILENAME\\$" ), header ); + classIntf.replace( TQRegExp( "\\$NAMESPACEBEG\\$" ), namespaceBeg ); + classIntf.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$" ), constructors ); + classIntf.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$" ), advH_public ); + classIntf.replace( TQRegExp( "\\$PUBLICSLOTS\\$" ), advH_public_slots ); + classIntf.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$" ), TQString( "protected:\n" ) + advH_protected ); + classIntf.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$" ), TQString( "protected slots:\n" ) + advH_protected_slots ); + classIntf.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$" ), TQString( "private:\n" ) + advH_private ); + classIntf.replace( TQRegExp( "\\$PRIVATESLOTS\\$" ), TQString( "private slots:\n" ) + advH_private_slots ); + classIntf.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); if ( !templateStr.isEmpty() && (!headeronly) ) - classIntf.tqreplace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); + classIntf.replace( TQRegExp( "#endif" ), "#include \"" + dlg.implementation_edit->text() + "\"\n\n#endif" ); if ( dlg.gen_config->reformat_box->isChecked() ) { @@ -2081,45 +2081,45 @@ void CppNewClassDialog::ClassGenerator::beautifyHeader( TQString &templ, TQStrin TQString &namespaceEnd ) { if ( headerGuard.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$HEADERGUARD\\$[\\n ]*" ), TQString() ); if ( includeBaseHeader.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$INCLUDEBASEHEADER\\$[\\n ]*" ), TQString() ); if ( author.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$AUTHOR\\$[\\n ]*" ), TQString() ); if ( doc.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$DOC\\$[\\n ]*" ), TQString() ); if ( className.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() ); if ( templateStr.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$TEMPLATE\\$[\\n ]*" ), TQString() ); if ( baseclass.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$BASECLASS\\$[\\n ]*" ), TQString() ); if ( inheritance.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$INHERITANCE\\$[\\n ]*" ), TQString() ); if ( qobjectStr.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$TQOBJECT\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$TQOBJECT\\$[\\n ]*" ), TQString() ); if ( args.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$ARGS\\$[\\n ]*" ), TQString() ); if ( header.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() ); if ( namespaceBeg.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() ); if ( constructors.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$CONSTRUCTORDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_public.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$PUBLICDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_public_slots.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$PUBLICSLOTS\\$[\\n ]*" ), TQString() ); if ( advH_protected.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$PROTECTEDDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_protected_slots.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$PROTECTEDSLOTS\\$[\\n ]*" ), TQString() ); if ( advH_private.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$PRIVATEDECLARATIONS\\$[\\n ]*" ), TQString() ); if ( advH_private_slots.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$PRIVATESLOTS\\$[\\n ]*" ), TQString() ); if ( namespaceEnd.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() ); } @@ -2127,19 +2127,19 @@ void CppNewClassDialog::ClassGenerator::beautifySource( TQString &templ, TQStrin TQString &constructors, TQString &advCpp, TQString &namespaceEnd, TQString &implementation ) { if ( header.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$HEADER\\$[\\n ]*" ), TQString() ); if ( className.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$CLASSNAME\\$[\\n ]*" ), TQString() ); if ( namespaceBeg.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$NAMESPACEBEG\\$[\\n ]*" ), TQString() ); if ( constructors.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$CONSTRUCTORDEFINITIONS\\$[\\n ]*" ), TQString() ); if ( advCpp.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$DEFINITIONS\\$[\\n ]*" ), TQString() ); if ( namespaceEnd.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$NAMESPACEEND\\$[\\n ]*" ), TQString() ); if ( implementation.isEmpty() ) - templ.tqreplace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() ); + templ.replace( TQRegExp( "\\$FILENAME\\$[\\n ]*" ), TQString() ); } TQString CppNewClassDialog::classNameFormatted( ) @@ -2150,7 +2150,7 @@ TQString CppNewClassDialog::classNameFormatted( ) TQString CppNewClassDialog::classNameFormatted( const TQString &name ) { TQString temp = name.simplifyWhiteSpace(); - return temp.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + return temp.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); } @@ -2163,9 +2163,9 @@ TQString CppNewClassDialog::templateStrFormatted( const TQString &name ) { TQString className = name.simplifyWhiteSpace(); TQString temp = className; - className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); - TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); - templateStr.tqreplace( TQRegExp( " *class *$" ), "" ); + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.replace( TQRegExp( TQRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); return templateStr; } @@ -2178,13 +2178,13 @@ TQString CppNewClassDialog::templateParamsFormatted( const TQString &name ) { TQString className = name.simplifyWhiteSpace(); TQString temp = className; - className.tqreplace( TQRegExp( "template *<.*> *(class *)?" ), "" ); - TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); - templateStr.tqreplace( TQRegExp( " *class *$" ), "" ); + className.replace( TQRegExp( "template *<.*> *(class *)?" ), "" ); + TQString templateStr = temp.replace( TQRegExp( TQRegExp_escape( className ) ), "" ); + templateStr.replace( TQRegExp( " *class *$" ), "" ); TQString templateParams = templateStr; - templateParams.tqreplace( TQRegExp( "^ *template *" ), "" ); - templateParams.tqreplace( TQRegExp( " *class *" ), "" ); + templateParams.replace( TQRegExp( "^ *template *" ), "" ); + templateParams.replace( TQRegExp( " *class *" ), "" ); templateParams.simplifyWhiteSpace(); return templateParams; @@ -2194,19 +2194,19 @@ TQString CppNewClassDialog::templateActualParamsFormatted( const TQString & name { TQString className = name.simplifyWhiteSpace(); TQString temp = className; - className.tqreplace( TQRegExp( "<.*> *" ), "" ); - TQString templateStr = temp.tqreplace( TQRegExp( TQRegExp_escape( className ) ), "" ); + className.replace( TQRegExp( "<.*> *" ), "" ); + TQString templateStr = temp.replace( TQRegExp( TQRegExp_escape( className ) ), "" ); return templateStr; } void CppNewClassDialog::removeTemplateParams( TQString & name ) { - name.tqreplace( TQRegExp( "<.*> *" ), "" ); + name.replace( TQRegExp( "<.*> *" ), "" ); } bool CppNewClassDialog::isDestructor( TQString className, const FunctionDom &method ) { - if ( m_part->formatModelItem( method.data() ).tqcontains( TQRegExp( " *~ *" + className ) ) ) + if ( m_part->formatModelItem( method.data() ).contains( TQRegExp( " *~ *" + className ) ) ) return true; return false; } @@ -2218,4 +2218,4 @@ void CppNewClassDialog::headeronly_box_stateChanged(int val) #include "cppnewclassdlg.moc" -//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index b4be045d..338fa724 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -75,7 +75,7 @@ TQMap<TQString, TQString> typedefMap( const CodeModel* model ) TQMap<TQString, TQString>::iterator it = map.begin(); for ( ; it != map.end(); ++it ) { - while ( map.tqcontains( map[ it.key() ] ) && + while ( map.contains( map[ it.key() ] ) && it.key() != map[ it.key() ] ) { map[ it.key() ] = map[ map[ it.key() ] ]; diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 384ba03e..204195aa 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) text += "::"; } text += formatModelItem( *it, true ); - text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); + text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); @@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) text += "::"; } text += formatModelItem( *it, true ); - text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); + text = text.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) ); int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) ); int line, column; ( *it ) ->getStartPosition( &line, &column ); @@ -850,7 +850,7 @@ TQStringList makeListUnique( const TQStringList& rhs ) { TQMap<TQString, bool> map; TQStringList ret; for( TQStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) { - if( map.tqfind( *it ) == map.end() ) { + if( map.find( *it ) == map.end() ) { ret << *it; map.insert( *it, true ); } @@ -878,7 +878,7 @@ TQStringList CppSupportPart::reorder( const TQStringList &list ) filePath = projectPath + "/" + filePath; } if( !isValidSource( filePath ) ) continue; - if ( headerExtensions.tqcontains( TQFileInfo( filePath ).extension() ) ) + if ( headerExtensions.contains( TQFileInfo( filePath ).extension() ) ) headers << ( filePath ); else others << ( filePath ); @@ -945,7 +945,7 @@ void CppSupportPart::savedFile( const KURL &file ) kdDebug( 9007 ) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl; - if ( m_projectFileList.tqcontains( fileName.mid ( m_projectDirectory.length() + 1 ) ) ) + if ( m_projectFileList.contains( fileName.mid ( m_projectDirectory.length() + 1 ) ) ) { maybeParse( fileName ); emit addedSourceInfo( fileName ); @@ -962,7 +962,7 @@ TQString CppSupportPart::findSourceFile() // extract the base path (full path without '.' and extension) TQString base = path.left( path.length() - ext.length() - 1 ); TQStringList candidates; - if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) ) + if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -1017,7 +1017,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) // just the filename without the extension TQString fileNameWoExt = fi.fileName(); if ( !ext.isEmpty() ) - fileNameWoExt.tqreplace( "." + ext, "" ); + fileNameWoExt.replace( "." + ext, "" ); TQString possibleExts; // depending on the current extension assemble a list of // candidate files to look for @@ -1026,13 +1026,13 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) if ( path.endsWith( "_impl.h" ) ) { TQString headerpath = path; - headerpath.tqreplace( "_impl.h", ".h" ); + headerpath.replace( "_impl.h", ".h" ); candidates << headerpath; - fileNameWoExt.tqreplace( "_impl", "" ); + fileNameWoExt.replace( "_impl", "" ); possibleExts = "h"; } // if file is a header file search for implementation file - else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) ) + else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) ) { candidates << ( base + ".c" ); candidates << ( base + ".cc" ); @@ -1048,7 +1048,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) possibleExts = "c,cc,cpp,c++,cxx,C,m,mm,M,inl,_impl.h"; } // if file is an implementation file, search for header file - else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).tqcontains( ext ) ) + else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) ) { candidates << ( base + ".h" ); candidates << ( base + ".H" ); @@ -1081,10 +1081,10 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url ) candidateFileWoExt.setFile(*fileIt); //kdDebug( 9007 ) << "candidate file: " << *fileIt << endl; if( !candidateFileWoExt.extension().isEmpty() ) - candidateFileWoExtString = candidateFileWoExt.fileName().tqreplace( "." + candidateFileWoExt.extension(), "" ); + candidateFileWoExtString = candidateFileWoExt.fileName().replace( "." + candidateFileWoExt.extension(), "" ); if ( candidateFileWoExtString == fileNameWoExt ) { - if ( possibleExtsList.tqcontains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() ) + if ( possibleExtsList.contains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() ) { //kdDebug( 9007 ) << "checking if " << *fileIt << " exists" << endl; if ( TQFileInfo( *fileIt ).exists() ) @@ -1354,13 +1354,13 @@ KDevLanguageSupport::Features CppSupportPart::features() TQString CppSupportPart::formatClassName( const TQString &name ) { TQString n = name; - return n.tqreplace( ".", "::" ); + return n.replace( ".", "::" ); } TQString CppSupportPart::unformatClassName( const TQString &name ) { TQString n = name; - return n.tqreplace( "::", "." ); + return n.replace( "::", "." ); } bool CppSupportPart::shouldSplitDocument(const KURL &url) @@ -1554,9 +1554,9 @@ void CppSupportPart::slotParseFiles() { TQDateTime t = fileInfo.lastModified(); - if ( ! ( m_timestamp.tqcontains( absFilePath ) && m_timestamp[ absFilePath ] == t ) ) + if ( ! ( m_timestamp.contains( absFilePath ) && m_timestamp[ absFilePath ] == t ) ) { - if ( _jd->pcs.tqcontains( absFilePath ) ) + if ( _jd->pcs.contains( absFilePath ) ) { _jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second ); FileDom file = codeModel() ->create<FileModel>(); @@ -1678,7 +1678,7 @@ void CppSupportPart::maybeParse( const TQString& fn, bool background ) if ( !fileInfo.exists() ) return; - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path ); if ( codeModel()->hasFile( fn ) && it != m_timestamp.end() && *it == t ) return; @@ -1751,7 +1751,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum } SimpleDeclarationAST* decl = currentNode ? ( SimpleDeclarationAST* ) currentNode : 0; - if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().tqcontains("friend") ) + if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().contains("friend") ) { kdDebug(9007) << "this is a friend declaration, don't create any definition" << endl; fail = true; @@ -1903,7 +1903,7 @@ TQStringList CppSupportPart::modifiedFileList() TQDateTime t = fileInfo.lastModified(); - TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path ); + TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path ); if ( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -1983,7 +1983,7 @@ void CppSupportPart::setupCatalog( ) kdDebug( 9007 ) << "CppSupportPart::setupCatalog()2 " << *it << endl; Catalog * catalog = new Catalog(); catalog->open( *it ); - catalog->setEnabled( enabledPCSs.tqcontains( TQFileInfo( *it ).baseName(true) ) ); + catalog->setEnabled( enabledPCSs.contains( TQFileInfo( *it ).baseName(true) ) ); ++it; for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt ) @@ -2179,7 +2179,7 @@ void CppSupportPart::saveProjectSourceInfo() { const FileDom dom = ( *it ); stream << dom->name() << m_timestamp[ dom->name() ].toTime_t(); - if( m_timestamp.tqfind( dom->name() ) == m_timestamp.end() ) { + if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) { kdDebug( 9007 ) << dom->name() << ": timestamp is missing " << endl; } offsets.insert( dom->name(), stream.tqdevice() ->at() ); @@ -2323,7 +2323,7 @@ int CppSupportPart::parseFilesAndDependencies( TQStringList files, bool backgrou int cgroup = nextGroup; nextGroup++; - if( fileGroups.tqfind( *it ) != fileGroups.end() ) + if( fileGroups.find( *it ) != fileGroups.end() ) cgroup = fileGroups[*it]; for( TQStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit ) @@ -2575,19 +2575,19 @@ void CppSupportPart::emitFileParsed( TQStringList l ) bool CppSupportPart::isHeader( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); - if ( ptr && m_headerMimeTypes.tqcontains( ptr->name() ) ) + if ( ptr && m_headerMimeTypes.contains( ptr->name() ) ) return true;*/ - return ( m_headerExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 ); + return ( m_headerExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); } bool CppSupportPart::isSource( const TQString& fileName ) const { /*KMimeType::Ptr ptr = KMimeType::findByPath( fileName ); - if ( ptr && m_sourceMimeTypes.tqcontains( ptr->name() ) ) + if ( ptr && m_sourceMimeTypes.contains( ptr->name() ) ) return true;*/ - return ( m_sourceExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 ); + return ( m_sourceExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 ); } void CppSupportPart::gotoDeclarationLine( int line ) @@ -2825,7 +2825,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS indentString = sourceFormatter->indentString(); editIface->insertText( findInsertionLineMethod( aClass, accessType ), 0, - finalDeclaration.tqreplace( "\n", "\n\t" ) + "\n" ); + finalDeclaration.replace( "\n", "\n\t" ) + "\n" ); backgroundParser() ->addFile( aClass->fileName() ); if ( isInline || isPureVirtual ) diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 6e2ee964..650831e8 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -143,7 +143,7 @@ public: m_fileSet.insert( s ); } - bool tqcontains( const HashedString& str ) const { + bool contains( const HashedString& str ) const { TQMutexLocker locker( &m_mutex ); return m_fileSet.find( str ) != m_fileSet.end(); } @@ -512,7 +512,7 @@ private: ///files that were not requested must not be processed, since they maybe do not respect the group-relationships. bool reject( TQString file ) { for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { - if( (*it).first.tqfind( file ) != (*it).first.end() ) { + if( (*it).first.find( file ) != (*it).first.end() ) { return false; } } @@ -522,7 +522,7 @@ private: bool waiting( TQString file, Flags forbidFlags = None, int count = 1 ) const { int hits = 0; for( List::const_iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { - if( (*it).first.tqfind( file ) != (*it).first.end() ) { + if( (*it).first.find( file ) != (*it).first.end() ) { if( ((Flags)((*it).flags & forbidFlags )) == None ) { hits++; if( hits >= count ) return true; @@ -577,8 +577,8 @@ private: Processed processFile( TQString file, Flags flag = None ) { TQStringList ret; for( List::iterator it = m_waiting.begin(); it != m_waiting.end(); ++it) { - if( (*it).first.tqfind( file ) != (*it).first.end() ) { - if( (*it).second.tqfind( file ) == (*it).second.end() ) { + if( (*it).first.find( file ) != (*it).first.end() ) { + if( (*it).second.find( file ) == (*it).second.end() ) { (*it).flags = (Flags) ((*it).flags | flag); (*it).second << file; if( (*it).second.count() == (*it).first.count() ) { diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index cb5b25c1..a5b328c4 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -102,7 +102,7 @@ public: TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); //addIncludePath( "/usr/include/g++-3" ); //addIncludePath( "/usr/include/g++" ); diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index e08a1cec..fe04ffd4 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -155,14 +155,14 @@ void Dbg_PS_Dialog::slotProcessExited() pidLines_ += '\n'; - int start = pidLines_.tqfind('\n', 0); // Skip the first line (header line) + int start = pidLines_.find('\n', 0); // Skip the first line (header line) int pos; static TQRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); - while ( (pos = pidLines_.tqfind('\n', start)) != -1) { + while ( (pos = pidLines_.find('\n', start)) != -1) { TQString item = pidLines_.mid(start, pos-start); - if (!item.isEmpty() && item.tqfind(pidCmd_) == -1) + if (!item.isEmpty() && item.find(pidCmd_) == -1) { if(ps_output_line.search(item) == -1) { diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 088aff77..58cea851 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -229,7 +229,7 @@ DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pi void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) return; switch (e->button()) { diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 22621630..43d6990e 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -376,7 +376,7 @@ void DebuggerPart::setupDcop() { QCStringList objects = kapp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it) - if ((*it).tqfind("drkonqi-") == 0) + if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); @@ -385,7 +385,7 @@ void DebuggerPart::setupDcop() void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) { - if (appId.tqfind("drkonqi-") == 0) { + if (appId.find("drkonqi-") == 0) { TQByteArray answer; TQCString replyType; diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index 38d9e7e8..dffdf5d4 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -385,7 +385,7 @@ void GDBBreakpointWidget::slotWatchpointHit(int id, /***************************************************************************/ -BreakpointTableRow* GDBBreakpointWidget::tqfind(Breakpoint *breakpoint) +BreakpointTableRow* GDBBreakpointWidget::find(Breakpoint *breakpoint) { // NOTE:- The match doesn't have to be equal. Each type of bp // must decide on the match criteria. @@ -493,7 +493,7 @@ void GDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); if (btr) { removeBreakpoint(btr); @@ -508,7 +508,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) { @@ -523,7 +523,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, void GDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); - BreakpointTableRow* btr = tqfind(watchpoint); + BreakpointTableRow* btr = find(watchpoint); if (btr) { removeBreakpoint(btr); @@ -917,7 +917,7 @@ void GDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineN { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) @@ -946,7 +946,7 @@ void GDBBreakpointWidget::slotBreakpointModified(Breakpoint* b) { emit publishBPState(*b); - if (BreakpointTableRow* btr = tqfind(b)) + if (BreakpointTableRow* btr = find(b)) { if (b->isActionDie()) { diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index f67bb03e..2379a318 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -106,7 +106,7 @@ signals: void tracingOutput(const char*); private: - BreakpointTableRow* tqfind(Breakpoint *bp); + BreakpointTableRow* find(Breakpoint *bp); BreakpointTableRow* findId(int id); BreakpointTableRow* findKey(int BPKey); diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 93424396..ffa86b2b 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -401,7 +401,7 @@ void GDBController::executeCmd() setStateOn(s_waitForWrite); TQString prettyCmd = currentCmd_->cmdToSend(); - prettyCmd.tqreplace( TQRegExp("set prompt \032.\n"), "" ); + prettyCmd.replace( TQRegExp("set prompt \032.\n"), "" ); prettyCmd = "(gdb) " + prettyCmd; if (currentCmd_->isUserCommand()) @@ -1349,7 +1349,7 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result) { TQString msg = result["msg"].literal(); - if (msg.tqcontains("No such process")) + if (msg.contains("No such process")) { setState(s_appNotStarted|s_programExited); emit dbgtqStatus (i18n("Process exited"), state_); @@ -1447,7 +1447,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) int i; bool got_any_command = false; // For each gdb reply. In MI mode, each reply is one string. - while((i = holdingZone_.tqfind('\n')) != -1) + while((i = holdingZone_.find('\n')) != -1) { got_any_command = true; diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index ba51e871..fe5059cb 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -291,8 +291,8 @@ void GDBOutputWidget::focusInEvent(TQFocusEvent */*e*/) TQString GDBOutputWidget::html_escape(const TQString& s) { TQString r(s); - r.tqreplace("<", "<"); - r.tqreplace(">", ">"); + r.replace("<", "<"); + r.replace(">", ">"); return r; } diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp index 46f5251b..5a8588b1 100644 --- a/languages/cpp/debugger/gdbparser.cpp +++ b/languages/cpp/debugger/gdbparser.cpp @@ -138,7 +138,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) if (value[0] == '@') { // It's a reference, we need to show just the value. - if (int i = value.tqfind(":")) + if (int i = value.find(":")) { value = value.mid(i+2); } @@ -149,7 +149,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) } } - if (value.tqfind("Cannot access memory") == 0) + if (value.find("Cannot access memory") == 0) value = "(inaccessible)"; return value.stripWhiteSpace(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 44a95b1a..c594d134 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -457,7 +457,7 @@ namespace GDBDebugger TQWidget* ncs = const_cast<TQWidget*>(s); TQString cap = caption; // Prevent intepreting '&' as accelerator specifier. - cap.tqreplace("&", "&&"); + cap.replace("&", "&&"); toolBox_->setItemLabel(toolBox_->indexOf(ncs), cap); } diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 27bde0aa..07b848d9 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -105,7 +105,7 @@ static int chownpty(int fd, int grant) // { // signal from other child, behave like catchChild. // // guess this gives quite some control chaos... - // Shell* sh = shells.tqfind(rc); + // Shell* sh = shells.find(rc); // if (sh) { shells.remove(rc); sh->doneShell(w); } // goto retry; // } diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop index af025ba1..03faba9a 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop @@ -9,7 +9,7 @@ <ignoreparts> <part>kdevsecurity</part> <part>kdevkonsoleview</part> - <part>kdevtqreplace</part> + <part>kdevreplace</part> <part>kdevctags2</part> <part>kdevvalgrind</part> </ignoreparts> diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index c5293c8c..2b9e4de3 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -711,7 +711,7 @@ void VariableTree::frameIdReady(const TQValueVector<TQString>& lines) frame_info += lines[i]; kdDebug(9012) << "frame info: " << frame_info << "\n"; - frame_info.tqreplace('\n', ""); + frame_info.replace('\n', ""); static TQRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)"); static TQRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)"); @@ -1619,7 +1619,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) TQString s(xs); if (s[0] == '$') { - int i = s.tqfind('='); + int i = s.find('='); if (i != -1) s = s.mid(i+2); } @@ -1638,7 +1638,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) // one TQChar from two characters from gdb. But to do that, we *should* // now if the data if generic gdb value, and result of request for string // data. Fixing is is for later. - s.tqreplace( TQRegExp("\\\\000|\\\\0"), "" ); + s.replace( TQRegExp("\\\\000|\\\\0"), "" ); // FIXME: for now, assume that all special representations are // just strings. diff --git a/languages/cpp/doc/cppannotations.toc b/languages/cpp/doc/cppannotations.toc index 7acb23a3..ad63b241 100644 --- a/languages/cpp/doc/cppannotations.toc +++ b/languages/cpp/doc/cppannotations.toc @@ -290,7 +290,7 @@ <tocsect2 name="17.4: The Generic Algorithms" url="cplusplus17.html#l227"> <tocsect3 name="17.4.1: accumulate()" url="cplusplus17.html#l228"/> <tocsect3 name="17.4.2: adjacent_difference()" url="cplusplus17.html#l229"/> - <tocsect3 name="17.4.3: adjacent_tqfind()" url="cplusplus17.html#l230"/> + <tocsect3 name="17.4.3: adjacent_find()" url="cplusplus17.html#l230"/> <tocsect3 name="17.4.4: binary_search()" url="cplusplus17.html#l231"/> <tocsect3 name="17.4.5: copy()" url="cplusplus17.html#l232"/> <tocsect3 name="17.4.6: copy_backward()" url="cplusplus17.html#l233"/> @@ -300,7 +300,7 @@ <tocsect3 name="17.4.10: equal_range()" url="cplusplus17.html#l237"/> <tocsect3 name="17.4.11: fill()" url="cplusplus17.html#l238"/> <tocsect3 name="17.4.12: fill_n()" url="cplusplus17.html#l239"/> - <tocsect3 name="17.4.13: tqfind()" url="cplusplus17.html#l240"/> + <tocsect3 name="17.4.13: find()" url="cplusplus17.html#l240"/> <tocsect3 name="17.4.14: find_end()" url="cplusplus17.html#l241"/> <tocsect3 name="17.4.15: find_first_of()" url="cplusplus17.html#l242"/> <tocsect3 name="17.4.16: find_if()" url="cplusplus17.html#l243"/> @@ -331,7 +331,7 @@ <tocsect3 name="17.4.41: remove_copy()" url="cplusplus17.html#l268"/> <tocsect3 name="17.4.42: remove_if()" url="cplusplus17.html#l269"/> <tocsect3 name="17.4.43: remove_copy_if()" url="cplusplus17.html#l270"/> - <tocsect3 name="17.4.44: tqreplace()" url="cplusplus17.html#l271"/> + <tocsect3 name="17.4.44: replace()" url="cplusplus17.html#l271"/> <tocsect3 name="17.4.45: replace_copy()" url="cplusplus17.html#l272"/> <tocsect3 name="17.4.46: replace_if()" url="cplusplus17.html#l273"/> <tocsect3 name="17.4.47: replace_copy_if()" url="cplusplus17.html#l274"/> diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 00141e92..f779695e 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -238,7 +238,7 @@ <entry name="actions, editBookmarks" url="ch06.html"/> <entry name="actions, findNext" url="ch06.html"/> <entry name="actions, findPrev" url="ch06.html"/> -<entry name="actions, tqfind" url="ch06.html"/> +<entry name="actions, find" url="ch06.html"/> <entry name="actions, firstPage" url="ch06.html"/> <entry name="actions, fitToHeight" url="ch06.html"/> <entry name="actions, fitToPage" url="ch06.html"/> @@ -266,7 +266,7 @@ <entry name="actions, quit" url="ch06.html"/> <entry name="actions, redisplay" url="ch06.html"/> <entry name="actions, redo" url="ch06.html"/> -<entry name="actions, tqreplace" url="ch06.html"/> +<entry name="actions, replace" url="ch06.html"/> <entry name="actions, reportBug" url="ch06.html"/> <entry name="actions, revert" url="ch06.html"/> <entry name="actions, saveAs" url="ch06.html"/> diff --git a/languages/cpp/doc/stl.toc b/languages/cpp/doc/stl.toc index a3754311..d86b82b0 100644 --- a/languages/cpp/doc/stl.toc +++ b/languages/cpp/doc/stl.toc @@ -109,9 +109,9 @@ <tocsect1 name="Algorithms" url=""> <tocsect2 name="Non-mutating algorithms" url=""> <tocsect3 name="for_each" url="for_each.html"/> - <tocsect3 name="tqfind" url="find.html"/> + <tocsect3 name="find" url="find.html"/> <tocsect3 name="find_if" url="find_if.html"/> - <tocsect3 name="adjacent_tqfind" url="adjacent_find.html"/> + <tocsect3 name="adjacent_find" url="adjacent_find.html"/> <tocsect3 name="find_first_of" url="find_first_of.html"/> <tocsect3 name="count" url="count.html"/> <tocsect3 name="count_if" url="count_if.html"/> @@ -129,7 +129,7 @@ <tocsect3 name="iter_swap" url="iter_swap.html"/> <tocsect3 name="swap_ranges" url="swap_ranges.html"/> <tocsect3 name="transform" url="transform.html"/> - <tocsect3 name="tqreplace" url="tqreplace.html"/> + <tocsect3 name="replace" url="replace.html"/> <tocsect3 name="replace_if" url="replace_if.html"/> <tocsect3 name="replace_copy" url="replace_copy.html"/> <tocsect3 name="replace_copy_if" url="replace_copy_if.html"/> @@ -370,9 +370,9 @@ <entry name="distance, STL function" url="distance.html"/> <entry name="advance, STL function" url="advance.html"/> <entry name="for_each, STL algorithm" url="for_each.html"/> -<entry name="tqfind, STL algorithm" url="find.html"/> +<entry name="find, STL algorithm" url="find.html"/> <entry name="find_if, STL algorithm" url="find_if.html"/> -<entry name="adjacent_tqfind, STL algorithm" url="adjacent_find.html"/> +<entry name="adjacent_find, STL algorithm" url="adjacent_find.html"/> <entry name="find_first_of, STL algorithm" url="find_first_of.html"/> <entry name="count, STL algorithm" url="count.html"/> <entry name="count_if, STL algorithm" url="count_if.html"/> @@ -388,7 +388,7 @@ <entry name="iter_swap, STL algorithm" url="iter_swap.html"/> <entry name="swap_ranges, STL algorithm" url="swap_ranges.html"/> <entry name="transform, STL algorithm" url="transform.html"/> -<entry name="tqreplace, STL algorithm" url="tqreplace.html"/> +<entry name="replace, STL algorithm" url="replace.html"/> <entry name="replace_if, STL algorithm" url="replace_if.html"/> <entry name="replace_copy, STL algorithm" url="replace_copy.html"/> <entry name="fill, STL algorithm" url="fill.html"/> diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp index 1f35708c..9b637798 100644 --- a/languages/cpp/doxydoc.cpp +++ b/languages/cpp/doxydoc.cpp @@ -20,7 +20,7 @@ void DoxyDoc::formatType( TQString& str ) { - str.tqreplace( TQRegExp( " " ), "" ); + str.replace( TQRegExp( " " ), "" ); } DoxyDoc::DoxyDoc( const TQStringList& dir ) @@ -36,7 +36,7 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& TQString scope = tmpscope; bool foundfile = false; //produce doxygen conform filenames - TQString filename = "/class" + scope.tqreplace( TQRegExp( "_" ), "__" ).tqreplace( TQRegExp( "::" ), "_1_1" ) + ".xml"; + TQString filename = "/class" + scope.replace( TQRegExp( "_" ), "__" ).replace( TQRegExp( "::" ), "_1_1" ) + ".xml"; //search for file in all directories for ( std::list<TQDir>::const_iterator ci = m_dirs.begin(); !foundfile && ci != m_dirs.end(); ++ci ) diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index fee9832e..1da45d76 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -18,7 +18,7 @@ * * * unsermake: - * unsermake is detected by reading the first line of the makefile. If it tqcontains "generated by unsermake" the following things are respected: + * unsermake is detected by reading the first line of the makefile. If it contains "generated by unsermake" the following things are respected: * 1. Since unsermake does not have the -W command(which should tell it to recompile the given file no matter whether it has been changed or not), the file-modification-time of the file is changed temporarily and the --no-real-compare option is used to force recompilation. * 2. The targets seem to be called *.lo instead of *.o when using unsermake, so *.lo names are used. * example-(test)command: unsermake --no-real-compare -n myfile.lo @@ -181,7 +181,7 @@ namespace CppTools { if( f.open( IO_ReadOnly ) ) { TQString firstLine; f.readLine( firstLine, 1000 ); - if( firstLine.tqfind( "generated by unsermake" ) != -1 ) { + if( firstLine.find( "generated by unsermake" ) != -1 ) { ret = true; } f.close(); @@ -261,7 +261,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi TQStringList cachedPath; //If the call doesn't succeed, use the cached not up-to-date version TQDateTime makeFileModification = makeFile.lastModified(); - Cache::iterator it = m_cache.tqfind( dir.path() ); + Cache::iterator it = m_cache.find( dir.path() ); if( it != m_cache.end() ) { cachedPath = (*it).path; if( makeFileModification == (*it).modificationTime ) { @@ -272,7 +272,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi return ret; } else { //We have a cached failed result. We should use that for some time but then try again. Return the failed result if: ( there were too many tries within this folder OR this file was already tried ) AND The last tries have not expired yet - if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.tqfind( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { + if( /*((*it).failedFiles.size() > 3 || (*it).failedFiles.find( file ) != (*it).failedFiles.end()) &&*/ (*it).failTime.secsTo( TQDateTime::tqcurrentDateTime() ) < CACHE_FAIL_FOR_SECONDS ) { PathResolutionResult ret(false); //Fake that the result is ok ret.errorMessage = i18n("Cached: ") + (*it).errorMessage; ret.longErrorMessage = (*it).longErrorMessage; @@ -297,7 +297,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi absoluteFile = u.path(); int dot; - if( (dot = file.tqfindRev( '.' )) == -1 ) + if( (dot = file.findRev( '.' )) == -1 ) return PathResolutionResult( false, i18n( "Filename %1 seems to be malformed" ).tqarg(file) ); targetName = file.left( dot ); @@ -413,11 +413,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt return res; TQRegExp newLineRx("\\\\\\n"); - fullOutput.tqreplace( newLineRx, "" ); + fullOutput.replace( newLineRx, "" ); ///@todo collect multiple outputs at the same time for performance-reasons TQString firstLine = fullOutput; int lineEnd; - if( (lineEnd = fullOutput.tqfind('\n')) != -1 ) + if( (lineEnd = fullOutput.find('\n')) != -1 ) firstLine.truncate( lineEnd ); //Only look at the first line of output /** @@ -443,7 +443,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt else if( prefix.endsWith( ";" ) ) prefix.truncate( prefix.length() - 1 ); ///Now test if what we have as prefix is a simple "cd /foo/bar" call. - if( prefix.startsWith( "cd ") && !prefix.tqcontains( ";") && !prefix.tqcontains("&&") ) { + if( prefix.startsWith( "cd ") && !prefix.contains( ";") && !prefix.contains("&&") ) { newWorkingDirectory = prefix.right( prefix.length() - 3 ).stripWhiteSpace(); if( !newWorkingDirectory.startsWith("/") ) newWorkingDirectory = workingDirectory + "/" + newWorkingDirectory; @@ -456,7 +456,7 @@ PathResolutionResult IncludePathResolver::resolveIncludePathInternal( const TQSt if( d.exists() ) { ///The recursive working-directory exists. TQString makeParams = firstLine.mid( offset+5 ); - if( !makeParams.tqcontains( ";" ) && !makeParams.tqcontains( "&&" ) ) { + if( !makeParams.contains( ";" ) && !makeParams.contains( "&&" ) ) { ///Looks like valid parameters ///Make the file-name absolute, so it can be referenced from any directory TQString absoluteFile = file; diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index 9e0918b2..22aec56f 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -138,7 +138,7 @@ void KDevDriver::setup() TQString str = cfg->customIncludePaths(); int pos = 0; while( pos < str.length() ) { - int end = str.tqfind( ';', pos ); + int end = str.find( ';', pos ); if( end == -1 ) { end = str.length(); } @@ -188,11 +188,11 @@ bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { if( !m_shouldParseIncludedFiles ) return false; - m_cppSupport->safeFileSet().tqcontains( compoundString ); + m_cppSupport->safeFileSet().contains( compoundString ); - if( m_cppSupport->safeFileSet().tqcontains( file->fileName()) ){ + if( m_cppSupport->safeFileSet().contains( file->fileName()) ){ return false; - } else if( m_cppSupport->safeFileSet().tqcontains( compoundString ) ) { + } else if( m_cppSupport->safeFileSet().contains( compoundString ) ) { //kdDebug( 9007 ) << "ALREADY IN FILE-SET: " << compoundString << endl; return false; } else { diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index b29fe2d4..a1965f78 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -107,7 +107,7 @@ public: TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); addIncludePath( "/usr/include/g++-3" ); addIncludePath( "/usr/include/g++" ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index ebef44ed..5845ff83 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -88,7 +88,7 @@ void SettingsDialog::validateDirectory( const TQString & dir ) { elb->lineEdit() ->setText( dir ); - if ( TQListBoxItem * item = elb->listBox() ->tqfindItem( dir, TQt::ExactMatch ) ) + if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, TQt::ExactMatch ) ) { elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); } diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp index 612ff79a..a9a24c48 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp @@ -47,7 +47,7 @@ SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl { TQString kdedir = *it; if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) ) - if ( !kdeListBox->tqfindItem( kdedir, ExactMatch ) ) + if ( !kdeListBox->findItem( kdedir, ExactMatch ) ) kdeListBox->insertItem( kdedir ); } @@ -81,7 +81,7 @@ void SettingsDialog::addUrlButton_clicked() if ( isValidKDELibsDir( kdeUrl->url() ) ) { kdeListBox->insertItem( kdeUrl->url() ); - if ( TQListBoxItem * item = kdeListBox->tqfindItem( kdeUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) ) { kdeListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index 1b8e46f2..75fad7f3 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -49,7 +49,7 @@ SettingsDialog::SettingsDialog(TQWidget* tqparent, const char* name, WFlags fl) { TQString qtdir = *it; if( !qtdir.isEmpty() && isValidTQtDir(qtdir) ) - if (!qtListBox->tqfindItem(qtdir, ExactMatch)) + if (!qtListBox->findItem(qtdir, ExactMatch)) qtListBox->insertItem( qtdir ); } @@ -96,7 +96,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidTQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index a03ac0d4..0c25753c 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -50,7 +50,7 @@ SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl { TQString qtdir = *it; if ( !qtdir.isEmpty() && isValidTQtDir( qtdir ) ) - if ( !qtListBox->tqfindItem( qtdir, ExactMatch ) ) + if ( !qtListBox->findItem( qtdir, ExactMatch ) ) qtListBox->insertItem( qtdir ); } @@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidTQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 32c078e1..ea1c3dc6 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -198,7 +198,7 @@ void ProblemReporter::filterList(KListView* listview, const TQString& level) TQListViewItemIterator it( listview ); while ( it.current() ) { - if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false)) + if ( it.current()->text(3).contains(m_filterEdit->text(),false)) { new KListViewItem(m_filteredList,level, it.current()->text(0), it.current()->text(1), @@ -356,7 +356,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p m_markIface->addMark( p.line(), markType ); TQString msg = p.text(); - msg = msg.tqreplace( TQRegExp("\n"), "" ); + msg = msg.replace( TQRegExp("\n"), "" ); TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index 1d20a9f9..a1a06a96 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -102,14 +102,14 @@ void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; TQString binpath = TQDir::rootDirPath() + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; binpath = TQDir::rootDirPath() + "usr" + TQString( TQChar( TQDir::separator() ) ) + "local" + TQString( TQChar( TQDir::separator() ) ) + "bin"; - if( dirs.tqfindIndex( binpath ) != -1 ) + if( dirs.findIndex( binpath ) != -1 ) dirs << binpath; } @@ -213,4 +213,4 @@ void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration } #include "qtbuildconfig.moc" -//kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index b39d3ea1..943fda92 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -70,7 +70,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function TQString access = accessID( *it ); TQPair<int, int> funEndPoint = tqMakePair( funEndLine, funEndColumn ); - if ( !points.tqcontains( access ) || points[ access ] < funEndPoint ) + if ( !points.contains( access ) || points[ access ] < funEndPoint ) { points[ access ] = funEndPoint; } @@ -91,7 +91,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function str = " " + str; TQPair<int, int> pt; - if ( points.tqcontains( access ) ) + if ( points.contains( access ) ) { pt = points[ access ]; } @@ -103,7 +103,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } editIface->insertText( pt.first + insertedLine + 1, 0 /*pt.second*/, str ); - insertedLine += str.tqcontains( TQChar( '\n' ) ); + insertedLine += str.contains( TQChar( '\n' ) ); CppSupportPart *cppPart = dynamic_cast<CppSupportPart *>( m_part ); cppPart->backgroundParser() ->addFile( klass->fileName() ); @@ -121,7 +121,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function TQFileInfo fi( klass->fileName() ); TQString implementationFile = fi.absFilePath(); - implementationFile.tqreplace( ".h", ".cpp" ); + implementationFile.replace( ".h", ".cpp" ); TQFileInfo fileInfo( implementationFile ); if ( !TQFile::exists( fileInfo.absFilePath() ) ) @@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } else { - if ( editIface->textLine( line ).tqcontains( TQRegExp( ".*#include .*\\.tqmoc.*" ) ) ) + if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.tqmoc.*" ) ) ) atLine = line; break; } @@ -210,7 +210,7 @@ TQString QtDesignerCppIntegration::accessID( FunctionDom fun ) const void QtDesignerCppIntegration::processImplementationName( TQString &name ) { - name.tqreplace( ".h", ".cpp" ); + name.replace( ".h", ".cpp" ); } #include "qtdesignercppintegration.moc" diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index 9e9d6113..2a2b27de 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -39,11 +39,11 @@ BuiltinTypes::BuiltinTypes() { } bool BuiltinTypes::isBuiltin( const TypeDesc& desc ) { - return m_types.tqfind( desc.name() ) != m_types.end(); + return m_types.find( desc.name() ) != m_types.end(); } TQString BuiltinTypes::comment( const TypeDesc& desc ) { - TQMap<TQString, TQString>::iterator it = m_types.tqfind( desc.name() ); + TQMap<TQString, TQString>::iterator it = m_types.find( desc.name() ); if( it != m_types.end() ) { return *it; } else { @@ -428,7 +428,7 @@ class TemplateParamMatch { for( int a = 0; a < m_candidateParams.count(); a++ ) { SimpleTypeImpl::TemplateParamInfo::TemplateParam t; if( m_candidateParams.getParam( t, a ) ) { - if( !m_hadParameters.tqcontains( t.name ) ) { + if( !m_hadParameters.contains( t.name ) ) { m_matched = false; } } else { @@ -472,7 +472,7 @@ class TemplateParamMatch { t.value = val; - if( m_hadParameters.tqcontains( t.name ) && oldValue != t.value ) { + if( m_hadParameters.contains( t.name ) && oldValue != t.value ) { return false; ///We have a mismatch, two different values for the same template-parameter. } else { m_candidateParams.addParam( t ); @@ -998,7 +998,7 @@ void SimpleTypeImpl::takeTemplateParams( TypeDesc desc ) { //SimpleTypeImpl::TemplateParamInfo implementation bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQString name ) const { - TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.tqfind( name ); + TQMap<TQString, TemplateParam>::const_iterator it = m_paramsByName.find( name ); if ( it != m_paramsByName.end() ) { target = *it; return true; @@ -1007,7 +1007,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, TQStrin } bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int number ) const { - TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.tqfind( number ); + TQMap<int, TemplateParam>::const_iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { target = *it; return true; @@ -1016,7 +1016,7 @@ bool SimpleTypeImpl::TemplateParamInfo::getParam( TemplateParam& target, int num } void SimpleTypeImpl::TemplateParamInfo::removeParam( int number ) { - TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.tqfind( number ); + TQMap<int, TemplateParam>::iterator it = m_paramsByNumber.find( number ); if ( it != m_paramsByNumber.end() ) { m_paramsByName.remove( ( *it ).name ); m_paramsByNumber.remove( it ); diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index 9d6ed77a..3f950cbf 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -203,7 +203,7 @@ class SimpleTypeCacheBinder : public Base { } #ifdef TEST_REMAP - typename MemberMap::iterator it = m_memberCache.tqfind( key ); + typename MemberMap::iterator it = m_memberCache.find( key ); if ( it == m_memberCache.end() ) dbgMajor() << "\"" << Base::str() << "\"remap failed with \"" << name.fullNameChain() << "\"" << endl; #endif @@ -260,7 +260,7 @@ class SimpleTypeCacheBinder : public Base { (*r.first).second = t; #ifdef TEST_REMAP - typename LocateMap::iterator it = m_locateCache.tqfind( desc ); + typename LocateMap::iterator it = m_locateCache.find( desc ); if ( it == m_locateCache.end() ) dbgMajor() << "\"" << Base::str() << "\"remap failed with \"" << name.fullNameChain() << "\"" << endl; #endif return t; diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index 92563781..69a920c7 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -77,7 +77,7 @@ private: int pointerDepthFromString( const TQString& str ) { TQRegExp ptrRx( "(\\*|\\&)" ); - TQString ptr = str.mid( str.tqfind( ptrRx ) ); + TQString ptr = str.mid( str.find( ptrRx ) ); TQStringList ptrList = TQStringList::split( "", ptr ); return ptrList.size(); } diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index cbd128eb..10e9b83d 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -116,7 +116,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe ImportList m_aliasImports; - AliasMap::iterator itt = m_aliases.tqfind( name.name() ); + AliasMap::iterator itt = m_aliases.find( name.name() ); if ( itt != m_aliases.end() && !( *itt ).empty() ) { ifVerbose( dbg() << "\"" << str() << "\": namespace-sub-aliases \"" << name.name() << "\"" << "\" requested, locating targets" << endl ); @@ -227,7 +227,7 @@ void SimpleTypeNamespace::addAliasMap( const TypeDesc& name, const TypeDesc& ali invalidateSecondaryCache(); invalidatePrimaryCache( true ); //Only not-found items are cleared updated here for performance-reasons(found items will stay cached) - AliasMap::iterator it = m_aliases.tqfind( name.name() ); + AliasMap::iterator it = m_aliases.find( name.name() ); if ( it == m_aliases.end() ) it = m_aliases.insert( name.name(), ImportList() ); @@ -253,7 +253,7 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* if ( m_activeSlaves.empty() || !safetyCounter.ok() ) return possibleSlaves; // if( !isRecursion ) { // ///Test the cache -// SlavesCache::const_iterator it = m_slavesCache.tqfind( files ); +// SlavesCache::const_iterator it = m_slavesCache.find( files ); // if( it != m_slavesCache.end() && it->second.first == m_slavesCache.size() ) return; ///The cache already contains a valid entry, and the work is done // } @@ -320,8 +320,8 @@ std::set<size_t> SimpleTypeNamespace::updateAliases( const IncludeFiles& files/* void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) { while ( !map.isEmpty() ) { - int mid = map.tqfind( "=" ); - int mid2 = map.tqfind( "<<" ); + int mid = map.find( "=" ); + int mid2 = map.find( "<<" ); int found = mid; int len = 1; if ( mid2 != -1 && ( mid2 < found || found == -1 ) ) { @@ -331,7 +331,7 @@ void SimpleTypeNamespace::addAliases( TQString map, const IncludeFiles& files ) if ( found == -1 ) break; - int end = map.tqfind( ";", found + len ); + int end = map.find( ";", found + len ); if ( end == -1 ) { //break; end = map.length(); @@ -377,7 +377,7 @@ bool SimpleTypeNamespace::hasNode() const { SimpleTypeNamespace::SlaveList SimpleTypeNamespace::getSlaves( const IncludeFiles& files ) { /* ///Test the cache - SlavesCache::const_iterator it = m_slavesCache.tqfind( files ); + SlavesCache::const_iterator it = m_slavesCache.find( files ); if( it != m_slavesCache.end() && it->second.first == m_activeSlaves.size() ) return it->second.second; ///The cache already contains a valid entry, and the work is done*/ std::set<size_t> allSlaves = updateAliases( files ); diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp index e0c9bfd6..8b13b808 100644 --- a/languages/cpp/store_walker.cpp +++ b/languages/cpp/store_walker.cpp @@ -519,7 +519,7 @@ void StoreWalker::parseClassSpecifier( ClassSpecifierAST* ast ) klass->setEndPosition( endLine, endColumn ); klass->setFileName( m_fileName ); - int i = className.tqfind( '<' ); + int i = className.find( '<' ); if( i != -1 ) { klass->setSpecializationDeclaration( className.mid( i ) ); className = className.left( i ); @@ -982,7 +982,7 @@ ClassDom StoreWalker::findClassFromScope( const TQStringList& scope ) { TQString scopeText = scope.join("::"); if( !m_imports.isEmpty() ) { - TQMapIterator<TQString, ClassDom> it = m_imports.back().first.tqfind( scopeText ); + TQMapIterator<TQString, ClassDom> it = m_imports.back().first.find( scopeText ); if( it != m_imports.back().first.end() ) { return *it; } @@ -1052,7 +1052,7 @@ ClassDom StoreWalker::classFromScope(const TQStringList& scope) { if( c ) { ///Check the file that overrides the code-model file - it = m_overrides.tqfind( c->fileName() ); + it = m_overrides.find( c->fileName() ); //Find the class within the file that is overriding the one in code-model. if( it != m_overrides.end() ) { diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 4eae290a..6ad55925 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -140,7 +140,7 @@ void StoreConverter::parseArguments(FunctionDom function, CppFunction<Tag> &cppF { ArgumentDom arg = m_model->create<ArgumentModel>(); arg->setType(*it); - arg->setName(cppFun.argumentNames()[args.tqfindIndex(*it)]); + arg->setName(cppFun.argumentNames()[args.findIndex(*it)]); function->addArgument(arg); } diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp index bc1a8dc7..bc267c15 100644 --- a/languages/cpp/stringhelpers.cpp +++ b/languages/cpp/stringhelpers.cpp @@ -36,9 +36,9 @@ TQString clearComments( TQString str ) { int lastPos = 0; int pos; int len = str.length(); - while( (pos = str.tqfind( "/*", lastPos )) != -1 ) { + while( (pos = str.find( "/*", lastPos )) != -1 ) { if( !s ) return str; - int i = str.tqfind( "*/", pos ); + int i = str.find( "*/", pos ); if( i != -1 && i <= len - 2 ) { clearStr( str, pos, i+2 ); lastPos = i+2; @@ -49,9 +49,9 @@ TQString clearComments( TQString str ) { } lastPos = 0; - while( (pos = str.tqfind( "//", lastPos )) != -1 ) { + while( (pos = str.find( "//", lastPos )) != -1 ) { if( !s ) return str; - int i = str.tqfind( "\n", pos ); + int i = str.find( "\n", pos ); if( i != -1 && i <= len - 1 ) { clearStr( str, pos, i+1 ); lastPos = i+1; @@ -66,17 +66,17 @@ TQString clearComments( TQString str ) { TQString cutTemplateParams( TQString str ) { int p; - if( (p = str.tqfind('<') ) != -1) { + if( (p = str.find('<') ) != -1) { return str.left( p ); } - return str.stripWhiteSpace().tqreplace('*',""); + return str.stripWhiteSpace().replace('*',""); } TQPair<TQString, TQString> splitTemplateParams( TQString str ) { TQPair<TQString, TQString> ret; int p; - if( (p = str.tqfind('<') ) != -1) { + if( (p = str.find('<') ) != -1) { ret.first = str.left( p ).stripWhiteSpace(); ret.second = str.mid( p ).stripWhiteSpace(); } else { @@ -238,8 +238,8 @@ int countExtract( TQChar c, const TQString& str ) { TQString templateParamFromString( int num, TQString str ) { if( str.endsWith("::") ) str.truncate( str.length() - 2 ); - int begin = str.tqfind('<'); - int end = str.tqfindRev('>'); + int begin = str.find('<'); + int end = str.findRev('>'); if(begin == -1 || end == -1) return ""; diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h index a6815f2b..33e01827 100644 --- a/languages/cpp/stringhelpers.h +++ b/languages/cpp/stringhelpers.h @@ -63,8 +63,8 @@ TQStringList splitType( TQString str ) ; class ParamIterator { public: ParamIterator( TQString parens, TQString source ) : m_source( source ), m_parens( parens ), m_cur( 0 ), m_curEnd ( 0 ) { - int begin = m_source.tqfind( m_parens[ 0 ] ); - int end = m_source.tqfindRev( m_parens[ 1 ] ); + int begin = m_source.find( m_parens[ 0 ] ); + int end = m_source.findRev( m_parens[ 1 ] ); m_prefix = m_source.left( begin ); if ( begin == -1 || end == -1 && end - begin > 1 ) diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 27b08f27..72db362b 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -145,7 +145,7 @@ m_newFileNames(dummy), m_cppSupport( cppSupport ) { kdDebug() << "base class " << baseClass << " class " << (*classIt)->name() << " parents " << (*classIt)->baseClassList().join(",") << endl; - if ( (*classIt)->baseClassList().tqfindIndex(baseClass) != -1 ) + if ( (*classIt)->baseClassList().findIndex(baseClass) != -1 ) { kdDebug() << "base class matched " << endl; m_edClassName->setText((*classIt)->name()); @@ -167,7 +167,7 @@ bool SubclassingDlg::alreadyInSubclass(const TQString &method) { for (uint i=0;i<m_parsedMethods.count();i++) { - if (method.tqfind(m_parsedMethods[i])==0) + if (method.find(m_parsedMethods[i])==0) return true; } return false; @@ -276,14 +276,14 @@ void SubclassingDlg::updateDlg() { } -void SubclassingDlg::tqreplace(TQString &string, const TQString& search, const TQString& tqreplace) +void SubclassingDlg::replace(TQString &string, const TQString& search, const TQString& replace) { - int nextPos = string.tqfind(search); + int nextPos = string.find(search); unsigned int searchLength = search.length(); while (nextPos>-1) { - string = string.tqreplace(nextPos,searchLength,tqreplace); - nextPos = string.tqfind(search,nextPos+tqreplace.length()); + string = string.replace(nextPos,searchLength,replace); + nextPos = string.find(search,nextPos+replace.length()); } } @@ -304,24 +304,24 @@ bool SubclassingDlg::loadBuffer(TQString &buffer, const TQString& filename) bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) { - tqreplace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); - tqreplace(buffer,"$BASEFILENAMELC$",m_formName.lower()); - tqreplace(buffer,"$BASEFILENAME$",m_formName); - tqreplace(buffer,"$NEWCLASS$",m_edClassName->text()); - tqreplace(buffer,"$TQTBASECLASS$", m_qtBaseClassName ); - tqreplace(buffer,"$BASECLASS$",m_baseClassName); - tqreplace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); + replace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); + replace(buffer,"$BASEFILENAMELC$",m_formName.lower()); + replace(buffer,"$BASEFILENAME$",m_formName); + replace(buffer,"$NEWCLASS$",m_edClassName->text()); + replace(buffer,"$TQTBASECLASS$", m_qtBaseClassName ); + replace(buffer,"$BASECLASS$",m_baseClassName); + replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - tqreplace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); - tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); - tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); + replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } else { - tqreplace(buffer,"$CAN_BE_MODAL_H$",""); - tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",""); - tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",""); + replace(buffer,"$CAN_BE_MODAL_H$",""); + replace(buffer,"$CAN_BE_MODAL_CPP1$",""); + replace(buffer,"$CAN_BE_MODAL_CPP2$",""); } return true; @@ -378,8 +378,8 @@ void SubclassingDlg::accept() TQFileInfo fi(m_filename + ".h"); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module); - buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); } else loadBuffer(buffer,m_filename+".h"); @@ -411,12 +411,12 @@ void SubclassingDlg::accept() if (!slitem->m_isFunc) { declBuild += spacer.fill(' ',43-declBuild.length()) + slitem->m_methodName + ";"; - tqreplace(buffer,"/*$PUBLIC_SLOTS$*/",declBuild); + replace(buffer,"/*$PUBLIC_SLOTS$*/",declBuild); } else { declBuild += spacer.fill(' ',47-declBuild.length()) + slitem->m_methodName + ";"; - tqreplace(buffer,"/*$PUBLIC_FUNCTIONS$*/",declBuild); + replace(buffer,"/*$PUBLIC_FUNCTIONS$*/",declBuild); } } if (slitem->m_access=="protected") @@ -424,12 +424,12 @@ void SubclassingDlg::accept() if (!slitem->m_isFunc) { declBuild += spacer.fill(' ',46-declBuild.length()) + slitem->m_methodName + ";"; - tqreplace(buffer,"/*$PROTECTED_SLOTS$*/",declBuild); + replace(buffer,"/*$PROTECTED_SLOTS$*/",declBuild); } else { declBuild += spacer.fill(' ',50-declBuild.length()) + slitem->m_methodName + ";"; - tqreplace(buffer,"/*$PROTECTED_FUNCTIONS$*/",declBuild); + replace(buffer,"/*$PROTECTED_FUNCTIONS$*/",declBuild); } } } @@ -473,8 +473,8 @@ void SubclassingDlg::accept() TQFileInfo fi(m_filename + ".cpp"); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module); - buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) buffer += "\n#include \"$NEWFILENAMELC$.tqmoc\"\n"; } @@ -489,11 +489,11 @@ void SubclassingDlg::accept() slitem->m_alreadyInSubclass) continue; TQString impl = slitem->m_callBaseClass ? implementation_callbase : implementation; - tqreplace(impl,"$RETURNTYPE$",slitem->m_returnType); - tqreplace(impl,"$NEWCLASS$",m_edClassName->text()); - tqreplace(impl,"$METHOD$", slitem->m_methodName); - tqreplace(impl,"$TQTBASECLASS$", m_qtBaseClassName); - tqreplace(buffer,"/*$SPECIALIZATION$*/",impl); + replace(impl,"$RETURNTYPE$",slitem->m_returnType); + replace(impl,"$NEWCLASS$",m_edClassName->text()); + replace(impl,"$METHOD$", slitem->m_methodName); + replace(impl,"$TQTBASECLASS$", m_qtBaseClassName); + replace(buffer,"/*$SPECIALIZATION$*/",impl); } if (reformat_box->isChecked()) diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index ca07059a..e63dee7b 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -54,7 +54,7 @@ private: TQString readBaseClassName(); void updateDlg(); bool replaceKeywords( TQString &buffer, bool canBeModal = true ); - void tqreplace( TQString &string, const TQString& search, const TQString& tqreplace ); + void replace( TQString &string, const TQString& search, const TQString& replace ); bool saveBuffer( TQString &buffer, const TQString& filename ); bool loadBuffer( TQString &buffer, const TQString& filename ); bool alreadyInSubclass( const TQString &method ); diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp index 2ac8d54b..80ab86f5 100644 --- a/languages/cpp/tag_creator.cpp +++ b/languages/cpp/tag_creator.cpp @@ -47,10 +47,10 @@ void TagCreator::parseDeclaration( DeclarationAST* ast ) { if( ast->nodeType() == NodeType_AccessDeclaration || m_currentAccess.isEmpty() || - m_currentAccess.tqcontains("private") || ///In order to correctly evaluate templates, the private members are necessary too - m_currentAccess.tqcontains("public") || - m_currentAccess.tqcontains("protected") || - m_currentAccess.tqcontains("signals") ) + m_currentAccess.contains("private") || ///In order to correctly evaluate templates, the private members are necessary too + m_currentAccess.contains("public") || + m_currentAccess.contains("protected") || + m_currentAccess.contains("signals") ) { TreeParser::parseDeclaration( ast ); } @@ -362,7 +362,7 @@ void TagCreator::parseFunctionDefinition( FunctionDefinitionAST* ast ) checkTemplateDeclarator( tag ); TQString arguments = tag.attribute( "a" ).toStringList().join( "," ); -tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.tqreplace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); +tag.setAttribute( "description", m_documentation->functionDescription( scopeStr.replace( TQRegExp( "." ), ":" ), id, typeOfDeclaration( typeSpec, d ), arguments ) ); tagBuilder.setAccess( TagUtils::stringToAccess( m_currentAccess ) ); @@ -469,7 +469,7 @@ void TagCreator::parseClassSpecifier( ClassSpecifierAST* ast ) tag.setFileName( m_fileName ); - int i = className.tqfind( '<' ); + int i = className.find( '<' ); TQString specialization; if( i != -1 ) { @@ -862,7 +862,7 @@ int TagUtils::stringToAccess( const TQString & access ) << "public slots" << "protected slots" << "private slots" << "signals"; - int idx = l.tqfindIndex( access ); + int idx = l.findIndex( access ); return idx == -1 ? 0 : idx+1; } diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h index 9e52bb5e..e142d837 100644 --- a/languages/cpp/typedecoration.h +++ b/languages/cpp/typedecoration.h @@ -47,9 +47,9 @@ class TypeDecoration { } void operator += ( const TypeDecoration& rhs ) { - if ( !m_decoration_front.tqcontains( rhs.m_decoration_front ) ) + if ( !m_decoration_front.contains( rhs.m_decoration_front ) ) m_decoration_front += rhs.m_decoration_front; - if ( !m_decoration_back.tqcontains( rhs.m_decoration_back ) ) + if ( !m_decoration_back.contains( rhs.m_decoration_back ) ) m_decoration_back += rhs.m_decoration_back; } diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp index 757b4eae..bc314743 100644 --- a/languages/cpp/typedesc.cpp +++ b/languages/cpp/typedesc.cpp @@ -150,7 +150,7 @@ TypeDesc::TypeDesc( const TypeDesc& rhs ) { bool TypeDesc::isValidType() const { if ( !m_data ) return false; - if ( m_data->m_cleanName.tqfind( "->" ) != -1 || m_data->m_cleanName.tqcontains( '.' ) || m_data->m_cleanName.tqcontains( ' ' ) || m_data->m_cleanName.isEmpty() ) + if ( m_data->m_cleanName.find( "->" ) != -1 || m_data->m_cleanName.contains( '.' ) || m_data->m_cleanName.contains( ' ' ) || m_data->m_cleanName.isEmpty() ) return false; for ( TemplateParams::const_iterator it = m_data->m_templateParams.begin(); it != m_data->m_templateParams.end(); ++it ) { @@ -708,7 +708,7 @@ void TypeDesc::init( TQString stri ) { ///Since function-names are also processed by this function, this check has to be done if( shorten ) { ///Remove any prefixes like const or typename(very limited algorithm) - int len = str.tqfind( "<" ); + int len = str.find( "<" ); if ( len == -1 ) len = str.length(); int currentStart = 0; diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 0c67b155..6f12836c 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -166,7 +166,7 @@ void CSharpSupportPart::savedFile(const KURL &fileName) #if 0 // not needed anymore kdDebug(9016) << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName); emit updatedSourceInfo(); } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 267c67f0..113b5abd 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -150,7 +150,7 @@ void OptimizationTab::readFlags(TQStringList *list) if (optBox) { TQListViewItem *item = optBox->firstChild(); for (; item; item = item->nextSibling()) { - TQStringList::Iterator sli = list->tqfind(item->text(0)); + TQStringList::Iterator sli = list->find(item->text(0)); if (sli != list->end()) { static_cast<TQCheckListItem*>(item)->setOn(true); list->remove(sli); @@ -159,17 +159,17 @@ void OptimizationTab::readFlags(TQStringList *list) } TQStringList::Iterator sli; - sli = list->tqfind("-O0"); + sli = list->find("-O0"); if (sli != list->end()) { O0->setChecked(true); list->remove(sli); } - sli = list->tqfind("-O1"); + sli = list->find("-O1"); if (sli != list->end()) { O1->setChecked(true); list->remove(sli); } - sli = list->tqfind("-O2"); + sli = list->find("-O2"); if (sli != list->end()) { O2->setChecked(true); list->remove(sli); @@ -220,7 +220,7 @@ void HpfTab::readFlags(TQStringList *list) { TQListViewItem *item = hpfBox->firstChild(); for (; item; item = item->nextSibling()) { - TQStringList::Iterator sli = list->tqfind(item->text(0)); + TQStringList::Iterator sli = list->find(item->text(0)); if (sli != list->end()) { static_cast<TQCheckListItem*>(item)->setOn(true); list->remove(sli); diff --git a/languages/fortran/fixedformparser.cpp b/languages/fortran/fixedformparser.cpp index 8f07ad4a..312d811e 100644 --- a/languages/fortran/fixedformparser.cpp +++ b/languages/fortran/fixedformparser.cpp @@ -73,7 +73,7 @@ void FixedFormParser::parse(const TQString &fileName) while (!stream.atEnd()) { ++lineNum; TQCString str = stream.readLine().local8Bit(); - if (!str.isEmpty() && TQCString("*Cc#!").tqfind(str[0]) != -1) + if (!str.isEmpty() && TQCString("*Cc#!").find(str[0]) != -1) continue; // Continuation line if (str.length() > 6 && str.left(5) == " " && str[5] != ' ') { diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 63a06584..3ac3f6e3 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -267,7 +267,7 @@ void FortranSupportPart::savedFile(const KURL &fileName) { kdDebug(9019) << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName.path()); emit addedSourceInfo( fileName.path() ); } diff --git a/languages/fortran/ftnchekconfigwidget.cpp b/languages/fortran/ftnchekconfigwidget.cpp index c359f78d..2fcd7905 100644 --- a/languages/fortran/ftnchekconfigwidget.cpp +++ b/languages/fortran/ftnchekconfigwidget.cpp @@ -48,7 +48,7 @@ void FtnchekItem::readFlagsToListView(TQListView *listview, TQStringList *list) TQListViewItem *item = listview->firstChild(); for (; item; item = item->nextSibling()) { FtnchekItem *flitem = static_cast<FtnchekItem*>(item); - TQStringList::Iterator sli = list->tqfind(flitem->flag); + TQStringList::Iterator sli = list->find(flitem->flag); if (sli != list->end()) { flitem->setOn(true); list->remove(sli); diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp index ac5cfc5e..e83cd90e 100644 --- a/languages/java/JavaStoreWalker.cpp +++ b/languages/java/JavaStoreWalker.cpp @@ -1046,9 +1046,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { #line 264 "java.store.g" meth->setResultType( tp ); - if( m.tqcontains("public") ) + if( m.contains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -1096,14 +1096,14 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { #line 300 "java.store.g" attr->setType( tp ); - if( m.tqcontains("public") ) + if( m.contains("public") ) attr->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) attr->setAccess( CodeModelItem::Protected ); else attr->setAccess( CodeModelItem::Private ); - attr->setStatic( m.tqcontains("static") ); + attr->setStatic( m.contains("static") ); #line 1109 "JavaStoreWalker.cpp" } @@ -1144,9 +1144,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { _t = _t->getNextSibling(); #line 247 "java.store.g" - if( m.tqcontains("public") ) + if( m.contains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -1212,9 +1212,9 @@ void JavaStoreWalker::modifier(RefJavaAST _t) { #line 282 "java.store.g" meth->setResultType( tp ); - if( m.tqcontains("public") ) + if( m.contains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); diff --git a/languages/java/app_templates/superwaba/src-Makefile b/languages/java/app_templates/superwaba/src-Makefile index f2a2a1ab..84b55ece 100644 --- a/languages/java/app_templates/superwaba/src-Makefile +++ b/languages/java/app_templates/superwaba/src-Makefile @@ -114,7 +114,7 @@ WABAEXTRADIR = $(WABADIR)/superwaba ################################################################################ # the classpath will have to tell java where to find the waba stuff. # -# the CLASSPATH here is set to let java tqfind +# the CLASSPATH here is set to let java find # - the classes it needs to produce the executable class files # - the waba.applet class, Warp.class, and Exegen.class # @@ -198,7 +198,7 @@ $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES) # $(PDBFILE): $(MAINCLASS) $(EXTRACLASSES) # $(WARP) $(WARPFLAGS) $(PDBBASENAME) $(MAINCLASS) $(EXTRACLASSES) -# Below, we just tell make how to create foo.class if it can tqfind +# Below, we just tell make how to create foo.class if it can find # foo.java %.class: %.java diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index e1f058c7..cdeae8b4 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -146,7 +146,7 @@ public: m_fileList.pop_front(); } - bool tqcontains( const TQString& fileName ) const + bool contains( const TQString& fileName ) const { TQMutexLocker locker( &m_mutex ); TQValueList< TQPair<TQString, bool> >::ConstIterator it = m_fileList.begin(); @@ -199,7 +199,7 @@ void BackgroundParser::addFile( const TQString& fileName, bool readFromDisk ) TQString fn = deepCopy( fileName ); bool added = false; - if( !m_fileList->tqcontains(fn) ){ + if( !m_fileList->contains(fn) ){ m_fileList->push_back( fn, readFromDisk ); added = true; } @@ -257,7 +257,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) static_cast<KDevSourceProvider*>( m_driver->sourceProvider() )->setReadFromDisk( false ); - if( m_unitDict.tqfind(fileName) != m_unitDict.end() ){ + if( m_unitDict.find(fileName) != m_unitDict.end() ){ Unit* u = m_unitDict[ fileName ]; m_unitDict.remove( fileName ); delete( u ); @@ -266,7 +266,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) m_unitDict.insert( fileName, unit ); - if( m_fileList->tqcontains(fileName) ){ + if( m_fileList->contains(fileName) ){ kdDebug(9013) << "========================> FILE: " << fileName << " IN TQUEUE <=============" << endl; } else { KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); @@ -282,7 +282,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) Unit* BackgroundParser::findUnit( const TQString& fileName ) { - TQMap<TQString, Unit*>::Iterator it = m_unitDict.tqfind( fileName ); + TQMap<TQString, Unit*>::Iterator it = m_unitDict.find( fileName ); return it != m_unitDict.end() ? *it : 0; } diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp index 9a4bccdf..7991028e 100644 --- a/languages/java/driver.cpp +++ b/languages/java/driver.cpp @@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName ) { m_problems.remove( fileName ); - TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName ); + TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName ); if( it != m_parsedUnits.end() ){ RefJavaAST unit = *it; m_parsedUnits.remove( it ); @@ -110,7 +110,7 @@ void Driver::remove( const TQString & fileName ) RefJavaAST Driver::takeTranslationUnit( const TQString& fileName ) { - TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( fileName ); + TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( fileName ); RefJavaAST unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName] = 0; @@ -119,7 +119,7 @@ RefJavaAST Driver::takeTranslationUnit( const TQString& fileName ) RefJavaAST Driver::translationUnit( const TQString& fileName ) const { - TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.tqfind( fileName ); + TQMap<TQString, RefJavaAST>::ConstIterator it = m_parsedUnits.find( fileName ); return it != m_parsedUnits.end() ? *it : RefJavaAST(); } @@ -130,7 +130,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem ) TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { - TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName ); + TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName ); if( it != m_problems.end() ) return it.data(); @@ -141,7 +141,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN TQValueList < Problem > Driver::problems( const TQString & fileName ) const { - TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName ); + TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName ); if( it != m_problems.end() ) return it.data(); return TQValueList<Problem>(); @@ -152,7 +152,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc TQFileInfo fileInfo( fileName ); TQString absFilePath = fileInfo.absFilePath(); - TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.tqfind( absFilePath ); + TQMap<TQString, RefJavaAST>::Iterator it = m_parsedUnits.find( absFilePath ); if( force && it != m_parsedUnits.end() ){ takeTranslationUnit( absFilePath ); diff --git a/languages/java/java.store.g b/languages/java/java.store.g index d7e28c22..b69b7323 100644 --- a/languages/java/java.store.g +++ b/languages/java/java.store.g @@ -245,9 +245,9 @@ ctorDef returns [ FunctionDom meth ] { m=modifiers methodHead[meth] slist ) { - if( m.tqcontains("public") ) + if( m.contains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -263,9 +263,9 @@ methodDecl returns [ FunctionDom meth ] { : #(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth]) { meth->setResultType( tp ); - if( m.tqcontains("public") ) + if( m.contains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -281,9 +281,9 @@ methodDef returns [ FunctionDom meth ] { : #(METHOD_DEF m=modifiers tp=typeSpec methodHead[meth] (slist)?) { meth->setResultType( tp ); - if( m.tqcontains("public") ) + if( m.contains("public") ) meth->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) meth->setAccess( CodeModelItem::Protected ); else meth->setAccess( CodeModelItem::Private ); @@ -299,14 +299,14 @@ variableDef returns [ VariableDom attr ] { : #(VARIABLE_DEF m=modifiers tp=typeSpec variableDeclarator[attr] varInitializer) { attr->setType( tp ); - if( m.tqcontains("public") ) + if( m.contains("public") ) attr->setAccess( CodeModelItem::Public ); - else if( m.tqcontains("protected") ) + else if( m.contains("protected") ) attr->setAccess( CodeModelItem::Protected ); else attr->setAccess( CodeModelItem::Private ); - attr->setStatic( m.tqcontains("static") ); + attr->setStatic( m.contains("static") ); } ; diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index e8f62fa1..68a22250 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -273,7 +273,7 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); TQFileInfo fi( m_activeFileName ); TQString ext = fi.extension(); - if (fileExtensions().tqcontains(ext)) + if (fileExtensions().contains(ext)) enabled = true; } @@ -395,7 +395,7 @@ void JavaSupportPart::savedFile(const KURL &fileName) kdDebug(9013) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl; TQStringList projectFileList = project()->allFiles(); - if (projectFileList.tqcontains(fileName.mid ( m_projectDirectory.length() + 1 ))) { + if (projectFileList.contains(fileName.mid ( m_projectDirectory.length() + 1 ))) { maybeParse( fileName ); emit addedSourceInfo( fileName ); } @@ -556,10 +556,10 @@ JavaSupportPart::parseProject( ) if( isValidSource(absFilePath) ){ TQDateTime t = fileInfo.lastModified(); - if( m_timestamp.tqcontains(absFilePath) && m_timestamp[absFilePath] == t ) + if( m_timestamp.contains(absFilePath) && m_timestamp[absFilePath] == t ) continue; - if( pcs.tqcontains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){ + if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){ stream.tqdevice()->at( pcs[absFilePath].second ); FileDom file = codeModel()->create<FileModel>(); file->read( stream ); @@ -607,7 +607,7 @@ void JavaSupportPart::maybeParse( const TQString& fileName ) return; } - TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path ); + TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path ); if( it != m_timestamp.end() && *it == t ){ return; } @@ -666,12 +666,12 @@ TQStringList JavaSupportPart::modifiedFileList() TQFileInfo fileInfo( m_projectDirectory, fileName ); - if( !fileExtensions().tqcontains(fileInfo.extension()) ) + if( !fileExtensions().contains(fileInfo.extension()) ) continue; TQDateTime t = fileInfo.lastModified(); TQString path = URLUtil::canonicalPath( fileInfo.absFilePath() ); - TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path ); + TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path ); if( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t ) continue; @@ -787,7 +787,7 @@ void JavaSupportPart::removeWithReferences( const TQString & fileName ) bool JavaSupportPart::isValidSource( const TQString& fileName ) const { TQFileInfo fileInfo( fileName ); - return fileExtensions().tqcontains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore"); + return fileExtensions().contains( fileInfo.extension() ) && !TQFile::exists(fileInfo.dirPath(true) + "/.kdev_ignore"); } TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool shortDescription ) diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index f287f70d..d2237ad3 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -214,7 +214,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p } TQString msg = p.text(); - msg = msg.tqreplace( TQRegExp("\n"), "" ); + msg = msg.replace( TQRegExp("\n"), "" ); new ProblemItem( this, levelToString( p.level() ), diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 8f6afda3..2c894b17 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -157,7 +157,7 @@ void kjsSupportPart::savedFile(const TQString &fileName) { - if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) + if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { kdDebug(9014) << "parse file " << fileName << endl; parse( fileName ); @@ -326,10 +326,10 @@ void kjsSupportPart::parse(const TQString &fileName) m_problemReporter->addLine(m_file->fileName(), lineNo, errorMessage.qstring()); } - if( line.tqcontains("{") ) + if( line.contains("{") ) ++depth; - if( line.tqcontains("}") ) + if( line.contains("}") ) --depth; ++lineNo; diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index a74b1e00..a4697569 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -165,7 +165,7 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport ) bool SubclassingDlg::alreadyInSubclass(const TQString &method) { for (uint i=0;i<m_parsedMethods.count();i++) - if (method.tqfind(m_parsedMethods[i])==0) + if (method.find(m_parsedMethods[i])==0) return true; return false; } @@ -293,15 +293,15 @@ void SubclassingDlg::updateDlg() { } -void SubclassingDlg::tqreplace(TQString &string, const TQString& search, const TQString& tqreplace) +void SubclassingDlg::replace(TQString &string, const TQString& search, const TQString& replace) //========================================================================================== { - int nextPos = string.tqfind(search); + int nextPos = string.find(search); unsigned int searchLength = search.length(); while (nextPos>-1) { - string = string.tqreplace(nextPos,searchLength,tqreplace); - nextPos = string.tqfind(search,nextPos+tqreplace.length()); + string = string.replace(nextPos,searchLength,replace); + nextPos = string.find(search,nextPos+replace.length()); } } @@ -324,23 +324,23 @@ bool SubclassingDlg::loadBuffer(TQString &buffer, const TQString& filename) bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal) //=================================================================== { - tqreplace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); - tqreplace(buffer,"$BASEFILENAMELC$",m_formName.lower()); - tqreplace(buffer,"$BASEFILENAME$",m_formName); - tqreplace(buffer,"$NEWCLASS$",m_edClassName->text()); - tqreplace(buffer,"$BASECLASS$",m_baseClassName); - tqreplace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); + replace(buffer,"$NEWFILENAMEUC$",m_edFileName->text().upper()); + replace(buffer,"$BASEFILENAMELC$",m_formName.lower()); + replace(buffer,"$BASEFILENAME$",m_formName); + replace(buffer,"$NEWCLASS$",m_edClassName->text()); + replace(buffer,"$BASECLASS$",m_baseClassName); + replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower()); if (canBeModal) { - tqreplace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); - tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); - tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); + replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE"); + replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal"); + replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal"); } else { - tqreplace(buffer,"$CAN_BE_MODAL_H$",""); - tqreplace(buffer,"$CAN_BE_MODAL_CPP1$",""); - tqreplace(buffer,"$CAN_BE_MODAL_CPP2$",""); + replace(buffer,"$CAN_BE_MODAL_H$",""); + replace(buffer,"$CAN_BE_MODAL_CPP1$",""); + replace(buffer,"$CAN_BE_MODAL_CPP2$",""); } return true; @@ -397,8 +397,8 @@ void SubclassingDlg::accept() TQFileInfo fi(m_filename + ".js"); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - buffer.tqreplace(TQRegExp("\\$MODULE\\$"),module); - buffer.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); + buffer.replace(TQRegExp("\\$MODULE\\$"),module); + buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); } else loadBuffer(buffer,m_filename+".js"); @@ -419,11 +419,11 @@ void SubclassingDlg::accept() slitem->m_alreadyInSubclass) continue; TQString impl = implementation; - tqreplace(impl,"$RETURNTYPE$",slitem->m_returnType); - tqreplace(impl,"$NEWCLASS$",m_edClassName->text()); - tqreplace(impl,"$METHOD$", slitem->m_methodName); - tqreplace(impl,"$TQTBASECLASS$", m_qtBaseClassName); - tqreplace(buffer,"/*$SPECIALIZATION$*/",impl); + replace(impl,"$RETURNTYPE$",slitem->m_returnType); + replace(impl,"$NEWCLASS$",m_edClassName->text()); + replace(impl,"$METHOD$", slitem->m_methodName); + replace(impl,"$TQTBASECLASS$", m_qtBaseClassName); + replace(buffer,"/*$SPECIALIZATION$*/",impl); } kdDebug() << buffer << endl; diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h index c3573643..b6836037 100644 --- a/languages/kjssupport/subclassingdlg.h +++ b/languages/kjssupport/subclassingdlg.h @@ -54,7 +54,7 @@ private: TQString readBaseClassName(); void updateDlg(); bool replaceKeywords(TQString &buffer, bool canBeModal=true); - void tqreplace(TQString &string, const TQString& search, const TQString& tqreplace); + void replace(TQString &string, const TQString& search, const TQString& replace); bool saveBuffer(TQString &buffer, const TQString& filename); bool loadBuffer(TQString &buffer, const TQString& filename); bool alreadyInSubclass(const TQString &method); diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index 8bfebb33..5d33ee8c 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -50,7 +50,7 @@ void Debugger::setBreakpoint(const TQString &fileName, int lineNum, int id, bool iface->removeMark( lineNum, Breakpoint | ActiveBreakpoint | ReachedBreakpoint | DisabledBreakpoint ); BPItem bpItem(fileName, lineNum); - TQValueList<BPItem>::Iterator it = BPList.tqfind(bpItem); + TQValueList<BPItem>::Iterator it = BPList.find(bpItem); if (it != BPList.end()) { // kdDebug(9012) << "Removing BP=" << fileName << ":" << lineNum << endl; diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp index 43359bd1..1d9e0c01 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.cpp +++ b/languages/lib/designer_integration/qtdesignerintegration.cpp @@ -53,7 +53,7 @@ void QtDesignerIntegration::addFunction(const TQString& formName, KInterfaceDesi { kdDebug() << "QtDesignerIntegration::addFunction: form: " << formName << ", function: " << function.function << endl; - if (!m_implementations.tqcontains(formName)) + if (!m_implementations.contains(formName)) if (!selectImplementation(formName)) return; @@ -139,8 +139,8 @@ void QtDesignerIntegration::openFunction(const TQString &formName, const TQStrin kdDebug() << "QtDesignerIntegration::openFunction, formName = " << formName << ", functionName = " << functionName << endl; TQString fn = functionName; - if (fn.tqfind("(") > 0) - fn.remove(fn.tqfind("("), fn.length()); + if (fn.find("(") > 0) + fn.remove(fn.find("("), fn.length()); if (!m_implementations[formName]) return; @@ -184,7 +184,7 @@ void QtDesignerIntegration::processImplementationName(TQString &// name void QtDesignerIntegration::openSource(const TQString &formName) { - if (!m_implementations.tqcontains(formName)) + if (!m_implementations.contains(formName)) if (!selectImplementation(formName)) return; TQString impl = m_implementations[formName]->fileName(); diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h index aa0c0f2f..d1f72aeb 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.h +++ b/languages/lib/designer_integration/qtdesignerintegration.h @@ -66,7 +66,7 @@ protected: separate files for interface and implementation parts of a class. For example, C++ language support plugin will do: @code - name.tqreplace(".h", ".cpp"); + name.replace(".h", ".cpp"); @endcode*/ virtual void processImplementationName(TQString &name); diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index 4b74164a..adb02c63 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -217,7 +217,7 @@ void ProblemReporter::reportError( TQString message, new ProblemItem( this, "error", - message.tqreplace( TQRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); @@ -229,7 +229,7 @@ void ProblemReporter::reportWarning( TQString message, { new ProblemItem( this, "warning", - message.tqreplace( TQRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); @@ -241,7 +241,7 @@ void ProblemReporter::reportMessage( TQString message, { new TQListViewItem( this, "message", - message.tqreplace( TQRegExp("\n"), "" ), + message.replace( TQRegExp("\n"), "" ), filename, TQString::number( line ), TQString::number( column ) ); diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp index 4ab48333..520daab3 100644 --- a/languages/perl/perlparser.cpp +++ b/languages/perl/perlparser.cpp @@ -437,7 +437,7 @@ void perlparser::addParentClass(const TQString& tqparent) void perlparser::addUseLib(const TQString& lib) { if (!m_model->hasFile(lib)) { - if (m_usefiles.tqfindIndex(lib) == -1) { + if (m_usefiles.findIndex(lib) == -1) { //only add if not already parsed or in the list kdDebug(9016) << "add lib for later parsing [" << lib << "]" << endl; m_usefiles.append(lib); @@ -478,7 +478,7 @@ TQString perlparser::findLib( const TQString& lib) TQString result; TQString file=lib; - file.tqreplace( TQRegExp("::"), TQString("/")); + file.replace( TQRegExp("::"), TQString("/")); //find the correct path by using the INC list TQStringList::Iterator inc = m_INClist.begin(); diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index b131af11..a8c66b66 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -166,7 +166,7 @@ void PerlSupportPart::savedFile(const KURL &fileName) #if 0 // not needed anymore kdDebug(9016) << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName); emit updatedSourceInfo(); } diff --git a/languages/php/data/phpfunctions b/languages/php/data/phpfunctions index d5b80245..be8667f6 100644 --- a/languages/php/data/phpfunctions +++ b/languages/php/data/phpfunctions @@ -150,7 +150,7 @@ db:string dblist(void) db:int dbmopen(string filename, string mode) db:bool dbmclose(int dbm_identifier) db:int dbminsert(int dbm_identifier, string key, string value) -db:int dbmtqreplace(int dbm_identifier, string key, string value) +db:int dbmreplace(int dbm_identifier, string key, string value) db:string dbmfetch(int dbm_identifier, string key) db:int dbmexists(int dbm_identifier, string key) db:int dbmdelete(int dbm_identifier, string key) @@ -165,7 +165,7 @@ dba:string dba_firstkey(int handle) dba:string dba_nextkey(int handle) dba:bool dba_delete(string key, int handle) dba:bool dba_insert(string key, string value, int handle) -dba:bool dba_tqreplace(string key, string value, int handle) +dba:bool dba_replace(string key, string value, int handle) dba:bool dba_optimize(int handle) dba:bool dba_sync(int handle) dbase:int dbase_open(string name, int mode) @@ -559,7 +559,7 @@ ldap:array ldap_explode_dn(string dn, int with_attrib) ldap:string ldap_dn2ufn(string dn) ldap:int ldap_add(int link, string dn, array entry) ldap:int ldap_modify(int link, string dn, array entry) -ldap:int ldap_mod_tqreplace(int link, string dn, array entry) +ldap:int ldap_mod_replace(int link, string dn, array entry) ldap:int ldap_mod_add(int link, string dn, array entry) ldap:int ldap_mod_del(int link, string dn, array entry) ldap:int ldap_delete(int link, string dn) @@ -861,7 +861,7 @@ ovrimos:int ovrimos_rollback(int connection_id) ovrimos:int ovrimos_setoption(int conn_id|result_id, int which, int option, int value) pcre:int preg_match(string pattern, string subject [, array subpatterns]) pcre:int preg_match_all(string pattern, string subject, array subpatterns [, int order]) -pcre:string preg_tqreplace(string|array regex, string|array tqreplace, string|array subject [, int limit]) +pcre:string preg_replace(string|array regex, string|array replace, string|array subject [, int limit]) pcre:array preg_split(string pattern, string subject [, int limit [, int flags]]) pcre:string preg_quote(string str, string delim_char) pcre:array preg_grep(string regex, array input) @@ -1403,8 +1403,8 @@ rand:int mt_getrandmax(void) quot_print:string quoted_printable_decode(string str) reg:int ereg(string pattern, string string [, array registers]) reg:int eregi(string pattern, string string [, array registers]) -reg:string ereg_tqreplace(string pattern, string replacement, string string) -reg:string eregi_tqreplace(string pattern, string replacement, string string]) +reg:string ereg_replace(string pattern, string replacement, string string) +reg:string eregi_replace(string pattern, string replacement, string string]) reg:array split(string pattern, string string [, int limit]) reg:array spliti(string pattern, string string [, int limit]) reg:string sql_regcase(string string) @@ -1434,7 +1434,7 @@ string:int strrpos(string haystack, string needle) string:string strrchr(string haystack, string needle) string:string chunk_split(string str [, int chunklen [, string ending]]) string:string substr(string str, int start [, int length]) -string:string substr_tqreplace(string str, string repl, int start [, int length]) +string:string substr_replace(string str, string repl, int start [, int length]) string:string quotemeta(string str) string:int ord(string character) string:string chr(int ascii) @@ -1447,7 +1447,7 @@ string:string addcslashes(string str, string charlist) string:string addslashes(string str) string:string stripcslashes(string str) string:string stripslashes(string str) -string:string str_tqreplace(string needle, string str, string haystack) +string:string str_replace(string needle, string str, string haystack) string:string hebrev(string str [, int max_chars_per_line]) string:string hebrevc(string str [, int max_chars_per_line]) string:string nl2br(string str) diff --git a/languages/php/doc/php.toc b/languages/php/doc/php.toc index 67883245..7a35196d 100644 --- a/languages/php/doc/php.toc +++ b/languages/php/doc/php.toc @@ -1629,7 +1629,7 @@ <entry name="newt_checkbox_set_flags" url="function.newt-checkbox-set-flags.php"/> <entry name="newt_checkbox_set_value" url="function.newt-checkbox-set-value.php"/> <entry name="newt_checkbox_tree_add_item" url="function.newt-checkbox-tree-add-item.php"/> -<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-tqfind-item.php"/> +<entry name="newt_checkbox_tree_find_item" url="function.newt-checkbox-tree-find-item.php"/> <entry name="newt_checkbox_tree_get_current" url="function.newt-checkbox-tree-get-current.php"/> <entry name="newt_checkbox_tree_get_entry_value" url="function.newt-checkbox-tree-get-entry-value.php"/> <entry name="newt_checkbox_tree_get_multi_selection" url="function.newt-checkbox-tree-get-multi-selection.php"/> @@ -1840,7 +1840,7 @@ <entry name="ncurses_qiflush" url="function.ncurses-qiflush.php"/> <entry name="ncurses_raw" url="function.ncurses-raw.php"/> <entry name="ncurses_refresh" url="function.ncurses-refresh.php"/> -<entry name="ncurses_replace_panel" url="function.ncurses-tqreplace-panel.php"/> +<entry name="ncurses_replace_panel" url="function.ncurses-replace-panel.php"/> <entry name="ncurses_reset_prog_mode" url="function.ncurses-reset-prog-mode.php"/> <entry name="ncurses_reset_shell_mode" url="function.ncurses-reset-shell-mode.php"/> <entry name="ncurses_resetty" url="function.ncurses-resetty.php"/> @@ -2245,7 +2245,7 @@ <entry name="dba_open" url="function.dba-open.php"/> <entry name="dba_optimize" url="function.dba-optimize.php"/> <entry name="dba_popen" url="function.dba-popen.php"/> -<entry name="dba_tqreplace" url="function.dba-tqreplace.php"/> +<entry name="dba_replace" url="function.dba-replace.php"/> <entry name="dba_sync" url="function.dba-sync.php"/> <entry name="dbx_close" url="function.dbx-close.php"/> <entry name="dbx_compare" url="function.dbx-compare.php"/> @@ -2411,7 +2411,7 @@ <entry name="dbase_numrecords" url="function.dbase-numrecords.php"/> <entry name="dbase_open" url="function.dbase-open.php"/> <entry name="dbase_pack" url="function.dbase-pack.php"/> -<entry name="dbase_replace_record" url="function.dbase-tqreplace-record.php"/> +<entry name="dbase_replace_record" url="function.dbase-replace-record.php"/> <entry name="dbplus_add" url="function.dbplus-add.php"/> <entry name="dbplus_aql" url="function.dbplus-aql.php"/> <entry name="dbplus_chdir" url="function.dbplus-chdir.php"/> @@ -2419,7 +2419,7 @@ <entry name="dbplus_curr" url="function.dbplus-curr.php"/> <entry name="dbplus_errcode" url="function.dbplus-errcode.php"/> <entry name="dbplus_errno" url="function.dbplus-errno.php"/> -<entry name="dbplus_tqfind" url="function.dbplus-find.php"/> +<entry name="dbplus_find" url="function.dbplus-find.php"/> <entry name="dbplus_first" url="function.dbplus-first.php"/> <entry name="dbplus_flush" url="function.dbplus-flush.php"/> <entry name="dbplus_freealllocks" url="function.dbplus-freealllocks.php"/> @@ -3581,7 +3581,7 @@ <entry name="mb_encode_mimeheader" url="function.mb-encode-mimeheader.php"/> <entry name="mb_encode_numericentity" url="function.mb-encode-numericentity.php"/> <entry name="mb_ereg_match" url="function.mb-ereg-match.php"/> -<entry name="mb_ereg_tqreplace" url="function.mb-ereg-tqreplace.php"/> +<entry name="mb_ereg_replace" url="function.mb-ereg-replace.php"/> <entry name="mb_ereg_search_getpos" url="function.mb-ereg-search-getpos.php"/> <entry name="mb_ereg_search_getregs" url="function.mb-ereg-search-getregs.php"/> <entry name="mb_ereg_search_init" url="function.mb-ereg-search-init.php"/> @@ -3590,7 +3590,7 @@ <entry name="mb_ereg_search_setpos" url="function.mb-ereg-search-setpos.php"/> <entry name="mb_ereg_search" url="function.mb-ereg-search.php"/> <entry name="mb_ereg" url="function.mb-ereg.php"/> -<entry name="mb_eregi_tqreplace" url="function.mb-eregi-tqreplace.php"/> +<entry name="mb_eregi_replace" url="function.mb-eregi-replace.php"/> <entry name="mb_eregi" url="function.mb-eregi.php"/> <entry name="mb_get_info" url="function.mb-get-info.php"/> <entry name="mb_http_input" url="function.mb-http-input.php"/> @@ -5672,7 +5672,7 @@ <entry name="hw_api->dstofsrcanchor" url="function.hwapi-dstofsrcanchor.php"/> <entry name="hw_api_error->count" url="function.hwapi-error-count.php"/> <entry name="hw_api_error->reason" url="function.hwapi-error-reason.php"/> -<entry name="hw_api->tqfind" url="function.hwapi-find.php"/> +<entry name="hw_api->find" url="function.hwapi-find.php"/> <entry name="hw_api->ftstat" url="function.hwapi-ftstat.php"/> <entry name="hwapi_hgcsp" url="function.hwapi-hgcsp.php"/> <entry name="hw_api->hwstat" url="function.hwapi-hwstat.php"/> @@ -5700,7 +5700,7 @@ <entry name="hw_api_reason->description" url="function.hwapi-reason-description.php"/> <entry name="hw_api_reason->type" url="function.hwapi-reason-type.php"/> <entry name="hw_api->remove" url="function.hwapi-remove.php"/> -<entry name="hw_api->tqreplace" url="function.hwapi-tqreplace.php"/> +<entry name="hw_api->replace" url="function.hwapi-replace.php"/> <entry name="hw_api->setcommittedversion" url="function.hwapi-setcommittedversion.php"/> <entry name="hw_api->srcanchors" url="function.hwapi-srcanchors.php"/> <entry name="hw_api->srcsofdst" url="function.hwapi-srcsofdst.php"/> @@ -5929,7 +5929,7 @@ <entry name="ldap_list" url="function.ldap-list.php"/> <entry name="ldap_mod_add" url="function.ldap-mod-add.php"/> <entry name="ldap_mod_del" url="function.ldap-mod-del.php"/> -<entry name="ldap_mod_tqreplace" url="function.ldap-mod-tqreplace.php"/> +<entry name="ldap_mod_replace" url="function.ldap-mod-replace.php"/> <entry name="ldap_modify" url="function.ldap-modify.php"/> <entry name="ldap_next_attribute" url="function.ldap-next-attribute.php"/> <entry name="ldap_next_entry" url="function.ldap-next-entry.php"/> @@ -5951,7 +5951,7 @@ <entry name="notes_create_db" url="function.notes-create-db.php"/> <entry name="notes_create_note" url="function.notes-create-note.php"/> <entry name="notes_drop_db" url="function.notes-drop-db.php"/> -<entry name="notes_find_note" url="function.notes-tqfind-note.php"/> +<entry name="notes_find_note" url="function.notes-find-note.php"/> <entry name="notes_header_info" url="function.notes-header-info.php"/> <entry name="notes_list_msgs" url="function.notes-list-msgs.php"/> <entry name="notes_mark_read" url="function.notes-mark-read.php"/> @@ -5975,7 +5975,7 @@ <entry name="Memcache::getVersion" url="function.memcache-getversion.php"/> <entry name="Memcache::increment" url="function.memcache-increment.php"/> <entry name="Memcache::pconnect" url="function.memcache-pconnect.php"/> -<entry name="Memcache::tqreplace" url="function.memcache-tqreplace.php"/> +<entry name="Memcache::replace" url="function.memcache-replace.php"/> <entry name="Memcache::set" url="function.memcache-set.php"/> <entry name="Memcache::setCompressThreshold" url="function.memcache-setcompressthreshold.php"/> <entry name="Memcache::setServerParams" url="function.memcache-setserverparams.php"/> @@ -5992,7 +5992,7 @@ <entry name="udm_crc32" url="function.udm-crc32.php"/> <entry name="udm_errno" url="function.udm-errno.php"/> <entry name="udm_error" url="function.udm-error.php"/> -<entry name="udm_tqfind" url="function.udm-find.php"/> +<entry name="udm_find" url="function.udm-find.php"/> <entry name="udm_free_agent" url="function.udm-free-agent.php"/> <entry name="udm_free_ispell_data" url="function.udm-free-ispell-data.php"/> <entry name="udm_free_res" url="function.udm-free-res.php"/> @@ -6250,7 +6250,7 @@ <entry name="msession_create" url="function.msession-create.php"/> <entry name="msession_destroy" url="function.msession-destroy.php"/> <entry name="msession_disconnect" url="function.msession-disconnect.php"/> -<entry name="msession_tqfind" url="function.msession-find.php"/> +<entry name="msession_find" url="function.msession-find.php"/> <entry name="msession_get_array" url="function.msession-get-array.php"/> <entry name="msession_get_data" url="function.msession-get-data.php"/> <entry name="msession_get" url="function.msession-get.php"/> @@ -6304,12 +6304,12 @@ <entry name="preg_match_all" url="function.preg-match-all.php"/> <entry name="preg_match" url="function.preg-match.php"/> <entry name="preg_quote" url="function.preg-quote.php"/> -<entry name="preg_replace_callback" url="function.preg-tqreplace-callback.php"/> -<entry name="preg_tqreplace" url="function.preg-tqreplace.php"/> +<entry name="preg_replace_callback" url="function.preg-replace-callback.php"/> +<entry name="preg_replace" url="function.preg-replace.php"/> <entry name="preg_split" url="function.preg-split.php"/> -<entry name="ereg_tqreplace" url="function.ereg-tqreplace.php"/> +<entry name="ereg_replace" url="function.ereg-replace.php"/> <entry name="ereg" url="function.ereg.php"/> -<entry name="eregi_tqreplace" url="function.eregi-tqreplace.php"/> +<entry name="eregi_replace" url="function.eregi-replace.php"/> <entry name="eregi" url="function.eregi.php"/> <entry name="split" url="function.split.php"/> <entry name="spliti" url="function.spliti.php"/> @@ -6364,10 +6364,10 @@ <entry name="sprintf" url="function.sprintf.php"/> <entry name="sscanf" url="function.sscanf.php"/> <entry name="str_getcsv" url="function.str-getcsv.php"/> -<entry name="str_itqreplace" url="function.str-itqreplace.php"/> +<entry name="str_ireplace" url="function.str-ireplace.php"/> <entry name="str_pad" url="function.str-pad.php"/> <entry name="str_repeat" url="function.str-repeat.php"/> -<entry name="str_tqreplace" url="function.str-tqreplace.php"/> +<entry name="str_replace" url="function.str-replace.php"/> <entry name="str_rot13" url="function.str-rot13.php"/> <entry name="str_shuffle" url="function.str-shuffle.php"/> <entry name="str_split" url="function.str-split.php"/> @@ -6401,7 +6401,7 @@ <entry name="strtr" url="function.strtr.php"/> <entry name="substr_compare" url="function.substr-compare.php"/> <entry name="substr_count" url="function.substr-count.php"/> -<entry name="substr_tqreplace" url="function.substr-tqreplace.php"/> +<entry name="substr_replace" url="function.substr-replace.php"/> <entry name="substr" url="function.substr.php"/> <entry name="trim" url="function.trim.php"/> <entry name="ucfirst" url="function.ucfirst.php"/> @@ -6860,8 +6860,8 @@ <entry name="DomNode->prefix" url="function.domnode-prefix.php"/> <entry name="DomNode->previous_sibling" url="function.domnode-previous-sibling.php"/> <entry name="DomNode->remove_child" url="function.domnode-remove-child.php"/> -<entry name="DomNode->replace_child" url="function.domnode-tqreplace-child.php"/> -<entry name="DomNode->replace_node" url="function.domnode-tqreplace-node.php"/> +<entry name="DomNode->replace_child" url="function.domnode-replace-child.php"/> +<entry name="DomNode->replace_node" url="function.domnode-replace-node.php"/> <entry name="DomNode->set_content" url="function.domnode-set-content.php"/> <entry name="DomNode->set_name" url="function.domnode-set-name.php"/> <entry name="DomNode->set_namespace" url="function.domnode-set-namespace.php"/> diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index 8f0a9298..c8af6b94 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -146,9 +146,9 @@ void PHPCodeCompletion::cursorPositionChanged(){ } if (m_config->getCodeHinting()) { - int pos1 = lineStr.tqfindRev("(", col - 1); - int pos2 = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1); - int pos3 = lineStr.tqfindRev(")", col); + int pos1 = lineStr.findRev("(", col - 1); + int pos2 = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), pos1 - 1); + int pos3 = lineStr.findRev(")", col); if (pos1 > pos2 && pos1 != -1 && pos3 < pos1) { TQString line = lineStr.mid(pos2 + 1, pos1 - pos2 - 1).stripWhiteSpace(); @@ -163,7 +163,7 @@ void PHPCodeCompletion::cursorPositionChanged(){ return; } - int pos = lineStr.tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); + int pos = lineStr.findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); TQString line = lineStr.mid(pos + 1, col - pos).stripWhiteSpace(); if (checkForVariable(line, col)) { @@ -180,7 +180,7 @@ kdDebug(9018) << "end checkForGlobalFunction" << endl; return; } - pos = lineStr.stripWhiteSpace().tqfindRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); + pos = lineStr.stripWhiteSpace().findRev(TQRegExp("[ \\t=;\\$\\.\\(\\)]"), col - 1); line = lineStr.mid(pos + 1, col - pos); if (checkForNew(line, col)) { @@ -214,7 +214,7 @@ bool PHPCodeCompletion::checkForStaticFunction(TQString line, int col) { kdDebug(9018) << "checkForStaticFunction" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.tqfind("::") == -1) + if (line.find("::") == -1) return false; TQRegExp Class("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); @@ -267,7 +267,7 @@ bool PHPCodeCompletion::checkForNew(TQString line, int col){ kdDebug(9018) << "checkForNew" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.tqfind("new ", 0, FALSE) == -1) + if (line.find("new ", 0, FALSE) == -1) return false; TQRegExp New("[& \t]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); @@ -297,7 +297,7 @@ bool PHPCodeCompletion::checkForExtends(TQString line, int col){ kdDebug(9018) << "checkForExtends" << endl; TQValueList<KTextEditor::CompletionEntry> list; - if (line.tqfind("extends", 0, FALSE) == -1) + if (line.find("extends", 0, FALSE) == -1) return false; TQRegExp extends("[ \t]*extends[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|)"); @@ -316,12 +316,12 @@ bool PHPCodeCompletion::checkForVariable(TQString line, int col){ TQValueList<KTextEditor::CompletionEntry> list; TQString args; - if (line.tqfind("->") == -1) { + if (line.find("->") == -1) { return false; } if (line.left(2) != "->") { - int pos = line.tqfindRev("->"); + int pos = line.findRev("->"); args = line.mid(pos + 2, line.length() - pos); line = line.mid(0, pos); } @@ -365,7 +365,7 @@ TQValueList<KTextEditor::CompletionEntry> PHPCodeCompletion::getClasses(TQString if (name == NULL || name.isEmpty() || nClass->name().tqstartsWith(name, FALSE)) { KTextEditor::CompletionEntry e; - TQStringList::Iterator it = added.tqfind(nClass->name()); + TQStringList::Iterator it = added.find(nClass->name()); if (it == added.end()) { e.text = nClass->name(); list.append(e); @@ -532,7 +532,7 @@ TQString PHPCodeCompletion::getCurrentClassName() { TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { kdDebug(9018) << "getClassName " << varName << "::" << classname << endl; - if (varName.tqfind("$") == 0) + if (varName.find("$") == 0) varName = varName.mid(1); if (varName.lower() == "this") @@ -577,7 +577,7 @@ TQString PHPCodeCompletion::getClassName(TQString varName, TQString classname) { for(int i = m_currentLine; i >= 0; i--){ TQString line = m_editInterface->textLine(i); - if (!line.isNull() && line.tqfind(varName,0 , FALSE) != -1) { + if (!line.isNull() && line.find(varName,0 , FALSE) != -1) { if (createmember.search(line) != -1) { TQString right = createmember.cap(1).stripWhiteSpace(); @@ -640,7 +640,7 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { if (m_argWidgetShow == true) return false; - if (line.tqfind("::") != -1) { + if (line.find("::") != -1) { TQRegExp Static("([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)::([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); Static.setCaseSensitive(FALSE); @@ -658,8 +658,8 @@ bool PHPCodeCompletion::checkForArgHint(TQString line, int col) { } } - if (line.tqfindRev("->") != -1) { - int pos1 = line.tqfindRev("->"); + if (line.findRev("->") != -1) { + int pos1 = line.findRev("->"); TQString classname; TQString function = line.mid(pos1 + 2); diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index 241adb44..c21f9fdc 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -166,7 +166,7 @@ void PHPErrorView::filterList(KListView* listview, const TQString& level) { TQListViewItemIterator it( listview ); while ( it.current() ) { - if ( it.current()->text(3).tqcontains(m_filterEdit->text(),false)) + if ( it.current()->text(3).contains(m_filterEdit->text(),false)) new KListViewItem(m_filteredList,level, it.current()->text(0),it.current()->text(1),it.current()->text(2),it.current()->text(3)); ++it; @@ -308,7 +308,7 @@ void PHPErrorView::reportProblem( int level, const TQString& fileName, int line, } TQString msg = text; - msg = msg.tqreplace( TQRegExp("\n"), "" ); + msg = msg.replace( TQRegExp("\n"), "" ); TQString relFileName = fileName; relFileName.remove(m_phpSupport->project()->projectDirectory()); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 6e258569..3e3fbd68 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -138,7 +138,7 @@ void PHPFile::Analyse() { } bool PHPFile::ParseClass(TQString line, int lineNo) { - if (line.tqfind("class ", 0, FALSE) == -1) + if (line.find("class ", 0, FALSE) == -1) return FALSE; TQRegExp Class("^[ \t]*(abstract|final|)[ \t]*class[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*(extends[ \t]*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))?.*$"); @@ -159,7 +159,7 @@ bool PHPFile::ParseClass(TQString line, int lineNo) { } bool PHPFile::ParseFunction(TQString line, int lineNo) { - if (line.tqfind("function", 0, FALSE) == -1) + if (line.find("function", 0, FALSE) == -1) return FALSE; TQRegExp function("^[ \t]*(final|abstract|static|)[ \t]*(public|private|protected|)[ \t]*(static|)[ \t]*function[ \t&]*([_a-zA-Z\x7f-\xff][_a-zA-Z0-9\x7f-\xff]*)[ \t]*\\(([_a-zA-Z\x7f-\xff]*[_$, &'\\\"0-9A-Za-z\x7f-\xff\t-=]*)\\).*$"); @@ -198,7 +198,7 @@ bool PHPFile::ParseFunction(TQString line, int lineNo) { } bool PHPFile::ParseVariable(TQString line, int lineNo) { - if (line.tqfind("var") == -1 && line.tqfind("public") == -1 && line.tqfind("private") == -1 && line.tqfind("protected") == -1) + if (line.find("var") == -1 && line.find("public") == -1 && line.find("private") == -1 && line.find("protected") == -1) return FALSE; TQRegExp variable("^[ \t]*(var|public|private|protected|static)[ \t]*\\$([a-zA-Z_\x7f-\xff][0-9A-Za-z_\x7f-\xff]*)[ \t;=].*$"); @@ -227,7 +227,7 @@ bool PHPFile::ParseVariable(TQString line, int lineNo) { } bool PHPFile::ParseThisMember(TQString line, int lineNo) { - if (line.tqfind("$this->", 0, FALSE) == -1) + if (line.find("$this->", 0, FALSE) == -1) return FALSE; TQRegExp createthis; @@ -240,7 +240,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { return TRUE; } - if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) { + if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { createthis.setPattern("\\$(this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createthis.search(line) != -1) { if (AddVariable(createthis.cap(1), "boolean", lineNo, TRUE) == FALSE) @@ -249,7 +249,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { } } - if (line.tqfind("new", 0, FALSE) != -1) { + if (line.find("new", 0, FALSE) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createthis.search(line) != -1) { if (AddVariable(createthis.cap(1), createthis.cap(2), lineNo, TRUE) == FALSE) @@ -258,7 +258,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { } } - if (line.tqfind("array", 0, FALSE) != -1) { + if (line.find("array", 0, FALSE) != -1) { createthis.setPattern("\\$this->([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createthis.search(line) != -1) { if (AddVariable(createthis.cap(1), "array", lineNo, TRUE) == FALSE) @@ -271,7 +271,7 @@ bool PHPFile::ParseThisMember(TQString line, int lineNo) { } bool PHPFile::ParseMember(TQString line, int lineNo) { - if (line.tqfind("$", 0, FALSE) == -1) + if (line.find("$", 0, FALSE) == -1) return FALSE; /// @todo Ajouter plus de test .... @@ -293,7 +293,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { return TRUE; } - if (line.tqfind("true", 0, FALSE) != -1 || line.tqfind("false", 0, FALSE) != -1) { + if (line.find("true", 0, FALSE) != -1 || line.find("false", 0, FALSE) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t]*(true|false)[ \t]*;"); if (createmember.search(line) != -1) { if (AddVariable(createmember.cap(1), "boolean", lineNo) == FALSE) @@ -302,7 +302,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { } } - if (line.tqfind("new", 0, FALSE) != -1) { + if (line.find("new", 0, FALSE) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*new[ \t]+([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)"); if (createmember.search(line) != -1) { if (AddVariable(createmember.cap(1), createmember.cap(2), lineNo) == FALSE) @@ -311,7 +311,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { } } - if (line.tqfind("array", 0, FALSE) != -1) { + if (line.find("array", 0, FALSE) != -1) { createmember.setPattern("\\$([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[ \t]*=[ \t&]*(new|)[ \t&]*(array)[ \t]*[\\(;]+"); if (createmember.search(line) != -1) { if (AddVariable(createmember.cap(1), "array", lineNo) == FALSE) @@ -326,7 +326,7 @@ bool PHPFile::ParseMember(TQString line, int lineNo) { bool PHPFile::ParseReturn(TQString line, int lineNo) { TQString rettype; - if (line.tqfind("return", 0, FALSE) == -1) + if (line.find("return", 0, FALSE) == -1) return FALSE; TQRegExp typeex; @@ -337,7 +337,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { TQString varname = typeex.cap(2).ascii(); rettype = varname; - if (varname.tqfind("$") == 0) { + if (varname.find("$") == 0) { /// @todo search in variable /* varname = varname.mid(1); @@ -357,7 +357,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { rettype = "null"; } - if (rettype.tqfind("$") == 0) + if (rettype.find("$") == 0) kdDebug(9018) << "ParseReturn value" << " " << rettype.latin1() << endl; } @@ -366,7 +366,7 @@ bool PHPFile::ParseReturn(TQString line, int lineNo) { } bool PHPFile::ParseTodo(TQString line, int lineNo) { - if (line.tqfind("todo", 0, FALSE) == -1) + if (line.find("todo", 0, FALSE) == -1) return FALSE; TQRegExp todo("/[/]+[ \t]*[@]*todo([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); @@ -381,7 +381,7 @@ bool PHPFile::ParseTodo(TQString line, int lineNo) { } bool PHPFile::ParseFixme(TQString line, int lineNo) { - if (line.tqfind("fixme", 0, FALSE) == -1) + if (line.find("fixme", 0, FALSE) == -1) return FALSE; TQRegExp fixme("/[/]+[ \t]*[@]*fixme([ \t]*:[ \t]*|[ \t]*)[ \t]*(.*)$"); @@ -411,7 +411,7 @@ void PHPFile::ParseSource() { line = (*it).local8Bit(); if (!line.isNull()) { - if (line.tqfind("include", 0, FALSE) != -1 || line.tqfind("require", 0, FALSE) != -1) { + if (line.find("include", 0, FALSE) != -1 || line.find("require", 0, FALSE) != -1) { if (includere.search(line) != -1) { TQStringList include_path; include_path = include_path.split(":", m_part->getIncludePath()); @@ -432,16 +432,16 @@ void PHPFile::ParseSource() { if ( inMethod == TRUE ) { - bracketFuncOpen += line.tqcontains("{"); - bracketFuncClose += line.tqcontains("}"); + bracketFuncOpen += line.contains("{"); + bracketFuncClose += line.contains("}"); if (bracketFuncOpen == bracketFuncClose && bracketFuncOpen != 0 && bracketFuncClose != 0) { CloseFunction( lineNo ); } } if ( inMethod == FALSE ) { - bracketOpen += line.tqcontains("{"); - bracketClose += line.tqcontains("}"); + bracketOpen += line.contains("{"); + bracketClose += line.contains("}"); if (bracketOpen == bracketClose && bracketOpen != 0 && bracketClose != 0 && inClass == TRUE) { CloseClass( lineNo ); } @@ -449,8 +449,8 @@ void PHPFile::ParseSource() { if ( inClass == FALSE ) { if (ParseClass(line, lineNo) == TRUE) { - bracketOpen = line.tqcontains("{"); - bracketClose = line.tqcontains("}"); + bracketOpen = line.contains("{"); + bracketClose = line.contains("}"); } } @@ -459,8 +459,8 @@ void PHPFile::ParseSource() { } if (ParseFunction(line, lineNo) == TRUE) { - bracketFuncOpen = line.tqcontains("{"); - bracketFuncClose = line.tqcontains("}"); + bracketFuncOpen = line.contains("{"); + bracketFuncClose = line.contains("}"); } if ( inMethod == TRUE ) diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 9227e8ff..2b014cfc 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -104,14 +104,14 @@ void PHPNewClassDlg::accept(){ // generate the sourcecode for the class if(m_baseClassEdit->text().isEmpty()){ - text = text.tqreplace(TQRegExp("extends BASECLASS"),""); - text = text.tqreplace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),""); + text = text.replace(TQRegExp("extends BASECLASS"),""); + text = text.replace(TQRegExp("BASECLASS\\:\\:BASECLASS\\(\\);"),""); }else{ - text = text.tqreplace(TQRegExp("BASECLASS"),m_baseClassEdit->text()); + text = text.replace(TQRegExp("BASECLASS"),m_baseClassEdit->text()); } - text = text.tqreplace(TQRegExp("CLASSNAME"),m_classNameEdit->text()); - text = text.tqreplace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper()); - text = text.tqreplace(TQRegExp("AUTHOR"),"not implemented"); + text = text.replace(TQRegExp("CLASSNAME"),m_classNameEdit->text()); + text = text.replace(TQRegExp("FILENAME"),m_fileNameEdit->text().upper()); + text = text.replace(TQRegExp("AUTHOR"),"not implemented"); file.setName(absFileName); if(file.open(IO_WriteOnly)){ diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index a4b5185e..a0f1179e 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -50,7 +50,7 @@ bool PHPParser::hasFile( const TQString& fileName ) { // kdDebug(9018) << "hasFile " << fileName.latin1() << endl; TQString abso = URLUtil::canonicalPath(fileName); - TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso); + TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso); if ( it == m_files.end() ) return false; @@ -67,7 +67,7 @@ void PHPParser::addFile( const TQString& fileName ) kdDebug(9018) << "addFile " << fileName.latin1() << endl; TQFileInfo fi( abso ); - if ((fi.extension().tqcontains("inc") || fi.extension().tqcontains("php") || fi.extension().tqcontains("html") || fi.extension().tqcontains("php3") || !fi.extension()) && !fi.extension().tqcontains("~")) { + if ((fi.extension().contains("inc") || fi.extension().contains("php") || fi.extension().contains("html") || fi.extension().contains("php3") || !fi.extension()) && !fi.extension().contains("~")) { m_files.insert(abso, new PHPFile(m_part, abso)); } } @@ -76,7 +76,7 @@ void PHPParser::removeFile( const TQString& fileName ) { // kdDebug(9018) << "removeFile " << fileName.latin1() << endl; TQString abso = URLUtil::canonicalPath(fileName); - TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso); + TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso); if ( it != m_files.end()) { PHPFile *file = it.data(); @@ -104,7 +104,7 @@ void PHPParser::reparseFile( const TQString& fileName ) { kdDebug(9018) << "reparseFile" << endl; TQString abso = URLUtil::canonicalPath(fileName); - TQMap<TQString, PHPFile *>::Iterator it = m_files.tqfind(abso); + TQMap<TQString, PHPFile *>::Iterator it = m_files.find(abso); if ( it != m_files.end()) { PHPFile *file = it.data(); diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 3dbf4211..4d20a30b 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -354,7 +354,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, TQString buf = buffer; if (configData->getInvocationMode() == PHPConfigData::Shell) - buf.tqreplace("\n", "<br>"); + buf.replace("\n", "<br>"); m_htmlView->write(buf); } @@ -364,7 +364,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, TQString buf = buffer; if (configData->getInvocationMode() == PHPConfigData::Shell) - buf.tqreplace("\n", "<br>"); + buf.replace("\n", "<br>"); m_htmlView->write(buf); } diff --git a/languages/python/kde_pydoc.py b/languages/python/kde_pydoc.py index eb7c6b44..0516f172 100755 --- a/languages/python/kde_pydoc.py +++ b/languages/python/kde_pydoc.py @@ -7,7 +7,7 @@ __version__ = "6 April 2006" import sys, imp, os, stat, re, types, cgi from repr import Repr -from string import expandtabs, tqfind, join, lower, split, strip, rstrip +from string import expandtabs, find, join, lower, split, strip, rstrip import pydoc @@ -16,19 +16,19 @@ import pydoc def cleanlinks(string): """Changes the links to work with the pydoc:-notation""" finalstring = "" - string = str(string).tqreplace(".html","") + string = str(string).replace(".html","") pos = 0 mark = "<a href=\"" l = len(mark) while(pos != -1): opos = pos - pos = string.tqfind(mark, pos) + pos = string.find(mark, pos) if(pos == -1): finalstring += string[opos:] break finalstring += string[opos:pos+l] pos+=l - if(string[pos] == '#' or string.tqfind(":/",pos, pos+10) != -1): #leave local jumps or external references untouched + if(string[pos] == '#' or string.find(":/",pos, pos+10) != -1): #leave local jumps or external references untouched continue finalstring += "pydoc:" if(string[pos] == "." and string[pos+1] == "\""): diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp index 9e979f13..9d9b542a 100644 --- a/languages/python/pythonimplementationwidget.cpp +++ b/languages/python/pythonimplementationwidget.cpp @@ -51,9 +51,9 @@ TQStringList PythonImplementationWidget::createClassFiles() TQString template_py = "from qt import *\nfrom $BASEFILENAME$ import *\nclass $CLASSNAME$($BASECLASSNAME$):\n\n def __init__(self,tqparent,name):\n $BASECLASSNAME$.__init__(self,tqparent,name)\n \n\n\n"; TQFileInfo formInfo(m_formName); - template_py.tqreplace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py"); - template_py.tqreplace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); - template_py.tqreplace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); + template_py.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".py"); + template_py.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); + template_py.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); template_py = FileTemplate::read(m_part, "py") + template_py; diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index a9efa3e6..c8aebb6a 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -210,7 +210,7 @@ void PythonSupportPart::savedFile(const KURL &fileName) { kdDebug(9014) << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName.path()); emit addedSourceInfo( fileName.path() ); } diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp index 0eb67147..267da965 100644 --- a/languages/python/qtdesignerpythonintegration.cpp +++ b/languages/python/qtdesignerpythonintegration.cpp @@ -78,7 +78,7 @@ void QtDesignerPythonIntegration::addFunctionToClass(KInterfaceDesigner::Functio } TQString func = function.function; - func.tqreplace("()", ""); + func.replace("()", ""); TQString str = " def " + func + "(self):\n\n"; kdDebug(9014) << "insert " << str << " into " << point.first << endl; diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 5458ae8b..b659dbfb 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -10,7 +10,7 @@ int main(int argc, char **argv) { TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { - qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n"); + qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } TQFileInfo program(appdir); diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 5458ae8b..b659dbfb 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -10,7 +10,7 @@ int main(int argc, char **argv) { TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { - qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n"); + qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } TQFileInfo program(appdir); diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 5458ae8b..b659dbfb 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -10,7 +10,7 @@ int main(int argc, char **argv) { TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { - qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n"); + qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } TQFileInfo program(appdir); diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 336a48b6..1389e0f6 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -149,14 +149,14 @@ void Dbg_PS_Dialog::slotProcessExited() pidLines_ += '\n'; - int start = pidLines_.tqfind('\n', 0); // Skip the first line (header line) + int start = pidLines_.find('\n', 0); // Skip the first line (header line) int pos; if (start != -1) heading_->setText(pidLines_.left(start)); - while ( (pos = pidLines_.tqfind('\n', start)) != -1) { + while ( (pos = pidLines_.find('\n', start)) != -1) { TQString item = pidLines_.mid(start, pos-start); if (!item.isEmpty()) { - if (item.tqfind(pidCmd_) == -1) + if (item.find(pidCmd_) == -1) pids_->insertItem(item); } diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index a11d1c02..75264b60 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -228,7 +228,7 @@ DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pi void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) return; switch (e->button()) { diff --git a/languages/ruby/debugger/debuggee.rb b/languages/ruby/debugger/debuggee.rb index 51df5867..38e2dea7 100644 --- a/languages/ruby/debugger/debuggee.rb +++ b/languages/ruby/debugger/debuggee.rb @@ -441,7 +441,7 @@ class Context stdout.printf "Set watchpoint %d\n", break_points.size, exp when /^\s*b(?:reak)?$/ - if break_points.tqfind{|b| b[1] == 0} + if break_points.find{|b| b[1] == 0} n = 1 stdout.print "Breakpoints:\n" for b in break_points @@ -451,7 +451,7 @@ class Context n += 1 end end - if break_points.tqfind{|b| b[1] == 1} + if break_points.find{|b| b[1] == 1} n = 1 stdout.print "\n" stdout.print "Watchpoints:\n" @@ -827,7 +827,7 @@ EOHELP exit end - if @catch and ($!.class.ancestors.tqfind { |e| e.to_s == @catch }) + if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch }) stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class fs = @frames.size tb = caller(0)[-fs..-1] diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index b448cbb4..200f97f4 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -311,7 +311,7 @@ void RDBBreakpointWidget::slotRefreshBP(const KURL &filename) /***************************************************************************/ -BreakpointTableRow* RDBBreakpointWidget::tqfind(Breakpoint *breakpoint) +BreakpointTableRow* RDBBreakpointWidget::find(Breakpoint *breakpoint) { // NOTE:- The match doesn't have to be equal. Each type of bp // must decide on the match criteria. @@ -398,7 +398,7 @@ void RDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); if (btr) { delete fpBP; @@ -414,7 +414,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) { @@ -429,7 +429,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, void RDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); - BreakpointTableRow* btr = tqfind(watchpoint); + BreakpointTableRow* btr = find(watchpoint); if (btr) { removeBreakpoint(btr); @@ -792,7 +792,7 @@ void RDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineN { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) @@ -889,7 +889,7 @@ void RDBBreakpointWidget::restorePartialProjectSession(const TQDomElement* el) bp->setEnabled(breakpointEl.attribute( "enabled", "1").toInt()); // Add the bp if we don't already have it. - if (!tqfind(bp)) + if (!find(bp)) addBreakpoint(bp); else delete bp; diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h index 58275842..ad1e0605 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.h +++ b/languages/ruby/debugger/rdbbreakpointwidget.h @@ -94,7 +94,7 @@ signals: void clearAllBreakpoints(); private: - BreakpointTableRow* tqfind(Breakpoint *bp); + BreakpointTableRow* find(Breakpoint *bp); BreakpointTableRow* findId(int id); BreakpointTableRow* findKey(int BPKey); diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp index dc7e0226..d0e8e31b 100644 --- a/languages/ruby/debugger/rdbparser.cpp +++ b/languages/ruby/debugger/rdbparser.cpp @@ -64,7 +64,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf) while (pos != -1) { varName = var_re.cap(1); if (ref_re.search(var_re.cap(2)) != -1) { - if (var_re.cap(2).tqcontains("=") > 0) { + if (var_re.cap(2).contains("=") > 0) { value = (ref_re.cap(1) + ">").latin1(); } else { // There are no 'name=value' pairs, as in #<TQt::Color:0x0 #ff0000> @@ -128,7 +128,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) varName = ppvalue_re.cap(1); if (ppref_re.search(ppvalue_re.cap(2)) != -1) { - if (ppvalue_re.cap(2).tqcontains("=") > 0) { + if (ppvalue_re.cap(2).contains("=") > 0) { value = (ppref_re.cap(1) + ">").latin1(); } else { // There are no 'name=value' pairs, as in #<TQt::Color:0x0 #ff0000> diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 7381ae2a..f28b32b9 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -104,7 +104,7 @@ static int chownpty(int fd, int grant) // { // signal from other child, behave like catchChild. // // guess this gives quite some control chaos... - // Shell* sh = shells.tqfind(rc); + // Shell* sh = shells.find(rc); // if (sh) { shells.remove(rc); sh->doneShell(w); } // goto retry; // } diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index fc562baa..42a14322 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -609,13 +609,13 @@ TQString VarItem::fullName() const } // Change 'self.@foobar' to '@foobar' - vPath.tqreplace(TQRegExp("^self\\.@"), "@"); + vPath.replace(TQRegExp("^self\\.@"), "@"); // Use instance_variable_get() to access any '@var's in the middle of a path TQRegExp re_instance_var("\\.(@[^\\[.]+)"); int pos = re_instance_var.search(vPath); while (pos != -1) { - vPath.tqreplace( pos, + vPath.replace( pos, re_instance_var.matchedLength(), TQString(".instance_variable_get(:") + re_instance_var.cap(1) + ")" ); pos = re_instance_var.search(vPath, pos); @@ -816,7 +816,7 @@ void VarFrameRoot::setActivationId() bool VarFrameRoot::needsVariables() const { - return ( text(VAR_NAME_COLUMN).tqcontains("try_initialize") == 0 + return ( text(VAR_NAME_COLUMN).contains("try_initialize") == 0 && isOpen() && !isWaitingForData() && needsVariables_ ); diff --git a/languages/ruby/doc/ruby.toc b/languages/ruby/doc/ruby.toc index e732ae4d..bce60158 100644 --- a/languages/ruby/doc/ruby.toc +++ b/languages/ruby/doc/ruby.toc @@ -448,8 +448,8 @@ <entry name="fileno (IO)" url="html/ref_c_io.html#IO.fileno"/> <entry name="FileTest" url="html/ref_m_filetest.html"/> <entry name="fill (Array)" url="html/ref_c_array.html#Array.fill"/> -<entry name="tqfind" url="html/lib_standard.html#Find.tqfind"/> -<entry name="tqfind (Enumerable)" url="html/ref_m_enumerable.html#Enumerable.tqfind"/> +<entry name="find" url="html/lib_standard.html#Find.find"/> +<entry name="find (Enumerable)" url="html/ref_m_enumerable.html#Enumerable.find"/> <entry name="find_all (Enumerable)" url="html/ref_m_enumerable.html#Enumerable.find_all"/> <entry name="find_library (mkmf)" url="html/lib_standard.html#mkmf.find_library"/> <entry name="finish (Net::POP)" url="html/lib_network.html#Net::POP.finish"/> @@ -970,9 +970,9 @@ <entry name="rename (File)" url="html/ref_c_file.html#File.rename"/> <entry name="reopen (IO)" url="html/ref_c_io.html#IO.reopen"/> <entry name="Repetition (stdtypes)" url="html/tut_stdtypes.html#UH"/> -<entry name="tqreplace (Array)" url="html/ref_c_array.html#Array.tqreplace"/> -<entry name="tqreplace (Hash)" url="html/ref_c_hash.html#Hash.tqreplace"/> -<entry name="tqreplace (String)" url="html/ref_c_string.html#String.tqreplace"/> +<entry name="replace (Array)" url="html/ref_c_array.html#Array.replace"/> +<entry name="replace (Hash)" url="html/ref_c_hash.html#Hash.replace"/> +<entry name="replace (String)" url="html/ref_c_string.html#String.replace"/> <entry name="require (Kernel)" url="html/ref_m_kernel.html#Kernel.require"/> <entry name="REQUIRED_ARGUMENT (GetoptLong)" url="html/lib_standard.html#GetoptLong.REQUIRED_ARGUMENT"/> <entry name="Requirements for a Hash Key (language)" url="html/language.html#UH"/> diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 3ddaec11..0b54fe2f 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -44,9 +44,9 @@ TQStringList RubyImplementationWidget::createClassFiles() TQString template_rb = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; TQFileInfo formInfo(m_formName); - template_rb.tqreplace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb"); - template_rb.tqreplace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); - template_rb.tqreplace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); + template_rb.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb"); + template_rb.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); + template_rb.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); template_rb = FileTemplate::read(m_part, "rb") + template_rb; diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 7c451a05..cc895770 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -205,7 +205,7 @@ void RubySupportPart::savedFile(const KURL &fileName) { kdDebug() << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName.path()); emit addedSourceInfo( fileName.path() ); } @@ -715,7 +715,7 @@ void RubySupportPart::slotSwitchToController() } else if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb") { - //this is a view, we need to find the directory of this view and try to tqfind + //this is a view, we need to find the directory of this view and try to find //the controller basing on the directory information switchTo = file.dir().dirName(); } diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index eabb1c5a..4e0a7d07 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -49,7 +49,7 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, void SqlListAction::setCurrentConnectionName(const TQString &name) { - int idx = m_part->connections().tqfindIndex( name ); + int idx = m_part->connections().findIndex( name ); if ( idx < 0 ) m_combo->setCurrentItem( 0 ); else diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 9ce617e3..a53f2879 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -84,7 +84,7 @@ void SQLSupportPart::activeConnectionChanged() void SQLSupportPart::clearConfig() { for ( TQStringList::Iterator it = conNames.begin(); it != conNames.end(); ++it ) { - if ( TQSqlDatabase::tqcontains( *it ) ) { + if ( TQSqlDatabase::contains( *it ) ) { TQSqlDatabase::database( *it, false )->close(); TQSqlDatabase::removeDatabase( *it ); } else { @@ -261,7 +261,7 @@ void SQLSupportPart::removedFilesFromProject( const TQStringList &fileList ) void SQLSupportPart::savedFile( const KURL &fileName ) { - if ( project() ->allFiles().tqcontains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) { + if ( project() ->allFiles().contains( fileName.path().mid ( project() ->projectDirectory().length() + 1 ) ) ) { // parse( fileName ); // emit updatedSourceInfo(); } diff --git a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp b/lib/antlr/antlr/TokenStreamRewriteEngine.hpp index 6aa948fe..9fab08c2 100644 --- a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp +++ b/lib/antlr/antlr/TokenStreamRewriteEngine.hpp @@ -34,7 +34,7 @@ namespace antlr { * Useful for dumping out the input stream exactly after doing some * augmentation or other manipulations. Tokens are index from 0..n-1 * - * You can insert stuff, tqreplace, and delete chunks. Note that the + * You can insert stuff, replace, and delete chunks. Note that the * operations are done lazily--only if you convert the buffer to a * String. This is very efficient because you are not moving data around * all the time. As the buffer of tokens is converted to strings, the @@ -262,43 +262,43 @@ public: addToSortedRewriteList(programName, new InsertBeforeOp(index,text)); } - void tqreplace(size_t index, const ANTLR_USE_NAMESPACE(std)string& text) + void replace(size_t index, const ANTLR_USE_NAMESPACE(std)string& text) { - tqreplace(DEFAULT_PROGRAM_NAME, index, index, text); + replace(DEFAULT_PROGRAM_NAME, index, index, text); } - void tqreplace( size_t from, size_t to, + void replace( size_t from, size_t to, const ANTLR_USE_NAMESPACE(std)string& text) { - tqreplace(DEFAULT_PROGRAM_NAME, from, to, text); + replace(DEFAULT_PROGRAM_NAME, from, to, text); } - void tqreplace( RefTokenWithIndex indexT, + void replace( RefTokenWithIndex indexT, const ANTLR_USE_NAMESPACE(std)string& text ) { - tqreplace(DEFAULT_PROGRAM_NAME, indexT->getIndex(), indexT->getIndex(), text); + replace(DEFAULT_PROGRAM_NAME, indexT->getIndex(), indexT->getIndex(), text); } - void tqreplace( RefTokenWithIndex from, + void replace( RefTokenWithIndex from, RefTokenWithIndex to, const ANTLR_USE_NAMESPACE(std)string& text ) { - tqreplace(DEFAULT_PROGRAM_NAME, from, to, text); + replace(DEFAULT_PROGRAM_NAME, from, to, text); } - void tqreplace(const ANTLR_USE_NAMESPACE(std)string& programName, + void replace(const ANTLR_USE_NAMESPACE(std)string& programName, size_t from, size_t to, const ANTLR_USE_NAMESPACE(std)string& text ) { addToSortedRewriteList(programName,new ReplaceOp(from, to, text)); } - void tqreplace( const ANTLR_USE_NAMESPACE(std)string& programName, + void replace( const ANTLR_USE_NAMESPACE(std)string& programName, RefTokenWithIndex from, RefTokenWithIndex to, const ANTLR_USE_NAMESPACE(std)string& text ) { - tqreplace(programName, + replace(programName, from->getIndex(), to->getIndex(), text); @@ -323,13 +323,13 @@ public: void remove( const ANTLR_USE_NAMESPACE(std)string& programName, size_t from, size_t to) { - tqreplace(programName,from,to,""); + replace(programName,from,to,""); } void remove( const ANTLR_USE_NAMESPACE(std)string& programName, RefTokenWithIndex from, RefTokenWithIndex to ) { - tqreplace(programName,from,to,""); + replace(programName,from,to,""); } void discard(int ttype) { diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp index 5ece8b2b..d8bff1bc 100644 --- a/lib/catalog/catalog.cpp +++ b/lib/catalog/catalog.cpp @@ -48,7 +48,7 @@ struct _Catalog_Private bool hasIndex( const TQCString& name ) const { - return indexList.tqcontains( name ); + return indexList.contains( name ); } DB* index( const TQCString& name ) @@ -172,7 +172,7 @@ void Catalog::setEnabled( bool isEnabled ) { Q_ASSERT( d->dbp != 0 ); - TQMap<TQCString, DB*>::Iterator it = d->indexList.tqfind( name ); + TQMap<TQCString, DB*>::Iterator it = d->indexList.find( name ); if( it == d->indexList.end() ){ DB* dbp = 0; diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h index 426358f4..23b2efef 100644 --- a/lib/catalog/tag.h +++ b/lib/catalog/tag.h @@ -198,7 +198,7 @@ public: } bool hasSpecializationDeclaration() const { - return data->attributes.tqcontains( "spc" ); + return data->attributes.contains( "spc" ); } void setSpecializationDeclaration( const TQString& str ) { @@ -216,7 +216,7 @@ public: name == "endLine" || name == "endColumn" ) return true; - return data->attributes.tqcontains( name ); + return data->attributes.contains( name ); } TQVariant attribute( const TQCString& name ) const @@ -270,7 +270,7 @@ public: } void addTemplateParam( const TQString& param , const TQString& def = "" ) { - TQMap<TQCString, TQVariant>::iterator it = data->attributes.tqfind( "tpl" ); + TQMap<TQCString, TQVariant>::iterator it = data->attributes.find( "tpl" ); if( it != data->attributes.end() && (*it).type() == TQVariant::StringList ) { }else{ it = data->attributes.insert( "tpl", TQVariant( TQStringList() ) ); diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index 58704df9..ccea98e2 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -854,7 +854,7 @@ public: class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } void setParameterDeclarationClause( AUTO_PTR<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); - // ### tqreplace 'constant' with cvQualify + // ### replace 'constant' with cvQualify AST* constant() { return m_constant.get(); } void setConstant( AST::Node& constant ); diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h index 078c420f..01ff0754 100644 --- a/lib/cppparser/driver.h +++ b/lib/cppparser/driver.h @@ -297,7 +297,7 @@ class Driver { */ TQMap<TQString, Dependence> dependences( const TQString& fileName ) const; /** - * Get all the macros the driver tqcontains + * Get all the macros the driver contains * @return The macros */ const MacroMap& macros() const; @@ -306,7 +306,7 @@ class Driver { * Take all macros from the given map(forgetting own macros) */ void insertMacros( const MacroSet& macros ); /** - * Get the list of problem areas the driver tqcontains + * Get the list of problem areas the driver contains * @param fileName The filename to get problems for * @return The list of problems for @p fileName */ diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index b62cce32..1b98708f 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -82,7 +82,7 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.tqcontains(name) ) + if( scope.contains(name) ) return true; } @@ -96,7 +96,7 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.tqcontains(name) ) + if( scope.contains(name) ) return scope[ name ]; } diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp index 3d4bbe63..e2e211ad 100644 --- a/lib/interfaces/codemodel.cpp +++ b/lib/interfaces/codemodel.cpp @@ -380,12 +380,12 @@ const FileList CodeModel::fileList( ) const bool CodeModel::hasFile( const TQString & name ) const { - return m_files.tqcontains( name ); + return m_files.contains( name ); } FileDom CodeModel::fileByName( const TQString & name ) { - TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name ); + TQMap<TQString, FileDom>::const_iterator it = m_files.find( name ); if( it != m_files.end() ) { return *it; } else { @@ -395,7 +395,7 @@ FileDom CodeModel::fileByName( const TQString & name ) const FileDom CodeModel::fileByName( const TQString & name ) const { - TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name ); + TQMap<TQString, FileDom>::const_iterator it = m_files.find( name ); if( it != m_files.end() ) { return *it; } else { @@ -502,7 +502,7 @@ bool CodeModel::addFile( FileDom file ) if( file->name().isEmpty() ) return false; - if( m_files.tqfind( file->name() ) != m_files.end() ) { + if( m_files.find( file->name() ) != m_files.end() ) { ///the error-channel is set to 9007 because this problem appears with the cpp-support, so it is needed while debugging it kdDebug(9007) << "file " << file->name() << " was added to code-model without removing it before! \n" << kdBacktrace() << endl; removeFile( fileByName( file->name() ) ); @@ -679,17 +679,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) { - return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom(); + return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); } const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const { - return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom(); + return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom(); } bool NamespaceModel::hasNamespace( const TQString & name ) const { - return m_namespaces.tqcontains( name ); + return m_namespaces.contains( name ); } bool NamespaceModel::addNamespace( NamespaceDom ns ) @@ -760,17 +760,17 @@ const ClassList ClassModel::classList( ) const bool ClassModel::hasClass( const TQString & name ) const { - return m_classes.tqcontains( name ); + return m_classes.contains( name ); } ClassList ClassModel::classByName( const TQString & name ) { - return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList(); + return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); } const ClassList ClassModel::classByName( const TQString & name ) const { - return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList(); + return m_classes.contains( name ) ? m_classes[ name ] : ClassList(); } bool ClassModel::addClass( ClassDom klass ) @@ -816,17 +816,17 @@ const FunctionList ClassModel::functionList( ) const bool ClassModel::hasFunction( const TQString & name ) const { - return m_functions.tqcontains( name ); + return m_functions.contains( name ); } FunctionList ClassModel::functionByName( const TQString & name ) { - return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList(); + return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); } const FunctionList ClassModel::functionByName( const TQString & name ) const { - return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList(); + return m_functions.contains( name ) ? m_functions[ name ] : FunctionList(); } bool ClassModel::addFunction( FunctionDom fun ) @@ -872,17 +872,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const bool ClassModel::hasFunctionDefinition( const TQString & name ) const { - return m_functionDefinitions.tqcontains( name ); + return m_functionDefinitions.contains( name ); } FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) { - return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); + return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const { - return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); + return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList(); } bool ClassModel::addFunctionDefinition( FunctionDefinitionDom fun ) @@ -914,17 +914,17 @@ const VariableList ClassModel::variableList( ) const VariableDom ClassModel::variableByName( const TQString & name ) { - return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom(); + return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); } const VariableDom ClassModel::variableByName( const TQString & name ) const { - return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom(); + return m_variables.contains( name ) ? m_variables[ name ] : VariableDom(); } bool ClassModel::hasVariable( const TQString & name ) const { - return m_variables.tqcontains( name ); + return m_variables.contains( name ); } bool ClassModel::addVariable( VariableDom var ) @@ -953,17 +953,17 @@ const EnumList ClassModel::enumList( ) const EnumDom ClassModel::enumByName( const TQString & name ) { - return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom(); + return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); } const EnumDom ClassModel::enumByName( const TQString & name ) const { - return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom(); + return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom(); } bool ClassModel::hasEnum( const TQString & name ) const { - return m_enumerators.tqcontains( name ); + return m_enumerators.contains( name ); } bool ClassModel::addEnum( EnumDom e ) @@ -1028,17 +1028,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const bool ClassModel::hasTypeAlias( const TQString & name ) const { - return m_typeAliases.tqcontains( name ); + return m_typeAliases.contains( name ); } TypeAliasList ClassModel::typeAliasByName( const TQString & name ) { - return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList(); + return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const { - return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList(); + return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList(); } bool ClassModel::addTypeAlias( TypeAliasDom typeAlias ) diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp index 5c9c71e9..afb946bd 100644 --- a/lib/interfaces/codemodel_utils.cpp +++ b/lib/interfaces/codemodel_utils.cpp @@ -296,7 +296,7 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom ) bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) { - if( !def->resultType().tqcontains("::") ) return dec->resultType() == def->resultType(); + if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType(); TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() ); TQStringList l2 = TQStringList::split("::", def->resultType() ); diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h index 14e97656..2879a424 100644 --- a/lib/interfaces/codemodel_utils.h +++ b/lib/interfaces/codemodel_utils.h @@ -462,11 +462,11 @@ class PredAmOwner{ /**@return A list of all functions in the file. @param dom File Dom to look for functions in.*/ FunctionList allFunctions(const FileDom &dom); -/**@return A detailed list of all functions in the file (detailed list tqcontains +/**@return A detailed list of all functions in the file (detailed list contains the information about a scope of each FunctionDom found). @param dom File Dom to look for functions in.*/ AllFunctions allFunctionsDetailed(const FileDom &dom); -/**@return A detailed list of all function definitions in the file (detailed list tqcontains +/**@return A detailed list of all function definitions in the file (detailed list contains the information about a scope of each FunctionDefinitionDom found). @param dom File Dom to look for functions in.*/ AllFunctionDefinitions allFunctionDefinitionsDetailed(const FileDom &dom); diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index 1c334a8d..fe495ea1 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -80,7 +80,7 @@ KDevProject::Options KDevProject::options() const bool KDevProject::isProjectFile( const TQString & absFileName ) { - return d->m_absToRel.tqcontains( absFileName ); + return d->m_absToRel.contains( absFileName ); } TQString KDevProject::relativeProjectFile( const TQString & absFileName ) diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index 5ce6becf..3396adfd 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -92,7 +92,7 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) { if ( !page ) return; - PageMap::Iterator it = _pageMap.tqfind( page ); + PageMap::Iterator it = _pageMap.find( page ); if ( it != _pageMap.end() ) { emit insertConfigWidget( static_cast<KDialogBase*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))), page, it.data() ); @@ -102,4 +102,4 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) #include "configwidgetproxy.moc" -// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4; +// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4; diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index c35c09c9..b91bf3f7 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -127,4 +127,4 @@ private: #endif -// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4; +// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4; diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index f153642f..c3538040 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -73,15 +73,15 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & TQString year = TQString::number(TQDate::tqcurrentDate().year()); TQString str = text; - str.tqreplace(TQRegExp("\\$EMAIL\\$"),email); - str.tqreplace(TQRegExp("\\$AUTHOR\\$"),author); - str.tqreplace(TQRegExp("\\$VERSION\\$"),version); - str.tqreplace(TQRegExp("\\$DATE\\$"),date); - str.tqreplace(TQRegExp("\\$YEAR\\$"),year); - str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname); - str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname); - str.tqreplace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper()); - str.tqreplace(TQRegExp("\\$APPNAMELC\\$"),appname.lower()); + str.replace(TQRegExp("\\$EMAIL\\$"),email); + str.replace(TQRegExp("\\$AUTHOR\\$"),author); + str.replace(TQRegExp("\\$VERSION\\$"),version); + str.replace(TQRegExp("\\$DATE\\$"),date); + str.replace(TQRegExp("\\$YEAR\\$"),year); + str.replace(TQRegExp("\\$APPNAME\\$"),appname); + str.replace(TQRegExp("\\$APPNAME\\$"),appname); + str.replace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper()); + str.replace(TQRegExp("\\$APPNAMELC\\$"),appname.lower()); return str; } @@ -99,8 +99,8 @@ bool FileTemplate::copy(KDevPlugin *part, const TQString &name, TQFileInfo fi(f); TQString module = fi.baseName(); TQString basefilename = fi.baseName(true); - text.tqreplace(TQRegExp("\\$MODULE\\$"),module); - text.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename); + text.replace(TQRegExp("\\$MODULE\\$"),module); + text.replace(TQRegExp("\\$FILENAME\\$"),basefilename); TQTextStream stream(&f); stream << text; diff --git a/lib/util/rurl.cpp b/lib/util/rurl.cpp index 86ca920a..05dac07d 100644 --- a/lib/util/rurl.cpp +++ b/lib/util/rurl.cpp @@ -113,9 +113,9 @@ TQString Name::extension( bool complete ) const { TQString temp = fileName(); if (complete) - return temp.mid(temp.tqfind('.')+1); + return temp.mid(temp.find('.')+1); else - return temp.mid(temp.tqfindRev('.')+1); + return temp.mid(temp.findRev('.')+1); } return TQString(); } @@ -129,10 +129,10 @@ TQString Name::fileName( ) const TQString Name::directory( ) const { - if ( (m_type == File) && (m_rurl.tqfindRev('/') == -1) ) + if ( (m_type == File) && (m_rurl.findRev('/') == -1) ) return TQString(); - return m_rurl.mid(0, m_rurl.tqfindRev('/')+1); + return m_rurl.mid(0, m_rurl.findRev('/')+1); } bool Name::isFile( ) const @@ -159,7 +159,7 @@ bool Name::isValid( ) const { if (m_rurl.startsWith("/")) return false; - if (m_rurl.tqcontains("//")) + if (m_rurl.contains("//")) return false; if ( (m_rurl.endsWith("/")) && (m_type == File) ) return false; diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 9855b06b..908df54e 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -46,9 +46,9 @@ TQString Settings::profileByAttributes(const TQString &language, const TQStringL for (TQStringList::const_iterator it = profileKeywords.constBegin(); it != profileKeywords.constEnd(); ++it) { - if (keywords.tqcontains(*it)) + if (keywords.contains(*it)) { - idx = profileKeywords.tqfindIndex(*it); + idx = profileKeywords.findIndex(*it); break; } } diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index 5f4d2dcd..d3cbc5e3 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -37,14 +37,14 @@ /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::filename(const TQString & name) { - int slashPos = name.tqfindRev("/"); + int slashPos = name.findRev("/"); return slashPos<0 ? name : name.mid(slashPos+1); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::directory(const TQString & name) { - int slashPos = name.tqfindRev("/"); + int slashPos = name.findRev("/"); return slashPos<0 ? TQString("") : name.left(slashPos); } @@ -103,7 +103,7 @@ TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::upDir(const TQString & path, bool slashSuffix) { - int slashPos = path.tqfindRev("/"); + int slashPos = path.findRev("/"); if (slashPos<1) return TQString(); return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) ); } @@ -132,7 +132,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::getExtension(const TQString & path) { - int dotPos = path.tqfindRev('.'); + int dotPos = path.findRev('.'); if (dotPos<0) return TQString(""); return path.mid(dotPos+1); } @@ -143,7 +143,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur { TQString absBase = extractPathNameAbsolute( baseDirUrl ), absRef = extractPathNameAbsolute( url ); - int i = absRef.tqfind( absBase, 0, true ); + int i = absRef.find( absBase, 0, true ); if (i == -1) return TQString(); @@ -151,7 +151,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur if (absRef == absBase) return TQString( "." ); else - return absRef.tqreplace( 0, absBase.length(), TQString() ); + return absRef.replace( 0, absBase.length(), TQString() ); } /////////////////////////////////////////////////////////////////////////////// @@ -298,7 +298,7 @@ TQString URLUtil::envExpand ( const TQString& str ) if (len > 1 && str[0] == '$') { - int pos = str.tqfind ('/'); + int pos = str.find ('/'); if (pos < 0) pos = len; diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h index 9673d8cc..e61beed2 100644 --- a/lib/widgets/fancylistviewitem.h +++ b/lib/widgets/fancylistviewitem.h @@ -53,7 +53,7 @@ class TextPaintStyleStore { } Item& getStyle( int num ) { - Store::Iterator it = m_styles.tqfind( num ); + Store::Iterator it = m_styles.find( num ); if( it != m_styles.end() ) return *it; return m_styles[0]; } @@ -67,7 +67,7 @@ class TextPaintStyleStore { } bool hasStyle( int num ) { - Store::Iterator it = m_styles.tqfind( num ); + Store::Iterator it = m_styles.find( num ); return ( it != m_styles.end() ); } diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index 47659fc4..a12c5092 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -105,12 +105,12 @@ void FlagListBox::readFlags(TQStringList *list) TQListViewItem *item = firstChild(); for (; item; item = item->nextSibling()) { FlagListItem *flitem = static_cast<FlagListItem*>(item); - TQStringList::Iterator sli = list->tqfind(flitem->flag); + TQStringList::Iterator sli = list->find(flitem->flag); if (sli != list->end()) { flitem->setOn(true); list->remove(sli); } - sli = list->tqfind(flitem->off); + sli = list->find(flitem->off); if (sli != list->end()) { flitem->setOn(false); list->remove(sli); @@ -205,13 +205,13 @@ void FlagCheckBoxController::readFlags(TQStringList *list) TQPtrListIterator<FlagCheckBox> it(cblist); for (; it.current(); ++it) { FlagCheckBox *fitem = it.current(); - TQStringList::Iterator sli = list->tqfind(fitem->flag); + TQStringList::Iterator sli = list->find(fitem->flag); if (sli != list->end()) { fitem->setChecked(true); fitem->useDef = false; list->remove(sli); } - sli = list->tqfind(fitem->off); + sli = list->find(fitem->off); if (sli != list->end()) { fitem->setChecked(false); fitem->includeOff = true; @@ -270,13 +270,13 @@ void FlagPathEditController::readFlags( TQStringList * list ) if ((*sli).startsWith(peitem->flag)) { // kdDebug() << "Processing.." << endl; - peitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),"")); + peitem->setText((*sli).replace(TQRegExp(TQRegExp_escape(peitem->flag)),"")); sli = list->remove(sli); continue; } ++sli; } -/* TQStringList::Iterator sli = list->tqfind(peitem->flag); +/* TQStringList::Iterator sli = list->find(peitem->flag); if (sli != list->end()) { peitem->setText((*sli).remove(peitem->flag)); list->remove(sli); @@ -433,7 +433,7 @@ void FlagRadioButtonController::readFlags(TQStringList *list) TQPtrListIterator<FlagRadioButton> it(cblist); for (; it.current(); ++it) { FlagRadioButton *fitem = it.current(); - TQStringList::Iterator sli = list->tqfind(fitem->flag); + TQStringList::Iterator sli = list->find(fitem->flag); if (sli != list->end()) { fitem->setChecked(true); list->remove(sli); @@ -471,7 +471,7 @@ void FlagEditController::readFlags( TQStringList * list ) { if ((*sli).startsWith(peitem->flag)) { - peitem->appendText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),"")); + peitem->appendText((*sli).replace(TQRegExp(TQRegExp_escape(peitem->flag)),"")); sli = list->remove(sli); continue; } @@ -489,7 +489,7 @@ void FlagEditController::readFlags( TQStringList * list ) { if ((*sli).startsWith(sitem->flag)) { - sitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(sitem->flag)),"")); + sitem->setText((*sli).replace(TQRegExp(TQRegExp_escape(sitem->flag)),"")); sli = list->remove(sli); continue; } diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 5bda3bed..220b846a 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -254,7 +254,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) { // check for environment variables and make necessary translations TQString path = url; - int nDollarPos = path.tqfind( '$' ); + int nDollarPos = path.find( '$' ); // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;) while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) { @@ -275,7 +275,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) result = ts.read().stripWhiteSpace(); pclose(fs); } - path.tqreplace( nDollarPos, nEndPos-nDollarPos, result ); + path.replace( nDollarPos, nEndPos-nDollarPos, result ); } else if( (path)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ @@ -302,9 +302,9 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. if (isUtf8( pEnv )) - path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) ); + path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) ); else - path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) ); + path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) ); } else path.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -312,7 +312,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) path.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = path.tqfind( '$', nDollarPos ); + nDollarPos = path.find( '$', nDollarPos ); } return path; @@ -494,7 +494,7 @@ void KDevHTMLPart::addHistoryEntry() void KDevHTMLPart::slotCopy( ) { TQString text = selectedText(); - text.tqreplace( TQChar( 0xa0 ), ' ' ); + text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::tqclipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); cb->setText(text); diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index ab267ff2..a2c2d87c 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -71,7 +71,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co KURL::List::ConstIterator it = filelist.begin(); while ( it != filelist.end() ) { - if ( !ignorelist.tqcontains( *it ) ) + if ( !ignorelist.contains( *it ) ) { TQCheckListItem * x = new CheckURL( _listview, *it ); x->setOn( true ); diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index ad5f307c..8fdbc5d2 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -39,7 +39,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer ) { stdoutbuf += buffer; int pos; - while ( (pos = stdoutbuf.tqfind('\n')) != -1) { + while ( (pos = stdoutbuf.find('\n')) != -1) { TQCString line = stdoutbuf.left( pos ); emit receivedStdoutLine(line); stdoutbuf.remove(0, pos+1); @@ -60,7 +60,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer ) { stderrbuf += buffer; int pos; - while ( (pos = stderrbuf.tqfind('\n')) != -1) { + while ( (pos = stderrbuf.find('\n')) != -1) { TQCString line = stderrbuf.left( pos ); emit receivedStderrLine(line); stderrbuf.remove(0, pos+1); diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h index cf5e78e4..f304cdd8 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -65,4 +65,4 @@ private: #endif -//kate: tqreplace-tabs off; indent-spaces off; +//kate: replace-tabs off; indent-spaces off; diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index 66796266..cf13248c 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -33,9 +33,9 @@ ProcessListBoxItem::ProcessListBoxItem(const TQString &s, Type type) : TQListBoxText(s), t(type) { TQString clean = s; - clean.tqreplace( TQChar('\t'), TQString(" ") ); - clean.tqreplace( TQChar('\n'), TQString() ); - clean.tqreplace( TQChar('\r'), TQString() ); + clean.replace( TQChar('\t'), TQString(" ") ); + clean.replace( TQChar('\n'), TQString() ); + clean.replace( TQChar('\r'), TQString() ); setText( clean ); setCustomHighlighting(true); diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox index 1f98b4ac..6bc81be0 100644 --- a/lib/widgets/propeditor/Mainpage.dox +++ b/lib/widgets/propeditor/Mainpage.dox @@ -56,7 +56,7 @@ called @ref PropertyLib::PropertyMachineFactory. Static function @ref PropertyLi can be used to obtain the reference to the factory instance. Factory creates and returns so-called @ref PropertyLib::Machine for each registered property type (either predefined or user defined). -@ref PropertyLib::Machine tqcontains @ref PropertyLib::PropertyWidget and a list of "detailed" machines. +@ref PropertyLib::Machine contains @ref PropertyLib::PropertyWidget and a list of "detailed" machines. Usually only property widget is necessary for a property but there are complex properties like "Font" for example. We would like to see separate editors for font family, size, etc. and a button to choose all of these in the dialog. diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index 18cad9b6..7732866c 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -58,7 +58,7 @@ void PComboBox::fillBox() TQVariant PComboBox::value() const { - TQMap<TQString, TQVariant>::const_iterator it = m_valueList.tqfind(m_edit->currentText()); + TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText()); if (it == m_valueList.end()) return TQVariant(""); return TQVariant(it.data()); diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index b51ff4fc..c7e5523c 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -263,7 +263,7 @@ void PropertyEditor::addChildProperties(PropertyItem *tqparent) { MultiProperty *prop = tqparent->property(); //force machine creation to get detailed properties appended to current multiproperty - if ( !m_registeredForType.tqcontains(prop->name()) + if ( !m_registeredForType.contains(prop->name()) && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) ) { //FIXME: find better solution @@ -328,10 +328,10 @@ void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &v emit changed(); -/* if (m_list->tqcontains(name)) +/* if (m_list->contains(name)) { (*m_list)[name]->setValue(value, false); -// else if (m_detailedList->tqcontains(*/ +// else if (m_detailedList->contains(*/ } void PropertyEditor::hideEditor() diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp index 20feeb43..b831e6d2 100644 --- a/lib/widgets/propeditor/propertylist.cpp +++ b/lib/widgets/propeditor/propertylist.cpp @@ -41,7 +41,7 @@ PropertyList::~PropertyList() MultiProperty *PropertyList::operator[](const TQString &name) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) return m_list[name]; else return new MultiProperty(this); @@ -49,7 +49,7 @@ MultiProperty *PropertyList::operator[](const TQString &name) MultiProperty *PropertyList::property( const TQString &name ) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) return m_list[name]; else return new MultiProperty(this); @@ -60,7 +60,7 @@ void PropertyList::addProperty(Property *property) if (property == 0) return; MultiProperty *mp = 0; - if ( m_list.tqcontains(property->name()) ) + if ( m_list.contains(property->name()) ) { mp = m_list[property->name()]; mp->addProperty(property); @@ -79,7 +79,7 @@ void PropertyList::addProperty(const TQString &group, Property *property) return; MultiProperty *mp = 0; - if (m_list.tqcontains(property->name())) + if (m_list.contains(property->name())) { mp = m_list[property->name()]; mp->addProperty(property); @@ -119,7 +119,7 @@ void PropertyList::removeProperty(Property *property) void PropertyList::removeProperty(const TQString &name) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) { TQString group = m_groupOfProperty[m_list[name]]; removeFromGroup(m_list[name]); @@ -162,7 +162,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; //do not add same property to the group twice - if (m_groupOfProperty.tqcontains(property) && (m_groupOfProperty[property] == group)) + if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group)) return; TQPair<TQString, TQValueList<TQString> > *groupPair = 0; @@ -185,7 +185,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property) return; } //check if group already contains property with the same name - if (!groupPair->second.tqcontains(property->name())) + if (!groupPair->second.contains(property->name())) groupPair->second.append(property->name()); m_groupOfProperty[property] = group; @@ -217,16 +217,16 @@ void PropertyList::clear( ) removeProperty(it.key()); } -bool PropertyList::tqcontains( const TQString & name ) +bool PropertyList::contains( const TQString & name ) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) return true; return false; } TQPtrList<Property> PropertyList::properties(const TQString &name) { - if (m_list.tqcontains(name)) + if (m_list.contains(name)) return m_list[name]->list; return TQPtrList<Property>(); } @@ -309,9 +309,9 @@ void PropertyBuffer::intersect(const PropertyList *list) for (TQMap<TQString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it) { // qWarning("intersect:: for mp = %s", it.data()->name().ascii()); - if (list->m_list.tqcontains(it.key())) + if (list->m_list.contains(it.key())) { -/* qWarning("intersect:: list tqcontains %s", it.key().ascii()); +/* qWarning("intersect:: list contains %s", it.key().ascii()); if ( (*(it.data()) == *(list->m_list[it.key()]))) qWarning("intersect:: equal properties"); else @@ -334,7 +334,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property) { // qWarning("PropertyBuffer::intersectedValueChanged"); TQString propertyName = property->name(); - if (!tqcontains(propertyName)) + if (!contains(propertyName)) return; MultiProperty mp(property); diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h index c549048b..94baf50d 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -118,7 +118,7 @@ public: /**Clears the list of properties.*/ virtual void clear(); /**Returns true if the list of properties contains property with given name.*/ - virtual bool tqcontains(const TQString &name); + virtual bool contains(const TQString &name); /**The list of properties with given name.*/ TQPtrList<Property> properties(const TQString &name); diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp index cccc3a37..e8390e18 100644 --- a/lib/widgets/propeditor/propertymachinefactory.cpp +++ b/lib/widgets/propeditor/propertymachinefactory.cpp @@ -76,7 +76,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property) TQString propertyName = property->name(); TQMap<TQString, TQVariant> valueList = property->valueList(); - if (m_registeredForType.tqcontains(propertyName)) + if (m_registeredForType.contains(propertyName)) return (*m_registeredForType[propertyName])(); switch (type) diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 565786f0..0c3119da 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -185,7 +185,7 @@ void QEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (m_listBox->tqfindItem( text, mode ) == 0L); + bool enable = (m_listBox->findItem( text, mode ) == 0L); servNewButton->setEnabled( enable ); } } @@ -256,7 +256,7 @@ void QEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) != 0); + alreadyInList =(m_listBox->findItem(currentTextLE, mode) != 0); } } diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 6a53f92b..793c52d2 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -480,13 +480,13 @@ void QComboView::mousePressEvent( TQMouseEvent *e ) // and thus has a rect that doesn't fit the button. arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( childCount() && ( !editable() || arrowRect.tqcontains( e->pos() ) ) ) { + if ( childCount() && ( !editable() || arrowRect.contains( e->pos() ) ) ) { d->arrowPressed = FALSE; listView()->blockSignals( TRUE ); tqApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll listView()->blockSignals( FALSE ); popup(); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -895,7 +895,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) if ( !d->mouseWasInsidePopup ) { // qWarning("!d->mouseWasInsidePopup"); TQPoint pos = e->pos(); - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( pos ) ) + if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { @@ -905,7 +905,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::tqvisualRect(arrowRect, this); - if ( arrowRect.tqcontains( comboPos ) ) { + if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) { + if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup @@ -955,7 +955,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) { TQPoint globalPos = d->listView()->mapToGlobal(e->pos()); if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE; @@ -1085,7 +1085,7 @@ void QComboView::returnPressed() TQListViewItem *c = 0; bool doInsert = TRUE; if ( !d->duplicatesEnabled ) { - c = listView()->tqfindItem(s, 0); + c = listView()->findItem(s, 0); if ( c ) doInsert = FALSE; } @@ -1457,7 +1457,7 @@ void QComboView::setLineEdit( TQLineEdit *edit ) void QComboView::setCurrentText( const TQString& txt ) { TQListViewItem *i; - i = listView()->tqfindItem(txt, 0); + i = listView()->findItem(txt, 0); if ( i ) setCurrentItem( i ); else if ( d->ed ) diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 33660069..a5d6c777 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -284,7 +284,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin } TQString suffix = part->url().url(); - int pos = suffix.tqfindRev('.'); + int pos = suffix.findRev('.'); if (pos != -1) suffix.remove(0, pos+1); kdDebug(9028) << "AbbrevPart::findAllWords with suffix " << suffix << endl; @@ -298,7 +298,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin while ( (pos = rx.search(text, idx)) != -1 ) { len = rx.matchedLength(); TQString word = text.mid(pos, len); - if (map.tqfind(word) == map.end()) { + if (map.find(word) == map.end()) { KTextEditor::CompletionEntry e; e.text = word; entries << e; @@ -313,7 +313,7 @@ TQValueList<KTextEditor::CompletionEntry> AbbrevPart::findAllWords(const TQStrin while ( (pos = rx.search(m_completionFile, idx)) != -1 ) { len = rx.matchedLength(); TQString word = m_completionFile.mid(pos, len); - if (map.tqfind(word) == map.end()) { + if (map.find(word) == map.end()) { KTextEditor::CompletionEntry e; e.text = word; entries << e; @@ -345,7 +345,7 @@ void AbbrevPart::slotExpandAbbrev() } TQString suffix = part->url().url(); - int pos = suffix.tqfindRev('.'); + int pos = suffix.findRev('.'); if (pos != -1) suffix.remove(0, pos+1); @@ -417,7 +417,7 @@ void AbbrevPart::insertChars( const TQString &chars ) currentCol += spaces.length(); } - int idx = lineText.tqfind( '|' ); + int idx = lineText.find( '|' ); if( idx != -1 ){ stream << lineText.left( idx ) << lineText.mid( idx+1 ); if( !foundPipe ){ @@ -562,7 +562,7 @@ void AbbrevPart::slotFilterInsertString( KTextEditor::CompletionEntry* entry, TQ } TQString suffix = part->url().url(); - int pos = suffix.tqfindRev('.'); + int pos = suffix.findRev('.'); if (pos != -1) suffix.remove(0, pos+1); kdDebug(9028) << "AbbrevPart::slotFilterInsertString with suffix " << suffix << endl; @@ -621,9 +621,9 @@ TQMap< TQString, CodeTemplate * > CodeTemplateList::operator [ ]( TQString suffi for (TQMap<TQString, TQMap<TQString, CodeTemplate* > >::const_iterator it = templates.begin(); it != templates.end(); ++it) { kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << endl; - if (TQStringList::split(",", it.key()).tqcontains(suffix)) + if (TQStringList::split(",", it.key()).contains(suffix)) { - kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " tqcontains " << suffix << endl; + kdDebug(9028) << "CodeTemplateList::operator [] - suffixes " << it.key() << " contains " << suffix << endl; TQMap<TQString, CodeTemplate* > m = it.data(); for (TQMap<TQString, CodeTemplate* >::const_iterator itt = m.begin(); itt != m.end(); ++itt) @@ -640,18 +640,18 @@ void CodeTemplateList::insert( TQString name, TQString description, TQString cod { TQString origSuffixes = suffixes; // TQStringList suffixList; - int pos = suffixes.tqfind('('); + int pos = suffixes.find('('); if (pos == -1) return; suffixes.remove(0, pos+1); - pos = suffixes.tqfind(')'); + pos = suffixes.find(')'); if (pos == -1) return; suffixes.remove(pos, suffixes.length()-pos); // suffixList = TQStringList::split(",", suffixes); CodeTemplate *t; - if (templates.tqcontains(suffixes) && templates[suffixes].tqcontains(name)) + if (templates.contains(suffixes) && templates[suffixes].contains(name)) { kdDebug(9028) << "found template for suffixes " << suffixes << " and name " << name << endl; t = templates[suffixes][name]; @@ -667,7 +667,7 @@ void CodeTemplateList::insert( TQString name, TQString description, TQString cod t->description = description; t->code = code; t->suffixes = origSuffixes; - if (!m_suffixes.tqcontains(origSuffixes)) + if (!m_suffixes.contains(origSuffixes)) m_suffixes.append(origSuffixes); } diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 4a54d195..bfcdc91b 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -148,7 +148,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *tqparent, const info->fileTemplates = templateConfig.readEntry("FileTemplates"); info->openFilesAfterGeneration = templateConfig.readListEntry("ShowFilesAfterGeneration"); TQString destDir = templateConfig.readPathEntry("DefaultDestinatonDir", defaultProjectsDir); - destDir.tqreplace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); + destDir.replace(TQRegExp("HOMEDIR"), TQDir::homeDirPath()); info->defaultDestDir = destDir; TQString category = templateConfig.readEntry("Category"); // format category to a unique status @@ -266,7 +266,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *tqparent, const // Insert items into list view TQPtrListIterator<ApplicationInfo> ait(m_appsInfo); for (; ait.current(); ++ait) { - TQListViewItem *item = m_categoryMap.tqfind(ait.current()->category); + TQListViewItem *item = m_categoryMap.find(ait.current()->category); if (item) { item = new KListViewItem(item, ait.current()->name); @@ -630,9 +630,9 @@ void AppWizardDialog::accept() for( ; mapIt != m_pCurrentAppInfo->subMap.end(); ++mapIt ) { TQString escaped( mapIt.data() ); - escaped.tqreplace( "&", "&" ); - escaped.tqreplace( "<", "<" ); - escaped.tqreplace( ">", ">" ); + escaped.replace( "&", "&" ); + escaped.replace( "<", "<" ); + escaped.replace( ">", ">" ); m_pCurrentAppInfo->subMapXML.insert( mapIt.key(), escaped ); } @@ -968,7 +968,7 @@ void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategor TQStringList::ConstIterator it; for (it = categories.begin(); it != categories.end(); ++it) { category = category + "/" + *it; - TQListViewItem *item = m_categoryMap.tqfind(category); + TQListViewItem *item = m_categoryMap.find(category); if (!item) { // not found, create it if (!pParentItem) pParentItem = new KListViewItem(templates_listview,*it); @@ -1290,7 +1290,7 @@ void AppWizardDialog::loadLicenses() { TQString licPath( dirs->findResource( "licenses", *it ) ); kdDebug(9010) << "Loading license file: " << licPath << endl; - TQString licName = licPath.mid( licPath.tqfindRev('/') + 1 ); + TQString licName = licPath.mid( licPath.findRev('/') + 1 ); KDevLicense* lic = new KDevLicense( licName, licPath ); m_licenses.insert( licName, lic ); } @@ -1342,7 +1342,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view) TQListViewItem *item = view->firstChild(); while (item) { - if (!m_categoryItems.tqcontains(item)) + if (!m_categoryItems.contains(item)) continue; checkAndHideItems(item); item = item->nextSibling(); @@ -1351,7 +1351,7 @@ void AppWizardDialog::checkAndHideItems(TQListView *view) bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) { - if (!m_categoryItems.tqcontains(item)) + if (!m_categoryItems.contains(item)) return !item->isVisible(); TQListViewItem *child = item->firstChild(); bool hide = true; @@ -1371,4 +1371,4 @@ bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) #include "appwizarddlg.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index c63f66e1..d1892c7a 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -207,4 +207,4 @@ public slots: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index 5e324b8a..e29fd98b 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -95,4 +95,4 @@ void AppWizardPart::openFilesAfterGeneration() #include "appwizardpart.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/common/COPYING.LIB b/parts/appwizard/common/COPYING.LIB index 4da30f2f..789c31ee 100644 --- a/parts/appwizard/common/COPYING.LIB +++ b/parts/appwizard/common/COPYING.LIB @@ -123,7 +123,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it tqcontains, plus any associated +all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. diff --git a/parts/appwizard/common/gnome/macros/autogen.sh b/parts/appwizard/common/gnome/macros/autogen.sh index 33acff24..70273913 100644 --- a/parts/appwizard/common/gnome/macros/autogen.sh +++ b/parts/appwizard/common/gnome/macros/autogen.sh @@ -79,7 +79,7 @@ xlc ) am_opt=--include-deps;; esac -for coin in `tqfind $srcdir -name configure.in -print` +for coin in `find $srcdir -name configure.in -print` do dr=`dirname $coin` if test -f $dr/NO-AUTO-GEN; then diff --git a/parts/appwizard/common/gnome/macros/curses.m4 b/parts/appwizard/common/gnome/macros/curses.m4 index 21d90b01..3dd4ffaa 100644 --- a/parts/appwizard/common/gnome/macros/curses.m4 +++ b/parts/appwizard/common/gnome/macros/curses.m4 @@ -11,7 +11,7 @@ dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately diff --git a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 index 5c9f976f..7c11a785 100644 --- a/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 +++ b/parts/appwizard/common/gnome/macros/gnome-fileutils.m4 @@ -38,7 +38,7 @@ fi list_mounted_fs= # If the getmntent function is available but not in the standard library, -# make sure LIBS tqcontains -lsun (on Irix4) or -lseq (on PTX). +# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). AC_FUNC_GETMNTENT # This test must precede the ones for getmntent because Unicos-9 is diff --git a/parts/appwizard/common/gnome2/macros/autogen.sh b/parts/appwizard/common/gnome2/macros/autogen.sh index 9cd3c7fe..ac9e0b68 100755 --- a/parts/appwizard/common/gnome2/macros/autogen.sh +++ b/parts/appwizard/common/gnome2/macros/autogen.sh @@ -216,7 +216,7 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false -configure_files="`tqfind $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`" +configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`" for configure_ac in $configure_files; do if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null; then want_libtool=true diff --git a/parts/appwizard/common/gnome2/macros/curses.m4 b/parts/appwizard/common/gnome2/macros/curses.m4 index d7beb9bf..5307e13d 100644 --- a/parts/appwizard/common/gnome2/macros/curses.m4 +++ b/parts/appwizard/common/gnome2/macros/curses.m4 @@ -11,7 +11,7 @@ dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - tqcontains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index 494d04c6..3ddf6182 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -1135,7 +1135,7 @@ EOF echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; i*86:OS/2:*:*) - # If we were able to tqfind `uname', then EMX Unix compatibility + # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx exit 0 ;; diff --git a/parts/appwizard/common/incadmin/install-sh b/parts/appwizard/common/incadmin/install-sh index f811e309..36f96f3e 100755 --- a/parts/appwizard/common/incadmin/install-sh +++ b/parts/appwizard/common/incadmin/install-sh @@ -126,7 +126,7 @@ else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) tqcontains '*'. +# if $src (and thus $dsttmp) contains '*'. if [ -f "$src" ] || [ -d "$src" ] then diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 8f29b4b9..0cb90869 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -1306,7 +1306,7 @@ func_mode_compile () elif test "$need_locks" = warn; then if test -f "$lockfile"; then $ECHO "\ -*** ERROR, $lockfile exists and tqcontains: +*** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` This indicates that another process is trying to use the same @@ -1358,7 +1358,7 @@ compiler." if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ -*** ERROR, $lockfile tqcontains: +*** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1407,7 +1407,7 @@ compiler." if test "$need_locks" = warn && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ -*** ERROR, $lockfile tqcontains: +*** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1674,7 +1674,7 @@ func_mode_execute () dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" fi fi ;; @@ -2062,7 +2062,7 @@ func_mode_install () if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we tqreplace! Solaris /bin/ln does not understand -f, + # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname do @@ -2684,7 +2684,7 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`tqfind $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" @@ -3400,7 +3400,7 @@ EOF newargz = XMALLOC (char *, argc + 1); tmp_pathspec = find_executable (argv[0]); if (tmp_pathspec == NULL) - lt_fatal ("Couldn't tqfind %s", argv[0]); + lt_fatal ("Couldn't find %s", argv[0]); LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", tmp_pathspec)); @@ -7843,7 +7843,7 @@ EOF func_emit_cwrapperexe_src > $cwrappersource # The wrapper executable is built using the $host compiler, - # because it tqcontains $host paths and files. If cross- + # because it contains $host paths and files. If cross- # compiling, it, like the target executable, must be # executed on the $host or under an emulation environment. $opt_dry_run || { @@ -8339,7 +8339,7 @@ func_mode_uninstall () func_source $dir/$noexename fi - # note $name still tqcontains .exe if it was in $file originally + # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then diff --git a/parts/appwizard/common/incadmin/missing b/parts/appwizard/common/incadmin/missing index a311c33a..2c025eb6 100755 --- a/parts/appwizard/common/incadmin/missing +++ b/parts/appwizard/common/incadmin/missing @@ -150,7 +150,7 @@ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - tqfind . -type f -name Makefile.am -print | + find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | while read f; do touch "$f"; done ;; diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index b0e51997..f74943dd 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -157,8 +157,8 @@ def detect_kde(env): if not libdir: libdir=execprefix+"/lib"+libsuffix - subst_vars = lambda x: x.tqreplace('${exec_prefix}', execprefix).tqreplace('${datadir}',datadir).tqreplace('${libdir}', libdir) - debian_fix = lambda x: x.tqreplace('/usr/share', '${datadir}') + subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir) + debian_fix = lambda x: x.replace('/usr/share', '${datadir}') env['KDEBIN'] = subst_vars(os.popen('kde-config --install exe').read().strip()) env['KDEAPPS'] = subst_vars(os.popen('kde-config --install apps').read().strip()) env['KDEDATA'] = subst_vars(os.popen('kde-config --install data').read().strip()) diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index b2beb660..8d0ca20d 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -101,7 +101,7 @@ ImportDialog::~ImportDialog() void ImportDialog::slotProjectNameChanged( const TQString &_text ) { - ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().tqcontains( TQRegExp("\\s") ) ); + ok_button->setEnabled( !_text.isEmpty() && !urlinput_edit->url().contains( TQRegExp("\\s") ) ); } void ImportDialog::accept() @@ -204,9 +204,9 @@ void ImportDialog::accept() // // while (!srcstream.atEnd()) { // TQString line = srcstream.readLine(); -// line.tqreplace(TQRegExp("\\$APPNAMELC\\$"), projectName); -// line.tqreplace(TQRegExp("\\$AUTHOR\\$"), author); -// line.tqreplace(TQRegExp("\\$EMAIL\\$"), email); +// line.replace(TQRegExp("\\$APPNAMELC\\$"), projectName); +// line.replace(TQRegExp("\\$AUTHOR\\$"), author); +// line.replace(TQRegExp("\\$EMAIL\\$"), email); // deststream << line << endl; // } // @@ -260,7 +260,7 @@ void ImportDialog::dirChanged() if (!dir.exists()) return; - if ( dirName.tqcontains( TQRegExp("\\s") ) ) + if ( dirName.contains( TQRegExp("\\s") ) ) { ok_button->setEnabled( false ); return; @@ -290,7 +290,7 @@ void ImportDialog::dirChanged() } // Remove any characters from the dirName that would be invalid in a project name - TQString projectName(dir.dirName().tqreplace(TQRegExp("[^a-zA-Z0-9_]"), "_")); + TQString projectName(dir.dirName().replace(TQRegExp("[^a-zA-Z0-9_]"), "_")); // Set the project name name_edit->setText(projectName); @@ -339,7 +339,7 @@ void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName) name_edit->setText(config.readEntry("project_name")); TQString legacyType = config.readEntry("project_type"); - if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").tqcontains(legacyType)) + if (TQStringList::split(",", "normal_kde,normal_kde2,kde2_normal,mdi_kde2").contains(legacyType)) setProjectType("kde"); else if (legacyType == "normal_gnome") setProjectType("gnome"); diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp index 688c3177..1357c774 100644 --- a/parts/appwizard/kdevlicense.cpp +++ b/parts/appwizard/kdevlicense.cpp @@ -87,28 +87,28 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const return str; case KDevFile::PascalStyle: - str.tqreplace(TQRegExp("/\\**\n \\*"), "{\n "); - str.tqreplace(TQRegExp("\\*\n \\*"), " \n "); - str.tqreplace(TQRegExp(" *\\**/\n"), "}\n"); + str.replace(TQRegExp("/\\**\n \\*"), "{\n "); + str.replace(TQRegExp("\\*\n \\*"), " \n "); + str.replace(TQRegExp(" *\\**/\n"), "}\n"); return str; case KDevFile::AdaStyle: - str.tqreplace(TQRegExp("/\\*"), "--"); - str.tqreplace(TQRegExp(" \\*"), "--"); - str.tqreplace(TQRegExp("\\*/"), "*"); + str.replace(TQRegExp("/\\*"), "--"); + str.replace(TQRegExp(" \\*"), "--"); + str.replace(TQRegExp("\\*/"), "*"); return str; case KDevFile::BashStyle: - str.tqreplace(TQRegExp("\\*|/"), "#"); - str.tqreplace(TQRegExp("\n ##"), "\n##"); - str.tqreplace(TQRegExp("\n #"), "\n# "); + str.replace(TQRegExp("\\*|/"), "#"); + str.replace(TQRegExp("\n ##"), "\n##"); + str.replace(TQRegExp("\n #"), "\n# "); return str; case KDevFile::XMLStyle: - str.tqreplace(TQRegExp("/\\*"), "<!--"); - str.tqreplace(TQRegExp("\n \\*"), "\n<!--"); - str.tqreplace(TQRegExp("\\*/?\n"), "-->\n"); - str.tqreplace(TQRegExp("\\*"), "_"); + str.replace(TQRegExp("/\\*"), "<!--"); + str.replace(TQRegExp("\n \\*"), "\n<!--"); + str.replace(TQRegExp("\\*/?\n"), "-->\n"); + str.replace(TQRegExp("\\*"), "_"); return str; } diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 8ae4d85e..828b54e9 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -40,5 +40,5 @@ ProfileSupport::ProfileSupport(KDevPlugin *tqparent) bool ProfileSupport::isInTemplateList(const TQString &templateUrl) { - return m_templateList.tqcontains(TQFileInfo(templateUrl).baseName()); + return m_templateList.contains(TQFileInfo(templateUrl).baseName()); } diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index de7153c1..59cb1666 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -193,21 +193,21 @@ void AStylePart::beautifySource() if (m_project["Fill"].toString() == "Tabs") { // tabs and wsCount spaces to be a tab - TQString tqreplace; + TQString replace; for (int i =0;i<wsCount;i++) - tqreplace+=' '; + replace+=' '; - indentWith=indentWith.tqreplace(tqreplace, TQChar('\t')); + indentWith=indentWith.replace(replace, TQChar('\t')); indentWith=indentWith.remove(' '); } else { if ( m_project["FillForce"].toBool()){ //convert tabs to spaces - TQString tqreplace; + TQString replace; for (int i =0;i<wsCount;i++) - tqreplace+=' '; + replace+=' '; - indentWith=indentWith.tqreplace(TQChar('\t'),tqreplace); + indentWith=indentWith.replace(TQChar('\t'),replace); } } } @@ -323,14 +323,14 @@ void AStylePart::activePartChanged ( KParts::Part *part ) if ( iface ) { // check for the everything case.. - if ( m_searchExtensions.tqfind ( "*" ) == m_searchExtensions.end() ) + if ( m_searchExtensions.find ( "*" ) == m_searchExtensions.end() ) { TQString extension = rw_part->url().path(); - int pos = extension.tqfindRev ( '.' ); + int pos = extension.findRev ( '.' ); if ( pos >= 0 ) { extension = extension.mid ( pos ); - enabled = ( m_searchExtensions.tqfind ( extension ) != m_searchExtensions.end() ); + enabled = ( m_searchExtensions.find ( extension ) != m_searchExtensions.end() ); } } else @@ -436,7 +436,7 @@ void AStylePart::restorePartialProjectSession(const TQDomElement * el) if ( ext.isEmpty()){ ext=defaultFormatExtensions; } - setExtensions(ext.tqreplace(TQChar(','), TQChar('\n')),false); + setExtensions(ext.replace(TQChar(','), TQChar('\n')),false); } } diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 7646cc76..5edfa5a3 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -105,7 +105,7 @@ void BookmarksPart::partAdded( KParts::Part * part ) if ( setBookmarksForURL( ro_part ) ) { updateContextStringForURL( ro_part ); - if ( EditorData * data = _editorMap.tqfind( ro_part->url().path() ) ) + if ( EditorData * data = _editorMap.find( ro_part->url().path() ) ) { _widget->updateURL( data ); } @@ -143,7 +143,7 @@ void BookmarksPart::marksEvent() TQObject * senderobj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart *>( senderobj ); - if ( partIsSane( ro_part ) && !_dirtyParts.tqcontains( ro_part ) ) + if ( partIsSane( ro_part ) && !_dirtyParts.contains( ro_part ) ) { _dirtyParts.push_back( ro_part ); _marksChangeTimer->start( 1000, true ); @@ -273,7 +273,7 @@ void BookmarksPart::removeBookmarkForURL( KURL const & url, int line ) { //kdDebug(0) << "BookmarksPart::removeBookmarkForURL()" << endl; - if ( EditorData * data = _editorMap.tqfind( url.path() ) ) + if ( EditorData * data = _editorMap.find( url.path() ) ) { TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin(); while ( it != data->marks.end() ) @@ -305,7 +305,7 @@ void BookmarksPart::updateContextStringForURL( KParts::ReadOnlyPart * ro_part ) KTextEditor::EditInterface * ed = dynamic_cast<KTextEditor::EditInterface *>( ro_part ); - EditorData * data = _editorMap.tqfind( ro_part->url().path() ); + EditorData * data = _editorMap.find( ro_part->url().path() ); if ( ! ( data && ed ) ) return; @@ -343,7 +343,7 @@ bool BookmarksPart::setBookmarksForURL( KParts::ReadOnlyPart * ro_part ) _settingMarks = true; - if ( EditorData * data = _editorMap.tqfind( ro_part->url().path() ) ) + if ( EditorData * data = _editorMap.find( ro_part->url().path() ) ) { // we've seen this one before, apply stored bookmarks @@ -479,7 +479,7 @@ KParts::ReadOnlyPart * BookmarksPart::partForURL( KURL const & url ) bool BookmarksPart::partIsSane( KParts::ReadOnlyPart * ro_part ) { return ( ro_part != 0 ) && - partController()->parts()->tqcontains( ro_part) && + partController()->parts()->contains( ro_part) && !ro_part->url().path().isEmpty(); } diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index 9ae51f19..99e8715d 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -196,7 +196,7 @@ void BookmarksWidget::updateURL( EditorData * data ) { // kdDebug(0) << "BookmarksWidget::updateURL()" << endl; - // remove the node that tqcontains 'data' + // remove the node that contains 'data' removeURL( data->url ); // create it again with new data diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index eceb656f..200ef9bb 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -72,13 +72,13 @@ class FunctionCompletion : public CustomCompleter { TQString fScope; int cutpos; - if((cutpos = function.tqfind('(')) != -1) { + if((cutpos = function.find('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { return function; } - if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { + if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } @@ -103,7 +103,7 @@ class FunctionCompletion : public CustomCompleter { } virtual void removeItem ( const TQString &item ) { - FuncMap::iterator it = nameMap.tqfind( item ); + FuncMap::iterator it = nameMap.find( item ); if( it != nameMap.end() ) { KCompletion::removeItem( *it ); revNameMap.remove( *it ); @@ -118,7 +118,7 @@ class FunctionCompletion : public CustomCompleter { } virtual void postProcessMatch ( TQString *match ) const { - FuncMap::const_iterator it = revNameMap.tqfind( *match ); + FuncMap::const_iterator it = revNameMap.find( *match ); if( it != revNameMap.end() ) { *match = *it; } @@ -261,7 +261,7 @@ void ClassViewPart::activePartChanged( KParts::Part * part) m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); navigator->refreshNavBars(m_activeFileName); navigator->syncFunctionNavDelayed(200); -/* if ( languageSupport()->mimeTypes().tqfind( +/* if ( languageSupport()->mimeTypes().find( KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() ) m_activeFileName = TQString();*/ } diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 1eccf136..a06948ab 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -116,7 +116,7 @@ template <class ModelType, class ListItemType> if( c ) { KSharedPtr<ModelType> d( c ); - typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.tqfind(d); + typename TQMap<KSharedPtr<ModelType>, ListItemType*>::ConstIterator it = map.find(d); if( it != map.end() ) { ( *it )->select(); return true; @@ -482,13 +482,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo TQString current = path.front(); path.pop_front(); - FolderBrowserItem* item = m_folders.tqcontains( current ) ? m_folders[ current ] : 0; + FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0; if( !item ){ if( remove ) return; item = new FolderBrowserItem( m_widget, this, current ); - if( listView()->removedText.tqcontains(current) ) + if( listView()->removedText.contains(current) ) item->setOpen( true ); m_folders.insert( current, item ); } @@ -507,13 +507,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove ) { - NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; + NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; if( !item ){ if( remove ) return; item = new NamespaceDomBrowserItem( this, ns ); - if( listView()->removedText.tqcontains(ns->name()) ) + if( listView()->removedText.contains(ns->name()) ) item->setOpen( true ); m_namespaces.insert( ns->name(), item ); } @@ -547,13 +547,13 @@ void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove ) void FolderBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.tqcontains(klass->name()) ) + if( listView()->removedText.contains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -584,13 +584,13 @@ void FolderBrowserItem::processClass( ClassDom klass, bool remove ) void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.tqcontains(typeAlias->name()) ) + if( listView()->removedText.contains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -607,7 +607,7 @@ void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) void FolderBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -625,7 +625,7 @@ void FolderBrowserItem::processFunction( FunctionDom fun, bool remove ) void FolderBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -679,13 +679,13 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item) void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove ) { - NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; + NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; if( !item ){ if( remove ) return; item = new NamespaceDomBrowserItem( this, ns ); - if( listView()->removedText.tqcontains(ns->name()) ) + if( listView()->removedText.contains(ns->name()) ) item->setOpen( true ); m_namespaces.insert( ns->name(), item ); } @@ -719,13 +719,13 @@ void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove ) void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.tqcontains(klass->name()) ) + if( listView()->removedText.contains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -756,13 +756,13 @@ void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove ) void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.tqcontains(typeAlias->name()) ) + if( listView()->removedText.contains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -779,7 +779,7 @@ void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool rem void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -797,7 +797,7 @@ void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove ) void NamespaceDomBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -844,13 +844,13 @@ bool ClassDomBrowserItem::selectItem(ItemDom item) void ClassDomBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.tqcontains(klass->name()) ) + if( listView()->removedText.contains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -881,13 +881,13 @@ void ClassDomBrowserItem::processClass( ClassDom klass, bool remove ) void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.tqcontains(typeAlias->name()) ) + if( listView()->removedText.contains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -904,7 +904,7 @@ void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -922,7 +922,7 @@ void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove ) void ClassDomBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index 1e2f7dfd..6374ce50 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -173,13 +173,13 @@ TQStringList DigraphView::splitLine(TQString str) while (!str.isEmpty()) { if (str[0] == '"') { - int pos = str.tqfind('"', 1); + int pos = str.find('"', 1); if (pos == -1) pos = str.length(); result << str.mid(1, pos-1); str.remove(0, pos+1); } else { - int pos = str.tqfind(' '); + int pos = str.find(' '); if (pos == -1) pos = str.length(); result << str.left(pos); @@ -323,7 +323,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e) TQPtrListIterator<DigraphNode> it1(nodes); for (; it1.current(); ++it1) { TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); - if (r.tqcontains(e->pos())) { + if (r.contains(e->pos())) { if (selNode) { TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2, selNode->w, selNode->h); diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 2eedf64d..2ce9d6b3 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -113,7 +113,7 @@ void HierarchyDialog::save() TQStringList baseClasses = it.data()->baseClassList(); for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - TQMap<TQString, TQString>::const_iterator baseIt = uclasses.tqfind(*bit); + TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit); if (baseIt != uclasses.end()) { TQString formattedParentName = ls->formatClassName(baseIt.data()); @@ -143,7 +143,7 @@ void HierarchyDialog::refresh() TQStringList baseClasses = it.data()->baseClassList(); for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - TQMap<TQString, TQString>::const_iterator baseIt = uclasses.tqfind(*bit); + TQMap<TQString, TQString>::const_iterator baseIt = uclasses.find(*bit); if (baseIt != uclasses.end()) { TQString formattedParentName = ls->formatClassName(baseIt.data()); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 78415d8c..01bfe2d0 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -289,7 +289,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap<TQString, TQListViewItem*>::iterator it2 = it; ++it; - if ( !toLeave.tqcontains( it2.key() ) ) + if ( !toLeave.contains( it2.key() ) ) { if (it2.data()) { @@ -331,7 +331,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap<TQString, TQListViewItem*>::iterator it2 = itt; ++itt; - if ( !toLeave.tqcontains( it2.key() ) ) + if ( !toLeave.contains( it2.key() ) ) { if (it2.data()) { @@ -397,14 +397,14 @@ TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleS TQString fScope; int cutpos; - if((cutpos = function.tqfind('(')) != -1) { + if((cutpos = function.find('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { ret.addItem( function ); return ret; } - if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { + if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 6dc0063b..93270a78 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -270,7 +270,7 @@ int CTags2Part::getFileLineFromStream( TQTextStream & istream, TQString const & // ctags interestingly escapes "/", but apparently nothing else. lets revert that TQString unescaped = pattern; - unescaped.tqreplace( "\\/", "/" ); + unescaped.replace( "\\/", "/" ); // most of the time, the ctags pattern has the form /^foo$/ // but this isn't true for some macro definitions diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index ea607eb6..da50a317 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -91,7 +91,7 @@ void CTags2SettingsWidget::loadSettings() while ( it != entryMap.end() ) { TQString file = config->readPathEntry( it.key() ); - new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.tqcontains( file ) ); + new TagsItem( otherTagFiles, it.key(), file, activeTagsFiles.contains( file ) ); ++it; } } diff --git a/parts/ctags2/readtags.c b/parts/ctags2/readtags.c index dce0a2e8..38014d3f 100644 --- a/parts/ctags2/readtags.c +++ b/parts/ctags2/readtags.c @@ -649,7 +649,7 @@ static tagResult findSequential (tagFile *const file) return result; } -static tagResult tqfind (tagFile *const file, tagEntry *const entry, +static tagResult find (tagFile *const file, tagEntry *const entry, const char *const name, const int options) { tagResult result = TagFailure; @@ -758,7 +758,7 @@ extern tagResult tagsFind (tagFile *const file, tagEntry *const entry, { tagResult result = TagFailure; if (file != NULL && file->initialized) - result = tqfind (file, entry, name, options); + result = find (file, entry, name, options); return result; } diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp index 8b83c701..19993823 100644 --- a/parts/ctags2/tags.cpp +++ b/parts/ctags2/tags.cpp @@ -123,7 +123,7 @@ Tags::TagList Tags::getMatches(const char* tagFile, const TQString & tagpart, bo { type = "macro"; } - if ( types.isEmpty() || types.tqcontains( entry.kind ) ) + if ( types.isEmpty() || types.contains( entry.kind ) ) { list << TagEntry( TQString( entry.name ), type, file, TQString( entry.address.pattern ) ); } diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h index d289d9d6..22b7e7ea 100644 --- a/parts/ctags2/tags.h +++ b/parts/ctags2/tags.h @@ -45,7 +45,7 @@ public: /** * Method to check if the tag database contains a specific tag * @param tag Tag to look up - * @return returns true if tag database tqcontains 'tag' + * @return returns true if tag database contains 'tag' */ static bool hasTag( const TQString & tag ); diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 177bd966..60316c25 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -192,7 +192,7 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() { else { for(unsigned int i=0; i< uploadFileListBox->count(); i++) KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ), - KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).tqreplace(TQRegExp("[^/]*/"),"") )); + KURL::fromPathOrURL( getuploadURLLineEditText() + uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") )); } } @@ -455,9 +455,9 @@ void DistpartDialog::setprojectChangelogMultilineEditText(TQString text) { TQString DistpartDialog::getSourceName() { TQString name = (getcustomProjectCheckBoxState()) ? getarchNameFormatLineEditText() : TQString("%n-%v"); name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz"; - return name.tqreplace(TQRegExp("%n"),getappNameFormatLineEditText()) - .tqreplace(TQRegExp("%v"),getversionLineEditText()) - .tqreplace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd")); + return name.replace(TQRegExp("%n"),getappNameFormatLineEditText()) + .replace(TQRegExp("%v"),getversionLineEditText()) + .replace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd")); } void DistpartDialog::loadSettings() { diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 985c7c0f..63bfa59a 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -72,7 +72,7 @@ SpecSupport::~SpecSupport() { void SpecSupport::slotbuildAllPushButtonPressed() { TQMap<TQString,TQString>::Iterator it; TQFile file1(dir + "/" + getAppSource()); - TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource()); + TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); if (!file2.exists()) { if (!file1.exists()) { TQMessageBox::critical(0 ,i18n("Error"),i18n("You need to create a source archive first.")); @@ -81,17 +81,17 @@ void SpecSupport::slotbuildAllPushButtonPressed() { else if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) + - " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir")))); + " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir")))); } if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend")) - makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) + + makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -ba " + m_part->project()->projectName() + ".spec"); } // TQPushButton* exportSPECPushButton; void SpecSupport::slotexportSPECPushButtonPressed() { TQMap<TQString,TQString>::Iterator it; - TQString specname = ((it = map.tqfind("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory()); + TQString specname = ((it = map.find("_specdir")) != map.end()) ? (*it) : (m_part->project()->projectDirectory()); specname += ("/" + m_part->project()->projectName() + ".spec"); TQFile file(specname); @@ -171,7 +171,7 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { TQMap<TQString,TQString>::Iterator it; TQFile file1(dir + "/" + getAppSource()); - TQFile file2(*(map.tqfind("_sourcedir")) + "/" + getAppSource()); + TQFile file2(*(map.find("_sourcedir")) + "/" + getAppSource()); if (!file2.exists()) { if (!file1.exists()) { TQMessageBox::critical(0,i18n("Error"),i18n("You need to create a source archive first.")); @@ -180,10 +180,10 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { else if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) + - " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.tqfind("_sourcedir")))); + " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir")))); } if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend")) - makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.tqfind("_specdir")) != map.end()) ? (*it) : dir)) + + makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -bs " + m_part->project()->projectName() + ".spec"); } @@ -212,7 +212,7 @@ void SpecSupport::parseDotRpmmacros() { TQString value = re.cap(2).stripWhiteSpace(); while(subst.search(value) != -1) { - value.tqreplace(TQRegExp("%\\{"+ TQRegExp_escape( subst.cap(1) ) +"\\}"),*map.tqfind(subst.cap(1))); + value.replace(TQRegExp("%\\{"+ TQRegExp_escape( subst.cap(1) ) +"\\}"),*map.find(subst.cap(1))); } map.insert(re.cap(1),value); } @@ -231,7 +231,7 @@ void SpecSupport::parseDotRpmmacros() { bool SpecSupport::createRpmDirectoryFromMacro(const TQString & name) { TQMap<TQString,TQString>::Iterator it; - if((it = map.tqfind(name)) != map.end()) { + if((it = map.find(name)) != map.end()) { TQDir dir(*it); if (!dir.exists()) return dir.mkdir(*it); } diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 3bcefe97..69908881 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -100,7 +100,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) + if ( kapp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels @@ -195,7 +195,7 @@ void DocGlobalConfigWidget::accept() for (TQStringList::const_iterator it2 = app.constBegin(); it2 != app.constEnd(); ++it2) { - if (!locs.tqcontains(*it2)) + if (!locs.contains(*it2)) locs.append(*it2); } } diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 0d22c07a..b17216d1 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -665,7 +665,7 @@ TQCString DocumentationPart::startAssistant() kdDebug() << dcopName.data() << endl; //@fixme: is there another way to wait for the remote object to be loaded - while (!KApplication::dcopClient()->remoteObjects(dcopName).tqcontains("KDevDocumentation")) + while (!KApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation")) usleep(500); } } @@ -675,7 +675,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) + if ( kapp->instanceName().find("kdevassistant") != -1 ) { return false; } diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 60b0bce1..5e3b72f8 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -228,7 +228,7 @@ void FindDocumentation::searchInContents() catalogItem->load(); catalogItem->plugin()->setCatalogURL(catalogItem); } - if (it.current()->text(0).tqcontains(search_term->text(),false)) + if (it.current()->text(0).contains(search_term->text(),false)) { DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document, contents_item, it.current()->text(0) ); @@ -260,7 +260,7 @@ void FindDocumentation::searchInIndex() DocumentationItem* newitem = 0; while(item) { - if(!item->text().tqcontains(search_term->text(),false)) + if(!item->text().contains(search_term->text(),false)) break; IndexItem::List urls = item->urls(); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 22c375d2..14a72900 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -462,7 +462,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin(); it != deletedConfigurationItems.constEnd(); ++it) { - if (namedCatalogs.tqcontains(*it)) + if (namedCatalogs.contains(*it)) delete namedCatalogs[*it]; } deletedConfigurationItems.clear(); @@ -472,15 +472,15 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL it != entryMap.end(); ++it) { config->setGroup("Locations"); - if (restrictions.tqcontains(it.key()) || (!catalogEnabled(it.key()))) + if (restrictions.contains(it.key()) || (!catalogEnabled(it.key()))) { - if (namedCatalogs.tqcontains(it.key())) + if (namedCatalogs.contains(it.key())) delete namedCatalogs[it.key()]; } else { kdDebug() << "updating 1" << endl; - if (!namedCatalogs.tqcontains(it.key())) //create catalog if it does not exist + if (!namedCatalogs.contains(it.key())) //create catalog if it does not exist { DocumentationCatalogItem * item = createCatalog(contents, it.key(), config->readPathEntry(it.key())); loadIndex(index, item); @@ -493,7 +493,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL clearCatalogIndex(namedCatalogs[it.key()]); } else if ( (indexEnabled(namedCatalogs[it.key()])) //index is requested in configuration but does not yet exist - && (!indexes.tqcontains(namedCatalogs[it.key()])) ) + && (!indexes.contains(namedCatalogs[it.key()])) ) { kdDebug() << " index requested " << endl; loadIndex(index, namedCatalogs[it.key()]); @@ -512,7 +512,7 @@ void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { - if (namedCatalogs.tqcontains(it.key()) + if (namedCatalogs.contains(it.key()) && namedCatalogs[it.key()]->isProjectDocumentationItem()) continue; @@ -630,7 +630,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item) if (items[text].count() == 0) { items.remove(text); - TQListBoxItem *item = tqfindItem(text, TQt::CaseSensitive | TQt::ExactMatch); + TQListBoxItem *item = findItem(text, TQt::CaseSensitive | TQt::ExactMatch); if (item) delete item; } diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index fb033a7f..83263fce 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -144,9 +144,9 @@ static TQString decodeHTML(const TQString& s) { while(pos > -1) { TQString found = rx.cap(0); if(found != " ") { - out.tqreplace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); + out.replace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); }else{ - out.tqreplace(pos, found.length(), " "); + out.replace(pos, found.length(), " "); } pos = rx.search(out, pos+1); } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 79106157..21e450a6 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -240,7 +240,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) void DocDevHelpPlugin::pushToScanStack(TQValueStack<TQString> &stack, const TQString &value) { - if ( (!value.isEmpty()) && (!stack.tqcontains(value)) ) + if ( (!value.isEmpty()) && (!stack.contains(value)) ) { stack << value; kdDebug() << "Devhelp scan stack: +: " << value << endl; @@ -330,7 +330,7 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement chil TQString name = childEl.attribute("name"); TQString url = childEl.attribute("link"); - if (name.isEmpty() && url.tqcontains("ix")) + if (name.isEmpty() && url.contains("ix")) name = "Index"; DocumentationItem *item = new DocumentationItem( diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 6ae9b2e2..e40ad5a9 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -105,7 +105,7 @@ void ChmProtocol::get( const KURL& url ) } - if (m_dirMap.tqfind(path) == m_dirMap.end()) { + if (m_dirMap.find(path) == m_dirMap.end()) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } @@ -183,13 +183,13 @@ void ChmProtocol::get( const KURL& url ) int current = 0; int old = 0, pos = 0; parents.push(0); - while ((pos = s.tqfind(object, pos)) != -1) { + while ((pos = s.find(object, pos)) != -1) { if(htmlOutput) output += s.mid(old, pos - old); if(catalog) { TQRegExp ex("<UL>|</UL>", false); ex.setMinimal(true); TQString ms = s.mid(old, pos - old); int pos = 0; - while( (pos = ms.tqfind(ex, pos)) != -1) { + while( (pos = ms.find(ex, pos)) != -1) { if(ms.mid(pos, 4) == "<UL>") { parents.push(current); } else{ @@ -206,9 +206,9 @@ void ChmProtocol::get( const KURL& url ) old = pos; TQString obj = object.cap(1); TQString name, local; - if (obj.tqfind(nameParam) != -1) { + if (obj.find(nameParam) != -1) { name = nameParam.cap(1); - if (obj.tqfind(localParam) != -1) { + if (obj.find(localParam) != -1) { local = localParam.cap(1); //output += "<a href=\"" + local + "\">" + name + "</a>"; //added by lucida lucida@users.sf.net @@ -233,10 +233,10 @@ void ChmProtocol::get( const KURL& url ) if(htmlOutput) output += name; } } - if (obj.tqfind(mergeParam) != -1 && htmlOutput) { + if (obj.find(mergeParam) != -1 && htmlOutput) { TQString link = mergeParam.cap(1); - TQString href = link.left(link.tqfind("::")); - TQString path = m_chmFile.left(m_chmFile.tqfindRev("/") + 1); + TQString href = link.left(link.find("::")); + TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1); //output += " (<a href=\"" + path + href + "\">link</a>)"; m_bIndex = 1; output += " (<a target=\"browse\" href=\"" + url.url() + path + href + "\">link</a>)"; @@ -301,7 +301,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) { //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl; - fullPath = fullPath.tqreplace(TQRegExp("::"), ""); + fullPath = fullPath.replace(TQRegExp("::"), ""); // Are we already looking at that file ? if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) ) @@ -324,7 +324,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) fullPath += '/'; //kdDebug() << "the full path is " << fullPath << endl; - while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) { TQString tryPath = fullPath.left( pos ); //kdDebug() << fullPath << " trying " << tryPath << endl; diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index a2d688ec..51700470 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -230,8 +230,8 @@ void SearchView::search() delete proc; // modify the search result - searchResult = searchResult.tqreplace(TQRegExp("http://localhost/"), "file:/"); - searchResult = searchResult.tqreplace(TQRegExp("Content-type: text/html"), ""); + searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/"); + searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), ""); // dump the search result TQFile f(savedir + "/results.html"); @@ -268,7 +268,7 @@ void SearchView::analyseSearchResults() TQRegExp starsExp("alt=\"\\*\""); starsExp.setMinimal(true); - int stars = line.tqcontains(starsExp); + int stars = line.contains(starsExp); TQRegExp urlExp("<strong><a href=\"(.*)\">(.*)</a></strong>"); if (urlExp.search(line)==-1) diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index d0146d0e..cec37b02 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -323,12 +323,12 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) TQString line = TQString(buffer).left(len); int cnt=0, index=-1; - while ( (index = line.tqfind("http://", index+1)) > 0) + while ( (index = line.find("http://", index+1)) > 0) cnt++; filesDigged += cnt; cnt=0, index=-1; - while ( (index = line.tqfind("not changed", index+1)) > 0) + while ( (index = line.find("not changed", index+1)) > 0) cnt++; filesDigged -= cnt; diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index 658f5ae5..727020bf 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -708,7 +708,7 @@ void ConfigBool::convertStrToVal() TQCString &Config::getString(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->tqfind(name); + ConfigOption *opt = m_dict->find(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -724,7 +724,7 @@ TQCString &Config::getString(const char *fileName,int num,const char *name) cons TQStrList &Config::getList(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->tqfind(name); + ConfigOption *opt = m_dict->find(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -740,7 +740,7 @@ TQStrList &Config::getList(const char *fileName,int num,const char *name) const TQCString &Config::getEnum(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->tqfind(name); + ConfigOption *opt = m_dict->find(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -756,7 +756,7 @@ TQCString &Config::getEnum(const char *fileName,int num,const char *name) const int &Config::getInt(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->tqfind(name); + ConfigOption *opt = m_dict->find(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -772,7 +772,7 @@ int &Config::getInt(const char *fileName,int num,const char *name) const bool &Config::getBool(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->tqfind(name); + ConfigOption *opt = m_dict->find(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -2493,7 +2493,7 @@ static void substEnvVarsInStrList(TQStrList &sl) { TQCString result(s); // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE. - bool wasQuoted = (result.tqfind(' ')!=-1) || (result.tqfind('\t')!=-1); + bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1); // here we strip the quote again substEnvVarsInString(result); @@ -2654,15 +2654,15 @@ void Config::check() } else { - if (warnFormat.tqfind("$file")==-1) + if (warnFormat.find("$file")==-1) { config_err("Warning: warning format does not contain a $file tag!\n"); } - if (warnFormat.tqfind("$line")==-1) + if (warnFormat.find("$line")==-1) { config_err("Warning: warning format does not contain a $line tag!\n"); } - if (warnFormat.tqfind("$text")==-1) + if (warnFormat.find("$text")==-1) { config_err("Warning: warning format foes not contain a $text tag!\n"); } @@ -2774,7 +2774,7 @@ void Config::check() TQRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument TQCString alias=s; alias=alias.stripWhiteSpace(); - if (alias.tqfind(re1)!=0 && alias.tqfind(re2)!=0) + if (alias.find(re1)!=0 && alias.find(re2)!=0) { config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", alias.data()); @@ -3042,7 +3042,7 @@ void Config::check() annotationFromBrief.append("is"); annotationFromBrief.append("provides"); annotationFromBrief.append("specifies"); - annotationFromBrief.append("tqcontains"); + annotationFromBrief.append("contains"); annotationFromBrief.append("represents"); annotationFromBrief.append("a"); annotationFromBrief.append("an"); @@ -3306,7 +3306,7 @@ void Config::create() "used as the annotated text. Otherwise, the brief description is used as-is. \n" "If left blank, the following values are used (\"$name\" is automatically \n" "replaced with the name of the entity): \"The $name class\" \"The $name widget\" \n" - "\"The $name file\" \"is\" \"provides\" \"specifies\" \"tqcontains\" \n" + "\"The $name file\" \"is\" \"provides\" \"specifies\" \"contains\" \n" "\"represents\" \"a\" \"an\" \"the\"\n" ); cb = addBool( @@ -4132,7 +4132,7 @@ void Config::create() "To create a documentation set, doxygen will generate a Makefile in the \n" "HTML output directory. Running make will produce the docset in that \n" "directory and running \"make install\" will install the docset in \n" - "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will tqfind \n" + "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find \n" "it at startup. \n" "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html " "for more information. \n", diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h index 19d877d8..3d47d5c6 100644 --- a/parts/doxygen/config.h +++ b/parts/doxygen/config.h @@ -409,7 +409,7 @@ class Config */ ConfigOption *get(const char *name) const { - return m_dict->tqfind(name); + return m_dict->find(name); } /* @} */ diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index eb08f0f9..f1f28473 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -184,13 +184,13 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches, if (dep.isEmpty()) return; - IInput *tqparent = m_inputWidgets->tqfind(dep); + IInput *tqparent = m_inputWidgets->find(dep); Q_ASSERT(tqparent!=0); - IInput *child = m_inputWidgets->tqfind(name); + IInput *child = m_inputWidgets->find(name); Q_ASSERT(child!=0); - if (!switches->tqfind(dep)) + if (!switches->find(dep)) switches->insert(dep, tqparent->qobject()); - TQPtrList<IInput> *list = m_dependencies->tqfind(dep); + TQPtrList<IInput> *list = m_dependencies->find(dep); if (!list) { list = new TQPtrList<IInput>; m_dependencies->insert(dep, list); @@ -201,7 +201,7 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches, void DoxygenConfigWidget::toggle(const TQString &name, bool state) { - TQPtrList<IInput> *inputs = m_dependencies->tqfind(name); + TQPtrList<IInput> *inputs = m_dependencies->find(name); Q_ASSERT(inputs!=0); IInput *input = inputs->first(); while (input) { diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index 3414ee6d..de1577f1 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -245,7 +245,7 @@ InputString::~InputString() void InputString::init() { if (sm == StringFixed) { - int *itemIndex = m_values->tqfind(str); + int *itemIndex = m_values->find(str); if (itemIndex) com->setCurrentItem(*itemIndex); else diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp index ee56cb34..dcebe217 100644 --- a/parts/doxygen/messages.cpp +++ b/parts/doxygen/messages.cpp @@ -289,7 +289,7 @@ TQString message(const TQCString &key) initialized = true; } - if (!sMessages.tqcontains(key)) + if (!sMessages.contains(key)) { kdDebug() << "Unhandled message: " << key << endl; diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 6a1dc7e6..201fb65f 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -113,7 +113,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) TQString subtyperef = element.attribute("subtyperef"); if (subtyperef.isNull()) { - TQListViewItem *it = view->tqfindItem(ext, 0); + TQListViewItem *it = view->findItem(ext, 0); if (it) { ((TQCheckListItem*)it)->setOn(true); @@ -128,7 +128,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) } else { - TQListViewItem *it = view->tqfindItem(subtyperef, 0); + TQListViewItem *it = view->findItem(subtyperef, 0); if (it) ((TQCheckListItem*)it)->setOn(true); } diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index e8fbecff..e7ad379e 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -274,7 +274,7 @@ FileType * FileCreatePart::getType(const TQString & ex, const TQString subtRef) TQString subtypeRef = subtRef; TQString ext = ex; - int dashPos = ext.tqfind('-'); + int dashPos = ext.find('-'); if (dashPos>-1 && subtRef.isNull()) { ext = ex.left(dashPos); subtypeRef = ex.mid(dashPos+1); @@ -301,7 +301,7 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su TQString subtypeRef = subtRef; TQString ext = ex; - int dashPos = ext.tqfind('-'); + int dashPos = ext.find('-'); if (dashPos>-1 && subtRef.isNull()) { ext = ex.left(dashPos); subtypeRef = ex.mid(dashPos+1); @@ -559,4 +559,4 @@ void FileCreatePart::slotGlobalInitialize( ) #include "filecreate_part.moc" -// kate: indent-width 2; tqreplace-tabs on; tab-width 4; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on; diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index 5c39393b..ca37957a 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -164,7 +164,7 @@ namespace FileCreate { return; } - m_selected = typeForRow.tqcontains(row) ? typeForRow[row] : NULL; + m_selected = typeForRow.contains(row) ? typeForRow[row] : NULL; TQTimer::singleShot(0, this, TQT_SLOT(slotDoSelection()) ); } diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 7043deed..5f026628 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -287,7 +287,7 @@ void FileListWidget::restoreSelections(const TQStringList & list) TQListViewItem * item = firstChild(); while ( item ) { - if ( list.tqcontains( item->text(0) ) ) + if ( list.contains( item->text(0) ) ) { item->setSelected( true ); } diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index c3341cd8..2fa329dd 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -389,7 +389,7 @@ void ProjectviewPart::slotOpenProjectView(const TQString &view) m_currentProjectView = view; - if (m_projectViews.tqcontains(view) > 0) + if (m_projectViews.contains(view) > 0) { FileInfoList viewUrls = m_projectViews[view]; @@ -400,7 +400,7 @@ void ProjectviewPart::slotOpenProjectView(const TQString &view) for (KURL::List::Iterator it = urlsToClose.begin(); it != urlsToClose.end(); ++it) { // it is in the list of wanted files and do we want it at all - if ((viewUrls.tqcontains(*it) > 0) && (!onlyProject || !project() || project()->isProjectFile((*it).path()) )) + if ((viewUrls.contains(*it) > 0) && (!onlyProject || !project() || project()->isProjectFile((*it).path()) )) { viewUrls.remove(*it); // don't open if it is open already it = urlsToClose.remove(it); @@ -439,7 +439,7 @@ void ProjectviewPart::adjustViewActions() m_openPrjViewAction->clear(); m_openPrjViewAction->setItems(viewList); - int i = viewList.tqfindIndex(m_currentProjectView); + int i = viewList.findIndex(m_currentProjectView); if (i > -1) { m_openPrjViewAction->setCurrentItem(i); @@ -490,7 +490,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName) return; } newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it - if (m_projectViews.tqcontains(newProjectView) > 0 && + if (m_projectViews.contains(newProjectView) > 0 && KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue) { return; diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index e9e60f47..eacc513a 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -762,13 +762,13 @@ void KFSConfigPage::init() TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { - lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); + lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); if ( *it == "bookmarks" || *it == "sync_dir" ) ac = fileSelector->actionCollection()->action( (*it).latin1() ); else ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() ); if ( ac ) - new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it ); + new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it ); } // sync diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 7093ead9..40c2b752 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -97,7 +97,7 @@ FileViewFolderItem::FileViewFolderItem(TQListView *tqparent, const TQString &nam TQString pattern = *ci; TQString tail = pattern.right( pattern.length() - 1 ); - if ( (tail).tqcontains('*') || pattern.tqcontains('?') || pattern.tqcontains('[') || pattern.tqcontains(']') ) + if ( (tail).contains('*') || pattern.contains('?') || pattern.contains('[') || pattern.contains(']') ) { m_patterns.append( new RegExpComparator( pattern ) ); } @@ -371,7 +371,7 @@ void FileGroupsWidget::addFile(const TQString &fileName) if (fvgitem->matches(fileName)) { TQString f = fileName; - if (fileName.tqcontains(m_part->project()->projectDirectory())) + if (fileName.contains(m_part->project()->projectDirectory())) f = fileName.mid(m_part->project()->projectDirectory().length()+1); (void) new FileGroupsFileItem(fvgitem, f); // fvgitem->sortChildItems(0, true); diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index a21ba427..958e756e 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -234,7 +234,7 @@ TQString FileTreeWidget::projectDirectory() */ bool FileTreeWidget::isInProject(const TQString &fileName) const { - return m_projectFiles.tqcontains(fileName); + return m_projectFiles.contains(fileName); } /////////////////////////////////////////////////////////////////////////////// @@ -262,7 +262,7 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr continue; kdDebug(9017) << "adding file: " << *it << endl; const TQString file = projectDirectory() + "/" + ( *it ); - if ( !m_projectFiles.tqcontains( file ) ) + if ( !m_projectFiles.contains( file ) ) { // We got a new file to add to this project. // Ensure all the tqparent directories are part of the project set, too. @@ -276,7 +276,7 @@ void FileTreeWidget::addProjectFiles( TQStringList const & fileList, bool constr // we may stop adding, because its tqparent directories were already added - // in some previous addition. TQString joinedPaths = paths.join("/"); - if( m_projectFiles.tqcontains( joinedPaths ) ) + if( m_projectFiles.contains( joinedPaths ) ) break; m_projectFiles.insert( projectDirectory() + "/" + joinedPaths, true ); paths.pop_back(); diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index a513a1ae..6aebce29 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -155,7 +155,7 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* // const VCSFileInfoMap &vcsFiles = *m_vcsInfoProvider->status( dirName ); // kdDebug(9017) << "Dir has " << vcsFiles.count() << " registered files!" << endl; -// if (vcsFiles.tqcontains( fileName )) +// if (vcsFiles.contains( fileName )) // newItem->setVCSInfo( vcsFiles[ fileName ] ); // else // kdDebug(9017) << "!!!No VCS info for this file!!!" << endl; @@ -308,7 +308,7 @@ void VCSFileTreeWidgetImpl::vcsDirStatusReady( const VCSFileInfoMap &modifiedFil { const TQString fileName = item->fileName(); kdDebug(9017) << "Widget item filename is: " << fileName << endl; - if (modifiedFiles.tqcontains( fileName )) + if (modifiedFiles.contains( fileName )) { const VCSFileInfo &vcsInfo = modifiedFiles[ fileName ]; kdDebug(9017) << "Nice! Found info for this file: " << vcsInfo.toString() << endl; diff --git a/parts/grepview/README.dox b/parts/grepview/README.dox index 23e0eac3..d5e9130a 100644 --- a/parts/grepview/README.dox +++ b/parts/grepview/README.dox @@ -1,5 +1,5 @@ /** \class GrepViewPart -Integrates "tqfind|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions. +Integrates "find|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions. \authors <a href="mailto:bernd AT kdevelop.org">Bernd Gehrmann</a> diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index e565a7d8..be31174f 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -59,7 +59,7 @@ GrepListBoxItem::GrepListBoxItem(const TQString &fileName, const TQString &lineN fileName(fileName), lineNumber(lineNumber), text(text.stripWhiteSpace()), show(showFilename) { - this->text.tqreplace( TQChar('\t'), TQString(" ") ); + this->text.replace( TQChar('\t'), TQString(" ") ); } @@ -174,7 +174,7 @@ void GrepViewWidget::showDialog() if(selectIface && selectIface->hasSelection()) { TQString selText = selectIface->selection(); - if(!selText.tqcontains('\n')) + if(!selText.contains('\n')) { grepdlg->setPattern(selText); } @@ -201,7 +201,7 @@ static TQString escape(const TQString &str) for (uint i=0; i < str.length(); ++i) { - if (escaped.tqfind(str[i]) != -1) + if (escaped.find(str[i]) != -1) res += "\\"; res += str[i]; } @@ -305,7 +305,7 @@ void GrepViewWidget::searchActivated() } command = "cat "; - command += tmpFilePath.tqreplace(' ', "\\ "); + command += tmpFilePath.replace(' ', "\\ "); } } else @@ -319,7 +319,7 @@ void GrepViewWidget::searchActivated() files += " -o -name " + KShellProcess::quote(*it); } - TQString filepattern = "tqfind "; + TQString filepattern = "find "; filepattern += KShellProcess::quote(grepdlg->directoryString()); if (!grepdlg->recursiveFlag()) filepattern += " -maxdepth 1"; @@ -366,9 +366,9 @@ void GrepViewWidget::searchActivated() m_lastPattern = grepdlg->patternString(); TQString pattern = grepdlg->templateString(); if (grepdlg->regexpFlag()) - pattern.tqreplace(TQRegExp("%s"), grepdlg->patternString()); + pattern.replace(TQRegExp("%s"), grepdlg->patternString()); else - pattern.tqreplace(TQRegExp("%s"), escape( grepdlg->patternString() ) ); + pattern.replace(TQRegExp("%s"), escape( grepdlg->patternString() ) ); command += KShellProcess::quote(pattern); m_curOutput->startJob("", command); @@ -402,11 +402,11 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line) { str = TQString::fromLocal8Bit( line ); } - if ( (pos = str.tqfind(':')) != -1) + if ( (pos = str.find(':')) != -1) { filename = str.left(pos); str.remove( 0, pos+1 ); - if ( ( pos = str.tqfind(':') ) != -1) + if ( ( pos = str.find(':') ) != -1) { linenumber = str.left(pos); str.remove( 0, pos+1 ); diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 89c3ced5..48b25db3 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -180,11 +180,11 @@ bool AppOutputWidget::filterSingleLine(const TQString & line) if ( m_filter.m_isRegExp ) { - return ( line.tqfind( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 ); + return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 ); } else { - return ( line.tqfind( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 ); + return ( line.find( m_filter.m_filterString, 0, m_filter.m_caseSensitive ) != -1 ); } } diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp index c365d6cf..a17ba71b 100644 --- a/parts/outputviews/compileerrorfilter.cpp +++ b/parts/outputviews/compileerrorfilter.cpp @@ -53,7 +53,7 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats() // ld ErrorFormat( "undefined reference", 0, 0, 0 ), ErrorFormat( "undefined symbol", 0, 0, 0 ), - ErrorFormat( "ld: cannot tqfind", 0, 0, 0 ), + ErrorFormat( "ld: cannot find", 0, 0, 0 ), ErrorFormat( "No such file", 0, 0, 0 ), // make ErrorFormat( "No rule to make target", 0, 0, 0 ), @@ -98,9 +98,9 @@ void CompileErrorFilter::processLine( const TQString& line ) text = regExp.cap( format->textGroup ); compiler = format->compiler; TQString cap = regExp.cap(3); - if (cap.tqcontains("warning:", false) || cap.tqcontains("Warnung:", false)) + if (cap.contains("warning:", false) || cap.contains("Warnung:", false)) isWarning = true; - if (regExp.cap(3).tqcontains("instantiated from", false)) { + if (regExp.cap(3).contains("instantiated from", false)) { isInstantiationInfo = true; } break; @@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line ) if( hasmatch ) { // Add hacks for error strings you want excluded here - if( text.tqfind( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0 - || text.tqfind( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 ) + if( text.find( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0 + || text.find( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 ) hasmatch = false; } diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp index 9d110533..64945ad5 100644 --- a/parts/outputviews/directorystatusmessagefilter.cpp +++ b/parts/outputviews/directorystatusmessagefilter.cpp @@ -93,18 +93,18 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, // and the input required is very short if these strings match. - if(line.tqfind(en_e) > -1 || - line.tqfind(fr_e) > -1 || - line.tqfind(pl_e) > -1 || - line.tqfind(ja_e) > -1 || - line.tqfind(ko_e) > -1 || - line.tqfind(ko_b) > -1 || - line.tqfind(pt_br_e) > -1 || - line.tqfind(ru_e) > -1 || - line.tqfind(de_e1) > -1 || - line.tqfind(de_e2) > -1 || - line.tqfind(es_e) > -1 || - line.tqfind(nl_e) > -1) + if(line.find(en_e) > -1 || + line.find(fr_e) > -1 || + line.find(pl_e) > -1 || + line.find(ja_e) > -1 || + line.find(ko_e) > -1 || + line.find(ko_b) > -1 || + line.find(pt_br_e) > -1 || + line.find(ru_e) > -1 || + line.find(de_e1) > -1 || + line.find(de_e2) > -1 || + line.find(es_e) > -1 || + line.find(nl_e) > -1) { // grab the directory name if(dirChange.search(line) > -1) @@ -164,17 +164,17 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString // avoid TQRegExp if possible. This regex performs VERY badly with large inputs, // and the input required is very short if these strings match. - if(line.tqfind(en_l) > -1 || - line.tqfind(fr_l) > -1 || - line.tqfind(ja_l) > -1 || - (line.tqfind(ko_l) > -1 && line.tqfind(ko_b) > -1) || - line.tqfind(pt_br_l) > -1 || - line.tqfind(ru_l) > -1 || - line.tqfind(de_l1) > -1 || - line.tqfind(de_l2) > -1 || - line.tqfind(es_l) > -1 || - line.tqfind(nl_l) > -1 || - line.tqfind(po_l) > -1) + if(line.find(en_l) > -1 || + line.find(fr_l) > -1 || + line.find(ja_l) > -1 || + (line.find(ko_l) > -1 && line.find(ko_b) > -1) || + line.find(pt_br_l) > -1 || + line.find(ru_l) > -1 || + line.find(de_l1) > -1 || + line.find(de_l2) > -1 || + line.find(es_l) > -1 || + line.find(nl_l) > -1 || + line.find(po_l) > -1) { // grab the directory name if(dirChange.search(line) > -1 ) diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index ca3e843a..61e98409 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -233,7 +233,7 @@ void MakeActionFilter::test() "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " - "kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " + "kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", "linking", "libtool", "libkfilereplacepart.la.closure") << TestItem( //libtool, linking 3 @@ -241,7 +241,7 @@ void MakeActionFilter::test() "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la -rpath /opt/kde3/lib/kde3 " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/kde3/lib -version-info 1:0:0 kfilereplacepart.lo " - "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfiletqreplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " + "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", "linking", "libtool", "libkfilereplacepart.la") << TestItem( //automake, builddir!=srcdir, libtool=no, compiling diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 4734408f..a35a3d3c 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -247,20 +247,20 @@ void MakeWidget::startNextJob() currentCommand = *it; commandList.remove(it); - int i = currentCommand.tqfindRev(" gmake"); + int i = currentCommand.findRev(" gmake"); if ( i == -1 ) - i = currentCommand.tqfindRev(" make"); + i = currentCommand.findRev(" make"); if ( i == -1 ) m_bCompiling = false; else { TQString s = currentCommand.right(currentCommand.length() - i); - if ( s.tqcontains("configure ") || - s.tqcontains(" Makefile.cvs") || - s.tqcontains(" clean") || - s.tqcontains(" distclean") || - s.tqcontains(" package-messages") || - s.tqcontains(" install") ) + if ( s.contains("configure ") || + s.contains(" Makefile.cvs") || + s.contains(" clean") || + s.contains(" distclean") || + s.contains(" package-messages") || + s.contains(" install") ) { m_bCompiling = false; } @@ -337,10 +337,10 @@ void MakeWidget::copy() selection.remove((selection.length()-1) - removeend, removeend); } - selection.tqreplace("<","<"); - selection.tqreplace(">",">"); - selection.tqreplace(""","\""); - selection.tqreplace("&","&"); + selection.replace("<","<"); + selection.replace(">",">"); + selection.replace(""","\""); + selection.replace("&","&"); kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard); } @@ -453,7 +453,7 @@ void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const TQStringList files = m_part->project()->allFiles(); for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it) { - if( (*it).tqcontains( file ) ) + if( (*it).contains( file ) ) { fName = URLUtil::canonicalPath( m_part->project()->projectDirectory() + "/" + *it ); } diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index bebbbc53..b94e01f3 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -117,7 +117,7 @@ TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text) TQStringList::const_iterator it = m_items.begin(); while( it != m_items.end() ) { - if ( (*it).tqfind( re ) != -1 ) + if ( (*it).find( re ) != -1 ) { matches << *it; } diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index ebeeb311..3e8242e8 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -24,24 +24,24 @@ #include "replace_widget.h" -static const KDevPluginInfo data("kdevtqreplace"); +static const KDevPluginInfo data("kdevreplace"); typedef KDevGenericFactory<ReplacePart> ReplaceFactory; -K_EXPORT_COMPONENT_FACTORY(libkdevtqreplace, ReplaceFactory(data)) +K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data)) ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringList& ) : KDevPlugin( &data, tqparent, name ? name : "ReplacePart" ) { setInstance(ReplaceFactory::instance()); - setXMLFile("kdevpart_tqreplace.rc"); + setXMLFile("kdevpart_replace.rc"); m_widget = new ReplaceWidget(this); - m_widget->setIcon( SmallIcon("filetqfind") ); + m_widget->setIcon( SmallIcon("filefind") ); m_widget->setCaption(i18n("Replace")); TQWhatsThis::add (m_widget, i18n("<b>Replace</b><p>" - "This window shows a preview of a string tqreplace " + "This window shows a preview of a string replace " "operation. Uncheck a line to exclude that replacement. " "Uncheck a file to exclude the whole file from the " "operation. " @@ -60,7 +60,7 @@ ReplacePart::ReplacePart(TQObject *tqparent, const char *name, const TQStringLis "can enter a string or a regular expression which is then " "searched for within all files in the locations " "you specify. Matches will be displayed in the <b>Replace</b> window, you " - "can replace them with the specified string, exclude them from replace operation or cancel the whole tqreplace.") ); + "can replace them with the specified string, exclude them from replace operation or cancel the whole replace.") ); connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(enableAction())); diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 957f845a..1136e08a 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -69,21 +69,21 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout ); _cancel = new KPushButton( KStdGuiItem::cancel(), this ); - _tqreplace = new KPushButton( KGuiItem(i18n("Replace"),"filetqfind"), this ); + _replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this ); _cancel->setEnabled( false ); - _tqreplace->setEnabled( false ); + _replace->setEnabled( false ); - buttontqlayout->addWidget( _tqreplace ); + buttontqlayout->addWidget( _replace ); buttontqlayout->addWidget( _cancel ); _listview = new ReplaceView( this ); tqlayout->addWidget( _listview ); // setup signals - connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( tqfind() ) ); + connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) ); - connect( _tqreplace, TQT_SIGNAL( clicked() ), TQT_SLOT( tqreplace() ) ); + connect( _replace, TQT_SIGNAL( clicked() ), TQT_SLOT( replace() ) ); connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); @@ -142,7 +142,7 @@ void ReplaceWidget::showDialog() } -void ReplaceWidget::tqfind() +void ReplaceWidget::find() { _listview->clear(); m_part->mainWindow()->raiseView( this ); @@ -153,7 +153,7 @@ void ReplaceWidget::tqfind() if ( showReplacements() ) { _cancel->setEnabled( true ); - _tqreplace->setEnabled( true ); + _replace->setEnabled( true ); } else { @@ -162,7 +162,7 @@ void ReplaceWidget::tqfind() } } -void ReplaceWidget::tqreplace() +void ReplaceWidget::replace() { makeReplacements(); clear(); @@ -174,7 +174,7 @@ void ReplaceWidget::clear() _listview->clear(); _cancel->setEnabled( false ); - _tqreplace->setEnabled( false ); + _replace->setEnabled( false ); m_part->mainWindow()->setViewAvailable( this, false ); } @@ -215,7 +215,7 @@ bool ReplaceWidget::showReplacements() break; } - if ( openfiles.tqcontains( *it ) ) + if ( openfiles.contains( *it ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( *it ) ) { @@ -290,7 +290,7 @@ bool ReplaceWidget::makeReplacements() { TQString currentfile = fileitem->file(); - if ( openfiles.tqcontains( currentfile ) ) + if ( openfiles.contains( currentfile ) ) { if ( KTextEditor::EditInterface * ei = getEditInterfaceForFile( currentfile ) ) { @@ -437,7 +437,7 @@ TQStringList ReplaceWidget::openProjectFiles() if ( KTextEditor::Editor * ed = dynamic_cast<KTextEditor::Editor *>( part ) ) { TQString editorpath = ed->url().path(); - if ( projectfiles.tqcontains( editorpath ) ) + if ( projectfiles.contains( editorpath ) ) { openfiles.append( editorpath ); } diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index ea1e3dc6..b3959124 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -42,8 +42,8 @@ protected: virtual void focusInEvent(TQFocusEvent *e); private slots: - void tqfind(); - void tqreplace(); + void find(); + void replace(); void clear(); void editDocument( const TQString & ,int ); void setCursorPos( KParts::Part *part, uint line, uint col ); @@ -69,7 +69,7 @@ private: ReplaceView * _listview; TQPushButton * _cancel; - TQPushButton * _tqreplace; + TQPushButton * _replace; uint calledCol; uint calledLine; diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui index 559a226d..6a8b81f9 100644 --- a/parts/replace/replacedlg.ui +++ b/parts/replace/replacedlg.ui @@ -276,7 +276,7 @@ <cstring>textLabel1</cstring> </property> <property name="text"> - <string>&Text to tqfind:</string> + <string>&Text to find:</string> </property> <property name="buddy" stdset="0"> <cstring>find_combo</cstring> diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 0973e54f..87be28f9 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -27,7 +27,7 @@ TQString escape(const TQString &str) for (uint i=0; i < str.length(); ++i) { - if (escaped.tqfind(str[i]) != -1) + if (escaped.find(str[i]) != -1) res += "\\"; res += str[i]; } diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index 5f5eee77..b81b7dbb 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -60,7 +60,7 @@ void ReplaceView::makeReplacementsForFile( TQTextStream & istream, TQTextStream line++; } // this is the hit - ostream << istream.readLine().tqreplace( _regexp, _replacement ) << "\n"; + ostream << istream.readLine().replace( _regexp, _replacement ) << "\n"; line++; } @@ -84,9 +84,9 @@ void ReplaceView::showReplacementsForFile( TQTextStream & stream, TQString const { TQString s = stream.readLine(); - if ( s.tqcontains( _regexp ) > 0 ) + if ( s.contains( _regexp ) > 0 ) { - s.tqreplace( _regexp, _replacement ); + s.replace( _regexp, _replacement ); if ( firstline ) { diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 6a83681e..e460cb67 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -589,9 +589,9 @@ TQString SnippetWidget::parseText(TQString text, TQString del) TQRect rMulti = _SnippetConfig.getMultiRect(); do { - iFound = text.tqfind(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this TQRegExp + iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this TQRegExp if (iFound >= 0) { - iEnd = text.tqfind(del, iFound+1)+1; + iEnd = text.find(del, iFound+1)+1; strName = text.mid(iFound, iEnd-iFound); if ( strName != del+del ) { //if not doubel-delimiter @@ -612,7 +612,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) } if (iInMeth == 0) { //if input-method "single" is selected - str.tqreplace(strName, strNew); + str.replace(strName, strNew); } mapVar[strName] = strNew; @@ -627,7 +627,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog TQMap<TQString, TQString>::Iterator it; for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the replacement - str.tqreplace(it.key(), it.data()); + str.replace(it.key(), it.data()); } } else { return ""; @@ -958,7 +958,7 @@ void SnippetWidget::languageChanged() for (SnippetItem *it=_list.first(); it; it=_list.next()) { SnippetGroup * group = dynamic_cast<SnippetGroup*>(it); if (group) { - if (group->getLanguage() == i18n("All") || langs.tqcontains(group->getLanguage())) { + if (group->getLanguage() == i18n("All") || langs.contains(group->getLanguage())) { group->setOpen(TRUE); } else { group->setOpen(FALSE); diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index 59a6fb21..269c8136 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -291,7 +291,7 @@ void TextToolsWidget::parseXML() ++endpos; } - if (!m_relevantTags.tqcontains(tag)) { + if (!m_relevantTags.contains(tag)) { pos = endpos; continue; } @@ -327,7 +327,7 @@ void TextToolsWidget::parseXML() ++endpos; } - if (!m_relevantTags.tqcontains(tag)) { + if (!m_relevantTags.contains(tag)) { pos = endpos; continue; } @@ -337,7 +337,7 @@ void TextToolsWidget::parseXML() item->pos = pos; item->endpos = -1; - if (m_emptyTags.tqcontains(tag)) + if (m_emptyTags.contains(tag)) item->endpos = endpos; else currentItem = item; @@ -376,8 +376,8 @@ void TextToolsWidget::parseLaTeX() TQString tag = re.cap(1); TQString title = re.cap(2); kdDebug(9030) << "Match with " << tag << " and title " << title << endl; - int level = hierarchyLevels.tqfind(tag); - while (currentItem->tqparent() && level <= hierarchyLevels.tqfind(currentItem->tag)) + int level = hierarchyLevels.find(tag); + while (currentItem->tqparent() && level <= hierarchyLevels.find(currentItem->tag)) currentItem = currentItem->parentStructItem(); TextStructItem *item = new TextStructItem(currentItem); @@ -386,7 +386,7 @@ void TextToolsWidget::parseLaTeX() item->pos = pos+1; item->endpos = pos+re.matchedLength()-1; // lie - if (level > hierarchyLevels.tqfind(currentItem->tag)) + if (level > hierarchyLevels.find(currentItem->tag)) currentItem = item; pos = pos+re.matchedLength(); diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 95400863..1844ba06 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -94,7 +94,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con exec = _exec; dEntry = _dEntry; exec.simplifyWhiteSpace(); - exec.truncate(exec.tqfind(' ')); + exec.truncate(exec.find(' ')); } diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index fbc02bd9..b6420714 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -135,21 +135,21 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) TQString word = KDevEditorUtil::currentWord( doc ); // This should really be checked before inserting into the popup - if (cmdline.tqcontains("%D") && projectDirectory.isNull()) + if (cmdline.contains("%D") && projectDirectory.isNull()) return; - cmdline.tqreplace(TQRegExp("%D"), projectDirectory); + cmdline.replace(TQRegExp("%D"), projectDirectory); - if (cmdline.tqcontains("%S") && fileName.isNull()) + if (cmdline.contains("%S") && fileName.isNull()) return; - cmdline.tqreplace(TQRegExp("%S"), fileName); + cmdline.replace(TQRegExp("%S"), fileName); - if (cmdline.tqcontains("%T") && selection.isNull()) + if (cmdline.contains("%T") && selection.isNull()) return; - cmdline.tqreplace(TQRegExp("%T"), selection); + cmdline.replace(TQRegExp("%T"), selection); - if (cmdline.tqcontains("%W") && word.isNull()) + if (cmdline.contains("%W") && word.isNull()) return; - cmdline.tqreplace(TQRegExp("%W"), word); + cmdline.replace(TQRegExp("%W"), word); if (captured) { diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp index 5020b123..da96adad 100644 --- a/parts/tools/toolsconfigwidget.cpp +++ b/parts/tools/toolsconfigwidget.cpp @@ -125,7 +125,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry bool ToolsConfigWidget::addEntry(ToolsConfigEntry *entry, TQDict<ToolsConfigEntry> *entryDict) { TQString menutext = entry->menutext; - if (entryDict->tqfind(menutext)) { + if (entryDict->find(menutext)) { delete entry; KMessageBox::sorry(this, i18n("An entry with this title exists already.")); return false; diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index 247eaee1..5caa2db6 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -109,18 +109,18 @@ TQString ValgrindDialog::valParams() const void ValgrindDialog::setValParams( const TQString& params ) { TQString myParams = params; - if ( myParams.tqcontains( leakCheckParam ) ) + if ( myParams.contains( leakCheckParam ) ) w->memleakBox->setChecked( true ); - if ( myParams.tqcontains( reachableParam ) ) + if ( myParams.contains( reachableParam ) ) w->reachableBox->setChecked( true ); - if ( myParams.tqcontains( tqchildrenParam ) ) + if ( myParams.contains( tqchildrenParam ) ) w->tqchildrenBox->setChecked( true ); w->init(); - myParams = myParams.tqreplace( TQRegExp( memCheckParam ), "" ); - myParams = myParams.tqreplace( TQRegExp( leakCheckParam ), "" ); - myParams = myParams.tqreplace( TQRegExp( reachableParam ), "" ); - myParams = myParams.tqreplace( TQRegExp( tqchildrenParam ), "" ); + myParams = myParams.replace( TQRegExp( memCheckParam ), "" ); + myParams = myParams.replace( TQRegExp( leakCheckParam ), "" ); + myParams = myParams.replace( TQRegExp( reachableParam ), "" ); + myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->valParamEdit->setText( myParams ); } @@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params ) //force --tool=callgrind if no params are given if (myParams.isEmpty()) myParams = "--tool=callgrind"; - if ( myParams.tqcontains( tqchildrenParam ) ) + if ( myParams.contains( tqchildrenParam ) ) w->ctChildrenBox->setChecked( true ); w->init(); - myParams = myParams.tqreplace( TQRegExp( tqchildrenParam ), "" ); + myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" ); myParams = myParams.stripWhiteSpace(); w->ctParamEdit->setText( myParams ); } diff --git a/src/core.cpp b/src/core.cpp index 6dc493bf..c189fcf8 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -46,7 +46,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client) if (tooltip.isEmpty()) tooltip = action->text().remove('&'); else { - int i = tooltip.tqfindRev('('); + int i = tooltip.findRev('('); if (i > 0) tooltip = tooltip.left(i).stripWhiteSpace(); } @@ -109,8 +109,8 @@ namespace MainWindowUtils{ TQString beautifyToolTip(const TQString& text) { TQString temp = text; - temp.tqreplace(TQRegExp("&"), ""); - temp.tqreplace(TQRegExp("\\.\\.\\."), ""); + temp.replace(TQRegExp("&"), ""); + temp.replace(TQRegExp("\\.\\.\\."), ""); return temp; } } diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 0cf0e3f1..345af582 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -163,9 +163,9 @@ void EditorProxy::popupAboutToShow() for (int index=popup->count()-1; index >= 0; --index) { int id = popup->idAt(index); - if (m_popupIds.tqcontains(id) == 0) + if (m_popupIds.contains(id) == 0) { - TQMenuItem *item = popup->tqfindItem(id); + TQMenuItem *item = popup->findItem(id); if ( item && item->popup() ) delete item->popup(); else @@ -182,7 +182,7 @@ void EditorProxy::popupAboutToShow() TQString wordstr; TQString selection = KDevEditorUtil::currentSelection( doc ); - if ( !selection.isEmpty() && selection.tqcontains('\n') != 0 ) + if ( !selection.isEmpty() && selection.contains('\n') != 0 ) { wordstr = selection; } @@ -201,7 +201,7 @@ void EditorProxy::popupAboutToShow() for( uint i = 0; i < popup->count(); ) { int id = popup->idAt( i ); - if( lastWasSeparator && popup->tqfindItem( id )->isSeparator() ) + if( lastWasSeparator && popup->findItem( id )->isSeparator() ) { popup->removeItem( id ); // Since we removed an item, don't increment i diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index e2af092e..b21f4c3a 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -120,7 +120,7 @@ void LanguageSelectWidget::readProjectConfig() if (la == language) continue; LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() ); - item->setOn(languages.tqcontains(la)); + item->setOn(languages.contains(la)); } TQListViewItem * first = _pluginList->firstChild(); diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 4960d870..404a0bae 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -84,7 +84,7 @@ KParts::Part *MultiBuffer::activeBuffer( ) const bool MultiBuffer::hasURL( const KURL &url ) const { - return m_buffers.tqcontains( url ); + return m_buffers.contains( url ); } int MultiBuffer::numberOfBuffers() const @@ -124,7 +124,7 @@ KParts::Part* MultiBuffer::openURL( const KURL &url ) bool MultiBuffer::closeURL( const KURL &url ) { - if ( !m_buffers.tqcontains( url ) ) + if ( !m_buffers.contains( url ) ) return false; bool result = false; @@ -256,7 +256,7 @@ void MultiBuffer::setOrientation( Qt::Orientation orientation ) void MultiBuffer::activePartChanged( const KURL &url ) { - if ( !m_buffers.tqcontains( url ) ) + if ( !m_buffers.contains( url ) ) return ; m_activeBuffer = m_buffers[ url ]; @@ -300,4 +300,4 @@ void MultiBuffer::updateUrlForPart(KParts::Part *part, KURL url) #include "multibuffer.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/multibuffer.h b/src/multibuffer.h index f6f40ea6..e3cabcf0 100644 --- a/src/multibuffer.h +++ b/src/multibuffer.h @@ -87,4 +87,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/newui/button.cpp b/src/newui/button.cpp index 1795b18a..1e28a827 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -78,7 +78,7 @@ Button::~Button() if (r.search(m_realText) > -1) { TQString text = m_realText; - if (text.tqcontains(r2)) + if (text.contains(r2)) text.remove(r2); config->writeEntry(TQString("button_%1").tqarg(text), r.cap(1)); } @@ -304,7 +304,7 @@ void Button::contextMenuEvent(TQContextMenuEvent *e) TQPopupMenu menu; m_assignAccelAction->plug(&menu); - if (m_realText.tqcontains(TQRegExp("^&[0-9]\\s"))) + if (m_realText.contains(TQRegExp("^&[0-9]\\s"))) m_clearAccelAction->plug(&menu); emit contextMenu( &menu ); @@ -340,7 +340,7 @@ TQString Button::realTextWithoutAccel() const { TQString text = m_realText; TQRegExp r("^&[0-9]\\s"); - if (text.tqcontains(r)) + if (text.contains(r)) text.remove(r); return text; } diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp index 342e3491..55f55fb4 100644 --- a/src/newui/buttonbar.cpp +++ b/src/newui/buttonbar.cpp @@ -249,7 +249,7 @@ void ButtonBar::deshrink(int preferredDimension, int actualDimension) int i = 0; for (TQValueList<uint>::iterator it = texts.begin(); it != texts.end(); ++it, i++) { - if (m_buttons[i]->text().tqcontains("...")) + if (m_buttons[i]->text().contains("...")) (*it)++; newTextLength += *it; } @@ -309,7 +309,7 @@ Button *ButtonBar::firstButton() Button *ButtonBar::nextTo(Button *button) { - ButtonList::iterator it = m_buttons.tqfind(button); + ButtonList::iterator it = m_buttons.find(button); Button *next = 0; if ((*it) == m_buttons.last()) next = m_buttons.first(); @@ -326,7 +326,7 @@ Button *ButtonBar::nextTo(Button *button) Button *ButtonBar::prevTo(Button *button) { - ButtonList::iterator it = m_buttons.tqfind(button); + ButtonList::iterator it = m_buttons.find(button); Button *prev = 0; if (it == m_buttons.begin()) prev = m_buttons.last(); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 95b36eab..8394b00f 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -404,7 +404,7 @@ void DDockWindow::moveToDockBottom() void DDockWindow::moveToDock(DDockWindow::Position position ) { - if ( m_widgets.tqcontains( m_lastContextMenuButton ) ) + if ( m_widgets.contains( m_lastContextMenuButton ) ) { mainWindow()->moveWidget( position, m_widgets[ m_lastContextMenuButton ], m_lastContextMenuButton->realTextWithoutAccel() ); } diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 2343b044..68e8883d 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -116,10 +116,10 @@ void DMainWindow::addWidget(DTabWidget *tab, TQWidget *widget, const TQString &t void DMainWindow::removeWidget(TQWidget *widget) { - if (!m_widgets.tqcontains(widget)) + if (!m_widgets.contains(widget)) return; //not a widget in main window - if (m_widgetTabs.tqcontains(widget)) + if (m_widgetTabs.contains(widget)) { DTabWidget *tab = m_widgetTabs[widget]; if (tab->indexOf(widget) >= 0) @@ -188,12 +188,12 @@ void DMainWindow::invalidateActiveTabWidget() kdDebug(9000) << "tqinvalidate: " << focused << endl; if (focused == 0) return; - if (!m_widgets.tqcontains(focused)) + if (!m_widgets.contains(focused)) { kdDebug(9000) << " focused is not in m_widgets" << endl; return; } - if (m_widgetTabs.tqcontains(focused)) + if (m_widgetTabs.contains(focused)) { kdDebug(9000) << " focused is in m_widgets and m_widgetTabs" << endl; DTabWidget *tab = m_widgetTabs[focused]; @@ -218,7 +218,7 @@ DTabWidget *DMainWindow::createTab() bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev) { TQWidget *w = (TQWidget*)obj; - if (!m_widgets.tqcontains(w)) + if (!m_widgets.contains(w)) return KParts::MainWindow::eventFilter(obj, ev); if ((m_currentWidget != w) && (ev->type() == TQEvent::FocusIn)) @@ -228,7 +228,7 @@ bool DMainWindow::eventFilter(TQObject *obj, TQEvent *ev) } else if (ev->type() == TQEvent::IconChange) { - if (m_widgetTabs.tqcontains(w)) + if (m_widgetTabs.contains(w)) { DTabWidget *tab = m_widgetTabs[w]; tab->setTabIconSet(w, w->icon() ? (*(w->icon())) : TQPixmap()); @@ -261,7 +261,7 @@ void DMainWindow::closeTab(TQWidget *) void DMainWindow::moveWidget(DDockWindow::Position position, TQWidget * view, const TQString & title) { - if (m_docks.tqcontains(view)) + if (m_docks.contains(view)) { toolWindow(m_docks[view])->removeWidget(view); @@ -285,7 +285,7 @@ void DMainWindow::removeDockWidget(TQWidget *view) bool DMainWindow::hasDockWidget(TQWidget *view) { - return m_docks.tqcontains(view); + return m_docks.contains(view); } DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) @@ -297,7 +297,7 @@ void DMainWindow::widgetDestroyed() { TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); - if (m_docks.tqcontains(w)) + if (m_docks.contains(w)) { kdError() << "Widget destroyed before being removed from UI!" << endl; m_docks.remove(w); @@ -306,4 +306,4 @@ void DMainWindow::widgetDestroyed() #include "dmainwindow.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index a14417eb..4c9c6c6f 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -210,7 +210,7 @@ KURL PartController::findURLInProject(const KURL& url) { TQStringList fileList = API::getInstance()->project()->allFiles(); - bool filenameOnly = (url.url().tqfind('/') == -1); + bool filenameOnly = (url.url().find('/') == -1); TQString filename = filenameOnly ? "/" : ""; filename += url.url(); @@ -442,7 +442,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); - if ( texttypeslist.tqcontains( MimeType->name() ) ) + if ( texttypeslist.contains( MimeType->name() ) ) { m_openNextAsText = true; } @@ -830,7 +830,7 @@ void PartController::updatePartURL( KParts::ReadOnlyPart * ro_part ) bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part ) { - if ( _partURLMap.tqcontains( ro_part ) && !ro_part->url().isEmpty() ) + if ( _partURLMap.contains( ro_part ) && !ro_part->url().isEmpty() ) { if ( _partURLMap[ ro_part ] != ro_part->url() ) { @@ -842,7 +842,7 @@ bool PartController::partURLHasChanged( KParts::ReadOnlyPart * ro_part ) KURL PartController::storedURLForPart( KParts::ReadOnlyPart * ro_part ) { - if ( _partURLMap.tqcontains( ro_part ) ) + if ( _partURLMap.contains( ro_part ) ) { return _partURLMap[ ro_part ]; } @@ -1216,7 +1216,7 @@ bool PartController::closeFilesDialog( KURL::List const & ignoreList ) while ( KParts::Part* part = it.current() ) { KParts::ReadOnlyPart * ro_part = dynamic_cast<KParts::ReadOnlyPart*>( part ); - if ( ro_part && !ignoreList.tqcontains( ro_part->url() ) || !ro_part ) + if ( ro_part && !ignoreList.contains( ro_part->url() ) || !ro_part ) { closePart( part ); } @@ -1426,7 +1426,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload ) if ( reason > 0 ) { - if ( !_dirtyDocuments.tqcontains( doc ) ) + if ( !_dirtyDocuments.contains( doc ) ) { _dirtyDocuments.append( doc ); } @@ -1455,7 +1455,7 @@ void PartController::slotDocumentDirtyStepTwo( void * payload ) bool PartController::isDirty( KURL const & url ) { - return _dirtyDocuments.tqcontains( static_cast<KTextEditor::Document*>( partForURL( url ) ) ); + return _dirtyDocuments.contains( static_cast<KTextEditor::Document*>( partForURL( url ) ) ); } bool PartController::reactToDirty( KURL const & url, unsigned char reason ) diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 85d0b068..3c75fd89 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -144,7 +144,7 @@ void PluginController::loadPlugins( KTrader::OfferList offers, const TQStringLis TQString name = (*it)->desktopEntryName(); // Check if it is already loaded or shouldn't be - if( m_parts[ name ] != 0 || ignorePlugins.tqcontains( name ) ) + if( m_parts[ name ] != 0 || ignorePlugins.contains( name ) ) continue; emit loadingPlugin(i18n("Loading: %1").tqarg((*it)->genericName())); diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index 18eef37d..e6973d79 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -137,7 +137,7 @@ void PluginSelectDialog::init( ) TQString Comment = (*it)->comment(); TQRegExp re("\\bhttp://[\\S]*"); re.search( Comment ); - Comment.tqreplace( re, "" ); + Comment.replace( re, "" ); TQString url; if ( re.pos() > -1 ) @@ -146,9 +146,9 @@ void PluginSelectDialog::init( ) } PluginItem *item = new PluginItem( plugin_list, (*it)->desktopEntryName(), (*it)->genericName(), Comment, url ); - item->setOn( loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) ); + item->setOn( loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ); - kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.tqcontains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl; + kdDebug(9000) << (*it)->desktopEntryName() << " : " << (loadedPluginDesktopNames.contains( (*it)->desktopEntryName() ) ? "YES" : "NO" ) << endl; } TQListViewItem * first = plugin_list->firstChild(); diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 0e3fb5d4..ca6b6633 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -122,7 +122,7 @@ void ProfileEditor::refreshPropertyCombo() TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList(); for (TQStringList::const_iterator p = currProps.constBegin(); p != currProps.constEnd(); ++p) - if (!props.tqcontains(*p)) + if (!props.contains(*p)) props.append(*p); } props.sort(); @@ -271,8 +271,8 @@ void ProfileEditor::removeProfile() void ProfileEditor::addProperty() { if ( (!propertyCombo->currentText().isEmpty()) && - (ownPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) && - (derivedPropertiesBox->tqfindItem(propertyCombo->currentText()) == 0) ) + (ownPropertiesBox->findItem(propertyCombo->currentText()) == 0) && + (derivedPropertiesBox->findItem(propertyCombo->currentText()) == 0) ) { ownPropertiesBox->insertItem(propertyCombo->currentText()); @@ -322,9 +322,9 @@ void ProfileEditor::addEnabled() text = allList->currentItem()->text(0); } - if (enabledList->tqfindItem(text, 0) != 0) + if (enabledList->findItem(text, 0) != 0) return; - if (disabledList->tqfindItem(text, 0) != 0) + if (disabledList->findItem(text, 0) != 0) { KMessageBox::error(this, i18n("This plugin is already contained in the list of disabled plugins."), i18n("Enable Plugin")); @@ -368,9 +368,9 @@ void ProfileEditor::addDisabled() text = allList->currentItem()->text(0); } - if (disabledList->tqfindItem(text, 0) != 0) + if (disabledList->findItem(text, 0) != 0) return; - if (enabledList->tqfindItem(text, 0) != 0) + if (enabledList->findItem(text, 0) != 0) { KMessageBox::error(this, i18n("This plugin is already contained in the list of enabled plugins."), i18n("Disable Plugin")); diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 5c94d566..a5ad5803 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -119,7 +119,7 @@ Profile::EntryList Profile::list(List type) void Profile::addEntry(List type, const TQString &value) { TQStringList &list = listByType(type); - if (!list.tqcontains(value)) + if (!list.contains(value)) list.append(value); } diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index 7a6d65d8..896d8080 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -57,7 +57,7 @@ void ProfileEngine::processDir(const TQString &dir, const TQString &currPath, TQ { TQString dirName = *eit; Profile *profile = 0; - if (passedPaths.tqcontains(currPath + dirName)) + if (passedPaths.contains(currPath + dirName)) profile = passedPaths[currPath + dirName]; else { @@ -127,7 +127,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType Profile::EntryList enableList = profile->list(Profile::ExplicitEnable); for (Profile::EntryList::const_iterator it = enableList.begin(); it != enableList.end(); ++it) { - if (names.tqcontains((*it).name)) + if (names.contains((*it).name)) continue; TQString constraint = TQString::tqfromLatin1("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION); constraint += TQString::tqfromLatin1("and [Name] == '%1'").tqarg((*it).name); @@ -229,7 +229,7 @@ void ProfileEngine::diffProfiles(OfferType offerType, const TQString &profile1, it != offers1List.constEnd(); ++it) { // kdDebug() << "checking: " << *it << endl; - if (offers2List.tqcontains(*it)) + if (offers2List.contains(*it)) { // kdDebug() << " keep" << endl; offers2.remove(offers2List[*it]); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 42e5337d..58cbaaef 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -648,7 +648,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) // for (TQStringList::const_iterator it = profileKeywords.constBegin(); // it != profileKeywords.constEnd(); ++it) // { -// if (keywords.tqcontains(*it)) +// if (keywords.contains(*it)) // { // idx = profileKeywords.findIndex(*it); // break; diff --git a/src/projectsession.cpp b/src/projectsession.cpp index cddf5d77..c471366f 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -112,7 +112,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ TQString pluginName = pPlugin->instance()->instanceName(); TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement(); if (!pluginEl.isNull()) { - // now plugin, load what you tqfind! + // now plugin, load what you find! pPlugin->restorePartialProjectSession(&pluginEl); } ++it; diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index cbbb1543..1f2c4dd5 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -182,7 +182,7 @@ void SimpleMainWindow::contextMenu(TQPopupMenu *popupMenu, const Context *contex bool isOpen = true; for (KURL::List::const_iterator it = m_splitURLs.begin(); it != m_splitURLs.end(); ++it) { - if (!PartController::getInstance()->openURLs().tqcontains(*it) && (*it).isValid()) + if (!PartController::getInstance()->openURLs().contains(*it) && (*it).isValid()) { isOpen = false; break; @@ -217,7 +217,7 @@ void SimpleMainWindow::embedPartView(TQWidget *view, const TQString &title, cons return; TQString shortName = title; - shortName = shortName.right( shortName.length() - (shortName.tqfindRev('/') +1)); + shortName = shortName.right( shortName.length() - (shortName.findRev('/') +1)); addWidget(view, title); view->show(); @@ -338,7 +338,7 @@ void SimpleMainWindow::raiseView(TQWidget *view) DDockWindow *dock = toolWindow(dockWidgetPosition(view)); dock->raiseWidget(view); } - else if (m_widgets.tqcontains(view) && m_widgetTabs.tqcontains(view)) + else if (m_widgets.contains(view) && m_widgetTabs.contains(view)) m_widgetTabs[view]->showPage(view); } @@ -943,7 +943,7 @@ void SimpleMainWindow::switchToNextTabWidget() TQValueList<DTabWidget*>::iterator it = tabWidgets.begin(); while ( it != tabWidgets.end() ) { - if ( !reduced.tqcontains( *it ) ) + if ( !reduced.contains( *it ) ) { reduced << *it; } @@ -1008,4 +1008,4 @@ void SimpleMainWindow::projectClosed() #include "simplemainwindow.moc" -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index 11180edb..19ef20b2 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -136,6 +136,6 @@ private: KURL::List m_splitURLs; }; -// kate: space-indent on; indent-width 4; tab-width 4; tqreplace-tabs on +// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on #endif diff --git a/vcs/cvsservice/bufferedstringreader.cpp b/vcs/cvsservice/bufferedstringreader.cpp index f9d1ecb2..bdaa26f3 100644 --- a/vcs/cvsservice/bufferedstringreader.cpp +++ b/vcs/cvsservice/bufferedstringreader.cpp @@ -34,7 +34,7 @@ TQStringList BufferedStringReader::process( const TQString &otherChars ) TQStringList strings; // Now find all the basic strings in the buffer int pos; - while ( (pos = m_stringBuffer.tqfind('\n')) != -1) + while ( (pos = m_stringBuffer.find('\n')) != -1) { TQString line = m_stringBuffer.left( pos ); if (!line.isEmpty()) diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp index 80dabbe5..bd06767b 100644 --- a/vcs/cvsservice/cvsdir.cpp +++ b/vcs/cvsservice/cvsdir.cpp @@ -202,7 +202,7 @@ CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) con if (refreshCache) refreshEntriesCache(); - if (m_cachedEntries.tqcontains( fileName )) + if (m_cachedEntries.contains( fileName )) { return m_cachedEntries[ fileName ]; } diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index eb8ca704..bf478f7c 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -91,7 +91,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) m_state = Added; else if ( revision().length() > 3 && revision()[0] == '-' ) m_state = Removed; - else if ( timeStamp().tqfind('+') >= 0 ) + else if ( timeStamp().find('+') >= 0 ) m_state = Conflict; else { @@ -184,4 +184,4 @@ VCSFileInfo CVSEntry::toVCSFileInfo() const return VCSFileInfo( fileName(), revision(), revision(), fileState ); } -//kate: space-indent on; indent-width 4; tqreplace-tabs on; +//kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 9eb57fcf..7830f643 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -137,7 +137,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) /* FileTree will call requesttqStatus() everytime the user expands a directory * Unfortunatly requesttqStatus() will be called before the * VCSFileTreeViewItem of the directory will be filled with the files - * it tqcontains. Meaning, m_savedCallerData contains no childs at that + * it contains. Meaning, m_savedCallerData contains no childs at that * time. When a dcop call is made to run "cvs status" this is no problem. * The dcop call takes quit long, and so FileTree has enough time the fill * in the childs before we report the status back. @@ -226,14 +226,14 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) state = 1; else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName { - fileName = rx_fileName.cap().tqreplace( "File:", "" ).stripWhiteSpace(); - filetqStatus = rx_filetqStatus.cap().tqreplace( "tqStatus:", "" ).stripWhiteSpace(); + fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace(); + filetqStatus = rx_filetqStatus.cap().replace( "tqStatus:", "" ).stripWhiteSpace(); ++state; // Next state kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl; } else if (state == 2 && rx_fileWorkRev.search( s ) >= 0) { - workingRevision = s.tqreplace( "Working revision:", "" ).stripWhiteSpace(); + workingRevision = s.replace( "Working revision:", "" ).stripWhiteSpace(); TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" ); if (rx_revision.search( workingRevision ) >= 0) @@ -245,7 +245,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) } else if (state == 3 && rx_fileRepoRev.search( s ) >= 0) { - repositoryRevision = s.tqreplace( "Repository revision:", "" ).stripWhiteSpace(); + repositoryRevision = s.replace( "Repository revision:", "" ).stripWhiteSpace(); TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" ); if (rx_revision.search( s ) >= 0) @@ -311,4 +311,4 @@ void CVSFileInfoProvider::printOutFileInfoMap( const VCSFileInfoMap &map ) } #include "cvsfileinfoprovider.moc" -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 1f4b925e..07e59ce7 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -133,7 +133,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus ) TQString dstr = "<b>" + s + "</b> "; int lastVer = ver.section( '.', -1 ).toInt() - 1; if ( lastVer > 0 ) { - TQString lv = ver.left( ver.tqfindRev( "." ) + 1 ) + TQString::number( lastVer ); + TQString lv = ver.left( ver.findRev( "." ) + 1 ) + TQString::number( lastVer ); dstr += " [<a href=\"diff:/" + m_pathName + "/" + lv + "_" + ver + "\">diff to " + lv + "</a>]"; } m_textBrowser->setTextFormat( TQTextBrowser::RichText ); @@ -172,7 +172,7 @@ void CVSLogPage::slotLinkClicked( const TQString &link ) /// \FIXME in this way I lose the source m_textBrowser->setSource( m_logTextBackup ); - TQString ver = link.mid( link.tqfindRev( "/" ) + 1 ); + TQString ver = link.mid( link.findRev( "/" ) + 1 ); TQString v1 = ver.section( '_', 0, 0 ); TQString v2 = ver.section( '_', 1, 1 ); if ( v1.isEmpty() || v2.isEmpty() ) diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index 550b76b5..319fcfe6 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -264,9 +264,9 @@ void CvsProcessWidget::showOutput( const TQStringList &msg ) //This will prevent TQTextEdit from crashing on trying to parse the tags. //This should fix BUG:99590 TQString lineNew(line); - lineNew.tqreplace("<", "<"); - lineNew.tqreplace(">", ">"); - lineNew.tqreplace("&", "&"); + lineNew.replace("<", "<"); + lineNew.replace(">", ">"); + lineNew.replace("&", "&"); if (line.startsWith( "C " )) append( "<cvs_conflict>" + lineNew + "</cvs_conflict>" ); diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 2f119ed2..6bb3c08d 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -112,7 +112,7 @@ void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err { TQStringList lst = TQStringList::split( TQChar('\n'), out ); for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { - int pos = (*it).tqfind( TQChar('#') ); + int pos = (*it).find( TQChar('#') ); if ( pos > 1 && (*it).startsWith( "//" ) ) { filesBox->insertItem( (*it).left( pos ) ); } @@ -129,7 +129,7 @@ TQString CommitDialog::changeList() const "tqStatus: new\n" "Description:\n "; - lst += logMessage().tqreplace(TQRegExp("\n"), "\n ") + "\n\n"; + lst += logMessage().replace(TQRegExp("\n"), "\n ") + "\n\n"; lst += "Files:\n"; diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 406de1f8..2bd60c76 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -275,7 +275,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) static TQRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" ); rx.setMinimal( true ); TQString strippedDiff = diff; - strippedDiff.tqreplace( rx, "--- \\2\n+++ \\2\n" ); + strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" ); if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend")) diffFrontend->showDiff( strippedDiff ); diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index df519d02..54c6c4f2 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -44,4 +44,4 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) #include "commitdlg.moc" -//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle; +//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index f940511c..a0070770 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -35,4 +35,4 @@ protected: #endif -//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle; +//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 1060158b..5d80f997 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -64,7 +64,7 @@ void SvnBlameWidget::show() SvnBlameHolder holder = *it; SvnIntSortListItem *item = new SvnIntSortListItem(outView()); - TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); item->setText(0, TQString::number( holder.line+1 ) ); item->setText(1, TQString::number(holder.rev) ); diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 416f32c0..9a70dd1b 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -261,7 +261,7 @@ void kio_svnProtocol::get(const KURL& url ){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.tqfindRev( "?rev=" ); + int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -323,7 +323,7 @@ void kio_svnProtocol::stat(const KURL & url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.tqfindRev( "?rev=" ); + int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -428,7 +428,7 @@ void kio_svnProtocol::listDir(const KURL& url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.tqfindRev( "?rev=" ); + int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool ); @@ -545,7 +545,7 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& // // //find the requested revision // svn_opt_revision_t rev; -// int idx = srcsvn.tqfindRev( "?rev=" ); +// int idx = srcsvn.findRev( "?rev=" ); // if ( idx != -1 ) { // TQString revstr = srcsvn.mid( idx+5 ); // kdDebug(9036) << "revision string found " << revstr << endl; @@ -672,7 +672,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite //find the requested revision svn_opt_revision_t rev; - int idx = srcsvn.tqfindRev( "?rev=" ); + int idx = srcsvn.findRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = srcsvn.mid( idx+5 ); kdDebug(9036) << "revision string found " << revstr << endl; @@ -1661,7 +1661,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { tpURL.setProtocol("file"); svnUrl = tpURL.url(-1); //hack : add one more / after file:/ - int idx = svnUrl.tqfind("/"); + int idx = svnUrl.find("/"); svnUrl.insert( idx, "//" ); return svnUrl; } diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index 9eaa6aa9..c8f33e66 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -92,7 +92,7 @@ void SvnLogViewWidget::setLogResult( TQValueList<SvnLogHolder> *loglist ) SvnLogHolder holder = *it; SvnLogViewItem *item = new SvnLogViewItem(this->listView1); - TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); item->setText(0, holder.rev ); item->setText(1, prettyDate ); |