From 7021f40c13f949b7cb5ded32d0241d648a43bf6c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 22 Jan 2012 00:28:18 -0600
Subject: Part 1 of 2 of kdm rename

---
 kdesktop/CMakeLists.txt      | 2 +-
 kdesktop/Makefile.am         | 4 ++--
 kdesktop/bgmanager.cc        | 2 +-
 kdesktop/lock/CMakeLists.txt | 2 +-
 kdesktop/lock/Makefile.am    | 4 ++--
 kdesktop/lock/main.cc        | 2 +-
 kdesktop/lock/sakdlg.cc      | 2 +-
 kdesktop/lockeng.cc          | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kdesktop')

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index a7047e550..fa3d8547c 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kdmlib
+  ${CMAKE_SOURCE_DIR}/tdmlib
   ${CMAKE_SOURCE_DIR}/kcontrol/background
   ${CMAKE_SOURCE_DIR}/libkonq
   ${TDE_INCLUDE_DIR}
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 5cdaa8b4b..1b4927db6 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -1,8 +1,8 @@
 ## Makefile.am of tdebase/kdesktop
 
-INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes)
+INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/tdmlib $(all_includes)
 kdesktop_la_LDFLAGS  = $(all_libraries) -module $(KDE_PLUGIN)
-kdesktop_la_LIBADD   = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR)
+kdesktop_la_LIBADD   = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR)
 
 SUBDIRS = . lock pics patterns programs init kwebdesktop
 
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index cf61030bb..cd0ff4c1d 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -525,7 +525,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
        m_pDesktop->repaint();
        static bool root_cleared = false;
        if( !root_cleared )
-       { // clear the root window pixmap set by kdm
+       { // clear the root window pixmap set by tdm
           root_cleared = true;
 	  TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
           // but make the pixmap visible until m_pDesktop is visible
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 5ea297037..5530d4c5c 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/kdesktop
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kdmlib
+  ${CMAKE_SOURCE_DIR}/tdmlib
   ${CMAKE_SOURCE_DIR}/kcheckpass
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 7a1841086..158541a6f 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,8 +1,8 @@
 ## Makefile.am of tdebase/kdesktop/lock
 
-INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
+INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
 kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
+kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
 
 ####### Files
 
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 1d459a0d3..2711c36c5 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -29,7 +29,7 @@
 #include <kglobalsettings.h>
 #include <dcopref.h>
 
-#include <kdmtsak.h>
+#include <tdmtsak.h>
 
 #include <stdlib.h>
 
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index f600e6a21..17f54a115 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -104,7 +104,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
     installEventFilter(this);
 
     mSAKProcess = new KProcess;
-    *mSAKProcess << "kdmtsak";
+    *mSAKProcess << "tdmtsak";
     connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
     mSAKProcess->start();
 }
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index c5306e9d6..fb0f75447 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -54,7 +54,7 @@ SaverEngine::SaverEngine()
                         TQT_SLOT(lockProcessExited()));
 
     mSAKProcess = new KProcess;
-    *mSAKProcess << "kdmtsak";
+    *mSAKProcess << "tdmtsak";
     connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
 
     TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
-- 
cgit v1.2.1