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

---
 kugar/kudesigner/Makefile.am        | 6 +++---
 kugar/kudesigner/kudesigner_doc.cpp | 2 +-
 kugar/kudesigner/kudesigner_view.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kugar/kudesigner')

diff --git a/kugar/kudesigner/Makefile.am b/kugar/kudesigner/Makefile.am
index 753db18f..951de07b 100644
--- a/kugar/kudesigner/Makefile.am
+++ b/kugar/kudesigner/Makefile.am
@@ -8,19 +8,19 @@ bin_PROGRAMS =
 lib_LTLIBRARIES = libkudesignercore.la
 libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \
 	kudesigner_doc.cpp
-libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_TDEPRINT)
 
 ## The part
 kde_module_LTLIBRARIES = libkudesignerpart.la
 libkudesignerpart_la_SOURCES = kudesigner_part.cpp
-libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE)
 
 ## The tdeinit loadable module
 tdeinit_LTLIBRARIES = kudesigner.la
 kudesigner_la_SOURCES = main.cpp
-kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 kudesigner_la_LIBADD = $(LIB_KOFFICECORE)
 
 xdg_apps_DATA = kudesigner.desktop
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 0e7355b2..8e85bae6 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -21,7 +21,7 @@
 #include "kudesigner_view.h"
 
 #include <KoTemplateChooseDia.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kugar/kudesigner/kudesigner_view.h b/kugar/kudesigner/kudesigner_view.h
index 139bdec8..387996f5 100644
--- a/kugar/kudesigner/kudesigner_view.h
+++ b/kugar/kudesigner/kudesigner_view.h
@@ -20,7 +20,7 @@
 #define KUDESIGNER_VIEW_H
 
 #include <KoView.h>
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 
 #include <tqdom.h>
 
-- 
cgit v1.2.1