diff options
| -rw-r--r-- | acinclude.m4 | 22 | ||||
| -rw-r--r-- | bibletime/Makefile.am | 2 | ||||
| -rw-r--r-- | bibletime/frontend/cbtconfig.cpp | 2 | ||||
| -rw-r--r-- | bibletime/frontend/coptionsdialog.cpp | 4 | ||||
| -rw-r--r-- | bibletime/frontend/cprinter.cpp | 4 | ||||
| -rw-r--r-- | bibletime/frontend/display/chtmlreaddisplay.cpp | 16 | ||||
| -rw-r--r-- | bibletime/frontend/display/chtmlreaddisplay.h | 12 |
7 files changed, 31 insertions, 31 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e745546..1be07a7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2071,15 +2071,15 @@ 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") - 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") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2087,13 +2087,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)") @@ -2548,7 +2548,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/bibletime/Makefile.am b/bibletime/Makefile.am index ac6795c..42d5d44 100644 --- a/bibletime/Makefile.am +++ b/bibletime/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) # them while "make clean", use CLEANFILES DISTCLEANFILES = $(bibletime_METASOURCES) diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp index b0f4257..1de0448 100644 --- a/bibletime/frontend/cbtconfig.cpp +++ b/bibletime/frontend/cbtconfig.cpp @@ -39,7 +39,7 @@ #include <kaccel.h> #include <kstaticdeleter.h> -#include <khtml_settings.h> +#include <tdehtml_settings.h> //Sword includes #include <versekey.h> diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp index c5a5a7c..2c5905a 100644 --- a/bibletime/frontend/coptionsdialog.cpp +++ b/bibletime/frontend/coptionsdialog.cpp @@ -53,8 +53,8 @@ #include <kglobal.h> #include <kstandarddirs.h> #include <kkeydialog.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <ktabctl.h> #include <kapp.h> diff --git a/bibletime/frontend/cprinter.cpp b/bibletime/frontend/cprinter.cpp index 23df40b..84ef2e0 100644 --- a/bibletime/frontend/cprinter.cpp +++ b/bibletime/frontend/cprinter.cpp @@ -16,8 +16,8 @@ #include "backend/cswordversekey.h" //KDE includes -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> /* Class: CPrinter */ diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp index 2ff1b0a..1e93446 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.cpp +++ b/bibletime/frontend/display/chtmlreaddisplay.cpp @@ -42,9 +42,9 @@ //KDE includes #include <kapplication.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kglobalsettings.h> -#include <khtml_events.h> +#include <tdehtml_events.h> #include <dom/dom2_range.h> #include <dom/html_element.h> @@ -245,8 +245,8 @@ void CHTMLReadDisplay::urlSelected( const TQString& url, int button, int state, } /** Reimplementation. */ -void CHTMLReadDisplay::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ) { - KHTMLPart::khtmlMouseReleaseEvent(event); +void CHTMLReadDisplay::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent* event ) { + KHTMLPart::tdehtmlMouseReleaseEvent(event); m_dndData.mousePressed = false; m_dndData.isDragging = false; @@ -262,7 +262,7 @@ void CHTMLReadDisplay::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ) } } -void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) { +void CHTMLReadDisplay::tdehtmlMousePressEvent( tdehtml::MousePressEvent* event ) { m_dndData.node = DOM::Node(); m_dndData.anchor = DOM::DOMString(); m_dndData.mousePressed = false; @@ -300,11 +300,11 @@ void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) { } } - KHTMLPart::khtmlMousePressEvent(event); + KHTMLPart::tdehtmlMousePressEvent(event); } /** Reimplementation for our drag&drop system. Also needed for the mouse tracking */ -void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { +void CHTMLReadDisplay::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent* e ) { if( e->qmouseEvent()->state() & Qt::LeftButton == Qt::LeftButton) { //left mouse button pressed const int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = TQPoint(e->x(), e->y()); @@ -362,7 +362,7 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { } } - KHTMLPart::khtmlMouseMoveEvent(e); + KHTMLPart::tdehtmlMouseMoveEvent(e); } /** The Mag window update happens here if the mouse has not moved to another node after starting the timer.*/ diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h index 8b9a5c8..09aca7d 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.h +++ b/bibletime/frontend/display/chtmlreaddisplay.h @@ -21,9 +21,9 @@ #include <tqwidget.h> //KDE includes -#include <khtml_part.h> -#include <khtmlview.h> -#include <kparts/browserextension.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> +#include <tdeparts/browserextension.h> class CHTMLReadDisplayView; @@ -68,9 +68,9 @@ protected: /** * Reimplementation. */ - virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ); - virtual void khtmlMousePressEvent( khtml::MousePressEvent* event ); - virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent* event ); + virtual void tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent* event ); + virtual void tdehtmlMousePressEvent( tdehtml::MousePressEvent* event ); + virtual void tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent* event ); virtual void timerEvent(TQTimerEvent *event); |