diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /dcop | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'dcop')
| -rw-r--r-- | dcop/Makefile.am | 6 | ||||
| -rw-r--r-- | dcop/testdcop.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dcop/Makefile.am b/dcop/Makefile.am index d59b75cdb..57ce71786 100644 --- a/dcop/Makefile.am +++ b/dcop/Makefile.am @@ -50,15 +50,15 @@ dcopserver_la_LIBADD = libDCOP.la $(LIB_QT) dcopserver_shutdown_SOURCES = dcopserver_shutdown.c -testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testdcop_SOURCES = testdcop.cpp testdcop_LDADD = libDCOP.la -dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la -testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testdcopc_SOURCES = testdcopc.c dcopc.c testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp index 5e4cd00c7..1e70171d2 100644 --- a/dcop/testdcop.cpp +++ b/dcop/testdcop.cpp @@ -258,12 +258,12 @@ int main(int argc, char **argv) foundApp.data(), foundObj.data()); // Find an object called "object1" in any application. - boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj); + boolResult = client->findObject( "", "tdesycoca", "", data, foundApp, foundObj); tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", foundApp.data(), foundObj.data()); // Find ourselves in any application. - boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj); + boolResult = client->findObject( "testdcop", "tdesycoca", "", data, foundApp, foundObj); tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", foundApp.data(), foundObj.data()); |