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

---
 superkaramba/src/Makefile.am | 2 +-
 superkaramba/src/karamba.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'superkaramba')

diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am
index 1bdfd1b..374c552 100644
--- a/superkaramba/src/Makefile.am
+++ b/superkaramba/src/Makefile.am
@@ -40,7 +40,7 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
 
 # kde_cfg_DATA = superkaramba.kcfg
 
-superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 #superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index c61f6f8..466c1c3 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -39,8 +39,8 @@
 #include <tdeversion.h>
 #include <kdirwatch.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 
 #include <tqdir.h>
 #include <tqwidgetlist.h>
-- 
cgit v1.2.3