diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:07:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:07:13 -0600 |
| commit | ea67b42ac8b1bf8cf1bc6f1bf1c5271120021029 (patch) | |
| tree | d9cea5f4cdcbe45bb2f5c80b4f7424cf81f7c2e3 /amarok/src/konquisidebar | |
| parent | f6d535927fe307583a49286033e26444d6e8ff0d (diff) | |
| download | amarok-ea67b42ac8b1bf8cf1bc6f1bf1c5271120021029.tar.gz amarok-ea67b42ac8b1bf8cf1bc6f1bf1c5271120021029.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'amarok/src/konquisidebar')
| -rw-r--r-- | amarok/src/konquisidebar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | amarok/src/konquisidebar/universalamarok.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/konquisidebar/universalamarok.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/amarok/src/konquisidebar/CMakeLists.txt b/amarok/src/konquisidebar/CMakeLists.txt index 782d2511..c819b7fb 100644 --- a/amarok/src/konquisidebar/CMakeLists.txt +++ b/amarok/src/konquisidebar/CMakeLists.txt @@ -35,6 +35,6 @@ tde_add_kpart( konqsidebar_universalamarok AUTOMOC SOURCES universalamarok.cpp ${CMAKE_SOURCE_DIR}/amarok/src/amarokcore/amarokdcopiface.stub - LINK konqsidebarplugin-shared khtml-shared + LINK konqsidebarplugin-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp index f9da34ee..c24beb8f 100644 --- a/amarok/src/konquisidebar/universalamarok.cpp +++ b/amarok/src/konquisidebar/universalamarok.cpp @@ -42,7 +42,7 @@ #include <tqslider.h> #include <kdebug.h> #include <kurldrag.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #define HTML_FILE TDEGlobal::dirs()->saveLocation( "data", "amarok/", true ) + "contextbrowser.html" diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index 327d1e2a..f96b1de5 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -20,12 +20,12 @@ #ifndef KONQUERORSIDEBAR_H #define KONQUERORSIDEBAR_H -#include <khtml_part.h> +#include <tdehtml_part.h> #include <konqsidebarplugin.h> #include <dcopclient.h> #include <tqslider.h> #include <tqvbox.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kurl.h> #include "amarokdcopiface_stub.h" |