summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-11-06 02:18:06 -0600
committerTimothy Pearson <[email protected]>2011-11-06 02:18:06 -0600
commit0f66b4578769837328f2c6313ce09e1e04836e4a (patch)
tree4e7af809c03757d39d34b44c831f4385a2f0a724
parentc2c048ca449b4b96ab540bf3e1db853490991d51 (diff)
downloaddolphin-0f66b4578769837328f2c6313ce09e1e04836e4a.tar.gz
dolphin-0f66b4578769837328f2c6313ce09e1e04836e4a.zip
Additional kde to tde renaming
-rw-r--r--acinclude.m426
-rw-r--r--d3lphin.kdevelop2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/servicemenus/d3lphin_su.desktop2
-rw-r--r--src/servicemenus/edit_as_root.desktop2
-rw-r--r--src/servicemenus/run_as_root.desktop2
6 files changed, 18 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 1e36955..f095c3a 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/d3lphin.kdevelop b/d3lphin.kdevelop
index d9505b2..1bac687 100644
--- a/d3lphin.kdevelop
+++ b/d3lphin.kdevelop
@@ -56,7 +56,7 @@
<globalcwd/>
<useglobalprogram>false</useglobalprogram>
<autoinstall>false</autoinstall>
- <autokdesu>false</autokdesu>
+ <autotdesu>false</autotdesu>
<runarguments>
<d3lphin/>
</runarguments>
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a81218..c146559 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = d3lphin
INCLUDES = $(all_includes)
# the library search path.
-d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against.
d3lphin_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lkonq
diff --git a/src/servicemenus/d3lphin_su.desktop b/src/servicemenus/d3lphin_su.desktop
index ea6cb55..f0e2e4c 100644
--- a/src/servicemenus/d3lphin_su.desktop
+++ b/src/servicemenus/d3lphin_su.desktop
@@ -8,4 +8,4 @@ Name=Open as Root
Name[de]=Öffne als Root
Name[ru]=Открыть под root
Icon=d3lphin
-Exec=kdesu -c "d3lphin '%U'"
+Exec=tdesu -c "d3lphin '%U'"
diff --git a/src/servicemenus/edit_as_root.desktop b/src/servicemenus/edit_as_root.desktop
index 049454e..e3df170 100644
--- a/src/servicemenus/edit_as_root.desktop
+++ b/src/servicemenus/edit_as_root.desktop
@@ -9,4 +9,4 @@ Name[fr]=Editer en tant que Root
Name[es]=Editar como Root
Name[de]=Als root bearbeiten
Icon=kfm
-Exec=kdesu "kwrite" "%U"
+Exec=tdesu "kwrite" "%U"
diff --git a/src/servicemenus/run_as_root.desktop b/src/servicemenus/run_as_root.desktop
index 6ba05c0..d6107ab 100644
--- a/src/servicemenus/run_as_root.desktop
+++ b/src/servicemenus/run_as_root.desktop
@@ -14,4 +14,4 @@ Name[pt_br]=Executar como Root
Name[it]=Esegui come Root
Name[pl]=Uruchom jako root
Icon=kfm
-Exec=kdesu -c
+Exec=tdesu -c