Browse Source

Rename additional instances of KDE to TDE

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
7cb24f16be
100 changed files with 245 additions and 245 deletions
  1. +5
    -5
      CMakeLists.txt
  2. +2
    -2
      ConfigureChecks.cmake
  3. +1
    -1
      akregator/ChangeLog
  4. +2
    -2
      akregator/src/Makefile.am
  5. +2
    -2
      akregator/src/mk4storage/Makefile.am
  6. +1
    -1
      certmanager/Makefile.am
  7. +1
    -1
      certmanager/conf/Makefile.am
  8. +1
    -1
      certmanager/kwatchgnupg/Makefile.am
  9. +1
    -1
      certmanager/lib/Makefile.am
  10. +2
    -2
      config.h.cmake
  11. +2
    -2
      kabc/frontend/Makefile.am
  12. +2
    -2
      kabc/kabc2mutt/Makefile.am
  13. +1
    -1
      kabc/kabcdistlistupdater/Makefile.am
  14. +2
    -2
      kaddressbook/Makefile.am
  15. +3
    -3
      kaddressbook/distributionlistpicker.cpp
  16. +1
    -1
      kaddressbook/editors/Makefile.am
  17. +3
    -3
      kaddressbook/features/Makefile.am
  18. +22
    -22
      kaddressbook/features/distributionlistwidget.cpp
  19. +3
    -3
      kaddressbook/features/distributionlistwidget.h
  20. +3
    -3
      kaddressbook/interfaces/core.h
  21. +9
    -9
      kaddressbook/kabcore.cpp
  22. +4
    -4
      kaddressbook/kabcore.h
  23. +1
    -1
      kaddressbook/kcmconfigs/Makefile.am
  24. +4
    -4
      kaddressbook/ldapsearchdialog.cpp
  25. +2
    -2
      kaddressbook/ldapsearchdialog.h
  26. +4
    -4
      kaddressbook/searchmanager.cpp
  27. +4
    -4
      kaddressbook/searchmanager.h
  28. +1
    -1
      kaddressbook/thumbnailcreator/Makefile.am
  29. +3
    -3
      kaddressbook/views/Makefile.am
  30. +9
    -9
      kaddressbook/xxport/Makefile.am
  31. +1
    -1
      kalarm/Makefile.am
  32. +4
    -4
      kalarm/kalarmd/Makefile.am
  33. +3
    -3
      kandy/src/Makefile.am
  34. +1
    -1
      karm/Makefile.am
  35. +3
    -3
      karm/test/Makefile.am
  36. +1
    -1
      kdgantt/Makefile.am
  37. +1
    -1
      kgantt/kgantt/Makefile.am
  38. +1
    -1
      kioslaves/mbox/Makefile.am
  39. +1
    -1
      kioslaves/sieve/Makefile.am
  40. +1
    -1
      kitchensync/libqopensync/Makefile.am
  41. +2
    -2
      kitchensync/src/Makefile.am
  42. +1
    -1
      kmail/Makefile.am
  43. +7
    -7
      kmail/distributionlistdialog.cpp
  44. +7
    -7
      kmail/folderdiaacltab.cpp
  45. +3
    -3
      kmail/kleo_util.h
  46. +1
    -1
      kmail/klistviewindexedsearchline.h
  47. +13
    -13
      kmail/recipientspicker.cpp
  48. +6
    -6
      kmail/recipientspicker.h
  49. +3
    -3
      kmail/stl_util.h
  50. +1
    -1
      kmailcvt/Makefile.am
  51. +3
    -3
      kmobile/Makefile.am
  52. +3
    -3
      knode/Makefile.am
  53. +2
    -2
      knotes/Makefile.am
  54. +1
    -1
      kode/Makefile.am
  55. +1
    -1
      kode/kwsdl/Makefile.am
  56. +1
    -1
      kode/kwsdl/kung/Makefile.am
  57. +1
    -1
      kode/kwsdl/schema/Makefile.am
  58. +1
    -1
      kode/kwsdl/tests/google/Makefile.am
  59. +1
    -1
      kode/kwsdl/wscl/Makefile.am
  60. +1
    -1
      kode/kxml_compiler/Makefile.am
  61. +1
    -1
      konsolekalendar/Makefile.am
  62. +1
    -1
      kontact/TODO
  63. +1
    -1
      kontact/plugins/kmail/Makefile.am
  64. +1
    -1
      kontact/plugins/korganizer/Makefile.am
  65. +2
    -2
      kontact/plugins/newsticker/Makefile.am
  66. +1
    -1
      kontact/plugins/specialdates/Makefile.am
  67. +1
    -1
      kontact/plugins/summary/Makefile.am
  68. +2
    -2
      kontact/src/Makefile.am
  69. +5
    -5
      korganizer/Makefile.am
  70. +1
    -1
      korganizer/README
  71. +3
    -3
      korganizer/koattendeeeditor.cpp
  72. +5
    -5
      korganizer/koeditorattachments.cpp
  73. +4
    -4
      korganizer/korgac/Makefile.am
  74. +1
    -1
      korganizer/plugins/datenums/Makefile.am
  75. +1
    -1
      korganizer/plugins/exchange/Makefile.am
  76. +1
    -1
      korganizer/plugins/hebrew/Makefile.am
  77. +1
    -1
      korganizer/plugins/printing/journal/Makefile.am
  78. +1
    -1
      korganizer/plugins/printing/list/Makefile.am
  79. +1
    -1
      korganizer/plugins/printing/whatsnext/Makefile.am
  80. +1
    -1
      korganizer/plugins/printing/year/Makefile.am
  81. +2
    -2
      korganizer/printing/Makefile.am
  82. +1
    -1
      korn/Makefile.am
  83. +1
    -1
      korn/kconf_update/Makefile.am
  84. +2
    -2
      kresources/caldav/export.h
  85. +2
    -2
      kresources/carddav/export.h
  86. +2
    -2
      kresources/exchange/resourceexchangeconfig.h
  87. +4
    -4
      kresources/featureplan/Makefile.am
  88. +1
    -1
      kresources/groupwise/soap/Makefile.am
  89. +1
    -1
      kresources/groupwise/soap/groupwiseserver.cpp
  90. +2
    -2
      kresources/newexchange/exchangeconvertercalendar.cpp
  91. +2
    -2
      kresources/newexchange/exchangeconvertercontact.cpp
  92. +4
    -4
      kresources/newexchange/exchangeglobals.cpp
  93. +1
    -1
      kresources/scalix/scalixadmin/Makefile.am
  94. +1
    -1
      kresources/slox/Makefile.am
  95. +1
    -1
      ktnef/gui/Makefile.am
  96. +1
    -1
      ktnef/lib/Makefile.am
  97. +2
    -2
      ktnef/tests/Makefile.am
  98. +1
    -1
      libemailfunctions/CMakeLists.txt
  99. +1
    -1
      libemailfunctions/Makefile.am
  100. +1
    -1
      libemailfunctions/email.cpp

