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

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

(limited to 'tdesu')

diff --git a/tdesu/tdesu/Makefile.am b/tdesu/tdesu/Makefile.am
index 411e6661b..2afc27b70 100644
--- a/tdesu/tdesu/Makefile.am
+++ b/tdesu/tdesu/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
 ## tdesu
 bin_PROGRAMS = 	tdesu
 tdesu_SOURCES = tdesu.cpp sudlg.cpp
-tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 tdesu_LDADD   = $(LIB_KIO) -ltdesu
 tdesu_METASOURCES =  AUTO
 noinst_HEADERS = sudlg.h
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index 209b985b4..0159b828d 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -303,8 +303,8 @@ static int startApp()
     
     if (!new_dcop)
     {
-        TQCString ksycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca"));
-        env << ksycoca;
+        TQCString tdesycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "tdesycoca"));
+        env << tdesycoca;
 
         options += "xf"; // X-only, dcop forwarding enabled.
     }
-- 
cgit v1.2.3