Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
b363d2579a
100 changed files with 185 additions and 185 deletions
  1. 2
    2
      CMakeLists.txt
  2. 4
    4
      Makefile.am.in
  3. 1
    1
      README.Kolab
  4. 2
    2
      akregator/src/CMakeLists.txt
  5. 1
    1
      akregator/src/Makefile.am
  6. 4
    4
      akregator/src/akregator_part.cpp
  7. 2
    2
      akregator/src/akregator_part.h
  8. 1
    1
      akregator/src/akregator_run.h
  9. 3
    3
      akregator/src/akregator_view.cpp
  10. 1
    1
      akregator/src/articleviewer.cpp
  11. 1
    1
      akregator/src/feedlistview.cpp
  12. 2
    2
      akregator/src/frame.cpp
  13. 1
    1
      akregator/src/listtabwidget.cpp
  14. 2
    2
      akregator/src/mainwindow.cpp
  15. 3
    3
      akregator/src/mainwindow.h
  16. 3
    3
      akregator/src/pageviewer.cpp
  17. 2
    2
      akregator/src/tabwidget.cpp
  18. 2
    2
      akregator/src/viewer.cpp
  19. 1
    1
      akregator/src/viewer.h
  20. 1
    1
      certmanager/CMakeLists.txt
  21. 1
    1
      certmanager/Makefile.am
  22. 1
    1
      certmanager/kwatchgnupg/Makefile.am
  23. 7
    7
      dependency-graph.dot
  24. 3
    3
      doc/kmail/menus.docbook
  25. 1
    1
      doc/kmail/using-kmail.docbook
  26. 1
    1
      kabc/frontend/Makefile.am
  27. 1
    1
      kabc/kabc2mutt/Makefile.am
  28. 1
    1
      kabc/kabcdistlistupdater/Makefile.am
  29. 1
    1
      kaddressbook/CMakeLists.txt
  30. 1
    1
      kaddressbook/Makefile.am
  31. 1
    1
      kaddressbook/features/Makefile.am
  32. 1
    1
      kaddressbook/features/resourceselection.cpp
  33. 2
    2
      kaddressbook/kabcore.cpp
  34. 2
    2
      kaddressbook/kaddressbook_part.cpp
  35. 3
    3
      kaddressbook/kaddressbook_part.h
  36. 1
    1
      kaddressbook/viewmanager.cpp
  37. 1
    1
      kaddressbook/views/contactlistview.cpp
  38. 1
    1
      kaddressbook/views/kaddressbooktableview.cpp
  39. 1
    1
      kalarm/CMakeLists.txt
  40. 1
    1
      kalarm/Makefile.am
  41. 2
    2
      kalarm/kalarmd/Makefile.am
  42. 2
    2
      kandy/src/Makefile.am
  43. 2
    2
      karm/CMakeLists.txt
  44. 4
    4
      karm/Makefile.am
  45. 1
    1
      karm/karm_part.cpp
  46. 2
    2
      karm/karm_part.h
  47. 1
    1
      karm/mainwindow.cpp
  48. 1
    1
      karm/mainwindow.h
  49. 2
    2
      karm/test/Makefile.am
  50. 1
    1
      karm/test/locking.cpp
  51. 1
    1
      karm/test/remote_storage.sh
  52. 1
    1
      kioslaves/opengroupware/Makefile.am
  53. 1
    1
      kitchensync/src/CMakeLists.txt
  54. 1
    1
      kitchensync/src/Makefile.am
  55. 2
    2
      kitchensync/src/aboutpage.cpp
  56. 1
    1
      kitchensync/src/part.cpp
  57. 3
    3
      kitchensync/src/part.h
  58. 3
    3
      kmail/CMakeLists.txt
  59. 1
    1
      kmail/Mainpage.dox
  60. 2
    2
      kmail/Makefile.am
  61. 1
    1
      kmail/encodingdetector.cpp
  62. 3
    3
      kmail/encodingdetector_ja_p.h
  63. 1
    1
      kmail/headerstyle.cpp
  64. 2
    2
      kmail/kmail_part.cpp
  65. 5
    5
      kmail/kmail_part.h
  66. 2
    2
      kmail/kmcommands.cpp
  67. 2
    2
      kmail/kmcomposewin.cpp
  68. 2
    2
      kmail/kmedit.cpp
  69. 1
    1
      kmail/kmedit.h
  70. 1
    1
      kmail/kmheaders.cpp
  71. 1
    1
      kmail/kmkernel.cpp
  72. 1
    1
      kmail/kmkernel.h
  73. 1
    1
      kmail/kmmessage.cpp
  74. 1
    1
      kmail/kmmsgdict.cpp
  75. 4
    4
      kmail/kmreaderwin.cpp
  76. 2
    2
      kmail/kmtransport.cpp
  77. 1
    1
      kmail/networkaccount.cpp
  78. 1
    1
      kmail/objecttreeparser.cpp
  79. 1
    1
      kmail/regexplineedit.cpp
  80. 1
    1
      kmail/searchwindow.cpp
  81. 2
    2
      kmail/snippetwidget.h
  82. 5
    5
      kmail/tdehtmlparthtmlwriter.cpp
  83. 1
    1
      kmail/tdehtmlparthtmlwriter.h
  84. 1
    1
      kmail/tdemdict.cpp
  85. 0
    0
      kmail/tdemdict.h
  86. 12
    12
      kmail/tests/Makefile.am
  87. 3
    3
      kmail/tests/messagedicttests.cpp
  88. 1
    1
      kmail/tests/messagedicttests.h
  89. 4
    4
      kmail/tests/mimelibtests.cpp
  90. 1
    1
      kmail/tests/mimelibtests.h
  91. 3
    3
      kmail/tests/storagelayermodule.cpp
  92. 3
    3
      kmail/tests/utiltests.cpp
  93. 1
    1
      kmail/tests/utiltests.h
  94. 2
    2
      kmail/urlhandlermanager.cpp
  95. 1
    1
      kmailcvt/Makefile.am
  96. 2
    2
      kmobile/Makefile.am
  97. 1
    1
      knode/CMakeLists.txt
  98. 1
    1
      knode/Makefile.am
  99. 2
    2
      knode/articlewidget.cpp
  100. 0
    0
      knode/knaccountmanager.cpp