+ 5
- 5
CMakeLists.txt View File

@@ -77,7 +77,7 @@ if( NOT WITH_ARTS )
endif( )

if( WITH_NEWDISTRLISTS )
set( KDEPIM_NEW_DISTRLISTS 1 )
set( TDEPIM_NEW_DISTRLISTS 1 )
endif( )


@@ -88,7 +88,7 @@ option( BUILD_INDEXLIB "Build indexlib" ${BUILD_ALL} )
option( BUILD_LIBKMIME "Build libkmime" ${BUILD_ALL} )
option( BUILD_KTNEF "Build ktnef" ${BUILD_ALL} )
option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} )
option( BUILD_LIBKDEPIM "Build libtdepim" ${BUILD_ALL} )
option( BUILD_LIBTDEPIM "Build libtdepim" ${BUILD_ALL} )
option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} )
option( BUILD_LIBKDENETWORK "Build libkdenetwork" ${BUILD_ALL} )
option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} )
@@ -143,7 +143,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )

##### activate dependencies #####################

if( BUILD_LIBKCAL OR BUILD_LIBKDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_KIOSLAVES OR BUILD_KMAIL OR BUILD_KNODE )
if( BUILD_LIBKCAL OR BUILD_LIBTDEPIM OR BUILD_LIBKPIMIDENTITIES OR BUILD_KIOSLAVES OR BUILD_KMAIL OR BUILD_KNODE )
add_subdirectory( libemailfunctions )
endif()

@@ -158,8 +158,8 @@ tde_conditional_add_subdirectory( BUILD_INDEXLIB indexlib )
tde_conditional_add_subdirectory( BUILD_LIBKMIME libkmime )
tde_conditional_add_subdirectory( BUILD_KTNEF ktnef )
tde_conditional_add_subdirectory( BUILD_LIBKCAL libkcal )
tde_conditional_add_subdirectory( BUILD_LIBKDEPIM pixmaps )
tde_conditional_add_subdirectory( BUILD_LIBKDEPIM libtdepim )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM pixmaps )
tde_conditional_add_subdirectory( BUILD_LIBTDEPIM libtdepim )
tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities )
tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libkdenetwork )
tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager )


+ 2
- 2
ConfigureChecks.cmake View File

@@ -9,8 +9,8 @@
#
#################################################

if( BUILD_LIBKDEPIM OR BUILD_KMAIL )
option( KDEPIM_NEW_DISTRLISTS "Define if you want to use the new distribution lists" ON )
if( BUILD_LIBTDEPIM OR BUILD_KMAIL )
option( TDEPIM_NEW_DISTRLISTS "Define if you want to use the new distribution lists" ON )
endif( )




+ 1
- 1
akregator/ChangeLog View File

@@ -163,7 +163,7 @@ New features:

Changes:
- Added new about page, designed by Lokheed, lokheed at gmail.com -fo
- Use KDEPIM's progressbar -tpr
- Use TDEPIM's progressbar -tpr
- Update unread count when stopping fetching before it's finished -tpr
- Added "Keep flag set" to the search combobox -fo
- Added optional close buttons on browser tabs -fo


+ 2
- 2
akregator/src/Makefile.am View File

@@ -20,7 +20,7 @@ bin_PROGRAMS = akregator

# the application source, library search path, and link libraries
akregator_SOURCES = main.cpp mainwindow.cpp
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la

@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
kspeech.stub

libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim

# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)


+ 2
- 2
akregator/src/mk4storage/Makefile.am View File

@@ -12,9 +12,9 @@ libakregator_mk4storage_plugin_la_LIBADD = \
$(top_builddir)/akregator/src/librss/librsslocal.la \
../libakregatorprivate.la \
$(LIB_KFILE) \
$(LIB_KDECORE) \
$(LIB_TDECORE) \
$(LIB_QT) \
$(LIB_KDEUI)
$(LIB_TDEUI)

libakregator_mk4storage_plugin_la_LDFLAGS = \
$(KDE_PLUGIN) \


+ 1
- 1
certmanager/Makefile.am View File

@@ -17,7 +17,7 @@ kleopatra_SOURCES = \

METASOURCES = AUTO

kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)

rcdir = $(kde_datadir)/kleopatra


+ 1
- 1
certmanager/conf/Makefile.am View File

@@ -16,7 +16,7 @@ kcm_kleopatra_la_SOURCES = dirservconfigpage.cpp \
dnorderconfigpage.cpp

kcm_kleopatra_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_TDEUI)

kde_services_DATA = \
kleopatra_config_dirserv.desktop \


+ 1
- 1
certmanager/kwatchgnupg/Makefile.am View File

@@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \

METASOURCES = AUTO

kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)

rcdir = $(kde_datadir)/kwatchgnupg


+ 1
- 1
certmanager/lib/Makefile.am View File

@@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \
ui/libkleopatra_ui.la \
\
$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la \
$(LIB_KIO) $(LIB_KDEUI)
$(LIB_KIO) $(LIB_TDEUI)

# Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
# backends/kpgp/libkleopatra_backend_kpgp.la


+ 2
- 2
config.h.cmake View File

@@ -12,7 +12,7 @@
#cmakedefine SIZEOF_UINT64_T @SIZEOF_UINT64_T@

// libtdepim, kmail
#cmakedefine KDEPIM_NEW_DISTRLISTS 1
#cmakedefine TDEPIM_NEW_DISTRLISTS 1

