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

---
 khexedit/Makefile.am                       | 2 +-
 khexedit/optiondialog.cc                   | 2 +-
 khexedit/parts/kbytesedit/CMakeLists.txt   | 2 +-
 khexedit/parts/kpart/CMakeLists.txt        | 2 +-
 khexedit/parts/kpart/khebrowserextension.h | 2 +-
 khexedit/parts/kpart/khepart.h             | 2 +-
 khexedit/parts/kpart/khepartfactory.h      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'khexedit')

diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am
index 87c0fe3..576c08b 100644
--- a/khexedit/Makefile.am
+++ b/khexedit/Makefile.am
@@ -20,7 +20,7 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \
 exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h
 
 khexedit_METASOURCES = AUTO
-khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 khexedit_LDADD = $(LIB_KIO) $(LIB_TDEPRINT)
 
 xdg_apps_DATA = khexedit.desktop
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index c33700c..b0360a3 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -426,7 +426,7 @@ void COptionDialog::setupFilePage( void )
 {
   TQString text;
   TQFrame *page = addPage( i18n("Files"), i18n("File Management"),
-			  BarIcon("kmultiple", KIcon::SizeMedium ) );
+			  BarIcon("tdemultiple", KIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
diff --git a/khexedit/parts/kbytesedit/CMakeLists.txt b/khexedit/parts/kbytesedit/CMakeLists.txt
index 53f0cda..aece7ca 100644
--- a/khexedit/parts/kbytesedit/CMakeLists.txt
+++ b/khexedit/parts/kbytesedit/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_kpart( libkbyteseditwidget AUTOMOC
   SOURCES kbyteseditwidget.cpp
   DESTINATION ${PLUGIN_INSTALL_DIR}
-  LINK khexeditcommon-shared kparts-shared
+  LINK khexeditcommon-shared tdeparts-shared
 )
 
 
diff --git a/khexedit/parts/kpart/CMakeLists.txt b/khexedit/parts/kpart/CMakeLists.txt
index af4d5b5..9efb479 100644
--- a/khexedit/parts/kpart/CMakeLists.txt
+++ b/khexedit/parts/kpart/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_kpart( libkhexedit2part AUTOMOC
   SOURCES khepart.cpp khebrowserextension.cpp
     khepartfactory.cpp
-  LINK khexeditcommon-shared kparts-shared
+  LINK khexeditcommon-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h
index 3115b8e..8096bef 100644
--- a/khexedit/parts/kpart/khebrowserextension.h
+++ b/khexedit/parts/kpart/khebrowserextension.h
@@ -19,7 +19,7 @@
 #define KHEBROWSEREXTENSION_H
 
 // kde specific
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KHE
 {
diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h
index 0ce0391..ccbd038 100644
--- a/khexedit/parts/kpart/khepart.h
+++ b/khexedit/parts/kpart/khepart.h
@@ -19,7 +19,7 @@
 #define KHEPART_H
 
 // kde specific
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 // app specific
 #include "kbigbuffer.h"
 
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index a411acb..9d12317 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -18,7 +18,7 @@
 #ifndef KHEPARTFACTORY_H
 #define KHEPARTFACTORY_H
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 class TDEInstance;
 class TDEAboutData;
-- 
cgit v1.2.1