summaryrefslogtreecommitdiffstats
path: root/kdecore
diff options
context:
space:
mode:
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/CMakeLists.txt26
-rw-r--r--kdecore/MAINTAINERS2
-rw-r--r--kdecore/Mainpage.dox2
-rw-r--r--kdecore/Makefile.am14
-rw-r--r--kdecore/README2
-rw-r--r--kdecore/README.kstartupinfo2
-rw-r--r--kdecore/configure.in.in6
-rw-r--r--kdecore/kaccel.cpp2
-rw-r--r--kdecore/kaccelmanager.cpp2
-rw-r--r--kdecore/kapplication.cpp30
-rw-r--r--kdecore/kapplication.h16
-rw-r--r--kdecore/kconfig.cpp2
-rw-r--r--kdecore/kconfig_compiler/CMakeLists.txt6
-rw-r--r--kdecore/kconfig_compiler/Makefile.am8
-rw-r--r--kdecore/kconfig_compiler/example/Makefile.am6
-rw-r--r--kdecore/kconfig_compiler/tests/Makefile.am22
-rw-r--r--kdecore/kcrash.cpp10
-rw-r--r--kdecore/kdebug.areas82
-rw-r--r--kdecore/kdebug.cpp2
-rw-r--r--kdecore/kdelibs_export.h2
-rw-r--r--kdecore/kglobal.h2
-rw-r--r--kdecore/kiconeffect.cpp4
-rw-r--r--kdecore/kiconeffect.h2
-rw-r--r--kdecore/kiconloader.cpp2
-rw-r--r--kdecore/kiconloader.h2
-rw-r--r--kdecore/kiconloader_p.h2
-rw-r--r--kdecore/kicontheme.cpp2
-rw-r--r--kdecore/kicontheme.h2
-rw-r--r--kdecore/klibloader.cpp2
-rw-r--r--kdecore/kstartupinfo.cpp4
-rw-r--r--kdecore/kstartupinfo.h2
-rw-r--r--kdecore/ksycoca.cpp4
-rw-r--r--kdecore/kuniqueapplication.cpp2
-rw-r--r--kdecore/libkdecore.nmcheck4
-rw-r--r--kdecore/network/CMakeLists.txt8
-rw-r--r--kdecore/svgicons/CMakeLists.txt4
-rw-r--r--kdecore/tests/Makefile.am2
-rw-r--r--kdecore/tests/testqtargs.cpp4
38 files changed, 149 insertions, 149 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 2cad31cb0..348e80451 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -27,8 +27,8 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/network
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/libltdl
- ${CMAKE_SOURCE_DIR}/kdefx
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdefx
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
${LIBART_INCLUDE_DIRS}
${LIBIDN_INCLUDE_DIRS}
@@ -90,7 +90,7 @@ install( FILES eventsrc
##### libtdecore ################################
-set( target kdecore )
+set( target tdecore )
set( ${target}_SRCS
libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
@@ -120,7 +120,7 @@ set( ${target}_SRCS
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
- kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
+ kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
kqiodevicegzip_p.cpp ktimezones.cpp
)
@@ -128,16 +128,16 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 4.2.0
- EMBED kdecorenetwork-static
- LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
+ EMBED tdecorenetwork-static
+ LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
-##### kdefakes_nonpic ###########################
+##### tdefakes_nonpic ###########################
-set( target kdefakes_nonpic )
+set( target tdefakes_nonpic )
set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -148,9 +148,9 @@ tde_add_library( ${target} STATIC
DESTINATION ${LIB_INSTALL_DIR}
)
-##### kdefakes_pic ##############################
+##### tdefakes_pic ##############################
-set( target kdefakes_pic )
+set( target tdefakes_pic )
set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -164,7 +164,7 @@ tde_add_library( ${target} STATIC_PIC
##### libtdefakes ###############################
-set( target kdefakes )
+set( target tdefakes )
set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -185,7 +185,7 @@ configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY )
tde_add_executable( kde-config
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -204,6 +204,6 @@ tde_add_executable(kgrantpty SETUID
tde_add_executable( kdetcompmgr
SOURCES kdetcompmgr.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdecore/MAINTAINERS b/kdecore/MAINTAINERS
index 50820b5f0..64b825f06 100644
--- a/kdecore/MAINTAINERS
+++ b/kdecore/MAINTAINERS
@@ -104,7 +104,7 @@ klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright)
kmacroexpander.cpp
kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org> (copyright)
kmountpoint.cpp Waldo Bastian <bastian@kde.org> (copyright)
-kprotocolinfo_kdecore.cpp Torben Weis <weis@kde.org> (copyright)
+kprotocolinfo_tdecore.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright)
kpty.cpp
diff --git a/kdecore/Mainpage.dox b/kdecore/Mainpage.dox
index 987080ad2..c0e13a339 100644
--- a/kdecore/Mainpage.dox
+++ b/kdecore/Mainpage.dox
@@ -5,7 +5,7 @@ as the configuration system, IPC, internationalization and locale
support, site-independent access to the filesystem and a large number
of other (but no less important) things.
<p>
-All Trinity applications should link to the kdecore library. Also, using a
+All Trinity applications should link to the tdecore library. Also, using a
KApplication derived class instead of TQApplication is almost
mandatory if you expect your application to behave nicely within the
Trinity environment.
diff --git a/kdecore/Makefile.am b/kdecore/Makefile.am
index 32ccec1ca..92ee7ebfc 100644
--- a/kdecore/Makefile.am
+++ b/kdecore/Makefile.am
@@ -20,7 +20,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes) $(LIBART_CFLAGS)
+INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore/network $(all_includes) $(LIBART_CFLAGS)
if include_SVGICONS
SVGICONS=svgicons
@@ -117,20 +117,20 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \
- kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
+ kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
kqiodevicegzip_p.cpp ktimezones.cpp
libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
- $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
+ $(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
- $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
+ $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck
libtdecore_la_METASOURCES = AUTO
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore
+SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore
kdebugdir = $(kde_confdir)
kdebug_DATA = kdebug.areas kdebugrc language.codes
@@ -154,7 +154,7 @@ install-data-local:
uninstall-local:
-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h
-# If you add a color palette file here, please change kdelibs/kdeui/kcolordialog.cpp too to allow to translate the name
+# If you add a color palette file here, please change kdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
colorsdir = $(kde_confdir)/colors
@@ -188,7 +188,7 @@ install-exec-hook:
DISTCLEANFILES = kde-config.cpp
-DOXYGEN_REFERENCES = dcop kdeui kparts kio
+DOXYGEN_REFERENCES = dcop tdeui kparts kio
DOXYGEN_EXCLUDE = malloc kde_file.h
DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
diff --git a/kdecore/README b/kdecore/README
index 0788341af..ec99f440f 100644
--- a/kdecore/README
+++ b/kdecore/README
@@ -1,3 +1,3 @@
-This is the KDE "core" library. The kdecore library provides basic non user
+This is the KDE "core" library. The tdecore library provides basic non user
interface functionality.
diff --git a/kdecore/README.kstartupinfo b/kdecore/README.kstartupinfo
index 233ccde1e..cbb6a6dfb 100644
--- a/kdecore/README.kstartupinfo
+++ b/kdecore/README.kstartupinfo
@@ -88,7 +88,7 @@ The KStartupInfo classes :
--------------------------
In some cases, or if you are interested in getting the ASN information, you
-have to use the KStartupInfo classes in kdelibs/kdecore.
+have to use the KStartupInfo classes in kdelibs/tdecore.
Receiving the application startup notification information :
------------------------------------------------------------
diff --git a/kdecore/configure.in.in b/kdecore/configure.in.in
index b2fe9bd6e..7439a7c12 100644
--- a/kdecore/configure.in.in
+++ b/kdecore/configure.in.in
@@ -1,7 +1,7 @@
dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
-dnl Compile in kde_bindir to safely find kdesu_stub.
+dnl Compile in kde_bindir to safely find tdesu_stub.
if test "$exec_prefix" = "NONE"; then
bindir_str="\"$prefix/bin\""
else
@@ -167,9 +167,9 @@ AC_TRY_LINK(dnl
AC_CHECK_HEADERS(sys/mount.h)
-dnl AC_OUTPUT(kdecore/kde-config.cpp)
+dnl AC_OUTPUT(tdecore/kde-config.cpp)
-AM_CONFIG_HEADER(kdecore/kdemacros.h)
+AM_CONFIG_HEADER(tdecore/kdemacros.h)
SVGICONS=
diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp
index 75cd7aecf..b1fe773c6 100644
--- a/kdecore/kaccel.cpp
+++ b/kdecore/kaccel.cpp
@@ -523,7 +523,7 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
const TQString& KAccel::configGroup() const
{ return d->configGroup(); }
-// for kdegames/ksirtet
+// for tdegames/ksirtet
void KAccel::setConfigGroup( const TQString& s )
{ d->setConfigGroup( s ); }
diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index 7dc49ce78..6e8f08e0a 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -46,7 +46,7 @@
#include "kaccelmanager_private.h"
-#include "../kdeui/kstdaction_p.h"
+#include "../tdeui/kstdaction_p.h"
#include "../kutils/kmultitabbar.h"
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index 1f0db7240..9fdcfbcb9 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -1440,18 +1440,18 @@ bool KApplication::sessionSaving() const
void KApplication::startKdeinit()
{
#ifndef Q_WS_WIN //TODO
- KInstance inst( "startkdeinitlock" );
- KLockFile lock( locateLocal( "tmp", "startkdeinitlock", &inst ));
+ KInstance inst( "starttdeinitlock" );
+ KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock();
DCOPClient cl;
if( cl.attach())
return; // whoever held the lock has already started dcopserver
}
- // Try to launch kdeinit.
- TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"));
+ // Try to launch tdeinit.
+ TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"));
if (srv.isEmpty())
- srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
+ srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
if (srv.isEmpty())
return;
if (kapp && (Tty != kapp->type()))
@@ -2884,7 +2884,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
TQString error;
// TODO this should check if cmd has a .desktop file, and use data from it, together
// with sending more ASN data
- if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
+ if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
if (Tty != kapp->type())
TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
@@ -3006,7 +3006,7 @@ startServiceInternal( const TQCString &function,
// make sure there is id, so that user timestamp exists
stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id );
#endif
- if( function.left( 12 ) != "kdeinit_exec" )
+ if( function.left( 12 ) != "tdeinit_exec" )
stream << noWait;
if (!dcopClient->call(_launcher, _launcher,
@@ -3100,32 +3100,32 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
}
int
-KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid )
{
- return kdeinitExec( name, args, error, pid, "" );
+ return tdeinitExec( name, args, error, pid, "" );
}
int
-KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id )
{
- return startServiceInternal("kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
+ return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
name, args, error, 0, pid, startup_id, false);
}
int
-KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid )
{
- return kdeinitExecWait( name, args, error, pid, "" );
+ return tdeinitExecWait( name, args, error, pid, "" );
}
int
-KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
+KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id )
{
- return startServiceInternal("kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
+ return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
name, args, error, 0, pid, startup_id, false);
}
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index 25ecb6ee3..f1be3bfb8 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -814,10 +814,10 @@ public:
TQString *error=0, TQCString *dcopService=0, int *pid = 0, const TQCString &startup_id = "", bool noWait = false );
/**
- * Starts a program via kdeinit.
+ * Starts a program via tdeinit.
*
* program name and arguments are converted to according to the
- * local encoding and passed as is to kdeinit.
+ * local encoding and passed as is to tdeinit.
*
* @param name Name of the program to start
* @param args Arguments to pass to the program
@@ -830,16 +830,16 @@ public:
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
- static int kdeinitExec( const TQString& name, const TQStringList &args,
+ static int tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with startup_id = ""
- static int kdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
+ static int tdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
TQString *error=0, int *pid = 0 );
/**
- * Starts a program via kdeinit and wait for it to finish.
+ * Starts a program via tdeinit and wait for it to finish.
*
- * Like kdeinitExec(), but it waits till the program is finished.
+ * Like tdeinitExec(), but it waits till the program is finished.
* As such it behaves similar to the system(...) function.
*
* @param name Name of the program to start
@@ -853,10 +853,10 @@ public:
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
- static int kdeinitExecWait( const TQString& name, const TQStringList &args,
+ static int tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with startup_id = ""
- static int kdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
+ static int tdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
TQString *error=0, int *pid = 0 );
/**
diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp
index 2531034ee..709e39de3 100644
--- a/kdecore/kconfig.cpp
+++ b/kdecore/kconfig.cpp
@@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
{
TQStringList args;
args << "--check" << updateFile;
- KApplication::kdeinitExecWait("kconf_update", args);
+ KApplication::tdeinitExecWait("kconf_update", args);
reparseConfiguration();
}
setGroup(oldGroup);
diff --git a/kdecore/kconfig_compiler/CMakeLists.txt b/kdecore/kconfig_compiler/CMakeLists.txt
index d256d21c3..4acc09f51 100644
--- a/kdecore/kconfig_compiler/CMakeLists.txt
+++ b/kdecore/kconfig_compiler/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
)
link_directories(
@@ -24,6 +24,6 @@ link_directories(
tde_add_executable( kconfig_compiler
SOURCES kconfig_compiler.cpp
- LINK kdecore-shared
+ LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdecore/kconfig_compiler/Makefile.am b/kdecore/kconfig_compiler/Makefile.am
index e80f24d0e..d7b1400a4 100644
--- a/kdecore/kconfig_compiler/Makefile.am
+++ b/kdecore/kconfig_compiler/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = example tests
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = kconfig_compiler
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kconfig_compiler_LDADD = $(LIB_KDECORE)
kconfig_compiler_SOURCES = kconfig_compiler.cpp
@@ -13,6 +13,6 @@ TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
check-local:
for i in $(TESTFILES); \
do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
- perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \
- $(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done
+ perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
+ $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done
diff --git a/kdecore/kconfig_compiler/example/Makefile.am b/kdecore/kconfig_compiler/example/Makefile.am
index 4359c429e..9c0454ad8 100644
--- a/kdecore/kconfig_compiler/example/Makefile.am
+++ b/kdecore/kconfig_compiler/example/Makefile.am
@@ -1,13 +1,13 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = autoexample
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
example_LDADD = $(LIB_KDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp
diff --git a/kdecore/kconfig_compiler/tests/Makefile.am b/kdecore/kconfig_compiler/tests/Makefile.am
index 01a510f31..0b47449fa 100644
--- a/kdecore/kconfig_compiler/tests/Makefile.am
+++ b/kdecore/kconfig_compiler/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
test_dpointer.cpp test_dpointer.h \
md5sums
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test1_LDADD = $(LIB_KDECORE)
test1_SOURCES = test1main.cpp test1.cpp
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test2_LDADD = $(LIB_KDECORE)
test2_SOURCES = test2main.cpp test2.cpp
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test3_LDADD = $(LIB_KDECORE)
test3_SOURCES = test3main.cpp test3.cpp
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test4_LDADD = $(LIB_KDECORE)
test4_SOURCES = test4main.cpp test4.cpp
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test5_LDADD = $(LIB_KDECORE)
test5_SOURCES = test5main.cpp test5.cpp
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test6_LDADD = $(LIB_KDECORE)
test6_SOURCES = test6main.cpp test6.cpp
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test7_LDADD = $(LIB_KDECORE)
test7_SOURCES = test7main.cpp test7.cpp
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test8_LDADD = $(LIB_KDECORE)
test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test9_LDADD = $(LIB_KDECORE)
test9_SOURCES = test9main.cpp test9.cpp
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test_dpointer_LDADD = $(LIB_KDECORE)
test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
diff --git a/kdecore/kcrash.cpp b/kdecore/kcrash.cpp
index dd758f034..dbbd41338 100644
--- a/kdecore/kcrash.cpp
+++ b/kdecore/kcrash.cpp
@@ -177,7 +177,7 @@ KCrash::defaultCrashHandler (int sig)
argv[i++] = "--appname";
argv[i++] = appName;
if (KApplication::loadedByKdeinit)
- argv[i++] = "--kdeinit";
+ argv[i++] = "--tdeinit";
// only add apppath if it's not NULL
if (appPath) {
@@ -314,10 +314,10 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
}
}
-// If we can't reach kdeinit we can still at least try to fork()
+// If we can't reach tdeinit we can still at least try to fork()
void KCrash::startDirectly( const char* argv[], int )
{
- fprintf( stderr, "KCrash cannot reach kdeinit, launching directly.\n" );
+ fprintf( stderr, "KCrash cannot reach tdeinit, launching directly.\n" );
pid_t pid = fork();
if (pid <= 0)
{
@@ -483,13 +483,13 @@ static int openSocket()
return -1;
}
- if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE)
+ if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE)
{
fprintf(stderr, "Warning: Socket name will be too long.\n");
free(display);
return -1;
}
- strcat(sock_file, "/kdeinit_");
+ strcat(sock_file, "/tdeinit_");
strcat(sock_file, display);
free(display);
diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas
index e4c526be1..efa46034c 100644
--- a/kdecore/kdebug.areas
+++ b/kdecore/kdebug.areas
@@ -5,48 +5,48 @@
#
#Format : number<tab>description
-125 kdecore (KAccel)
-126 kdecore (KURL)
+125 tdecore (KAccel)
+126 tdecore (KURL)
127 kio (KProtocolInfo)
-128 kdecore (KRegExp)
-129 kdecore (KAction)
+128 tdecore (KRegExp)
+129 tdecore (KAction)
130 kio (KPasswdServer)
-131 kdecore (KAcceleratorManager)
-150 kdecore (KLibLoader)
-160 kdecore (KNotifyClient)
-170 kdecore (KNetwork socket)
-171 kdecore (KSocks)
-172 kdecore (KStartupInfo)
-173 kdecore (KLocale)
-174 kdecore (KProcIO)
-175 kdecore (KProcess)
-176 kdecore (KWin)
-177 kdecore (KConfigSkeleton)
-178 kdecore (KConfigDialogManager)
-179 kdecore (KNetwork resolver)
-180 kdecore (kdelibs)
-200 kdeui (KMainWindow)
-220 kdeui (KToolBar)
-230 kdeui (KCommand)
-240 kdeui (kdelibs)
+131 tdecore (KAcceleratorManager)
+150 tdecore (KLibLoader)
+160 tdecore (KNotifyClient)
+170 tdecore (KNetwork socket)
+171 tdecore (KSocks)
+172 tdecore (KStartupInfo)
+173 tdecore (KLocale)
+174 tdecore (KProcIO)
+175 tdecore (KProcess)
+176 tdecore (KWin)
+177 tdecore (KConfigSkeleton)
+178 tdecore (KConfigDialogManager)
+179 tdecore (KNetwork resolver)
+180 tdecore (kdelibs)
+200 tdeui (KMainWindow)
+220 tdeui (KToolBar)
+230 tdeui (KCommand)
+240 tdeui (kdelibs)
250 kfile (kdelibs)
-264 kdecore (KIconLoader)
-265 kdecore (KIconEffect)
-270 kdeui (KRootPixmap)
-280 kdeui (KSharedPixmap)
-281 kdeui (KCModule)
-282 kdeui (KDockWidget)
-290 kdeui (KPixmapIO)
-291 kdeui (KAboutDialog)
-292 kdeui (KComboBox)
-293 kdeui (KLineEdit)
-294 kdeui (KEdit)
-295 kdeui (KMenuBar)
-296 kdeui (KPopupMenu)
-298 kdeui (KDatePicker)
+264 tdecore (KIconLoader)
+265 tdecore (KIconEffect)
+270 tdeui (KRootPixmap)
+280 tdeui (KSharedPixmap)
+281 tdeui (KCModule)
+282 tdeui (KDockWidget)
+290 tdeui (KPixmapIO)
+291 tdeui (KAboutDialog)
+292 tdeui (KComboBox)
+293 tdeui (KLineEdit)
+294 tdeui (KEdit)
+295 tdeui (KMenuBar)
+296 tdeui (KPopupMenu)
+298 tdeui (KDatePicker)
399 kimgio
400 artskde
-500 kdeprint
+500 tdeprint
700 kutils (KSettings::Dialog)
701 kutils (KSettings::Dispatcher)
702 kutils (KPluginSelector)
@@ -61,7 +61,7 @@
780 kcmshell (kdelibs)
790 kimproxy (kdelibs)
800 kabapi (kdelibs)
-900 kdesu (kdelibs)
+900 tdesu (kdelibs)
912 ksmartcard (kdelibs)
@@ -74,8 +74,8 @@
1202 konqueror
1203 libkonq
1204 kdesktop
-1205 kdesud
-1206 kdesu
+1205 tdesud
+1206 tdesu
1207 kdesktop (Minicli)
1208 kcontrol
1210 kicker
@@ -151,7 +151,7 @@
5150 libkleopatra
-# kdepim
+# tdepim
5200 kitchensync
5201 kitchensync (Konnector)
5202 kitchensync (OpieKonnector)
diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp
index 8b7b4d88d..ed1a3d60d 100644
--- a/kdecore/kdebug.cpp
+++ b/kdecore/kdebug.cpp
@@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
}
case 1: // Message Box
{
- // Since we are in kdecore here, we cannot use KMsgBox and use
+ // Since we are in tdecore here, we cannot use KMsgBox and use
// TQMessageBox instead
if ( !kDebug_data->aAreaName.isEmpty() )
aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );
diff --git a/kdecore/kdelibs_export.h b/kdecore/kdelibs_export.h
index 5624fcddb..220657d0b 100644
--- a/kdecore/kdelibs_export.h
+++ b/kdecore/kdelibs_export.h
@@ -67,7 +67,7 @@
#endif /*_KDELIBS_EXPORT_H*/
-/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
+/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
between 'class' keyword and <classname>: */
#ifdef KDE_DEPRECATED
# ifndef KDECORE_EXPORT_DEPRECATED
diff --git a/kdecore/kglobal.h b/kdecore/kglobal.h
index c00279e1b..08e12767e 100644
--- a/kdecore/kglobal.h
+++ b/kdecore/kglobal.h
@@ -227,7 +227,7 @@ int KDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
* support, site-independent access to the filesystem and a large number
* of other (but no less important) things.
*
- * All KDE applications should link to the kdecore library. Also, using a
+ * All KDE applications should link to the tdecore library. Also, using a
* KApplication derived class instead of TQApplication is almost
* mandatory if you expect your application to behave nicely within the
* KDE environment.
diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp
index dddfba556..9c76c7e4d 100644
--- a/kdecore/kiconeffect.cpp
+++ b/kdecore/kiconeffect.cpp
@@ -1,7 +1,7 @@
/* vi: ts=8 sts=4 sw=4
* $Id$
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* with minor additions and based on ideas from
* Torsten Rahn <torsten@kde.org>
@@ -279,7 +279,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
return result;
}
-// Taken from KImageEffect. We don't want to link kdecore to kdeui! As long
+// Taken from KImageEffect. We don't want to link tdecore to tdeui! As long
// as this code is not too big, it doesn't seem much of a problem to me.
void KIconEffect::toGray(TQImage &img, float value)
diff --git a/kdecore/kiconeffect.h b/kdecore/kiconeffect.h
index b5f84cc20..a8e7b685e 100644
--- a/kdecore/kiconeffect.h
+++ b/kdecore/kiconeffect.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* with minor additions and based on ideas from
* Torsten Rahn <torsten@kde.org>
diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp
index 62950e5d8..317a56add 100644
--- a/kdecore/kiconloader.cpp
+++ b/kdecore/kiconloader.cpp
@@ -2,7 +2,7 @@
*
* $Id$
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kiconloader.h b/kdecore/kiconloader.h
index f8ac3fbc7..b7f1478f6 100644
--- a/kdecore/kiconloader.h
+++ b/kdecore/kiconloader.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kiconloader_p.h b/kdecore/kiconloader_p.h
index e6ae13659..4a7695390 100644
--- a/kdecore/kiconloader_p.h
+++ b/kdecore/kiconloader_p.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kicontheme.cpp b/kdecore/kicontheme.cpp
index ea91ab418..0f7d3b605 100644
--- a/kdecore/kicontheme.cpp
+++ b/kdecore/kicontheme.cpp
@@ -2,7 +2,7 @@
*
* $Id$
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/kicontheme.h b/kdecore/kicontheme.h
index 3a1f14fa4..d8e29d339 100644
--- a/kdecore/kicontheme.h
+++ b/kdecore/kicontheme.h
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * This file is part of the KDE project, module kdecore.
+ * This file is part of the KDE project, module tdecore.
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
* Antonio Larrosa <larrosa@kde.org>
*
diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp
index 1a90881df..290e23154 100644
--- a/kdecore/klibloader.cpp
+++ b/kdecore/klibloader.cpp
@@ -362,7 +362,7 @@ TQString KLibLoader::findLibrary( const char * name, const KInstance * instance
{
libfile = instance->dirs()->findResource( "lib", libname );
#ifndef NDEBUG
- if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules
+ if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for tdeinit modules
kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl;
#endif
}
diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp
index 98195e8e5..12825e805 100644
--- a/kdecore/kstartupinfo.cpp
+++ b/kdecore/kstartupinfo.cpp
@@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE.
****************************************************************************/
-// kdDebug() can't be turned off in kdeinit
+// kdDebug() can't be turned off in tdeinit
#if 0
#define KSTARTUPINFO_ALL_DEBUG
#warning Extra KStartupInfo debug messages enabled.
@@ -66,7 +66,7 @@ DEALINGS IN THE SOFTWARE.
static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO";
static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID";
// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c ,
-// kdesu in both kdelibs and kdebase and who knows where else
+// tdesu in both kdelibs and kdebase and who knows where else
static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID";
static bool auto_app_started_sending = true;
diff --git a/kdecore/kstartupinfo.h b/kdecore/kstartupinfo.h
index da3018d8c..807e484c5 100644
--- a/kdecore/kstartupinfo.h
+++ b/kdecore/kstartupinfo.h
@@ -49,7 +49,7 @@ class KStartupInfoPrivate;
*
* This class can be used to send information about started application,
* change the information and receive this information. For detailed
- * description, see kdelibs/kdecore/README.kstartupinfo.
+ * description, see kdelibs/tdecore/README.kstartupinfo.
*
* You usually don't need to use this class for sending the notification
* information, as KDE libraries should do this when an application is
diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp
index 2df7ae772..3a655d617 100644
--- a/kdecore/ksycoca.cpp
+++ b/kdecore/ksycoca.cpp
@@ -98,7 +98,7 @@ KSycoca::KSycoca()
}
// We register with DCOP _before_ we try to open the database.
// This way we can be relative sure that the KDE framework is
- // up and running (kdeinit, dcopserver, klaucnher, kded) and
+ // up and running (tdeinit, dcopserver, klaucnher, kded) and
// that the database is up to date.
openDatabase();
_self = this;
@@ -332,7 +332,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id)
if (!triedLaunchingKdeinit) // try only once
{
triedLaunchingKdeinit = true;
- kdDebug(7011) << "findFactory: we have no database.... launching kdeinit" << endl;
+ kdDebug(7011) << "findFactory: we have no database.... launching tdeinit" << endl;
KApplication::startKdeinit();
// Ok, the new database should be here now, open it.
}
diff --git a/kdecore/kuniqueapplication.cpp b/kdecore/kuniqueapplication.cpp
index 7cd0575cc..193aafcd3 100644
--- a/kdecore/kuniqueapplication.cpp
+++ b/kdecore/kuniqueapplication.cpp
@@ -164,7 +164,7 @@ KUniqueApplication::start()
::exit(255);
}
- // Try to launch kdeinit.
+ // Try to launch tdeinit.
startKdeinit();
regName = dc->registerAs(appName, false);
if (regName.isEmpty())
diff --git a/kdecore/libkdecore.nmcheck b/kdecore/libkdecore.nmcheck
index b8057d350..7c017a6e4 100644
--- a/kdecore/libkdecore.nmcheck
+++ b/kdecore/libkdecore.nmcheck
@@ -1,6 +1,6 @@
# KDE namespace check file
-# kdecore classes
+# tdecore classes
K*::*
# these should preferably go in some namespace in KDE4
@@ -48,7 +48,7 @@ kasciistricmp
# from libtldl
lt_dl*
-# from kdefakes
+# from tdefakes
setenv
unsetenv
usleep
diff --git a/kdecore/network/CMakeLists.txt b/kdecore/network/CMakeLists.txt
index e00fdd0c8..101da4843 100644
--- a/kdecore/network/CMakeLists.txt
+++ b/kdecore/network/CMakeLists.txt
@@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_BINARY_DIR}/tdecore
)
@@ -35,9 +35,9 @@ install( FILES
install( FILES ipv6blacklist DESTINATION ${CONFIG_INSTALL_DIR} )
-##### kdecorenetwork ############################
+##### tdecorenetwork ############################
-set( target kdecorenetwork )
+set( target tdecorenetwork )
set( ${target}_SRCS
kresolver.cpp kresolvermanager.cpp kresolverworkerbase.cpp
diff --git a/kdecore/svgicons/CMakeLists.txt b/kdecore/svgicons/CMakeLists.txt
index 714925667..4f2345510 100644
--- a/kdecore/svgicons/CMakeLists.txt
+++ b/kdecore/svgicons/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
${LIBART_INCLUDE_DIRS}
)
diff --git a/kdecore/tests/Makefile.am b/kdecore/tests/Makefile.am
index 71e6faa92..e35ae68a4 100644
--- a/kdecore/tests/Makefile.am
+++ b/kdecore/tests/Makefile.am
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(top_srcdir)/kdecore $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdecore $(all_includes)
AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
diff --git a/kdecore/tests/testqtargs.cpp b/kdecore/tests/testqtargs.cpp
index 3853bc035..d1c8ff244 100644
--- a/kdecore/tests/testqtargs.cpp
+++ b/kdecore/tests/testqtargs.cpp
@@ -5,7 +5,7 @@
g++ -g -Wall -o testqtargs testqtargs.cpp -I/usr/X11R6/include \
-I/opt/qt3/include -I/opt/trinity/include -L/usr/X11R6/lib -L/opt/qt3/lib \
- -L/opt/trinity/lib -lqt -lkdecore
+ -L/opt/trinity/lib -lqt -ltdecore
if invoked like this ./testqtargs --bg blue --caption something --hello hi
@@ -28,7 +28,7 @@
--bg is aliased to --background but If you try it with --background or
-background, you get the same thing.
- in kdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used
+ in tdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used
by the static method Kapplication::addCmdLineOptions to add the Qt options
but its' entries look like this: