From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:16:20 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kfind/CMakeLists.txt | 2 +-
 kfind/Makefile.am    | 2 +-
 kfind/kfindpart.cpp  | 2 +-
 kfind/kfindpart.h    | 4 ++--
 kfind/kftabdlg.cpp   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kfind')

diff --git a/kfind/CMakeLists.txt b/kfind/CMakeLists.txt
index 91ed980f5..4162c1319 100644
--- a/kfind/CMakeLists.txt
+++ b/kfind/CMakeLists.txt
@@ -57,5 +57,5 @@ tde_add_executable( kfind AUTOMOC
 
 tde_add_library( kfind_common STATIC_PIC AUTOMOC
   SOURCES kftabdlg.cpp kfind.cpp kquery.cpp kdatecombo.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
 )
diff --git a/kfind/Makefile.am b/kfind/Makefile.am
index dacae8ba3..fed64f027 100644
--- a/kfind/Makefile.am
+++ b/kfind/Makefile.am
@@ -33,4 +33,4 @@ kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
 kfind_LDADD   =  libkfind_common.la $(LIB_KPARTS)
 
 # the library search path.
-kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 482400d50..3f71bdfbd 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -21,7 +21,7 @@
 #include "kfindpart.h"
 #include "kquery.h"
 
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index b2a8156c5..fe343879a 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -20,8 +20,8 @@
 #ifndef kfindpart__h
 #define kfindpart__h
 
-#include <kparts/browserextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/part.h>
 #include <kfileitem.h>
 #include <kdebug.h>
 #include <tqptrlist.h>
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index f5ec0a55b..6145e18c1 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -24,7 +24,7 @@
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 #include <kregexpeditorinterface.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kstandarddirs.h>
 
 #include "kquery.h"
-- 
cgit v1.2.3