diff options
Diffstat (limited to 'kontact')
37 files changed, 50 insertions, 50 deletions
diff --git a/kontact/CMakeLists.txt b/kontact/CMakeLists.txt index 430e04df1..cb7aff9c7 100644 --- a/kontact/CMakeLists.txt +++ b/kontact/CMakeLists.txt @@ -13,7 +13,7 @@ tde_import( libkdenetwork ) tde_import( libkmime ) tde_import( ktnef ) tde_import( libkcal ) -tde_import( libkdepim ) +tde_import( libtdepim ) tde_import( certmanager ) tde_import( libkpimidentities ) diff --git a/kontact/Thoughts b/kontact/Thoughts index a93d9193b..32a627584 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -188,7 +188,7 @@ Don: If kontact is not running and is not the users preferred application Don: then a standalone version of X should be started, and an iface for Don: that standalone app returned. Don: -Don: I think this library should be in libkdepim ad all the kdepim apps +Don: I think this library should be in libtdepim ad all the kdepim apps Don: should be moved into kdepim, so their iface files all be in one Don: package. Or alternatively a new kdeinterfaces package be created Don: and used as a general repository for interface files. diff --git a/kontact/interfaces/CMakeLists.txt b/kontact/interfaces/CMakeLists.txt index 68a7a46ff..74b590d8b 100644 --- a/kontact/interfaces/CMakeLists.txt +++ b/kontact/interfaces/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/interfaces/Makefile.am b/kontact/interfaces/Makefile.am index 94a15dda3..d7c9f3402 100644 --- a/kontact/interfaces/Makefile.am +++ b/kontact/interfaces/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkpinterfaces.la libkpinterfaces_la_SOURCES = core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp libkpinterfaces_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 -libkpinterfaces_la_LIBADD = ../../libkdepim/libkdepim.la $(LIB_KPARTS) +libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_KPARTS) kpincludedir = $(includedir)/kontact kpinclude_HEADERS = core.h plugin.h summary.h diff --git a/kontact/plugins/akregator/CMakeLists.txt b/kontact/plugins/akregator/CMakeLists.txt index 74a4e0593..067442654 100644 --- a/kontact/plugins/akregator/CMakeLists.txt +++ b/kontact/plugins/akregator/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/akregator/src - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/kaddressbook/CMakeLists.txt b/kontact/plugins/kaddressbook/CMakeLists.txt index 9786fa62f..b0ec6fe2f 100644 --- a/kontact/plugins/kaddressbook/CMakeLists.txt +++ b/kontact/plugins/kaddressbook/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/kaddressbook/Makefile.am b/kontact/plugins/kaddressbook/Makefile.am index a769f29d8..8cbe4f4a9 100644 --- a/kontact/plugins/kaddressbook/Makefile.am +++ b/kontact/plugins/kaddressbook/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_kaddressbookplugin.la libkontact_kaddressbookplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkabc -libkontact_kaddressbookplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkdepim/libkdepim.la +libkontact_kaddressbookplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libtdepim/libtdepim.la libkontact_kaddressbookplugin_la_SOURCES = kaddressbook_plugin.cpp \ kaddressbookiface.stub \ diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index db1d80caf..34bec493e 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -40,7 +40,7 @@ #include <dcopclient.h> #include "kmailIface_stub.h" -#include <libkdepim/maillistdrag.h> +#include <libtdepim/maillistdrag.h> #include "core.h" #include "plugin.h" diff --git a/kontact/plugins/karm/CMakeLists.txt b/kontact/plugins/karm/CMakeLists.txt index 22be764ac..03e573b59 100644 --- a/kontact/plugins/karm/CMakeLists.txt +++ b/kontact/plugins/karm/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/kmail/CMakeLists.txt b/kontact/plugins/kmail/CMakeLists.txt index ce0ddcac7..75f6ad2f5 100644 --- a/kontact/plugins/kmail/CMakeLists.txt +++ b/kontact/plugins/kmail/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/kmail ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${CMAKE_SOURCE_DIR}/kmail ${CMAKE_SOURCE_DIR}/certmanager/lib ${CMAKE_SOURCE_DIR}/libkdenetwork diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am index f390aff4e..5cabde505 100644 --- a/kontact/plugins/kmail/Makefile.am +++ b/kontact/plugins/kmail/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_builddir)/kmail \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir)/libkdenetwork \ -I$(top_srcdir)/certmanager/lib \ -I$(top_srcdir) $(all_includes) diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index aa1e205ad..01cef3a6d 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -39,7 +39,7 @@ #include <libkcal/icaldrag.h> #include <libkcal/calendarlocal.h> -#include <libkdepim/kvcarddrag.h> +#include <libtdepim/kvcarddrag.h> #include <kmail/kmail_part.h> #include <kmail/kmkernel.h> diff --git a/kontact/plugins/knode/CMakeLists.txt b/kontact/plugins/knode/CMakeLists.txt index 38f89fe94..ed5a06082 100644 --- a/kontact/plugins/knode/CMakeLists.txt +++ b/kontact/plugins/knode/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/knotes/CMakeLists.txt b/kontact/plugins/knotes/CMakeLists.txt index d0019567e..39e5e62a0 100644 --- a/kontact/plugins/knotes/CMakeLists.txt +++ b/kontact/plugins/knotes/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am index 4a3b1710f..095be66de 100644 --- a/kontact/plugins/knotes/Makefile.am +++ b/kontact/plugins/knotes/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_knotesplugin.la libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ - $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la \ + $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la -lkresources -lkdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknoteseditor.la \ diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 004865dce..769c1acf5 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -27,8 +27,8 @@ #include <kaction.h> #include <kmessagebox.h> -#include <libkdepim/infoextension.h> -#include <libkdepim/sidebarextension.h> +#include <libtdepim/infoextension.h> +#include <libtdepim/sidebarextension.h> #include "knotes/knoteprinter.h" #include "knotes/resourcemanager.h" diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index a6e23d899..274d140e1 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -52,7 +52,7 @@ #include <libkcal/calendarlocal.h> #include <libkcal/journal.h> #include <libkcal/icaldrag.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include "knotes/knoteedit.h" diff --git a/kontact/plugins/korganizer/CMakeLists.txt b/kontact/plugins/korganizer/CMakeLists.txt index 600afcbf5..82a83ba38 100644 --- a/kontact/plugins/korganizer/CMakeLists.txt +++ b/kontact/plugins/korganizer/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/korganizer ${CMAKE_SOURCE_DIR}/korganizer/interfaces - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/korganizer/Makefile.am b/kontact/plugins/korganizer/Makefile.am index a987e4941..f041fa4ca 100644 --- a/kontact/plugins/korganizer/Makefile.am +++ b/kontact/plugins/korganizer/Makefile.am @@ -1,6 +1,6 @@ # top_srcdir/korganizer is a hack, to get korganizeriface.h INCLUDES = -I$(top_srcdir)/kontact/interfaces \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir)/korganizer \ -I$(top_srcdir)/korganizer/interfaces \ -I$(top_srcdir) $(all_includes) diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index beba17382..7e67e5f54 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -40,9 +40,9 @@ #include <dcopclient.h> -#include <libkdepim/kvcarddrag.h> -#include <libkdepim/maillistdrag.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kvcarddrag.h> +#include <libtdepim/maillistdrag.h> +#include <libtdepim/kpimprefs.h> #include <libkcal/calendarlocal.h> #include <libkcal/icaldrag.h> diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index b3f73fdf2..ed17e3177 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -38,7 +38,7 @@ #include <libkcal/resourcecalendar.h> #include <libkcal/resourcelocal.h> #include <libkcal/incidenceformatter.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include "korganizeriface_stub.h" diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index fa788778e..4994c5151 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -40,9 +40,9 @@ #include <libkcal/calendarlocal.h> #include <libkcal/icaldrag.h> -#include <libkdepim/maillistdrag.h> -#include <libkdepim/kvcarddrag.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/maillistdrag.h> +#include <libtdepim/kvcarddrag.h> +#include <libtdepim/kpimprefs.h> #include "core.h" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 8d78d3725..15731dd47 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -38,7 +38,7 @@ #include <libkcal/resourcelocal.h> #include <libkcal/todo.h> #include <libkcal/incidenceformatter.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include "korganizeriface_stub.h" diff --git a/kontact/plugins/kpilot/Makefile.am b/kontact/plugins/kpilot/Makefile.am index 2383a4fbd..c02ba572d 100644 --- a/kontact/plugins/kpilot/Makefile.am +++ b/kontact/plugins/kpilot/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir) \ -I$(top_srcdir)/kpilot/lib \ -I$(top_srcdir)/kpilot/kpilot \ @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkontact_kpilotplugin.la libkontact_kpilotplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_kpilotplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ $(LIB_KPARTS) \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kpilot/lib/libkpilot.la libkontact_kpilotplugin_la_SOURCES = kpilot_plugin.cpp summarywidget.cpp \ diff --git a/kontact/plugins/newsticker/CMakeLists.txt b/kontact/plugins/newsticker/CMakeLists.txt index 1292e519d..1415a3545 100644 --- a/kontact/plugins/newsticker/CMakeLists.txt +++ b/kontact/plugins/newsticker/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/newsticker/Makefile.am b/kontact/plugins/newsticker/Makefile.am index 779936802..d30813342 100644 --- a/kontact/plugins/newsticker/Makefile.am +++ b/kontact/plugins/newsticker/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) \ - $(top_builddir)/libkdepim/libkdepim.la ../../interfaces/libkpinterfaces.la + $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \ summarywidget.cpp summarywidget.skel diff --git a/kontact/plugins/specialdates/CMakeLists.txt b/kontact/plugins/specialdates/CMakeLists.txt index e3cc0bd41..34b6bb9f8 100644 --- a/kontact/plugins/specialdates/CMakeLists.txt +++ b/kontact/plugins/specialdates/CMakeLists.txt @@ -15,7 +15,7 @@ tde_import( korganizer ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${CMAKE_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/kontact/plugins/specialdates/Makefile.am b/kontact/plugins/specialdates/Makefile.am index 7bedb2051..7922b79ad 100644 --- a/kontact/plugins/specialdates/Makefile.am +++ b/kontact/plugins/specialdates/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_specialdatesplugin.la kcm_sdsummary.la libkontact_specialdatesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_specialdatesplugin_la_LIBADD = \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkholidays/libkholidays.la \ $(top_builddir)/korganizer/libkorganizer_calendar.la \ $(top_builddir)/kaddressbook/libkaddressbook.la diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 537e4ec0d..4df2d664a 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -44,7 +44,7 @@ #include <libkcal/event.h> #include <libkcal/resourcecalendar.h> #include <libkcal/resourcelocal.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include "core.h" #include "plugin.h" diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt index 5e23c91db..4d7f2b730 100644 --- a/kontact/plugins/summary/CMakeLists.txt +++ b/kontact/plugins/summary/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/certmanager/lib - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am index ab83c72a5..d2051701a 100644 --- a/kontact/plugins/summary/Makefile.am +++ b/kontact/plugins/summary/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \ - -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libtdepim \ -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_summaryplugin_la_LIBADD = -lkutils \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ - $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la + $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp diff --git a/kontact/plugins/weather/CMakeLists.txt b/kontact/plugins/weather/CMakeLists.txt index ad3d1792d..3c3928cbb 100644 --- a/kontact/plugins/weather/CMakeLists.txt +++ b/kontact/plugins/weather/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/plugins/weather/Makefile.am b/kontact/plugins/weather/Makefile.am index dc547a0ce..2bd4cfbf4 100644 --- a/kontact/plugins/weather/Makefile.am +++ b/kontact/plugins/weather/Makefile.am @@ -1,8 +1,8 @@ -INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libkdepim -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libtdepim -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_weatherplugin.la libkontact_weatherplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la +libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la libkontact_weatherplugin_la_SOURCES = weather_plugin.cpp summarywidget.cpp \ summarywidget.skel diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt index 9da69d0d0..3a0dadeb0 100644 --- a/kontact/src/CMakeLists.txt +++ b/kontact/src/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am index 1b49e279f..f4bf13c50 100644 --- a/kontact/src/Makefile.am +++ b/kontact/src/Makefile.am @@ -11,7 +11,7 @@ bin_PROGRAMS = kontact kontact_METASOURCES = AUTO kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kontact_LDADD = $(top_builddir)/libkdepim/libkdepim.la \ +kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \ $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML) kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \ @@ -23,7 +23,7 @@ kde_module_LTLIBRARIES = kcm_kontact.la kcm_kontact_la_SOURCES = kcmkontact.cpp kcm_kontact_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la +kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libtdepim/libtdepim.la kcm_kontact_la_COMPILE_FIRST = prefs.h diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index e30975ec6..fe24bd8dd 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -62,7 +62,7 @@ #include <krsqueezedtextlabel.h> #include <khtml_part.h> #include <khtmlview.h> -#include <libkdepim/kfileio.h> +#include <libtdepim/kfileio.h> #include <kcursor.h> #include <krun.h> #include <kaboutdata.h> @@ -290,9 +290,9 @@ void MainWindow::paintAboutScreen( const TQString& msg ) { TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); - content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); + content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); + content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.tqarg( "" ); diff --git a/kontact/src/prefs.kcfgc b/kontact/src/prefs.kcfgc index 0c200c592..31e6e4338 100644 --- a/kontact/src/prefs.kcfgc +++ b/kontact/src/prefs.kcfgc @@ -5,7 +5,7 @@ ClassName=Prefs Singleton=true Mutators=true #Inherits=KPimPrefs -#IncludeFiles=libkdepim/kpimprefs.h +#IncludeFiles=libtdepim/kpimprefs.h Visibility=KDE_EXPORT MemberVariables=public GlobalEnums=true |