summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/CMakeLists.txt4
-rw-r--r--kdesktop/DESIGN2
-rw-r--r--kdesktop/Makefile.am2
-rw-r--r--kdesktop/kshadowengine.h2
-rw-r--r--kdesktop/kwebdesktop/Makefile.am2
-rw-r--r--kdesktop/lock/Makefile.am2
-rw-r--r--kdesktop/lock/infodlg.cc2
-rw-r--r--kdesktop/lock/lockdlg.cc2
-rw-r--r--kdesktop/lock/querydlg.cc2
-rw-r--r--kdesktop/lock/sakdlg.cc2
-rw-r--r--kdesktop/lock/securedlg.cc2
-rw-r--r--kdesktop/minicli.cpp4
12 files changed, 14 insertions, 14 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 3c83764c2..a7047e550 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -72,7 +72,7 @@ tde_add_executable( kxdglauncher
)
-##### kdesktop (kdeinit) ########################
+##### kdesktop (tdeinit) ########################
set( target kdesktop )
@@ -86,7 +86,7 @@ set( ${target}_SRCS
kfileividesktop.cpp kdesktopapp.cpp
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK
kdesktopsettings-static bgnd-static dmctl-static
diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN
index e2a6a2b8b..f13a7b2f5 100644
--- a/kdesktop/DESIGN
+++ b/kdesktop/DESIGN
@@ -37,7 +37,7 @@ lock* : screen saver/locker
Libs used by KDesktop
======================
-kdecore, kdeui, kfile - usual stuff :)
+tdecore, tdeui, kfile - usual stuff :)
libkio - I/O stuff, mimetypes, services, registry
libkonq - properties dialog, templates ("new") menu, dir lister, settings
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 994a44c12..6c7b869f8 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = . lock pics patterns programs init kwebdesktop
bin_PROGRAMS = kcheckrunning kxdglauncher
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kdesktop.la
+tdeinit_LTLIBRARIES = kdesktop.la
noinst_LTLIBRARIES = libkdesktopsettings.la
libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h
index 4a9d6b7eb..3443eda40 100644
--- a/kdesktop/kshadowengine.h
+++ b/kdesktop/kshadowengine.h
@@ -80,7 +80,7 @@ class KShadowEngine
TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor);
private:
- // No static objects in libs, and no static deleters in kdefx...
+ // No static objects in libs, and no static deleters in tdefx...
//static KShadowSettings s_defaultShadowSettings;
KShadowSettings *m_shadowSettings;
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index 6d1d9fac2..eb8d759cf 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop
METASOURCES = AUTO
kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 3b16ff479..b2d886e50 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am of kdebase/kdesktop/lock
INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
####### Files
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index da83535c8..ff4553b8e 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -18,7 +18,7 @@
#include <kglobalsettings.h>
#include <kconfig.h>
#include <kiconloader.h>
-#include <kdesu/defaults.h>
+#include <tdesu/defaults.h>
#include <kpassdlg.h>
#include <kdebug.h>
#include <kuser.h>
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 1cec74e2c..9ff990820 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -23,7 +23,7 @@
#include <kglobalsettings.h>
#include <kconfig.h>
#include <kiconloader.h>
-#include <kdesu/defaults.h>
+#include <tdesu/defaults.h>
#include <kpassdlg.h>
#include <kdebug.h>
#include <kuser.h>
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index 639772ace..ec9b88b04 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -18,7 +18,7 @@
#include <kglobalsettings.h>
#include <kconfig.h>
#include <kiconloader.h>
-#include <kdesu/defaults.h>
+#include <tdesu/defaults.h>
#include <kpassdlg.h>
#include <kdebug.h>
#include <kuser.h>
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index 8b00e5408..ff1c4470f 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -18,7 +18,7 @@
#include <kglobalsettings.h>
#include <kconfig.h>
#include <kiconloader.h>
-#include <kdesu/defaults.h>
+#include <tdesu/defaults.h>
#include <kpassdlg.h>
#include <kdebug.h>
#include <kuser.h>
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 4577f5784..532b9044e 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -18,7 +18,7 @@
#include <kglobalsettings.h>
#include <kconfig.h>
#include <kiconloader.h>
-#include <kdesu/defaults.h>
+#include <tdesu/defaults.h>
#include <kpassdlg.h>
#include <kdebug.h>
#include <kuser.h>
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index f60eff4a5..17d636b01 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -58,7 +58,7 @@
#include <kpassdlg.h>
#include <krun.h>
#include <kwin.h>
-#include <kdesu/su.h>
+#include <tdesu/su.h>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <kiconloader.h>
@@ -544,7 +544,7 @@ int Minicli::runCommand()
// through SuProcess without providing the user password
if (m_iPriority < 50)
{
- // from kdesu_stub.c
+ // from tdesu_stub.c
int val = 20 - (int) (((double) m_iPriority) * 40 / 100 + 0.5);
cmd = "nice -n " + TQString::number( val ) + " " + cmd;
}