summaryrefslogtreecommitdiffstats
path: root/parts/appwizard
diff options
context:
space:
mode:
Diffstat (limited to 'parts/appwizard')
-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
17 files changed, 53 insertions, 53 deletions
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());
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 13:48:45 +0000