diff options
Diffstat (limited to 'kdepasswd/kcm')
-rw-r--r-- | kdepasswd/kcm/chfacedlg.cpp | 2 | ||||
-rw-r--r-- | kdepasswd/kcm/chfnprocess.cpp | 8 | ||||
-rw-r--r-- | kdepasswd/kcm/main.cpp | 8 | ||||
-rw-r--r-- | kdepasswd/kcm/main_widget.ui | 50 |
4 files changed, 34 insertions, 34 deletions
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp index c5f700338..8344164db 100644 --- a/kdepasswd/kcm/chfacedlg.cpp +++ b/kdepasswd/kcm/chfacedlg.cpp @@ -128,7 +128,7 @@ void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy ) } if ( (pix.width() > KCFGUserAccount::faceSize()) || (pix.height() > KCFGUserAccount::faceSize()) ) - pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size. + pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQ_ScaleMin );// Should be no bigger than certain size. if ( saveCopy ) { 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..8a6a520bb 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 @@ -231,7 +231,7 @@ void KCMUserAccount::save() { KMessageBox::sorry( this, i18n("An error occurred and your password has " "probably not been changed. The error " - "message was:\n%1").arg(proc->error())); + "message was:\n%1").arg(static_cast<const char *>(proc->error()))); kdDebug() << "ChfnProcess->exec() failed. Error code: " << ret << "\nOutput:" << proc->error() << endl; } diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui index 29adb0835..bb5a57b94 100644 --- a/kdepasswd/kcm/main_widget.ui +++ b/kdepasswd/kcm/main_widget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MainWidget</class> <author>Frans Englich <frans.englich@telia.com></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MainWidget</cstring> </property> @@ -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> @@ -51,7 +51,7 @@ <string></string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>grpUserInformation</cstring> </property> @@ -62,7 +62,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOrganisation</cstring> </property> @@ -73,12 +73,12 @@ <cstring>leOrganization</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>leRealname</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblRealName</cstring> </property> @@ -89,12 +89,12 @@ <cstring>leRealname</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>leOrganization</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblEmail</cstring> </property> @@ -105,12 +105,12 @@ <cstring>leEmail</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>leEmail</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -121,12 +121,12 @@ <cstring>leSMTP</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>leSMTP</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lblUIDTell</cstring> </property> @@ -134,7 +134,7 @@ <string>User ID:</string> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>lblUID</cstring> </property> @@ -154,14 +154,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>layout1</cstring> </property> @@ -169,7 +169,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblUsername</cstring> </property> @@ -182,18 +182,18 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblClickButtonInfo</cstring> </property> <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,14 +217,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>20</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>kcfg_EchoMode</cstring> </property> @@ -247,7 +247,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rdbOneStar</cstring> </property> @@ -255,7 +255,7 @@ <string>Show one star for each letter</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>rdbThreeStars</cstring> </property> @@ -263,7 +263,7 @@ <string>Show three stars for each letter</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rdbShowPassword</cstring> </property> |