summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:18:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:18:26 -0600
commit8317f65d8e197770560eace3d78ff41f72162edc (patch)
tree4beeba14bf9510aa620131947da0bc45bf754ca4
parent5994021c483a1ab132d0b02ac8d23f9b443d4bb7 (diff)
downloadk3b-8317f65d8e197770560eace3d78ff41f72162edc.tar.gz
k3b-8317f65d8e197770560eace3d78ff41f72162edc.zip
Additional kde to tde renaming
-rw-r--r--FAQ2
-rw-r--r--acinclude.m426
-rw-r--r--configure.in2
-rw-r--r--k3bsetup/k3bsetup4
-rw-r--r--kioslaves/videodvd/Makefile.am2
-rw-r--r--plugins/project/audiometainforenamer/Makefile.am2
-rw-r--r--plugins/project/audioprojectcddb/Makefile.am2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/fastscale/configure.in.in2
-rw-r--r--src/k3b.cpp4
-rw-r--r--src/k3bsystemproblemdialog.cpp2
11 files changed, 26 insertions, 26 deletions
diff --git a/FAQ b/FAQ
index 8e3e60c..b97064e 100644
--- a/FAQ
+++ b/FAQ
@@ -30,7 +30,7 @@ A: You need to install NAS.
Q: Where can I find K3bSetup2?
A: K3bSetup2 is a KControlCenter Module. You can find it in the System Administration section or start
- it manually with "kdesu kcmshell k3bsetup2".
+ it manually with "tdesu kcmshell k3bsetup2".
There also is a script since K3b 0.11 called k3bsetup.
diff --git a/acinclude.m4 b/acinclude.m4
index 79f19b2..5861e34 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)
@@ -710,7 +710,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
@@ -2088,12 +2088,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
case $host in
- *cygwin*) lib_kded="-lkdeinit_kded" ;;
+ *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
- 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_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2102,9 +2102,9 @@ 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")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2113,8 +2113,8 @@ if test $kde_qtver = 3; then
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")
@@ -2123,10 +2123,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)")
@@ -2513,7 +2513,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/configure.in b/configure.in
index eb14893..4d2dfc6 100644
--- a/configure.in
+++ b/configure.in
@@ -889,7 +889,7 @@ dnl =======================================================
#
AM_PROG_AS
-# MMX test duped from kdelibs/kdefx - it should be probably moved to admin/
+# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/
dnl -----------------------------------------------------
dnl IA32 checks
dnl -----------------------------------------------------
diff --git a/k3bsetup/k3bsetup b/k3bsetup/k3bsetup
index 0851430..9a85ccd 100644
--- a/k3bsetup/k3bsetup
+++ b/k3bsetup/k3bsetup
@@ -15,6 +15,6 @@
#!/usr/bin/sh
-#TODO: if kdesu not found and not currently root use kdialog to display an error message
+#TODO: if tdesu not found and not currently root use kdialog to display an error message
-kdesu kcmshell k3bsetup2
+tdesu kcmshell k3bsetup2
diff --git a/kioslaves/videodvd/Makefile.am b/kioslaves/videodvd/Makefile.am
index ca4f814..eccc0e9 100644
--- a/kioslaves/videodvd/Makefile.am
+++ b/kioslaves/videodvd/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kio_videodvd.la
kio_videodvd_la_SOURCES = videodvd.cpp
kio_videodvd_la_LIBADD = -lkio ../../libk3b/libk3b.la
-kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lkio -lkdecore -L../../libk3bdevice/.libs -lk3bdevice
+kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lkio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice
protocol_DATA = videodvd.protocol
protocoldir = $(kde_servicesdir)
diff --git a/plugins/project/audiometainforenamer/Makefile.am b/plugins/project/audiometainforenamer/Makefile.am
index bf46409..5a10957 100644
--- a/plugins/project/audiometainforenamer/Makefile.am
+++ b/plugins/project/audiometainforenamer/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libk3baudiometainforenamerplugin.la
libk3baudiometainforenamerplugin_la_SOURCES = k3baudiometainforenamerplugin.cpp
libk3baudiometainforenamerplugin_la_LIBADD = ../../../libk3b/libk3b.la
-libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkio -lkdecore -lkdeui -L../../../libk3bdevice/.libs -lk3bdevice
+libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice
pluginsdir = $(kde_datadir)/k3b/plugins
plugins_DATA = k3baudiometainforenamerplugin.plugin
diff --git a/plugins/project/audioprojectcddb/Makefile.am b/plugins/project/audioprojectcddb/Makefile.am
index 1366f3f..258023f 100644
--- a/plugins/project/audioprojectcddb/Makefile.am
+++ b/plugins/project/audioprojectcddb/Makefile.am
@@ -14,7 +14,7 @@ libk3baudioprojectcddbplugin_la_SOURCES = k3baudioprojectcddbplugin.cpp
libk3baudioprojectcddbplugin_la_LIBADD = ../../../libk3b/libk3b.la
-libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkio -lkdecore -lkdeui -L../../../libk3bdevice/.libs -lk3bdevice
+libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice
pluginsdir = $(kde_datadir)/k3b/plugins
plugins_DATA = k3baudioprojectcddbplugin.plugin
diff --git a/src/Makefile.am b/src/Makefile.am
index 37c0c67..7677258 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ k3b_SOURCES = k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp \
k3b_LDADD = ./option/liboption.la ./rip/librip.la \
./projects/libprojects.la ../libk3bdevice/libk3bdevice.la \
../libk3b/libk3b.la ./misc/libmisc.la ./fastscale/libfastscale.la \
- -lkdefx -lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
+ -ltdefx -lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
@@ -74,7 +74,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libk3b/tools \
METASOURCES = AUTO
# the library search path.
-k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
rcdir = $(kde_datadir)/k3b
rc_DATA = k3bui.rc eventsrc tips
diff --git a/src/fastscale/configure.in.in b/src/fastscale/configure.in.in
index a1a5f28..287e4e9 100644
--- a/src/fastscale/configure.in.in
+++ b/src/fastscale/configure.in.in
@@ -3,7 +3,7 @@
#
AM_PROG_AS
-# MMX test duped from kdelibs/kdefx - it should be probably moved to admin/
+# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/
dnl -----------------------------------------------------
dnl IA32 checks
dnl -----------------------------------------------------
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 33fa52a..40ea871 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -1291,9 +1291,9 @@ void K3bMainWindow::slotProjectAddFiles()
void K3bMainWindow::slotK3bSetup()
{
KProcess p;
- p << "kdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language();
+ p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language();
if( !p.start( KProcess::DontCare ) )
- KMessageBox::error( 0, i18n("Could not find kdesu to run K3bSetup with root privileges. "
+ KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. "
"Please run it manually as root.") );
}
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 75a9f58..a7575f0 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -608,7 +608,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
void K3bSystemProblemDialog::slotK3bSetup()
{
KProcess p;
- p << "kdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language();
+ p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language();
if( !p.start( KProcess::DontCare ) )
KMessageBox::error( 0, i18n("Unable to start K3bSetup2.") );
}