summaryrefslogtreecommitdiffstats
path: root/kdmlib
diff options
context:
space:
mode:
Diffstat (limited to 'kdmlib')
-rw-r--r--kdmlib/dmctl.cpp62
-rw-r--r--kdmlib/dmctl.h18
-rw-r--r--kdmlib/kgreet_classic.cpp86
-rw-r--r--kdmlib/kgreet_classic.h20
-rw-r--r--kdmlib/kgreet_winbind.cpp152
-rw-r--r--kdmlib/kgreet_winbind.h28
-rw-r--r--kdmlib/kgreeterplugin.h34
7 files changed, 200 insertions, 200 deletions
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp
index cd20ee4ab..58d4f8379 100644
--- a/kdmlib/dmctl.cpp
+++ b/kdmlib/dmctl.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <dcopclient.h>
-#include <qregexp.h>
+#include <tqregexp.h>
#include <X11/Xauth.h>
#include <X11/Xlib.h>
@@ -90,7 +90,7 @@ DM::DM() : fd( -1 )
break;
case OldKDM:
{
- QString tf( ctl );
+ TQString tf( ctl );
tf.truncate( tf.find( ',' ) );
fd = ::open( tf.latin1(), O_WRONLY );
}
@@ -107,7 +107,7 @@ DM::~DM()
bool
DM::exec( const char *cmd )
{
- QCString buf;
+ TQCString buf;
return exec( cmd, buf );
}
@@ -125,7 +125,7 @@ DM::exec( const char *cmd )
* from KDM.
*/
bool
-DM::exec( const char *cmd, QCString &buf )
+DM::exec( const char *cmd, TQCString &buf )
{
bool ret = false;
int tl;
@@ -175,7 +175,7 @@ DM::canShutdown()
if (DMType == OldKDM)
return strstr( ctl, ",maysd" ) != 0;
- QCString re;
+ TQCString re;
if (DMType == GDM)
return exec( "QUERY_LOGOUT_ACTION\n", re ) && re.find("HALT") >= 0;
@@ -186,14 +186,14 @@ DM::canShutdown()
void
DM::shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode, /* NOT Default */
- const QString &bootOption )
+ const TQString &bootOption )
{
if (shutdownType == KApplication::ShutdownTypeNone)
return;
bool cap_ask;
if (DMType == NewKDM) {
- QCString re;
+ TQCString re;
cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0;
} else {
if (!bootOption.isEmpty())
@@ -203,7 +203,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
if (!cap_ask && shutdownMode == KApplication::ShutdownModeInteractive)
shutdownMode = KApplication::ShutdownModeForceNow;
- QCString cmd;
+ TQCString cmd;
if (DMType == GDM) {
cmd.append( shutdownMode == KApplication::ShutdownModeForceNow ?
"SET_LOGOUT_ACTION " : "SET_SAFE_LOGOUT_ACTION " );
@@ -226,16 +226,16 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
}
bool
-DM::bootOptions( QStringList &opts, int &defopt, int &current )
+DM::bootOptions( TQStringList &opts, int &defopt, int &current )
{
if (DMType != NewKDM)
return false;
- QCString re;
+ TQCString re;
if (!exec( "listbootoptions\n", re ))
return false;
- opts = QStringList::split( '\t', QString::fromLocal8Bit( re.data() ) );
+ opts = TQStringList::split( '\t', TQString::fromLocal8Bit( re.data() ) );
if (opts.size() < 4)
return false;
@@ -247,8 +247,8 @@ DM::bootOptions( QStringList &opts, int &defopt, int &current )
if (!ok)
return false;
- opts = QStringList::split( ' ', opts[1] );
- for (QStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
+ opts = TQStringList::split( ' ', opts[1] );
+ for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
(*it).replace( "\\s", " " );
return true;
@@ -270,7 +270,7 @@ DM::isSwitchable()
if (DMType == GDM)
return exec( "QUERY_VT\n" );
- QCString re;
+ TQCString re;
return exec( "caps\n", re ) && re.find( "\tlocal" ) >= 0;
}
@@ -284,7 +284,7 @@ DM::numReserve()
if (DMType == OldKDM)
return strstr( ctl, ",rsvd" ) ? 1 : -1;
- QCString re;
+ TQCString re;
int p;
if (!(exec( "caps\n", re ) && (p = re.find( "\treserve " )) >= 0))
@@ -307,14 +307,14 @@ DM::localSessions( SessList &list )
if (DMType == OldKDM)
return false;
- QCString re;
+ TQCString re;
if (DMType == GDM) {
if (!exec( "CONSOLE_SERVERS\n", re ))
return false;
- QStringList sess = QStringList::split( QChar(';'), re.data() + 3 );
- for (QStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
- QStringList ts = QStringList::split( QChar(','), *it, true );
+ TQStringList sess = TQStringList::split( TQChar(';'), re.data() + 3 );
+ for (TQStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
+ TQStringList ts = TQStringList::split( TQChar(','), *it, true );
SessEnt se;
se.display = ts[0];
se.user = ts[1];
@@ -327,9 +327,9 @@ DM::localSessions( SessList &list )
} else {
if (!exec( "list\talllocal\n", re ))
return false;
- QStringList sess = QStringList::split( QChar('\t'), re.data() + 3 );
- for (QStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
- QStringList ts = QStringList::split( QChar(','), *it, true );
+ TQStringList sess = TQStringList::split( TQChar('\t'), re.data() + 3 );
+ for (TQStringList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
+ TQStringList ts = TQStringList::split( TQChar(','), *it, true );
SessEnt se;
se.display = ts[0];
if (ts[1][0] == '@')
@@ -347,11 +347,11 @@ DM::localSessions( SessList &list )
}
void
-DM::sess2Str2( const SessEnt &se, QString &user, QString &loc )
+DM::sess2Str2( const SessEnt &se, TQString &user, TQString &loc )
{
if (se.tty) {
user = i18n("user: ...", "%1: TTY login").arg( se.user );
- loc = se.vt ? QString("vt%1").arg( se.vt ) : se.display ;
+ loc = se.vt ? TQString("vt%1").arg( se.vt ) : se.display ;
} else {
user =
se.user.isEmpty() ?
@@ -366,7 +366,7 @@ DM::sess2Str2( const SessEnt &se, QString &user, QString &loc )
.arg( se.user ).arg( se.session );
loc =
se.vt ?
- QString("%1, vt%2").arg( se.display ).arg( se.vt ) :
+ TQString("%1, vt%2").arg( se.display ).arg( se.vt ) :
se.display;
}
}
@@ -374,7 +374,7 @@ DM::sess2Str2( const SessEnt &se, QString &user, QString &loc )
QString
DM::sess2Str( const SessEnt &se )
{
- QString user, loc;
+ TQString user, loc;
sess2Str2( se, user, loc );
return i18n("session (location)", "%1 (%2)").arg( user ).arg( loc );
@@ -384,9 +384,9 @@ bool
DM::switchVT( int vt )
{
if (DMType == GDM)
- return exec( QString("SET_VT %1\n").arg(vt).latin1() );
+ return exec( TQString("SET_VT %1\n").arg(vt).latin1() );
- return exec( QString("activate\tvt%1\n").arg(vt).latin1() );
+ return exec( TQString("activate\tvt%1\n").arg(vt).latin1() );
}
void
@@ -404,7 +404,7 @@ DM::GDMAuthenticate()
int dnl;
Xauth *xau;
- dpy = DisplayString( QPaintDevice::x11AppDisplay() );
+ dpy = DisplayString( TQPaintDevice::x11AppDisplay() );
if (!dpy) {
dpy = ::getenv( "DISPLAY" );
if (!dpy)
@@ -424,9 +424,9 @@ DM::GDMAuthenticate()
xau->data_length == 16 &&
xau->name_length == 18 && !memcmp( xau->name, "MIT-MAGIC-COOKIE-1", 18 ))
{
- QString cmd( "AUTH_LOCAL " );
+ TQString cmd( "AUTH_LOCAL " );
for (int i = 0; i < 16; i++)
- cmd += QString::number( (uchar)xau->data[i], 16 ).rightJustify( 2, '0');
+ cmd += TQString::number( (uchar)xau->data[i], 16 ).rightJustify( 2, '0');
cmd += "\n";
if (exec( cmd.latin1() )) {
XauDisposeAuth( xau );
diff --git a/kdmlib/dmctl.h b/kdmlib/dmctl.h
index aadc89bdb..da5aa2b0b 100644
--- a/kdmlib/dmctl.h
+++ b/kdmlib/dmctl.h
@@ -24,12 +24,12 @@
#include <kapplication.h>
struct SessEnt {
- QString display, from, user, session;
+ TQString display, from, user, session;
int vt;
bool self:1, tty:1;
};
-typedef QValueList<SessEnt> SessList;
+typedef TQValueList<SessEnt> SessList;
class DM {
@@ -42,7 +42,7 @@ public:
bool canShutdown();
void shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode,
- const QString &bootOption = QString::null );
+ const TQString &bootOption = TQString::null );
void setLock( bool on );
@@ -53,15 +53,15 @@ public:
bool switchVT( int vt );
void lockSwitchVT( int vt );
- bool bootOptions( QStringList &opts, int &dflt, int &curr );
+ bool bootOptions( TQStringList &opts, int &dflt, int &curr );
- static QString sess2Str( const SessEnt &se );
- static void sess2Str2( const SessEnt &se, QString &user, QString &loc );
+ static TQString sess2Str( const SessEnt &se );
+ static void sess2Str2( const SessEnt &se, TQString &user, TQString &loc );
private:
int fd;
- bool exec( const char *cmd, QCString &ret );
+ bool exec( const char *cmd, TQCString &ret );
bool exec( const char *cmd );
void GDMAuthenticate();
@@ -74,7 +74,7 @@ public:
bool canShutdown() { return false; }
void shutdown( KApplication::ShutdownType shutdownType,
KApplication::ShutdownMode shutdownMode,
- const QString &bootOption = QString::null ) {}
+ const TQString &bootOption = TQString::null ) {}
void setLock( bool ) {}
@@ -84,7 +84,7 @@ public:
bool localSessions( SessList &list ) { return false; }
void switchVT( int vt ) {}
- bool bootOptions( QStringList &opts, int &dflt, int &curr );
+ bool bootOptions( TQStringList &opts, int &dflt, int &curr );
#endif // Q_WS_X11
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp
index b38e979d0..fd2e65bd8 100644
--- a/kdmlib/kgreet_classic.cpp
+++ b/kdmlib/kgreet_classic.cpp
@@ -31,26 +31,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kpassdlg.h>
#include <kuser.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
class KDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, QWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
- virtual void contextMenuEvent( QContextMenuEvent * ) {}
+ virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
static int echoMode;
KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
KdmThemer *themer,
- QWidget *parent, QWidget *pred,
- const QString &_fixedEntity,
+ TQWidget *parent, TQWidget *pred,
+ const TQString &_fixedEntity,
Function _func, Context _ctx ) :
- QObject(),
+ TQObject(),
KGreeterPlugin( _handler ),
fixedUser( _fixedEntity ),
func( _func ),
@@ -60,7 +60,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
running( false )
{
KdmItem *user_entry = 0, *pw_entry = 0;
- QGridLayout *grid = 0;
+ TQGridLayout *grid = 0;
int line = 0;
layoutItem = 0;
@@ -71,7 +71,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
- layoutItem = grid = new QGridLayout( 0, 0, 10 );
+ layoutItem = grid = new TQGridLayout( 0, 0, 10 );
loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
loginEdit = 0;
@@ -82,10 +82,10 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
if (fixedUser.isEmpty()) {
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotLoginLostFocus()) );
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(selectionChanged()), SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, loginEdit );
pred = loginEdit;
@@ -94,23 +94,23 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
loginEdit->adjustSize();
user_entry->setWidget( loginEdit );
} else {
- loginLabel = new QLabel( loginEdit, i18n("&Username:"), parent );
+ loginLabel = new TQLabel( loginEdit, i18n("&Username:"), parent );
grid->addWidget( loginLabel, line, 0 );
grid->addWidget( loginEdit, line++, 1 );
}
} else if (ctx != Login && ctx != Shutdown && grid) {
- loginLabel = new QLabel( i18n("Username:"), parent );
+ loginLabel = new TQLabel( i18n("Username:"), parent );
grid->addWidget( loginLabel, line, 0 );
- grid->addWidget( new QLabel( fixedUser, parent ), line++, 1 );
+ grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
}
if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent );
else
passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
- connect( passwdEdit, SIGNAL(textChanged( const QString & )),
- SLOT(slotActivity()) );
- connect( passwdEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
+ TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, passwdEdit );
pred = passwdEdit;
@@ -119,7 +119,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
passwdEdit->adjustSize();
pw_entry->setWidget( passwdEdit );
} else {
- passwdLabel = new QLabel( passwdEdit,
+ passwdLabel = new TQLabel( passwdEdit,
func == Authenticate ?
i18n("&Password:") :
i18n("Current &password:"),
@@ -140,8 +140,8 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
passwd1Edit = new KDMPasswordEdit( parent );
passwd2Edit = new KDMPasswordEdit( parent );
}
- passwd1Label = new QLabel( passwd1Edit, i18n("&New password:"), parent );
- passwd2Label = new QLabel( passwd2Edit, i18n("Con&firm password:"), parent );
+ passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
+ passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );
if (pred) {
parent->setTabOrder( pred, passwd1Edit );
parent->setTabOrder( passwd1Edit, passwd2Edit );
@@ -166,14 +166,14 @@ KClassicGreeter::~KClassicGreeter()
delete passwdEdit;
return;
}
- QLayoutIterator it = static_cast<QLayout *>(layoutItem)->iterator();
- for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
+ for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
}
void // virtual
-KClassicGreeter::loadUsers( const QStringList &users )
+KClassicGreeter::loadUsers( const TQStringList &users )
{
KCompletion *userNamesCompletion = new KCompletion;
userNamesCompletion->setItems( users );
@@ -183,7 +183,7 @@ KClassicGreeter::loadUsers( const QStringList &users )
}
void // virtual
-KClassicGreeter::presetEntity( const QString &entity, int field )
+KClassicGreeter::presetEntity( const TQString &entity, int field )
{
loginEdit->setText( entity );
if (field == 1)
@@ -200,14 +200,14 @@ KClassicGreeter::presetEntity( const QString &entity, int field )
curUser = entity;
}
-QString // virtual
+TQString // virtual
KClassicGreeter::getEntity() const
{
return fixedUser.isEmpty() ? loginEdit->text() : fixedUser;
}
void // virtual
-KClassicGreeter::setUser( const QString &user )
+KClassicGreeter::setUser( const TQString &user )
{
// assert( fixedUser.isEmpty() );
curUser = user;
@@ -259,7 +259,7 @@ bool // virtual
KClassicGreeter::textMessage( const char *text, bool err )
{
if (!err &&
- QString( text ).find( QRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
+ TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
return true;
return false;
}
@@ -273,21 +273,21 @@ KClassicGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
else if (!authTok)
exp = 1;
else {
- QString pr( prompt );
- if (pr.find( QRegExp( "\\bpassword\\b", false ) ) >= 0) {
- if (pr.find( QRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
+ TQString pr( prompt );
+ if (pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0) {
+ if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
false ) ) >= 0)
exp = 3;
- else if (pr.find( QRegExp( "\\bnew\\b", false ) ) >= 0)
+ else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0)
exp = 2;
- else { // QRegExp( "\\b(old|current)\\b", false ) is too strict
+ else { // TQRegExp( "\\b(old|current)\\b", false ) is too strict
handler->gplugReturnText( "",
KGreeterPluginHandler::IsOldPassword |
KGreeterPluginHandler::IsSecret );
return;
}
} else {
- handler->gplugMsgBox( QMessageBox::Critical,
+ handler->gplugMsgBox( TQMessageBox::Critical,
i18n("Unrecognized prompt \"%1\"")
.arg( prompt ) );
handler->gplugReturnText( 0, 0 );
@@ -422,7 +422,7 @@ KClassicGreeter::clear()
if (loginEdit) {
loginEdit->clear();
loginEdit->setFocus();
- curUser = QString::null;
+ curUser = TQString::null;
} else
passwdEdit->setFocus();
}
@@ -472,11 +472,11 @@ KClassicGreeter::slotActivity()
// factory
-static bool init( const QString &,
- QVariant (*getConf)( void *, const char *, const QVariant & ),
+static bool init( const TQString &,
+ TQVariant (*getConf)( void *, const char *, const TQVariant & ),
void *ctx )
{
- echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt();
+ echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
KGlobal::locale()->insertCatalogue( "kgreet_classic" );
return true;
}
@@ -488,8 +488,8 @@ static void done( void )
static KGreeterPlugin *
create( KGreeterPluginHandler *handler, KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx )
{
diff --git a/kdmlib/kgreet_classic.h b/kdmlib/kgreet_classic.h
index 64d39799a..788df8493 100644
--- a/kdmlib/kgreet_classic.h
+++ b/kdmlib/kgreet_classic.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeterplugin.h"
-#include <qobject.h>
+#include <tqobject.h>
class KLineEdit;
class KPasswordEdit;
@@ -36,20 +36,20 @@ class KSimpleConfig;
class QGridLayout;
class QLabel;
-class KClassicGreeter : public QObject, public KGreeterPlugin {
+class KClassicGreeter : public TQObject, public KGreeterPlugin {
Q_OBJECT
public:
KClassicGreeter( KGreeterPluginHandler *handler,
KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntitiy,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntitiy,
Function func, Context ctx );
~KClassicGreeter();
- virtual void loadUsers( const QStringList &users );
- virtual void presetEntity( const QString &entity, int field );
- virtual QString getEntity() const;
- virtual void setUser( const QString &user );
+ virtual void loadUsers( const TQStringList &users );
+ virtual void presetEntity( const TQString &entity, int field );
+ virtual TQString getEntity() const;
+ virtual void setUser( const TQString &user );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );
@@ -73,11 +73,11 @@ class KClassicGreeter : public QObject, public KGreeterPlugin {
void setActive2( bool enable );
void returnData();
- QLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
+ TQLabel *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
KLineEdit *loginEdit;
KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
KSimpleConfig *stsFile;
- QString fixedUser, curUser;
+ TQString fixedUser, curUser;
Function func;
Context ctx;
int exp, pExp, has;
diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp
index eeef08b01..5f6530707 100644
--- a/kdmlib/kgreet_winbind.cpp
+++ b/kdmlib/kgreet_winbind.cpp
@@ -34,27 +34,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kuser.h>
#include <kprocio.h>
-#include <qregexp.h>
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqregexp.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
#include <stdlib.h>
class KDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( QWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, QWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
- virtual void contextMenuEvent( QContextMenuEvent * ) {}
+ virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
static int echoMode;
static char separator;
-static QStringList staticDomains;
-static QString defaultDomain;
+static TQStringList staticDomains;
+static TQString defaultDomain;
static void
-splitEntity( const QString &ent, QString &dom, QString &usr )
+splitEntity( const TQString &ent, TQString &dom, TQString &usr )
{
int pos = ent.find( separator );
if (pos < 0)
@@ -65,10 +65,10 @@ splitEntity( const QString &ent, QString &dom, QString &usr )
KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
KdmThemer *themer,
- QWidget *parent, QWidget *pred,
- const QString &_fixedEntity,
+ TQWidget *parent, TQWidget *pred,
+ const TQString &_fixedEntity,
Function _func, Context _ctx ) :
- QObject(),
+ TQObject(),
KGreeterPlugin( _handler ),
func( _func ),
ctx( _ctx ),
@@ -77,7 +77,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
running( false )
{
KdmItem *user_entry = 0, *pw_entry = 0, *domain_entry = 0;
- QGridLayout *grid = 0;
+ TQGridLayout *grid = 0;
int line = 0;
layoutItem = 0;
@@ -89,7 +89,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
- layoutItem = grid = new QGridLayout( 0, 0, 10 );
+ layoutItem = grid = new TQGridLayout( 0, 0, 10 );
domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
domainCombo = 0;
@@ -103,12 +103,12 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
if (func != ChAuthTok) {
if (fixedUser.isEmpty()) {
domainCombo = new KComboBox( parent );
- connect( domainCombo, SIGNAL(activated( const QString & )),
- SLOT(slotChangedDomain( const QString & )) );
- connect( domainCombo, SIGNAL(activated( const QString & )),
- SLOT(slotLoginLostFocus()) );
- connect( domainCombo, SIGNAL(activated( const QString & )),
- SLOT(slotActivity()) );
+ connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotChangedDomain( const TQString & )) );
+ connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotLoginLostFocus()) );
+ connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
+ TQT_SLOT(slotActivity()) );
// should handle loss of focus
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
@@ -124,42 +124,42 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
user_entry->setWidget( loginEdit );
domain_entry->setWidget( domainCombo );
} else {
- domainLabel = new QLabel( domainCombo, i18n("&Domain:"), parent );
- loginLabel = new QLabel( loginEdit, i18n("&Username:"), parent );
+ domainLabel = new TQLabel( domainCombo, i18n("&Domain:"), parent );
+ loginLabel = new TQLabel( loginEdit, i18n("&Username:"), parent );
grid->addWidget( domainLabel, line, 0 );
grid->addWidget( domainCombo, line++, 1 );
grid->addWidget( loginLabel, line, 0 );
grid->addWidget( loginEdit, line++, 1 );
}
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotLoginLostFocus()) );
- connect( loginEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(textChanged( const QString & )), SLOT(slotActivity()) );
- connect( loginEdit, SIGNAL(selectionChanged()), SLOT(slotActivity()) );
- connect(&mDomainListTimer, SIGNAL(timeout()), SLOT(slotStartDomainList()));
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+ connect(&mDomainListTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartDomainList()));
domainCombo->insertStringList( staticDomains );
- QTimer::singleShot(0, this, SLOT(slotStartDomainList()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotStartDomainList()));
} else if (ctx != Login && ctx != Shutdown && grid) {
- domainLabel = new QLabel( i18n("Domain:"), parent );
+ domainLabel = new TQLabel( i18n("Domain:"), parent );
grid->addWidget( domainLabel, line, 0 );
- grid->addWidget( new QLabel( fixedDomain, parent ), line++, 1 );
- loginLabel = new QLabel( i18n("Username:"), parent );
+ grid->addWidget( new TQLabel( fixedDomain, parent ), line++, 1 );
+ loginLabel = new TQLabel( i18n("Username:"), parent );
grid->addWidget( loginLabel, line, 0 );
- grid->addWidget( new QLabel( fixedUser, parent ), line++, 1 );
+ grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
}
if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent );
else
passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
- connect( passwdEdit, SIGNAL(textChanged( const QString & )),
- SLOT(slotActivity()) );
- connect( passwdEdit, SIGNAL(lostFocus()), SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
+ TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
if (!grid) {
passwdEdit->adjustSize();
pw_entry->setWidget( passwdEdit );
} else {
- passwdLabel = new QLabel( passwdEdit,
+ passwdLabel = new TQLabel( passwdEdit,
func == Authenticate ?
i18n("&Password:") :
i18n("Current &password:"),
@@ -185,8 +185,8 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
passwd1Edit = new KDMPasswordEdit( parent );
passwd2Edit = new KDMPasswordEdit( parent );
}
- passwd1Label = new QLabel( passwd1Edit, i18n("&New password:"), parent );
- passwd2Label = new QLabel( passwd2Edit, i18n("Con&firm password:"), parent );
+ passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
+ passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );
if (pred) {
parent->setTabOrder( pred, passwd1Edit );
parent->setTabOrder( passwd1Edit, passwd2Edit );
@@ -212,26 +212,26 @@ KWinbindGreeter::~KWinbindGreeter()
delete domainCombo;
return;
}
- QLayoutIterator it = static_cast<QLayout *>(layoutItem)->iterator();
- for (QLayoutItem *itm = it.current(); itm; itm = ++it)
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
+ for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
delete m_domainLister;
}
void
-KWinbindGreeter::slotChangedDomain( const QString &dom )
+KWinbindGreeter::slotChangedDomain( const TQString &dom )
{
if (!loginEdit->completionObject())
return;
- QStringList users;
+ TQStringList users;
if (dom == "<local>") {
- for (QStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
+ for (TQStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
if ((*it).find( separator ) < 0)
users << *it;
} else {
- QString st( dom + separator );
- for (QStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
+ TQString st( dom + separator );
+ for (TQStringList::ConstIterator it = allUsers.begin(); it != allUsers.end(); ++it)
if ((*it).startsWith( st ))
users << (*it).mid( st.length() );
}
@@ -239,7 +239,7 @@ KWinbindGreeter::slotChangedDomain( const QString &dom )
}
void // virtual
-KWinbindGreeter::loadUsers( const QStringList &users )
+KWinbindGreeter::loadUsers( const TQStringList &users )
{
allUsers = users;
KCompletion *userNamesCompletion = new KCompletion;
@@ -250,9 +250,9 @@ KWinbindGreeter::loadUsers( const QStringList &users )
}
void // virtual
-KWinbindGreeter::presetEntity( const QString &entity, int field )
+KWinbindGreeter::presetEntity( const TQString &entity, int field )
{
- QString dom, usr;
+ TQString dom, usr;
splitEntity( entity, dom, usr );
domainCombo->setCurrentItem( dom, true );
slotChangedDomain( dom );
@@ -271,10 +271,10 @@ KWinbindGreeter::presetEntity( const QString &entity, int field )
curUser = entity;
}
-QString // virtual
+TQString // virtual
KWinbindGreeter::getEntity() const
{
- QString dom, usr;
+ TQString dom, usr;
if (fixedUser.isEmpty())
dom = domainCombo->currentText(), usr = loginEdit->text();
else
@@ -283,11 +283,11 @@ KWinbindGreeter::getEntity() const
}
void // virtual
-KWinbindGreeter::setUser( const QString &user )
+KWinbindGreeter::setUser( const TQString &user )
{
// assert (fixedUser.isEmpty());
curUser = user;
- QString dom, usr;
+ TQString dom, usr;
splitEntity( user, dom, usr );
domainCombo->setCurrentItem( dom, true );
slotChangedDomain( dom );
@@ -340,7 +340,7 @@ bool // virtual
KWinbindGreeter::textMessage( const char *text, bool err )
{
if (!err &&
- QString( text ).find( QRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
+ TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0)
return true;
return false;
}
@@ -354,19 +354,19 @@ KWinbindGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
else if (!authTok)
exp = 1;
else {
- QString pr( prompt );
- if (pr.find( QRegExp( "\\b(old|current)\\b", false ) ) >= 0) {
+ TQString pr( prompt );
+ if (pr.find( TQRegExp( "\\b(old|current)\\b", false ) ) >= 0) {
handler->gplugReturnText( "",
KGreeterPluginHandler::IsOldPassword |
KGreeterPluginHandler::IsSecret );
return;
- } else if (pr.find( QRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
+ } else if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b",
false ) ) >= 0)
exp = 3;
- else if (pr.find( QRegExp( "\\bnew\\b", false ) ) >= 0)
+ else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0)
exp = 2;
else {
- handler->gplugMsgBox( QMessageBox::Critical,
+ handler->gplugMsgBox( TQMessageBox::Critical,
i18n("Unrecognized prompt \"%1\"")
.arg( prompt ) );
handler->gplugReturnText( 0, 0 );
@@ -505,7 +505,7 @@ KWinbindGreeter::clear()
slotChangedDomain( defaultDomain );
loginEdit->clear();
loginEdit->setFocus();
- curUser = QString::null;
+ curUser = TQString::null;
} else
passwdEdit->setFocus();
}
@@ -538,7 +538,7 @@ KWinbindGreeter::slotLoginLostFocus()
{
if (!running)
return;
- QString ent( getEntity() );
+ TQString ent( getEntity() );
if (exp > 0) {
if (curUser == ent)
return;
@@ -563,8 +563,8 @@ KWinbindGreeter::slotStartDomainList()
mDomainListing.clear();
m_domainLister = new KProcIO;
- connect(m_domainLister, SIGNAL(readReady(KProcIO*)), SLOT(slotReadDomainList()));
- connect(m_domainLister, SIGNAL(processExited(KProcess*)), SLOT(slotEndDomainList()));
+ connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
+ connect(m_domainLister, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotEndDomainList()));
(*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
m_domainLister->setComm (KProcess::Stdout);
@@ -574,7 +574,7 @@ KWinbindGreeter::slotStartDomainList()
void
KWinbindGreeter::slotReadDomainList()
{
- QString line;
+ TQString line;
while ( m_domainLister->readln( line ) != -1 ) {
mDomainListing.append(line);
@@ -587,17 +587,17 @@ KWinbindGreeter::slotEndDomainList()
delete m_domainLister;
m_domainLister = 0;
- QStringList domainList;
+ TQStringList domainList;
domainList = staticDomains;
- for (QStringList::const_iterator it = mDomainListing.begin();
+ for (TQStringList::const_iterator it = mDomainListing.begin();
it != mDomainListing.end(); ++it) {
if (!domainList.contains(*it))
domainList.append(*it);
}
- QString current = domainCombo->currentText();
+ TQString current = domainCombo->currentText();
for (int i = 0; i < domainList.count(); ++i) {
if (i < domainCombo->count())
@@ -619,21 +619,21 @@ KWinbindGreeter::slotEndDomainList()
// factory
-static bool init( const QString &,
- QVariant (*getConf)( void *, const char *, const QVariant & ),
+static bool init( const TQString &,
+ TQVariant (*getConf)( void *, const char *, const TQVariant & ),
void *ctx )
{
- echoMode = getConf( ctx, "EchoMode", QVariant( -1 ) ).toInt();
- staticDomains = QStringList::split( ':', getConf( ctx, "winbind.Domains", QVariant( "" ) ).toString() );
+ echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
+ staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
if (!staticDomains.contains("<local>"))
staticDomains << "<local>";
- defaultDomain = getConf( ctx, "winbind.DefaultDomain", QVariant( staticDomains.first() ) ).toString();
- QString sepstr = getConf( ctx, "winbind.Separator", QVariant( QString::null ) ).toString();
+ defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString();
+ TQString sepstr = getConf( ctx, "winbind.Separator", TQVariant( TQString::null ) ).toString();
if (sepstr.isNull()) {
FILE *sepfile = popen( "wbinfo --separator 2>/dev/null", "r" );
if (sepfile) {
- QTextIStream( sepfile ) >> sepstr;
+ TQTextIStream( sepfile ) >> sepstr;
if (pclose( sepfile ))
sepstr = "\\";
} else
@@ -649,13 +649,13 @@ static void done( void )
KGlobal::locale()->removeCatalogue( "kgreet_winbind" );
// avoid static deletion problems ... hopefully
staticDomains.clear();
- defaultDomain = QString::null;
+ defaultDomain = TQString::null;
}
static KGreeterPlugin *
create( KGreeterPluginHandler *handler, KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx )
{
diff --git a/kdmlib/kgreet_winbind.h b/kdmlib/kgreet_winbind.h
index 7fc6a1c77..7137d8638 100644
--- a/kdmlib/kgreet_winbind.h
+++ b/kdmlib/kgreet_winbind.h
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeterplugin.h"
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqtimer.h>
class KComboBox;
class KLineEdit;
@@ -40,20 +40,20 @@ class QLabel;
class KdmThemer;
class KProcIO;
-class KWinbindGreeter : public QObject, public KGreeterPlugin {
+class KWinbindGreeter : public TQObject, public KGreeterPlugin {
Q_OBJECT
public:
KWinbindGreeter( KGreeterPluginHandler *handler,
KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntitiy,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntitiy,
Function func, Context ctx );
~KWinbindGreeter();
- virtual void loadUsers( const QStringList &users );
- virtual void presetEntity( const QString &entity, int field );
- virtual QString getEntity() const;
- virtual void setUser( const QString &user );
+ virtual void loadUsers( const TQStringList &users );
+ virtual void presetEntity( const TQString &entity, int field );
+ virtual TQString getEntity() const;
+ virtual void setUser( const TQString &user );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );
@@ -70,7 +70,7 @@ class KWinbindGreeter : public QObject, public KGreeterPlugin {
public slots:
void slotLoginLostFocus();
- void slotChangedDomain( const QString &dom );
+ void slotChangedDomain( const TQString &dom );
void slotActivity();
void slotStartDomainList();
void slotReadDomainList();
@@ -81,15 +81,15 @@ class KWinbindGreeter : public QObject, public KGreeterPlugin {
void setActive2( bool enable );
void returnData();
- QLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
+ TQLabel *domainLabel, *loginLabel, *passwdLabel, *passwd1Label, *passwd2Label;
KComboBox *domainCombo;
KLineEdit *loginEdit;
KPasswordEdit *passwdEdit, *passwd1Edit, *passwd2Edit;
KSimpleConfig *stsFile;
- QString fixedDomain, fixedUser, curUser;
- QStringList allUsers, mDomainListing;
+ TQString fixedDomain, fixedUser, curUser;
+ TQStringList allUsers, mDomainListing;
KProcIO* m_domainLister;
- QTimer mDomainListTimer;
+ TQTimer mDomainListTimer;
Function func;
Context ctx;
diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h
index e7677415c..25680f312 100644
--- a/kdmlib/kgreeterplugin.h
+++ b/kdmlib/kgreeterplugin.h
@@ -24,8 +24,8 @@
#ifndef KGREETERPLUGIN_H
#define KGREETERPLUGIN_H
-#include <qvariant.h>
-#include <qmessagebox.h>
+#include <tqvariant.h>
+#include <tqmessagebox.h>
#include <kdemacros.h>
class KdmThemer;
@@ -58,7 +58,7 @@ public:
* user changes.
* @param user the user logging in
*/
- virtual void gplugSetUser( const QString &user ) = 0;
+ virtual void gplugSetUser( const TQString &user ) = 0;
/**
* Start processing.
*/
@@ -76,7 +76,7 @@ public:
* @param type message severity
* @param text message text
*/
- virtual void gplugMsgBox( QMessageBox::Icon type, const QString &text ) = 0;
+ virtual void gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) = 0;
};
/**
@@ -122,7 +122,7 @@ public:
* Will be called only when not running.
* @param users the users to load.
*/
- virtual void loadUsers( const QStringList &users ) = 0;
+ virtual void loadUsers( const TQStringList &users ) = 0;
/**
* Preload the talker with an (opaque to the greeter) entity.
@@ -134,13 +134,13 @@ public:
* the password field with anything, disabling it, and placing the
* cursor in the user name field.
*/
- virtual void presetEntity( const QString &entity, int field ) = 0;
+ virtual void presetEntity( const TQString &entity, int field ) = 0;
/**
* Obtain the actually logged in entity.
* Will be called only after succeeded() was called.
*/
- virtual QString getEntity() const = 0;
+ virtual TQString getEntity() const = 0;
/**
* "Push" a user into the talker. That can be a click into the user list
@@ -149,7 +149,7 @@ public:
* @param user the user to set. Note that this is a UNIX login, not a
* canonical entity
*/
- virtual void setUser( const QString &user ) = 0;
+ virtual void setUser( const TQString &user ) = 0;
/**
* En-/disable any widgets contained in the talker.
@@ -277,14 +277,14 @@ public:
virtual void clear() = 0;
/**
- * Obtain the QLayoutItem containg the widget(s) to actually handle the
- * conversation. See QLayout and QWidgetItem for possible implementations.
+ * Obtain the TQLayoutItem containg the widget(s) to actually handle the
+ * conversation. See TQLayout and TQWidgetItem for possible implementations.
*/
- QLayoutItem *getLayoutItem() const { return layoutItem; }
+ TQLayoutItem *getLayoutItem() const { return layoutItem; }
protected:
KGreeterPluginHandler *handler;
- QLayoutItem *layoutItem;
+ TQLayoutItem *layoutItem;
};
struct KDE_EXPORT kgreeterplugin_info {
@@ -345,9 +345,9 @@ struct KDE_EXPORT kgreeterplugin_info {
* @param ctx context pointer for @p getConf
* @return if false, unload the plugin again (don't call done() first)
*/
- bool (*init)( const QString &method,
- QVariant (*getConf)( void *ctx, const char *key,
- const QVariant &dflt ),
+ bool (*init)( const TQString &method,
+ TQVariant (*getConf)( void *ctx, const char *key,
+ const TQVariant &dflt ),
void *ctx );
/**
@@ -392,8 +392,8 @@ struct KDE_EXPORT kgreeterplugin_info {
*/
KGreeterPlugin *(*create)( KGreeterPluginHandler *handler,
KdmThemer *themer,
- QWidget *parent, QWidget *predecessor,
- const QString &fixedEntity,
+ TQWidget *parent, TQWidget *predecessor,
+ const TQString &fixedEntity,
KGreeterPlugin::Function func,
KGreeterPlugin::Context ctx );
};