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

---
 xparts/src/gtk/Makefile.am           | 2 +-
 xparts/src/interfaces/Makefile.am    | 4 ++--
 xparts/src/interfaces/xpart.h        | 4 ++--
 xparts/src/interfaces/xparthost.h    | 4 ++--
 xparts/src/interfaces/xpartmanager.h | 4 ++--
 xparts/src/kde/kbrowsersignals.h     | 2 +-
 xparts/src/kde/xparthost_kpart.h     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'xparts/src')

diff --git a/xparts/src/gtk/Makefile.am b/xparts/src/gtk/Makefile.am
index 60a7a194..839e43db 100644
--- a/xparts/src/gtk/Makefile.am
+++ b/xparts/src/gtk/Makefile.am
@@ -10,4 +10,4 @@ libgtkxparts_la_LIBADD = $(GTK2_LIBS) $(GLIB2_LIBS) $(top_builddir)/dcopc/libdco
 libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined
 
 gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h
-gtkxpartsincludedir = $(includedir)/xkparts
+gtkxpartsincludedir = $(includedir)/xtdeparts
diff --git a/xparts/src/interfaces/Makefile.am b/xparts/src/interfaces/Makefile.am
index 0d4b7f97..21b08ed6 100644
--- a/xparts/src/interfaces/Makefile.am
+++ b/xparts/src/interfaces/Makefile.am
@@ -1,3 +1,3 @@
 
-xkpartsinclude_HEADERS = xpart.h xparthost.h
-xkpartsincludedir = $(includedir)/xkparts
+xtdepartsinclude_HEADERS = xpart.h xparthost.h
+xtdepartsincludedir = $(includedir)/xtdeparts
diff --git a/xparts/src/interfaces/xpart.h b/xparts/src/interfaces/xpart.h
index 5c44cbbd..819e65d2 100644
--- a/xparts/src/interfaces/xpart.h
+++ b/xparts/src/interfaces/xpart.h
@@ -1,5 +1,5 @@
-#ifndef __xkparts_part_h__
-#define __xkparts_part_h__
+#ifndef __xtdeparts_part_h__
+#define __xtdeparts_part_h__
 
 #include <dcopobject.h>
 #include <dcopref.h>
diff --git a/xparts/src/interfaces/xparthost.h b/xparts/src/interfaces/xparthost.h
index 75c6f4e0..40958086 100644
--- a/xparts/src/interfaces/xparthost.h
+++ b/xparts/src/interfaces/xparthost.h
@@ -1,5 +1,5 @@
-#ifndef __xkparts_parthost_h__
-#define __xkparts_parthost_h__
+#ifndef __xtdeparts_parthost_h__
+#define __xtdeparts_parthost_h__
 
 #include <dcopobject.h>
 #include <dcopref.h>
diff --git a/xparts/src/interfaces/xpartmanager.h b/xparts/src/interfaces/xpartmanager.h
index 25a341f8..714b0984 100644
--- a/xparts/src/interfaces/xpartmanager.h
+++ b/xparts/src/interfaces/xpartmanager.h
@@ -1,5 +1,5 @@
-#ifndef __xkparts_partmanager_h__
-#define __xkparts_partmanager_h__
+#ifndef __xtdeparts_partmanager_h__
+#define __xtdeparts_partmanager_h__
 
 #include <dcopobject.h>
 #include <tqglobal.h>
diff --git a/xparts/src/kde/kbrowsersignals.h b/xparts/src/kde/kbrowsersignals.h
index 3bd29a7f..baee95aa 100644
--- a/xparts/src/kde/kbrowsersignals.h
+++ b/xparts/src/kde/kbrowsersignals.h
@@ -2,7 +2,7 @@
 #define __kbrowsersignals_h__
 
 #include <xbrowsersignals.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <dcopref.h>
 
 class XBrowserExtension_stub;
diff --git a/xparts/src/kde/xparthost_kpart.h b/xparts/src/kde/xparthost_kpart.h
index 527178d2..829f7ca7 100644
--- a/xparts/src/kde/xparthost_kpart.h
+++ b/xparts/src/kde/xparthost_kpart.h
@@ -3,7 +3,7 @@
 
 #include <xparthost.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class XPart_stub;
 class KBrowserSignals;
-- 
cgit v1.2.1