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

---
 kicker/extensions/kasbar/Makefile.am           | 2 +-
 kicker/extensions/sidebar/sidebarextension.cpp | 4 ++--
 kicker/extensions/sidebar/sidebarextension.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kicker/extensions')

diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index 314f71ff1..e186aad17 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA)
 
 bin_PROGRAMS = kasbar
 kasbar_SOURCES = kasbarapp.cpp
-kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kasbar_LDADD = 	libkasbar.la \
 		$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index fe5acd1bb..1bbb7d99a 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -20,8 +20,8 @@
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <tqlayout.h>
 #include <konq_historymgr.h>
 #include <krun.h>
diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index 4d0d1646b..5a117b1ee 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -19,7 +19,7 @@
 
 #include <kpanelextension.h>
 #include <kurl.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class TQHBoxLayout;
 class TQVBox;
-- 
cgit v1.2.1