// libkdemanager, certmanager
#cmakedefine HAVE_GPGME_0_4_BRANCH 1
@@ -29,7 +29,7 @@
#cmakedefine STD_NAMESPACE_PREFIX @STD_NAMESPACE_PREFIX@

// kaddressbook
#cmakedefine KDEPIM_NEW_DISTRLISTS 1
#cmakedefine TDEPIM_NEW_DISTRLISTS 1

// kandy
#cmakedefine HAVE_LOCKDEV 1


+ 2
- 2
kabc/frontend/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO

bin_PROGRAMS = kabcfrontend

kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDADD = -lkabc $(LIB_TDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui


+ 2
- 2
kabc/kabc2mutt/Makefile.am View File

@@ -4,8 +4,8 @@ METASOURCES = AUTO

bin_PROGRAMS = kabc2mutt

kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDADD = -lkabc $(LIB_KDECORE)
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp

messages: rc.cpp


+ 1
- 1
kabc/kabcdistlistupdater/Makefile.am View File

@@ -4,7 +4,7 @@ METASOURCES = AUTO

bin_PROGRAMS = kabcdistlistupdater

kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp



+ 2
- 2
kaddressbook/Makefile.am View File

@@ -17,14 +17,14 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook

kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDADD = libkaddressbook.la

kde_module_LTLIBRARIES = libkaddressbookpart.la

libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) -lDCOP
libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP

lib_LTLIBRARIES = libkaddressbook.la
libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \


+ 3
- 3
kaddressbook/distributionlistpicker.cpp View File

@@ -23,7 +23,7 @@
#include "distributionlistpicker.h"
#include "config.h"

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif

@@ -59,7 +59,7 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ),
this, TQT_SLOT( entrySelected( const TQString& ) ) );
setMainWidget( main );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
typedef TQValueList<KPIM::DistributionList> DistListList;
const DistListList lists = KPIM::DistributionList::allDistributionLists( m_book );
for ( DistListList::ConstIterator it = lists.begin(); it != lists.end(); ++it )
@@ -81,7 +81,7 @@ void KPIM::DistributionListPickerDialog::setLabelText( const TQString& text )

void KPIM::DistributionListPickerDialog::slotUser1()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<KPIM::DistributionList> lists = KPIM::DistributionList::allDistributionLists( m_book );
TQStringList listNames;
for ( TQValueList<KPIM::DistributionList>::ConstIterator it = lists.begin(); it != lists.end(); ++it )


+ 1
- 1
kaddressbook/editors/Makefile.am View File

@@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \

libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)

noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h



+ 3
- 3
kaddressbook/features/Makefile.am View File

@@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
if compile_newdistrlists
libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
else
libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
endif

libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources

noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h



+ 22
- 22
kaddressbook/features/distributionlistwidget.cpp View File

@@ -39,7 +39,7 @@
#include <kmessagebox.h>

#include <kabc/addresseedialog.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
typedef KPIM::DistributionList DistributionList;
#else
@@ -149,7 +149,7 @@ class ContactItem : public TQListViewItem
DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent,
const char *name )
: KAB::ExtensionWidget( core, parent, name )
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
, mManager( 0 )
#endif
{
@@ -201,7 +201,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
topLayout->addWidget( mRemoveContactButton, 2, 3 );
connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
// When contacts are changed, update both distr list combo and contents of displayed distr list
connect( core, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( updateNameCombo() ) );
@@ -228,7 +228,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren

DistributionListWidget::~DistributionListWidget()
{
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
delete mManager;
#endif

@@ -237,7 +237,7 @@ DistributionListWidget::~DistributionListWidget()

void DistributionListWidget::save()
{
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
mManager->save();
#endif
}
@@ -254,7 +254,7 @@ void DistributionListWidget::selectionContactViewChanged()

bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
return core()->distributionListNames().contains( distrListName );
#else
return mManager->listNames().contains( distrListName );
@@ -273,7 +273,7 @@ void DistributionListWidget::createList()
KMessageBox::sorry( this, i18n( "The name already exists" ) );
return;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::Resource* resource = core()->requestResource( this );
if ( !resource )
return;
@@ -313,7 +313,7 @@ void DistributionListWidget::editList()
KMessageBox::sorry( this, i18n( "The name already exists." ) );
return;
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found [should be impossible]
@@ -335,7 +335,7 @@ void DistributionListWidget::editList()
// Display the contents of the list we just selected
updateContactView();

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
changed();
#endif
}
@@ -349,7 +349,7 @@ void DistributionListWidget::removeList()
if ( result != KMessageBox::Continue )
return;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found [should be impossible]
@@ -369,7 +369,7 @@ void DistributionListWidget::removeList()

void DistributionListWidget::addContact()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) { // not found
@@ -388,7 +388,7 @@ void DistributionListWidget::addContact()
for ( it = addrList.begin(); it != addrList.end(); ++it )
dist.insertEntry( *it );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@@ -399,7 +399,7 @@ void DistributionListWidget::addContact()

void DistributionListWidget::removeContact()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found
@@ -419,7 +419,7 @@ void DistributionListWidget::removeContact()
dist.removeEntry( contactItem->addressee(), contactItem->email() );
delete contactItem;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@@ -429,7 +429,7 @@ void DistributionListWidget::removeContact()

void DistributionListWidget::changeEmail()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() ) // not found
@@ -454,7 +454,7 @@ void DistributionListWidget::changeEmail()
dist.removeEntry( contactItem->addressee(), contactItem->email() );
dist.insertEntry( contactItem->addressee(), email );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@@ -468,7 +468,7 @@ void DistributionListWidget::updateContactView()
mContactView->clear();

