Part 1 of 2 of kdm rename

author: Timothy Pearson <[email protected]> 2012-01-22 00:28:18 -0600
committer: Timothy Pearson <[email protected]> 2012-01-22 00:28:18 -0600
commit: 7021f40c13f949b7cb5ded32d0241d648a43bf6c (patch)
tree: aa1a5e4de2963edc6638783246b2ff25e98833aa /kdm/kfrontend
parent: 0a2a54a02254ded760afd5b9c965c6bb71459d46 (diff)
download: tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.tar.gz
tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.zip
55 files changed, 423 insertions, 423 deletions
diff --git a/kdm/kfrontend/CMakeLists.txt b/kdm/kfrontend/CMakeLists.txt
index cd432af4b..4a069a3ae 100644
--- a/kdm/kfrontend/CMakeLists.txt
+++ b/kdm/kfrontend/CMakeLists.txt
@@ -17,8 +17,8 @@ add_subdirectory( sessions )
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kdm/backend
-  ${CMAKE_SOURCE_DIR}/kdmlib
+  ${CMAKE_SOURCE_DIR}/tdm/backend
+  ${CMAKE_SOURCE_DIR}/tdmlib
   ${CMAKE_SOURCE_DIR}/kcontrol/background
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -31,43 +31,43 @@ link_directories(
 
 ##### other data ################################
 
-if( NOT DEFINED GENKDMCONF_FLAGS )
-  set( GENKDMCONF_FLAGS "--no-old" )
+if( NOT DEFINED GENTDMCONF_FLAGS )
+  set( GENTDMCONF_FLAGS "--no-old" )
 endif( )
 
-install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
+install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/tdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENTDMCONF_FLAGS} )" )
 
 
 ##### config.ci (generated) #####################
 
 add_custom_command( OUTPUT config.ci
-  COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci
-  DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def )
+  COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci
+  DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def )
 
 
-##### kdm_config (executable) ###################
+##### tdm_config (executable) ###################
 
-set_property( SOURCE kdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
+set_property( SOURCE tdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
 
-tde_add_executable( kdm_config
-  SOURCES kdm_config.c
+tde_add_executable( tdm_config
+  SOURCES tdm_config.c
   LINK
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### kdm_greet (executable) ####################
+##### tdm_greet (executable) ####################
 if( WITH_XRANDR )
-  set( KDMGREET_OPTIONAL_LINK "krandr-shared" )
+  set( TDMGREET_OPTIONAL_LINK "krandr-shared" )
 endif ( )
 
-tde_add_executable( kdm_greet AUTOMOC
+tde_add_executable( tdm_greet AUTOMOC
   SOURCES
-    kdm_greet.c kdmconfig.cpp kdmclock.cpp kconsole.cpp
+    tdm_greet.c tdmconfig.cpp tdmclock.cpp kconsole.cpp
     kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
-    kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp
+    tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp
     kgapp.cpp sakdlg.cc
-  LINK kdmthemer-static tdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK}
+  LINK tdmthemer-static tdeui-shared Xtst ${TDMGREET_OPTIONAL_LINK}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -81,21 +81,21 @@ tde_add_executable( krootimage AUTOMOC
 )
 
 
-##### genkdmconf (executable) ###################
+##### gentdmconf (executable) ###################
 
-set_property( SOURCE genkdmconf.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
+set_property( SOURCE gentdmconf.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
 
-tde_add_executable( genkdmconf AUTOMOC
-  SOURCES genkdmconf.c
+tde_add_executable( gentdmconf AUTOMOC
+  SOURCES gentdmconf.c
   LINK X11
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### kdmctl (executable) #######################
+##### tdmctl (executable) #######################
 
-tde_add_executable( kdmctl
-  SOURCES kdmctl.c
+tde_add_executable( tdmctl
+  SOURCES tdmctl.c
   LINK
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdm/kfrontend/Makefile.am b/kdm/kfrontend/Makefile.am
index 889271292..7c58dc67f 100644
--- a/kdm/kfrontend/Makefile.am
+++ b/kdm/kfrontend/Makefile.am
@@ -1,31 +1,31 @@
-# use 'make GENKDMCONF_FLAGS=... install' to override
-GENKDMCONF_FLAGS = --no-old
+# use 'make GENTDMCONF_FLAGS=... install' to override
+GENTDMCONF_FLAGS = --no-old
 
 SUBDIRS = themer themes pics sessions
 
 AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
-    -I$(top_srcdir)/kdmlib $(all_includes)
+    -I$(top_srcdir)/tdmlib $(all_includes)
 
-bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl
+bin_PROGRAMS = tdm_config tdm_greet krootimage gentdmconf tdmctl
 
-kdm_config_SOURCES = kdm_config.c
-kdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4)
+tdm_config_SOURCES = tdm_config.c
+tdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4)
 
-kdm_greet_SOURCES = \
-    kdm_greet.c \
-    kdmconfig.cpp \
-    kdmclock.cpp \
+tdm_greet_SOURCES = \
+    tdm_greet.c \
+    tdmconfig.cpp \
+    tdmclock.cpp \
     kconsole.cpp \
     kfdialog.cpp \
     kgdialog.cpp \
     kchooser.cpp \
     kgverify.cpp \
-    kdmshutdown.cpp \
-    kdmadmindialog.cpp \
+    tdmshutdown.cpp \
+    tdmadmindialog.cpp \
     kgreeter.cpp \
     kgapp.cpp
-kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4)
+tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4)
 
 krootimage_SOURCES = krootimage.cpp
 krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
@@ -33,35 +33,35 @@ krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
 
 METASOURCES = AUTO
 
-genkdmconf_SOURCES = genkdmconf.c
-genkdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH)
-genkdmconf_LDADD = $(LIB_X11)
+gentdmconf_SOURCES = gentdmconf.c
+gentdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH)
+gentdmconf_LDADD = $(LIB_X11)
 
-kdmctl_SOURCES = kdmctl.c
-kdmctl_LDADD = $(LIBSOCKET)
+tdmctl_SOURCES = tdmctl.c
+tdmctl_LDADD = $(LIBSOCKET)
 
-install-data-local: genkdmconf
-	./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
+install-data-local: gentdmconf
+	./gentdmconf --in $(DESTDIR)$(kde_confdir)/tdm --no-in-notice --face-src $(srcdir)/pics $(GENTDMCONF_FLAGS)
 
 messages:
-	$(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot
+	$(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/tdmgreet.pot
 
 noinst_HEADERS = \
-    kdm_greet.h \
-    kdmconfig.h \
-    kdmclock.h \
+    tdm_greet.h \
+    tdmconfig.h \
+    tdmclock.h \
     kconsole.h \
     kfdialog.h \
     kgdialog.h \
     kchooser.h \
     kgverify.h \
-    kdmshutdown.h \
+    tdmshutdown.h \
     kgreeter.h \
     kgapp.h \
     \
     krootimage.h 
 
-kdm_greet_COMPILE_FIRST = ../config.ci
-kdm_config_COMPILE_FIRST = ../config.ci
-genkdmconf_COMPILE_FIRST = ../config.ci
+tdm_greet_COMPILE_FIRST = ../config.ci
+tdm_config_COMPILE_FIRST = ../config.ci
+gentdmconf_COMPILE_FIRST = ../config.ci
 
diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index bfbeda32a..f55ffbbbc 100644
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
@@ -1,6 +1,6 @@
 /*
 
-Create a suitable configuration for kdm taking old xdm/kdm
+Create a suitable configuration for tdm taking old xdm/tdm
 installations into account
 
 Copyright (C) 2001-2005 Oswald Buddenhagen <[email protected]>
@@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 static int old_scripts, no_old_scripts, old_confs, no_old,
 	no_backup, no_in_notice, use_destdir, mixed_scripts;
-static const char *newdir = KDMCONF, *facesrc = KDMDATA "/pics/users",
+static const char *newdir = TDMCONF, *facesrc = TDMDATA "/pics/users",
 	*oldxdm, *oldkde;
 
 static int oldver;
@@ -350,7 +350,7 @@ locate( const char *exe )
 
 
 /*
- * target data to be written to kdmrc
+ * target data to be written to tdmrc
  */
 
 typedef struct Entry {
@@ -369,10 +369,10 @@ typedef struct Section {
 	Entry *ents;
 } Section;
 
-static Section *config; /* the kdmrc data to be written */
+static Section *config; /* the tdmrc data to be written */
 
 /*
- * Specification of the (currently possible) kdmrc entries
+ * Specification of the (currently possible) tdmrc entries
  */
 
 typedef struct Ent {
@@ -392,7 +392,7 @@ static Sect *findSect( const char *name );
 static Ent *findEnt( Sect *sect, const char *key );
 
 /*
- * Functions to manipulate the current kdmrc data
+ * Functions to manipulate the current tdmrc data
  */
 
 static const char *
@@ -594,12 +594,12 @@ static const char def_startup[] =
 "    xmessage -file /etc/nologin -geometry 640x480\n"
 "  fi\n"
 "  if [ \"$(id -u)\" != \"0\" ] && \\\n"
-"     ! grep -qs '^ignore-nologin' /etc/trinity/kdm/kdm.options; then\n"
+"     ! grep -qs '^ignore-nologin' /etc/trinity/tdm/tdm.options; then\n"
 "    exit 1\n"
 "  fi\n"
 "fi\n"
 "\n"
-"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n"
+"if grep -qs '^use-sessreg' /etc/trinity/tdm/tdm.options && \\\n"
 "   which sessreg > /dev/null 2>&1; then\n"
 "      exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
 "                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
@@ -620,7 +620,7 @@ static const char def_reset[] =
 "#devname=`echo $DISPLAY | cut -c1-8`\n"
 "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
 #else
-"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n"
+"if grep -qs '^use-sessreg' /etc/trinity/tdm/tdm.options && \\\n"
 "   which sessreg > /dev/null 2>&1; then\n"
 "      exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
 "                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
@@ -765,7 +765,7 @@ resect( const char *sec, const char *name )
 static int
 inNewDir( const char *name )
 {
-	return !memcmp( name, KDMCONF "/", sizeof(KDMCONF) );
+	return !memcmp( name, TDMCONF "/", sizeof(TDMCONF) );
 }
 
 static int
@@ -839,7 +839,7 @@ copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
 		return 1;
 
 	tptr = strrchr( tname, '/' );
-	ASPrintf( &nname, KDMCONF "/%s", tptr ? tptr + 1 : tname );
+	ASPrintf( &nname, TDMCONF "/%s", tptr ? tptr + 1 : tname );
 	if (inList( cflist, ce->value ) ||
 	    inList( eflist, ce->value ) ||
 	    inList( lflist, ce->value ))
@@ -1322,7 +1322,7 @@ cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED )
 	if (old_confs)
 		linkfile( ce );
 	else
-		if (!copyfile( ce, "kdmkeys", 0600, 0 ))
+		if (!copyfile( ce, "tdmkeys", 0600, 0 ))
 			ce->active = 0;
 }
 
@@ -1351,7 +1351,7 @@ mk_willing( Entry *ce, Section *cs ATTR_UNUSED )
 			dlinkfile( fname );
 		else {
 		  dflt:
-			ce->value = KDMCONF "/Xwilling";
+			ce->value = TDMCONF "/Xwilling";
 			ce->active = ce->written = 1;
 			writefile( ce->value, 0755, def_willing );
 		}
@@ -1459,18 +1459,18 @@ edit_setup( File *file )
 	int chg =
 		delstr( file, "\n"
 		        "(\n"
-		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
-		        "  */kdmdesktop\t&\n"
+		        "  PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n"
+		        "  */tdmdesktop\t&\n"
 		        "  echo $! >$PIDFILE\n"
 		        "  wait $!\n"
 		        "  rm $PIDFILE\n"
 		        ")\t&\n" ) |
 		delstr( file, "\n"
-		        "*/kdmdesktop\t&\n" ) |
+		        "*/tdmdesktop\t&\n" ) |
 		delstr( file, "\n"
-		        "kdmdesktop\t&\n" ) |
+		        "tdmdesktop\t&\n" ) |
 		delstr( file, "\n"
-		        "kdmdesktop\n" );
+		        "tdmdesktop\n" );
 	putval( "UseBackground", chg ? "true" : "false" );
 	return chg;
 }
@@ -1490,7 +1490,7 @@ mk_setup( Entry *ce, Section *cs )
 			else
 				linkfile( ce );
 		} else {
-			ce->value = KDMCONF "/Xsetup";
+			ce->value = TDMCONF "/Xsetup";
 			ce->active = ce->written = 1;
 			writefile( ce->value, 0755, def_setup );
 		}
@@ -1504,12 +1504,12 @@ edit_startup( File *file )
 
 	if (mod_usebg &&
 	    (delstr( file, "\n"
-	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+	             "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n"
 	             "if [[] -f $PIDFILE ] ; then\n"
 	             "	   kill `cat $PIDFILE`\n"
 	             "fi\n" ) ||
 	     delstr( file, "\n"
-	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+	             "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n"
 	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
 		chg1 = 1;
 	if (oldver < 0x0203) {
@@ -1571,7 +1571,7 @@ mk_startup( Entry *ce, Section *cs )
 			else
 				linkfile( ce );
 		} else {
-			ce->value = KDMCONF "/Xstartup";
+			ce->value = TDMCONF "/Xstartup";
 			ce->active = ce->written = 1;
 			writefile( ce->value, 0755, def_startup );
 		}
@@ -1616,7 +1616,7 @@ mk_reset( Entry *ce, Section *cs ATTR_UNUSED )
 			else
 				linkfile( ce );
 		} else {
-			ce->value = KDMCONF "/Xreset";
+			ce->value = TDMCONF "/Xreset";
 			ce->active = ce->written = 1;
 			writefile( ce->value, 0755, def_reset );
 		}
@@ -1639,7 +1639,7 @@ mk_session( Entry *ce, Section *cs ATTR_UNUSED )
 		               "`tempfile`" :
 		               "$HOME/.xsession-env-$DISPLAY";
 		ASPrintf( &def_session, "%s%s%s", def_session1, tmpf, def_session2 );
-		ce->value = KDMCONF "/Xsession";
+		ce->value = TDMCONF "/Xsession";
 		ce->active = ce->written = 1;
 		writefile( ce->value, 0755, def_session );
 	}
@@ -1770,8 +1770,8 @@ upd_datadir( Entry *ce, Section *cs ATTR_UNUSED )
 		return;
 	dir = ce->active ? ce->value : def_DataDir;
 	if (mkdirp( dir, 0755, "data", 0 ) && oldkde) {
-		ASPrintf( &oldsts, "%s/kdm/kdmsts", oldkde );
-		ASPrintf( &newsts, "%s/kdmsts", dir );
+		ASPrintf( &oldsts, "%s/tdm/tdmsts", oldkde );
+		ASPrintf( &newsts, "%s/tdmsts", dir );
 		rename( oldsts, newsts );
 	}
 }
@@ -1808,7 +1808,7 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED )
 			setpwent();
 			while ((pw = getpwent()))
 				if (strcmp( pw->pw_name, "root" )) {
-					ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/%s.png",
+					ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/%s.png",
 					          oldkde, pw->pw_name );
 					ASPrintf( &newpic, "%s/%s.face.icon", dir, pw->pw_name );
 					rename( oldpic, newpic );
@@ -1816,10 +1816,10 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED )
 					free( oldpic );
 				}
 			endpwent();
