summaryrefslogtreecommitdiffstats
path: root/kdiff3plugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:18:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:18:54 -0600
commit025d8f276d740f40838a63cc8ce338d30fdb97d2 (patch)
treec6d936629113c5a2cf59ce718b3402e8402ec50f /kdiff3plugin
parent4cd5ed4662c2475df3a22729f7e65dcb0b2a7383 (diff)
downloadkdiff3-025d8f276d740f40838a63cc8ce338d30fdb97d2.tar.gz
kdiff3-025d8f276d740f40838a63cc8ce338d30fdb97d2.zip
Additional kde to tde renaming
Diffstat (limited to 'kdiff3plugin')
-rwxr-xr-xkdiff3plugin/kdiff3plugin.cpp12
-rw-r--r--kdiff3plugin/po/Makefile10
2 files changed, 11 insertions, 11 deletions
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