bool isListSelected = false;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist;
if ( mNameCombo->count() != 0 )
dist = KPIM::DistributionList::findByName(
@@ -491,7 +491,7 @@ void DistributionListWidget::updateContactView()
mContactView->setEnabled( true );

uint entryCount = 0;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const KPIM::DistributionList::Entry::List entries = dist.entries( core()->addressBook() );
KPIM::DistributionList::Entry::List::ConstIterator it;
#else
@@ -512,7 +512,7 @@ void DistributionListWidget::updateNameCombo()
{
int pos = mNameCombo->currentItem();
mNameCombo->clear();
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQStringList names = core()->distributionListNames();
#else
mManager->load();
@@ -529,7 +529,7 @@ void DistributionListWidget::dropEvent( TQDropEvent *e )
if ( mNameCombo->count() == 0 )
return;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName(
core()->addressBook(), mNameCombo->currentText() );
if ( dist.isEmpty() )
@@ -548,7 +548,7 @@ void DistributionListWidget::dropEvent( TQDropEvent *e )
for ( KABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it )
dist.insertEntry( *it );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
core()->addressBook()->insertAddressee( dist );
changed( dist );
#else
@@ -578,7 +578,7 @@ void DistributionListWidget::dropped( TQDropEvent *e, TQListViewItem* )
dropEvent( e );
}

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void DistributionListWidget::changed( const KABC::Addressee& dist )
{
emit modified( KABC::Addressee::List() << dist );


+ 3
- 3
kaddressbook/features/distributionlistwidget.h View File

@@ -24,7 +24,7 @@
#ifndef DISTRIBUTIONLISTWIDGET_H
#define DISTRIBUTIONLISTWIDGET_H

#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include <kdialogbase.h>
#include <klistview.h>

@@ -76,7 +76,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
void selectionContactViewChanged();

private:
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void changed( const KABC::Addressee& dist );
#else
void changed();
@@ -91,7 +91,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
TQLabel *mEntryCountLabel;
DistributionListView *mContactView;

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager *mManager;
#endif
TQPushButton *mCreateListButton;


+ 3
- 3
kaddressbook/interfaces/core.h View File

@@ -24,9 +24,9 @@
#ifndef KAB_CORE_H
#define KAB_CORE_H

#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif

@@ -117,7 +117,7 @@ class KDE_EXPORT Core : public TQObject
*/
virtual void deleteDistributionLists( const TQStringList &uids ) = 0;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
/**
Returns all the distribution lists.
*/


+ 9
- 9
kaddressbook/kabcore.cpp View File

@@ -354,7 +354,7 @@ void KABCore::setContactSelected( const TQString &uid )
KABC::Addressee addr = mAddressBook->findByUid( uid );
if ( !mDetailsViewer->isHidden() )
mDetailsViewer->setAddressee( addr );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( !mSelectedDistributionList.isNull() && mDistListEntryView->isShown() ) {
showDistributionListEntry( uid );
}
@@ -439,7 +439,7 @@ void KABCore::setContactSelected( const TQString &uid )
#endif
mActionPaste->setEnabled( !list.isEmpty() );
}
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
mAddDistListButton->setEnabled( writable );
mRemoveDistListButton->setEnabled( someSelected && writable );
#endif
@@ -709,7 +709,7 @@ void KABCore::contactModified( const KABC::Addressee &addr )

void KABCore::newDistributionList()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::Resource *resource = requestResource( mWidget );
if ( !resource )
return;
@@ -1230,7 +1230,7 @@ void KABCore::initGUI()
mViewManager = new ViewManager( this, viewWidget );
viewLayout->addWidget( mViewManager, 1 );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
mDistListButtonWidget = new TQWidget( viewWidget );
TQHBoxLayout *buttonLayout = new TQHBoxLayout( mDistListButtonWidget );
buttonLayout->setSpacing( KDialog::spacingHint() );
@@ -1604,7 +1604,7 @@ bool KABCore::handleCommandLine( KAddressBookIface* iface )

void KABCore::removeSelectedContactsFromDistList()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS

KPIM::DistributionList dist = KPIM::DistributionList::findByName( addressBook(), mSelectedDistributionList );
if ( dist.isEmpty() )
@@ -1656,7 +1656,7 @@ void KABCore::removeSelectedContactsFromDistList()

void KABCore::sendMailToDistributionList( const TQString &name )
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dist = KPIM::DistributionList::findByName( addressBook(), name );
if ( dist.isEmpty() )
return;
@@ -1671,7 +1671,7 @@ void KABCore::sendMailToDistributionList( const TQString &name )

void KABCore::editSelectedDistributionList()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
editDistributionList( KPIM::DistributionList::findByName( addressBook(), mSelectedDistributionList ) );
#endif
}
@@ -1679,12 +1679,12 @@ void KABCore::editSelectedDistributionList()

void KABCore::editDistributionList( const TQString &name )
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
editDistributionList( KPIM::DistributionList::findByName( addressBook(), name ) );
#endif
}

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS

void KABCore::showDistributionListEntry( const TQString& uid )
{


+ 4
- 4
kaddressbook/kabcore.h View File

@@ -24,7 +24,7 @@
#ifndef KABCORE_H
#define KABCORE_H

#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS

#include <kabc/field.h>

@@ -148,7 +148,7 @@ class KDE_EXPORT KABCore : public KAB::Core

KCommandHistory *commandHistory() const { return mCommandHistory; }

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
/**
Returns all the distribution lists.
*/
@@ -395,7 +395,7 @@ class KDE_EXPORT KABCore : public KAB::Core

private:

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void editDistributionList( const KPIM::DistributionList &list );
void showDistributionListEntry( const TQString &uid );
#endif
@@ -445,7 +445,7 @@ class KDE_EXPORT KABCore : public KAB::Core
ViewManager *mViewManager;
TQLabel *mViewHeaderLabel;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString mSelectedDistributionList;
KPushButton *mAddDistListButton;
KPushButton *mRemoveDistListButton;


+ 1
- 1
kaddressbook/kcmconfigs/Makefile.am View File

@@ -25,7 +25,7 @@ kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libtdepim/l
kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kabcustomfields_la_LIBADD = $(LIB_KDEUI) -lqui \
kcm_kabcustomfields_la_LIBADD = $(LIB_TDEUI) -lqui \
$(top_builddir)/kaddressbook/common/libkabcommon.la
kcm_kabcustomfields_la_COMPILE_FIRST = $(top_builddir)/kaddressbook/common/kabprefs_base.h



+ 4
- 4
kaddressbook/ldapsearchdialog.cpp View File

@@ -42,7 +42,7 @@
#include "ldapsearchdialog.h"
#include "kablock.h"

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include "distributionlistpicker.h"
#endif

@@ -214,7 +214,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,

showButton( User2, false );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
showButton( User2, true );
setButtonText( User2, i18n( "Add to Distribution List..." ) );
#endif
@@ -543,7 +543,7 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::
return addr;
}

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
{
TQGuardedPtr<KPIM::DistributionListPickerDialog> picker = new KPIM::DistributionListPickerDialog( mCore->addressBook(), this );
@@ -601,7 +601,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV

void LDAPSearchDialog::slotUser2()
{
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<ContactListItem*> selectedItems = d->selectedItems( mResultListView );
if ( selectedItems.isEmpty() ) {
KMessageBox::information( this, i18n( "Please select the contacts you want to add to the distribution list." ), i18n( "No Contacts Selected" ) );


+ 2
- 2
kaddressbook/ldapsearchdialog.h View File

@@ -29,7 +29,7 @@
#include <ldapclient.h>
#include <kdialogbase.h>

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif

@@ -90,7 +90,7 @@ class LDAPSearchDialog : public KDialogBase
private:
void saveSettings();
static KABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList selectDistributionList();
#endif



+ 4
- 4
kaddressbook/searchmanager.cpp View File

@@ -20,7 +20,7 @@
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS

#include <kabc/addresseelist.h>
#include <kdeversion.h>
@@ -57,7 +57,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
allContacts.append( *abIt );
#endif

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
// Extract distribution lists from allContacts
mDistributionLists.clear();
KABC::Addressee::List::Iterator rmIt( allContacts.begin() );
@@ -98,7 +98,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
KABC::Addressee::List::ConstIterator it( allContacts.begin() );
const KABC::Addressee::List::ConstIterator endIt( allContacts.end() );
for ( ; it != endIt; ++it ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( KPIM::DistributionList::isDistributionList( *it ) )
continue;
#endif
@@ -169,7 +169,7 @@ void SearchManager::reload()
search( mPattern, mFields, mType );
}

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS

void KAB::SearchManager::setSelectedDistributionList( const TQString &name )
{


+ 4
- 4
kaddressbook/searchmanager.h View File

@@ -24,11 +24,11 @@
#ifndef SEARCHMANAGER_H
#define SEARCHMANAGER_H

#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include <tqobject.h>

#include <kabc/stdaddressbook.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif

@@ -67,7 +67,7 @@ class SearchManager : public TQObject
KABC::Addressee::List contacts() const;


#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
/**
sets the distribution list to be shown
*/
@@ -95,7 +95,7 @@ class SearchManager : public TQObject

private:
KABC::Addressee::List mContacts;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString mSelectedDistributionList;
KPIM::DistributionList::List mDistributionLists;
#endif


+ 1
- 1
kaddressbook/thumbnailcreator/Makefile.am View File

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la

ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp
ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -ltdefx
ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_KABC) -ltdefx

noinst_HEADERS = ldifvcardcreator.h



+ 3
- 3
kaddressbook/views/Makefile.am View File

@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC)

libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC)

libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)

noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \


+ 9
- 9
kaddressbook/xxport/Makefile.am View File

@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la

libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) \
libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la

libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)

noinst_HEADERS = csvimportdialog.h



+ 1
- 1
kalarm/Makefile.am View File

@@ -31,7 +31,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkpimidentities/libkpimidentities.la \
-lkabc -lkutils $(LIB_KDEUI) $(ARTSLIB) $(LIBXTST)
-lkabc -lkutils $(LIB_TDEUI) $(ARTSLIB) $(LIBXTST)
noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
alarmtimewidget.h birthdaydlg.h daemon.h dcophandler.h deferdlg.h \
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \


+ 4
- 4
kalarm/kalarmd/Makefile.am View File

@@ -2,14 +2,14 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)

noinst_LTLIBRARIES = libkalarmd.la

libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LIBADD = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub

bin_PROGRAMS = kalarmd

kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \
alarmdaemoniface.skel


+ 3
- 3
kandy/src/Makefile.am View File

@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client

INCLUDES = -I$(top_srcdir) $(all_includes)

kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -17,8 +17,8 @@ kandy_SOURCES = main.cpp kandy.cpp \
noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \
commanditem.h mobilegui.h commandscheduler.h

kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_client_LDADD = $(LIB_KDECORE)
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_client_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp

METASOURCES = AUTO


+ 1
- 1
karm/Makefile.am View File

@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \


+ 3
- 3
karm/test/Makefile.am View File

@@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking

runscripts_SOURCES = script.cpp runscripts.cpp
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE)
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)

locking_SOURCES = locking.cpp lockerthread.cpp
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la

KDE_CXXFLAGS = $(USE_EXCEPTIONS)


+ 1
- 1
kdgantt/Makefile.am View File

@@ -16,7 +16,7 @@ libkdgantt_la_SOURCES = \
KDGanttXMLTools.cpp \
itemAttributeDialog.ui
libkdgantt_la_LDFLAGS = $(all_libraries) -no-undefined
libkdgantt_la_LIBADD = $(LIB_KDEUI)
libkdgantt_la_LIBADD = $(LIB_TDEUI)

noinst_HEADERS = \
KDGanttViewSubwidgets.h \


+ 1
- 1
kgantt/kgantt/Makefile.am View File

@@ -7,7 +7,7 @@ xQGanttBarViewPort_Events.cpp \
xQGanttBarView.cpp xQGanttListView.cpp KGanttBarConfig.cpp

libkgantt_la_LDFLAGS = -version-info 0:2:0 $(all_libraries) -no-undefined
libkgantt_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
libkgantt_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)

# set the include path for X, qt and KDE
INCLUDES= $(all_includes)


+ 1
- 1
kioslaves/mbox/Makefile.am View File

@@ -12,7 +12,7 @@ kio_mbox_la_SOURCES = \
readmbox.cc \
stat.cc \
urlinfo.cc
kio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
kio_mbox_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
kio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)

noinst_HEADERS = \


+ 1
- 1
kioslaves/sieve/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes)
kde_module_LTLIBRARIES = kio_sieve.la

