diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:59 -0600 |
commit | 1515a4f2eb9cf023ed7f9c2e10106b5e93164a08 (patch) | |
tree | d5617734090b254659ff331ce7d1e574c4807caf /kompare/komparepart | |
parent | f8069e2ea048f2657cc417d83820576ec55c181b (diff) | |
download | tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.tar.gz tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparepart')
-rw-r--r-- | kompare/komparepart/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kompare/komparepart/kompare_part.cpp | 2 | ||||
-rw-r--r-- | kompare/komparepart/kompare_part.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kompare/komparepart/CMakeLists.txt b/kompare/komparepart/CMakeLists.txt index 00fe0e04..10083566 100644 --- a/kompare/komparepart/CMakeLists.txt +++ b/kompare/komparepart/CMakeLists.txt @@ -41,6 +41,6 @@ tde_add_kpart( libkomparepart AUTOMOC komparesaveoptionswidget.cpp LINK dialogpages-static diff2-static kompareinterface-shared - kparts-shared + tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index c9e1f19b..52de1f5f 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <kinstance.h> #include <ktempfile.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> //#include <ktempdir.h> #include <kio/netaccess.h> diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index 721d7afc..f853fa36 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -22,8 +22,8 @@ #ifndef KOMPAREPART_H #define KOMPAREPART_H -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> #include "kompare.h" |