diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 9a3f0aacd44fb866833ebcb852df3cd31475cb33 (patch) | |
tree | 9f699684624f4e78e13e7dd2393a103cc6fa8274 /kdmlib | |
parent | 341ad02235b9c85cd31782225181ed475b74eaa3 (diff) | |
download | tdebase-9a3f0aacd44fb866833ebcb852df3cd31475cb33.tar.gz tdebase-9a3f0aacd44fb866833ebcb852df3cd31475cb33.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdmlib')
-rw-r--r-- | kdmlib/dmctl.cpp | 18 | ||||
-rw-r--r-- | kdmlib/kgreet_classic.cpp | 8 | ||||
-rw-r--r-- | kdmlib/kgreet_winbind.cpp | 16 |
3 files changed, 21 insertions, 21 deletions
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp index 63e323fdc..5f3bd26f0 100644 --- a/kdmlib/dmctl.cpp +++ b/kdmlib/dmctl.cpp @@ -91,7 +91,7 @@ DM::DM() : fd( -1 ) case OldKDM: { TQString tf( ctl ); - tf.truncate( tf.tqfind( ',' ) ); + tf.truncate( tf.find( ',' ) ); fd = ::open( tf.latin1(), O_WRONLY ); } break; @@ -178,9 +178,9 @@ DM::canShutdown() TQCString re; if (DMType == GDM) - return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.tqfind("HALT") >= 0; + return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.find("HALT") >= 0; - return exec( "caps\n", re ) && re.tqfind( "\tshutdown" ) >= 0; + return exec( "caps\n", re ) && re.find( "\tshutdown" ) >= 0; } void @@ -194,7 +194,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType, bool cap_ask; if (DMType == NewKDM) { TQCString re; - cap_ask = exec( "caps\n", re ) && re.tqfind( "\tshutdown ask" ) >= 0; + cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0; } else { if (!bootOption.isEmpty()) return; @@ -249,7 +249,7 @@ DM::bootOptions( TQStringList &opts, int &defopt, int ¤t ) opts = TQStringList::split( ' ', opts[1] ); for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it) - (*it).tqreplace( "\\s", " " ); + (*it).replace( "\\s", " " ); return true; } @@ -272,7 +272,7 @@ DM::isSwitchable() TQCString re; - return exec( "caps\n", re ) && re.tqfind( "\tlocal" ) >= 0; + return exec( "caps\n", re ) && re.find( "\tlocal" ) >= 0; } int @@ -287,7 +287,7 @@ DM::numReserve() TQCString re; int p; - if (!(exec( "caps\n", re ) && (p = re.tqfind( "\treserve " )) >= 0)) + if (!(exec( "caps\n", re ) && (p = re.find( "\treserve " )) >= 0)) return -1; return atoi( re.data() + p + 9 ); } @@ -338,8 +338,8 @@ DM::localSessions( SessList &list ) se.vt = ts[1].mid( 2 ).toInt(); se.user = ts[2]; se.session = ts[3]; - se.self = (ts[4].tqfind( '*' ) >= 0); - se.tty = (ts[4].tqfind( 't' ) >= 0); + se.self = (ts[4].find( '*' ) >= 0); + se.tty = (ts[4].find( 't' ) >= 0); list.append( se ); } } diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index def8882c1..50f959596 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -260,7 +260,7 @@ bool // virtual KClassicGreeter::textMessage( const char *text, bool err ) { if (!err && - TQString( text ).tqfind( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) + TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) return true; return false; } @@ -275,11 +275,11 @@ KClassicGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) exp = 1; else { TQString pr( prompt ); - if (pr.tqfind( TQRegExp( "\\bpassword\\b", false ) ) >= 0) { - if (pr.tqfind( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", + if (pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0) { + if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", false ) ) >= 0) exp = 3; - else if (pr.tqfind( TQRegExp( "\\bnew\\b", false ) ) >= 0) + else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0) exp = 2; else { // TQRegExp( "\\b(old|current)\\b", false ) is too strict handler->gplugReturnText( "", diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index edb38ad1d..ae55a4b0f 100644 --- a/kdmlib/kgreet_winbind.cpp +++ b/kdmlib/kgreet_winbind.cpp @@ -56,7 +56,7 @@ static TQString defaultDomain; static void splitEntity( const TQString &ent, TQString &dom, TQString &usr ) { - int pos = ent.tqfind( separator ); + int pos = ent.find( separator ); if (pos < 0) dom = "<local>", usr = ent; else @@ -228,7 +228,7 @@ KWinbindGreeter::slotChangedDomain( const TQString &dom ) TQStringList users; if (dom == "<local>") { for (TQStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it) - if ((*it).tqfind( separator ) < 0) + if ((*it).find( separator ) < 0) users << *it; } else { TQString st( dom + separator ); @@ -341,7 +341,7 @@ bool // virtual KWinbindGreeter::textMessage( const char *text, bool err ) { if (!err && - TQString( text ).tqfind( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) + TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) return true; return false; } @@ -356,15 +356,15 @@ KWinbindGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) exp = 1; else { TQString pr( prompt ); - if (pr.tqfind( TQRegExp( "\\b(old|current)\\b", false ) ) >= 0) { + if (pr.find( TQRegExp( "\\b(old|current)\\b", false ) ) >= 0) { handler->gplugReturnText( "", KGreeterPluginHandler::IsOldPassword | KGreeterPluginHandler::IsSecret ); return; - } else if (pr.tqfind( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", + } else if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", false ) ) >= 0) exp = 3; - else if (pr.tqfind( TQRegExp( "\\bnew\\b", false ) ) >= 0) + else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0) exp = 2; else { handler->gplugMsgBox( TQMessageBox::Critical, @@ -594,7 +594,7 @@ KWinbindGreeter::slotEndDomainList() for (TQStringList::const_iterator it = mDomainListing.begin(); it != mDomainListing.end(); ++it) { - if (!domainList.tqcontains(*it)) + if (!domainList.contains(*it)) domainList.append(*it); } @@ -626,7 +626,7 @@ static bool init( const TQString &, { echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt(); staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() ); - if (!staticDomains.tqcontains("<local>")) + if (!staticDomains.contains("<local>")) staticDomains << "<local>"; defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString(); |