From 025d8f276d740f40838a63cc8ce338d30fdb97d2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 6 Nov 2011 02:18:54 -0600
Subject: Additional kde to tde renaming

---
 kdiff3plugin/kdiff3plugin.cpp | 12 ++++++------
 kdiff3plugin/po/Makefile      | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kdiff3plugin')

diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 3cc6cea..53360b6 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -165,7 +165,7 @@ void KDiff3Plugin::slotCompareWith()
       TQStringList args;
       args << s_pHistory->front();
       args << m_list.front();
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -177,7 +177,7 @@ void KDiff3Plugin::slotCompareWithHistoryItem()
       TQStringList args;
       args << pAction->text();
       args << m_list.front();
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -188,7 +188,7 @@ void KDiff3Plugin::slotCompareTwoFiles()
       TQStringList args;
       args << m_list.front();
       args << m_list.back();
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -200,7 +200,7 @@ void KDiff3Plugin::slotCompareThreeFiles()
       args << m_list[0];
       args << m_list[1];
       args << m_list[2];
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -212,7 +212,7 @@ void KDiff3Plugin::slotMergeWith()
       args << s_pHistory->front();
       args << m_list.front();
       args << ( "-o" + m_list.front() );
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -225,7 +225,7 @@ void KDiff3Plugin::slotMergeThreeWay()
       args << (*s_pHistory)[0];
       args << m_list.front();
       args << ("-o" + m_list.front());
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
index 0a8b883..3e6e26a 100644
--- a/kdiff3plugin/po/Makefile
+++ b/kdiff3plugin/po/Makefile
@@ -140,11 +140,11 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -lkdecore
+LIB_KDECORE = -ltdecore
 LIB_KDED = 
-LIB_KDEPIM = -lkdepim
-LIB_KDEPRINT = -lkdeprint
-LIB_KDEUI = -lkdeui
+LIB_KDEPIM = -ltdepim
+LIB_KDEPRINT = -ltdeprint
+LIB_KDEUI = -ltdeui
 LIB_KDNSSD = -lkdnssd
 LIB_KFILE = -lkio
 LIB_KFM = 
@@ -271,7 +271,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = ${datadir}/templates
 kde_wallpaperdir = ${datadir}/wallpapers
 kde_widgetdir = /usr/lib/trinity/plugins/designer
-kdeinitdir = $(kde_moduledir)
+tdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
-- 
cgit v1.2.1