+ 2
- 2
CMakeLists.txt View File

@@ -109,7 +109,7 @@ option( BUILD_KORGANIZER "Build korganizer" ${BUILD_ALL} )
option( BUILD_PLUGINS "Build plugins" ${BUILD_ALL} )
option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
option( BUILD_KODE "Build kode" ${BUILD_ALL} )
option( BUILD_KRESOURCES "Build kresources" ${BUILD_ALL} )
option( BUILD_KRESOURCES "Build tderesources" ${BUILD_ALL} )
option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
@@ -181,7 +181,7 @@ tde_conditional_add_subdirectory( BUILD_KORGANIZER korganizer )
tde_conditional_add_subdirectory( BUILD_PLUGINS plugins )
tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
tde_conditional_add_subdirectory( BUILD_KODE kode )
tde_conditional_add_subdirectory( BUILD_KRESOURCES kresources )
tde_conditional_add_subdirectory( BUILD_KRESOURCES tderesources )
tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
tde_conditional_add_subdirectory( BUILD_KABC kabc )
tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )

+ 4
- 4
Makefile.am.in View File

@@ -11,7 +11,7 @@
COMPILE_AFTER_libkmime = libemailfunctions
COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
COMPILE_AFTER_libkholidays = korganizer kontact
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes kresources kfile-plugins
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources kfile-plugins
COMPILE_AFTER_mimelib = korn kmail
COMPILE_AFTER_libtdenetwork = kmail knode
COMPILE_AFTER_libksieve = kmail
@@ -25,14 +25,14 @@ COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator
COMPILE_BEFORE_kandy = libtdepim
COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime
COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
COMPILE_BEFORE_karm = libtdepim kresources
COMPILE_BEFORE_karm = libtdepim tderesources
COMPILE_BEFORE_plugins = kmail libtdepim libkcal
COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
COMPILE_BEFORE_kioslaves = libkmime libtdepim
COMPILE_BEFORE_libkpimexchange = libtdepim
COMPILE_BEFORE_kalarm = libtdepim libkmime
COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail
COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode
COMPILE_BEFORE_wizards = libtdepim tderesources korganizer kaddressbook kmail
COMPILE_BEFORE_korn = libtdenetwork
COMPILE_BEFORE_kitchensync = libtdepim
COMPILE_BEFORE_akregator = libtdepim

+ 1
- 1
README.Kolab View File

@@ -76,7 +76,7 @@ General Notes:
==============
Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion
is as follows:
1. All available addressbook resources as seen in "kcmshell kresources", section "kabc"
1. All available addressbook resources as seen in "kcmshell tderesources", section "kabc"
2. LDAP

Nothing special, AFAIK

+ 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 tdepim-shared kparts-shared
LINK akregatorprivate-shared tdepim-shared tdeparts-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 tdepim-shared khtml-shared
LINK akregatorprivate-shared tdepim-shared tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la


+ 4
- 4
akregator/src/akregator_part.cpp View File

@@ -32,7 +32,7 @@
#include <kconfigdialog.h>
#include <kfiledialog.h>
#include <kglobalsettings.h>
#include <khtmldefaults.h>
#include <tdehtmldefaults.h>
#include <kinstance.h>
#include <kmainwindow.h>
#include <kmessagebox.h>
@@ -45,9 +45,9 @@
#include <ktempfile.h>
#include <ktrader.h>
#include <kio/netaccess.h>
#include <kparts/browserinterface.h>
#include <kparts/genericfactory.h>
#include <kparts/partmanager.h>
#include <tdeparts/browserinterface.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/partmanager.h>

#include <tqfile.h>
#include <tqobjectlist.h>

+ 2
- 2
akregator/src/akregator_part.h View File

@@ -26,8 +26,8 @@
#ifndef _AKREGATORPART_H_
#define _AKREGATORPART_H_

#include <kparts/browserextension.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>
#include <kurl.h>

#include "config.h"

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

@@ -25,7 +25,7 @@
#ifndef AKREGATOR_RUN_H
#define AKREGATOR_RUN_H

#include <kparts/browserrun.h>
#include <tdeparts/browserrun.h>