kio_sieve_la_SOURCES = sieve.cpp
kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_KDECORE)
kio_sieve_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) $(LIB_QT) $(LIB_TDECORE)
kio_sieve_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)

noinst_HEADERS = sieve.h


+ 1
- 1
kitchensync/libqopensync/Makefile.am View File

@@ -11,7 +11,7 @@ libqopensync_la_SOURCES = callbackhandler.cpp conversion.cpp engine.cpp environm
member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp \
syncchange.cpp
libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libqopensync_la_LIBADD = $(LIB_KDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS)
libqopensync_la_LIBADD = $(LIB_TDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS)

METASOURCES = AUTO



+ 2
- 2
kitchensync/src/Makefile.am View File

@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync

kitchensync_SOURCES = main.cpp mainwindow.cpp
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kitchensync_LDADD = libkitchensync.la

xdg_apps_DATA = kitchensync.desktop
@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la

libkitchensyncpart_la_SOURCES = part.cpp
libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_KDECORE) $(LIB_KDEUI)
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_KHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)

# Resources
kitchensyncdatadir = $(kde_datadir)/kitchensync


+ 1
- 1
kmail/Makefile.am View File

@@ -40,7 +40,7 @@ libkmailpart_la_LIBADD = libkmailprivate.la

kcm_kmail_la_SOURCES = kcm_kmail.cpp
kcm_kmail_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE)
kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_TDECORE)

libkmail_bodypartformatter_application_octetstream_la_SOURCES = app_octetstream.cpp
libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)


+ 7
- 7
kmail/distributionlistdialog.cpp View File

@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/

#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS

#include "distributionlistdialog.h"

@@ -28,7 +28,7 @@
#include <kabc/stdaddressbook.h>
#include <kabc/distributionlist.h>

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
#include <libtdepim/kaddrbook.h>
@@ -172,7 +172,7 @@ void DistributionListDialog::slotUser1()
return;
}

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager manager( ab );
manager.load();
#endif
@@ -189,7 +189,7 @@ void DistributionListDialog::slotUser1()

KABC::AddressBook *ab = KABC::StdAddressBook::self( true );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) {
#else
if ( manager.list( name ) ) {
@@ -212,7 +212,7 @@ void DistributionListDialog::slotUser1()
return;
}

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList dlist;
dlist.setName( name );

@@ -260,13 +260,13 @@ void DistributionListDialog::slotUser1()
return;
}

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
manager.save();
#endif

