summaryrefslogtreecommitdiffstats
path: root/kdepasswd
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kdepasswd
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdepasswd')
-rw-r--r--kdepasswd/kcm/chfacedlg.cpp78
-rw-r--r--kdepasswd/kcm/chfacedlg.h12
-rw-r--r--kdepasswd/kcm/chfnprocess.cpp4
-rw-r--r--kdepasswd/kcm/chfnprocess.h6
-rw-r--r--kdepasswd/kcm/main.cpp90
-rw-r--r--kdepasswd/kcm/main.h12
-rw-r--r--kdepasswd/kdepasswd.cpp4
-rw-r--r--kdepasswd/passwd.cpp8
-rw-r--r--kdepasswd/passwd.h10
-rw-r--r--kdepasswd/passwddlg.cpp12
-rw-r--r--kdepasswd/passwddlg.h6
11 files changed, 121 insertions, 121 deletions
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp
index 1894ac81..c5f70033 100644
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/kdepasswd/kcm/chfacedlg.cpp
@@ -25,14 +25,14 @@
* @author Braden MacDonald
*/
-#include <qstring.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpushbutton.h>
-#include <qdir.h>
-#include <qcheckbox.h>
+#include <tqstring.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpushbutton.h>
+#include <tqdir.h>
+#include <tqcheckbox.h>
#include <kdialogbase.h>
#include <klocale.h>
@@ -52,35 +52,35 @@
/**
* TODO: It would be nice if the widget were in a .ui
*/
-ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name, bool modal)
+ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name, bool modal)
: KDialogBase( parent, name, modal, i18n("Change your Face"), Ok|Cancel, Ok, true )
{
- QWidget *page = new QWidget(this);
+ TQWidget *page = new TQWidget(this);
setMainWidget( page );
- QVBoxLayout *top = new QVBoxLayout(page, 0, spacingHint());
+ TQVBoxLayout *top = new TQVBoxLayout(page, 0, spacingHint());
- QLabel *header = new QLabel( i18n("Select a new face:"), page );
+ TQLabel *header = new TQLabel( i18n("Select a new face:"), page );
top->addWidget( header );
m_FacesWidget = new KIconView( page );
- m_FacesWidget->setSelectionMode( QIconView::Single );
+ m_FacesWidget->setSelectionMode( TQIconView::Single );
m_FacesWidget->setItemsMovable( false );
m_FacesWidget->setMinimumSize( 400, 200 );
- connect( m_FacesWidget, SIGNAL( selectionChanged( QIconViewItem * ) ), SLOT( slotFaceWidgetSelectionChanged( QIconViewItem * ) ) );
+ connect( m_FacesWidget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQT_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
- connect( m_FacesWidget, SIGNAL( doubleClicked( QIconViewItem *, const QPoint & ) ), SLOT( slotOk() ) );
+ connect( m_FacesWidget, TQT_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQT_SLOT( slotOk() ) );
top->addWidget( m_FacesWidget );
// Buttons to get more pics
- QHBoxLayout * morePics = new QHBoxLayout( 0, 0, spacingHint() );
- QPushButton *browseBtn = new QPushButton( i18n("Custom &Image..."), page );
- connect( browseBtn, SIGNAL( clicked() ), SLOT( slotGetCustomImage() ) );
+ TQHBoxLayout * morePics = new TQHBoxLayout( 0, 0, spacingHint() );
+ TQPushButton *browseBtn = new TQPushButton( i18n("Custom &Image..."), page );
+ connect( browseBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGetCustomImage() ) );
morePics->addWidget( browseBtn );
#if 0
- QPushButton *acquireBtn = new QPushButton( i18n("&Acquire Image..."), page );
+ TQPushButton *acquireBtn = new TQPushButton( i18n("&Acquire Image..."), page );
acquireBtn->setEnabled( false );
morePics->addWidget( acquireBtn );
#endif
@@ -88,36 +88,36 @@ ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name,
top->addLayout( morePics );
// Filling the icon view
- QDir facesDir( picsdir );
+ TQDir facesDir( picsdir );
if ( facesDir.exists() )
{
- QStringList picslist = facesDir.entryList( QDir::Files );
- for ( QStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
- new QIconViewItem( m_FacesWidget, (*it).section(".",0,0), QPixmap( picsdir + *it ) );
+ TQStringList picslist = facesDir.entryList( TQDir::Files );
+ for ( TQStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
+ new TQIconViewItem( m_FacesWidget, (*it).section(".",0,0), TQPixmap( picsdir + *it ) );
}
facesDir.setPath( KCFGUserAccount::userFaceDir() );
if ( facesDir.exists() )
{
- QStringList picslist = facesDir.entryList( QDir::Files );
- for ( QStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
- new QIconViewItem( m_FacesWidget, "/"+(*it) == KCFGUserAccount::customFaceFile() ?
+ TQStringList picslist = facesDir.entryList( TQDir::Files );
+ for ( TQStringList::Iterator it = picslist.begin(); it != picslist.end(); ++it )
+ new TQIconViewItem( m_FacesWidget, "/"+(*it) == KCFGUserAccount::customFaceFile() ?
i18n("(Custom)") : (*it).section(".",0,0),
- QPixmap( KCFGUserAccount::userFaceDir() + *it ) );
+ TQPixmap( KCFGUserAccount::userFaceDir() + *it ) );
}
- m_FacesWidget->setResizeMode( QIconView::Adjust );
+ m_FacesWidget->setResizeMode( TQIconView::Adjust );
//m_FacesWidget->setGridX( FACE_PIX_SIZE - 10 );
m_FacesWidget->arrangeItemsInGrid();
enableButtonOK( false );
- //connect( this, SIGNAL( okClicked() ), SLOT( slotSaveCustomImage() ) );
+ //connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSaveCustomImage() ) );
resize( 420, 400 );
}
-void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
+void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy )
{
- QImage pix( imPath );
+ TQImage pix( imPath );
// TODO: save pix to TMPDIR/userinfo-tmp,
// then scale and copy *that* to ~/.faces
@@ -128,24 +128,24 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
}
if ( (pix.width() > KCFGUserAccount::faceSize())
|| (pix.height() > KCFGUserAccount::faceSize()) )
- pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), QImage::ScaleMin );// Should be no bigger than certain size.
+ pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size.
if ( saveCopy )
{
// If we should save a copy:
- QDir userfaces( KCFGUserAccount::userFaceDir() );
+ TQDir userfaces( KCFGUserAccount::userFaceDir() );
if ( !userfaces.exists( ) )
userfaces.mkdir( userfaces.absPath() );
pix.save( userfaces.absPath() + "/.userinfo-tmp" , "PNG" );
- KonqOperations::copy( this, KonqOperations::COPY, KURL::List( KURL( userfaces.absPath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + QFileInfo(imPath).fileName().section(".",0,0) ) );
+ KonqOperations::copy( this, KonqOperations::COPY, KURL::List( KURL( userfaces.absPath() + "/.userinfo-tmp" ) ), KURL( userfaces.absPath() + "/" + TQFileInfo(imPath).fileName().section(".",0,0) ) );
#if 0
if ( !pix.save( userfaces.absPath() + "/" + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absPath() ) );
#endif
}
- QIconViewItem* newface = new QIconViewItem( m_FacesWidget, QFileInfo(imPath).fileName().section(".",0,0) , pix );
+ TQIconViewItem* newface = new TQIconViewItem( m_FacesWidget, TQFileInfo(imPath).fileName().section(".",0,0) , pix );
newface->setKey( KCFGUserAccount::customKey() );// Add custom items to end
m_FacesWidget->ensureItemVisible( newface );
m_FacesWidget->setCurrentItem( newface );
@@ -153,9 +153,9 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
void ChFaceDlg::slotGetCustomImage( )
{
- QCheckBox* checkWidget = new QCheckBox( i18n("&Save copy in custom faces folder for future use"), 0 );
+ TQCheckBox* checkWidget = new TQCheckBox( i18n("&Save copy in custom faces folder for future use"), 0 );
- KFileDialog *dlg = new KFileDialog( QDir::homeDirPath(), KImageIO::pattern( KImageIO::Reading ),
+ KFileDialog *dlg = new KFileDialog( TQDir::homeDirPath(), KImageIO::pattern( KImageIO::Reading ),
this, 0, true, checkWidget);
dlg->setOperationMode( KFileDialog::Opening );
@@ -164,7 +164,7 @@ void ChFaceDlg::slotGetCustomImage( )
KImageFilePreview *ip = new KImageFilePreview( dlg );
dlg->setPreviewWidget( ip );
- if (dlg->exec() == QDialog::Accepted)
+ if (dlg->exec() == TQDialog::Accepted)
addCustomPixmap( dlg->selectedFile(), checkWidget->isChecked() );
// Because we give it a parent we have to close it ourselves.
dlg->close(true);
@@ -175,7 +175,7 @@ void ChFaceDlg::slotSaveCustomImage()
{
if ( m_FacesWidget->currentItem()->key() == USER_CUSTOM_KEY)
{
- QDir userfaces( QDir::homeDirPath() + USER_FACES_DIR );
+ TQDir userfaces( TQDir::homeDirPath() + USER_FACES_DIR );
if ( !userfaces.exists( ) )
userfaces.mkdir( userfaces.absPath() );
diff --git a/kdepasswd/kcm/chfacedlg.h b/kdepasswd/kcm/chfacedlg.h
index 1802ccd9..08515326 100644
--- a/kdepasswd/kcm/chfacedlg.h
+++ b/kdepasswd/kcm/chfacedlg.h
@@ -28,7 +28,7 @@
#ifndef CHFACEDLG_H
#define CHFACEDLG_H
-#include <qobject.h>
+#include <tqobject.h>
#include <kiconview.h> // declaration below
@@ -42,26 +42,26 @@ class ChFaceDlg : public KDialogBase
public:
- ChFaceDlg(const QString& picsdirs, QWidget *parent=0, const char *name=0, bool modal=true);
+ ChFaceDlg(const TQString& picsdirs, TQWidget *parent=0, const char *name=0, bool modal=true);
- QPixmap getFaceImage() const
+ TQPixmap getFaceImage() const
{
if(m_FacesWidget->currentItem())
return *(m_FacesWidget->currentItem()->pixmap());
else
- return QPixmap();
+ return TQPixmap();
}
private slots:
- void slotFaceWidgetSelectionChanged( QIconViewItem *item )
+ void slotFaceWidgetSelectionChanged( TQIconViewItem *item )
{ enableButtonOK( !item->pixmap()->isNull() ); }
void slotGetCustomImage();
//void slotSaveCustomImage();
private:
- void addCustomPixmap( QString imPath, bool saveCopy );
+ void addCustomPixmap( TQString imPath, bool saveCopy );
KIconView *m_FacesWidget;
};
diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp
index ec39a152..4f6af0ad 100644
--- a/kdepasswd/kcm/chfnprocess.cpp
+++ b/kdepasswd/kcm/chfnprocess.cpp
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdesu/process.h>
#include <kdebug.h>
@@ -52,7 +52,7 @@ int ChfnProcess::ConverseChfn(const char *pass)
{
int status=-1;
- QCString line;
+ TQCString line;
while(1)
{
line = readLine();
diff --git a/kdepasswd/kcm/chfnprocess.h b/kdepasswd/kcm/chfnprocess.h
index f8bb4e0c..4f129b64 100644
--- a/kdepasswd/kcm/chfnprocess.h
+++ b/kdepasswd/kcm/chfnprocess.h
@@ -11,7 +11,7 @@
#ifndef CHFNPROC_H
#define CHFNPROC_H
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdesu/process.h>
class ChfnProcess : public PtyProcess
@@ -22,12 +22,12 @@ public:
int exec(const char *pass, const char *name);
- QCString error() { return m_Error; }
+ TQCString error() { return m_Error; }
private:
int ConverseChfn(const char *pass);
- QCString m_Error;
+ TQCString m_Error;
};
#endif
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index d4930448..a3a25c0f 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -20,15 +20,15 @@
*
*/
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qbuttongroup.h>
-#include <qevent.h>
-#include <qpixmap.h>
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qlayout.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqbuttongroup.h>
+#include <tqevent.h>
+#include <tqpixmap.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
+#include <tqlayout.h>
#include <kpushbutton.h>
#include <kguiitem.h>
@@ -52,31 +52,31 @@
#include "chfacedlg.h"
#include "main.h"
-typedef KGenericFactory<KCMUserAccount, QWidget> Factory;
+typedef KGenericFactory<KCMUserAccount, TQWidget> Factory;
K_EXPORT_COMPONENT_FACTORY( kcm_useraccount, Factory("useraccount") )
-KCMUserAccount::KCMUserAccount( QWidget *parent, const char *name,
- const QStringList &)
+KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
+ const TQStringList &)
: KCModule( parent, name)
{
- QVBoxLayout *topLayout = new QVBoxLayout(this);
+ TQVBoxLayout *topLayout = new TQVBoxLayout(this);
_mw = new MainWidget(this);
topLayout->addWidget( _mw );
- connect( _mw->btnChangeFace, SIGNAL(clicked()), SLOT(slotFaceButtonClicked()));
- connect( _mw->btnChangePassword, SIGNAL(clicked()), SLOT(slotChangePassword()));
+ connect( _mw->btnChangeFace, TQT_SIGNAL(clicked()), TQT_SLOT(slotFaceButtonClicked()));
+ connect( _mw->btnChangePassword, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangePassword()));
_mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" ));
- connect( _mw->leRealname, SIGNAL(textChanged(const QString&)), SLOT(changed()));
- connect( _mw->leOrganization, SIGNAL(textChanged(const QString&)), SLOT(changed()));
- connect( _mw->leEmail, SIGNAL(textChanged(const QString&)), SLOT(changed()));
- connect( _mw->leSMTP, SIGNAL(textChanged(const QString&)), SLOT(changed()));
+ connect( _mw->leRealname, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect( _mw->leOrganization, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect( _mw->leEmail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
+ connect( _mw->leSMTP, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()));
_ku = new KUser();
_kes = new KEMailSettings();
_mw->lblUsername->setText( _ku->loginName() );
- _mw->lblUID->setText( QString().number(_ku->uid()) );
+ _mw->lblUID->setText( TQString().number(_ku->uid()) );
KAboutData *about = new KAboutData(I18N_NOOP("kcm_useraccount"),
I18N_NOOP("Password & User Information"), 0, 0,
@@ -108,7 +108,7 @@ KCMUserAccount::KCMUserAccount( QWidget *parent, const char *name,
void KCMUserAccount::slotChangePassword()
{
KProcess *proc = new KProcess;
- QString bin = KGlobal::dirs()->findExe("kdepasswd");
+ TQString bin = KGlobal::dirs()->findExe("kdepasswd");
if ( !bin )
{
kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl;
@@ -146,22 +146,22 @@ void KCMUserAccount::load()
_mw->leOrganization->setText( _kes->getSetting( KEMailSettings::Organization ));
_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
- QString _userPicsDir = KCFGUserAccount::faceDir() +
+ TQString _userPicsDir = KCFGUserAccount::faceDir() +
KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/";
- QString fs = KCFGUserAccount::faceSource();
- if (fs == QString::fromLatin1("UserOnly"))
+ TQString fs = KCFGUserAccount::faceSource();
+ if (fs == TQString::fromLatin1("UserOnly"))
_facePerm = userOnly;
- else if (fs == QString::fromLatin1("PreferUser"))
+ else if (fs == TQString::fromLatin1("PreferUser"))
_facePerm = userFirst;
- else if (fs == QString::fromLatin1("PreferAdmin"))
+ else if (fs == TQString::fromLatin1("PreferAdmin"))
_facePerm = adminFirst;
else
_facePerm = adminOnly; // Admin Only
if ( _facePerm == adminFirst )
{ // If the administrator's choice takes preference
- _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
+ _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
if ( _facePixmap.isNull() )
_facePerm = userFirst;
@@ -172,23 +172,23 @@ void KCMUserAccount::load()
if ( _facePerm >= userFirst )
{
// If the user's choice takes preference
- _facePixmap = QPixmap( KCFGUserAccount::faceFile() );
+ _facePixmap = TQPixmap( KCFGUserAccount::faceFile() );
// The user has no face, should we check for the admin's setting?
if ( _facePixmap.isNull() && _facePerm == userFirst )
- _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
+ _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
if ( _facePixmap.isNull() )
- _facePixmap = QPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
+ _facePixmap = TQPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
_mw->btnChangeFace->setPixmap( _facePixmap );
}
else if ( _facePerm <= adminOnly )
{
// Admin only
- _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
+ _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" );
if ( _facePixmap.isNull() )
- _facePixmap = QPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
+ _facePixmap = TQPixmap( _userPicsDir + KCFGUserAccount::defaultFile() );
_mw->btnChangeFace->setPixmap( _facePixmap );
}
@@ -209,7 +209,7 @@ void KCMUserAccount::save()
/* Save realname to /etc/passwd */
if ( _mw->leRealname->isModified() )
{
- QCString password;
+ TQCString password;
int ret = KPasswordDialog::getPassword( password, i18n("Please enter "
"your password in order to save your settings:"));
@@ -247,7 +247,7 @@ void KCMUserAccount::save()
}
-void KCMUserAccount::changeFace(const QPixmap &pix)
+void KCMUserAccount::changeFace(const TQPixmap &pix)
{
if ( _facePerm < userFirst )
return; // If the user isn't allowed to change their face, don't!
@@ -273,7 +273,7 @@ void KCMUserAccount::slotFaceButtonClicked()
ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() +
"/kdm/pics/users/" );
- if ( pDlg->exec() == QDialog::Accepted && !pDlg->getFaceImage().isNull() )
+ if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() )
changeFace( pDlg->getFaceImage() );
delete pDlg;
@@ -284,16 +284,16 @@ void KCMUserAccount::slotFaceButtonClicked()
* The function was called after checking event type and
* the code is now below that if statement
*/
-bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
+bool KCMUserAccount::eventFilter(TQObject *, TQEvent *e)
{
- if (e->type() == QEvent::DragEnter)
+ if (e->type() == TQEvent::DragEnter)
{
- QDragEnterEvent *ee = (QDragEnterEvent *) e;
+ TQDragEnterEvent *ee = (TQDragEnterEvent *) e;
ee->accept( KURLDrag::canDecode(ee) );
return true;
}
- if (e->type() == QEvent::Drop)
+ if (e->type() == TQEvent::Drop)
{
if ( _facePerm < userFirst )
{
@@ -302,12 +302,12 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return true;
}
- KURL *url = decodeImgDrop( (QDropEvent *) e, this);
+ KURL *url = decodeImgDrop( (TQDropEvent *) e, this);
if (url)
{
- QString pixPath;
+ TQString pixPath;
KIO::NetAccess::download(*url, pixPath, this);
- changeFace( QPixmap( pixPath ) );
+ changeFace( TQPixmap( pixPath ) );
KIO::NetAccess::removeTempFile(pixPath);
delete url;
}
@@ -316,7 +316,7 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return false;
}
-inline KURL *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
+inline KURL *KCMUserAccount::decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
{
KURL::List uris;
@@ -328,10 +328,10 @@ inline KURL *KCMUserAccount::decodeImgDrop(QDropEvent *e, QWidget *wdg)
if( KImageIO::canRead(KImageIO::type(url->fileName())) )
return url;
- QStringList qs = QStringList::split('\n', KImageIO::pattern());
+ TQStringList qs = TQStringList::split('\n', KImageIO::pattern());
qs.remove(qs.begin());
- QString msg = i18n( "%1 does not appear to be an image file.\n"
+ TQString msg = i18n( "%1 does not appear to be an image file.\n"
"Please use files with these extensions:\n"
"%2").arg(url->fileName()).arg(qs.join("\n"));
KMessageBox::sorry( wdg, msg);
diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h
index 2ee475bc..29562a22 100644
--- a/kdepasswd/kcm/main.h
+++ b/kdepasswd/kcm/main.h
@@ -39,8 +39,8 @@ class KCMUserAccount : public KCModule
Q_OBJECT
public:
- KCMUserAccount(QWidget* parent, const char* name = "KCMUserAccount",
- const QStringList& list=QStringList());
+ KCMUserAccount(TQWidget* parent, const char* name = "KCMUserAccount",
+ const TQStringList& list=TQStringList());
~KCMUserAccount();
/**
@@ -57,7 +57,7 @@ public:
/**
* For the face button
*/
- bool eventFilter(QObject *, QEvent *e);
+ bool eventFilter(TQObject *, TQEvent *e);
private slots:
void slotChangePassword();
@@ -65,14 +65,14 @@ private slots:
void slotFaceButtonClicked();
private:
- void changeFace(const QPixmap& pix);
- inline KURL* decodeImgDrop(QDropEvent *e, QWidget *wdg);
+ void changeFace(const TQPixmap& pix);
+ inline KURL* decodeImgDrop(TQDropEvent *e, TQWidget *wdg);
KEMailSettings *_kes;
KUser *_ku;
MainWidget *_mw;
FacePerm _facePerm;
- QPixmap _facePixmap;
+ TQPixmap _facePixmap;
};
diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp
index c7616950..ae75554d 100644
--- a/kdepasswd/kdepasswd.cpp
+++ b/kdepasswd/kdepasswd.cpp
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
KUniqueApplication app;
KUser ku;
- QCString user;
+ TQCString user;
bool bRoot = ku.isSuperUser();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
return 0;
}
- QCString oldpass;
+ TQCString oldpass;
if (!bRoot)
{
int result = KDEpasswd1Dialog::getPassword(oldpass);
diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp
index 903b2830..89bbbdf8 100644
--- a/kdepasswd/passwd.cpp
+++ b/kdepasswd/passwd.cpp
@@ -23,7 +23,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdebug.h>
#include <kstandarddirs.h>
@@ -32,7 +32,7 @@
#include "passwd.h"
-PasswdProcess::PasswdProcess(QCString user)
+PasswdProcess::PasswdProcess(TQCString user)
{
struct passwd *pw;
@@ -112,7 +112,7 @@ int PasswdProcess::exec(const char *oldpass, const char *newpass,
int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
int check)
{
- QCString line, errline;
+ TQCString line, errline;
int state = 0;
while (state != 7)
@@ -259,7 +259,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
}
-bool PasswdProcess::isPrompt(QCString line, const char *word)
+bool PasswdProcess::isPrompt(TQCString line, const char *word)
{
unsigned i, j, colon;
unsigned int lineLength(line.length());
diff --git a/kdepasswd/passwd.h b/kdepasswd/passwd.h
index a0c27a5a..72590740 100644
--- a/kdepasswd/passwd.h
+++ b/kdepasswd/passwd.h
@@ -9,7 +9,7 @@
#ifndef __Passwd_h_Included__
#define __Passwd_h_Included__
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdesu/process.h>
/**
@@ -20,7 +20,7 @@ class PasswdProcess
: public PtyProcess
{
public:
- PasswdProcess(QCString user=0);
+ PasswdProcess(TQCString user=0);
~PasswdProcess();
enum Errors { PasswdNotFound=1, PasswordIncorrect, PasswordNotGood };
@@ -28,14 +28,14 @@ public:
int checkCurrent(const char *oldpass);
int exec(const char *oldpass, const char *newpass, int check=0);
- QCString error() { return m_Error; }
+ TQCString error() { return m_Error; }
private:
- bool isPrompt(QCString line, const char *word=0L);
+ bool isPrompt(TQCString line, const char *word=0L);
int ConversePasswd(const char *oldpass, const char *newpass,
int check);
- QCString m_User, m_Error;
+ TQCString m_User, m_Error;
bool bOtherUser;
};
diff --git a/kdepasswd/passwddlg.cpp b/kdepasswd/passwddlg.cpp
index 5a3b4891..c6764a4e 100644
--- a/kdepasswd/passwddlg.cpp
+++ b/kdepasswd/passwddlg.cpp
@@ -35,7 +35,7 @@ bool KDEpasswd1Dialog::checkPassword(const char *password)
{
case -1:
{
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Conversation with 'passwd' failed.") + msg;
@@ -66,7 +66,7 @@ bool KDEpasswd1Dialog::checkPassword(const char *password)
// static
-int KDEpasswd1Dialog::getPassword(QCString &password)
+int KDEpasswd1Dialog::getPassword(TQCString &password)
{
KDEpasswd1Dialog *dlg = new KDEpasswd1Dialog();
int res = dlg->exec();
@@ -78,7 +78,7 @@ int KDEpasswd1Dialog::getPassword(QCString &password)
-KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, QCString user)
+KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user)
: KPasswordDialog(NewPassword, false, 0)
{
m_Pass = oldpass;
@@ -132,7 +132,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
case 0:
{
hide();
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Your password has been changed.") + msg;
@@ -142,7 +142,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
case PasswdProcess::PasswordNotGood:
{
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Your password has not been changed.") + msg;
@@ -153,7 +153,7 @@ bool KDEpasswd2Dialog::checkPassword(const char *password)
}
default:
- QString msg = QString::fromLocal8Bit(proc.error());
+ TQString msg = TQString::fromLocal8Bit(proc.error());
if (!msg.isEmpty())
msg = "<p>\"<i>" + msg + "</i>\"";
msg = "<qt>" + i18n("Conversation with 'passwd' failed.") + msg;
diff --git a/kdepasswd/passwddlg.h b/kdepasswd/passwddlg.h
index 78ce4297..853a8ac1 100644
--- a/kdepasswd/passwddlg.h
+++ b/kdepasswd/passwddlg.h
@@ -20,7 +20,7 @@ public:
KDEpasswd1Dialog();
~KDEpasswd1Dialog();
- static int getPassword(QCString &password);
+ static int getPassword(TQCString &password);
protected:
bool checkPassword(const char *password);
@@ -33,7 +33,7 @@ class KDEpasswd2Dialog
Q_OBJECT
public:
- KDEpasswd2Dialog(const char *oldpass, QCString user);
+ KDEpasswd2Dialog(const char *oldpass, TQCString user);
~KDEpasswd2Dialog();
protected:
@@ -41,7 +41,7 @@ protected:
private:
const char *m_Pass;
- QCString m_User;
+ TQCString m_User;
};