summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2013-09-03 20:02:44 +0200
committerSlávek Banko <[email protected]>2013-09-03 21:01:29 +0200
commit45971e65a6114fbd1f91ae354da485450001166f (patch)
treeb607ce9f3b683a89478b8c21c6bc9a53bf6b7a44 /kopete/protocols/msn
parentc26bb519a8aebc04ffe39d0b6c784a1c1e915202 (diff)
downloadtdenetwork-45971e65a6114fbd1f91ae354da485450001166f.tar.gz
tdenetwork-45971e65a6114fbd1f91ae354da485450001166f.zip
Additional k => tde renaming and fixes
Diffstat (limited to 'kopete/protocols/msn')
-rw-r--r--kopete/protocols/msn/Makefile.am6
-rw-r--r--kopete/protocols/msn/config/Makefile.am4
-rw-r--r--kopete/protocols/msn/msncontact.cpp2
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am
index da3fbcb1..5248d295 100644
--- a/kopete/protocols/msn/Makefile.am
+++ b/kopete/protocols/msn/Makefile.am
@@ -25,13 +25,13 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp \
p2p.cpp messageformatter.cpp incomingtransfer.cpp outgoingtransfer.cpp \
webcam.cpp
-libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_KIO)
-libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
+libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_TDEIO)
+libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
kopete_msn_la_SOURCES = dummy.cpp webcam.cpp
kopete_msn_la_LIBADD = libkopete_msn_shared.la
-kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
+kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
dummy.cpp: $(srcdir)/Makefile.am
echo '#include "kdemacros.h"' > $@
diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am
index f01cb0f1..2d84950e 100644
--- a/kopete/protocols/msn/config/Makefile.am
+++ b/kopete/protocols/msn/config/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kcm_kopete_msn.la
kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp
-kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_TDEUTILS)
service_DATA = kopete_msn_config.desktop
servicedir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 40d45b51..e58c3800 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -679,7 +679,7 @@ void MSNContact::setDisplayPicture(KTempFile *f)
f->setAutoDelete(false);
delete f;
- //let the time to KIO to copy the file
+ //let the time to TDEIO to copy the file
connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
}
diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h
index ea7a87b0..5dc4a277 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.h
+++ b/kopete/protocols/msn/msnsecureloginhandler.h
@@ -27,7 +27,7 @@ namespace TDEIO
/**
* This class handle the login process. It connect to the .NET Password service and retrive the ticket(tweener) to login.
- * Use KIO.
+ * Use TDEIO.
*
* @author Michaël Larouche <[email protected]>
*/