From 45971e65a6114fbd1f91ae354da485450001166f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:44 +0200 Subject: Additional k => tde renaming and fixes --- kopete/kopete/config/accounts/Makefile.am | 4 ++-- kopete/kopete/config/appearance/Makefile.am | 2 +- kopete/kopete/config/avdevice/Makefile.am | 4 ++-- kopete/kopete/config/behavior/Makefile.am | 4 ++-- kopete/kopete/config/identity/Makefile.am | 2 +- kopete/kopete/config/identity/kopeteidentityconfig.cpp | 4 ++-- kopete/kopete/config/plugins/Makefile.am | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kopete/kopete/config') diff --git a/kopete/kopete/config/accounts/Makefile.am b/kopete/kopete/config/accounts/Makefile.am index 139d9b2e..b455b396 100644 --- a/kopete/kopete/config/accounts/Makefile.am +++ b/kopete/kopete/config/accounts/Makefile.am @@ -8,8 +8,8 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) $(all_includes) -I$(k kde_module_LTLIBRARIES = kcm_kopete_accountconfig.la kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp -kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kcm_kopete_accountconfig_la_LIBADD = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS) +kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kcm_kopete_accountconfig_la_LIBADD = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) service_DATA = kopete_accountconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/config/appearance/Makefile.am b/kopete/kopete/config/appearance/Makefile.am index a555ef57..d16188bd 100644 --- a/kopete/kopete/config/appearance/Makefile.am +++ b/kopete/kopete/config/appearance/Makefile.am @@ -13,7 +13,7 @@ kcm_kopete_appearanceconfig_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \ $(all_libraries) kcm_kopete_appearanceconfig_la_LIBADD = ../../../libkopete/libkopete.la \ ../../../kopete/chatwindow/libkopetechatwindow.la \ - -ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF) + -ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) $(LIB_KNEWSTUFF) service_DATA = kopete_appearanceconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/config/avdevice/Makefile.am b/kopete/kopete/config/avdevice/Makefile.am index 24ace923..5e588a23 100644 --- a/kopete/kopete/config/avdevice/Makefile.am +++ b/kopete/kopete/config/avdevice/Makefile.am @@ -8,11 +8,11 @@ kde_module_LTLIBRARIES = kcm_kopete_avdeviceconfig.la kcm_kopete_avdeviceconfig_la_SOURCES = avdeviceconfig.cpp \ avdeviceconfig_videoconfig.ui -kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcm_kopete_avdeviceconfig_la_LIBADD = ../../../libkopete/libkopete.la \ ../../../libkopete/avdevice/libkopete_videodevice.la \ - $(LIB_KOPETECOMPAT) $(LIB_KUTILS) + $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) service_DATA = kopete_avdeviceconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/config/behavior/Makefile.am b/kopete/kopete/config/behavior/Makefile.am index ef04b4ff..33866039 100644 --- a/kopete/kopete/config/behavior/Makefile.am +++ b/kopete/kopete/config/behavior/Makefile.am @@ -7,10 +7,10 @@ kcm_kopete_behaviorconfig_la_SOURCES = \ kopeteawayconfigbase.ui \ behaviorconfig_chat.ui behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig.cpp -kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcm_kopete_behaviorconfig_la_LIBADD = ../../../libkopete/libkopete.la \ - $(LIB_KOPETECOMPAT) $(LIB_KUTILS) + $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) service_DATA = kopete_behaviorconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/config/identity/Makefile.am b/kopete/kopete/config/identity/Makefile.am index b69f72f9..64fdf05c 100644 --- a/kopete/kopete/config/identity/Makefile.am +++ b/kopete/kopete/config/identity/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kopete_identityconfig.la kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \ kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -kcm_kopete_identityconfig_la_LIBADD = -ltdeabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kcm_kopete_identityconfig_la_LIBADD = -ltdeabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor service_DATA = kopete_identityconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index 619c138b..e7ad4ac8 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -44,7 +44,7 @@ #include #include -// KDE KIO includes +// KDE TDEIO includes #include // KDE KABC(AddressBook) includes @@ -53,7 +53,7 @@ #include // Kopete include -#include "kabcpersistence.h" +#include "tdeabcpersistence.h" #include "kopeteglobal.h" #include "kopeteaccountmanager.h" #include "kopeteprotocol.h" diff --git a/kopete/kopete/config/plugins/Makefile.am b/kopete/kopete/config/plugins/Makefile.am index 3ed239a1..b7d66dfb 100644 --- a/kopete/kopete/config/plugins/Makefile.am +++ b/kopete/kopete/config/plugins/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libkopetepluginconfig.la libkopetepluginconfig_la_SOURCES = kopetepluginconfig.cpp libkopetepluginconfig_la_LDFLAGS = $(all_libraries) -libkopetepluginconfig_la_LIBADD = $(LIB_KUTILS) +libkopetepluginconfig_la_LIBADD = $(LIB_TDEUTILS) # vim: set noet: -- cgit v1.2.3