-			ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/default.png", oldkde );
+			ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/default.png", oldkde );
 			if (!rename( oldpic, defpic ))
 				defpic = 0;
-			ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/root.png", oldkde );
+			ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/root.png", oldkde );
 			if (!rename( oldpic, rootpic ))
 				rootpic = 0;
 		}
@@ -2051,12 +2051,12 @@ mergeKdmRcOld( const char *path )
 	char *p;
 	struct stat st;
 
-	ASPrintf( &p, "%s/kdmrc", path );
+	ASPrintf( &p, "%s/tdmrc", path );
 	if (stat( p, &st )) {
 		free( p );
 		return 0;
 	}
-	printf( "Information: ignoring old kdmrc %s from kde < 2.2\n", p );
+	printf( "Information: ignoring old tdmrc %s from kde < 2.2\n", p );
 	free( p );
 	return 1;
 }
@@ -2083,18 +2083,18 @@ applydefs( FDefs *chgdef, int ndefs, const char *path )
 }
 
 #ifdef XDMCP
-static FDefs kdmdefs_all[] = {
-{ "Xdmcp", "Xaccess", "%s/kdm/Xaccess", 0 },
+static FDefs tdmdefs_all[] = {
+{ "Xdmcp", "Xaccess", "%s/tdm/Xaccess", 0 },
 { "Xdmcp", "Willing", "", 0 },
 };
 #endif
 
-static FDefs kdmdefs_eq_22[] = {
+static FDefs tdmdefs_eq_22[] = {
 { "General", "PidFile", "/var/run/xdm.pid",  0 },
-{ "X-*-Core", "Setup", "%s/kdm/Xsetup",  0 },
-{ "X-*-Core", "Startup", "%s/kdm/Xstartup",  0 },
-{ "X-*-Core", "Reset", "%s/kdm/Xreset",  0 },
-{ "X-*-Core", "Session", "%s/kdm/Xsession",  0 },
+{ "X-*-Core", "Setup", "%s/tdm/Xsetup",  0 },
+{ "X-*-Core", "Startup", "%s/tdm/Xstartup",  0 },
+{ "X-*-Core", "Reset", "%s/tdm/Xreset",  0 },
+{ "X-*-Core", "Session", "%s/tdm/Xsession",  0 },
 };
 
 #ifdef XDMCP
@@ -2104,13 +2104,13 @@ if_xdmcp (void)
 	return isTrue( getfqval( "Xdmcp", "Enable", "true" ) );
 }
 
-static FDefs kdmdefs_le_30[] = {
-{ "Xdmcp", "KeyFile", "%s/kdm/kdmkeys", if_xdmcp },
+static FDefs tdmdefs_le_30[] = {
+{ "Xdmcp", "KeyFile", "%s/tdm/tdmkeys", if_xdmcp },
 };
 #endif
 
 /* HACK: misused by is22conf() below */
-static FDefs kdmdefs_ge_30[] = {
+static FDefs tdmdefs_ge_30[] = {
 { "X-*-Core", "Setup", "", 0 },
 { "X-*-Core", "Startup", "", 0 },
 { "X-*-Core", "Reset", "", 0 },
@@ -2123,8 +2123,8 @@ if_usebg (void)
 	return isTrue( getfqval( "X-*-Greeter", "UseBackground", "true" ) );
 }
 
-static FDefs kdmdefs_ge_31[] = {
-{ "X-*-Greeter","BackgroundCfg","%s/kdm/backgroundrc", if_usebg },
+static FDefs tdmdefs_ge_31[] = {
+{ "X-*-Greeter","BackgroundCfg","%s/tdm/backgroundrc", if_usebg },
 };
 
 static int
@@ -2134,10 +2134,10 @@ is22conf( const char *path )
 	const char *val;
 	int i, sl;
 
-	sl = ASPrintf( &p, "%s/kdm/", path );
+	sl = ASPrintf( &p, "%s/tdm/", path );
 	/* safe bet, i guess ... */
 	for (i = 0; i < 4; i++) {
-		val = getfqval( "X-*-Core", kdmdefs_ge_30[i].key, 0 );
+		val = getfqval( "X-*-Core", tdmdefs_ge_30[i].key, 0 );
 		if (val && !memcmp( val, p, sl )) {
 			free( p );
 			return 0;
@@ -2184,12 +2184,12 @@ mergeKdmRcNewer( const char *path )
 	int i, j;
 	static char sname[64];
 
-	ASPrintf( &p, "%s/kdm/kdmrc", path );
+	ASPrintf( &p, "%s/tdm/tdmrc", path );
 	if (!(rootsect = ReadConf( p ))) {
 		free( p );
 		return 0;
 	}
-	printf( "Information: reading current kdmrc %s (from kde >= 2.2.x)\n", p );
+	printf( "Information: reading current tdmrc %s (from kde >= 2.2.x)\n", p );
 	free( p );
 
 	for (cs = rootsect; cs; cs = cs->next) {
@@ -2241,29 +2241,29 @@ mergeKdmRcNewer( const char *path )
 	}
 
 #ifdef XDMCP
-	applydefs( kdmdefs_all, as(kdmdefs_all), path );
+	applydefs( tdmdefs_all, as(tdmdefs_all), path );
 #endif
 	if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */
 		mod_usebg = 1;
 		if (is22conf( path )) {
 			/* work around 2.2.x defaults borkedness */
-			applydefs( kdmdefs_eq_22, as(kdmdefs_eq_22), path );
-			printf( "Information: current kdmrc is from kde 2.2\n" );
+			applydefs( tdmdefs_eq_22, as(tdmdefs_eq_22), path );
+			printf( "Information: current tdmrc is from kde 2.2\n" );
 		} else {
-			applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path );
-			printf( "Information: current kdmrc is from kde 3.0\n" );
+			applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path );
+			printf( "Information: current tdmrc is from kde 3.0\n" );
 		}
 #ifdef XDMCP
 		/* work around minor <= 3.0.x defaults borkedness */
-		applydefs( kdmdefs_le_30, as(kdmdefs_le_30), path );
+		applydefs( tdmdefs_le_30, as(tdmdefs_le_30), path );
 #endif
 	} else {
 		int ma, mi;
 		sscanf( cp, "%d.%d", &ma, &mi );
 		oldver = (ma << 8) | mi;
-		printf( "Information: current kdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi );
-		applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path );
-		applydefs( kdmdefs_ge_31, as(kdmdefs_ge_31), path );
+		printf( "Information: current tdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi );
+		applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path );
+		applydefs( tdmdefs_ge_31, as(tdmdefs_ge_31), path );
 	}
 
 	return 1;
@@ -2384,12 +2384,12 @@ P_requestPort( const char *sect, char **value )
 }
 #endif
 
-static int kdmrcmode = 0644;
+static int tdmrcmode = 0644;
 
 static void
 P_autoPass( const char *sect ATTR_UNUSED, char **value ATTR_UNUSED )
 {
-	kdmrcmode = 0600;
+	tdmrcmode = 0600;
 }
 
 CONF_GEN_XMERGE
@@ -2547,7 +2547,7 @@ static const char *oldxdms[] = {
 int main( int argc, char **argv )
 {
 	const char **where;
-	char *newkdmrc;
+	char *newtdmrc;
 	FILE *f;
 	StrList *fp;
 	Section *cs;
@@ -2560,41 +2560,41 @@ int main( int argc, char **argv )
 	for (ap = 1; ap < argc; ap++) {
 		if (!strcmp( argv[ap], "--help" )) {
 			printf(
-"genkdmconf - generate configuration files for kdm\n"
+"gentdmconf - generate configuration files for tdm\n"
 "\n"
-"If an older xdm/kdm configuration is found, its config files are \"absorbed\";\n"
+"If an older xdm/tdm configuration is found, its config files are \"absorbed\";\n"
 "if it lives in the new target directory, its scripts are reused (and possibly\n"
 "modified) as well, otherwise the scripts are ignored and default scripts are\n"
 "installed.\n"
 "\n"
 "options:\n"
-"  --in /path/to/new/kdm-config-dir\n"
+"  --in /path/to/new/tdm-config-dir\n"
 "    In which directory to put the new configuration. You can use this\n"
 "    to support a $(DESTDIR), but not to change the final location of\n"
 "    the installation - the paths inside the files are not affected.\n"
-"    Default is " KDMCONF ".\n"
+"    Default is " TDMCONF ".\n"
 "  --old-xdm /path/to/old/xdm-dir\n"
-"    Where to look for the config files of an xdm/older kdm.\n"
-"    Default is to scan /etc/X11/kdm, $XLIBDIR/kdm, /etc/X11/xdm,\n"
-"    $XLIBDIR/xdm; there in turn look for kdm-config and xdm-config.\n"
+"    Where to look for the config files of an xdm/older tdm.\n"
+"    Default is to scan /etc/X11/tdm, $XLIBDIR/tdm, /etc/X11/xdm,\n"
+"    $XLIBDIR/xdm; there in turn look for tdm-config and xdm-config.\n"
 "    Note that you possibly need to use --no-old-kde to make this take effect.\n"
 "  --old-kde /path/to/old/kde-config-dir\n"
-"    Where to look for the kdmrc of an older kdm.\n"
+"    Where to look for the tdmrc of an older tdm.\n"
 "    Default is to scan " KDE_CONFDIR " and\n"
 "    {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n"
 "  --no-old\n"
-"    Don't look at older xdm/kdm configurations, just create default config.\n"
+"    Don't look at older xdm/tdm configurations, just create default config.\n"
 "  --no-old-xdm\n"
 "    Don't look at older xdm configurations.\n"
 "  --no-old-kde\n"
-"    Don't look at older kdm configurations.\n"
+"    Don't look at older tdm configurations.\n"
 "  --old-scripts\n"
-"    Directly use all scripts from the older xdm/kdm configuration.\n"
+"    Directly use all scripts from the older xdm/tdm configuration.\n"
 "  --no-old-scripts\n"
-"    Don't use scripts from the older xdm/kdm configuration even if it lives\n"
+"    Don't use scripts from the older xdm/tdm configuration even if it lives\n"
 "    in the new target directory.\n"
 "  --old-confs\n"
-"    Directly use all ancillary config files from the older xdm/kdm\n"
+"    Directly use all ancillary config files from the older xdm/tdm\n"
 "    configuration. This is usually a bad idea.\n"
 "  --no-backup\n"
 "    Overwrite/delete old config files instead of backing them up.\n"
@@ -2654,7 +2654,7 @@ int main( int argc, char **argv )
 		}
 		*where = argv[++ap];
 	}
-	if (memcmp( newdir, KDMCONF, sizeof(KDMCONF) ))
+	if (memcmp( newdir, TDMCONF, sizeof(TDMCONF) ))
 		use_destdir = 1;
 
 	if (!mkdirp( newdir, 0755, "target", 1 ))
@@ -2685,7 +2685,7 @@ int main( int argc, char **argv )
 		if (oldkde) {
 			if (!(newer = mergeKdmRcNewer( oldkde )) && !mergeKdmRcOld( oldkde ))
 				fprintf( stderr,
-				         "Cannot read old kdmrc at specified location\n" );
+				         "Cannot read old tdmrc at specified location\n" );
 		} else if (!no_old_kde) {
 			for (i = 0; i < as(oldkdes); i++) {
 				if ((newer = mergeKdmRcNewer( oldkdes[i] )) ||
@@ -2701,7 +2701,7 @@ int main( int argc, char **argv )
 			if (oldxdm) {
 				if (!mergeXdmCfg( oldxdm ))
 					fprintf( stderr,
-					         "Cannot read old kdm-config/xdm-config at specified location\n" );
+					         "Cannot read old tdm-config/xdm-config at specified location\n" );
 			} else
 				for (i = 0; i < as(oldxdms); i++)
 					if (mergeXdmCfg( oldxdms[i] )) {
@@ -2791,8 +2791,8 @@ int main( int argc, char **argv )
 			for (ce = cs->ents; ce; ce = ce->next)
 				if (ce->spec->func && i == ce->spec->prio)
 					ce->spec->func( ce, cs );
-	ASPrintf( &newkdmrc, "%s/kdmrc", newdir );
-	f = Create( newkdmrc, kdmrcmode );
+	ASPrintf( &newtdmrc, "%s/tdmrc", newdir );
+	f = Create( newtdmrc, tdmrcmode );
 	wrconf( f );
 	fclose( f );
 
@@ -2800,12 +2800,12 @@ int main( int argc, char **argv )
 	f = Create( nname, 0644 );
 	fprintf( f,
 "This automatically generated configuration consists of the following files:\n" );
-	fprintf( f, "- " KDMCONF "/kdmrc\n" );
+	fprintf( f, "- " TDMCONF "/tdmrc\n" );
 	for (fp = aflist; fp; fp = fp->next)
 		fprintf( f, "- %s\n", fp->str );
 	if (use_destdir && !no_in_notice)
 		fwrapprintf( f,
-"All files destined for " KDMCONF " were actually saved in %s; "
+"All files destined for " TDMCONF " were actually saved in %s; "
 "this config won't be workable until moved in place.\n", newdir );
 	if (uflist || eflist || cflist || lflist) {
 		fprintf( f,
@@ -2841,7 +2841,7 @@ int main( int argc, char **argv )
 "Old files that would have been overwritten were renamed to <oldname>.bak.\n" );
 	}
 	fprintf( f,
-"\nTry 'genkdmconf --help' if you want to generate another configuration.\n"
+"\nTry 'gentdmconf --help' if you want to generate another configuration.\n"
 "\nYou may delete this README.\n" );
 	fclose( f );
 
diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp
index 9f8f5064d..00b08cd35 100644
--- a/kdm/kfrontend/kchooser.cpp
+++ b/kdm/kfrontend/kchooser.cpp
@@ -1,6 +1,6 @@
 /*
 
-chooser widget for KDM
+chooser widget for TDM
 
 Copyright (C) 2002-2003 Oswald Buddenhagen <[email protected]>
 based on the chooser (C) 1999 by Harald Hoyer <[email protected]>
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "kchooser.h"
 #include "kconsole.h"
-#include "kdmconfig.h"
-#include "kdm_greet.h"
+#include "tdmconfig.h"
+#include "tdm_greet.h"
 
 #include <klocale.h>
 
@@ -101,7 +101,7 @@ ChooserDlg::ChooserDlg()
 //	TQPushButton *helpButton = new TQPushButton( i18n("&Help"), this );
 //	hbox->addWidget( helpButton );
 
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	if (consoleView)
 		vbox->addWidget( consoleView );
 #endif
diff --git a/kdm/kfrontend/kchooser.h b/kdm/kfrontend/kchooser.h
index da5b83d89..fcf14b1e1 100644
--- a/kdm/kfrontend/kchooser.h
+++ b/kdm/kfrontend/kchooser.h
@@ -1,6 +1,6 @@
 /*
 
-chooser widget for KDM
+chooser widget for TDM
 
 Copyright (C) 2002-2003 Oswald Buddenhagen <[email protected]>
 based on the chooser (C) 1999 by Harald Hoyer <[email protected]>
diff --git a/kdm/kfrontend/kconsole.cpp b/kdm/kfrontend/kconsole.cpp
index 6c2ab09ab..834507bdb 100644
--- a/kdm/kfrontend/kconsole.cpp
+++ b/kdm/kfrontend/kconsole.cpp
@@ -1,6 +1,6 @@
 /*
 
-xconsole widget for KDM
+xconsole widget for TDM
 
 Copyright (C) 2002-2003 Oswald Buddenhagen <[email protected]>
 
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <config.h>
 
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -53,8 +53,8 @@ extern "C" {
 
 
 #include "kconsole.h"
-#include "kdmconfig.h"
-#include "kdm_greet.h"
+#include "tdmconfig.h"
+#include "tdm_greet.h"
 
 #include <klocale.h>
 #include <kpty.h>
diff --git a/kdm/kfrontend/kconsole.h b/kdm/kfrontend/kconsole.h
index 73d13912e..2b3e2aac3 100644
--- a/kdm/kfrontend/kconsole.h
+++ b/kdm/kfrontend/kconsole.h
@@ -1,6 +1,6 @@
 /*
 
-xconsole widget for KDM
+xconsole widget for TDM
 
 Copyright (C) 2002-2003 Oswald Buddenhagen <[email protected]>
 
diff --git a/kdm/kfrontend/kdm_config.c b/kdm/kfrontend/kdm_config.c
index d8dba0412..48f316320 100644
--- a/kdm/kfrontend/kdm_config.c
+++ b/kdm/kfrontend/kdm_config.c
@@ -1,6 +1,6 @@
 /*
 
-Read options from kdmrc
+Read options from tdmrc
 
 Copyright (C) 2001-2005 Oswald Buddenhagen <[email protected]>
 
@@ -117,7 +117,7 @@ static void *Malloc( size_t size );
 static void *Realloc( void *ptr, size_t size );
 
 #define PRINT_QUOTES
-#define LOG_NAME "kdm_config"
+#define LOG_NAME "tdm_config"
 #define LOG_DEBUG_MASK DEBUG_CONFIG
 #define LOG_PANIC_EXIT 1
 #define STATIC static
@@ -381,8 +381,8 @@ PautoLoginX( Value *retval )
 
 CONF_READ_ENTRIES
 
-static const char *kdmrc = KDMCONF "/kdmrc";
-static const char *kdmrc_dist = KDMCONF "/kdmdistrc";
+static const char *tdmrc = TDMCONF "/tdmrc";
+static const char *tdmrc_dist = TDMCONF "/tdmdistrc";
 
 static Section *rootsec;
 
@@ -403,14 +403,14 @@ ReadConf()
 		return;
 	confread = 1;
 
-	Debug( "reading config %s ...\n", kdmrc_dist );
-	if (!readFile( &file, kdmrc_dist, "master configuration" )) {
-		Debug( "reading config %s ...\n", kdmrc );
-		if (!readFile( &file, kdmrc, "master configuration" ))
+	Debug( "reading config %s ...\n", tdmrc_dist );
+	if (!readFile( &file, tdmrc_dist, "master configuration" )) {
+		Debug( "reading config %s ...\n", tdmrc );
+		if (!readFile( &file, tdmrc, "master configuration" ))
 			return;
 	}
 	else {
-		kdmrc = kdmrc_dist;
+		tdmrc = tdmrc_dist;
 	}
 
 	for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) {
@@ -436,7 +436,7 @@ ReadConf()
 				e--;
 			if (*e != ']') {
 				cursec = 0;
-				LogError( "Invalid section header at %s:%d\n", kdmrc, line );
+				LogError( "Invalid section header at %s:%d\n", tdmrc, line );
 				continue;
 			}
 			nstr = sl + 1;
@@ -446,7 +446,7 @@ ReadConf()
 				    !memcmp( nstr, cursec->name, nlen ))
 				{
 					LogInfo( "Multiple occurrences of section [%.*s] in %s. "
-					         "Consider merging them.\n", nlen, nstr, kdmrc );
+					         "Consider merging them.\n", nlen, nstr, tdmrc );
 					goto secfnd;
 				}
 			if (nstr[0] == 'X' && nstr[1] == '-') {
@@ -502,7 +502,7 @@ ReadConf()
 		  illsec:
 			cursec = 0;
 			LogError( "Unrecognized section name [%.*s] at %s:%d\n",
-			          nlen, nstr, kdmrc, line );
+			          nlen, nstr, tdmrc, line );
 			continue;
 		  newsec:
 			if (!(cursec = Malloc( sizeof(*cursec) )))
@@ -530,7 +530,7 @@ ReadConf()
 		if (!cursec) {
 			if (sectmoan) {
 				sectmoan = 0;
-				LogError( "Entry outside any section at %s:%d", kdmrc, line );
+				LogError( "Entry outside any section at %s:%d", tdmrc, line );
 			}
 			goto sktoeol;
 		}
@@ -538,13 +538,13 @@ ReadConf()
 		for (; (s < file.eof) && (*s != '\n'); s++)
 			if (*s == '=')
 				goto haveeq;
-		LogError( "Invalid entry (missing '=') at %s:%d\n", kdmrc, line );
+		LogError( "Invalid entry (missing '=') at %s:%d\n", tdmrc, line );
 		continue;
 
 	  haveeq:
 		for (ek = s - 1; ; ek--) {
 			if (ek < sl) {
-				LogError( "Invalid entry (empty key) at %s:%d\n", kdmrc, line );
+				LogError( "Invalid entry (empty key) at %s:%d\n", tdmrc, line );
 				goto sktoeol;
 			}
 			if (!isspace( *ek ))
@@ -558,7 +558,7 @@ ReadConf()
 			if (*s == '\\') {
 				s++;
 				if (s >= file.eof || *s == '\n') {
-					LogError( "Trailing backslash at %s:%d\n", kdmrc, line );
+					LogError( "Trailing backslash at %s:%d\n", tdmrc, line );
 					break;
 				}
 				switch (*s) {
@@ -587,14 +587,14 @@ ReadConf()
 				goto keyok;
 		}
 		LogError( "Unrecognized key '%.*s' in section [%.*s] at %s:%d\n",
-		          nlen, nstr, cursec->nlen, cursec->name, kdmrc, line );
+		          nlen, nstr, cursec->nlen, cursec->name, tdmrc, line );
 		continue;
 	  keyok:
 		for (curent = cursec->entries; curent; curent = curent->next)
 			if (ce == curent->ent) {
 				LogError( "Multiple occurrences of key '%s' in section [%.*s]"
 				          " of %s\n",
-				          ce->name, cursec->nlen, cursec->name, kdmrc );
+				          ce->name, cursec->nlen, cursec->name, tdmrc );
 				goto keyfnd;
 			}
 		if (!(curent = Malloc( sizeof(*curent) )))
@@ -796,7 +796,7 @@ GetValue( Ent *et, DSpec *dspec, Value *retval, char **eopts )
 		if (!(errs = CvtValue( et, retval, ent->vallen, ent->val, eopts )))
 			return;
 		LogError( "Invalid %s value '%.*s' at %s:%d\n",
-		          errs, ent->vallen, ent->val, kdmrc, ent->line );
+		          errs, ent->vallen, ent->val, tdmrc, ent->line );
 	}
 	Debug( "default: %s = %'s\n", et->name, et->def );
 	if ((errs = CvtValue( et, retval, strlen( et->def ), et->def, eopts )))
@@ -1368,7 +1368,7 @@ int main( int argc ATTR_UNUSED, char **argv )
 	int what;
 
 	if (!(ci = getenv( "CONINFO" ))) {
-		fprintf( stderr, "This program is part of kdm and should not be run manually.\n" );
+		fprintf( stderr, "This program is part of tdm and should not be run manually.\n" );
 		return 1;
 	}
 	if (sscanf( ci, "%d %d", &rfd, &wfd ) != 2)
@@ -1381,7 +1381,7 @@ int main( int argc ATTR_UNUSED, char **argv )
 
 /*	Debug ("parsing command line\n");*/
 	if (**++argv)
-		kdmrc_dist = kdmrc = *argv;
+		tdmrc_dist = tdmrc = *argv;
 /*
 	while (*++argv) {
 	}
@@ -1402,7 +1402,7 @@ int main( int argc ATTR_UNUSED, char **argv )
 #else
 			GSendInt( 1 );
 #endif
-			GSendStr( kdmrc );
+			GSendStr( tdmrc );
 				GSendInt( -1 );
 #ifdef XDMCP
 			GSendNStr( VXaccess.ptr, VXaccess.len - 1 );
diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c
index b7841e6a3..f74c2410d 100644
--- a/kdm/kfrontend/kdm_greet.c
+++ b/kdm/kfrontend/kdm_greet.c
@@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <config.h>
 
-#include "kdm_greet.h"
-#include "kdmconfig.h"
+#include "tdm_greet.h"
+#include "tdmconfig.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,7 +71,7 @@ Realloc( void *ptr, size_t size )
 
 #define PRINT_QUOTES
 #define PRINT_ARRAYS
-#define LOG_NAME "kdm_greet"
+#define LOG_NAME "tdm_greet"
 #define LOG_DEBUG_MASK DEBUG_GREET
 #define LOG_PANIC_EXIT 1
 #define STATIC
@@ -742,7 +742,7 @@ main( int argc ATTR_UNUSED, char **argv )
 	char qtrc[40];
 
 	if (!(ci = getenv( "CONINFO" ))) {
-		fprintf( stderr, "This program is part of kdm and should not be run manually.\n" );
+		fprintf( stderr, "This program is part of tdm and should not be run manually.\n" );
 		return 1;
 	}
 	if (sscanf( ci, "%d %d %d %d", &srfd, &swfd, &mrfd, &mwfd ) != 4)
diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h
index df325c28d..9f7e3bd6a 100644
--- a/kdm/kfrontend/kdm_greet.h
+++ b/kdm/kfrontend/kdm_greet.h
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#ifndef _KDM_GREET_H_
-#define _KDM_GREET_H_
+#ifndef _TDM_GREET_H_
+#define _TDM_GREET_H_
 
 #include <greet.h> /* for the ATTR_ defines */
 #include <config.ci> /* for the HAVE_VTS define */
@@ -88,4 +88,4 @@ extern char *dname; /* d->name */
 }
 #endif
 
-#endif /* _KDM_GREET_H_ */
+#endif /* _TDM_GREET_H_ */
diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp
index 637d6dd90..6486eb3dc 100644
--- a/kdm/kfrontend/kdmadmindialog.cpp
+++ b/kdm/kfrontend/kdmadmindialog.cpp
@@ -22,10 +22,10 @@
 
     */
 
-#include "kdmadmindialog.h"
-#include "kdmconfig.h"
+#include "tdmadmindialog.h"
+#include "tdmconfig.h"
 #include "kgdialog.h"
-#include "kdm_greet.h"
+#include "tdm_greet.h"
 #include <stdlib.h>
 
 #include <kapplication.h>
@@ -41,10 +41,10 @@
 #include <tqaccel.h>
 #include <tqpopupmenu.h>
 
-int KDMAdmin::curPlugin = -1;
-PluginList KDMAdmin::pluginList;
+int TDMAdmin::curPlugin = -1;
+PluginList TDMAdmin::pluginList;
 
-KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
+TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent )
     : inherited( _parent )
     , verify( 0 ), curUser(user)
 {
@@ -93,14 +93,14 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
     slotWhenChanged();
 }
 
-KDMAdmin::~KDMAdmin()
+TDMAdmin::~TDMAdmin()
 {
     hide();
     delete verify;
 }
 
 void
-KDMAdmin::slotActivatePlugMenu()
+TDMAdmin::slotActivatePlugMenu()
 {
     TQPopupMenu *cmnu = verify->getPlugMenu();
     TQSize sh( cmnu->sizeHint() / 2 );
@@ -108,13 +108,13 @@ KDMAdmin::slotActivatePlugMenu()
 }
 
 void
-KDMAdmin::accept()
+TDMAdmin::accept()
 {
     verify->accept();
 }
 
 void
-KDMAdmin::slotWhenChanged()
+TDMAdmin::slotWhenChanged()
 {
     verify->abort();
     verify->setEnabled( 1 );
@@ -122,7 +122,7 @@ KDMAdmin::slotWhenChanged()
 }
 
 void
-KDMAdmin::bye_bye()
+TDMAdmin::bye_bye()
 {
   GSendInt( G_GetDmrc );
   GSendStr( "Session" );
@@ -141,36 +141,36 @@ KDMAdmin::bye_bye()
 }
 
 void
-KDMAdmin::verifyPluginChanged( int id )
+TDMAdmin::verifyPluginChanged( int id )
 {
     curPlugin = id;
     adjustSize();
 }
 
 void
-KDMAdmin::verifyOk()
+TDMAdmin::verifyOk()
 {
     bye_bye();
 }
 
 void
-KDMAdmin::verifyFailed()
+TDMAdmin::verifyFailed()
 {
     okButton->setEnabled( false );
     cancelButton->setEnabled( false );
 }
 
 void
-KDMAdmin::verifyRetry()
+TDMAdmin::verifyRetry()
 {
     okButton->setEnabled( true );
     cancelButton->setEnabled( true );
 }
 
 void
-KDMAdmin::verifySetUser( const TQString & )
+TDMAdmin::verifySetUser( const TQString & )
 {
 }
 
 
-#include "kdmadmindialog.moc"
+#include "tdmadmindialog.moc"
diff --git a/kdm/kfrontend/kdmadmindialog.h b/kdm/kfrontend/kdmadmindialog.h
index 91f1ed3a6..e5a68fbb9 100644
--- a/kdm/kfrontend/kdmadmindialog.h
+++ b/kdm/kfrontend/kdmadmindialog.h
@@ -23,8 +23,8 @@
     */
 
 
-#ifndef KDMADMIN_H
-#define KDMADMIN_H
+#ifndef TDMADMIN_H
+#define TDMADMIN_H
 
 #include "kgverify.h"
 
@@ -36,13 +36,13 @@ class KPushButton;
 class TQButtonGroup;
 class TQComboBox;
 
-class KDMAdmin : public FDialog, public KGVerifyHandler {
+class TDMAdmin : public FDialog, public KGVerifyHandler {
     Q_OBJECT
     typedef FDialog inherited;
 
 public:
-    KDMAdmin( const TQString &user, TQWidget *_parent = 0 );
-    ~KDMAdmin();
+    TDMAdmin( const TQString &user, TQWidget *_parent = 0 );
+    ~TDMAdmin();
 
 public slots:
     void accept();
diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp
index 88cd53970..2b2a99cea 100644
--- a/kdm/kfrontend/kdmclock.cpp
+++ b/kdm/kfrontend/kdmclock.cpp
@@ -1,6 +1,6 @@
 /*
 
-clock module for kdm
+clock module for tdm
 
 Copyright (C) 2000 Espen Sand, [email protected]
   Based on work by NN(yet to be determined)
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#include "kdmclock.h"
+#include "tdmclock.h"
 
 //#include <kapplication.h>
 //#include <kconfig.h>
@@ -173,4 +173,4 @@ void KdmClock::paintEvent( TQPaintEvent * )
 	bitBlt( this, contentsRect().topLeft(), &pm );
 }
 
-#include "kdmclock.moc"
+#include "tdmclock.moc"
diff --git a/kdm/kfrontend/kdmclock.h b/kdm/kfrontend/kdmclock.h
index 91fa181ea..89a48eb8e 100644
--- a/kdm/kfrontend/kdmclock.h
+++ b/kdm/kfrontend/kdmclock.h
@@ -1,6 +1,6 @@
 /*
 
-clock module for kdm
+clock module for tdm
 
 Copyright (C) 2000 Espen Sand, [email protected]
   Based on work by NN (yet to be determined)
@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#ifndef _KDM_CLOCK_H_
-#define _KDM_CLOCK_H_
+#ifndef _TDM_CLOCK_H_
+#define _TDM_CLOCK_H_
 
 #include <tqframe.h>
 
diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index c12345323..5b57a6375 100644
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -1,6 +1,6 @@
 /*
 
-Config for kdm
+Config for tdm
 
 Copyright (C) 1997, 1998 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2003 Oswald Buddenhagen <[email protected]>
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#include "kdmconfig.h"
-#include "kdm_greet.h"
+#include "tdmconfig.h"
+#include "tdm_greet.h"
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -110,7 +110,7 @@ void init_config( void )
 	_hasConsole = _hasConsole && _isLocal && GetCfgInt( C_hasConsole );
 	_authorized = GetCfgInt( C_isAuthorized );
 
-	_stsFile = _dataDir + "/kdmsts";
+	_stsFile = _dataDir + "/tdmsts";
 
 	// Greet String
 	char hostname[256], *ptr;
@@ -138,7 +138,7 @@ void init_config( void )
 			case 's': ptr = tuname.sysname; break;
 			case 'r': ptr = tuname.release; break;
 			case 'm': ptr = tuname.machine; break;
-			default: _greetString += i18n("[fix kdmrc!]"); continue;
+			default: _greetString += i18n("[fix tdmrc!]"); continue;
 			}
 			_greetString += TQString::fromLocal8Bit( ptr );
 		} else
diff --git a/kdm/kfrontend/kdmconfig.h b/kdm/kfrontend/kdmconfig.h
index 52e054af6..275cafa1b 100644
--- a/kdm/kfrontend/kdmconfig.h
+++ b/kdm/kfrontend/kdmconfig.h
@@ -1,6 +1,6 @@
 /*
 
-Configuration for kdm
+Configuration for tdm
 
 Copyright (C) 1997, 1998, 2000 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2003 Oswald Buddenhagen <[email protected]>
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 
-#ifndef KDMCONFIG_H
-#define KDMCONFIG_H
+#ifndef TDMCONFIG_H
+#define TDMCONFIG_H
 
 #include <config.h>
 
@@ -66,4 +66,4 @@ void init_config( void );
 
 CONF_GREET_C_DECLS
 
-#endif /* KDMCONFIG_H */
+#endif /* TDMCONFIG_H */
diff --git a/kdm/kfrontend/kdmctl.c b/kdm/kfrontend/kdmctl.c
index 7f70a4ddc..d6abe959a 100644
--- a/kdm/kfrontend/kdmctl.c
+++ b/kdm/kfrontend/kdmctl.c
@@ -1,6 +1,6 @@
 /*
 
-KDM remote control application
+TDM remote control application
 
 Copyright (C) 2004 Oswald Buddenhagen <[email protected]>
 
@@ -59,7 +59,7 @@ readcfg( const char *cfg )
 
 	if (!(fp = fopen( cfg, "r" ))) {
 		fprintf( stderr,
-		         "Cannot open kdm config file '%s'.\n",
+		         "Cannot open tdm config file '%s'.\n",
 		         cfg );
 		return 0;
 	}
@@ -148,7 +148,7 @@ main( int argc, char **argv )
 {
 	char *dpy = getenv( "DISPLAY" );
 	const char *ctl = getenv( "DM_CONTROL" );
-	const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
+	const char *cfg = KDE_CONFDIR "/tdm/tdmrc";
 	char *ptr;
 	int fd;
 
@@ -162,19 +162,19 @@ main( int argc, char **argv )
 			ptr++;
 		if (!strcmp( ptr, "h" ) || !strcmp( ptr, "help" )) {
 			puts(
-"Usage: kdmctl [options] [command [command arguments]]\n"
+"Usage: tdmctl [options] [command [command arguments]]\n"
 "\n"
 "Options are:\n"
 " -h -help     This help message.\n"
 " -g -global   Use global control socket even if $DISPLAY is set\n"
 " -d -display  Override $DISPLAY\n"
 " -s -sockets  Override $DM_CONTROL\n"
-" -c -config   Use alternative kdm config file\n"
+" -c -config   Use alternative tdm config file\n"
 "\n"
 "The directory in which the sockets are located is determined this way:\n"
 "- the -s option is examined\n"
 "- the $DM_CONTROL variable is examined\n"
-"- the kdm config file is searched for the FifoDir key\n"
+"- the tdm config file is searched for the FifoDir key\n"
 "- /var/run/xdmctl and /var/run are tried\n"
 "\n"
 "If $DISPLAY is set (or -d was specified) and -g was not specified, the\n"
@@ -184,7 +184,7 @@ main( int argc, char **argv )
 "Command arguments can be specified as separate command line parameters,\n"
 "in which case they are simply concatenated with tabs in between.\n"
 "\n"
-"If the command is '-', kdmctl reads commands from stdin.\n"
+"If the command is '-', tdmctl reads commands from stdin.\n"
 "The default command is 'caps'.\n"
 			);
 			return 0;
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 96f80e9a7..e546f62b6 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#include "kdmshutdown.h"
-#include "kdm_greet.h"
+#include "tdmshutdown.h"
+#include "tdm_greet.h"
 
 #include <kapplication.h>
 #include <kseparator.h>
@@ -59,10 +59,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 extern bool has_twin;
 
-int KDMShutdownBase::curPlugin = -1;
-PluginList KDMShutdownBase::pluginList;
+int TDMShutdownBase::curPlugin = -1;
+PluginList TDMShutdownBase::pluginList;
 
-KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent )
+TDMShutdownBase::TDMShutdownBase( int _uid, TQWidget *_parent )
 	: inherited( _parent )
 	, box( new TQVBoxLayout( this, KDmh, KDsh ) )
 #ifdef HAVE_VTS
@@ -79,14 +79,14 @@ KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent )
 {
 }
 
-KDMShutdownBase::~KDMShutdownBase()
+TDMShutdownBase::~TDMShutdownBase()
 {
 	hide();
 	delete verify;
 }
 
 void
-KDMShutdownBase::complete( TQWidget *prevWidget )
+TDMShutdownBase::complete( TQWidget *prevWidget )
 {
 	TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
@@ -143,7 +143,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
 }
 
 void
-KDMShutdownBase::slotActivatePlugMenu()
+TDMShutdownBase::slotActivatePlugMenu()
 {
 	if (needRoot) {
 		TQPopupMenu *cmnu = verify->getPlugMenu();
@@ -155,7 +155,7 @@ KDMShutdownBase::slotActivatePlugMenu()
 }
 
 void
-KDMShutdownBase::accept()
+TDMShutdownBase::accept()
 {
 	if (needRoot == 1)
 		verify->accept();
@@ -164,13 +164,13 @@ KDMShutdownBase::accept()
 }
 
 void
-KDMShutdownBase::slotSched()
+TDMShutdownBase::slotSched()
 {
 	done( Schedule );
 }
 
 void
-KDMShutdownBase::updateNeedRoot()
+TDMShutdownBase::updateNeedRoot()
 {
 	int nNeedRoot = uid &&
 		(((willShut && _allowShutdown == SHUT_ROOT) ||
@@ -187,40 +187,40 @@ KDMShutdownBase::updateNeedRoot()
 }
 
 void
-KDMShutdownBase::accepted()
+TDMShutdownBase::accepted()
 {
 	inherited::done( needRoot ? (int)Authed : (int)Accepted );
 }
 
 void
-KDMShutdownBase::verifyPluginChanged( int id )
+TDMShutdownBase::verifyPluginChanged( int id )
 {
 	curPlugin = id;
 	adjustSize();
 }
 
 void
-KDMShutdownBase::verifyOk()
+TDMShutdownBase::verifyOk()
 {
 	accepted();
 }
 
 void
-KDMShutdownBase::verifyFailed()
+TDMShutdownBase::verifyFailed()
 {
 	okButton->setEnabled( false );
 	cancelButton->setEnabled( false );
 }
 
 void
-KDMShutdownBase::verifyRetry()
+TDMShutdownBase::verifyRetry()
 {
 	okButton->setEnabled( true );
 	cancelButton->setEnabled( true );
 }
 
 void
-KDMShutdownBase::verifySetUser( const TQString & )
+TDMShutdownBase::verifySetUser( const TQString & )
 {
 }
 
@@ -241,7 +241,7 @@ doShutdown( int type, const char *os )
 
 
 
-KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
+TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 	: inherited( _uid, _parent )
 {
 	setCaption(i18n("Shutdown TDE"));
@@ -254,11 +254,11 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 	hlay->addWidget( howGroup, 0, AlignTop );
 
 	TQRadioButton *rb;
-	rb = new KDMRadioButton( i18n("&Turn off computer"), howGroup );
+	rb = new TDMRadioButton( i18n("&Turn off computer"), howGroup );
 	rb->setChecked( true );
 	rb->setFocus();
 
-	restart_rb = new KDMRadioButton( i18n("&Restart computer"), howGroup );
+	restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup );
 
 	connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
 	connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
@@ -337,7 +337,7 @@ get_date( const char *str )
 }
 
 void
-KDMShutdown::accept()
+TDMShutdown::accept()
 {
 	if (le_start->text() == "0" || le_start->text() == "now")
 		sch_st = time( 0 );
@@ -362,20 +362,20 @@ KDMShutdown::accept()
 }
 
 void
-KDMShutdown::slotTargetChanged()
+TDMShutdown::slotTargetChanged()
 {
 	restart_rb->setChecked( true );
 }
 
 void
-KDMShutdown::slotWhenChanged()
+TDMShutdown::slotWhenChanged()
 {
 	doesNuke = cb_force->isChecked();
 	updateNeedRoot();
 }
 
 void
-KDMShutdown::accepted()
+TDMShutdown::accepted()
 {
 	GSet( 1 );
 	GSendInt( G_Shutdown );
@@ -392,7 +392,7 @@ KDMShutdown::accepted()
 }
 
 void
-KDMShutdown::scheduleShutdown( TQWidget *_parent )
+TDMShutdown::scheduleShutdown( TQWidget *_parent )
 {
 	GSet( 1 );
 	GSendInt( G_QueryShutdown );
@@ -405,7 +405,7 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent )
 	GSet( 0 );
 	if (how) {
 		int ret =
-			KDMCancelShutdown( how, start, timeout, force, uid, os,
+			TDMCancelShutdown( how, start, timeout, force, uid, os,
 			                   _parent ).exec();
 		if (!ret)
 			return;
@@ -415,23 +415,23 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent )
 		uid = -1;
 	if (os)
 		free( os );
-	KDMShutdown( uid, _parent ).exec();
+	TDMShutdown( uid, _parent ).exec();
 }
 
 
-KDMRadioButton::KDMRadioButton( const TQString &label, TQWidget *parent )
+TDMRadioButton::TDMRadioButton( const TQString &label, TQWidget *parent )
 	: inherited( label, parent )
 {
 }
 
 void
-KDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * )
+TDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * )
 {
 	emit doubleClicked();
 }
 
 
-KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item,
+TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item,
                                             TQWidget *parent, 
                                             const char *name )
 	: inherited( item, parent, name )
@@ -442,31 +442,31 @@ KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item,
 	connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
 }
 
-void KDMDelayedPushButton::setPopup( TQPopupMenu *p )
+void TDMDelayedPushButton::setPopup( TQPopupMenu *p )
 {
 	pop = p;
 	setIsMenuButton( p != 0 );
 }
 
-void KDMDelayedPushButton::slotPressed()
+void TDMDelayedPushButton::slotPressed()
 {
 	if (pop)
 		popt.start( TQApplication::startDragTime() );
 }
 
-void KDMDelayedPushButton::slotReleased()
+void TDMDelayedPushButton::slotReleased()
 {
 	popt.stop();
 }
 
-void KDMDelayedPushButton::slotTimeout()
+void TDMDelayedPushButton::slotTimeout()
 {
 	popt.stop();
 	pop->popup( mapToGlobal( rect().bottomLeft() ) );
 	setDown( false );
 }
 
-KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
+TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 	: inherited( _parent )
 	, targetList( 0 )
 {
@@ -540,7 +540,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 		TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint()  );
 		hbuttonbox2->setAlignment( Qt::AlignRight );
 
-		// Back to kdm
+		// Back to tdm
 		KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
 		hbuttonbox2->addWidget( btnBack );
 		connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
@@ -556,7 +556,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 		// we need to set the minimum size for the logout box, since it
 		// gets too small if there all options are not available
 		TQLabel *icon = new TQLabel( lfrm );
-		icon->setPixmap( TQPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) );
+		icon->setPixmap( TQPixmap( locate( "data", "tdm/pics/shutdown.jpg" ) ) );
 		TQVBoxLayout *iconlay = new TQVBoxLayout( lfrm );
 		iconlay->addWidget( icon );
 	
@@ -571,8 +571,8 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 	
 		buttonlay->addSpacing( KDialog::spacingHint() );
 	
-		KDMDelayedPushButton *btnReboot = new
-			KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this );
+		TDMDelayedPushButton *btnReboot = new
+			TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this );
 		buttonlay->addWidget( btnReboot );
 		connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) );
 	
@@ -619,63 +619,63 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 
 }
 
-KDMSlimShutdown::~KDMSlimShutdown()
+TDMSlimShutdown::~TDMSlimShutdown()
 {
 	freeStrArr( targetList );
 }
 
 void
-KDMSlimShutdown::slotSched()
+TDMSlimShutdown::slotSched()
 {
 	reject();
-	KDMShutdown::scheduleShutdown();
+	TDMShutdown::scheduleShutdown();
 }
 
 void
-KDMSlimShutdown::slotHalt()
+TDMSlimShutdown::slotHalt()
 {
 	if (checkShutdown( SHUT_HALT, 0 ))
 		doShutdown( SHUT_HALT, 0 );
 }
 
 void
-KDMSlimShutdown::slotReboot()
+TDMSlimShutdown::slotReboot()
 {
 	if (checkShutdown( SHUT_REBOOT, 0 ))
 		doShutdown( SHUT_REBOOT, 0 );
 }
 
 void
-KDMSlimShutdown::slotReboot( int opt )
+TDMSlimShutdown::slotReboot( int opt )
 {
 	if (checkShutdown( SHUT_REBOOT, targetList[opt] ))
 		doShutdown( SHUT_REBOOT, targetList[opt] );
 }
 
 bool
-KDMSlimShutdown::checkShutdown( int type, const char *os )
+TDMSlimShutdown::checkShutdown( int type, const char *os )
 {
 	reject();
 	dpySpec *sess = fetchSessions( lstRemote | lstTTY );
 	if (!sess && _allowShutdown != SHUT_ROOT)
 		return true;
-	int ret = KDMConfShutdown( -1, sess, type, os ).exec();
+	int ret = TDMConfShutdown( -1, sess, type, os ).exec();
 	disposeSessions( sess );
 	if (ret == Schedule) {
-		KDMShutdown::scheduleShutdown();
+		TDMShutdown::scheduleShutdown();
 		return false;
 	}
 	return ret;
 }
 
 void
-KDMSlimShutdown::externShutdown( int type, const char *os, int uid )
+TDMSlimShutdown::externShutdown( int type, const char *os, int uid )
 {
 	dpySpec *sess = fetchSessions( lstRemote | lstTTY );
-	int ret = KDMConfShutdown( uid, sess, type, os ).exec();
+	int ret = TDMConfShutdown( uid, sess, type, os ).exec();
 	disposeSessions( sess );
 	if (ret == Schedule)
-		KDMShutdown( uid ).exec();
+		TDMShutdown( uid ).exec();
 	else if (ret)
 		doShutdown( type, os );
 }
@@ -804,7 +804,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e )
 
 
 
-KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os,
+TDMConfShutdown::TDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os,
                                   TQWidget *_parent )
 	: inherited( _uid, _parent )
 {
@@ -863,7 +863,7 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char
 }
 
 
-KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
+TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout,
                                       int force, int uid, const char *os,
                                       TQWidget *_parent )
 	: inherited( -1, _parent )
@@ -922,4 +922,4 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
 	complete( 0 );
 }
 
-#include "kdmshutdown.moc"
+#include "tdmshutdown.moc"
diff --git a/kdm/kfrontend/kdmshutdown.h b/kdm/kfrontend/kdmshutdown.h
index 18fda2e9a..6a2ee3a70 100644
--- a/kdm/kfrontend/kdmshutdown.h
+++ b/kdm/kfrontend/kdmshutdown.h
@@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 
-#ifndef KDMSHUTDOWN_H
-#define KDMSHUTDOWN_H
+#ifndef TDMSHUTDOWN_H
+#define TDMSHUTDOWN_H
 
-#include "kdmconfig.h" // for HAVE_VTS
+#include "tdmconfig.h" // for HAVE_VTS
 #include "kgverify.h"
 
 #include <kpushbutton.h>
@@ -45,13 +45,13 @@ class TQLineEdit;
 
 enum { Authed = TQDialog::Accepted + 1, Schedule };
 
-class KDMShutdownBase : public FDialog, public KGVerifyHandler {
+class TDMShutdownBase : public FDialog, public KGVerifyHandler {
 	Q_OBJECT
 	typedef FDialog inherited;
 
   public:
-	KDMShutdownBase( int _uid, TQWidget *_parent );
-	virtual ~KDMShutdownBase();
+	TDMShutdownBase( int _uid, TQWidget *_parent );
+	virtual ~TDMShutdownBase();
 
   protected slots:
 	virtual void accept();
@@ -93,12 +93,12 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler {
 };
 
 
-class KDMShutdown : public KDMShutdownBase {
+class TDMShutdown : public TDMShutdownBase {
 	Q_OBJECT
-	typedef KDMShutdownBase inherited;
+	typedef TDMShutdownBase inherited;
 
   public:
-	KDMShutdown( int _uid, TQWidget *_parent = 0 );
+	TDMShutdown( int _uid, TQWidget *_parent = 0 );
 	static void scheduleShutdown( TQWidget *_parent = 0 );
 
   protected slots:
@@ -123,12 +123,12 @@ class KDMShutdown : public KDMShutdownBase {
 
 };
 
-class KDMRadioButton : public TQRadioButton {
+class TDMRadioButton : public TQRadioButton {
 	Q_OBJECT
 	typedef TQRadioButton inherited;
 
   public:
-	KDMRadioButton( const TQString &label, TQWidget *parent );
+	TDMRadioButton( const TQString &label, TQWidget *parent );
 
   private:
 	virtual void mouseDoubleClickEvent( TQMouseEvent * );
@@ -138,12 +138,12 @@ class KDMRadioButton : public TQRadioButton {
 
 };
 
-class KDMDelayedPushButton : public KPushButton {
+class TDMDelayedPushButton : public KPushButton {
 	Q_OBJECT
 	typedef KPushButton inherited;
 
   public:
-	KDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
+	TDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
 	void setPopup( TQPopupMenu *pop );
 
   private slots:
@@ -156,13 +156,13 @@ class KDMDelayedPushButton : public KPushButton {
 	TQTimer popt;
 };
 
-class KDMSlimShutdown : public FDialog {
+class TDMSlimShutdown : public FDialog {
 	Q_OBJECT
 	typedef FDialog inherited;
 
   public:
-	KDMSlimShutdown( TQWidget *_parent = 0 );
-	~KDMSlimShutdown();
+	TDMSlimShutdown( TQWidget *_parent = 0 );
+	~TDMSlimShutdown();
 	static void externShutdown( int type, const char *os, int uid );
 
   private slots:
@@ -177,21 +177,21 @@ class KDMSlimShutdown : public FDialog {
 
 };
 
-class KDMConfShutdown : public KDMShutdownBase {
+class TDMConfShutdown : public TDMShutdownBase {
 	Q_OBJECT
-	typedef KDMShutdownBase inherited;
+	typedef TDMShutdownBase inherited;
 
   public:
-	KDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os,
+	TDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os,
 	                 TQWidget *_parent = 0 );
 };
 
-class KDMCancelShutdown : public KDMShutdownBase {
+class TDMCancelShutdown : public TDMShutdownBase {
 	Q_OBJECT
-	typedef KDMShutdownBase inherited;
+	typedef TDMShutdownBase inherited;
 
   public:
-	KDMCancelShutdown( int how, int start, int timeout, int force, int uid,
+	TDMCancelShutdown( int how, int start, int timeout, int force, int uid,
 	                   const char *os, TQWidget *_parent );
 };
 
@@ -237,4 +237,4 @@ class FlatButton : public TQToolButton
  
 };
 
-#endif /* KDMSHUTDOWN_H */
+#endif /* TDMSHUTDOWN_H */
diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp
index f662ae1c2..98b5773c2 100644
--- a/kdm/kfrontend/kfdialog.cpp
+++ b/kdm/kfrontend/kfdialog.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "kfdialog.h"
-#include "kdmconfig.h"
+#include "tdmconfig.h"
 
 #include <klocale.h>
 #include <kpushbutton.h>
@@ -61,7 +61,7 @@ FDialog::FDialog( TQWidget *parent, bool framed )
 	} else
 		winFrame = 0;
 
-	setCaption(KDM_LOGIN_SCREEN_BASE_TITLE);
+	setCaption(TDM_LOGIN_SCREEN_BASE_TITLE);
 
 	if (framed) {
 		if (m_wmTitle) setFixedSize(sizeHint());
@@ -158,11 +158,11 @@ FDialog::box( TQWidget *parent, TQMessageBox::Icon type, const TQString &text )
 KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text )
 	: inherited( parent, !is_themed )
 {
-	if (type == TQMessageBox::NoIcon) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE);
-	if (type == TQMessageBox::Question) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question"));
-	if (type == TQMessageBox::Information) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information"));
-	if (type == TQMessageBox::Warning) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning"));
-	if (type == TQMessageBox::Critical) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error"));
+	if (type == TQMessageBox::NoIcon) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE);
+	if (type == TQMessageBox::Question) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question"));
+	if (type == TQMessageBox::Information) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information"));
+	if (type == TQMessageBox::Warning) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning"));
+	if (type == TQMessageBox::Critical) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error"));
 
 	TQLabel *label1 = new TQLabel( this );
 	label1->setPixmap( TQMessageBox::standardIcon( type ) );
diff --git a/kdm/kfrontend/kfdialog.h b/kdm/kfrontend/kfdialog.h
index 3537c7b57..851d9a2db 100644
--- a/kdm/kfrontend/kfdialog.h
+++ b/kdm/kfrontend/kfdialog.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#define KDM_LOGIN_SCREEN_BASE_TITLE i18n("Login to TDE")
+#define TDM_LOGIN_SCREEN_BASE_TITLE i18n("Login to TDE")
 
 #ifndef FDIALOG_H
 #define FDIALOG_H
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index f21741805..5ad52dda6 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <config.h>
 
-#include "kdm_greet.h"
-#include "kdmshutdown.h"
-#include "kdmconfig.h"
+#include "tdm_greet.h"
+#include "tdmshutdown.h"
+#include "tdmconfig.h"
 #include "kgapp.h"
 #include "kgreeter.h"
 #ifdef XDMCP
@@ -179,7 +179,7 @@ checkSAK(GreeterApp* app)
 void
 kg_main( const char *argv0 )
 {
-	static char *argv[] = { (char *)"kdmgreet", 0 };
+	static char *argv[] = { (char *)"tdmgreet", 0 };
 	KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true );
 
 	kdDebug() << timestamp() << "start" << endl;
@@ -327,7 +327,7 @@ kg_main( const char *argv0 )
 		if (cmd == G_ConfShutdown) {
 			int how = GRecvInt(), uid = GRecvInt();
 			char *os = GRecvStr();
-			KDMSlimShutdown::externShutdown( how, os, uid );
+			TDMSlimShutdown::externShutdown( how, os, uid );
 			if (os)
 				free( os );
 			GSendInt( G_Ready );
diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp
index f4ed918c6..667eca8e1 100644
--- a/kdm/kfrontend/kgdialog.cpp
+++ b/kdm/kfrontend/kgdialog.cpp
@@ -1,6 +1,6 @@
 /*
 
-Base class for various kdm greeter dialogs
+Base class for various tdm greeter dialogs
 
 Copyright (C) 1997, 1998 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2004 Oswald Buddenhagen <[email protected]>
@@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "kgdialog.h"
 #include "kgverify.h"
 #include "kconsole.h"
-#include "kdmshutdown.h"
-#include "kdm_greet.h"
+#include "tdmshutdown.h"
+#include "tdm_greet.h"
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 KGDialog::KGDialog( bool themed ) : inherited( 0, !themed )
 {
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	consoleView = _showLog ? new KConsole( this ) : 0;
 #endif
 
@@ -171,7 +171,7 @@ KGDialog::slotConsole()
 	if (sess) {
 		if (verify)
 			verify->suspend();
-		int ret = KDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec();
+		int ret = TDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec();
 		if (verify)
 			verify->resume();
 		disposeSessions( sess );
@@ -194,11 +194,11 @@ KGDialog::slotShutdown( int id )
 		verify->suspend();
 	if (id < 0) {
 		if (_scheduledSd == SHUT_ALWAYS)
-			KDMShutdown::scheduleShutdown( this );
+			TDMShutdown::scheduleShutdown( this );
 		else
-			KDMSlimShutdown( this ).exec();
+			TDMSlimShutdown( this ).exec();
 	} else
-		KDMSlimShutdown::externShutdown( id, 0, -1 );
+		TDMSlimShutdown::externShutdown( id, 0, -1 );
 	if (verify)
 		verify->resume();
 }
diff --git a/kdm/kfrontend/kgdialog.h b/kdm/kfrontend/kgdialog.h
index 2c683760e..a902b6ff0 100644
--- a/kdm/kfrontend/kgdialog.h
+++ b/kdm/kfrontend/kgdialog.h
@@ -1,6 +1,6 @@
 /*
 
-Base class for various kdm greeter dialogs
+Base class for various tdm greeter dialogs
 
 Copyright (C) 1997, 1998 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2004 Oswald Buddenhagen <[email protected]>
@@ -26,9 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef KGDIALOG_H
 #define KGDIALOG_H
 
-#include <config.h> // for WITH_KDM_XCONSOLE
+#include <config.h> // for WITH_TDM_XCONSOLE
 
-#include "kdmconfig.h"
+#include "tdmconfig.h"
 #include "kfdialog.h"
 
 class TQPopupMenu;
@@ -67,7 +67,7 @@ class KGDialog : public FDialog {
 	bool needSep;
 	TQPopupMenu *optMenu;
 	KGVerify *verify;
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	KConsole *consoleView;
 #endif
 
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 5877cb6c7..ee1bf3e72 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -1,6 +1,6 @@
 /*
 
-Greeter widget for kdm
+Greeter widget for tdm
 
 Copyright (C) 1997, 1998, 2000 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2004 Oswald Buddenhagen <[email protected]>
@@ -24,13 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "kgreeter.h"
 #include "kconsole.h"
-#include "kdmconfig.h"
-#include "kdmclock.h"
-#include "kdm_greet.h"
-#include "kdmadmindialog.h"
-#include "themer/kdmthemer.h"
-#include "themer/kdmitem.h"
-#include "themer/kdmlabel.h"
+#include "tdmconfig.h"
+#include "tdmclock.h"
+#include "tdm_greet.h"
+#include "tdmadmindialog.h"
+#include "themer/tdmthemer.h"
+#include "themer/tdmitem.h"
+#include "themer/tdmlabel.h"
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -86,9 +86,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <X11/Xlib.h>
 
-#define FIFO_DIR "/tmp/ksocket-global/kdm"
-#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1"
-#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1"
+#define FIFO_DIR "/tmp/ksocket-global/tdm"
+#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
+#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
 
 class UserListView : public KListView {
   public:
@@ -872,7 +872,7 @@ KStdGreeter::KStdGreeter()
   , pixLabel( 0 )
 {
 	TQBoxLayout *main_box;
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	if (consoleView) {
 		TQBoxLayout *ex_box = new TQVBoxLayout( this, 10, 10 );
 		main_box = new TQHBoxLayout( ex_box, 10 );
@@ -952,7 +952,7 @@ KStdGreeter::KStdGreeter()
 	TQWidget *prec;
 	if (userView)
 		prec = userView;
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	else if (consoleView)
 		prec = consoleView;
 #endif
@@ -1060,10 +1060,10 @@ KThemedGreeter::KThemedGreeter()
 	connect( themer, TQT_SIGNAL(activated( const TQString & )),
 	         TQT_SLOT(slotThemeActivated( const TQString & )) );
 
-	console_rect = themer->findNode( "xconsole" ); // kdm ext
+	console_rect = themer->findNode( "xconsole" ); // tdm ext
 	userlist_rect = themer->findNode( "userlist" );
 	caps_warning = themer->findNode( "caps-lock-warning" );
-	xauth_warning = themer->findNode( "xauth-warning" ); // kdm ext
+	xauth_warning = themer->findNode( "xauth-warning" ); // tdm ext
 	pam_error = themer->findNode( "pam-error" );
 	timed_label = themer->findNode( "timed-label" );
 	if (pam_error && pam_error->isA( "KdmLabel" ))
@@ -1075,7 +1075,7 @@ KThemedGreeter::KThemedGreeter()
 	if ((itm = themer->findNode( "language_button" ))) // not implemented yet
 		itm->hide( true );
 
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	if (console_rect) {
 		if (consoleView)
 			console_rect->setWidget( consoleView );
@@ -1097,7 +1097,7 @@ KThemedGreeter::KThemedGreeter()
 	TQWidget *prec;
 	if (userView)
 		prec = userView;
-#ifdef WITH_KDM_XCONSOLE
+#ifdef WITH_TDM_XCONSOLE
 	else if (consoleView)
 		prec = consoleView;
 #endif
@@ -1268,7 +1268,7 @@ KThemedGreeter::keyPressEvent( TQKeyEvent *e )
 void
 KThemedGreeter::slotAskAdminPassword()
 {
-  KDMAdmin k(curUser, this);
+  TDMAdmin k(curUser, this);
   if (k.exec()) {
 	GSendInt(G_Ready);
 	hide();
diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h
index 8ec8dd9c1..0de48a21d 100644
--- a/kdm/kfrontend/kgreeter.h
+++ b/kdm/kfrontend/kgreeter.h
@@ -1,6 +1,6 @@
 /*
 
-Greeter widget for kdm
+Greeter widget for tdm
 
 Copyright (C) 1997, 1998 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2004 Oswald Buddenhagen <[email protected]>
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index 73ec34456..ec0bfae6c 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -1,6 +1,6 @@
 /*
 
-Shell for kdm conversation plugins
+Shell for tdm conversation plugins
 
 Copyright (C) 1997, 1998, 2000 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2004 Oswald Buddenhagen <[email protected]>
@@ -25,11 +25,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <config.h>
 
 #include "kgverify.h"
-#include "kdmconfig.h"
-#include "kdm_greet.h"
+#include "tdmconfig.h"
+#include "tdm_greet.h"
 
-#include "themer/kdmthemer.h"
-#include "themer/kdmitem.h"
+#include "themer/tdmthemer.h"
+#include "themer/tdmitem.h"
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -461,7 +461,7 @@ KGVerify::VErrBox( TQWidget *parent, const TQString &user, const char *msg )
 
 	if (!msg) {
 		mesg = i18n("A critical error occurred.\n"
-		            "Please look at KDM's logfile(s) for more information\n"
+		            "Please look at TDM's logfile(s) for more information\n"
 		            "or contact your system administrator.");
 		icon = errorbox;
 	} else {
diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h
index 41451d800..44fab973a 100644
--- a/kdm/kfrontend/kgverify.h
+++ b/kdm/kfrontend/kgverify.h
@@ -1,6 +1,6 @@
 /*
 
-Shell for kdm conversation plugins
+Shell for tdm conversation plugins
 
 Copyright (C) 1997, 1998 Steffen Hansen <[email protected]>
 Copyright (C) 2000-2004 Oswald Buddenhagen <[email protected]>
diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp
index 7d231948f..b51367485 100644
--- a/kdm/kfrontend/krootimage.cpp
+++ b/kdm/kfrontend/krootimage.cpp
@@ -35,7 +35,7 @@ Boston, MA 02110-1301, USA.
 #include <stdlib.h>
 
 static const char description[] =
-	I18N_NOOP( "Fancy desktop background for kdm" );
+	I18N_NOOP( "Fancy desktop background for tdm" );
 
 static const char version[] = "v2.0";
 
diff --git a/kdm/kfrontend/krootimage.h b/kdm/kfrontend/krootimage.h
index 3168994ba..e46190116 100644
--- a/kdm/kfrontend/krootimage.h
+++ b/kdm/kfrontend/krootimage.h
@@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
 
 */
 
-#ifndef __KDMDESKTOP_H__
-#define __KDMDESKTOP_H__
+#ifndef __TDMDESKTOP_H__
+#define __TDMDESKTOP_H__
 
 
 #include <kapplication.h>
diff --git a/kdm/kfrontend/pics/CMakeLists.txt b/kdm/kfrontend/pics/CMakeLists.txt
index 790dc06ce..e1b61b4f8 100644
--- a/kdm/kfrontend/pics/CMakeLists.txt
+++ b/kdm/kfrontend/pics/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 install( FILES
     kdelogo.png kdelogo-crystal.png shutdown.jpg
-  DESTINATION ${DATA_INSTALL_DIR}/kdm/pics )
+  DESTINATION ${DATA_INSTALL_DIR}/tdm/pics )
 
 install( FILES
     default1.png default2.png default3.png root1.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users )
+  DESTINATION ${DATA_INSTALL_DIR}/tdm/pics/users )
diff --git a/kdm/kfrontend/pics/Makefile.am b/kdm/kfrontend/pics/Makefile.am
index d6b8957e8..9ba04536e 100644
--- a/kdm/kfrontend/pics/Makefile.am
+++ b/kdm/kfrontend/pics/Makefile.am
@@ -1,5 +1,5 @@
 
-picsdir = $(kde_datadir)/kdm/pics
+picsdir = $(kde_datadir)/tdm/pics
 pics_DATA = kdelogo.png kdelogo-crystal.png shutdown.jpg
 
 usersdir = $(picsdir)/users
diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc
index edf346229..396fa1627 100644
--- a/kdm/kfrontend/sakdlg.cc
+++ b/kdm/kfrontend/sakdlg.cc
@@ -73,9 +73,9 @@
 # define AF_LOCAL	AF_UNIX
 #endif
 
-#define FIFO_DIR "/tmp/ksocket-global/kdm"
-#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1"
-#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1"
+#define FIFO_DIR "/tmp/ksocket-global/tdm"
+#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
+#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
 
 bool trinity_desktop_lock_use_system_modal_dialogs = TRUE;
 extern bool trinity_desktop_lock_use_sak;
@@ -94,7 +94,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
         kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
         XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
     }
-    setCaption(KDM_LOGIN_SCREEN_BASE_TITLE);
+    setCaption(TDM_LOGIN_SCREEN_BASE_TITLE);
 
     frame = new TQFrame( this );
     if (trinity_desktop_lock_use_system_modal_dialogs)
@@ -125,7 +125,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
     installEventFilter(this);
 
     mSAKProcess = new KProcess;
-    *mSAKProcess << "kdmtsak" << "dm";
+    *mSAKProcess << "tdmtsak" << "dm";
     connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
     mSAKProcess->start();
 
diff --git a/kdm/kfrontend/sessions/CMakeLists.txt b/kdm/kfrontend/sessions/CMakeLists.txt
index 9979d3a96..780963bd4 100644
--- a/kdm/kfrontend/sessions/CMakeLists.txt
+++ b/kdm/kfrontend/sessions/CMakeLists.txt
@@ -26,4 +26,4 @@ install( FILES
     twm.desktop ude.desktop vtwm.desktop w9wm.desktop
     waimea.desktop wm2.desktop wmaker.desktop xfce.desktop
     xfce4.desktop
-  DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions )
+  DESTINATION ${DATA_INSTALL_DIR}/tdm/sessions )
diff --git a/kdm/kfrontend/sessions/Makefile.am b/kdm/kfrontend/sessions/Makefile.am
index 490d9e37e..a29872441 100644
--- a/kdm/kfrontend/sessions/Makefile.am
+++ b/kdm/kfrontend/sessions/Makefile.am
@@ -1,4 +1,4 @@
-sessionsdir = $(kde_datadir)/kdm/sessions
+sessionsdir = $(kde_datadir)/tdm/sessions
 sessions_DATA = \
     admin.desktop tde.desktop gnome.desktop \
     9wm.desktop \
diff --git a/kdm/kfrontend/themer/CMakeLists.txt b/kdm/kfrontend/themer/CMakeLists.txt
index ff65734af..fc0b80fc3 100644
--- a/kdm/kfrontend/themer/CMakeLists.txt
+++ b/kdm/kfrontend/themer/CMakeLists.txt
@@ -12,8 +12,8 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kdm/kfrontend
-  ${CMAKE_SOURCE_DIR}/kdmlib
+  ${CMAKE_SOURCE_DIR}/tdm/kfrontend
+  ${CMAKE_SOURCE_DIR}/tdmlib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -27,15 +27,15 @@ link_directories(
 ##### config.ci (generated) #####################
 
 add_custom_command( OUTPUT config.ci
-  COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci
-  DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def )
-set_property( SOURCE kdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
+  COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci
+  DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def )
+set_property( SOURCE tdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
 
 
-##### kdmthemer (static) ########################
+##### tdmthemer (static) ########################
 
-tde_add_library( kdmthemer STATIC_PIC AUTOMOC
+tde_add_library( tdmthemer STATIC_PIC AUTOMOC
   SOURCES
-    kdmthemer.cpp kdmitem.cpp kdmpixmap.cpp
-    kdmrect.cpp kdmlabel.cpp kdmlayout.cpp
+    tdmthemer.cpp tdmitem.cpp tdmpixmap.cpp
+    tdmrect.cpp tdmlabel.cpp tdmlayout.cpp
 )
diff --git a/kdm/kfrontend/themer/Makefile.am b/kdm/kfrontend/themer/Makefile.am
index 7f6eb5701..f736795d6 100644
--- a/kdm/kfrontend/themer/Makefile.am
+++ b/kdm/kfrontend/themer/Makefile.am
@@ -1,16 +1,16 @@
 AM_CPPFLAGS = -I$(srcdir)/../../backend -I$(srcdir)/.. -I../.. \
-	-I$(top_srcdir)/kdmlib \
+	-I$(top_srcdir)/tdmlib \
 	$(all_includes)
 
-noinst_LIBRARIES = libkdmthemer.a
-libkdmthemer_a_SOURCES = \
-    kdmthemer.cpp \
-    kdmitem.cpp \
-    kdmpixmap.cpp \
-    kdmrect.cpp \
-    kdmlabel.cpp \
-    kdmlayout.cpp
+noinst_LIBRARIES = libtdmthemer.a
+libtdmthemer_a_SOURCES = \
+    tdmthemer.cpp \
+    tdmitem.cpp \
+    tdmpixmap.cpp \
+    tdmrect.cpp \
+    tdmlabel.cpp \
+    tdmlayout.cpp
 
 METASOURCES = AUTO
 
-libkdmthemer_a_COMPILE_FIRST = ../../config.ci
+libtdmthemer_a_COMPILE_FIRST = ../../config.ci
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 1c859d101..8cf126b66 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -25,9 +25,9 @@
 
 // #define DRAW_OUTLINE 1	// for debugging only
 
-#include "kdmitem.h"
-#include "kdmlayout.h"
-#include "kdmconfig.h"
+#include "tdmitem.h"
+#include "tdmlayout.h"
+#include "tdmconfig.h"
 
 #include <kglobal.h>
 #include <kdebug.h>
@@ -654,4 +654,4 @@ KdmItem::parentWidget() const
   return ((KdmItem*)parent())->parentWidget();
 }
 
-#include "kdmitem.moc"
+#include "tdmitem.moc"
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 230ed71c4..27158a7fd 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KDMITEM_H
-#define KDMITEM_H
+#ifndef TDMITEM_H
+#define TDMITEM_H
 
 #include <tqobject.h>
 #include <tqvaluelist.h>
@@ -35,7 +35,7 @@ class TQPainter;
 class TQLayoutItem;
 
 /** class KdmItem
- * @short Base class for every kdmthemes' element.
+ * @short Base class for every tdmthemes' element.
  *
  * This class provides methods for arranging it and its children to the
  * screen (see note below), painting the whole area or a sub-region using
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index 0eab99c30..5239d48dc 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -20,8 +20,8 @@
  */
 
 #include <config.h>
-#include "kdmlabel.h"
-#include "kdmconfig.h"
+#include "tdmlabel.h"
+#include "tdmconfig.h"
 #include "../kgreeter.h"
 
 #include <kglobal.h>
@@ -273,4 +273,4 @@ KdmLabel::lookupText( const TQString &t )
 	return KMacroExpander::expandMacros( text, m );
 }
 
-#include "kdmlabel.moc"
+#include "tdmlabel.moc"
diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h
index 1ec2f88ec..8b955fca5 100644
--- a/kdm/kfrontend/themer/kdmlabel.h
+++ b/kdm/kfrontend/themer/kdmlabel.h
@@ -22,7 +22,7 @@
 #ifndef KDELABEL_H
 #define KDELABEL_H
 
-#include "kdmitem.h"
+#include "tdmitem.h"
 
 #include <tqcolor.h>
 #include <tqfont.h>
diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp
index 093d450fc..9a277a7a3 100644
--- a/kdm/kfrontend/themer/kdmlayout.cpp
+++ b/kdm/kfrontend/themer/kdmlayout.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "kdmlayout.h"
-#include "kdmconfig.h"
-#include "kdmitem.h"
+#include "tdmlayout.h"
+#include "tdmconfig.h"
+#include "tdmitem.h"
 
 #include <kdebug.h>
 
diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h
index 4c73e9a1b..c147fd329 100644
--- a/kdm/kfrontend/themer/kdmlayout.h
+++ b/kdm/kfrontend/themer/kdmlayout.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KDMLAYOUT_H
-#define KDMLAYOUT_H
+#ifndef TDMLAYOUT_H
+#define TDMLAYOUT_H
 
 /**
  * this is a container for a lot of other stuff
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index 8020bd1e1..7a8d1a3d2 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -21,8 +21,8 @@
 
 #include <config.h>
 
-#include "kdmpixmap.h"
-#include <kdmconfig.h>
+#include "tdmpixmap.h"
+#include <tdmconfig.h>
 
 #include <kimageeffect.h>
 #ifdef HAVE_LIBART
@@ -68,10 +68,10 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 			parseColor( el.attribute( "tint", "#ffffff" ), pixmap.normal.tint );
 			pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat();
 
-			if (el.attribute( "file", "" ) == "@@@KDMBACKGROUND@@@") {
+			if (el.attribute( "file", "" ) == "@@@TDMBACKGROUND@@@") {
 				if ((_compositor.isEmpty()) || (!argb_visual_available)) {
 					// Software blend only (no compositing support)
-					// Use the preset KDM background...
+					// Use the preset TDM background...
 					KStandardDirs *m_pDirs = KGlobal::dirs();
 					KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
 					config->setGroup("Desktop0");
@@ -337,4 +337,4 @@ KdmPixmap::statusChanged()
 	needUpdate();
 }
 
-#include "kdmpixmap.moc"
+#include "tdmpixmap.moc"
diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h
index a12c9fea4..faa71a034 100644
--- a/kdm/kfrontend/themer/kdmpixmap.h
+++ b/kdm/kfrontend/themer/kdmpixmap.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KDMPIXMAP_H
-#define KDMPIXMAP_H
+#ifndef TDMPIXMAP_H
+#define TDMPIXMAP_H
 
-#include "kdmitem.h"
+#include "tdmitem.h"
 
 //#include <tqrect.h>
 #include <tqpixmap.h>
diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp
index 1db128da0..9056a513c 100644
--- a/kdm/kfrontend/themer/kdmrect.cpp
+++ b/kdm/kfrontend/themer/kdmrect.cpp
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "kdmrect.h"
-#include "kdmthemer.h"
-#include "kdmconfig.h"
+#include "tdmrect.h"
+#include "tdmthemer.h"
+#include "tdmconfig.h"
 
 #include <kimageeffect.h>
 #include <kdebug.h>
@@ -178,4 +178,4 @@ KdmRect::setWidget( TQWidget *widget )
 	//setAttribs( widget );
 }
 
-#include "kdmrect.moc"
+#include "tdmrect.moc"
diff --git a/kdm/kfrontend/themer/kdmrect.h b/kdm/kfrontend/themer/kdmrect.h
index a505e1921..6dfdc126a 100644
--- a/kdm/kfrontend/themer/kdmrect.h
+++ b/kdm/kfrontend/themer/kdmrect.h
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KDMRECT_H
-#define KDMRECT_H
+#ifndef TDMRECT_H
+#define TDMRECT_H
 
-#include "kdmitem.h"
+#include "tdmitem.h"
 
 #include <tqcolor.h>
 #include <tqfont.h>
diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp
index 39a1abe81..d2dc77935 100644
--- a/kdm/kfrontend/themer/kdmthemer.cpp
+++ b/kdm/kfrontend/themer/kdmthemer.cpp
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "kdmthemer.h"
-#include "kdmitem.h"
-#include "kdmpixmap.h"
-#include "kdmrect.h"
-#include "kdmlabel.h"
+#include "tdmthemer.h"
+#include "tdmitem.h"
+#include "tdmpixmap.h"
+#include "tdmrect.h"
+#include "tdmlabel.h"
 
-#include <kdmconfig.h>
+#include <tdmconfig.h>
 #include <kfdialog.h>
 
 #include <kiconloader.h>
@@ -76,7 +76,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
 		return;
 	}
 	// Set the root (screen) item
-	rootItem = new KdmRect( parent, TQDomNode(), "kdm root" );
+	rootItem = new KdmRect( parent, TQDomNode(), "tdm root" );
 
 	connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )),
 	         widget(), TQT_SLOT(update( int, int, int, int )) );
@@ -401,4 +401,4 @@ KdmThemer::slotPaintRoot()
   TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
 }
 
-#include "kdmthemer.moc"
+#include "tdmthemer.moc"
diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h
index f9a0b1b6f..2b8865b4d 100644
--- a/kdm/kfrontend/themer/kdmthemer.h
+++ b/kdm/kfrontend/themer/kdmthemer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KDMTHEMER_H
-#define KDMTHEMER_H
+#ifndef TDMTHEMER_H
+#define TDMTHEMER_H
 
 #include <tqobject.h>
 #include <tqdom.h>
diff --git a/kdm/kfrontend/themes/circles/CMakeLists.txt b/kdm/kfrontend/themes/circles/CMakeLists.txt
index 91396000b..9122c13ea 100644
--- a/kdm/kfrontend/themes/circles/CMakeLists.txt
+++ b/kdm/kfrontend/themes/circles/CMakeLists.txt
@@ -12,4 +12,4 @@
 install( FILES
     GdmGreeterTheme.desktop circles.xml background.svg
     flower.png help.png options.png screenshot.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/circles )
+  DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/circles )
diff --git a/kdm/kfrontend/themes/circles/Makefile.am b/kdm/kfrontend/themes/circles/Makefile.am
index 97ad04b6a..d88c407c2 100644
--- a/kdm/kfrontend/themes/circles/Makefile.am
+++ b/kdm/kfrontend/themes/circles/Makefile.am
@@ -1,4 +1,4 @@
-circlesdir = $(kde_datadir)/kdm/themes/circles
+circlesdir = $(kde_datadir)/tdm/themes/circles
 circles_DATA = \
 	GdmGreeterTheme.desktop \
 	circles.xml \
diff --git a/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt b/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt
index 81b5fe7de..bf9f738a0 100644
--- a/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt
+++ b/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt
@@ -13,4 +13,4 @@ install( FILES
     Dialog.png enter_normal.png enter_over.png enter_pressed.png
     enterprise.xml GdmGreeterTheme.desktop preview.png
     system_normal.png  system_over.png system_pressed.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/o2_enterprise )
+  DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/o2_enterprise )
diff --git a/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop b/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop
index d50678db4..10ce5cc52 100644
--- a/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop
+++ b/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop
@@ -5,6 +5,6 @@
 Encoding=UTF-8
 Greeter=enterprise.xml
 Name=O2 Enterprise
-Description=A sleek and professional looking KDM theme for Trinity
+Description=A sleek and professional looking TDM theme for Trinity
 Author=Ken Wimer ([email protected]) and Timothy Pearson ([email protected])
 Screenshot=preview.png
diff --git a/kdm/kfrontend/themes/o2_enterprise/Makefile.am b/kdm/kfrontend/themes/o2_enterprise/Makefile.am
index 02b0dee99..078e370a5 100644
--- a/kdm/kfrontend/themes/o2_enterprise/Makefile.am
+++ b/kdm/kfrontend/themes/o2_enterprise/Makefile.am
@@ -1,4 +1,4 @@
-o2_enterprisedir = $(kde_datadir)/kdm/themes/o2_enterprise
+o2_enterprisedir = $(kde_datadir)/tdm/themes/o2_enterprise
 o2_enterprise_DATA = \
 	Dialog.png \
 	enter_normal.png \
diff --git a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
index 42e37f890..cf8aecd32 100644
--- a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
+++ b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <greeter>
 	<item type="pixmap" >
-		<normal file="@@@KDMBACKGROUND@@@" />
+		<normal file="@@@TDMBACKGROUND@@@" />
 		<pos width="100%" x="0" y="0" height="100%" />
 	</item>
 	<item type="pixmap" >
author	Timothy Pearson <[email protected]>	2012-01-22 00:28:18 -0600
committer	Timothy Pearson <[email protected]>	2012-01-22 00:28:18 -0600
commit	7021f40c13f949b7cb5ded32d0241d648a43bf6c (patch)
tree	aa1a5e4de2963edc6638783246b2ff25e98833aa /kdm/kfrontend
parent	0a2a54a02254ded760afd5b9c965c6bb71459d46 (diff)
download	tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.tar.gz tdebase-7021f40c13f949b7cb5ded32d0241d648a43bf6c.zip