summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--acinclude.m424
-rw-r--r--aclocal.m424
-rw-r--r--kiosktool/Makefile.am6
-rw-r--r--kiosktool/componentPage.cpp4
-rw-r--r--kiosktool/kioskrun.cpp20
-rw-r--r--po/lt/kiosktool.po8
7 files changed, 44 insertions, 44 deletions
diff --git a/ChangeLog b/ChangeLog
index 563ed91..599193d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,7 @@
* Release of v0.3
* Fix grave problem of kiosktool terminating
- kdeinit/klauncher of the main session. (BR80436)
+ tdeinit/klauncher of the main session. (BR80436)
2004-04-28 Waldo Bastian <bastian@kde.org>
diff --git a/acinclude.m4 b/acinclude.m4
index bbd0d53..299e204 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -2027,8 +2027,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
@@ -2036,16 +2036,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-lkdepim")
+ AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2054,10 +2054,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+ AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2431,7 +2431,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+ AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
diff --git a/aclocal.m4 b/aclocal.m4
index 0de2c45..539b9c3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -383,7 +383,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@@ -717,7 +717,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -2039,8 +2039,8 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
@@ -2048,16 +2048,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-lkdepim")
+ AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2066,10 +2066,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+ AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2443,7 +2443,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+ AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
diff --git a/kiosktool/Makefile.am b/kiosktool/Makefile.am
index 34a3c9d..ca6fb6b 100644
--- a/kiosktool/Makefile.am
+++ b/kiosktool/Makefile.am
@@ -12,10 +12,10 @@ bin_PROGRAMS = kiosktool kiosktool-kdedirs
INCLUDES = $(all_includes)
# the library search path.
-kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kiosktool_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against.
-kiosktool_LDADD = $(LIB_KFILE) -lkdeprint
+kiosktool_LDADD = $(LIB_KFILE) -ltdeprint
# which sources should be compiled for kiosktool
kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
@@ -32,7 +32,7 @@ kiosktool_SOURCES = main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
kiosksync.cpp
# the library search path.
-kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against.
kiosktool_kdedirs_LDADD = $(LIB_KDECORE)
diff --git a/kiosktool/componentPage.cpp b/kiosktool/componentPage.cpp
index 3f7e3a7..0b519e0 100644
--- a/kiosktool/componentPage.cpp
+++ b/kiosktool/componentPage.cpp
@@ -204,7 +204,7 @@ void ComponentPage::slotSetupDone()
KioskRun::self()->flushConfigCache();
if (m_data->setup.hasOption("restart"))
- KApplication::kdeinitExec(m_data->setup.exec);
+ KApplication::tdeinitExec(m_data->setup.exec);
}
void ComponentPage::slotSetupAppRegistered( const TQCString &appid)
@@ -288,7 +288,7 @@ void ComponentPage::slotPreviewDone()
delete m_process;
m_process = 0;
if (m_data->preview.hasOption("restart"))
- KApplication::kdeinitExec(m_data->preview.exec);
+ KApplication::tdeinitExec(m_data->preview.exec);
}
void ComponentPage::slotShowAction(TQListViewItem *item)
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index bdf7353..7e96004 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -672,7 +672,7 @@ KioskRun::makeMutable(bool bMutable)
config->writeEntry("kiosk_exception", TQString());
}
}
- // Propagate to kdeinit
+ // Propagate to tdeinit
dcopRef("klauncher", "klauncher").call("setLaunchEnv",
TQCString("KDE_KIOSK_NO_RESTRICTIONS"), TQCString(m_noRestrictions ? "true" : ""));
@@ -759,15 +759,15 @@ KioskRun::setupRuntimeEnv()
TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver";
- KProcess kdeinit;
+ KProcess tdeinit;
- applyEnvironment(&kdeinit);
+ applyEnvironment(&tdeinit);
- kdeinit << "kdeinit";
+ tdeinit << "tdeinit";
- connect(&kdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished()));
+ connect(&tdeinit, TQT_SIGNAL(processExited(KProcess *)), &dlg, TQT_SLOT(slotFinished()));
- kdeinit.start(KProcess::NotifyOnExit);
+ tdeinit.start(KProcess::NotifyOnExit);
dlg.exec();
@@ -811,12 +811,12 @@ KioskRun::shutdownRuntimeEnv()
delete m_dcopClient;
m_dcopClient = 0;
- KProcess kdeinit;
- applyEnvironment(&kdeinit);
+ KProcess tdeinit;
+ applyEnvironment(&tdeinit);
- kdeinit << "kdeinit_shutdown";
+ tdeinit << "tdeinit_shutdown";
- kdeinit.start(KProcess::Block);
+ tdeinit.start(KProcess::Block);
KProcess dcopserver;
applyEnvironment(&dcopserver);
diff --git a/po/lt/kiosktool.po b/po/lt/kiosktool.po
index 1042743..b80ce25 100644
--- a/po/lt/kiosktool.po
+++ b/po/lt/kiosktool.po
@@ -551,7 +551,7 @@ msgstr ""
"Bendra\n"
"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n"
"Bendros\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Bendros\n"
"#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n"
"Bendra\n"
@@ -1276,7 +1276,7 @@ msgstr ""
"&Pridėti\n"
"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n"
"&Pridėti\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"&Pridėti\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"&Pridėti\n"
@@ -1354,7 +1354,7 @@ msgid "&Abort"
msgstr ""
"#-#-#-#-# kdat.po (kdat) #-#-#-#-#\n"
"&Atšaukti\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"&Nutraukti"
#: kioskrun.cpp:946
@@ -1633,7 +1633,7 @@ msgstr ""
"Aprašymas\n"
"#-#-#-#-# kfile_png.po (kfile_png) #-#-#-#-#\n"
"Aprašymas\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Aprašymas:\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"Aprašymas:\n"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 02:10:38 +0000