namespace Akregator
{

+ 3
- 3
akregator/src/akregator_view.cpp View File

@@ -67,8 +67,8 @@
#include <kdialog.h>
#include <kfiledialog.h>
#include <kfileitem.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klineedit.h>
@@ -82,7 +82,7 @@
#include <kstandarddirs.h>
#include <kurl.h>
#include <kxmlguifactory.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>

#include <tqbuttongroup.h>
#include <tqcheckbox.h>

+ 1
- 1
akregator/src/articleviewer.cpp View File

@@ -31,7 +31,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kglobalsettings.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <klocale.h>
#include <kprocess.h>
#include <krun.h>

+ 1
- 1
akregator/src/feedlistview.cpp View File

@@ -43,7 +43,7 @@
#include <kiconeffect.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <kstringhandler.h>
#include <kurldrag.h>


+ 2
- 2
akregator/src/frame.cpp View File

@@ -28,8 +28,8 @@
#include <kactioncollection.h>
#include <kdebug.h>
#include <klocale.h>
#include <kparts/browserextension.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>

#include <libtdepim/progressmanager.h>


+ 1
- 1
akregator/src/listtabwidget.cpp View File

@@ -27,7 +27,7 @@
#include "folder.h"
#include "treenode.h"

#include <kmultitabbar.h>
#include <tdemultitabbar.h>

#include <tqiconset.h>
#include <tqlayout.h>

+ 2
- 2
akregator/src/mainwindow.cpp View File

@@ -41,7 +41,7 @@
#include <klibloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>
#include <ksqueezedtextlabel.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
@@ -237,7 +237,7 @@ bool MainWindow::queryExit()
kdDebug() << "MainWindow::queryExit()" << endl;
if ( !kapp->sessionSaving() )
{
delete m_part; // delete that here instead of dtor to ensure nested khtmlparts are deleted before singleton objects like KHTMLPageCache
delete m_part; // delete that here instead of dtor to ensure nested tdehtmlparts are deleted before singleton objects like KHTMLPageCache
m_part = 0;
}
else

+ 3
- 3
akregator/src/mainwindow.h View File

@@ -30,9 +30,9 @@
#endif

#include <kapplication.h>
#include <kparts/mainwindow.h>
#include <kparts/browserinterface.h>
#include <kparts/browserextension.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/browserinterface.h>
#include <tdeparts/browserextension.h>
#include <kio/job.h>

class KActionCollection;

+ 3
- 3
akregator/src/pageviewer.cpp View File

@@ -35,14 +35,14 @@
#include <kbookmarkmanager.h>
#include <kconfig.h>
#include <kglobalsettings.h>
#include <khtml_settings.h>
#include <khtmlview.h>
#include <tdehtml_settings.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
#include <kstdaccel.h>
#include <kparts/browserinterface.h>
#include <tdeparts/browserinterface.h>

#include <tqclipboard.h>
#include <tqcstring.h>

+ 2
- 2
akregator/src/tabwidget.cpp View File

@@ -41,8 +41,8 @@
#include <kpopupmenu.h>
#include <krun.h>
#include <klocale.h>
#include <khtmlview.h>
#include <khtml_part.h>
#include <tdehtmlview.h>
#include <tdehtml_part.h>
#include <kiconloader.h>
#include <kurl.h>
#include <kurldrag.h>

+ 2
- 2
akregator/src/viewer.cpp View File

@@ -26,7 +26,7 @@
#include <kaction.h>
#include <kapplication.h>
#include <kfiledialog.h>
#include <khtmlview.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -35,7 +35,7 @@
#include <krun.h>
#include <kshell.h>
#include <kurl.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>

#include <tqaccel.h>
#include <tqclipboard.h>

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

@@ -25,7 +25,7 @@
#ifndef VIEWER_H
#define VIEWER_H

#include <khtml_part.h>
#include <tdehtml_part.h>

class KURL;


+ 1
- 1
certmanager/CMakeLists.txt View File

@@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
certificateinfowidget.ui certificateinfowidgetimpl.cpp
crlview.cpp storedtransferjob.cpp certlistview.cpp
LINK conf-static kleopatra-shared kutils-shared kabc-shared
LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)


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

rcdir = $(kde_datadir)/kleopatra

+ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)

rcdir = $(kde_datadir)/kwatchgnupg

+ 7
- 7
dependency-graph.dot View File

