From 79fd2b2bbd9f842ce3c84c67e3314033a9cceea4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:18:06 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- khexedit/parts/kpart/CMakeLists.txt | 2 +- khexedit/parts/kpart/khebrowserextension.h | 2 +- khexedit/parts/kpart/khepart.h | 2 +- khexedit/parts/kpart/khepartfactory.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'khexedit/parts/kpart') diff --git a/khexedit/parts/kpart/CMakeLists.txt b/khexedit/parts/kpart/CMakeLists.txt index af4d5b5..9efb479 100644 --- a/khexedit/parts/kpart/CMakeLists.txt +++ b/khexedit/parts/kpart/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_kpart( libkhexedit2part AUTOMOC SOURCES khepart.cpp khebrowserextension.cpp khepartfactory.cpp - LINK khexeditcommon-shared kparts-shared + LINK khexeditcommon-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h index 3115b8e..8096bef 100644 --- a/khexedit/parts/kpart/khebrowserextension.h +++ b/khexedit/parts/kpart/khebrowserextension.h @@ -19,7 +19,7 @@ #define KHEBROWSEREXTENSION_H // kde specific -#include +#include namespace KHE { diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h index 0ce0391..ccbd038 100644 --- a/khexedit/parts/kpart/khepart.h +++ b/khexedit/parts/kpart/khepart.h @@ -19,7 +19,7 @@ #define KHEPART_H // kde specific -#include +#include // app specific #include "kbigbuffer.h" diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h index a411acb..9d12317 100644 --- a/khexedit/parts/kpart/khepartfactory.h +++ b/khexedit/parts/kpart/khepartfactory.h @@ -18,7 +18,7 @@ #ifndef KHEPARTFACTORY_H #define KHEPARTFACTORY_H -#include +#include class TDEInstance; class TDEAboutData; -- cgit v1.2.1