summaryrefslogtreecommitdiffstats
path: root/parts
diff options
context:
space:
mode:
Diffstat (limited to 'parts')
-rw-r--r--parts/abbrev/abbrevpart.cpp24
-rw-r--r--parts/appwizard/appwizarddlg.cpp20
-rw-r--r--parts/appwizard/appwizarddlg.h2
-rw-r--r--parts/appwizard/appwizardpart.cpp2
-rw-r--r--parts/appwizard/common/COPYING.LIB2
-rw-r--r--parts/appwizard/common/gnome/macros/autogen.sh2
-rw-r--r--parts/appwizard/common/gnome/macros/curses.m42
-rw-r--r--parts/appwizard/common/gnome/macros/gnome-fileutils.m42
-rwxr-xr-xparts/appwizard/common/gnome2/macros/autogen.sh2
-rw-r--r--parts/appwizard/common/gnome2/macros/curses.m42
-rwxr-xr-xparts/appwizard/common/incadmin/config.guess2
-rwxr-xr-xparts/appwizard/common/incadmin/install-sh2
-rw-r--r--parts/appwizard/common/incadmin/ltmain.sh18
-rwxr-xr-xparts/appwizard/common/incadmin/missing2
-rw-r--r--parts/appwizard/common/scons/admin/kde.py4
-rw-r--r--parts/appwizard/importdlg.cpp14
-rw-r--r--parts/appwizard/kdevlicense.cpp26
-rw-r--r--parts/appwizard/profilesupport.cpp2
-rw-r--r--parts/astyle/astyle_part.cpp20
-rw-r--r--parts/bookmarks/bookmarks_part.cpp12
-rw-r--r--parts/bookmarks/bookmarks_widget.cpp2
-rw-r--r--parts/classview/classviewpart.cpp10
-rw-r--r--parts/classview/classviewwidget.cpp50
-rw-r--r--parts/classview/digraphview.cpp6
-rw-r--r--parts/classview/hierarchydlg.cpp4
-rw-r--r--parts/classview/navigator.cpp8
-rw-r--r--parts/ctags2/ctags2_part.cpp2
-rw-r--r--parts/ctags2/ctags2_settingswidget.cpp2
-rw-r--r--parts/ctags2/readtags.c4
-rw-r--r--parts/ctags2/tags.cpp2
-rw-r--r--parts/ctags2/tags.h2
-rw-r--r--parts/distpart/distpart_widget.cpp8
-rw-r--r--parts/distpart/specsupport.cpp18
-rw-r--r--parts/documentation/docglobalconfigwidget.cpp4
-rw-r--r--parts/documentation/documentation_part.cpp4
-rw-r--r--parts/documentation/find_documentation.cpp4
-rw-r--r--parts/documentation/interfaces/kdevdocumentationplugin.cpp14
-rw-r--r--parts/documentation/plugins/chm/docchmplugin.cpp4
-rw-r--r--parts/documentation/plugins/devhelp/docdevhelpplugin.cpp4
-rw-r--r--parts/documentation/protocols/chm/chm.cpp20
-rw-r--r--parts/documentation/searchview.cpp6
-rw-r--r--parts/documentation/tools/htdig/htdigindex.cpp4
-rw-r--r--parts/doxygen/config.cpp26
-rw-r--r--parts/doxygen/config.h2
-rw-r--r--parts/doxygen/doxygenconfigwidget.cpp10
-rw-r--r--parts/doxygen/input.cpp2
-rw-r--r--parts/doxygen/messages.cpp2
-rw-r--r--parts/filecreate/fcconfigwidget.cpp4
-rw-r--r--parts/filecreate/filecreate_part.cpp6
-rw-r--r--parts/filecreate/filecreate_widget2.cpp2
-rw-r--r--parts/filelist/filelist_widget.cpp2
-rw-r--r--parts/filelist/projectviewpart.cpp8
-rw-r--r--parts/fileselector/fileselector_widget.cpp4
-rw-r--r--parts/fileview/filegroupswidget.cpp4
-rw-r--r--parts/fileview/filetreewidget.cpp6
-rw-r--r--parts/fileview/vcsfiletreewidgetimpl.cpp4
-rw-r--r--parts/grepview/README.dox2
-rw-r--r--parts/grepview/grepviewwidget.cpp18
-rw-r--r--parts/outputviews/appoutputwidget.cpp4
-rw-r--r--parts/outputviews/compileerrorfilter.cpp10
-rw-r--r--parts/outputviews/directorystatusmessagefilter.cpp46
-rw-r--r--parts/outputviews/makeactionfilter.cpp4
-rw-r--r--parts/outputviews/makewidget.cpp26
-rw-r--r--parts/quickopen/quickopendialog.cpp2
-rw-r--r--parts/replace/replace_part.cpp12
-rw-r--r--parts/replace/replace_widget.cpp24
-rw-r--r--parts/replace/replace_widget.h6
-rw-r--r--parts/replace/replacedlg.ui2
-rw-r--r--parts/replace/replacedlgimpl.cpp2
-rw-r--r--parts/replace/replaceview.cpp6
-rw-r--r--parts/snippet/snippet_widget.cpp10
-rw-r--r--parts/texttools/texttoolswidget.cpp12
-rw-r--r--parts/tools/kapplicationtree.cpp2
-rw-r--r--parts/tools/tools_part.cpp16
-rw-r--r--parts/tools/toolsconfigwidget.cpp2
-rw-r--r--parts/valgrind/valgrind_dialog.cpp18
76 files changed, 325 insertions, 325 deletions
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( "&", "&amp;" );
- escaped.tqreplace( "<", "&lt;" );
- escaped.tqreplace( ">", "&gt;" );
+ escaped.replace( "&", "&amp;" );
+ escaped.replace( "<", "&lt;" );
+ escaped.replace( ">", "&gt;" );
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 != "&nbsp;") {
- 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("&lt;","<");
- selection.tqreplace("&gt;",">");
- selection.tqreplace("&quot;","\"");
- selection.tqreplace("&amp;","&");
+ selection.replace("&lt;","<");
+ selection.replace("&gt;",">");
+ selection.replace("&quot;","\"");
+ selection.replace("&amp;","&");
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>&amp;Text to tqfind:</string>
+ <string>&amp;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 );
}