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

---
 kdevdesigner/designer/CMakeLists.txt      | 2 +-
 kdevdesigner/designer/kdevdesigner_part.h | 4 ++--
 kdevdesigner/src/CMakeLists.txt           | 2 +-
 kdevdesigner/src/Makefile.am              | 2 +-
 kdevdesigner/src/kdevdesigner.h           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdevdesigner')

diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index c0f54fe8..298fb20d 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -102,6 +102,6 @@ tde_add_kpart( libkdevdesignerpart AUTOMOC
   SOURCES ${SRCS}
   LINK
     kdevqui-static shared-static kinterfacedesigner-shared
-    kio-shared kparts-shared qassistantclient
+    kio-shared tdeparts-shared qassistantclient
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 32537653..48c0205e 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -23,8 +23,8 @@
 
 #include <tqmap.h>
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 #include "designer.h"
 
diff --git a/kdevdesigner/src/CMakeLists.txt b/kdevdesigner/src/CMakeLists.txt
index 726a91d1..c232cd2f 100644
--- a/kdevdesigner/src/CMakeLists.txt
+++ b/kdevdesigner/src/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES kdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdesigne
 
 tde_add_executable( kdevdesigner AUTOMOC
   SOURCES main.cpp kdevdesigner.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am
index a241ff66..be773bda 100644
--- a/kdevdesigner/src/Makefile.am
+++ b/kdevdesigner/src/Makefile.am
@@ -21,7 +21,7 @@ bin_PROGRAMS = kdevdesigner
 
 # the application source, library search path, and link libraries
 kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp
-kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdevdesigner_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go 
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 5930cf2a..2fda0a78 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -27,7 +27,7 @@
 
 #include <kxmlguiclient.h>
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KToggleAction;
 
-- 
cgit v1.2.1