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

---
 src/Makefile.am         | 2 +-
 src/basket_part.cpp     | 4 ++--
 src/basket_part.h       | 4 ++--
 src/basketstatusbar.cpp | 2 +-
 src/kiconcanvas.cpp     | 2 +-
 src/notecontent.cpp     | 2 +-
 src/notedrag.h          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 3890719..25d2471 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,7 @@ kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
 
 libbasketpart_la_SOURCES = basket_part.cpp
 libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
-libbasketpart_la_LIBADD  = libbasketcommon.la -lkparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
+libbasketpart_la_LIBADD  = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
 
 kcm_basket_la_SOURCES = kcm_basket.cpp
 kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde
diff --git a/src/basket_part.cpp b/src/basket_part.cpp
index 3ef759f..f467dac 100644
--- a/src/basket_part.cpp
+++ b/src/basket_part.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <bnpview.h>
 #include <aboutdata.h>
-#include <kparts/genericfactory.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/statusbarextension.h>
 #include "basketstatusbar.h"
 
 typedef KParts::GenericFactory< BasketPart > BasketFactory;
diff --git a/src/basket_part.h b/src/basket_part.h
index 719c604..5fc094c 100644
--- a/src/basket_part.h
+++ b/src/basket_part.h
@@ -21,8 +21,8 @@
 #ifndef _BASKETPART_H_
 #define _BASKETPART_H_
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 class TQWidget;
 class TQPainter;
diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp
index 14edc82..9554e70 100644
--- a/src/basketstatusbar.cpp
+++ b/src/basketstatusbar.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp
index b080fe2..f008489 100644
--- a/src/kiconcanvas.cpp
+++ b/src/kiconcanvas.cpp
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <kimagefilepreview.h>
 #include <kurldrag.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 #include <tqsortedlist.h>
 #include <tqimage.h>
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index 785d5b1..a078b2b 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -40,7 +40,7 @@
 //#include <kstringhandler.h>
 #include <kfilemetainfo.h>
 #include <tqdatetime.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 #include <tqfileinfo.h>
 //#include <kio/kfileitem.h>
diff --git a/src/notedrag.h b/src/notedrag.h
index 86e4947..58cc1d5 100644
--- a/src/notedrag.h
+++ b/src/notedrag.h
@@ -26,7 +26,7 @@
 #include <tqdatastream.h>
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 class TQDataStream;
 
-- 
cgit v1.2.1