diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /kdict | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdict')
| -rw-r--r-- | kdict/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdict/applet/Makefile.am | 2 | ||||
| -rw-r--r-- | kdict/queryview.cpp | 8 | ||||
| -rw-r--r-- | kdict/queryview.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kdict/CMakeLists.txt b/kdict/CMakeLists.txt index 190f17c8..d699394b 100644 --- a/kdict/CMakeLists.txt +++ b/kdict/CMakeLists.txt @@ -39,5 +39,5 @@ tde_add_tdeinit_executable( kdict AUTOMOC SOURCES dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp - LINK khtml-shared pthread + LINK tdehtml-shared pthread ) diff --git a/kdict/applet/Makefile.am b/kdict/applet/Makefile.am index b22e5e3f..c89bb493 100644 --- a/kdict/applet/Makefile.am +++ b/kdict/applet/Makefile.am @@ -12,7 +12,7 @@ lnk_DATA = kdictapplet.desktop EXTRA_DIST = $(lnk_DATA) -kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdict_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) messages: rc.cpp diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index a17bfeaa..5b2303c8 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -25,8 +25,8 @@ #include <kpopupmenu.h> #include <kmessagebox.h> #include <klocale.h> -#include <khtml_events.h> -#include <khtmlview.h> +#include <tdehtml_events.h> +#include <tdehtmlview.h> #include "actions.h" #include "options.h" @@ -118,12 +118,12 @@ DictHTMLPart::~DictHTMLPart() {} -void DictHTMLPart::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event) +void DictHTMLPart::tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event) { if (event->qmouseEvent()->button()==Qt::MidButton) emit(middleButtonClicked()); else - KHTMLPart::khtmlMouseReleaseEvent(event); + KHTMLPart::tdehtmlMouseReleaseEvent(event); } diff --git a/kdict/queryview.h b/kdict/queryview.h index 766efaf7..ddce43de 100644 --- a/kdict/queryview.h +++ b/kdict/queryview.h @@ -20,7 +20,7 @@ #define _QUERYVIEW_H_ #include <tqvbox.h> -#include <khtml_part.h> +#include <tdehtml_part.h> class TQFile; class KTempFile; @@ -89,7 +89,7 @@ signals: protected: - virtual void khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *event); + virtual void tdehtmlMouseReleaseEvent(tdehtml::MouseReleaseEvent *event); }; |