summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am.in2
-rwxr-xr-xdcop/dcopidlng/dcopidlng2
-rw-r--r--kconf_update/README.kconf_update2
-rw-r--r--kdoctools/move_kio_help_cache.sh4
-rw-r--r--tdecore/CMakeLists.txt8
-rw-r--r--tdecore/Makefile.am6
-rw-r--r--tdecore/configure.in.in2
-rw-r--r--tdecore/tde-config.cpp.cmake (renamed from tdecore/kde-config.cpp.cmake)4
-rw-r--r--tdecore/tde-config.cpp.in (renamed from tdecore/kde-config.cpp.in)4
9 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am.in b/Makefile.am.in
index c537e0c3..5690f976 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -53,7 +53,7 @@ messages:
find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
- echo ./tdecore/kde-config.cpp.in >> files ;\
+ echo ./tdecore/tde-config.cpp.in >> files ;\
$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
: > kde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
diff --git a/dcop/dcopidlng/dcopidlng b/dcop/dcopidlng/dcopidlng
index 92ff412a..5a4f2b40 100755
--- a/dcop/dcopidlng/dcopidlng
+++ b/dcop/dcopidlng/dcopidlng
@@ -4,7 +4,7 @@ tmpfile=`mktemp -t dcopidlng.XXXXXX` || { echo "$0: Cannot create temporary file
trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
if test -z "$KDECONFIG"; then
- KDECONFIG=kde-config
+ KDECONFIG=tde-config
fi
LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> $tmpfile
diff --git a/kconf_update/README.kconf_update b/kconf_update/README.kconf_update
index 385f3185..32c087c0 100644
--- a/kconf_update/README.kconf_update
+++ b/kconf_update/README.kconf_update
@@ -87,7 +87,7 @@ and use Qt's powerful string API instead.
A workaround for KDE 3.1.x and older is to install a .sh script in
$(kde_datadir) that contains a simple exec:
- exec "`kde-config --prefix`/bin/kconf_update_bin/my_update_app"
+ exec "`tde-config --prefix`/bin/kconf_update_bin/my_update_app"
This is equivalent to what KDE 3.2 can do directly, but of course the .upd
file now points to the .sh script instead of the binary application.
diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh
index 671a7398..c31331c9 100644
--- a/kdoctools/move_kio_help_cache.sh
+++ b/kdoctools/move_kio_help_cache.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-bas=`kde-config --localprefix`share/apps/kio_help
-mv "$bas/cache" "`kde-config --path cache`kio_help"
+bas=`tde-config --localprefix`share/apps/kio_help
+mv "$bas/cache" "`tde-config --path cache`kio_help"
rmdir "$bas"
exit 0
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 1409c6cd..d5dbf8f9 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -177,14 +177,14 @@ tde_add_library( ${target} SHARED
)
-##### kde-config ################################
+##### tde-config ################################
# FIXME still need some research and improvements
-configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY )
+configure_file( tde-config.cpp.cmake tde-config.cpp @ONLY )
-tde_add_executable( kde-config
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp
+tde_add_executable( tde-config
+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/tde-config.cpp
LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index 976307eb..f8856108 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -168,9 +168,9 @@ kcharsets.lo: kentities.c
parser: kentities.gperf
cd $(srcdir) && gperf -a -L "ANSI-C" -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity -Wwordlist_Entity -s 2 kentities.gperf > kentities.c
-bin_PROGRAMS = kde-config kgrantpty
+bin_PROGRAMS = tde-config kgrantpty
-kde_config_SOURCES = kde-config.cpp
+kde_config_SOURCES = tde-config.cpp
kde_config_LDADD = ./libtdecore.la
kde_config_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS)
@@ -186,7 +186,7 @@ install-exec-hook:
@echo "This is needed for konsole, etc. to ensure that they can't be eavesdropped."
@echo ""
-DISTCLEANFILES = kde-config.cpp
+DISTCLEANFILES = tde-config.cpp
DOXYGEN_REFERENCES = dcop tdeui kparts kio
DOXYGEN_EXCLUDE = malloc kde_file.h
diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in
index 7439a7c1..ce957c92 100644
--- a/tdecore/configure.in.in
+++ b/tdecore/configure.in.in
@@ -167,7 +167,7 @@ AC_TRY_LINK(dnl
AC_CHECK_HEADERS(sys/mount.h)
-dnl AC_OUTPUT(tdecore/kde-config.cpp)
+dnl AC_OUTPUT(tdecore/tde-config.cpp)
AM_CONFIG_HEADER(tdecore/kdemacros.h)
diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 8b3dd7af..6716a24f 100644
--- a/tdecore/kde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KAboutData about("kde-config", "kde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
+ KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
KCmdLineArgs::init( argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- KInstance a("kde-config");
+ KInstance a("tde-config");
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();
diff --git a/tdecore/kde-config.cpp.in b/tdecore/tde-config.cpp.in
index 0fdf56e3..e5ee257c 100644
--- a/tdecore/kde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -114,12 +114,12 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
- KAboutData about("kde-config", "kde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
+ KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
KCmdLineArgs::init( argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
- KInstance a("kde-config");
+ KInstance a("tde-config");
(void)KGlobal::dirs(); // trigger the creation
(void)KGlobal::config();