diff options
Diffstat (limited to 'kdepasswd')
| -rw-r--r-- | kdepasswd/kcm/chfnprocess.cpp | 8 | ||||
| -rw-r--r-- | kdepasswd/kcm/main.cpp | 6 | ||||
| -rw-r--r-- | kdepasswd/kcm/main_widget.ui | 20 | ||||
| -rw-r--r-- | kdepasswd/passwd.cpp | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp index 4f6af0add..76d5209ea 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.contains( "Password: " )/*isPrompt( line, "password" )*/ ) + if ( line.tqcontains( "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.contains( "Changing finger info" ) ) + if ( line.tqcontains( "Changing finger info" ) ) { // do nothing } - else if ( line.contains( "information changed" ) ) + else if ( line.tqcontains( "information changed" ) ) { status=0; break; @@ -83,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char *pass) status=0; break; } - else if ( line.contains( "Password error" ) || line.contains("Incorrect password") ) + else if ( line.tqcontains( "Password error" ) || line.tqcontains("Incorrect password") ) { status=PasswordError; break; diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index a3a25c0f3..c521a73b1 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -150,11 +150,11 @@ void KCMUserAccount::load() KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; TQString fs = KCFGUserAccount::faceSource(); - if (fs == TQString::fromLatin1("UserOnly")) + if (fs == TQString::tqfromLatin1("UserOnly")) _facePerm = userOnly; - else if (fs == TQString::fromLatin1("PreferUser")) + else if (fs == TQString::tqfromLatin1("PreferUser")) _facePerm = userFirst; - else if (fs == TQString::fromLatin1("PreferAdmin")) + else if (fs == TQString::tqfromLatin1("PreferAdmin")) _facePerm = adminFirst; else _facePerm = adminOnly; // Admin Only diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui index 29adb0835..4852ab5b8 100644 --- a/kdepasswd/kcm/main_widget.ui +++ b/kdepasswd/kcm/main_widget.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>MainWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -32,13 +32,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>74</width> <height>74</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>74</width> <height>74</height> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -163,7 +163,7 @@ </spacer> <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> @@ -182,7 +182,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -193,7 +193,7 @@ <property name="text"> <string><i>(Click the button to change your image)</i></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>20</height> @@ -289,6 +289,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp index 89bbbdf82..6e3bb223f 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.contains("again")) + if( line.tqcontains("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.contains(word, false); + return line.tqcontains(word, false); } |