// Only accept when the dist list is really in the addressbook, since we can't detect if the
// user aborted saving in another way, since insertAddressee() lacks a return code.
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) {
#else
if ( manager.list( name ) ) {


+ 7
- 7
kmail/folderdiaacltab.cpp View File

@@ -30,7 +30,7 @@
* your version.
*/

#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS

#include "folderdiaacltab.h"
#include "acljobs.h"
@@ -41,7 +41,7 @@

#include <addressesdialog.h>
#include <kabc/addresseelist.h>
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h> // libtdepim
#else
#include <kabc/distributionlist.h>
@@ -204,7 +204,7 @@ public:

void load( const ACLListEntry& entry );
void save( ACLList& list,
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::AddressBook* abook,
#else
KABC::DistributionListManager& manager,
@@ -270,7 +270,7 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
}

void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KABC::AddressBook* addressBook,
#else
KABC::DistributionListManager& manager,
@@ -278,7 +278,7 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList,
IMAPUserIdFormat userIdFormat )
{
// expand distribution lists
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList list = KPIM::DistributionList::findByName( addressBook, userId(), false );
if ( !list.isEmpty() ) {
Q_ASSERT( mModified ); // it has to be new, it couldn't be stored as a distr list name....
@@ -675,7 +675,7 @@ bool KMail::FolderDiaACLTab::save()
// listviewitems at the same time sounds dangerous, so let's just save into
// ACLList and reload that.
KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager manager( addressBook );
manager.load();
#endif
@@ -683,7 +683,7 @@ bool KMail::FolderDiaACLTab::save()
for ( TQListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) {
ListViewItem* ACLitem = static_cast<ListViewItem *>( item );
ACLitem->save( aclList,
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
addressBook,
#else
manager,


+ 3
- 3
kmail/kleo_util.h View File

@@ -29,8 +29,8 @@
your version.
*/

#ifndef __KDEPIM_KMAIL_KLEO_UTIL_H__
#define __KDEPIM_KMAIL_KLEO_UTIL_H__
#ifndef __TDEPIM_KMAIL_KLEO_UTIL_H__
#define __TDEPIM_KMAIL_KLEO_UTIL_H__

#include <kleo/enum.h>

@@ -85,4 +85,4 @@ static inline bool containsOpenPGP( unsigned int f ) {
return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
}

#endif // __KDEPIM_KMAIL_KLEO_UTIL_H__
#endif // __TDEPIM_KMAIL_KLEO_UTIL_H__

+ 1
- 1
kmail/klistviewindexedsearchline.h View File

@@ -46,7 +46,7 @@ class KListViewSearchLine;
* Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex
*/

class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
{
Q_OBJECT
TQ_OBJECT


+ 13
- 13
kmail/recipientspicker.cpp View File

@@ -28,7 +28,7 @@

#include <libemailfunctions/email.h>

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
#include <kabc/distributionlist.h>
#endif

@@ -46,7 +46,7 @@
#include <tqtoolbutton.h>
#include <tqlabel.h>

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem::RecipientItem( KABC::AddressBook *ab )
: mAddressBook( ab )
{
@@ -58,7 +58,7 @@ RecipientItem::RecipientItem()
}
#endif

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
void RecipientItem::setDistributionList( KPIM::DistributionList &list )
{
mDistributionList = list;
@@ -142,7 +142,7 @@ TQString RecipientItem::tooltip() const
return mTooltip;
}

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList& RecipientItem::distributionList() {
return mDistributionList;
}
@@ -152,7 +152,7 @@ KABC::DistributionList * RecipientItem::distributionList() {
}
#endif

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString RecipientItem::createTooltip( KPIM::DistributionList &distributionList ) const
{
TQString txt = "<qt>";
@@ -342,7 +342,7 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev )

RecipientsPicker::RecipientsPicker( TQWidget *parent )
: TQDialog( parent, "RecipientsPicker" )
#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
, mDistributionListManager( 0 )
#endif
,mLdapSearchDialog( 0 )
@@ -452,7 +452,7 @@ RecipientsPicker::~RecipientsPicker()
{
writeConfig();

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
delete mDistributionListManager;
#endif

@@ -497,7 +497,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook )
TQStringList emails = (*it).emails();
TQStringList::ConstIterator it3;
for( it3 = emails.begin(); it3 != emails.end(); ++it3 ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem *item = new RecipientItem( mAddressBook );
#else
RecipientItem *item = new RecipientItem;
@@ -547,7 +547,7 @@ void RecipientsPicker::insertDistributionLists()
{
mDistributionLists->deleteAll();

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQValueList<KPIM::DistributionList> lists = KPIM::DistributionList::allDistributionLists( mAddressBook );
for ( uint i = 0; i < lists.count(); ++i ) {
RecipientItem *item = new RecipientItem( mAddressBook );
@@ -583,7 +583,7 @@ void RecipientsPicker::insertRecentAddresses()

KABC::Addressee::List::ConstIterator it;
for( it = recents.begin(); it != recents.end(); ++it ) {
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem *item = new RecipientItem( mAddressBook );
#else
RecipientItem *item = new RecipientItem;
@@ -637,7 +637,7 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients )
// a detached copy.
RecipientItem::List items = mDistributionLists->items();
RecipientItem::List::ConstIterator distIt;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
for ( distIt = items.begin(); distIt != items.end(); ++distIt ) {
if ( (*it).email() == (*distIt)->name() ) {
item = new RecipientItem( mAddressBook );
@@ -661,7 +661,7 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients )
a.setNameFromString( name );
a.insertEmail( email );

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
item = new RecipientItem( mAddressBook );
#else
item = new RecipientItem;
@@ -865,7 +865,7 @@ void RecipientsPicker::ldapSearchResult()
KABC::Addressee ad;
ad.setNameFromString( name );
ad.insertEmail( email );
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem *item = new RecipientItem( mAddressBook );
#else
RecipientItem *item = new RecipientItem;


+ 6
- 6
kmail/recipientspicker.h View File

@@ -21,7 +21,7 @@
#ifndef RECIPIENTSPICKER_H
#define RECIPIENTSPICKER_H

#include <config.h> // for KDEPIM_NEW_DISTRLISTS
#include <config.h> // for TDEPIM_NEW_DISTRLISTS

#include "recipientseditor.h"

@@ -36,7 +36,7 @@

class TQComboBox;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#else
namespace KABC {
@@ -54,7 +54,7 @@ class RecipientItem
public:
typedef TQValueList<RecipientItem *> List;

#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
RecipientItem( KABC::AddressBook *ab );
void setDistributionList( KPIM::DistributionList& );
KPIM::DistributionList& distributionList();
@@ -79,7 +79,7 @@ class RecipientItem
TQString tooltip() const;

private:
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
TQString createTooltip( KPIM::DistributionList & ) const;
#else
TQString createTooltip( KABC::DistributionList * ) const;
@@ -89,7 +89,7 @@ class RecipientItem
TQString mName;
TQString mEmail;
TQString mRecipient;
#ifdef KDEPIM_NEW_DISTRLISTS
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList mDistributionList;
KABC::AddressBook *mAddressBook;
#else
@@ -240,7 +240,7 @@ class RecipientsPicker : public TQDialog
RecipientsCollection *mDistributionLists;
RecipientsCollection *mSelectedRecipients;

#ifndef KDEPIM_NEW_DISTRLISTS
#ifndef TDEPIM_NEW_DISTRLISTS
KABC::DistributionListManager *mDistributionListManager;
#endif



+ 3
- 3
kmail/stl_util.h View File

@@ -29,8 +29,8 @@
your version.
*/

#ifndef __KDEPIM__KMAIL__STL_UTIL_H__
#define __KDEPIM__KMAIL__STL_UTIL_H__
#ifndef __TDEPIM__KMAIL__STL_UTIL_H__
#define __TDEPIM__KMAIL__STL_UTIL_H__

#include <algorithm>

@@ -61,4 +61,4 @@ namespace kdtools {

} // namespace kdtools

#endif // __KDEPIM__KMAIL__STL_UTIL_H__
#endif // __TDEPIM__KMAIL__STL_UTIL_H__

+ 1
- 1
kmailcvt/Makefile.am View File

@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
kmailcvt_METASOURCES = AUTO

# the library search path.
kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

KDE_ICON=AUTO



+ 3
- 3
kmobile/Makefile.am View File

@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la

INCLUDES = $(all_includes)

kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -26,10 +26,10 @@ libkmobiledevice_la_LIBADD = $(LIB_KABC) $(LIB_LOCKDEV) ../libkcal/libkcal.la
# the KDE application's client library to KMobile
libkmobileclient_la_SOURCES = kmobileclient.cpp
libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
libkmobileclient_la_LIBADD = $(LIB_KDECORE) -lDCOP
libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP

EXTRA_PROGRAMS = testlibkmobile
testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testlibkmobile_LDADD = libkmobileclient.la
testlibkmobile_SOURCES = testlibkmobile.cpp



+ 3
- 3
knode/Makefile.am View File

@@ -11,18 +11,18 @@ lib_LTLIBRARIES = libknodecommon.la

kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
libknodepart_la_LIBADD = libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim

SUBDIRS = pics filters

bin_PROGRAMS = knode

knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knode_LDADD = libknodecommon.la

kcm_knode_la_SOURCES = knconfigpages.cpp
kcm_knode_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_knode_la_LIBADD = libknodecommon.la $(LIB_KDECORE)
kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
knconfigpages.lo: smtpaccountwidget_base.h

libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)


+ 2
- 2
knotes/Makefile.am View File

@@ -28,14 +28,14 @@ knotes_SOURCES = main.cpp knotesapp.cpp KNotesAppIface.skel
knotes_LDADD = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -lkresources -ltdeprint -lkutils
knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
knotes_COMPILE_FIRST = knoteconfig.h

kde_module_LTLIBRARIES = knotes_local.la
knotes_local_la_SOURCES = resourcelocal_plugin.cpp
knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
knotes_local_la_LIBADD = libknotesresources.la libknotesconfig.la libknotesprinting.la \
$(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkresources
$(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lkresources

METASOURCES = AUTO



+ 1
- 1
kode/Makefile.am View File

@@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore

bin_PROGRAMS = kode

kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kode_LDADD = libkode.la -lkabc
kode_SOURCES = kodemain.cpp



+ 1
- 1
kode/kwsdl/Makefile.am View File

@@ -11,7 +11,7 @@ libwsdl_la_LIBADD = -ltdecore schema/libschema.la

bin_PROGRAMS = kwsdl_compiler

kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwsdl_compiler_LDADD = ../libkode.la libwsdl.la
kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \
namemapper.cpp


+ 1
- 1
kode/kwsdl/kung/Makefile.am View File

@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)

bin_PROGRAMS = kung
kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \


+ 1
- 1
kode/kwsdl/schema/Makefile.am View File

@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libschema_la_LIBADD = -lqt-mt -ltdecore -lkio

#bin_PROGRAMS = schematest
#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#schematest_SOURCES = main.cpp
#schematest_LDADD = libschema.la



+ 1
- 1
kode/kwsdl/tests/google/Makefile.am View File

@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest

googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
googletest_LDADD = -ltdecore -lkio
googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor


+ 1
- 1
kode/kwsdl/wscl/Makefile.am View File

@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libwscl_la_LIBADD = -lqt-mt

#bin_PROGRAMS = wscltest
#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#wscltest_SOURCES = main.cpp
#wscltest_LDADD = libwscl.la



+ 1
- 1
kode/kxml_compiler/Makefile.am View File

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)

bin_PROGRAMS = kxml_compiler

kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxml_compiler_LDADD = ../libkode.la -ltdecore
kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp



+ 1
- 1
konsolekalendar/Makefile.am View File

@@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
stdcalendar.cpp main.cpp
konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor

appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop


+ 1
- 1
kontact/TODO View File

@@ -2,7 +2,7 @@ UNTIL KDE 3.2
==============

- merge config of parts into a unified config dialog
* Unified Identity handling (Name, Mail address, SMTP, use KMIdentity KDEPIM wide?)
* Unified Identity handling (Name, Mail address, SMTP, use KMIdentity TDEPIM wide?)
Currently this is dublicated in at least KMail, KNode and KOrganizer
* Molularize KOrganizer and KMail Settings and turn them into kcm's
* Think about extending the kcm idea and add a framework to locate kcm's for apps via KTrader


+ 1
- 1
kontact/plugins/kmail/Makefile.am View File

@@ -15,7 +15,7 @@ libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \
kcm_kmailsummary_la_SOURCES = kcmkmailsummary.cpp
kcm_kmailsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kmailsummary_la_LIBADD = $(LIB_KDEUI)
kcm_kmailsummary_la_LIBADD = $(LIB_TDEUI)

kmailIface_DCOPIDLNG = true



+ 1
- 1
kontact/plugins/korganizer/Makefile.am View File

@@ -45,7 +45,7 @@ kcm_korgsummary_la_SOURCES = kcmkorgsummary.cpp
kcm_korgsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) \
$(all_libraries) \
-avoid-version -no-undefined
kcm_korgsummary_la_LIBADD = $(LIB_KDEUI)
kcm_korgsummary_la_LIBADD = $(LIB_TDEUI)

METASOURCES = AUTO



+ 2
- 2
kontact/plugins/newsticker/Makefile.am View File

@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \

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) \
libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) \
$(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la

libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \
@@ -13,7 +13,7 @@ libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \
kcm_kontactknt_la_SOURCES = kcmkontactknt.cpp
kcm_kontactknt_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kontactknt_la_LIBADD = $(LIB_KDEUI)
kcm_kontactknt_la_LIBADD = $(LIB_TDEUI)

METASOURCES = AUTO



+ 1
- 1
kontact/plugins/specialdates/Makefile.am View File

@@ -17,7 +17,7 @@ libkontact_specialdatesplugin_la_SOURCES = specialdates_plugin.cpp \
kcm_sdsummary_la_SOURCES = kcmsdsummary.cpp
kcm_sdsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_sdsummary_la_LIBADD = $(LIB_KDEUI)
kcm_sdsummary_la_LIBADD = $(LIB_TDEUI)

METASOURCES = AUTO



+ 1
- 1
kontact/plugins/summary/Makefile.am View File

@@ -13,7 +13,7 @@ libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cp
kcm_kontactsummary_la_SOURCES = kcmkontactsummary.cpp
kcm_kontactsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
kcm_kontactsummary_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS)
kcm_kontactsummary_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)

METASOURCES = AUTO



+ 2
- 2
kontact/src/Makefile.am View File

@@ -4,13 +4,13 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)

lib_LTLIBRARIES = libkontact.la
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
libkontact_la_LIBADD = $(LIB_KDECORE)
libkontact_la_LIBADD = $(LIB_TDECORE)
libkontact_la_SOURCES = prefs.kcfgc

bin_PROGRAMS = kontact

kontact_METASOURCES = AUTO
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)


+ 5
- 5
korganizer/Makefile.am View File

@@ -14,7 +14,7 @@ INCLUDES = \

bin_PROGRAMS = korganizer

korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korganizer_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h
@@ -25,23 +25,23 @@ kde_module_LTLIBRARIES = kcm_korganizer.la libkorganizerpart.la
kcm_korganizer_la_SOURCES = koprefsdialog.cpp
kcm_korganizer_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.la \
$(LIB_KDECORE)
$(LIB_TDECORE)
kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h

libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_SOURCES = korganizer_part.cpp
libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h


check_PROGRAMS = korgplugins timezone

korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA)
korgplugins_SOURCES = korgplugins.cpp
korgplugins_COMPILE_FIRST = koprefs_base.h

timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA)
timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h


+ 1
- 1
korganizer/README View File

@@ -6,7 +6,7 @@

http://korganizer.kde.org

Next release: <