Browse Source

Additional kde to tde renaming

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
d70ce47c22
100 changed files with 140 additions and 140 deletions
  1. +3
    -3
      CMakeLists.txt
  2. +1
    -1
      Makefile.am.in
  3. +8
    -8
      NewsLog.txt
  4. +3
    -3
      README
  5. +1
    -1
      README.Kolab
  6. +2
    -2
      akregator/src/CMakeLists.txt
  7. +3
    -3
      akregator/src/Makefile.am
  8. +1
    -1
      akregator/src/aboutdata.h
  9. +1
    -1
      akregator/src/akregator_export.h
  10. +1
    -1
      akregator/src/librss/Makefile.am
  11. +1
    -1
      akregator/src/librss/global.h
  12. +1
    -1
      akregator/src/pics/action-rss_tag.svg
  13. +1
    -1
      certmanager/Makefile.am
  14. +1
    -1
      certmanager/certmanager.cpp
  15. +1
    -1
      certmanager/certmanager.h
  16. +1
    -1
      certmanager/conf/appearanceconfigpage.cpp
  17. +1
    -1
      certmanager/conf/dirservconfigpage.cpp
  18. +1
    -1
      certmanager/conf/dirservconfigpage.h
  19. +1
    -1
      certmanager/conf/dnorderconfigpage.cpp
  20. +1
    -1
      certmanager/kwatchgnupg/Makefile.am
  21. +1
    -1
      certmanager/lib/Makefile.am
  22. +1
    -1
      certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
  23. +1
    -1
      certmanager/lib/backends/qgpgme/qgpgmejob.h
  24. +1
    -1
      certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
  25. +1
    -1
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
  26. +1
    -1
      certmanager/lib/cryptplug.h
  27. +1
    -1
      certmanager/lib/cryptplugfactory.h
  28. +1
    -1
      certmanager/lib/cryptplugwrapper.h
  29. +1
    -1
      certmanager/lib/kleo/cryptobackendfactory.h
  30. +1
    -1
      certmanager/lib/kleo/dn.h
  31. +1
    -1
      certmanager/lib/kleo/enum.h
  32. +1
    -1
      certmanager/lib/kleo/hierarchicalkeylistjob.h
  33. +1
    -1
      certmanager/lib/kleo/keyfiltermanager.h
  34. +1
    -1
      certmanager/lib/kleo/multideletejob.h
  35. +1
    -1
      certmanager/lib/ui/backendconfigwidget.h
  36. +1
    -1
      certmanager/lib/ui/cryptoconfigdialog.h
  37. +1
    -1
      certmanager/lib/ui/directoryserviceswidget.h
  38. +1
    -1
      certmanager/lib/ui/dnattributeorderconfigwidget.h
  39. +1
    -1
      certmanager/lib/ui/keyapprovaldialog.h
  40. +1
    -1
      certmanager/lib/ui/keylistview.h
  41. +1
    -1
      certmanager/lib/ui/keyrequester.h
  42. +1
    -1
      certmanager/lib/ui/keyselectiondialog.h
  43. +1
    -1
      certmanager/lib/ui/progressbar.h
  44. +1
    -1
      certmanager/lib/ui/progressdialog.h
  45. +1
    -1
      configure.in.in
  46. +1
    -1
      dependency-graph.dot
  47. +1
    -1
      doc/akregator/index.docbook
  48. +1
    -1
      doc/kaddressbook/index.docbook
  49. +4
    -4
      doc/kalarm/index.docbook
  50. +5
    -5
      doc/kandy/index.docbook
  51. +1
    -1
      doc/karm/index.docbook
  52. +1
    -1
      doc/kleopatra/index.docbook
  53. +2
    -2
      doc/kmail/index.docbook
  54. +1
    -1
      doc/kmail/menus.docbook
  55. +1
    -1
      doc/knode/index.docbook
  56. +1
    -1
      doc/knotes/index.docbook
  57. +2
    -2
      doc/konsolekalendar/index.docbook
  58. +2
    -2
      doc/kontact/index.docbook
  59. +4
    -4
      doc/korganizer/index.docbook
  60. +1
    -1
      doc/korganizer/outlook-to-vcalendar.docbook
  61. +1
    -1
      doc/korn/index.docbook
  62. +3
    -3
      doc/kpilot/index.docbook
  63. +1
    -1
      doc/ktnef/index.docbook
  64. +1
    -1
      doc/kwatchgnupg/index.docbook
  65. +1
    -1
      kabc/frontend/Makefile.am
  66. +1
    -1
      kabc/kabc2mutt/Makefile.am
  67. +1
    -1
      kabc/kabcdistlistupdater/CMakeLists.txt
  68. +1
    -1
      kabc/kabcdistlistupdater/Makefile.am
  69. +1
    -1
      kaddressbook/CMakeLists.txt
  70. +2
    -2
      kaddressbook/Makefile.am
  71. +1
    -1
      kaddressbook/common/kabprefs.h
  72. +1
    -1
      kaddressbook/common/kaddressbook.kcfg
  73. +2
    -2
      kaddressbook/features/CMakeLists.txt
  74. +1
    -1
      kaddressbook/interfaces/configurewidget.h
  75. +1
    -1
      kaddressbook/interfaces/contacteditorwidget.h
  76. +1
    -1
      kaddressbook/interfaces/core.h
  77. +1
    -1
      kaddressbook/interfaces/extensionwidget.h
  78. +1
    -1
      kaddressbook/interfaces/xxport.h
  79. +1
    -1
      kaddressbook/kabcore.h
  80. +1
    -1
      kaddressbook/kaddressbookiface.h
  81. +1
    -1
      kaddressbook/kaddressbookview.h
  82. +3
    -3
      kaddressbook/kcmconfigs/CMakeLists.txt
  83. +1
    -1
      kaddressbook/kcmconfigs/kcmkabconfig.cpp
  84. +1
    -1
      kaddressbook/kcmconfigs/kcmkabcustomfields.cpp
  85. +1
    -1
      kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
  86. +1
    -1
      kaddressbook/thumbnailcreator/Makefile.am
  87. +1
    -1
      kaddressbook/viewconfigurewidget.h
  88. +1
    -1
      kaddressbook/xxport/HACKING
  89. +1
    -1
      kaddressbook/xxportmanager.h
  90. +1
    -1
      kalarm/daemon.cpp
  91. +2
    -2
      kalarm/kalarmd/Makefile.am
  92. +1
    -1
      kalarm/kalarmd/alarmdaemon.cpp
  93. +1
    -1
      kalarm/lib/Makefile.am
  94. +1
    -1
      kalarm/lib/colourcombo.cpp
  95. +2
    -2
      kandy/src/CMakeLists.txt
  96. +2
    -2
      kandy/src/Makefile.am
  97. +1
    -1
      karm/CMakeLists.txt
  98. +4
    -4
      karm/Makefile.am
  99. +1
    -1
      karm/karmstorage.h
  100. +2
    -2
      karm/test/Makefile.am

