summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /tdm/kfrontend
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend')
-rw-r--r--tdm/kfrontend/CMakeLists.txt2
-rw-r--r--tdm/kfrontend/sakdlg.cc2
-rw-r--r--tdm/kfrontend/tdmclock.cpp2
-rw-r--r--tdm/kfrontend/tdmconfig.cpp2
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index bf2449fd..092e68b7 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 dfa65a94..8ba04697 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 14d8deea..3bafc2aa 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 5b57a637..c50b94f8 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 db598aed..8b1f61a3 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>