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 /kdepasswd | |
| 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 'kdepasswd')
| -rw-r--r-- | kdepasswd/kcm/chfnprocess.cpp | 8 | ||||
| -rw-r--r-- | kdepasswd/passwd.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp index 76d5209ea..4f6af0add 100644 --- a/kdepasswd/kcm/chfnprocess.cpp +++ b/kdepasswd/kcm/chfnprocess.cpp @@ -60,7 +60,7 @@ int ChfnProcess::ConverseChfn(const char *pass) if ( line.isEmpty() ) continue;// discard line - if ( line.tqcontains( "Password: " )/*isPrompt( line, "password" )*/ ) + if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ ) { WaitSlave(); write(m_Fd, pass, strlen(pass)); @@ -69,11 +69,11 @@ int ChfnProcess::ConverseChfn(const char *pass) line = readLine(); // Let's see what the outcome was - if ( line.tqcontains( "Changing finger info" ) ) + if ( line.contains( "Changing finger info" ) ) { // do nothing } - else if ( line.tqcontains( "information changed" ) ) + else if ( line.contains( "information changed" ) ) { status=0; break; @@ -83,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char *pass) status=0; break; } - else if ( line.tqcontains( "Password error" ) || line.tqcontains("Incorrect password") ) + else if ( line.contains( "Password error" ) || line.contains("Incorrect password") ) { status=PasswordError; break; diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp index 6e3bb223f..89bbbdf82 100644 --- a/kdepasswd/passwd.cpp +++ b/kdepasswd/passwd.cpp @@ -158,7 +158,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass, case 2: m_Error = ""; - if( line.tqcontains("again")) + if( line.contains("again")) { m_Error = line; kill(m_Pid, SIGKILL); @@ -278,7 +278,7 @@ bool PasswdProcess::isPrompt(TQCString line, const char *word) return false; if (word == 0L) return true; - return line.tqcontains(word, false); + return line.contains(word, false); } |