From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:16:20 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdeprint/tdeprint_part/CMakeLists.txt | 2 +- tdeprint/tdeprint_part/printpart.cpp | 2 +- tdeprint/tdeprint_part/printpart.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tdeprint/tdeprint_part') diff --git a/tdeprint/tdeprint_part/CMakeLists.txt b/tdeprint/tdeprint_part/CMakeLists.txt index 586d134c6..c0f04a9fe 100644 --- a/tdeprint/tdeprint_part/CMakeLists.txt +++ b/tdeprint/tdeprint_part/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( libtdeprint_part AUTOMOC SOURCES printpart.cpp - LINK tdeprint_management-shared kparts-shared + LINK tdeprint_management-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 0ac1adcd2..c725aa872 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include typedef KParts::GenericFactory PrintPartFactory; diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h index 98881d0f9..40e8041ea 100644 --- a/tdeprint/tdeprint_part/printpart.h +++ b/tdeprint/tdeprint_part/printpart.h @@ -20,8 +20,8 @@ #ifndef PRINTPART_H #define PRINTPART_H -#include -#include +#include +#include class PrintPartExtension; class KMMainView; -- cgit v1.2.1