summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:36 -0600
commitd2107b329f3eadbd4c193a21704fa6d4eedc0ed0 (patch)
tree78a4b23499d3e2319093af800445cd9df9554516 /apps
parentd46a1fe34693137bbc38a0a79593af420ea0914b (diff)
downloadktorrent-d2107b329f3eadbd4c193a21704fa6d4eedc0ed0.tar.gz
ktorrent-d2107b329f3eadbd4c193a21704fa6d4eedc0ed0.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'apps')
-rw-r--r--apps/ktcachecheck/Makefile.am2
-rw-r--r--apps/ktorrent/Makefile.am2
-rw-r--r--apps/ktorrent/README2
-rw-r--r--apps/ktorrent/newui/dmainwindow.h2
-rw-r--r--apps/kttorinfo/Makefile.am2
-rw-r--r--apps/ktupnptest/Makefile.am2
6 files changed, 6 insertions, 6 deletions
diff --git a/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am
index 45b8aaa..f6c2a80 100644
--- a/apps/ktcachecheck/Makefile.am
+++ b/apps/ktcachecheck/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = ktcachecheck
ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \
multicachechecker.cpp
-ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_KFILE) $(LIB_KIO)
noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h
diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am
index f3a904c..28c1073 100644
--- a/apps/ktorrent/Makefile.am
+++ b/apps/ktorrent/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/
$(all_includes)
# the library search path.
-ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
# the libraries to link against.
ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \
diff --git a/apps/ktorrent/README b/apps/ktorrent/README
index 69e9ac5..f7d3506 100644
--- a/apps/ktorrent/README
+++ b/apps/ktorrent/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
in your app.
For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
diff --git a/apps/ktorrent/newui/dmainwindow.h b/apps/ktorrent/newui/dmainwindow.h
index 3ebcddb..ab98207 100644
--- a/apps/ktorrent/newui/dmainwindow.h
+++ b/apps/ktorrent/newui/dmainwindow.h
@@ -21,7 +21,7 @@
#define DMAINWINDOW_H
#include <kxmlguiclient.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
#include "ddockwindow.h"
diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am
index dcb2cee..d85426e 100644
--- a/apps/kttorinfo/Makefile.am
+++ b/apps/kttorinfo/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kttorinfo
kttorinfo_SOURCES = main.cpp
-kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \
$(LIB_KIO)
diff --git a/apps/ktupnptest/Makefile.am b/apps/ktupnptest/Makefile.am
index 08fb678..ba619b5 100644
--- a/apps/ktupnptest/Makefile.am
+++ b/apps/ktupnptest/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS = ktupnptest
ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui
ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \
../../libktorrent/libktorrent.la $(LIB_KIO)
-ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = upnptestapp.h
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)