summaryrefslogtreecommitdiffstats
path: root/kio
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:31:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:31:13 -0600
commit0ae5679aa160245af248836e1d7743aeff63f2e1 (patch)
tree64608dccc9bfd57800995a414f6287b7605ca637 /kio
parentd3b5575f31f14629dbd3fd900665e1a69aa7bcd5 (diff)
downloadtdelibs-0ae5679aa160245af248836e1d7743aeff63f2e1.tar.gz
tdelibs-0ae5679aa160245af248836e1d7743aeff63f2e1.zip
Additional kde to tde renaming
Diffstat (limited to 'kio')
-rw-r--r--kio/CMakeLists.txt2
-rw-r--r--kio/DESIGN2
-rw-r--r--kio/Makefile.am4
-rw-r--r--kio/bookmarks/CMakeLists.txt8
-rw-r--r--kio/bookmarks/Makefile.am2
-rw-r--r--kio/httpfilter/CMakeLists.txt4
-rw-r--r--kio/kfile/CMakeLists.txt8
-rw-r--r--kio/kfile/ChangeLog2
-rw-r--r--kio/kfile/Makefile.am2
-rw-r--r--kio/kfile/kfilesharedlg.cpp2
-rw-r--r--kio/kio/CMakeLists.txt8
-rw-r--r--kio/kio/Makefile.am4
-rw-r--r--kio/kio/kmimetype.cpp2
-rw-r--r--kio/kio/kprotocolinfo.cpp2
-rw-r--r--kio/kio/kprotocolinfo.h10
-rw-r--r--kio/kio/krun.cpp10
-rw-r--r--kio/kio/scheduler.cpp2
-rw-r--r--kio/kio/sessiondata.cpp28
-rw-r--r--kio/kio/slavebase.cpp2
-rw-r--r--kio/kioexec/CMakeLists.txt6
-rw-r--r--kio/kioexec/Makefile.am2
-rw-r--r--kio/kpasswdserver/CMakeLists.txt8
-rw-r--r--kio/kssl/CMakeLists.txt8
-rw-r--r--kio/kssl/Makefile.am2
-rw-r--r--kio/misc/CMakeLists.txt16
-rw-r--r--kio/misc/Makefile.am8
-rw-r--r--kio/misc/kdesasl/CMakeLists.txt14
-rw-r--r--kio/misc/kdesasl/Makefile.am6
-rw-r--r--kio/misc/kdesasl/kdesasl.cpp2
-rw-r--r--kio/misc/kfile/CMakeLists.txt6
-rw-r--r--kio/misc/kfile/Makefile.am2
-rw-r--r--kio/misc/kntlm/CMakeLists.txt6
-rw-r--r--kio/misc/kpac/CMakeLists.txt8
-rw-r--r--kio/misc/kpac/Makefile.am2
-rw-r--r--kio/misc/ksendbugmail/CMakeLists.txt4
-rw-r--r--kio/misc/ksendbugmail/Makefile.am2
-rw-r--r--kio/misc/kssld/CMakeLists.txt6
-rw-r--r--kio/misc/ktelnetservice.cpp2
-rw-r--r--kio/misc/kwalletd/CMakeLists.txt8
-rw-r--r--kio/misc/uiserver.cpp2
-rw-r--r--kio/tests/CMakeLists.txt4
-rw-r--r--kio/tests/Makefile.am2
-rw-r--r--kio/tests/kruntest.cpp8
43 files changed, 119 insertions, 119 deletions
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 4b0b4eca3..b18bfef33 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -60,6 +60,6 @@ tde_add_library( ${target} SHARED
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
VERSION 4.2.0
EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static
- LINK kdeui-shared kdesu-shared kwalletclient-shared
+ LINK tdeui-shared tdesu-shared kwalletclient-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kio/DESIGN b/kio/DESIGN
index 8131573e1..c84bd2182 100644
--- a/kio/DESIGN
+++ b/kio/DESIGN
@@ -2,7 +2,7 @@ DESIGN:
=======
libkio uses kioslaves (separate processes) that handle a given protocol.
-Launching those slaves is taken care of by the kdeinit/klauncher tandem,
+Launching those slaves is taken care of by the tdeinit/klauncher tandem,
which are notified by DCOP.
Connection is the most low-level class, the one that encapsulates the pipe.
diff --git a/kio/Makefile.am b/kio/Makefile.am
index a0573f340..c2792330a 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -30,7 +30,7 @@ libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
$(KDE_MT_LDFLAGS)
libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
- ../kdeui/libtdeui.la ../kdesu/libtdesu.la \
+ ../tdeui/libtdeui.la ../tdesu/libtdesu.la \
../kwallet/client/libkwalletclient.la \
$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
@@ -62,6 +62,6 @@ messages:
$(XGETTEXT) `find . ../kioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kio.pot
rm -f rc.cpp
-DOXYGEN_REFERENCES = kdecore kdefx kjs dcop kdeui kio/kio kio/kfile
+DOXYGEN_REFERENCES = tdecore tdefx kjs dcop tdeui kio/kio kio/kfile
DOXYGEN_EXCLUDE = kssl/kssl
include ../admin/Doxyfile.am
diff --git a/kio/bookmarks/CMakeLists.txt b/kio/bookmarks/CMakeLists.txt
index 9aac8b591..7c2fd72c6 100644
--- a/kio/bookmarks/CMakeLists.txt
+++ b/kio/bookmarks/CMakeLists.txt
@@ -13,11 +13,11 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kio/bookmarks/Makefile.am b/kio/bookmarks/Makefile.am
index 2a41efd98..63b535e13 100644
--- a/kio/bookmarks/Makefile.am
+++ b/kio/bookmarks/Makefile.am
@@ -17,7 +17,7 @@
# Boston, MA 02110-1301, USA.
-INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/kdefx -I$(top_builddir)/kio/kio $(all_includes)
+INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx -I$(top_builddir)/kio/kio $(all_includes)
noinst_LTLIBRARIES = libkbookmarks.la
diff --git a/kio/httpfilter/CMakeLists.txt b/kio/httpfilter/CMakeLists.txt
index 802e45b89..eec4e78a7 100644
--- a/kio/httpfilter/CMakeLists.txt
+++ b/kio/httpfilter/CMakeLists.txt
@@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio
)
diff --git a/kio/kfile/CMakeLists.txt b/kio/kfile/CMakeLists.txt
index e9e7540b7..3444fa0da 100644
--- a/kio/kfile/CMakeLists.txt
+++ b/kio/kfile/CMakeLists.txt
@@ -14,12 +14,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/bookmarks
diff --git a/kio/kfile/ChangeLog b/kio/kfile/ChangeLog
index bb43f16da..ac05c86d0 100644
--- a/kio/kfile/ChangeLog
+++ b/kio/kfile/ChangeLog
@@ -643,7 +643,7 @@ Thu Mar 12 00:36:05 1998 Stephan Kulow <coolo@kde.org>
Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org>
* More work on the bookmarks - they should work properly now, you
- must create the directory ~/.kde/share/apps/kdeui to store the
+ must create the directory ~/.kde/share/apps/tdeui to store the
bookmarks in.
* Regenerated docs
diff --git a/kio/kfile/Makefile.am b/kio/kfile/Makefile.am
index a63306189..1951f30c0 100644
--- a/kio/kfile/Makefile.am
+++ b/kio/kfile/Makefile.am
@@ -17,7 +17,7 @@
# Boston, MA 02110-1301, USA.
-INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/kdefx \
+INCLUDES= -I$(srcdir)/../libltdl/ -I$(top_srcdir) -I$(top_srcdir)/tdefx \
-I$(top_builddir)/kio/kio -I$(top_srcdir)/kio/bookmarks $(all_includes) $(LIBART_CFLAGS)
noinst_LTLIBRARIES = libkfile.la
diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp
index c396a1b58..bdf101339 100644
--- a/kio/kfile/kfilesharedlg.cpp
+++ b/kio/kfile/kfilesharedlg.cpp
@@ -237,7 +237,7 @@ void KFileSharePropsPlugin::slotConfigureFileSharing()
if (d->m_configProc) return;
d->m_configProc = new KProcess(this);
- (*d->m_configProc) << KStandardDirs::findExe("kdesu") << locate("exe", "kcmshell") << "fileshare";
+ (*d->m_configProc) << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare";
if (!d->m_configProc->start( KProcess::NotifyOnExit ))
{
delete d->m_configProc;
diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt
index f337175c3..f9976a6d2 100644
--- a/kio/kio/CMakeLists.txt
+++ b/kio/kio/CMakeLists.txt
@@ -15,12 +15,12 @@ include_directories(
${CMAKE_BINARY_DIR}/kio/kssl
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore/network
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore/network
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kssl
${CMAKE_SOURCE_DIR}/interfaces
diff --git a/kio/kio/Makefile.am b/kio/kio/Makefile.am
index 374fb0ab1..2034a33b6 100644
--- a/kio/kio/Makefile.am
+++ b/kio/kio/Makefile.am
@@ -18,7 +18,7 @@
AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
-INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/kdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES)
+INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES)
noinst_LTLIBRARIES = libkiocore.la libksycoca.la
@@ -63,7 +63,7 @@ include_HEADERS += kacl.h
#endif
#libkiocore_la_LDFLAGS = $(all_libraries)
-#libkiocore_la_LIBADD = ../../kdeui/libtdeui.la ../../kdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
+#libkiocore_la_LIBADD = ../../tdeui/libtdeui.la ../../tdesu/libtdesu.la $(LIBZ) $(LIBFAM) $(LIBVOLMGT)
libkiocore_la_SOURCES = authinfo.cpp \
kshred.cpp \
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index f62a7d2a8..719107223 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -900,7 +900,7 @@ pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & )
args << url.path();
int pid;
- if ( !KApplication::kdeinitExec("kfmclient", args, 0, &pid) )
+ if ( !KApplication::tdeinitExec("kfmclient", args, 0, &pid) )
return pid;
KProcess p;
diff --git a/kio/kio/kprotocolinfo.cpp b/kio/kio/kprotocolinfo.cpp
index 01e3e6c18..73a960ea0 100644
--- a/kio/kio/kprotocolinfo.cpp
+++ b/kio/kio/kprotocolinfo.cpp
@@ -26,7 +26,7 @@
#include "kprotocolinfofactory.h"
#include "kprotocolmanager.h"
-// Most of this class is implemented in kdecore/kprotocolinfo_kdecore.cpp
+// Most of this class is implemented in tdecore/kprotocolinfo_tdecore.cpp
// This file only contains a few static class-functions that depend on
// KProtocolManager
diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h
index dba4694db..1dad7915f 100644
--- a/kio/kio/kprotocolinfo.h
+++ b/kio/kio/kprotocolinfo.h
@@ -669,11 +669,11 @@ protected:
TQString m_config;
int m_maxSlaves;
- bool canRenameFromFile() const; // for kprotocolinfo_kdecore
- bool canRenameToFile() const; // for kprotocolinfo_kdecore
- bool canDeleteRecursive() const; // for kprotocolinfo_kdecore
- FileNameUsedForCopying fileNameUsedForCopying() const; // for kprotocolinfo_kdecore
- static KProtocolInfo* findProtocol(const KURL &url); // for kprotocolinfo_kdecore
+ bool canRenameFromFile() const; // for kprotocolinfo_tdecore
+ bool canRenameToFile() const; // for kprotocolinfo_tdecore
+ bool canDeleteRecursive() const; // for kprotocolinfo_tdecore
+ FileNameUsedForCopying fileNameUsedForCopying() const; // for kprotocolinfo_tdecore
+ static KProtocolInfo* findProtocol(const KURL &url); // for kprotocolinfo_tdecore
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index 133c686b9..43bdb9f50 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -456,8 +456,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
2 << split(term) << "-e" << split(cmd)
3 << split(term) << "-e" << "sh" << "-c" << cmd
- 4 << "kdesu" << "-u" << user << "-c" << cmd
- 5 << "kdesu" << "-u" << user << "-c" << ("sh -c " + quote(cmd))
+ 4 << "tdesu" << "-u" << user << "-c" << cmd
+ 5 << "tdesu" << "-u" << user << "-c" << ("sh -c " + quote(cmd))
6 << split(term) << "-e" << "su" << user << "-c" << cmd
7 << split(term) << "-e" << "su" << user << "-c" << ("sh -c " + quote(cmd))
@@ -466,8 +466,8 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
a << term << "-e" << cmd
b << term << "-e" << ("sh -c " + quote(cmd))
- c << "kdesu" << "-u" << user << "-c" << quote(cmd)
- d << "kdesu" << "-u" << user << "-c" << quote("sh -c " + quote(cmd))
+ c << "tdesu" << "-u" << user << "-c" << quote(cmd)
+ d << "tdesu" << "-u" << user << "-c" << quote("sh -c " + quote(cmd))
e << term << "-e" << "su" << user << "-c" << quote(cmd)
f << term << "-e" << "su" << user << "-c" << quote("sh -c " + quote(cmd))
@@ -499,7 +499,7 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
if (_service.terminal())
result << "su";
else
- result << "kdesu" << "-u";
+ result << "tdesu" << "-u";
result << _service.username() << "-c";
KShell::splitArgs(exec, KShell::AbortOnMeta | KShell::TildeExpand, &err);
if (err == KShell::FoundMeta) {
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index 020bc62dd..5bda16786 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -33,7 +33,7 @@
#include <kprotocolinfo.h>
#include <assert.h>
#include <kstaticdeleter.h>
-#include <kdesu/client.h>
+#include <tdesu/client.h>
// Slaves may be idle for MAX_SLAVE_IDLE time before they are being returned
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp
index c94fe3b40..937d6aa51 100644
--- a/kio/kio/sessiondata.cpp
+++ b/kio/kio/sessiondata.cpp
@@ -30,7 +30,7 @@
#include <kprotocolmanager.h>
#include <kstandarddirs.h>
-#include <kdesu/client.h>
+#include <tdesu/client.h>
#include <kio/slaveconfig.h>
#include <kio/http_slave_defaults.h>
@@ -82,14 +82,14 @@ public:
private:
#ifdef Q_OS_UNIX
- KDEsuClient * m_kdesuClient;
+ KDEsuClient * m_tdesuClient;
#endif
};
SessionData::AuthDataList::AuthDataList()
{
#ifdef Q_OS_UNIX
- m_kdesuClient = new KDEsuClient;
+ m_tdesuClient = new KDEsuClient;
#endif
setAutoDelete(true);
}
@@ -98,8 +98,8 @@ SessionData::AuthDataList::~AuthDataList()
{
purgeCachedData();
#ifdef Q_OS_UNIX
- delete m_kdesuClient;
- m_kdesuClient = 0;
+ delete m_tdesuClient;
+ m_tdesuClient = 0;
#endif
}
@@ -131,12 +131,12 @@ void SessionData::AuthDataList::removeData( const TQCString& gkey )
bool SessionData::AuthDataList::pingCacheDaemon()
{
#ifdef Q_OS_UNIX
- Q_ASSERT(m_kdesuClient);
+ Q_ASSERT(m_tdesuClient);
- int success = m_kdesuClient->ping();
+ int success = m_tdesuClient->ping();
if( success == -1 )
{
- success = m_kdesuClient->startServer();
+ success = m_tdesuClient->startServer();
if( success == -1 )
return false;
}
@@ -154,15 +154,15 @@ void SessionData::AuthDataList::registerAuthData( SessionData::AuthData* d )
#ifdef Q_OS_UNIX
bool ok;
TQCString ref_key = d->key + "-refcount";
- int count = m_kdesuClient->getVar(ref_key).toInt( &ok );
+ int count = m_tdesuClient->getVar(ref_key).toInt( &ok );
if( ok )
{
TQCString val;
val.setNum( count+1 );
- m_kdesuClient->setVar( ref_key, val, 0, d->group );
+ m_tdesuClient->setVar( ref_key, val, 0, d->group );
}
else
- m_kdesuClient->setVar( ref_key, "1", 0, d->group );
+ m_tdesuClient->setVar( ref_key, "1", 0, d->group );
#endif
}
@@ -176,18 +176,18 @@ void SessionData::AuthDataList::unregisterAuthData( SessionData::AuthData* d )
TQCString ref_key = d->key + "-refcount";
#ifdef Q_OS_UNIX
- count = m_kdesuClient->getVar( ref_key ).toInt( &ok );
+ count = m_tdesuClient->getVar( ref_key ).toInt( &ok );
if ( ok )
{
if ( count > 1 )
{
TQCString val;
val.setNum(count-1);
- m_kdesuClient->setVar( ref_key, val, 0, d->group );
+ m_tdesuClient->setVar( ref_key, val, 0, d->group );
}
else
{
- m_kdesuClient->delVars(d->key);
+ m_tdesuClient->delVars(d->key);
}
}
#endif
diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp
index 13e7c636f..04d977009 100644
--- a/kio/kio/slavebase.cpp
+++ b/kio/kio/slavebase.cpp
@@ -47,7 +47,7 @@
#include <kapplication.h>
#include <ksock.h>
#include <kcrash.h>
-#include <kdesu/client.h>
+#include <tdesu/client.h>
#include <klocale.h>
#include <ksocks.h>
diff --git a/kio/kioexec/CMakeLists.txt b/kio/kioexec/CMakeLists.txt
index d903f1f3a..0ab606643 100644
--- a/kio/kioexec/CMakeLists.txt
+++ b/kio/kioexec/CMakeLists.txt
@@ -13,9 +13,9 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am
index e0bd75491..98fc1987d 100644
--- a/kio/kioexec/Makefile.am
+++ b/kio/kioexec/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
bin_PROGRAMS = kioexec
kioexec_SOURCES = main.cpp
-kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kioexec_LDADD = $(LIB_KIO)
noinst_HEADERS = main.h
diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt
index 5ed92bf17..a02d3b50a 100644
--- a/kio/kpasswdserver/CMakeLists.txt
+++ b/kio/kpasswdserver/CMakeLists.txt
@@ -13,11 +13,11 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client
${CMAKE_SOURCE_DIR}/kio
)
@@ -37,7 +37,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared
+ LINK tdeinit_kded-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/kssl/CMakeLists.txt b/kio/kssl/CMakeLists.txt
index c6a383adb..377cd9d01 100644
--- a/kio/kssl/CMakeLists.txt
+++ b/kio/kssl/CMakeLists.txt
@@ -16,11 +16,11 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore/network
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore/network
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client
)
diff --git a/kio/kssl/Makefile.am b/kio/kssl/Makefile.am
index 49a448db1..54f2fc6f5 100644
--- a/kio/kssl/Makefile.am
+++ b/kio/kssl/Makefile.am
@@ -3,7 +3,7 @@
# somewhere else. Another option for the future (needs testing) would be to
# change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
# instead of #include <openssl/foo.h>
-INCLUDES=-I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
+INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
noinst_LTLIBRARIES = libkssl.la
KSSLVERSION= 3.0.0
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
index d6bc0cb16..52aa2207a 100644
--- a/kio/misc/CMakeLists.txt
+++ b/kio/misc/CMakeLists.txt
@@ -11,7 +11,7 @@
add_subdirectory( ksendbugmail )
add_subdirectory( kpac )
-add_subdirectory( kdesasl )
+add_subdirectory( tdesasl )
add_subdirectory( kssld )
add_subdirectory( kfile )
add_subdirectory( kwalletd )
@@ -24,15 +24,15 @@ add_definitions(
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kio
${CMAKE_BINARY_DIR}/kio/kio
${CMAKE_BINARY_DIR}/kio/kssl
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kssl
@@ -69,7 +69,7 @@ set( ${target}_SRCS
uiserver.cpp uiserver.skel
)
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kio-shared
DEPENDENCIES dcopidl
@@ -82,7 +82,7 @@ set( target kmailservice )
tde_add_executable( ${target}
SOURCES ${target}.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -93,7 +93,7 @@ set( target ktelnetservice )
tde_add_executable( ${target}
SOURCES ${target}.cpp
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am
index 203d79878..3d05c0003 100644
--- a/kio/misc/Makefile.am
+++ b/kio/misc/Makefile.am
@@ -20,10 +20,10 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
-SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile kwalletd kntlm
+SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm
lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kio_uiserver.la
+tdeinit_LTLIBRARIES = kio_uiserver.la
bin_PROGRAMS = kmailservice ktelnetservice
observer_DIR = $(top_srcdir)/kio/kio
@@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
kmailservice_SOURCES = kmailservice.cpp
kmailservice_LDADD = $(LIB_KDECORE)
-kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ktelnetservice_SOURCES = ktelnetservice.cpp
ktelnetservice_LDADD = $(LIB_KDEUI)
-ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/kio/misc/kdesasl/CMakeLists.txt b/kio/misc/kdesasl/CMakeLists.txt
index 081d64799..27cacfbb9 100644
--- a/kio/misc/kdesasl/CMakeLists.txt
+++ b/kio/misc/kdesasl/CMakeLists.txt
@@ -12,8 +12,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -23,20 +23,20 @@ link_directories(
##### headers ###################################
-install(FILES kdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+install(FILES tdesasl.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
-##### kdesasl ###################################
+##### tdesasl ###################################
-set( target kdesasl )
+set( target tdesasl )
set( ${target}_SRCS
- kdesasl.cpp
+ tdesasl.cpp
)
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 1.2.0
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kio/misc/kdesasl/Makefile.am b/kio/misc/kdesasl/Makefile.am
index 0160cdb67..d308e6770 100644
--- a/kio/misc/kdesasl/Makefile.am
+++ b/kio/misc/kdesasl/Makefile.am
@@ -3,10 +3,10 @@ INCLUDES=$(all_includes)
lib_LTLIBRARIES = libtdesasl.la
METASOURCES = AUTO
-kdesaslincludedir = $(includedir)/kio
-kdesaslinclude_HEADERS = kdesasl.h
+tdesaslincludedir = $(includedir)/kio
+tdesaslinclude_HEADERS = tdesasl.h
-libtdesasl_la_SOURCES = kdesasl.cpp
+libtdesasl_la_SOURCES = tdesasl.cpp
libtdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
libtdesasl_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp
index b547f7e6b..37195faf3 100644
--- a/kio/misc/kdesasl/kdesasl.cpp
+++ b/kio/misc/kdesasl/kdesasl.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kdesasl.h"
+#include "tdesasl.h"
#include <kmdcodec.h>
#include <kurl.h>
diff --git a/kio/misc/kfile/CMakeLists.txt b/kio/misc/kfile/CMakeLists.txt
index 4a00ae286..07c2725b2 100644
--- a/kio/misc/kfile/CMakeLists.txt
+++ b/kio/misc/kfile/CMakeLists.txt
@@ -11,9 +11,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am
index c02f9eb97..c0ede6f62 100644
--- a/kio/misc/kfile/Makefile.am
+++ b/kio/misc/kfile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
bin_PROGRAMS = kfile
kfile_SOURCES = fileprops.cpp
-kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kfile_LDADD = $(LIB_KIO)
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index 9b4b916bc..0952f4535 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
)
link_directories(
@@ -38,6 +38,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kio/misc/kpac/CMakeLists.txt b/kio/misc/kpac/CMakeLists.txt
index c3fc418c3..00ce2d357 100644
--- a/kio/misc/kpac/CMakeLists.txt
+++ b/kio/misc/kpac/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kjs
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore/network
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore/network
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kded
@@ -49,7 +49,7 @@ set( ${target}_SKELS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES}
+ LINK tdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES}
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/misc/kpac/Makefile.am b/kio/misc/kpac/Makefile.am
index 796a9771c..65047f343 100644
--- a/kio/misc/kpac/Makefile.am
+++ b/kio/misc/kpac/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_proxyscout.la
bin_PROGRAMS = kpac_dhcp_helper
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/kded -I$(top_builddir)/kjs \
- -I$(top_srcdir)/kdecore/network $(all_includes)
+ -I$(top_srcdir)/tdecore/network $(all_includes)
METASOURCES = AUTO
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kio/misc/ksendbugmail/CMakeLists.txt b/kio/misc/ksendbugmail/CMakeLists.txt
index 133049129..f0e1b99b0 100644
--- a/kio/misc/ksendbugmail/CMakeLists.txt
+++ b/kio/misc/ksendbugmail/CMakeLists.txt
@@ -12,8 +12,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am
index 2a9b8f3cc..a9b461159 100644
--- a/kio/misc/ksendbugmail/Makefile.am
+++ b/kio/misc/ksendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
INCLUDES= -I$(srcdir)/.. $(all_includes)
ksendbugmail_SOURCES = main.cpp smtp.cpp
-ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ksendbugmail_LDADD = ../../libkio.la
METASOURCES = AUTO
diff --git a/kio/misc/kssld/CMakeLists.txt b/kio/misc/kssld/CMakeLists.txt
index ca9438817..14d2de1ac 100644
--- a/kio/misc/kssld/CMakeLists.txt
+++ b/kio/misc/kssld/CMakeLists.txt
@@ -14,10 +14,10 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kio/kssl
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio/kssl
)
@@ -41,7 +41,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared
+ LINK tdeinit_kded-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index 9c8238f74..aa7b3b226 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
cmd << TQString::number(url.port());
}
- app.kdeinitExec(terminal, cmd);
+ app.tdeinitExec(terminal, cmd);
return 0;
}
diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/kwalletd/CMakeLists.txt
index eb02085f5..db4f56cb1 100644
--- a/kio/misc/kwalletd/CMakeLists.txt
+++ b/kio/misc/kwalletd/CMakeLists.txt
@@ -12,11 +12,11 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client
${CMAKE_SOURCE_DIR}/kwallet/backend
${CMAKE_SOURCE_DIR}/kio/kio
@@ -43,7 +43,7 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdeinit_kded-shared kwalletbackend-shared
+ LINK tdeinit_kded-shared kwalletbackend-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index bf8b606dc..55da183ee 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -37,7 +37,7 @@
#include <kstatusbar.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kdesu/client.h>
+#include <tdesu/client.h>
#include <kwin.h>
#include <kdialog.h>
#include <ksystemtray.h>
diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt
index 9c4fb7427..54378f5c8 100644
--- a/kio/tests/CMakeLists.txt
+++ b/kio/tests/CMakeLists.txt
@@ -11,8 +11,8 @@
include_directories(
${TQT_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am
index ee81b822c..34acd24f6 100644
--- a/kio/tests/Makefile.am
+++ b/kio/tests/Makefile.am
@@ -18,7 +18,7 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
LDADD = $(LIB_KIO)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp
index 10dbc9b71..0febcbc26 100644
--- a/kio/tests/kruntest.cpp
+++ b/kio/tests/kruntest.cpp
@@ -146,16 +146,16 @@ int main(int argc, char **argv)
"'/bin/sh' '-c' 'echo $PWD '", // 1
"'x-term' '-T' ' - just_a_test' '-e' 'date' '-u'", // 2
"'x-term' '-T' ' - just_a_test' '-e' '/bin/sh' '-c' 'echo $PWD '", // 3
-"'kdesu' '-u' 'sprallo' '-c' 'date -u '", // 4
-"'kdesu' '-u' 'sprallo' '-c' '/bin/sh -c '\\''echo $PWD '\\'''", // 5
+"'tdesu' '-u' 'sprallo' '-c' 'date -u '", // 4
+"'tdesu' '-u' 'sprallo' '-c' '/bin/sh -c '\\''echo $PWD '\\'''", // 5
"'x-term' '-T' ' - just_a_test' '-e' 'su' 'sprallo' '-c' 'date -u '", // 6
"'x-term' '-T' ' - just_a_test' '-e' 'su' 'sprallo' '-c' '/bin/sh -c '\\''echo $PWD '\\'''", // 7
"'date -u '", // 8
"'echo $PWD '", // 9
"'x-term -T \" - just_a_test\"' '-e' 'date -u '", // a
"'x-term -T \" - just_a_test\"' '-e' '/bin/sh -c '\\''echo $PWD '\\'''", // b
-"'kdesu' '-u' 'sprallo' '-c' ''\\''date -u '\\'''", // c
-"'kdesu' '-u' 'sprallo' '-c' ''\\''/bin/sh -c '\\''\\'\\'''\\''echo $PWD '\\''\\'\\'''\\'''\\'''", // d
+"'tdesu' '-u' 'sprallo' '-c' ''\\''date -u '\\'''", // c
+"'tdesu' '-u' 'sprallo' '-c' ''\\''/bin/sh -c '\\''\\'\\'''\\''echo $PWD '\\''\\'\\'''\\'''\\'''", // d
"'x-term -T \" - just_a_test\"' '-e' 'su' 'sprallo' '-c' ''\\''date -u '\\'''", // e
"'x-term -T \" - just_a_test\"' '-e' 'su' 'sprallo' '-c' ''\\''/bin/sh -c '\\''\\'\\'''\\''echo $PWD '\\''\\'\\'''\\'''\\'''", // f
};