diff --git a/BibleTime.kdevelop b/BibleTime.kdevelop index f6d82ee..7551f4b 100644 --- a/BibleTime.kdevelop +++ b/BibleTime.kdevelop @@ -38,7 +38,7 @@ /home/jansorg/Projekte/BibleTime/bibletime false false - false + false diff --git a/acinclude.m4 b/acinclude.m4 index e86b1c3..7e681ba 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 @@ -2064,8 +2064,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_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2074,9 +2074,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") @@ -2084,8 +2084,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") @@ -2094,10 +2094,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)") @@ -2484,7 +2484,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/bibletime/Makefile.am b/bibletime/Makefile.am index 19c56d1..7a827df 100644 --- a/bibletime/Makefile.am +++ b/bibletime/Makefile.am @@ -15,7 +15,7 @@ bibletime_LDADD = \ $(LIB_QT) \ $(LIB_KDECORE) \ $(LIB_KDEUI) \ --lkdeprint \ +-ltdeprint \ $(LIB_KFILE) \ $(LIB_KHTML) \ $(LIB_X11) \ @@ -54,7 +54,7 @@ bin_PROGRAMS = bibletime bibletime_METASOURCES = AUTO # the library search path. -bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) # them while "make clean", use CLEANFILES DISTCLEANFILES = $(bibletime_METASOURCES) diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp index ba72c50..429940c 100644 --- a/bibletime/frontend/btinstallmgr.cpp +++ b/bibletime/frontend/btinstallmgr.cpp @@ -114,9 +114,9 @@ namespace BookshelfManager { } conf.Save(); - if (!directAccess) { //use kdesu to move the file to the right place + if (!directAccess) { //use tdesu to move the file to the right place KProcess *proc = new KProcess; - *proc << "kdesu"; + *proc << "tdesu"; *proc << TQString::tqfromLatin1("-c") << TQString("mv %1 %2").tqarg(filename).tqarg(LocalConfig::swordConfigFilename()); proc->start(KProcess::Block); }