From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 tdm/kfrontend/CMakeLists.txt  | 2 +-
 tdm/kfrontend/sakdlg.cc       | 2 +-
 tdm/kfrontend/tdmclock.cpp    | 2 +-
 tdm/kfrontend/tdmconfig.cpp   | 2 +-
 tdm/kfrontend/tdmshutdown.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdm/kfrontend')

diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index bf2449fd6..092e68b78 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -76,7 +76,7 @@ tde_add_executable( tdm_greet AUTOMOC
 
 tde_add_executable( krootimage AUTOMOC
   SOURCES krootimage.cpp
-  LINK bgnd-static kio-shared
+  LINK bgnd-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index dfa65a945..8ba04697e 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -16,7 +16,7 @@
 #include <kseparator.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
 #include <kpassdlg.h>
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index 14d8deeaf..3bafc2aaa 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "tdmclock.h"
 
 //#include <kapplication.h>
-//#include <kconfig.h>
+//#include <tdeconfig.h>
 
 #include <tqdatetime.h>
 #include <tqpixmap.h>
diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp
index 5b57a6375..c50b94f85 100644
--- a/tdm/kfrontend/tdmconfig.cpp
+++ b/tdm/kfrontend/tdmconfig.cpp
@@ -64,7 +64,7 @@ GetCfgQStrList( int id )
 	return qsl;
 }
 
-// Based on kconfigbase.cpp
+// Based on tdeconfigbase.cpp
 static TQFont
 Str2Font( const TQString &aValue )
 {
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index db598aed2..8b1f61a3c 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <tqcombobox.h>
-- 
cgit v1.2.3