summaryrefslogtreecommitdiffstats
path: root/tdepasswd
diff options
context:
space:
mode:
Diffstat (limited to 'tdepasswd')
-rw-r--r--tdepasswd/kcm/chfacedlg.cpp10
-rw-r--r--tdepasswd/kcm/chfacedlg.h2
-rw-r--r--tdepasswd/kcm/kcm_useraccount.kcfg2
-rw-r--r--tdepasswd/kcm/main.cpp16
-rw-r--r--tdepasswd/kcm/main.h2
-rw-r--r--tdepasswd/passwd.cpp4
-rw-r--r--tdepasswd/passwd.h2
-rw-r--r--tdepasswd/passwddlg.cpp2
-rw-r--r--tdepasswd/passwddlg.h6
-rw-r--r--tdepasswd/tdepasswd.cpp10
10 files changed, 28 insertions, 28 deletions
diff --git a/tdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp
index 0a3dbfb78..bea316c8c 100644
--- a/tdepasswd/kcm/chfacedlg.cpp
+++ b/tdepasswd/kcm/chfacedlg.cpp
@@ -68,16 +68,16 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
m_FacesWidget->setItemsMovable( false );
m_FacesWidget->setMinimumSize( 400, 200 );
- connect( m_FacesWidget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQT_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
+ connect( m_FacesWidget, TQ_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQ_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) );
- connect( m_FacesWidget, TQT_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQT_SLOT( slotOk() ) );
+ connect( m_FacesWidget, TQ_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQ_SLOT( slotOk() ) );
top->addWidget( m_FacesWidget );
// Buttons to get more pics
TQHBoxLayout * morePics = new TQHBoxLayout( 0, 0, spacingHint() );
TQPushButton *browseBtn = new TQPushButton( i18n("Custom &Image..."), page );
- connect( browseBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGetCustomImage() ) );
+ connect( browseBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotGetCustomImage() ) );
morePics->addWidget( browseBtn );
#if 0
TQPushButton *acquireBtn = new TQPushButton( i18n("&Acquire Image..."), page );
@@ -110,7 +110,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
m_FacesWidget->arrangeItemsInGrid();
enableButtonOK( false );
- //connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSaveCustomImage() ) );
+ //connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotSaveCustomImage() ) );
resize( 420, 400 );
}
@@ -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(), TQ_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 )
{
diff --git a/tdepasswd/kcm/chfacedlg.h b/tdepasswd/kcm/chfacedlg.h
index f96d50084..6ae6a1c16 100644
--- a/tdepasswd/kcm/chfacedlg.h
+++ b/tdepasswd/kcm/chfacedlg.h
@@ -38,7 +38,7 @@ class KDialogBase;
class ChFaceDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdepasswd/kcm/kcm_useraccount.kcfg b/tdepasswd/kcm/kcm_useraccount.kcfg
index 549afdb1e..9bd2c60ea 100644
--- a/tdepasswd/kcm/kcm_useraccount.kcfg
+++ b/tdepasswd/kcm/kcm_useraccount.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>tdeglobal.h</include>
- <include>kstandarddirs.h</include>
+ <include>tdestandarddirs.h</include>
<kcfgfile name="tdm/tdmrc"/>
<group name="X-*-Greeter">
<entry name="faceDir" type="Path">
diff --git a/tdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp
index 0751c997e..1d08564c3 100644
--- a/tdepasswd/kcm/main.cpp
+++ b/tdepasswd/kcm/main.cpp
@@ -37,11 +37,11 @@
#include <kuser.h>
#include <kdialog.h>
#include <kimageio.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeaboutdata.h>
#include <kgenericfactory.h>
#include <tdemessagebox.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
#include <kurldrag.h>
@@ -63,14 +63,14 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
_mw = new MainWidget(this);
topLayout->addWidget( _mw );
- connect( _mw->btnChangeFace, TQT_SIGNAL(clicked()), TQT_SLOT(slotFaceButtonClicked()));
- connect( _mw->btnChangePassword, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangePassword()));
+ connect( _mw->btnChangeFace, TQ_SIGNAL(clicked()), TQ_SLOT(slotFaceButtonClicked()));
+ connect( _mw->btnChangePassword, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangePassword()));
_mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" ));
- 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()));
+ connect( _mw->leRealname, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+ connect( _mw->leOrganization, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+ connect( _mw->leEmail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
+ connect( _mw->leSMTP, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()));
_ku = new KUser();
_kes = new KEMailSettings();
diff --git a/tdepasswd/kcm/main.h b/tdepasswd/kcm/main.h
index 350c42820..f74ad55de 100644
--- a/tdepasswd/kcm/main.h
+++ b/tdepasswd/kcm/main.h
@@ -36,7 +36,7 @@ class Config;
*/
class KCMUserAccount : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCMUserAccount(TQWidget* parent, const char* name = "KCMUserAccount",
diff --git a/tdepasswd/passwd.cpp b/tdepasswd/passwd.cpp
index ab0e913a2..fc3873770 100644
--- a/tdepasswd/passwd.cpp
+++ b/tdepasswd/passwd.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
@@ -26,7 +26,7 @@
#include <tqcstring.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdesu/process.h>
#include "passwd.h"
diff --git a/tdepasswd/passwd.h b/tdepasswd/passwd.h
index 83bde9a83..80c8fb359 100644
--- a/tdepasswd/passwd.h
+++ b/tdepasswd/passwd.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdepasswd/passwddlg.cpp b/tdepasswd/passwddlg.cpp
index eb897dc95..4a2b7d4b1 100644
--- a/tdepasswd/passwddlg.cpp
+++ b/tdepasswd/passwddlg.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
diff --git a/tdepasswd/passwddlg.h b/tdepasswd/passwddlg.h
index 1fef792a4..392738fef 100644
--- a/tdepasswd/passwddlg.h
+++ b/tdepasswd/passwddlg.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
@@ -14,7 +14,7 @@
class TDEpasswd1Dialog
: public KPasswordDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEpasswd1Dialog();
@@ -30,7 +30,7 @@ protected:
class TDEpasswd2Dialog
: public KPasswordDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEpasswd2Dialog(const TQString &oldpass, const TQString &user);
diff --git a/tdepasswd/tdepasswd.cpp b/tdepasswd/tdepasswd.cpp
index a6015eacc..150a2948a 100644
--- a/tdepasswd/tdepasswd.cpp
+++ b/tdepasswd/tdepasswd.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* $Id$
*
@@ -8,7 +8,7 @@
#include <config.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
@@ -36,15 +36,15 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
- if (!KUniqueApplication::start()) {
+ if (!TDEUniqueApplication::start()) {
kdDebug() << "tdepasswd is already running" << endl;
return 0;
}
- KUniqueApplication app;
+ TDEUniqueApplication app;
KUser ku;
TQString user;