@@ -6,18 +6,18 @@ digraph "inter-dependency graph for tdepim" {
"certmanager" -> "kmail";
"certmanager" -> "libkpimidentities";
"kaddressbook" -> "kontact";
"kaddressbook" -> "kresources";
"kaddressbook" -> "tderesources";
"kaddressbook" -> "wizards";
"kgantt" -> "korganizer";
"kmail" -> "plugins";
"kmail" -> "wizards";
"knotes" -> "kontact";
"knotes" -> "kresources";
"kode" -> "kresources";
"knotes" -> "tderesources";
"kode" -> "tderesources";
"korganizer" -> "kontact";
"korganizer" -> "wizards";
"kresources" -> "karm";
"kresources" -> "wizards";
"tderesources" -> "karm";
"tderesources" -> "wizards";
"ktnef" -> "libkcal";
"libemailfunctions" -> "kmail";
"libemailfunctions" -> "korganizer";
@@ -31,7 +31,7 @@ digraph "inter-dependency graph for tdepim" {
"libkcal" -> "konsolekalendar";
"libkcal" -> "korganizer";
"libkcal" -> "kpilot";
"libkcal" -> "kresources";
"libkcal" -> "tderesources";
"libkcal" -> "libtdepim";
"libkcal" -> "libkpimexchange";
"libkcal" -> "plugins";
@@ -64,7 +64,7 @@ digraph "inter-dependency graph for tdepim" {
"libkpgp" -> "kmail";
"libkpgp" -> "knode";
"libkpimexchange" -> "korganizer";
"libkpimexchange" -> "kresources";
"libkpimexchange" -> "tderesources";
"libkpimidentities" -> "kmail";
"libkpimidentities" -> "korganizer";
"libksieve" -> "kmail";

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

@@ -2100,9 +2100,9 @@ attachment window.</para>
</menuchoice>
</term>
<listitem>
<para>Uses <ulink url="/kspell/">&kspell;</ulink> to check the spelling in the body of your
<para>Uses <ulink url="/tdespell/">&tdespell;</ulink> to check the spelling in the body of your
message. Note that
you have to configure &kspell; with <menuchoice><guimenu>Settings</guimenu>
you have to configure &tdespell; with <menuchoice><guimenu>Settings</guimenu>
<guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the
first time.</para>
</listitem>
@@ -2163,7 +2163,7 @@ tools to change certain properties of the composed text.</para>
</menuchoice>
</term>
<listitem>
<para>Allows you to configure <ulink url="/kspell/">&kspell;</ulink>, &kde;'s spellchecker.</para>
<para>Allows you to configure <ulink url="/tdespell/">&tdespell;</ulink>, &kde;'s spellchecker.</para>
</listitem>
</varlistentry>


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

@@ -366,7 +366,7 @@ automatic spellchecking in the <menuchoice><guimenu>Options</guimenu></menuchoic
<para>To check the spelling of your message using a dialog, select
<menuchoice><guimenu>Tools</guimenu>
<guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses
<ulink url="/kspell/">&kspell;</ulink> to
<ulink url="/tdespell/">&tdespell;</ulink> to
check spelling, which is the &kde; frontend to the
<application>ispell</application> or <application>aspell</application> spelling
checker. Note that you may first need to configure the spellchecker using

+ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcfrontend_LDADD = -lkabc $(LIB_TDECORE)
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabc2mutt_LDADD = -lkabc $(LIB_TDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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
tdepim-shared kabc_file-shared tdeprint-shared kutils-shared
tdepim-shared kabc_file-shared tdeprint-shared tdeutils-shared
DESTINATION ${LIB_INSTALL_DIR}
)

+ 1
- 1
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kaddressbook_LDADD = libkaddressbook.la

kde_module_LTLIBRARIES = libkaddressbookpart.la

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

@@ -26,7 +26,7 @@ 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_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources
libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources

noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h


+ 1
- 1
kaddressbook/features/resourceselection.cpp View File

@@ -36,7 +36,7 @@
#include <kinputdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kresources/configdialog.h>
#include <tderesources/configdialog.h>

#include "core.h"


+ 2
- 2
kaddressbook/kabcore.cpp View File

@@ -52,13 +52,13 @@
#include <kcmultidialog.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprinter.h>
#include <kprotocolinfo.h>
#include <kpushbutton.h>
#include <kresources/selectdialog.h>
#include <tderesources/selectdialog.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kstdguiitem.h>

+ 2
- 2
kaddressbook/kaddressbook_part.cpp View File

@@ -29,8 +29,8 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
#include <kparts/genericfactory.h>
#include <kparts/statusbarextension.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/statusbarextension.h>
#include <kstatusbar.h>

#include "kabcore.h"

+ 3
- 3
kaddressbook/kaddressbook_part.h View File

@@ -23,9 +23,9 @@
#ifndef KADDRESSBOOK_PART_H
#define KADDRESSBOOK_PART_H

#include <kparts/event.h>
#include <kparts/factory.h>
#include <kparts/part.h>
#include <tdeparts/event.h>
#include <tdeparts/factory.h>
#include <tdeparts/part.h>

#include "kaddressbookiface.h"


+ 1
- 1
kaddressbook/viewmanager.cpp View File

@@ -35,7 +35,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmultipledrag.h>
#include <tdemultipledrag.h>
#include <ktempdir.h>
#include <ktrader.h>
#include <kurldrag.h>

+ 1
- 1
kaddressbook/views/contactlistview.cpp View File

@@ -38,7 +38,7 @@
#include <kurl.h>
#include <kabc/addressbook.h>
#include <kabc/addressee.h>
#include <kimproxy.h>
#include <tdeimproxy.h>

#include "kaddressbooktableview.h"


+ 1
- 1
kaddressbook/views/kaddressbooktableview.cpp View File

@@ -48,7 +48,7 @@
#include <kmessagebox.h>
#include <kurl.h>
#include <kurlrequester.h>
#include <kimproxy.h>
#include <tdeimproxy.h>

#include "configuretableviewdialog.h"
#include "contactlistview.h"

+ 1
- 1
kalarm/CMakeLists.txt View File

@@ -74,6 +74,6 @@ tde_add_executable( kalarm AUTOMOC
kalarmd/alarmguiiface.skel
LINK
kalarm-static kalarmd-static
kpimidentities-shared kutils-shared ${ARTS_LIBRARIES}
kpimidentities-shared tdeutils-shared ${ARTS_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)

+ 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_TDEUI) $(ARTSLIB) $(LIBXTST)
-lkabc -ltdeutils $(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 \

+ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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 \

+ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -19,7 +19,7 @@ KDE_ICON = kandy
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kandy_client_LDADD = $(LIB_TDECORE)
kandy_client_SOURCES = kandy_client.cpp


+ 2
- 2
karm/CMakeLists.txt View File

@@ -13,7 +13,7 @@ tde_import( libkmime )
tde_import( ktnef )
tde_import( libkcal )
tde_import( libtdepim )
tde_import( kresources )
tde_import( tderesources )

add_subdirectory( support )
add_subdirectory( pics )
@@ -25,7 +25,7 @@ include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/libkcal
${CMAKE_SOURCE_DIR}/libtdepim
${CMAKE_SOURCE_DIR}/kresources/remote
${CMAKE_SOURCE_DIR}/tderesources/remote
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

+ 4
- 4
karm/Makefile.am View File

@@ -1,13 +1,13 @@

############ Autoconf-generated variables ###################
INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/kresources/remote -I$(top_srcdir) $(all_includes)
INCLUDES = -I$(top_srcdir)/libkcal -I$(top_srcdir)/tderesources/remote -I$(top_srcdir) $(all_includes)

bin_PROGRAMS = karm
SUBDIRS = support pics test

METASOURCES = AUTO

COMPILE_BEFORE_karm = libtdepim kresources
COMPILE_BEFORE_karm = libtdepim tderesources

noinst_LTLIBRARIES = libkarm_shared.la

@@ -19,11 +19,11 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
csvexportdialog_base.ui csvexportdialog.cpp plannerparser.cpp \
karmdcopiface.skel taskviewwhatsthis.cpp
libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/kresources/remote/libkcal_resourceremote.la \
$(top_builddir)/tderesources/remote/libkcal_resourceremote.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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \

+ 1
- 1
karm/karm_part.cpp View File

@@ -156,7 +156,7 @@ void karmPart::makeMenus()
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");

+ 2
- 2
karm/karm_part.h View File

@@ -1,9 +1,9 @@
#ifndef _KARMPART_H_
#define _KARMPART_H_

#include <kparts/part.h>
#include <tdeparts/part.h>
#include "karmerrors.h"
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include <karmdcopiface.h>
#include "reportcriteria.h"
#include <tqlistview.h>

+ 1
- 1
karm/mainwindow.cpp View File

@@ -294,7 +294,7 @@ void MainWindow::makeMenus()
TQT_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new KAction( i18n("New &Subtask..."),
TQString::fromLatin1("kmultiple"), CTRL+ALT+Key_N,
TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView),
TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");

+ 1
- 1
karm/mainwindow.h View File

@@ -1,7 +1,7 @@
#ifndef KARM_MAIN_WINDOW_H
#define KARM_MAIN_WINDOW_H

#include <kparts/mainwindow.h>
#include <tdeparts/mainwindow.h>

#include "karmerrors.h"
#include <karmdcopiface.h>

+ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)

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

KDE_CXXFLAGS = $(USE_EXCEPTIONS)

+ 1
- 1
karm/test/locking.cpp View File

@@ -128,7 +128,7 @@ int main( int argc, char *argv[] )
short rval = 0;

// Use another directory than the real one, just to keep things clean
// TDEHOME needs to be writable though, for a ksycoca database
// TDEHOME needs to be writable though, for a tdesycoca database
// FIXME: Delete this directory when done with test.
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testresource" ), true );


+ 1
- 1
karm/test/remote_storage.sh View File

@@ -15,7 +15,7 @@ DCOPID=`dcop | grep karm 2>/dev/null`
if [ -n $DCOPID ]; then dcop $DCOPID KarmDCOPIface quit; fi;
if [ -e $TESTFILE_LOCAL ]; then rm $TESTFILE_LOCAL; fi

# if the file does not exist, kresources pops up a modal dialog box
# if the file does not exist, tderesources pops up a modal dialog box
# telling us that a file does not exist.

touch $TESTFILE_LOCAL

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

@@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/opengroupware/soap \
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/opengroupware/soap \
$(all_includes)

noinst_HEADERS = opengroupware.h

+ 1
- 1
kitchensync/src/CMakeLists.txt View File

@@ -72,6 +72,6 @@ tde_add_library( kitchensync SHARED AUTOMOC
configguijescs.cpp configguievo2.cpp configguimoto.cpp
configguisynce.cpp configguisunbird.cpp
VERSION 0.0.0
LINK qopensync-shared tdepim-shared khtml-shared
LINK qopensync-shared tdepim-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)

+ 1
- 1
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kitchensync_LDADD = libkitchensync.la

xdg_apps_DATA = kitchensync.desktop

+ 2
- 2
kitchensync/src/aboutpage.cpp View File

@@ -24,8 +24,8 @@
#include <kaboutdata.h>
#include <kapplication.h>
#include <kdebug.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <krun.h>

+ 1
- 1
kitchensync/src/part.cpp View File

@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>

#include "mainwidget.h"


+ 3
- 3
kitchensync/src/part.h View File

@@ -21,9 +21,9 @@
#ifndef PART_H
#define PART_H

#include <kparts/event.h>
#include <kparts/factory.h>
#include <kparts/part.h>
#include <tdeparts/event.h>
#include <tdeparts/factory.h>
#include <tdeparts/part.h>

class TDEAboutData;


+ 3
- 3
kmail/CMakeLists.txt View File

@@ -140,7 +140,7 @@ set( ${target}_SRCS
kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp klistboxdialog.cpp
kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp
@@ -151,7 +151,7 @@ set( ${target}_SRCS
kmkernel.cpp accountdialog.cpp searchwindow.cpp vcardviewer.cpp vacationdialog.cpp
vacation.cpp sievedebugdialog.cpp sieveconfig.cpp sievejob.cpp kmpopheaders.cpp
kmpopfiltercnfrmdlg.cpp kmmimeparttree.cpp mailinglist-magic.cpp kmacctmaildir.cpp
headerstyle.cpp headerstrategy.cpp khtmlparthtmlwriter.cpp filehtmlwriter.cpp
headerstyle.cpp headerstrategy.cpp tdehtmlparthtmlwriter.cpp filehtmlwriter.cpp
teehtmlwriter.cpp mailcomposerIface.skel objecttreeparser.cpp objecttreeparser_p.cpp
attachmentcollector.cpp bodypartformatterfactory.cpp bodypartformatter.cpp partNode.cpp
mailsourceviewer.cpp kmcommands.cpp kmreadermainwin.cpp kmstartup.cpp kmmainwidget.cpp
@@ -191,7 +191,7 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
LINK
emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared
mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY}
DESTINATION ${LIB_INSTALL_DIR}
)


+ 1
- 1
kmail/Mainpage.dox View File

@@ -42,7 +42,7 @@ access to all the core KMail functionality.

FIXME this has moved to libkpimidentities, right?

Files: identity*, kmidentity.{h,cpp}, configuredialog.cpp,
Files: identity*, tdemidentity.{h,cpp}, configuredialog.cpp,
signatureconfigurator.{h,cpp}

Contact Marc Mutz <mutz@kde.org> on questions...

+ 2
- 2
kmail/Makefile.am View File

@@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
csshelper.cpp klistboxdialog.cpp \
actionscheduler.cpp messageproperty.cpp \
kmmsgpart.cpp kmmsginfo.cpp \
accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@@ -88,7 +88,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
kmmimeparttree.cpp \
mailinglist-magic.cpp kmacctmaildir.cpp \
attachmentstrategy.cpp \
headerstrategy.cpp headerstyle.cpp khtmlparthtmlwriter.cpp \
headerstrategy.cpp headerstyle.cpp tdehtmlparthtmlwriter.cpp \
filehtmlwriter.cpp teehtmlwriter.cpp \
mailcomposerIface.skel objecttreeparser.cpp \
objecttreeparser_p.cpp \

+ 1
- 1
kmail/encodingdetector.cpp View File

@@ -1135,7 +1135,7 @@ bool EncodingDetector::analyze(const char *data, int len)
case EncodingDetector::WesternEuropean:
if (setEncoding(automaticDetectionForWesternEuropean( (const unsigned char*) data, len ), AutoDetectedEncoding))
return true;
else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for khtml
else if (d->m_defaultCodec->mibEnum()==MibLatin1) //detection for tdehtml
{
return setEncoding("iso-8859-15",AutoDetectedEncoding);
}

+ 3
- 3
kmail/encodingdetector_ja_p.h View File

@@ -42,7 +42,7 @@
#ifdef TQ_WS_WIN
#undef UNICODE
#endif
namespace khtml {
namespace tdehtml {
class guess_arc {
public:
unsigned int next; /* next state */
@@ -50,7 +50,7 @@ namespace khtml {
};
}

using namespace khtml;
using namespace tdehtml;

typedef signed char dfa_table[256];

@@ -62,7 +62,7 @@ extern guess_arc guess_sjis_ar[6];
extern const dfa_table guess_utf8_st[];
extern guess_arc guess_utf8_ar[11];

namespace khtml {
namespace tdehtml {

class guess_dfa {
public:

+ 1
- 1
kmail/headerstyle.cpp View File

@@ -53,7 +53,7 @@ using namespace KPIM;
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <kabc/stdaddressbook.h>
#include <kabc/addresseelist.h>
#include <kmdcodec.h>

+ 2
- 2
kmail/kmail_part.cpp View File

@@ -44,8 +44,8 @@ using KMail::AccountManager;
using KRecentAddress::RecentAddresses;

#include <kapplication.h>
#include <kparts/mainwindow.h>
#include <kparts/genericfactory.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/genericfactory.h>
#include <knotifyclient.h>
#include <dcopclient.h>
#include <kiconloader.h>

+ 5
- 5
kmail/kmail_part.h View File

@@ -28,11 +28,11 @@
#include "kmailpartIface.h"

#include <tdeversion.h>
#include <kparts/browserextension.h>
#include <kparts/statusbarextension.h>
#include <kparts/factory.h>
#include <kparts/event.h>
#include <kparts/part.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/statusbarextension.h>
#include <tdeparts/factory.h>
#include <tdeparts/event.h>
#include <tdeparts/part.h>

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

+ 2
- 2
kmail/kmcommands.cpp View File

@@ -67,13 +67,13 @@
#include <kdirselectdialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
#include <kprogress.h>
#include <krun.h>
#include <kbookmarkmanager.h>
#include <kstandarddirs.h>
#include <ktempfile.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <kuserprofile.h>
// KIO headers
#include <kio/job.h>

+ 2
- 2
kmail/kmcomposewin.cpp View File

@@ -109,8 +109,8 @@ using KRecentAddress::RecentAddresses;
#include "globalsettings.h"
#include "replyphrases.h"

#include <kspell.h>
#include <kspelldlg.h>
#include <tdespell.h>
#include <tdespelldlg.h>
#include <spellingfilter.h>
#include <ksyntaxhighlighter.h>
#include <kcolordialog.h>

+ 2
- 2
kmail/kmedit.cpp View File

@@ -38,8 +38,8 @@ using KPIM::MailListDrag;
#include "globalsettings.h"
#include "replyphrases.h"

#include <kspell.h>
#include <kspelldlg.h>
#include <tdespell.h>
#include <tdespelldlg.h>
#include <spellingfilter.h>
#include <ksyntaxhighlighter.h>


+ 1
- 1
kmail/kmedit.h View File

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

#include <tdeversion.h>
#include <keditcl.h>
#include <kspell.h>
#include <tdespell.h>
#include <ksyntaxhighlighter.h>
#include <tqmap.h>
#include <tqstringlist.h>

+ 1
- 1
kmail/kmheaders.cpp View File

@@ -2401,7 +2401,7 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e )
if( count == 1 )
pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
else
pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) );
pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );

// Calculate hotspot (as in Konqueror)
if( !pixmap.isNull() ) {

+ 1
- 1
kmail/kmkernel.cpp View File

@@ -69,7 +69,7 @@ using KMail::FolderIface;
#include <kpgp.h>
#include <kdebug.h>
#include <kio/netaccess.h>
#include <kwallet.h>
#include <tdewallet.h>
using KWallet::Wallet;
#include "actionscheduler.h"


+ 1
- 1
kmail/kmkernel.h View File

@@ -11,7 +11,7 @@

#include <kconfig.h>
#include <tdeversion.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <tdepimmacros.h>

#include "kmailIface.h"

+ 1
- 1
kmail/kmmessage.cpp View File

@@ -38,7 +38,7 @@ using KMail::HeaderStrategy;
#include <kglobalsettings.h>
#include <kdebug.h>
#include <kconfig.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <kuser.h>
#include <kidna.h>
#include <kasciistricmp.h>

+ 1
- 1
kmail/kmmsgdict.cpp View File

@@ -4,7 +4,7 @@
#include "kmfolderindex.h"
#include "kmfolder.h"
#include "kmmsgdict.h"
#include "kmdict.h"
#include "tdemdict.h"
#include "globalsettings.h"
#include "folderstorage.h"


+ 4
- 4
kmail/kmreaderwin.cpp View File

@@ -37,7 +37,7 @@ using KMail::AttachmentStrategy;
using KMail::HeaderStrategy;
#include "headerstyle.h"
using KMail::HeaderStyle;
#include "khtmlparthtmlwriter.h"
#include "tdehtmlparthtmlwriter.h"
using KMail::HtmlWriter;
using KMail::KHtmlPartHtmlWriter;
#include "htmlstatusbar.h"
@@ -80,9 +80,9 @@ using KMail::TeeHtmlWriter;
#include <kabc/addressee.h>
#include <kabc/vcardconverter.h>

// khtml headers
#include <khtml_part.h>
#include <khtmlview.h> // So that we can get rid of the frames
// tdehtml headers
#include <tdehtml_part.h>
#include <tdehtmlview.h> // So that we can get rid of the frames
#include <dom/html_element.h>
#include <dom/html_block.h>
#include <dom/html_document.h>

+ 2
- 2
kmail/kmtransport.cpp View File

@@ -38,7 +38,7 @@
#include <kmessagebox.h>
#include <kseparator.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
using KWallet::Wallet;
#include <kprotocolinfo.h>

@@ -87,7 +87,7 @@ void KMTransportInfo::readConfig(int id)
return;

if ( !mPasswd.isEmpty() ) {
// migration to kwallet if available
// migration to tdewallet if available
if ( Wallet::isEnabled() ) {
config->deleteEntry( "pass" );
mPasswdDirty = true;

+ 1
- 1
kmail/networkaccount.cpp View File

@@ -37,7 +37,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <kwallet.h>
#include <tdewallet.h>
using TDEIO::MetaData;
using KWallet::Wallet;


+ 1
- 1
kmail/objecttreeparser.cpp View File

@@ -89,7 +89,7 @@
#include <klocale.h>
#include <kmimetype.h>
#include <kglobal.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include <ktempfile.h>
#include <kstandarddirs.h>
#include <kapplication.h>

+ 1
- 1
kmail/regexplineedit.cpp View File

@@ -38,7 +38,7 @@

#include <klocale.h>
#include <klineedit.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
#include <kdialog.h>


+ 1
- 1
kmail/searchwindow.cpp View File

@@ -95,7 +95,7 @@ class MatchListView : public KListView
if( mailList.count() == 1 )
pixmap = TQPixmap( DesktopIcon("message", KIcon::SizeSmall) );
else
pixmap = TQPixmap( DesktopIcon("kmultiple", KIcon::SizeSmall) );
pixmap = TQPixmap( DesktopIcon("tdemultiple", KIcon::SizeSmall) );

d->setPixmap( pixmap );
return d;

+ 2
- 2
kmail/snippetwidget.h View File

@@ -19,8 +19,8 @@
#include <tqtooltip.h>
#include <tqrect.h>

#include <ktexteditor/editinterface.h>
#include <ktexteditor/view.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/view.h>
#include "snippetconfig.h"

class KDevProject;

kmail/khtmlparthtmlwriter.cpp → kmail/tdehtmlparthtmlwriter.cpp View File

@@ -1,5 +1,5 @@
/* -*- c++ -*-
khtmlparthtmlwriter.cpp
tdehtmlparthtmlwriter.cpp

This file is part of KMail, the KDE mail client.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
@@ -31,11 +31,11 @@

#include <config.h>

#include "khtmlparthtmlwriter.h"
#include "tdehtmlparthtmlwriter.h"

#include <kdebug.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>

#include <dom/dom_string.h>
#include <dom/html_document.h>
@@ -151,4 +151,4 @@ namespace KMail {

} // namespace KMail

#include "khtmlparthtmlwriter.moc"
#include "tdehtmlparthtmlwriter.moc"

kmail/khtmlparthtmlwriter.h → kmail/tdehtmlparthtmlwriter.h View File

@@ -1,5 +1,5 @@
/* -*- c++ -*-
khtmlparthtmlwriter.h
tdehtmlparthtmlwriter.h

This file is part of KMail, the KDE mail client.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>

kmail/kmdict.cpp → kmail/tdemdict.cpp View File

@@ -5,7 +5,7 @@
#include <config.h>
#endif

#include "kmdict.h"
#include "tdemdict.h"
#include "kmglobal.h"
#include <kdebug.h>


kmail/kmdict.h → kmail/tdemdict.h View File


+ 12
- 12
kmail/tests/Makefile.am View File

@@ -2,22 +2,22 @@ INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
METASOURCES = AUTO

check_LTLIBRARIES = kunittest_storagelayermodule.la \
kunittest_utilmodule.la \
kunittest_mimelibmodule.la
check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
tdeunittest_utilmodule.la \
tdeunittest_mimelibmodule.la

kunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
kunittest_storagelayermodule_la_LIBADD = -lkunittest
kunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
kunittest_utilmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
kunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
kunittest_mimelibmodule_la_LIBADD = -lkunittest ../../mimelib/libmimelib.la
tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
tdeunittest_mimelibmodule_la_SOURCES = mimelibtests.cpp ../util.cpp
tdeunittest_mimelibmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la

#LIBADD = -lkunittest
#LIBADD = -ltdeunittest
AM_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)

check-local:
kunittestmodrunner
tdeunittestmodrunner

guicheck:
kunittestguimodrunner
tdeunittestguimodrunner

+ 3
- 3
kmail/tests/messagedicttests.cpp View File

@@ -4,10 +4,10 @@
*/

#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>

#include "kmdict.h"
#include "tdemdict.h"

#include "messagedicttests.h"


+ 1
- 1
kmail/tests/messagedicttests.h View File

@@ -7,7 +7,7 @@
#ifndef MESSAGEDICTTESTS_H
#define MESSAGEDICTTESTS_H

#include <kunittest/tester.h>
#include <tdeunittest/tester.h>

class KMDict;


+ 4
- 4
kmail/tests/mimelibtests.cpp View File

@@ -21,12 +21,12 @@
#include "mimelibtests.moc"

#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>

using namespace KUnitTest;

KUNITTEST_MODULE( kunittest_mimelibmodule, "Mimelib Tests" );
KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );

#include <mimelib/string.h>
@@ -56,7 +56,7 @@ static TQString makePrintable( const DwString& str )
TQCString MimeLibTester::readFile(const TQString& fileName)
{
TQFile file( fileName );
// #!@#$& kunittest... VERIFY() does nothing in setUp. Using assert instead.
// #!@#$& tdeunittest... VERIFY() does nothing in setUp. Using assert instead.
bool ok = file.open( IO_ReadOnly );
if ( !ok ) {
kdError() << fileName << " not found!" << endl;

+ 1
- 1
kmail/tests/mimelibtests.h View File

@@ -20,7 +20,7 @@
#ifndef MIMELIBTEST_H
#define MIMELIBTEST_H

#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class DwString;

class MimeLibTester : public KUnitTest::SlotTester

+ 3
- 3
kmail/tests/storagelayermodule.cpp View File

@@ -5,12 +5,12 @@
* have to fix it" license.
*/

#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>

#include "messagedicttests.h"

using namespace KUnitTest;

KUNITTEST_MODULE( kunittest_storagelayermodule, "KMail Storage Layer Tests" );
KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );

+ 3
- 3
kmail/tests/utiltests.cpp View File

@@ -4,13 +4,13 @@
*/

#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "utiltests.h"

using namespace KUnitTest;

KUNITTEST_MODULE( kunittest_utilmodule, "KMail::Util Tests" );
KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );

#include "util.h"

+ 1
- 1
kmail/tests/utiltests.h View File

@@ -7,7 +7,7 @@
#ifndef UTILTESTS_H
#define UTILTESTS_H

#include <kunittest/tester.h>
#include <tdeunittest/tester.h>

class UtilTester : public KUnitTest::SlotTester
{

+ 2
- 2
kmail/urlhandlermanager.cpp View File

@@ -47,7 +47,7 @@

#include <kstandarddirs.h>
#include <kurldrag.h>
#include <kimproxy.h>
#include <tdeimproxy.h>
#include <kurl.h>

#include <algorithm>
@@ -399,7 +399,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW
#include <klocale.h>
#include <kprocess.h>
#include <kmessagebox.h>
#include <khtml_part.h>
#include <tdehtml_part.h>

#include <tqstring.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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

KDE_ICON=AUTO


+ 2
- 2
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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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 \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP

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


+ 1
- 1
knode/CMakeLists.txt View File

@@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC
kncollectionview.cpp articlewidget.cpp csshelper.cpp
smtpaccountwidget_base.ui
VERSION 3.0.0
LINK emailfunctions-static tdepim-shared kpgp-shared khtml-shared
LINK emailfunctions-static tdepim-shared kpgp-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)


+ 1
- 1
knode/Makefile.am View File

@@ -17,7 +17,7 @@ SUBDIRS = pics filters

bin_PROGRAMS = knode

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

kcm_knode_la_SOURCES = knconfigpages.cpp

+ 2
- 2
knode/articlewidget.cpp View File

@@ -32,8 +32,8 @@
#include <kapplication.h>
#include <kbookmarkmanager.h>
#include <kcharsets.h>
#include <khtml_part.h>
#include <khtmlview.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmdcodec.h>

+ 0
- 0
knode/knaccountmanager.cpp View File


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

Loading…
Cancel
Save