summaryrefslogtreecommitdiffstats
path: root/kdmlib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-22 00:28:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-22 00:28:18 -0600
commit7021f40c13f949b7cb5ded32d0241d648a43bf6c (patch)
treeaa1a5e4de2963edc6638783246b2ff25e98833aa /kdmlib
parent0a2a54a02254ded760afd5b9c965c6bb71459d46 (diff)
downloadtdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.tar.gz
tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.zip
Part 1 of 2 of kdm rename
Diffstat (limited to 'kdmlib')
-rw-r--r--kdmlib/CMakeLists.txt16
-rw-r--r--kdmlib/Makefile.am2
-rw-r--r--kdmlib/dmctl.cpp30
-rw-r--r--kdmlib/kdmtsak.cpp6
-rw-r--r--kdmlib/kdmtsak.h2
-rw-r--r--kdmlib/kgreet_classic.cpp24
-rw-r--r--kdmlib/kgreet_classic.h2
-rw-r--r--kdmlib/kgreet_pam.cpp52
-rw-r--r--kdmlib/kgreet_pam.h2
-rw-r--r--kdmlib/kgreet_winbind.cpp24
-rw-r--r--kdmlib/kgreet_winbind.h2
-rw-r--r--kdmlib/kgreeterplugin.h14
12 files changed, 88 insertions, 88 deletions
diff --git a/kdmlib/CMakeLists.txt b/kdmlib/CMakeLists.txt
index 671fd73b7..a2565fe1d 100644
--- a/kdmlib/CMakeLists.txt
+++ b/kdmlib/CMakeLists.txt
@@ -11,7 +11,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kdm/kfrontend
+ ${CMAKE_SOURCE_DIR}/tdm/kfrontend
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
@@ -21,7 +21,7 @@ link_directories(
${TQT_LIBRARY_DIRS}
)
-if( BUILD_KDM )
+if( BUILD_TDM )
##### headers ###################################
@@ -57,12 +57,12 @@ tde_add_kpart( kgreet_winbind AUTOMOC
-endif( BUILD_KDM )
+endif( BUILD_TDM )
##### dmctl (static) ############################
-if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_KDM OR BUILD_KSMSERVER )
+if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_TDM OR BUILD_KSMSERVER )
tde_add_library( dmctl STATIC_PIC
SOURCES dmctl.cpp
@@ -71,15 +71,15 @@ if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_KDM OR BUILD_KSMSERVER )
endif( )
-##### kdmtsak (executable) #######################
+##### tdmtsak (executable) #######################
if( BUILD_TSAK )
- tde_add_executable( kdmtsak
- SOURCES kdmtsak.cpp
+ tde_add_executable( tdmtsak
+ SOURCES tdmtsak.cpp
LINK ${TQT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
SETUID
- DESCRIPTION "Secure Attention Key interface for KDM"
+ DESCRIPTION "Secure Attention Key interface for TDM"
AUTHORS "Timothy Pearson"
)
endif( BUILD_TSAK )
diff --git a/kdmlib/Makefile.am b/kdmlib/Makefile.am
index 7183a8889..f21f59bd5 100644
--- a/kdmlib/Makefile.am
+++ b/kdmlib/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kdm/kfrontend $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdm/kfrontend $(all_includes)
kde_module_LTLIBRARIES = kgreet_classic.la kgreet_pam.la kgreet_winbind.la
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp
index 255a7b2ea..41a5cb206 100644
--- a/kdmlib/dmctl.cpp
+++ b/kdmlib/dmctl.cpp
@@ -37,7 +37,7 @@
#include <fcntl.h>
#include <errno.h>
-static enum { Dunno, NoDM, NewKDM, OldKDM, GDM } DMType = Dunno;
+static enum { Dunno, NoDM, NewTDM, OldTDM, GDM } DMType = Dunno;
static const char *ctl, *dpy;
DM::DM() : fd( -1 )
@@ -49,9 +49,9 @@ DM::DM() : fd( -1 )
if (!(dpy = ::getenv( "DISPLAY" )))
DMType = NoDM;
else if ((ctl = ::getenv( "DM_CONTROL" )))
- DMType = NewKDM;
+ DMType = NewTDM;
else if ((ctl = ::getenv( "XDM_MANAGED" )) && ctl[0] == '/')
- DMType = OldKDM;
+ DMType = OldTDM;
else if (::getenv( "GDMSESSION" ))
DMType = GDM;
else
@@ -60,7 +60,7 @@ DM::DM() : fd( -1 )
switch (DMType) {
default:
return;
- case NewKDM:
+ case NewTDM:
case GDM:
if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
return;
@@ -88,7 +88,7 @@ DM::DM() : fd( -1 )
}
}
break;
- case OldKDM:
+ case OldTDM:
{
TQString tf( ctl );
tf.truncate( tf.find( ',' ) );
@@ -113,16 +113,16 @@ DM::exec( const char *cmd )
}
/**
- * Execute a KDM/GDM remote control command.
+ * Execute a TDM/GDM remote control command.
* @param cmd the command to execute. FIXME: undocumented yet.
* @param buf the result buffer.
* @return result:
* @li If true, the command was successfully executed.
* @p ret might contain addional results.
* @li If false and @p ret is empty, a communication error occurred
- * (most probably KDM is not running).
+ * (most probably TDM is not running).
* @li If false and @p ret is non-empty, it contains the error message
- * from KDM.
+ * from TDM.
*/
bool
DM::exec( const char *cmd, TQCString &buf )
@@ -143,7 +143,7 @@ DM::exec( const char *cmd, TQCString &buf )
buf.resize( 0 );
return false;
}
- if (DMType == OldKDM) {
+ if (DMType == OldTDM) {
buf.resize( 0 );
return true;
}
@@ -172,7 +172,7 @@ DM::exec( const char *cmd, TQCString &buf )
bool
DM::canShutdown()
{
- if (DMType == OldKDM)
+ if (DMType == OldTDM)
return strstr( ctl, ",maysd" ) != 0;
TQCString re;
@@ -192,7 +192,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
return;
bool cap_ask;
- if (DMType == NewKDM) {
+ if (DMType == NewTDM) {
TQCString re;
cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0;
} else {
@@ -228,7 +228,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
bool
DM::bootOptions( TQStringList &opts, int &defopt, int &current )
{
- if (DMType != NewKDM)
+ if (DMType != NewTDM)
return false;
TQCString re;
@@ -264,7 +264,7 @@ DM::setLock( bool on )
bool
DM::isSwitchable()
{
- if (DMType == OldKDM)
+ if (DMType == OldTDM)
return dpy[0] == ':';
if (DMType == GDM)
@@ -281,7 +281,7 @@ DM::numReserve()
if (DMType == GDM)
return 1; /* Bleh */
- if (DMType == OldKDM)
+ if (DMType == OldTDM)
return strstr( ctl, ",rsvd" ) ? 1 : -1;
TQCString re;
@@ -304,7 +304,7 @@ DM::startReserve()
bool
DM::localSessions( SessList &list )
{
- if (DMType == OldKDM)
+ if (DMType == OldTDM)
return false;
TQCString re;
diff --git a/kdmlib/kdmtsak.cpp b/kdmlib/kdmtsak.cpp
index 22f8a0b9a..18acd05d2 100644
--- a/kdmlib/kdmtsak.cpp
+++ b/kdmlib/kdmtsak.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kdmtsak.h"
+#include "tdmtsak.h"
#include <tqstringlist.h>
@@ -45,7 +45,7 @@ bool is_vt_local() {
}
else {
TQString cvtName = "";
- TQString output = exec("kdmctl list");
+ TQString output = exec("tdmctl list");
TQStringList sessionList = TQStringList::split('\t', output, false);
// See if the current session is local
for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) {
@@ -69,7 +69,7 @@ bool is_vt_active() {
}
else {
TQString cvtName = "";
- TQString output = exec("kdmctl list");
+ TQString output = exec("tdmctl list");
TQString curConsole = exec("fgconsole");
bool intFound;
int curConsoleNum = curConsole.toInt(&intFound);
diff --git a/kdmlib/kdmtsak.h b/kdmlib/kdmtsak.h
index 9c512a59b..1987a8218 100644
--- a/kdmlib/kdmtsak.h
+++ b/kdmlib/kdmtsak.h
@@ -77,7 +77,7 @@ inline int tde_sak_verify_calling_process()
#ifdef DEBUG
printf("Parent executable name is: %s\n\r", procparent.ascii());
#endif
- if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "kdm")) {
+ if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "tdm")) {
authorized = true;
}
else if (procparent == "tdeinit") {
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp
index af6d80172..b37f2bab7 100644
--- a/kdmlib/kgreet_classic.cpp
+++ b/kdmlib/kgreet_classic.cpp
@@ -1,6 +1,6 @@
/*
-Conversation widget for kdm greeter
+Conversation widget for tdm greeter
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kgreet_classic.h"
-#include "themer/kdmthemer.h"
-#include "themer/kdmitem.h"
+#include "themer/tdmthemer.h"
+#include "themer/tdmitem.h"
#include <klocale.h>
#include <klineedit.h>
@@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqlayout.h>
#include <tqlabel.h>
-class KDMPasswordEdit : public KPasswordEdit {
+class TDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
@@ -105,9 +105,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
}
if (echoMode == -1)
- passwdEdit = new KDMPasswordEdit( parent );
+ passwdEdit = new TDMPasswordEdit( parent );
else
- passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
+ passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) );
@@ -135,11 +135,11 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
}
if (func != Authenticate) {
if (echoMode == -1) {
- passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
- passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
+ passwd1Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
+ passwd2Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
} else {
- passwd1Edit = new KDMPasswordEdit( parent );
- passwd2Edit = new KDMPasswordEdit( parent );
+ passwd1Edit = new TDMPasswordEdit( parent );
+ passwd2Edit = new TDMPasswordEdit( parent );
}
passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );
diff --git a/kdmlib/kgreet_classic.h b/kdmlib/kgreet_classic.h
index 07bf35957..1f467a528 100644
--- a/kdmlib/kgreet_classic.h
+++ b/kdmlib/kgreet_classic.h
@@ -1,6 +1,6 @@
/*
-Conversation widget for kdm greeter
+Conversation widget for tdm greeter
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp
index 41c7b2439..82506fb43 100644
--- a/kdmlib/kgreet_pam.cpp
+++ b/kdmlib/kgreet_pam.cpp
@@ -1,10 +1,10 @@
/*
-Conversation widget for kdm greeter
+Conversation widget for tdm greeter
Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
-based on classic kdm greeter:
+based on classic tdm greeter:
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kgreet_pam.h"
-#include "themer/kdmthemer.h"
-#include "themer/kdmlabel.h"
+#include "themer/tdmthemer.h"
+#include "themer/tdmlabel.h"
#include <klocale.h>
#include <klineedit.h>
@@ -47,10 +47,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//#define PAM_GREETER_DEBUG
-class KDMPasswordEdit : public KPasswordEdit {
+class TDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
@@ -148,9 +148,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
}
#if 0
if (echoMode == -1)
- passwdEdit = new KDMPasswordEdit( parent );
+ passwdEdit = new TDMPasswordEdit( parent );
else
- passwdEdit = new KDMPasswordEdit( echoMode,
+ passwdEdit = new TDMPasswordEdit( echoMode,
parent );
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) );
@@ -177,11 +177,11 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
}
if (func != Authenticate) {
if (echoMode == -1) {
- authEdit << new KDMPasswordEdit( echoMode, parent );
- authEdit << new KDMPasswordEdit( echoMode, parent );
+ authEdit << new TDMPasswordEdit( echoMode, parent );
+ authEdit << new TDMPasswordEdit( echoMode, parent );
} else {
- authEdit << new KDMPasswordEdit( parent );
- authEdit << new KDMPasswordEdit( parent );
+ authEdit << new TDMPasswordEdit( parent );
+ authEdit << new TDMPasswordEdit( parent );
}
authLabel << new TQLabel( authEdit[0], i18n("&New password:"), parent );
authLabel << new TQLabel( authEdit[1], i18n("Con&firm password:"), parent );
@@ -338,11 +338,11 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
if (loginLabel)
loginLabel->setText(TQString::fromUtf8(prompt));
else if (m_themer) {
- KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("user-label"));
- if (kdmlabel) {
+ KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("user-label"));
+ if (tdmlabel) {
//userLabel->setText(TQString::fromUtf8(prompt));
- kdmlabel->label.text = TQString::fromUtf8(prompt);
- TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update()));
+ tdmlabel->label.text = TQString::fromUtf8(prompt);
+ TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
}
}
}
@@ -356,21 +356,21 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
kg_debug("themer found!");
KdmItem *pw_label = 0;
- KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label"));
- if (kdmlabel) {
+ KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label"));
+ if (tdmlabel) {
//userLabel->setText(TQString::fromUtf8(prompt));
TQString str = TQString::fromUtf8(prompt);
- kdmlabel->label.text = str;
- TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update()));
+ tdmlabel->label.text = str;
+ TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
}
}
- KDMPasswordEdit* passwdEdit;
+ TDMPasswordEdit* passwdEdit;
if (echoMode == -1)
- passwdEdit = new KDMPasswordEdit( m_parentWidget );
+ passwdEdit = new TDMPasswordEdit( m_parentWidget );
else
- passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget);
+ passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget);
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) );
connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
@@ -400,8 +400,8 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
if (0) {
//userLabel->setText(TQString::fromUtf8(prompt));
- //kdmlabel->label.text = TQString::fromUtf8(prompt);
- //TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update()));
+ //tdmlabel->label.text = TQString::fromUtf8(prompt);
+ //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
}
}
else
diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h
index 2c1e3f252..03c404c1e 100644
--- a/kdmlib/kgreet_pam.h
+++ b/kdmlib/kgreet_pam.h
@@ -1,6 +1,6 @@
/*
-Conversation widget for kdm greeter
+Conversation widget for tdm greeter
Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp
index 3ab5bbaa8..d5626a3fd 100644
--- a/kdmlib/kgreet_winbind.cpp
+++ b/kdmlib/kgreet_winbind.cpp
@@ -1,6 +1,6 @@
/*
-Conversation widget for kdm greeter
+Conversation widget for tdm greeter
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kgreet_winbind.h"
-#include "themer/kdmthemer.h"
-#include "themer/kdmitem.h"
+#include "themer/tdmthemer.h"
+#include "themer/tdmitem.h"
#include <klocale.h>
#include <kdebug.h>
@@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <stdlib.h>
-class KDMPasswordEdit : public KPasswordEdit {
+class TDMPasswordEdit : public KPasswordEdit {
public:
- KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
- KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
+ TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
+ TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
@@ -148,9 +148,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
}
if (echoMode == -1)
- passwdEdit = new KDMPasswordEdit( parent );
+ passwdEdit = new TDMPasswordEdit( parent );
else
- passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
+ passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) );
@@ -180,11 +180,11 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
}
if (func != Authenticate) {
if (echoMode == -1) {
- passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
- passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
+ passwd1Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
+ passwd2Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
} else {
- passwd1Edit = new KDMPasswordEdit( parent );
- passwd2Edit = new KDMPasswordEdit( parent );
+ passwd1Edit = new TDMPasswordEdit( parent );
+ passwd2Edit = new TDMPasswordEdit( parent );
}
passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );
diff --git a/kdmlib/kgreet_winbind.h b/kdmlib/kgreet_winbind.h
index 055296e34..54f2653fc 100644
--- a/kdmlib/kgreet_winbind.h
+++ b/kdmlib/kgreet_winbind.h
@@ -1,6 +1,6 @@
/*
-Conversation widget for kdm greeter
+Conversation widget for tdm greeter
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h
index 61d9b519a..edf67f141 100644
--- a/kdmlib/kgreeterplugin.h
+++ b/kdmlib/kgreeterplugin.h
@@ -81,7 +81,7 @@ public:
/**
* Abstract base class for conversation plugins ("talkers") to be used with
- * KDM, kdesktop_lock, etc.
+ * TDM, kdesktop_lock, etc.
* The authentication method used by a particular instance of a plugin
* may be configurable, but the instance must handle exactly one method,
* i.e., info->method must be determined at the latest at init() time.
@@ -101,10 +101,10 @@ public:
/**
* Contexts the talker can be used in:
- * - Login: kdm login dialog
- * - Shutdown: kdm shutdown dialog
- * - Unlock: kdm unlock dialog (TODO)
- * - ChangeTok: kdm password change dialog (TODO)
+ * - Login: tdm login dialog
+ * - Shutdown: tdm shutdown dialog
+ * - Unlock: tdm unlock dialog (TODO)
+ * - ChangeTok: tdm password change dialog (TODO)
* - ExUnlock: kdesktop_lock unlock dialog
* - ExChangeTok: kdepasswd password change dialog (TODO)
*
@@ -343,9 +343,9 @@ struct KDE_EXPORT kgreeterplugin_info {
* above, it can ignore this parameter.
* @param getConf can be used to obtain configuration items from the
* greeter; you have to pass it the @p ctx pointer.
- * The only predefined key (in KDM) is "EchoMode", which is an int
+ * The only predefined key (in TDM) is "EchoMode", which is an int
* (in fact, KPasswordEdit::EchoModes).
- * Other keys are obtained from the PluginOptions option; see kdmrc
+ * Other keys are obtained from the PluginOptions option; see tdmrc
* for details.
* If the key is unknown, dflt is returned.
* @param ctx context pointer for @p getConf