diff options
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | k9author/k9importfiles.h | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/k9copy.cpp | 4 | ||||
| -rw-r--r-- | src/k9copy.h | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 255ec52..ccfe24d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2014,11 +2014,11 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") @@ -2027,13 +2027,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2450,7 +2450,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then diff --git a/k9author/k9importfiles.h b/k9author/k9importfiles.h index 8b28676..c310643 100644 --- a/k9author/k9importfiles.h +++ b/k9author/k9importfiles.h @@ -15,9 +15,9 @@ #include "k9common.h" #include <tqobject.h> -#include <kmdidefines.h> -#include <kmdichildarea.h> -#include <kmdimainfrm.h> +#include <tdemdidefines.h> +#include <tdemdichildarea.h> +#include <tdemdimainfrm.h> /** @author Jean-Michel PETIT <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 4e49b22..e6cf850 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,12 +30,12 @@ k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \ kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ titlefactor.ui viewmpeg2.ui -k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ - $(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -lkmdi $(LIBDL) + $(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -ltdemdi $(LIBDL) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/src/k9copy.cpp b/src/k9copy.cpp index 8d0cc7a..cca96d5 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -21,8 +21,8 @@ #include <kaction.h> #include <kstdaction.h> #include <kdockwidget.h> -#include <kmdidefines.h> -#include <kmdichildarea.h> +#include <tdemdidefines.h> +#include <tdemdichildarea.h> #include <tqframe.h> #include <kkeydialog.h> #include <kedittoolbar.h> diff --git a/src/k9copy.h b/src/k9copy.h index c72bdda..4e33d8d 100644 --- a/src/k9copy.h +++ b/src/k9copy.h @@ -21,7 +21,7 @@ #include "k9common.h" #include "k9cddrive.h" #include <kapplication.h> -#include <kmdimainfrm.h> +#include <tdemdimainfrm.h> enum eStatusBarId {sbMessage=0,sbFactor=1}; |