Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tellico

acinclude.m4

@@ -2080,16 +2080,16 @@ 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_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   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")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2097,13 +2097,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_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2552,7 +2552,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
@@ -3494,7 +3494,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 

configure.in.in

@@ -341,7 +341,7 @@ AC_LANG_RESTORE
 
 if test x$kcal = xyes; then
     AC_DEFINE(HAVE_KCAL, 1, [Define to 1 if you have libkcal])
-    KCAL_LIBS="-lkcal -lkresources"
+    KCAL_LIBS="-lkcal -ltderesources"
 else
     KCAL_LIBS=
 fi

src/Makefile.am

@@ -122,7 +122,7 @@ KDE_OPTIONS = noautodist
 CLEANFILES = *~ *.loT
 
 # the library search path.
-tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
 
 uidir = $(kde_datadir)/tellico
 ui_DATA = tellicoui.rc

src/configdialog.cpp

@@ -39,7 +39,7 @@
 #include <kiconloader.h>
 #include <ksortablevaluelist.h>
 #include <kaccelmanager.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kfiledialog.h>
 #include <kinputdialog.h>
 #include <kfontcombo.h>

src/entryview.cpp

@@ -30,7 +30,7 @@
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kmessagebox.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <dom/dom_element.h>
 #include <kapplication.h>
 #include <ktempfile.h>
@@ -253,7 +253,7 @@ void EntryView::setXSLTFile(const TQString& file_) {
     return;
   }
 
-  // now, have to recreate images and refresh khtml cache
+  // now, have to recreate images and refresh tdehtml cache
   resetColors();
 }
 

src/entryview.h

@@ -19,7 +19,7 @@ class KTempFile;
 
 #include "datavectors.h"
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include <tqguardedptr.h>
 

src/fetchdialog.cpp

@@ -32,7 +32,7 @@
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kstatusbar.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kprogress.h>
 #include <kconfig.h>
 #include <kdialogbase.h>

src/filterdialog.cpp

@@ -25,7 +25,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 #include <kiconloader.h>
 

src/gui/lineedit.cpp

@@ -15,7 +15,7 @@
 
 #include <kstdaction.h>
 #include <kactioncollection.h>
-#include <kspell.h>
+#include <tdespell.h>
 
 #include <tqapplication.h>
 #include <tqpainter.h>

src/gui/previewdialog.cpp

@@ -18,7 +18,7 @@
 
 #include <klocale.h>
 #include <ktempdir.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 
 using Tellico::GUI::PreviewDialog;
 

src/mainwindow.cpp

@@ -66,7 +66,7 @@
 #include <twin.h>
 #include <kprogress.h>
 #include <kprinter.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
@@ -1707,7 +1707,7 @@ void MainWindow::doPrint(const TQString& html_) {
 // the problem with doing my own layout is that the text gets truncated, both at the
 // top and at the bottom. Even adding the overlap parameter, there were problems.
 // KHTMLView takes care of that with a truncatedAt() parameter, but that's hidden in
-// the khtml::render_root class. So for now, just use the KHTMLView::print() method.
+// the tdehtml::render_root class. So for now, just use the KHTMLView::print() method.
 #if 1
   w.view()->print();
 #else

src/reportdialog.cpp

@@ -25,8 +25,8 @@
 #include "core/tellico_config.h"
 
 #include <klocale.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kapplication.h>

src/viewstack.cpp

@@ -17,7 +17,7 @@
 #include "tellico_debug.h"
 #include "imagefactory.h"
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 
 #include <tqwhatsthis.h>

xslt/entry-templates/Video.xsl

@@ -125,7 +125,7 @@
         background: <xsl:value-of select="$color2"/>;
         text-align: center;
    }
-  /* there seems to be a khtml bug, in 3.4.x at least, repeat-x doesn't
+  /* there seems to be a tdehtml bug, in 3.4.x at least, repeat-x doesn't
      work on the tr element, so have to put it on the th element */
    tr.category th {
         background-image: url(<xsl:value-of select="concat($imgdir, 'gradient_header.png')"/>);