summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit6e21bc798ba1066147d69dcc2d5c222ffafb9a90 (patch)
tree36613dfe2f86f8ccb96a30f3880507341228eeb0 /kinit
parent1e9fe867b0def399c63c42f35e83c3575e91ff83 (diff)
downloadtdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.tar.gz
tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kinit')
-rw-r--r--kinit/autostart.cpp12
-rw-r--r--kinit/kinit.cpp16
-rw-r--r--kinit/klauncher.cpp4
3 files changed, 16 insertions, 16 deletions
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 9383e4301..8fba76928 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -82,10 +82,10 @@ void AutoStart::setPhaseDone()
static TQString extractName(TQString path)
{
- int i = path.tqfindRev('/');
+ int i = path.findRev('/');
if (i >= 0)
path = path.mid(i+1);
- i = path.tqfindRev('.');
+ i = path.findRev('.');
if (i >= 0)
path = path.left(i);
return path;
@@ -147,14 +147,14 @@ AutoStart::loadAutoStartList()
// Same local file name?
TQString localOuter;
TQString localInner;
- int slashPos = (*it).tqfindRev( '/', -1, TRUE );
+ int slashPos = (*it).findRev( '/', -1, TRUE );
if (slashPos == -1) {
localOuter = (*it);
}
else {
localOuter = (*it).mid(slashPos+1);
}
- slashPos = (*localit).tqfindRev( '/', -1, TRUE );
+ slashPos = (*localit).findRev( '/', -1, TRUE );
if (slashPos == -1) {
localInner = (*localit);
}
@@ -178,12 +178,12 @@ AutoStart::loadAutoStartList()
if (config.hasKey("OnlyShowIn"))
{
- if ((!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")))
+ if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
continue;
}
if (config.hasKey("NotShowIn"))
{
- if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) || (config.readListEntry("NotShowIn", ';').tqcontains("KDE")))
+ if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE")))
continue;
}
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 2e4810dea..bda7a7d35 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -370,7 +370,7 @@ TQCString execpath_avoid_loops( const TQCString& exec, int envc, const char* env
s_instance->dirs()->findExe( exec, paths.join( TQString( ":" ))));
if( avoid_loops && !execpath.isEmpty())
{
- int pos = execpath.tqfindRev( '/' );
+ int pos = execpath.findRev( '/' );
TQString bin_path = execpath.left( pos );
for( TQStringList::Iterator it = paths.begin();
it != paths.end();
@@ -456,7 +456,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
{
lib = _name;
name = _name;
- name = name.mid( name.tqfindRev('/') + 1);
+ name = name.mid( name.findRev('/') + 1);
exec = _name;
if (lib.right(3) == ".la")
libpath = lib;
@@ -535,7 +535,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
++it )
{
TQCString tmp( it.current());
- int pos = tmp.tqfind( '=' );
+ int pos = tmp.find( '=' );
if( pos >= 0 )
unsetenv( tmp.left( pos ));
}
@@ -1477,16 +1477,16 @@ static void kdeinit_library_path()
it++)
{
TQString d = *it;
- if (ltdl_library_path.tqcontains(d))
+ if (ltdl_library_path.contains(d))
continue;
- if (ld_library_path.tqcontains(d))
+ if (ld_library_path.contains(d))
continue;
if (d[d.length()-1] == '/')
{
d.truncate(d.length()-1);
- if (ltdl_library_path.tqcontains(d))
+ if (ltdl_library_path.contains(d))
continue;
- if (ld_library_path.tqcontains(d))
+ if (ld_library_path.contains(d))
continue;
}
if ((d == "/lib") || (d == "/usr/lib"))
@@ -1517,7 +1517,7 @@ static void kdeinit_library_path()
exit(255);
}
int i;
- if((i = display.tqfindRev('.')) > display.tqfindRev(':') && i >= 0)
+ if((i = display.findRev('.')) > display.findRev(':') && i >= 0)
display.truncate(i);
TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit-%1").arg(TQString(display)), s_instance));
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 0c5ceb015..4f2e12450 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -893,7 +893,7 @@ KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_
request->transaction = 0; // No confirmation is send
request->envs = envs;
// Find service, if any - strip path if needed
- KService::Ptr service = KService::serviceByDesktopName( name.mid( name.tqfindRev( '/' ) + 1 ));
+ KService::Ptr service = KService::serviceByDesktopName( name.mid( name.findRev( '/' ) + 1 ));
if (service != NULL)
send_service_startup_info( request, service,
startup_id, TQValueList< TQCString >());
@@ -1165,7 +1165,7 @@ KLauncher::kdeinit_exec(const TQString &app, const TQStringList &args,
if( app != "kbuildsycoca" ) // avoid stupid loop
{
// Find service, if any - strip path if needed
- KService::Ptr service = KService::serviceByDesktopName( app.mid( app.tqfindRev( '/' ) + 1 ));
+ KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
if (service != NULL)
send_service_startup_info( request, service,
startup_id, TQValueList< TQCString >());