diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ChangeLog.original | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | kmymoney2/Makefile.am | 2 | ||||
| -rw-r--r-- | kmymoney2/kmymoney2.cpp | 2 | ||||
| -rw-r--r-- | kmymoney2/widgets/kmymoneyedit.cpp | 2 | ||||
| -rw-r--r-- | libkgpgfile/Makefile.am | 2 |
7 files changed, 19 insertions, 19 deletions
@@ -4167,7 +4167,7 @@ * Switched to dblatex for PDF file generation 2006-09-09 Thomas Baumgart <ipwizard@users.sourceforge.net> - * Added -lkdeui to the link phase of the kbanking plugin (was missing) + * Added -ltdeui to the link phase of the kbanking plugin (was missing) 2006-09-06 Thomas Baumgart <ipwizard@users.sourceforge.net> * Removed old html documentation files diff --git a/ChangeLog.original b/ChangeLog.original index b78d043..4de1291 100644 --- a/ChangeLog.original +++ b/ChangeLog.original @@ -123,7 +123,7 @@ When I try using the KFileDialog under KDE 1.1.2 it complains that dcopserver isn't running and then load the server. When the program is finished I have - to manually kill dcopserver (and kdeinit) so I can get control back to + to manually kill dcopserver (and tdeinit) so I can get control back to KDevelop. By having the hard link to /home/mte/kmymoney2.kmy I can circumnavigate the diff --git a/acinclude.m4 b/acinclude.m4 index 0e1f191..8695a21 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 @@ -2064,12 +2064,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") @@ -2078,9 +2078,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") @@ -2089,8 +2089,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") @@ -2099,10 +2099,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)") @@ -2489,7 +2489,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/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index 1e39e16..2bfb0df 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog METASOURCES = AUTO # the library search path. -kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) +kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index 67c4984..4e03477 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -4263,7 +4263,7 @@ void KMyMoney2App::slotKDELanguageSettings(void) TQString error; int pid; - KApplication::kdeinitExec("kcmshell", args, &error, &pid); + KApplication::tdeinitExec("kcmshell", args, &error, &pid); } void KMyMoney2App::slotNewFeature(void) diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index b9e3ace..2cbb6b3 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -54,7 +54,7 @@ kMyMoneyMoneyValidator::kMyMoneyMoneyValidator( double bottom, double top, int d } /* - * The code of the following function is taken from kdeui/knumvalidator.cpp + * The code of the following function is taken from tdeui/knumvalidator.cpp * and adjusted to always use the monetary symbols defined in the KDE control center */ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p ) const diff --git a/libkgpgfile/Makefile.am b/libkgpgfile/Makefile.am index 40880e2..a0bf7b3 100644 --- a/libkgpgfile/Makefile.am +++ b/libkgpgfile/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libkgpgfile.la libkgpgfile_la_SOURCES = kgpgfile.cpp -libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #libkgpgfile_la_LIBADD = $(top_builddir)/libtdepim/libtdepim.la instdir=$(includedir)/kmymoney |