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

---
 src/Makefile.am          | 2 +-
 src/README               | 2 +-
 src/dolphiniconsview.cpp | 2 +-
 src/dolphinview.h        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index a2f6b97..e209891 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = d3lphin
 INCLUDES         = $(all_includes)
 
 # the library search path.
-d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+d3lphin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
 d3lphin_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lkonq
diff --git a/src/README b/src/README
index 69e9ac5..f7d3506 100644
--- a/src/README
+++ b/src/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 1fe5dec..e363890 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -309,7 +309,7 @@ TQDragObject* DolphinIconsView::dragObject()
 
     TQPixmap pixmap;
     if(urls.count() > 1) {
-        pixmap = DesktopIcon("kmultiple", iconSize());
+        pixmap = DesktopIcon("tdemultiple", iconSize());
     }
     else {
         KFileIconViewItem* item = static_cast<KFileIconViewItem*>(currentItem());
diff --git a/src/dolphinview.h b/src/dolphinview.h
index 471ea8d..e402aff 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -23,7 +23,7 @@
 #define _DOLPHINVIEW_H_
 
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kfileitem.h>
 #include <kfileiconview.h>
 #include <kio/job.h>
-- 
cgit v1.2.3