Rename a number of libraries and executables to avoid conflicts with KDE4

6 files changed, 13 insertions, 13 deletions

diff --git a/kopete/protocols/oscar/aim/Makefile.am b/kopete/protocols/oscar/aim/Makefile.am
index 1ecf5fe5..616a5501 100644
--- a/kopete/protocols/oscar/aim/Makefile.am
+++ b/kopete/protocols/oscar/aim/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kopete_aim.la
 
 kopete_aim_la_SOURCES = aimprotocol.cpp aimaccount.cpp aimcontact.cpp aimuserinfo.cpp aimjoinchat.cpp aimchatsession.cpp
 
-kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kopete_aim_la_LIBADD  = ../libkopete_oscar.la ui/libkopeteaimui.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la
 
diff --git a/kopete/protocols/oscar/icq/Makefile.am b/kopete/protocols/oscar/icq/Makefile.am
index 3505909c..dc2e491a 100644
--- a/kopete/protocols/oscar/icq/Makefile.am
+++ b/kopete/protocols/oscar/icq/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_icq.la
 kopete_icq_la_SOURCES = icqpresence.cpp icqaccount.cpp icqcontact.cpp icqprotocol.cpp
 # icquserinfo.cpp icqreadaway.cpp icqsendsmsdialog.cpp
 
-kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kopete_icq_la_LIBADD  = ../libkopete_oscar.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la
 
diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am
index 57f993f2..2e1fad6a 100644
--- a/kopete/protocols/oscar/liboscar/tests/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes) $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/oscar/liboscar
 METASOURCES = AUTO
-check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
+check_PROGRAMS = tdeunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
 
-kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp
-kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
+tdeunittest_SOURCES = main.cpp tdeunittest.cpp chatnavtests.cpp
+tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
 
 clientstream_test_SOURCES = clientstream_test.cpp
 clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
@@ -24,5 +24,5 @@ redirecttest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
 ipaddrtest_SOURCES = ipaddrtest.cpp
 ipaddrtest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
 
-check: kunittest
-	@./kunittest 2>&1 | grep "tests:"
+check: tdeunittest
+	@./tdeunittest 2>&1 | grep "tests:"
diff --git a/kopete/protocols/oscar/liboscar/tests/main.cpp b/kopete/protocols/oscar/liboscar/tests/main.cpp
index 49966924..03138cd1 100644
--- a/kopete/protocols/oscar/liboscar/tests/main.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/main.cpp
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "kunittest.h"
+#include "tdeunittest.h"
 
 int main( int argc, char** argv )
 {
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp
index d40f0069..d634f5b9 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp
@@ -1,5 +1,5 @@
 /**
- * kunittest.cpp
+ * tdeunittest.cpp
  *
  * Copyright (C)  2004  Zack Rusin <zack@kde.org>
  *
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "kunittest.h"
+#include "tdeunittest.h"
 
 #include "tester.h"
 #include "chatnavtests.h"
@@ -164,4 +164,4 @@ void KUnitTest::qtesterDone( TQObject *obj )
 //        tqApp->quit();
 }
 
-#include "kunittest.moc"
+#include "tdeunittest.moc"
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h
index b5173e1a..d3ceee97 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h
@@ -1,5 +1,5 @@
 /**
- * kunittest.h
+ * tdeunittest.h
  *
  * Copyright (C)  2004  Zack Rusin <zack@kde.org>
  *