+ 3
- 3
CMakeLists.txt View File

@@ -14,8 +14,8 @@ cmake_minimum_required( VERSION 2.8 )

##### general package setup #####################

project( kdepim )
set( PACKAGE kdepim )
project( tdepim )
set( PACKAGE tdepim )
set( VERSION "3.5.13" )


@@ -152,7 +152,7 @@ if( BUILD_KADDRESSBOOK OR (BUILD_KRESOURCES AND (WITH_EGROUPWARE OR WITH_BIRTHDA
endif()


##### kdepim directories ########################
##### tdepim directories ########################

tde_conditional_add_subdirectory( BUILD_INDEXLIB indexlib )
tde_conditional_add_subdirectory( BUILD_LIBKMIME libkmime )

+ 1
- 1
Makefile.am.in View File

@@ -1,4 +1,4 @@
## kdepim/Makefile.am
## tdepim/Makefile.am
## (C) 1997 Stephan Kulow

# these are here to control the compilation order, but are only textual

+ 8
- 8
NewsLog.txt View File

@@ -1270,7 +1270,7 @@ Problems addressed

Merges
------
* Enterprise branch is in sync with kdepim 3.5 branch
* Enterprise branch is in sync with tdepim 3.5 branch
* Bugfixes from enterprise ported to 3.5 branch

Friday, July 4th 2008
@@ -1284,7 +1284,7 @@ Problems addressed
Merges
------

* Enterprise branch is in sync with kdepim 3.5 branch
* Enterprise branch is in sync with tdepim 3.5 branch

Friday, June 27th 2008

@@ -1316,7 +1316,7 @@ Problems addressed
Merges
--------

* Enterprise branch is in sync with kdepim 3.5 branch
* Enterprise branch is in sync with tdepim 3.5 branch

Friday, May 30th 2008

@@ -1327,7 +1327,7 @@ Problems addressed

Merges
-------
* Enterprise in sync with kdepim 3.5 branch.
* Enterprise in sync with tdepim 3.5 branch.



@@ -1341,7 +1341,7 @@ Problems addressed
Merges
-------

* Enterprise in sync with kdepim 3.5 branch.
* Enterprise in sync with tdepim 3.5 branch.


Friday, May 9th 2008
@@ -1359,7 +1359,7 @@ Problems addressed
Merges
--------

* Enterprise in sync with kdepim 3.5 branch.
* Enterprise in sync with tdepim 3.5 branch.


Saturday, May 3rd 2008
@@ -1367,7 +1367,7 @@ Saturday, May 3rd 2008
Merges
-------

* Enterprise in sync with kdepim 3.5 branch.
* Enterprise in sync with tdepim 3.5 branch.

Monday, April 28th 2008

@@ -1630,7 +1630,7 @@ Problems addressed

Merges
-------
* More merges from all of kdepim.
* More merges from all of tdepim.

Monday, December 4th 2007


+ 3
- 3
README View File

@@ -41,7 +41,7 @@ What it is
There is also quite an amount of infrastructure in this package:

* calendarsystem: library for handling of non-gregorian calendar systems
* libtdepim: Common code for different kdepim apps
* libtdepim: Common code for different tdepim apps
* libkdenetwork: Common code for apps previously being in the kdenetwork CVS
module (KMail, KNode). This will be merged with libtdepim.
* mimelib: MIME messages library
@@ -56,7 +56,7 @@ There is also quite an amount of infrastructure in this package:
* kioslaves/sieve: Sieve kioslave
* ktnef: handling of tnef data

The following subdirectories have been moved to kdenonbeta/kdepim:
The following subdirectories have been moved to kdenonbeta/tdepim:

* empath: a modular e-mail client, designed for reuse, needs a Qt
with threading support
@@ -77,7 +77,7 @@ subscribe my@email.address

If you have questions relating to development of this module please post them on
the developers mailing list (kde-pim@kde.org). If you have user questions,
please use kdepim-users@kde.org
please use tdepim-users@kde.org

If you are interested in kmail development use the mailing list
kmail-devel@kde.org.

+ 1
- 1
README.Kolab View File

@@ -1,4 +1,4 @@
These are preliminary instructions on how to set up kdepim to work
These are preliminary instructions on how to set up tdepim to work
with a kolab server. It is meant to be a help for people setting
up for testing. It is also meant as a list of things to set up in the
upcoming Kolab setup wizard.

+ 2
- 2
akregator/src/CMakeLists.txt View File

@@ -92,7 +92,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC

tde_add_executable( akregator AUTOMOC
SOURCES main.cpp mainwindow.cpp
LINK akregatorprivate-shared kdepim-shared kparts-shared
LINK akregatorprivate-shared tdepim-shared kparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@@ -117,6 +117,6 @@ tde_add_kpart( libakregatorpart AUTOMOC
tagpropertieswidgetbase.ui treenodeitem.cpp
viewer.cpp ${TDE_INCLUDE_DIR}/kspeechsink.skel
${TDE_INCLUDE_DIR}/kspeech.stub listtabwidget.cpp
LINK akregatorprivate-shared kdepim-shared khtml-shared
LINK akregatorprivate-shared tdepim-shared khtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 3
- 3
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) -lkdefx $(LIB_KIO) -lktexteditor
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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 -lkdepim
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim

# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
@@ -161,6 +161,6 @@ kde_servicetypes_DATA = akregator_plugin.desktop

SUBDIRS = librss about . mk4storage pics

DOXYGEN_REFERENCES = kdeui
DOXYGEN_REFERENCES = tdeui
include $(top_srcdir)/admin/Doxyfile.am


+ 1
- 1
akregator/src/aboutdata.h View File

@@ -26,7 +26,7 @@
#define ABOUTDATA_H

#include <kaboutdata.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#define AKREGATOR_VERSION "1.2.9"


+ 1
- 1
akregator/src/akregator_export.h View File

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

#include <kdepimmacros.h>
#include <tdepimmacros.h>

#define AKREGATOR_EXPORT KDE_EXPORT


+ 1
- 1
akregator/src/librss/Makefile.am View File

@@ -18,5 +18,5 @@ testlibrss_SOURCES = testlibrss.cpp
testlibrss_LDFLAGS = $(all_libraries)
testlibrss_LDADD = librsslocal.la $(LIB_KIO)

DOXYGEN_REFERENCES = kdeui
DOXYGEN_REFERENCES = tdeui
include $(top_srcdir)/admin/Doxyfile.am

+ 1
- 1
akregator/src/librss/global.h View File

@@ -11,7 +11,7 @@
#ifndef LIBRSS_GLOBAL_H
#define LIBRSS_GLOBAL_H

#include <kdepimmacros.h>
#include <tdepimmacros.h>

template <class>
class TQValueList;

+ 1
- 1
akregator/src/pics/action-rss_tag.svg View File

@@ -4,7 +4,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
sodipodi:docname="action-rss_tag.svg"
sodipodi:docbase="/mnt/ablage01/frank/cvs-mirror/kde_3.5_branch/kdepim/akregator/src/pics"
sodipodi:docbase="/mnt/ablage01/frank/cvs-mirror/kde_3.5_branch/tdepim/akregator/src/pics"
inkscape:version="0.40"
sodipodi:version="0.32"
id="svg1291"

+ 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) -lkdefx $(LIB_KIO) -lktexteditor
kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)

rcdir = $(kde_datadir)/kleopatra

+ 1
- 1
certmanager/certmanager.cpp View File

@@ -96,7 +96,7 @@
// other
#include <algorithm>
#include <assert.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
#include <kinputdialog.h>
namespace {


+ 1
- 1
certmanager/certmanager.h View File

@@ -36,7 +36,7 @@
//#include <gpgme.h>

#include <kmainwindow.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
#include <kurl.h>
#include <tqcstring.h>
#include <tqptrlist.h>

+ 1
- 1
certmanager/conf/appearanceconfigpage.cpp View File

@@ -36,7 +36,7 @@
#include <klocale.h>
#include <kdebug.h>

#include <kdepimmacros.h>
#include <tdepimmacros.h>

AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name )
: KCModule( parent, name )

+ 1
- 1
certmanager/conf/dirservconfigpage.cpp View File

@@ -47,7 +47,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>

#include <kdepimmacros.h>
#include <tdepimmacros.h>

#if 0 // disabled, since it is apparently confusing
// For sync'ing kabldaprc

+ 1
- 1
certmanager/conf/dirservconfigpage.h View File

@@ -34,7 +34,7 @@

#include <kcmodule.h>
#include <kleo/cryptoconfig.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

class TQCheckBox;
class TQTimeEdit;

+ 1
- 1
certmanager/conf/dnorderconfigpage.cpp View File

@@ -34,7 +34,7 @@
#include <ui/dnattributeorderconfigwidget.h>
#include <kleo/dn.h>

#include <kdepimmacros.h>
#include <tdepimmacros.h>

#include <tqlayout.h>


+ 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) -lkdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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

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

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

# --version-info CURRENT:REVISION:AGE

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h View File

@@ -38,7 +38,7 @@
#include "qgpgmejob.h"

#include <tqcstring.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace GpgME {
class Error;

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmejob.h View File

@@ -43,7 +43,7 @@
#include <tqstring.h>

#include <vector>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace GpgME {
class Data;

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h View File

@@ -36,7 +36,7 @@
#include <kleo/keygenerationjob.h>

#include "qgpgmejob.h"
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace GpgME {
class Error;

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h View File

@@ -44,7 +44,7 @@

#include <utility>

#include <kdepimmacros.h>
#include <tdepimmacros.h>
namespace GpgME {
class Error;
class Context;

+ 1
- 1
certmanager/lib/cryptplug.h View File

@@ -26,7 +26,7 @@

#include <gpgmepp/context.h>
#include <gpgme.h> // need it for gpgme_protocol_t :(
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace GpgME {
class ImportResult;

+ 1
- 1
certmanager/lib/cryptplugfactory.h View File

@@ -35,7 +35,7 @@

#include "kleo/cryptobackendfactory.h"

#include <kdepimmacros.h>
#include <tdepimmacros.h>

#ifndef LIBKLEOPATRA_NO_COMPAT
namespace Kleo {

+ 1
- 1
certmanager/lib/cryptplugwrapper.h View File

@@ -54,7 +54,7 @@
#include <tqpair.h>
#include <tqstringlist.h>
#include <tqstring.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>


class KConfigBase;

+ 1
- 1
certmanager/lib/kleo/cryptobackendfactory.h View File

@@ -36,7 +36,7 @@
#include <tqobject.h>

#include "cryptobackend.h"
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#include <vector>
#include <map>

+ 1
- 1
certmanager/lib/kleo/dn.h View File

@@ -35,7 +35,7 @@

#include <tqstring.h>
#include <tqvaluevector.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

class TQStringList;
class TQWidget;

+ 1
- 1
certmanager/lib/kleo/enum.h View File

@@ -33,7 +33,7 @@
#ifndef __KLEO_ENUM_H__
#define __KLEO_ENUM_H__

#include <kdepimmacros.h>
#include <tdepimmacros.h>

class TQString;
class TQStringList;

+ 1
- 1
certmanager/lib/kleo/hierarchicalkeylistjob.h View File

@@ -35,7 +35,7 @@

#include <kleo/keylistjob.h>
#include <kleo/cryptobackend.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#include <gpgmepp/keylistresult.h>


+ 1
- 1
certmanager/lib/kleo/keyfiltermanager.h View File

@@ -34,7 +34,7 @@
#define __KLEO_KEYFILTERMANAGER_H__

#include <tqobject.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
namespace GpgME {
class Key;
}

+ 1
- 1
certmanager/lib/kleo/multideletejob.h View File

@@ -36,7 +36,7 @@
#include <kleo/job.h>
#include <kleo/cryptobackend.h>

#include <kdepimmacros.h>
#include <tdepimmacros.h>
#include <tqguardedptr.h>

#include <vector>

+ 1
- 1
certmanager/lib/ui/backendconfigwidget.h View File

@@ -35,7 +35,7 @@
#define __KLEO_UI_BACKENDCONFIGWIDGET_H__

#include <tqwidget.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace Kleo {
class CryptoBackendFactory;

+ 1
- 1
certmanager/lib/ui/cryptoconfigdialog.h View File

@@ -33,7 +33,7 @@
#define CRYPTOCONFIGDIALOG_H

#include <kdialogbase.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace Kleo {


+ 1
- 1
certmanager/lib/ui/directoryserviceswidget.h View File

@@ -34,7 +34,7 @@
#define DIRECTORYSERVICESWIDGET_H
#include "directoryserviceswidgetbase.h"
#include <kurl.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

class CryptPlugWrapper;
namespace Kleo {

+ 1
- 1
certmanager/lib/ui/dnattributeorderconfigwidget.h View File

@@ -34,7 +34,7 @@
#define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__

#include <tqwidget.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
namespace Kleo {
class DNAttributeMapper;
}

+ 1
- 1
certmanager/lib/ui/keyapprovaldialog.h View File

@@ -40,7 +40,7 @@
#include <kleo/enum.h>

#include <kdialogbase.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#include <kpgpkey.h> // for EncryptPref
#include <gpgmepp/key.h>

+ 1
- 1
certmanager/lib/ui/keylistview.h View File

@@ -36,7 +36,7 @@
#include <klistview.h>

#include <gpgmepp/key.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

class TQPainter;
class TQColorGroup;

+ 1
- 1
certmanager/lib/ui/keyrequester.h View File

@@ -53,7 +53,7 @@
#include <kleo/cryptobackend.h>

#include <vector>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace Kleo {
class KeyListView;

+ 1
- 1
certmanager/lib/ui/keyselectiondialog.h View File

@@ -41,7 +41,7 @@

#include <kleo/cryptobackend.h>
#include <gpgmepp/key.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
#include <vector>

class TQVBoxLayout;

+ 1
- 1
certmanager/lib/ui/progressbar.h View File

@@ -34,7 +34,7 @@
#define __KLEO_PROGRESSBAR_H__

#include <tqprogressbar.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
class TQTimer;

namespace Kleo {

+ 1
- 1
certmanager/lib/ui/progressdialog.h View File

@@ -35,7 +35,7 @@

#include <tqprogressdialog.h>
#include <tqstring.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
namespace Kleo {

class Job;

+ 1
- 1
configure.in.in View File

@@ -80,7 +80,7 @@ AC_CHECK_HEADERS(sys/ioctl.h) dnl for kandy/src/modem.cpp
AC_CHECK_HEADERS(sys/file.h sys/stat.h sys/time.h byteswap.h) dnl for at least kmail

dnl the below is copied from kdenetwork's configure as too many apps moved
dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
dnl and noone can say which tests are needed and which are obsolete for tdepim ;(

AC_CHECK_HEADERS(fcntl.h unistd.h sysent.h strings.h paths.h)


+ 1
- 1
dependency-graph.dot View File

@@ -1,5 +1,5 @@
# to create a ps file use 'dot -Tps -o dependency-graph.ps dependency-graph.dot' (dot is part of the graphviz package)
digraph "inter-dependency graph for kdepim" {
digraph "inter-dependency graph for tdepim" {
"akregator" -> "kaddressbook";
"akregator" -> "kontact";
"certmanager" -> "kaddressbook";

+ 1
- 1
doc/akregator/index.docbook View File

@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY akregator "<application>Akregator</application>">
<!ENTITY kappname "&akregator;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>

+ 1
- 1
doc/kaddressbook/index.docbook View File

@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
<!ENTITY kappname "&kaddressbook;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>

+ 4
- 4
doc/kalarm/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kalarm;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here -->
]>
@@ -51,7 +51,7 @@

<keywordset>
<keyword>KDE</keyword>
<keyword>kdepim</keyword>
<keyword>tdepim</keyword>
<keyword>kalarm</keyword>
<keyword>alarm</keyword>
<keyword>reminder</keyword>
@@ -3964,7 +3964,7 @@ together with details of the &kalarm; client application.</para>
files whose format is defined by the document
<ulink url="http://www.w3.org/2002/12/cal/rfc2445.html">RFC2445 -
Internet Calendaring and Scheduling Core Object Specification
(iCalendar)</ulink>. This is the standard format used by all kdepim
(iCalendar)</ulink>. This is the standard format used by all tdepim
applications. &kalarm; uses certain non-standard properties in the
Alarm component, in conformance with RFC2445:
<literal>X-KDE-KALARM-NEXTRECUR</literal>,
@@ -4088,7 +4088,7 @@ url="http://www.astrojar.org.uk/kalarm">http://www.astrojar.org.uk/kalarm</ulink

<para>If you cannot obtain a suitable precompiled binary package, you
need to compile &kalarm; yourself from source files. Get the source
package file <filename>kdepim-x.x.tar.bz2</filename> or
package file <filename>tdepim-x.x.tar.bz2</filename> or
<filename>kalarm-x.x.tar.bz2</filename> (or similar), depending on
whether you want to install &package; or just &kalarm;. Unpack it in a
new folder using a command similar to

+ 5
- 5
doc/kandy/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kandy;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>
@@ -27,7 +27,7 @@ with the data on the desktop.</para>
</abstract>
<keywordset>
<keyword>KDE</keyword>
<keyword>kdepim</keyword>
<keyword>tdepim</keyword>
<keyword>kandy</keyword>
<keyword>synchronizing</keyword>
<keyword>phone</keyword>
@@ -294,12 +294,12 @@ Watts <email>lauri@kde.org</email>.</para>
<title>Requirements</title>

<para>You will need to have the kdelibs package installed in order to
successfully compile the kdepim package that contains &kandy;. The
kdelibs package may be found at the same location as the kdepim
successfully compile the tdepim package that contains &kandy;. The
kdelibs package may be found at the same location as the tdepim
package.</para>

<para>The &kaddressbook; is part of the kdebase package. This can also
be found at the same location as the kdepim package.</para>
be found at the same location as the tdepim package.</para>

</sect1>


+ 1
- 1
doc/karm/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&karm;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
<!ENTITY % addindex "IGNORE">
]>

+ 1
- 1
doc/kleopatra/index.docbook View File

@@ -6,7 +6,7 @@
<!ENTITY gpg "<application>GPG</application>">
<!ENTITY gpgconf "<application>GpgConf</application>">
<!ENTITY kappname "&kleopatra;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY smime "<acronym>S/MIME</acronym>">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">

+ 2
- 2
doc/kmail/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kmail;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY kmail-intro SYSTEM "intro.docbook">
<!ENTITY kmail-getting-started SYSTEM "getting-started.docbook">
<!ENTITY kmail-using-kmail SYSTEM "using-kmail.docbook">
@@ -36,7 +36,7 @@
-->

<!-- TODO:
*index (see kdegames/kpat/)
*index (see tdegames/kpat/)

* guisubmenu vs. guititem ??
* more about security?

+ 1
- 1
doc/kmail/menus.docbook View File

@@ -1256,7 +1256,7 @@ the &kde; address book.</para>
<listitem>
<para>
Starts up <application>kmailcvt</application> (which is
part of kdepim). This application lets you import
part of tdepim). This application lets you import
messages from several email clients &kmail;.
</para>
</listitem>

+ 1
- 1
doc/knode/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&knode;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY introduction SYSTEM "introduction.docbook">
<!ENTITY commands SYSTEM "commands.docbook">
<!ENTITY faq SYSTEM "faq.docbook">

+ 1
- 1
doc/knotes/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&knotes;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>

+ 2
- 2
doc/konsolekalendar/index.docbook View File

@@ -8,7 +8,7 @@

<!ENTITY konsolekalendar "<application>KonsoleKalendar</application>">
<!ENTITY kappname "KonsoleKalendar">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>
@@ -828,7 +828,7 @@ Compiling &kde; 3.2.x</ulink> for complete instructions.</para>

<para>If you cannot obtain a suitable precompiled binary package, you
need to compile &konsolekalendar; yourself from source files. Get the source
package file <filename>kdepim-x.x.tar.bz2</filename>.
package file <filename>tdepim-x.x.tar.bz2</filename>.
Unpack it in a new folder using a command similar to
<userinput><command>tar</command> <option>xvfj
<replaceable>package.tar.bz2</replaceable></option></userinput>, and

+ 2
- 2
doc/kontact/index.docbook View File

@@ -3,7 +3,7 @@
"dtd/kdex.dtd" [
<!ENTITY PIM "<acronym>PIM</acronym>">
<!ENTITY kappname "&kontact;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
<!ENTITY akregator "<application>Akregator</application>">
@@ -54,7 +54,7 @@ address book and other &PIM; functionality. </para></abstract>

<keywordset>
<keyword>KDE</keyword>
<keyword>kdepim</keyword>
<keyword>tdepim</keyword>
<keyword>KMail</keyword>
<keyword>Organizer</keyword>
<keyword>KAddressBook</keyword>

+ 4
- 4
doc/korganizer/index.docbook View File

@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [
<!ENTITY kappname "&korganizer;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY plugins-chapter SYSTEM "plugins-chapter.docbook">
<!ENTITY outlook-to-vcalendar-workshop SYSTEM "outlook-to-vcalendar.docbook">
<!ENTITY % addindex "IGNORE">
@@ -114,7 +114,7 @@ help you keep your schedule. </para></abstract>
<keywordset>
<keyword>KDE</keyword>
<keyword>KOrganizer</keyword>
<keyword>kdepim</keyword>
<keyword>tdepim</keyword>
<keyword>manager</keyword>
<keyword>time</keyword>
<keyword>schedule</keyword>
@@ -4631,7 +4631,7 @@ computer.</para>
<title>Command Line</title>

<para>A nice program to access a &kde; calendar from the command line is konsolekalendar, which
is included in the kdepim package together with &korganizer;.</para>
is included in the tdepim package together with &korganizer;.</para>

</sect1>

@@ -4826,7 +4826,7 @@ on your platform and the size of your calendar(s).</para>
<para>All required libraries are part of standard &kde; libraries
(kdelibs). &kde; base package (kdebase) must also be installed to change
localization preferences like date and time formats. &korganizer; itself
is in the kdepim package. All packages can be found on <ulink
is in the tdepim package. All packages can be found on <ulink
url="http://www.kde.org">&kde; home page</ulink>.</para>

<para>The &korganizer; homepage is at <ulink

+ 1
- 1
doc/korganizer/outlook-to-vcalendar.docbook View File

@@ -32,7 +32,7 @@ to vCalendar</quote> was released on October 17, 2002. See the
</abstract>

<keywordset>
<keyword>kdepim</keyword>
<keyword>tdepim</keyword>
<keyword>KOrganizer</keyword>
<keyword>KOrganizer workshop</keyword>
<keyword>Outlook</keyword>

+ 1
- 1
doc/korn/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY appname "&korn;" >
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % English "INCLUDE">
<!ENTITY % addindex "IGNORE">
]>

+ 3
- 3
doc/kpilot/index.docbook View File

@@ -3,7 +3,7 @@
"dtd/kdex.dtd" [
<!ENTITY kappname "&kpilot;">
<!ENTITY kpilotver "4.4.6">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY USB "<acronym>USB</acronym>">
<!ENTITY PalmOS '<trademark class="registered">Palm OS</trademark>'>
<!ENTITY PalmOne '<trademark class="registered">PalmOne</trademark>'>
@@ -87,7 +87,7 @@
<keywordset>
<keyword>KDE</keyword>
<keyword>KPilot</keyword>
<keyword>kdepim</keyword>
<keyword>tdepim</keyword>
<keyword>palm pilot</keyword>
<keyword>synchronization</keyword>
</keywordset>
@@ -111,7 +111,7 @@ There is a web page for &kpilot;: the <ulink
url="http://www.kpilot.org/">Official &kpilot; Home Page</ulink>. The <ulink
url="http://pim.kde.org/">KDE-PIM website</ulink> also offers useful information
on the subject of <acronym>PIM</acronym> in general. &kpilot; shares the
kdepim-users mailing list, <email>kdepim-users@kde.org</email>. See <ulink
tdepim-users mailing list, <email>tdepim-users@kde.org</email>. See <ulink
url="http://www.kde.org/mailinglists"> the mailing lists page</ulink> for more
information on subscribing and unsubscribing from the list.
</para>

+ 1
- 1
doc/ktnef/index.docbook View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&ktnef;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
]>

+ 1
- 1
doc/kwatchgnupg/index.docbook View File

@@ -5,7 +5,7 @@
<!ENTITY watchgnupg "<application>WatchGnuPG</application>">
<!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>">
<!ENTITY kappname "&kwatchgnupg;">
<!ENTITY package "kdepim">
<!ENTITY package "tdepim">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE">
]>

+ 1
- 1
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) -lkdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui


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

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

bin_PROGRAMS = kabc2mutt

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


+ 1
- 1
kabc/kabcdistlistupdater/CMakeLists.txt View File

@@ -37,6 +37,6 @@ install(

tde_add_executable( kabcdistlistupdater
SOURCES kabcdistlistupdater.cpp
LINK kdepim-shared
LINK tdepim-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 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) -lkdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp


+ 1
- 1
kaddressbook/CMakeLists.txt View File

@@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC
LINK
kabcommon-static kabim-static printer-static
kabinterfaces-shared
kdepim-shared kabc_file-shared kdeprint-shared kutils-shared
tdepim-shared kabc_file-shared tdeprint-shared kutils-shared
DESTINATION ${LIB_INSTALL_DIR}
)

+ 2
- 2
kaddressbook/Makefile.am View File

@@ -17,7 +17,7 @@ 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) -lkdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDADD = libkaddressbook.la

kde_module_LTLIBRARIES = libkaddressbookpart.la
@@ -48,7 +48,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la
-lkabc_file $(LIB_KABC) $(LIB_KHTML) \
$(top_builddir)/kaddressbook/common/libkabcommon.la \
$(top_builddir)/kaddressbook/editors/libkabim.la \
-lkdeprint
-ltdeprint
libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libtdepim/categoryselectdialog.h \
$(top_srcdir)/libtdepim/categoryeditdialog.h \
$(top_builddir)/kaddressbook/common/kabprefs_base.h

+ 1
- 1
kaddressbook/common/kabprefs.h View File

@@ -25,7 +25,7 @@
#define KABPREFS_H

#include <tqstringlist.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
#include "kabprefs_base.h"

class KConfig;

+ 1
- 1
kaddressbook/common/kaddressbook.kcfg View File

@@ -21,7 +21,7 @@
<entry type="String" name="FaxHookApplication">
<label>Fax</label>
<whatsthis></whatsthis>
<default>kdeprintfax --phone %N</default>
<default>tdeprintfax --phone %N</default>
</entry>
<entry type="String" name="SMSHookApplication">
<label>SMS</label>

+ 2
- 2
kaddressbook/features/CMakeLists.txt View File

@@ -46,7 +46,7 @@ install( FILES

tde_add_kpart( ${TARGET} AUTOMOC
SOURCES ${SOURCE}
LINK kabinterfaces-shared kdepim-shared kabc-shared
LINK kabinterfaces-shared tdepim-shared kabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC

tde_add_kpart( libkaddrbk_resourceselection AUTOMOC
SOURCES resourceselection.cpp
LINK kabinterfaces-shared kdepim-shared kabc-shared
LINK kabinterfaces-shared tdepim-shared kabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
kaddressbook/interfaces/configurewidget.h View File

@@ -27,7 +27,7 @@
#include <tqwidget.h>

#include <kconfig.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace KABC {
class AddressBook;

+ 1
- 1
kaddressbook/interfaces/contacteditorwidget.h View File

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

#include <kabc/addressbook.h>
#include <klibloader.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#define KAB_CEW_PLUGIN_VERSION 1


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

@@ -35,7 +35,7 @@
#include <kabc/field.h>
#include <kcommand.h>
#include <kxmlguiclient.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace KABC {
class AddressBook;

+ 1
- 1
kaddressbook/interfaces/extensionwidget.h View File

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

#include <kabc/addressbook.h>
#include <klibloader.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#define KAB_EXTENSIONWIDGET_PLUGIN_VERSION 1


+ 1
- 1
kaddressbook/interfaces/xxport.h View File

@@ -30,7 +30,7 @@
#include <kabc/addresseelist.h>
#include <klibloader.h>
#include <kxmlguiclient.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#define KAB_XXPORT_PLUGIN_VERSION 1


+ 1
- 1
kaddressbook/kabcore.h View File

@@ -33,7 +33,7 @@
#include <tqwidget.h>

#include "core.h"
#include <kdepimmacros.h>
#include <tdepimmacros.h>

namespace KABC {
class AddressBook;

+ 1
- 1
kaddressbook/kaddressbookiface.h View File

@@ -27,7 +27,7 @@
#include <dcopobject.h>
#include <kurl.h>
#include <tqstringlist.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

class KDE_EXPORT KAddressBookIface : virtual public DCOPObject
{

+ 1
- 1
kaddressbook/kaddressbookview.h View File

@@ -31,7 +31,7 @@

#include <kabc/field.h>
#include <klibloader.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>

#include "filter.h"
#include "viewconfigurewidget.h"

+ 3
- 3
kaddressbook/kcmconfigs/CMakeLists.txt View File

@@ -38,7 +38,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC
SOURCES
kcmkabconfig.cpp kabconfigwidget.cpp extensionconfigdialog.cpp
addresseewidget.cpp
LINK kabcommon-static kdepim-shared
LINK kabcommon-static tdepim-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@@ -48,7 +48,7 @@ tde_add_kpart( kcm_kabconfig AUTOMOC
tde_add_kpart( kcm_kabldapconfig AUTOMOC
SOURCES
addhostdialog.cpp kcmkabldapconfig.cpp ldapoptionswidget.cpp
LINK kdepim-shared
LINK tdepim-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@@ -57,6 +57,6 @@ tde_add_kpart( kcm_kabldapconfig AUTOMOC

tde_add_kpart( kcm_kabcustomfields AUTOMOC
SOURCES kcmkabcustomfields.cpp
LINK kabcommon-static kdepim-shared
LINK kabcommon-static tdepim-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabconfig.cpp View File

@@ -31,7 +31,7 @@

#include "kcmkabconfig.h"

#include <kdepimmacros.h>
#include <tdepimmacros.h>

extern "C"
{

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabcustomfields.cpp View File

@@ -29,7 +29,7 @@

#include <tqregexp.h>

#include <kdepimmacros.h>
#include <tdepimmacros.h>

extern "C"
{

+ 1
- 1
kaddressbook/kcmconfigs/kcmkabldapconfig.cpp View File

@@ -32,7 +32,7 @@

#include "kcmkabldapconfig.h"

#include <kdepimmacros.h>
#include <tdepimmacros.h>

extern "C"
{

+ 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) -lkdefx
ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -ltdefx

noinst_HEADERS = ldifvcardcreator.h


+ 1
- 1
kaddressbook/viewconfigurewidget.h View File

@@ -25,7 +25,7 @@
#define VIEWCONFIGUREWIDGET_H

#include <kdialogbase.h>
#include <kdepimmacros.h>
#include <tdepimmacros.h>
#include <tqpixmap.h>

#include "configurewidget.h"

+ 1
- 1
kaddressbook/xxport/HACKING View File

@@ -1,7 +1,7 @@
Coding Style
=============

Please use the coding style conventions from kdepim/kaddressbook/HACKING
Please use the coding style conventions from tdepim/kaddressbook/HACKING
if you want to commit your xxport plugin into the cvs.



+ 1
- 1
kaddressbook/xxportmanager.h View File

@@ -29,7 +29,7 @@

#include <kurl.h>

#include <kdepimmacros.h>
#include <tdepimmacros.h>

#include "xxport.h"


+ 1
- 1
kalarm/daemon.cpp View File

@@ -141,7 +141,7 @@ bool Daemon::start()
kdError() << "Daemon::startApp(): " DAEMON_APP_NAME " not found" << endl;
return false;
}
KApplication::kdeinitExec(execStr);
KApplication::tdeinitExec(execStr);
kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl;
mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up
mStartTimer = new TQTimer(mInstance);

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

@@ -2,13 +2,13 @@ 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) -lkdefx $(LIB_KIO) -lktexteditor
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_SOURCES = alarmdaemoniface.stub alarmguiiface.stub

bin_PROGRAMS = kalarmd

kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
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_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

+ 1
- 1
kalarm/kalarmd/alarmdaemon.cpp View File

@@ -120,7 +120,7 @@ void AlarmDaemon::autostartKAlarm()
kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n";
TQStringList args;
args << TQString::tqfromLatin1("--tray");
int ret = KApplication::kdeinitExec(TQString::tqfromLatin1("kalarm"), args);
int ret = KApplication::tdeinitExec(TQString::tqfromLatin1("kalarm"), args);
if (ret)
kdError(5900) << "AlarmDaemon::autostartKAlarm(): error=" << ret << endl;
else

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

@@ -18,5 +18,5 @@ noinst_HEADERS = \
timeperiod.h shellprocess.h slider.h spinbox.h spinbox2.h \
synchtimer.h spinbox2private.h

DOXYGEN_REFERENCES=kdecore kdeui libtdepim
DOXYGEN_REFERENCES=tdecore tdeui libtdepim
include $(top_srcdir)/admin/Doxyfile.am

+ 1
- 1
kalarm/lib/colourcombo.cpp View File

@@ -3,7 +3,7 @@
* Program: kalarm
* Copyright (c) 2001 - 2003, 2005 by David Jarvie <software@astrojar.org.uk>
*
* Some code taken from kdelibs/kdeui/kcolorcombo.cpp in the KDE libraries:
* Some code taken from kdelibs/tdeui/kcolorcombo.cpp in the KDE libraries:
* Copyright (C) 1997 Martin Jones (mjones@kde.org)
*
* This program is free software; you can redistribute it and/or modify

+ 2
- 2
kandy/src/CMakeLists.txt View File

@@ -46,7 +46,7 @@ tde_add_executable( kandy AUTOMOC
atcommand.cpp commanditem.cpp mobilegui_base.ui mobilegui.cpp
commandscheduler.cpp commandset.cpp kandyprefs.kcfgc
kandyprefsdialog.cpp mobilemain.cpp
LINK kdepim-shared ${LOCKDEV_LIBRARY}
LINK tdepim-shared ${LOCKDEV_LIBRARY}
DESTINATION ${BIN_INSTALL_DIR}
)

@@ -55,6 +55,6 @@ tde_add_executable( kandy AUTOMOC

tde_add_executable( kandy_client AUTOMOC
SOURCES kandy_client.cpp
LINK kdecore-shared
LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 2
- 2
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) -lkdefx $(LIB_KIO) -lktexteditor
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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,7 +17,7 @@ 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) -lkdefx $(LIB_KIO) -lktexteditor
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_SOURCES = kandy_client.cpp


+ 1
- 1
karm/CMakeLists.txt View File

@@ -55,7 +55,7 @@ tde_add_library( karm SHARED AUTOMOC
csvexportdialog.cpp plannerparser.cpp karmdcopiface.skel
taskviewwhatsthis.cpp
VERSION 0.0.0
LINK kcal_resourceremote-shared kdeprint-shared
LINK kcal_resourceremote-shared tdeprint-shared
DESTINATION ${LIB_INSTALL_DIR}
)


+ 4
- 4
karm/Makefile.am View File

@@ -20,10 +20,10 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
karmdcopiface.skel taskviewwhatsthis.cpp
libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kresources/remote/libkcal_resourceremote.la \
$(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -lkdeprint
$(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) -lkdefx $(LIB_KIO) -lktexteditor
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -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 \
@@ -43,9 +43,9 @@ messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/karm.pot

srcdoc:
kdoc -a -p -H -d $(HOME)/web/src/karm karm *.h -lkdecore -lkdeui -lqt
kdoc -a -p -H -d $(HOME)/web/src/karm karm *.h -ltdecore -ltdeui -lqt

DOXYGEN_REFERENCES = kdeui
DOXYGEN_REFERENCES = tdeui
include $(top_srcdir)/admin/Doxyfile.am

#########################################################################

+ 1
- 1
karm/karmstorage.h View File

@@ -34,7 +34,7 @@
#include <calendarresources.h>
#include <vector>
#include "resourcecalendar.h"
#include <kdepimmacros.h>
#include <tdepimmacros.h>

class TQDateTime;
class Preferences;

+ 2
- 2
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) -lkdefx $(LIB_KIO) -lktexteditor
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE)

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

KDE_CXXFLAGS = $(USE_EXCEPTIONS)

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save