Переглянути джерело

Additional k => tde renaming and fixes

Slávek Banko 5 роки тому
джерело
коміт
533bad2a15
100 змінених файлів з 173 додано та 214 видалено
  1. 2
    2
      CMakeLists.txt
  2. 1
    1
      Makefile.am.in
  3. 1
    1
      README
  4. 1
    1
      README.Kolab
  5. 5
    5
      akregator/src/Makefile.am
  6. 1
    1
      akregator/src/librss/Makefile.am
  7. 2
    2
      akregator/src/librss/loader.h
  8. 2
    2
      certmanager/Makefile.am
  9. 1
    1
      certmanager/aboutdata.cpp
  10. 1
    1
      certmanager/certificatewizardimpl.cpp
  11. 2
    2
      certmanager/kwatchgnupg/Makefile.am
  12. 1
    1
      certmanager/lib/Makefile.am
  13. 3
    3
      certmanager/lib/kleo/tdeconfigbasedkeyfilter.h
  14. 3
    3
      certmanager/storedtransferjob.cpp
  15. 1
    1
      certmanager/storedtransferjob.h
  16. 1
    1
      cvs.sh.diff
  17. 2
    2
      doc/kaddressbook/index.docbook
  18. 0
    5
      kabc/Makefile.am
  19. 0
    1
      kabc/README
  20. 0
    10
      kabc/frontend/Makefile.am
  21. 0
    13
      kabc/kabc2mutt/Makefile.am
  22. 0
    12
      kabc/kabcdistlistupdater/Makefile.am
  23. 2
    2
      kaddressbook/Makefile.am
  24. 3
    3
      kaddressbook/kabcore.cpp
  25. 2
    2
      kaddressbook/kcmconfigs/Makefile.am
  26. 2
    2
      kaddressbook/kcmconfigs/addresseewidget.cpp
  27. 2
    2
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  28. 1
    1
      kaddressbook/nameeditdialog.cpp
  29. 3
    3
      kaddressbook/views/Makefile.am
  30. 9
    9
      kaddressbook/xxport/Makefile.am
  31. 1
    1
      kaddressbook/xxport/bookmark_xxport.cpp
  32. 2
    2
      kalarm/kalarmd/Makefile.am
  33. 2
    2
      kandy/src/Makefile.am
  34. 2
    2
      karm/Makefile.am
  35. 2
    2
      karm/tdeaccelmenuwatch.h
  36. 2
    2
      karm/test/Makefile.am
  37. 3
    3
      kitchensync/src/Makefile.am
  38. 2
    2
      kitchensync/src/memberinfo.cpp
  39. 1
    1
      kmail/CMakeLists.txt
  40. 4
    4
      kmail/Makefile.am
  41. 1
    1
      kmail/folderdiaacltab.h
  42. 1
    1
      kmail/folderdiaquotatab.h
  43. 15
    15
      kmail/headerstyle.cpp
  44. 1
    1
      kmail/imapaccountbase.cpp
  45. 5
    5
      kmail/imapaccountbase.h
  46. 1
    1
      kmail/imapjob.cpp
  47. 1
    1
      kmail/keyresolver.cpp
  48. 1
    1
      kmail/kmacctimap.cpp
  49. 1
    1
      kmail/kmacctimap.h
  50. 1
    1
      kmail/kmail_part.cpp
  51. 2
    2
      kmail/kmcommands.cpp
  52. 1
    1
      kmail/kmcomposewin.cpp
  53. 1
    1
      kmail/kmcomposewin.h
  54. 1
    1
      kmail/kmdict.cpp
  55. 0
    0
      kmail/kmdict.h
  56. 2
    2
      kmail/kmfolderdia.h
  57. 1
    1
      kmail/kmmainwin.cpp
  58. 1
    1
      kmail/kmmsgdict.cpp
  59. 1
    1
      kmail/kmreaderwin.cpp
  60. 1
    1
      kmail/networkaccount.h
  61. 5
    5
      kmail/popaccount.h
  62. 1
    1
      kmail/recipientspicker.cpp
  63. 1
    1
      kmail/redirectdialog.cpp
  64. 2
    2
      kmail/tdelistboxdialog.h
  65. 3
    3
      kmail/tdelistviewindexedsearchline.h
  66. 1
    1
      kmail/tests/Makefile.am
  67. 1
    1
      kmail/tests/messagedicttests.cpp
  68. 2
    2
      kmail/tests/mimelibtests.cpp
  69. 2
    2
      kmail/tests/storagelayermodule.cpp
  70. 2
    2
      kmail/tests/utiltests.cpp
  71. 1
    1
      kmailcvt/Makefile.am
  72. 2
    2
      kmobile/Makefile.am
  73. 1
    1
      kmobile/tdeioslave/Makefile.am
  74. 2
    2
      kmobile/tdeioslave/tdeio_mobile.cpp
  75. 2
    2
      kmobile/tdeioslave/tdeio_mobile.h
  76. 3
    3
      knode/Makefile.am
  77. 1
    1
      knode/kncomposer.cpp
  78. 3
    3
      knotes/Makefile.am
  79. 1
    1
      kode/Makefile.am
  80. 2
    2
      kode/kodemain.cpp
  81. 1
    1
      kode/kwsdl/Makefile.am
  82. 1
    1
      kode/kwsdl/converter.cpp
  83. 1
    1
      kode/kwsdl/kung/Makefile.am
  84. 1
    1
      kode/kwsdl/kung/transport.cpp
  85. 1
    1
      kode/kwsdl/schema/Makefile.am
  86. 1
    1
      kode/kwsdl/tests/google/Makefile.am
  87. 1
    1
      kode/kwsdl/tests/google/transport.cpp
  88. 1
    1
      kode/kwsdl/wscl/Makefile.am
  89. 1
    1
      kode/kxml_compiler/Makefile.am
  90. 1
    1
      konsolekalendar/Makefile.am
  91. 1
    1
      kontact/Thoughts
  92. 1
    1
      kontact/interfaces/Makefile.am
  93. 1
    1
      kontact/plugins/akregator/Makefile.am
  94. 1
    1
      kontact/plugins/kmail/Makefile.am
  95. 1
    1
      kontact/plugins/knode/Makefile.am
  96. 1
    1
      kontact/plugins/knotes/Makefile.am
  97. 3
    3
      kontact/plugins/korganizer/Makefile.am
  98. 1
    1
      kontact/plugins/kpilot/Makefile.am
  99. 1
    1
      kontact/plugins/newsticker/Makefile.am
  100. 0
    0
      kontact/plugins/summary/Makefile.am

+ 2
- 2
CMakeLists.txt Переглянути файл

@@ -112,7 +112,7 @@ option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
112 112
 option( BUILD_KODE "Build kode" ${BUILD_ALL} )
113 113
 option( BUILD_TDERESOURCES "Build tderesources" ${BUILD_ALL} )
114 114
 option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
115
-option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
115
+option( BUILD_TDEABC "Build tdeabc" ${BUILD_ALL} )
116 116
 option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
117 117
 option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} )
118 118
 option( BUILD_KARM "Build karm" ${BUILD_ALL} )
@@ -184,7 +184,7 @@ tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
184 184
 tde_conditional_add_subdirectory( BUILD_KODE kode )
185 185
 tde_conditional_add_subdirectory( BUILD_TDERESOURCES tderesources )
186 186
 tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
187
-tde_conditional_add_subdirectory( BUILD_KABC kabc )
187
+tde_conditional_add_subdirectory( BUILD_TDEABC tdeabc )
188 188
 tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )
189 189
 tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt )
190 190
 tde_conditional_add_subdirectory( BUILD_KARM karm )

+ 1
- 1
Makefile.am.in Переглянути файл

@@ -38,7 +38,7 @@ COMPILE_BEFORE_kitchensync = libtdepim
38 38
 COMPILE_BEFORE_akregator = libtdepim
39 39
 COMPILE_BEFORE_knotes = libtdepim
40 40
 COMPILE_BEFORE_konsolekalendar = libtdepim
41
-COMPILE_BEFORE_kabc = libtdepim
41
+COMPILE_BEFORE_tdeabc = libtdepim
42 42
 
43 43
 AUTOMAKE_OPTIONS = foreign 1.6.1
44 44
 DISTCLEANFILES = inst-apps

+ 1
- 1
README Переглянути файл

@@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package:
48 48
 * libkcal: C++ api for the iCalendar and vCalendar formats
49 49
 * libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
50 50
 * libkpimexchange: connecting to Exchange2000 servers
51
-* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users.
51
+* tdeabc/frontend: A GUI frontend for libtdeabc, not intended for end users.
52 52
 * kgantt: lib to display and manage Gantt diagrams used by the project view
53 53
           plugin of KOrganizer
54 54
 * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of

+ 1
- 1
README.Kolab Переглянути файл

@@ -76,7 +76,7 @@ General Notes:
76 76
 ==============
77 77
 Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion
78 78
 is as follows:
79
-  1. All available addressbook resources as seen in "tdecmshell tderesources", section "kabc"
79
+  1. All available addressbook resources as seen in "tdecmshell tderesources", section "tdeabc"
80 80
   2. LDAP
81 81
 
82 82
 Nothing special, AFAIK

+ 5
- 5
akregator/src/Makefile.am Переглянути файл

@@ -20,9 +20,9 @@ bin_PROGRAMS = akregator
20 20
 
21 21
 # the application source, library search path, and link libraries
22 22
 akregator_SOURCES = main.cpp mainwindow.cpp
23
-akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
24
-akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
25
-#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
23
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
24
+akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la
25
+#akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
26 26
 
27 27
 # this is where the desktop file will go
28 28
 xdg_apps_DATA = akregator.desktop
@@ -145,8 +145,8 @@ libakregatorpart_la_SOURCES = \
145 145
 	kspeechsink.skel \
146 146
 	kspeech.stub
147 147
 
148
-libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
149
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
148
+libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_TDEUTILS) -avoid-version -no-undefined $(all_libraries)
149
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
150 150
 
151 151
 # this is where the desktop file will go
152 152
 partdesktopdir = $(kde_servicesdir)

+ 1
- 1
akregator/src/librss/Makefile.am Переглянути файл

@@ -16,7 +16,7 @@ librsslocal_la_METASOURCES = AUTO
16 16
 check_PROGRAMS = testlibrss
17 17
 testlibrss_SOURCES = testlibrss.cpp
18 18
 testlibrss_LDFLAGS = $(all_libraries)
19
-testlibrss_LDADD =  librsslocal.la $(LIB_KIO)
19
+testlibrss_LDADD =  librsslocal.la $(LIB_TDEIO)
20 20
 
21 21
 DOXYGEN_REFERENCES = tdeui
22 22
 include $(top_srcdir)/admin/Doxyfile.am

+ 2
- 2
akregator/src/librss/loader.h Переглянути файл

@@ -114,8 +114,8 @@ namespace RSS
114 114
 			/**
115 115
 			 * @return The error code for the last process of retrieving data.
116 116
 			 * The returned numbers correspond directly to the error codes
117
-			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
118
-			 * defined by KIO</a>.
117
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/TDEIO.html#Error">as
118
+			 * defined by TDEIO</a>.
119 119
 			 */
120 120
 			virtual int errorCode() const;
121 121
 

+ 2
- 2
certmanager/Makefile.am Переглянути файл

@@ -17,8 +17,8 @@ kleopatra_SOURCES = \
17 17
 
18 18
 METASOURCES = AUTO
19 19
 
20
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
21
-kleopatra_LDADD   = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC)
20
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
21
+kleopatra_LDADD   = conf/libconf.la lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
22 22
 
23 23
 rcdir = $(kde_datadir)/kleopatra
24 24
 rc_DATA = kleopatraui.rc

+ 1
- 1
certmanager/aboutdata.cpp Переглянути файл

@@ -58,7 +58,7 @@ static const about_data authors[] = {
58 58
 
59 59
 static const about_data credits[] = {
60 60
   { "David Faure",
61
-    I18N_NOOP("Backend configuration framework, KIO integration"),
61
+    I18N_NOOP("Backend configuration framework, TDEIO integration"),
62 62
     "faure@kde.org", 0 },
63 63
   { "Michel Boyer de la Giroday",
64 64
     I18N_NOOP("Key-state dependant colors and fonts in the key list"),

+ 1
- 1
certmanager/certificatewizardimpl.cpp Переглянути файл

@@ -498,7 +498,7 @@ void CertificateWizardImpl::accept()
498 498
 }
499 499
 
500 500
 /**
501
-   This slot is invoked by the KIO job used in newCertificate
501
+   This slot is invoked by the TDEIO job used in newCertificate
502 502
    to save/upload the certificate, when finished (success or error).
503 503
 */
504 504
 void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )

+ 2
- 2
certmanager/kwatchgnupg/Makefile.am Переглянути файл

@@ -13,8 +13,8 @@ kwatchgnupg_SOURCES = \
13 13
 
14 14
 METASOURCES = AUTO
15 15
 
16
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
17
-kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC)
16
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
17
+kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
18 18
 
19 19
 rcdir = $(kde_datadir)/kwatchgnupg
20 20
 rc_DATA = kwatchgnupgui.rc

+ 1
- 1
certmanager/lib/Makefile.am Переглянути файл

@@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \
17 17
 			ui/libkleopatra_ui.la \
18 18
 			\
19 19
 			$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \
20
-			$(LIB_KIO) $(LIB_TDEUI)
20
+			$(LIB_TDEIO) $(LIB_TDEUI)
21 21
 
22 22
 # Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
23 23
 # backends/kpgp/libkleopatra_backend_kpgp.la

+ 3
- 3
certmanager/lib/kleo/tdeconfigbasedkeyfilter.h Переглянути файл

@@ -30,8 +30,8 @@
30 30
     your version.
31 31
 */
32 32
 
33
-#ifndef __KLEO_KCONFIGBASEDKEYFILTER_H__
34
-#define __KLEO_KCONFIGBASEDKEYFILTER_H__
33
+#ifndef __KLEO_TDECONFIGBASEDKEYFILTER_H__
34
+#define __KLEO_TDECONFIGBASEDKEYFILTER_H__
35 35
 
36 36
 #include "keyfilter.h"
37 37
 
@@ -101,4 +101,4 @@ namespace Kleo {
101 101
 
102 102
 }
103 103
 
104
-#endif // __KLEO_KCONFIGBASEDKEYFILTER_H__
104
+#endif // __KLEO_TDECONFIGBASEDKEYFILTER_H__

+ 3
- 3
certmanager/storedtransferjob.cpp Переглянути файл

@@ -21,7 +21,7 @@
21 21
 
22 22
 using namespace TDEIOext;
23 23
 
24
-#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
24
+#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
25 25
 
26 26
 StoredTransferJob::StoredTransferJob(const KURL& url, int command,
27 27
                                      const TQByteArray &packedArgs,
@@ -79,7 +79,7 @@ void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
79 79
 StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showProgressInfo )
80 80
 {
81 81
     // Send decoded path and encoded query
82
-    KIO_ARGS << url;
82
+    TDEIO_ARGS << url;
83 83
     StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
84 84
     if (reload)
85 85
        job->addMetaData("cache", "reload");
@@ -89,7 +89,7 @@ StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showP
89 89
 StoredTransferJob *TDEIOext::put( const TQByteArray& arr, const KURL& url, int permissions,
90 90
                                 bool overwrite, bool resume, bool showProgressInfo )
91 91
 {
92
-    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
92
+    TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
93 93
     StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
94 94
     job->setData( arr );
95 95
     return job;

+ 1
- 1
certmanager/storedtransferjob.h Переглянути файл

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include <tdeio/job.h>
24 24
 
25
-// To be moved to KIO?
25
+// To be moved to TDEIO?
26 26
 namespace TDEIOext {
27 27
 
28 28
 /**

+ 1
- 1
cvs.sh.diff Переглянути файл

@@ -7,7 +7,7 @@ Index: admin/cvs.sh
7 7
  done
8 8
  for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
9 9
 -  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
10
-+  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE <LL@li.org>\\n","Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
10
++  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE <LL@li.org>\\n","Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
11 11
    #msgmerge -q -o po/$i po/$i po/$i
12 12
    egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
13 13
    if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then

+ 2
- 2
doc/kaddressbook/index.docbook Переглянути файл

@@ -69,7 +69,7 @@
69 69
 <para>
70 70
 &kaddressbook; is the main address book application for &kde;; it
71 71
 enables you to manage your contacts efficiently and comfortably.
72
-Since it is based on the kabc library it supports resources,
72
+Since it is based on the tdeabc library it supports resources,
73 73
 which can be used to load and save your contacts to many different locations &mdash;
74 74
 not just the local file system, but also to LDAP servers and SQL databases.
75 75
 </para>
@@ -79,7 +79,7 @@ The user interface is similar to MS Outlook and it supports different views
79 79
 for to represent the contact data differently;
80 80
 it also provides an incremental search over all fields and a jump button
81 81
 bar to quickly access single entries.
82
-Since the underlying kabc library uses the vCard format (specified in RFC
82
+Since the underlying tdeabc library uses the vCard format (specified in RFC
83 83
 2426) as its default storage medium, &kaddressbook; mainly reflects the supported
84 84
 entry fields in its graphical user interface.
85 85
 </para>

+ 0
- 5
kabc/Makefile.am Переглянути файл

@@ -1,5 +0,0 @@
1
-if compile_newdistrlists
2
-KABCDISTLISTUPDATER=kabcdistlistupdater
3
-endif
4
-
5
-SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)

+ 0
- 1
kabc/README Переглянути файл

@@ -1 +0,0 @@
1
-This directory contains test code for kabc.

+ 0
- 10
kabc/frontend/Makefile.am Переглянути файл

@@ -1,10 +0,0 @@
1
-INCLUDES = -I$(includedir)/tdeabc $(all_includes)
2
-
3
-METASOURCES = AUTO
4
-
5
-bin_PROGRAMS = kabcfrontend
6
-
7
-kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8
-kabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE)
9
-kabcfrontend_SOURCES = main.cpp mainWindow.ui
10
-

+ 0
- 13
kabc/kabc2mutt/Makefile.am Переглянути файл

@@ -1,13 +0,0 @@
1
-INCLUDES = -I$(includedir)/tdeabc $(all_includes)
2
-
3
-METASOURCES = AUTO
4
-
5
-bin_PROGRAMS = kabc2mutt
6
-
7
-kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8
-kabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE)
9
-kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
10
-
11
-messages: rc.cpp
12
-	$(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot
13
-

+ 0
- 12
kabc/kabcdistlistupdater/Makefile.am Переглянути файл

@@ -1,12 +0,0 @@
1
-INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes)
2
-
3
-METASOURCES = AUTO
4
-
5
-bin_PROGRAMS = kabcdistlistupdater
6
-
7
-kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8
-kabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
9
-kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
10
-
11
-autostart_DATA = kabcdistlistupdater.desktop
12
-autostartdir = $(datadir)/autostart

+ 2
- 2
kaddressbook/Makefile.am Переглянути файл

@@ -17,14 +17,14 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
17 17
 bin_PROGRAMS = kaddressbook
18 18
 
19 19
 kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
20
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
20
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
21 21
 kaddressbook_LDADD = libkaddressbook.la
22 22
 
23 23
 kde_module_LTLIBRARIES = libkaddressbookpart.la
24 24
 
25 25
 libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
26 26
 libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
27
-libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP
27
+libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP
28 28
 
29 29
 lib_LTLIBRARIES = libkaddressbook.la
30 30
 libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \

+ 3
- 3
kaddressbook/kabcore.cpp Переглянути файл

@@ -272,10 +272,10 @@ TQStringList KABCore::selectedUIDs() const
272 272
 
273 273
 TDEABC::Resource *KABCore::requestResource( TQWidget *parent )
274 274
 {
275
-  TQPtrList<TDEABC::Resource> kabcResources = addressBook()->resources();
275
+  TQPtrList<TDEABC::Resource> tdeabcResources = addressBook()->resources();
276 276
 
277 277
   TQPtrList<KRES::Resource> kresResources;
278
-  TQPtrListIterator<TDEABC::Resource> resIt( kabcResources );
278
+  TQPtrListIterator<TDEABC::Resource> resIt( tdeabcResources );
279 279
   TDEABC::Resource *resource;
280 280
   while ( ( resource = resIt.current() ) != 0 ) {
281 281
     ++resIt;
@@ -320,7 +320,7 @@ TDEAboutData *KABCore::createAboutData()
320 320
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" );
321 321
   about->addAuthor( "Don Sanders", I18N_NOOP( "Original author" ) );
322 322
   about->addAuthor( "Cornelius Schumacher",
323
-                    I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export" ),
323
+                    I18N_NOOP( "Co-maintainer, libtdeabc port, CSV import/export" ),
324 324
                     "schumacher@kde.org" );
325 325
   about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign" ),
326 326
                     "mpilone@slac.com" );

+ 2
- 2
kaddressbook/kcmconfigs/Makefile.am Переглянути файл

@@ -10,7 +10,7 @@ kcm_kabconfig_la_SOURCES = kcmkabconfig.cpp kabconfigwidget.cpp \
10 10
                            extensionconfigdialog.cpp addresseewidget.cpp
11 11
 kcm_kabconfig_la_LDFLAGS  = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
12 12
                             -avoid-version -no-undefined
13
-kcm_kabconfig_la_LIBADD = $(LIB_KIO) \
13
+kcm_kabconfig_la_LIBADD = $(LIB_TDEIO) \
14 14
                           $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
15 15
                           $(top_builddir)/libtdepim/libtdepim.la \
16 16
                           $(top_builddir)/kaddressbook/common/libkabcommon.la
@@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
20 20
                                ldapoptionswidget.cpp
21 21
 kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
22 22
                                -avoid-version -no-undefined
23
-kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
23
+kcm_kabldapconfig_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
24 24
 
25 25
 kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
26 26
 kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \

+ 2
- 2
kaddressbook/kcmconfigs/addresseewidget.cpp Переглянути файл

@@ -169,7 +169,7 @@ AddresseeWidget::~AddresseeWidget()
169 169
 
170 170
 void AddresseeWidget::restoreSettings()
171 171
 {
172
-  TDEConfig config( "kabcrc" );
172
+  TDEConfig config( "tdeabcrc" );
173 173
   config.setGroup( "General" );
174 174
 
175 175
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
@@ -183,7 +183,7 @@ void AddresseeWidget::restoreSettings()
183 183
 
184 184
 void AddresseeWidget::saveSettings()
185 185
 {
186
-  TDEConfig config( "kabcrc" );
186
+  TDEConfig config( "tdeabcrc" );
187 187
   config.setGroup( "General" );
188 188
 
189 189
   config.writeEntry( "Prefixes", mPrefix->nameParts() );

+ 2
- 2
kaddressbook/kcmconfigs/kabconfigwidget.cpp Переглянути файл

@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
174 174
   mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
175 175
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
176 176
 
177
-  TDEConfig config( "kabcrc", false, false );
177
+  TDEConfig config( "tdeabcrc", false, false );
178 178
   config.setGroup( "General" );
179 179
   mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
180 180
   mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
197 197
 
198 198
   KABPrefs::instance()->writeConfig();
199 199
 
200
-  TDEConfig config( "kabcrc", false, false );
200
+  TDEConfig config( "tdeabcrc", false, false );
201 201
   config.setGroup( "General" );
202 202
   config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
203 203
   config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );

+ 1
- 1
kaddressbook/nameeditdialog.cpp Переглянути файл

@@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
124 124
   mFormattedNameEdit->setText( addr.formattedName() );
125 125
 
126 126
   // Prefix and suffix combos
127
-  TDEConfig config( "kabcrc" );
127
+  TDEConfig config( "tdeabcrc" );
128 128
   config.setGroup( "General" );
129 129
 
130 130
   TQStringList sTitle;

+ 3
- 3
kaddressbook/views/Makefile.am Переглянути файл

@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
12 12
                                  configurecardviewdialog.cpp \
13 13
                                  kaddressbookcardview.cpp
14 14
 libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
15
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
15
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
16 16
 
17 17
 libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
18 18
 libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
19
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
19
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
20 20
 
21 21
 libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
22 22
                                   contactlistview.cpp \
23 23
                                   kaddressbooktableview.cpp
24 24
 libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
25
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY)
25
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY)
26 26
 
27 27
 noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
28 28
                  configuretableviewdialog.h contactlistview.h \

+ 9
- 9
kaddressbook/xxport/Makefile.am Переглянути файл

@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
21 21
          $(top_builddir)/libtdepim/libtdepim.la
22 22
 
23 23
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
24
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
24
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
25 25
 
26 26
 libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
27
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \
27
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \
28 28
                                     $(top_builddir)/kaddressbook/libkaddressbook.la \
29 29
                                     $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
30 30
 
31 31
 libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
32
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
32
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
33 33
 
34 34
 libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
35
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
35
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
36 36
 
37 37
 libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
38
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
38
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
39 39
 
40 40
 libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
41
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
41
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
42 42
 
43 43
 libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
44
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
44
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
45 45
 
46 46
 libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
47
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
47
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
48 48
 
49 49
 libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
50
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
50
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
51 51
 
52 52
 noinst_HEADERS = csvimportdialog.h
53 53
 

+ 1
- 1
kaddressbook/xxport/bookmark_xxport.cpp Переглянути файл

@@ -64,7 +64,7 @@ bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQ
64 64
   menu.location = fileName;
65 65
   menu.type = "xbel";
66 66
   menu.show = true;
67
-  KBookmarkMenu::setDynamicBookmarks( "kabc", menu );
67
+  KBookmarkMenu::setDynamicBookmarks( "tdeabc", menu );
68 68
 
69 69
   return true;
70 70
 }

+ 2
- 2
kalarm/kalarmd/Makefile.am Переглянути файл

@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
2 2
 
3 3
 noinst_LTLIBRARIES = libkalarmd.la
4 4
 
5
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
5
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
6 6
 libkalarmd_la_LIBADD  = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
7 7
 libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub
8 8
 
9 9
 bin_PROGRAMS = kalarmd
10 10
 
11
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
11
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
12 12
 kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
13 13
 kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
14 14
         adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

+ 2
- 2
kandy/src/Makefile.am Переглянути файл

@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
2 2
 
3 3
 INCLUDES = -I$(top_srcdir) $(all_includes)
4 4
 
5
-kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
5
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
6 6
 kandy_LDADD   = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la
7 7
 kandy_SOURCES =	main.cpp kandy.cpp \
8 8
                 cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -19,7 +19,7 @@ KDE_ICON = kandy
19 19
 noinst_HEADERS   = kandy.h kandyview.h modem.h atcommand.h \
20 20
                    commanditem.h mobilegui.h commandscheduler.h
21 21
 
22
-kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
22
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
23 23
 kandy_client_LDADD   = $(LIB_TDECORE)
24 24
 kandy_client_SOURCES = kandy_client.cpp
25 25
 

+ 2
- 2
karm/Makefile.am Переглянути файл

@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
23 23
              $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint 
24 24
 karm_SOURCES = main.cpp
25 25
 karm_LDADD = libkarm_shared.la 
26
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
26
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
27 27
 noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
28 28
                  idletimedetector.h tdeaccelmenuwatch.h timekard.h \
29 29
 		 karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
@@ -56,7 +56,7 @@ kde_module_LTLIBRARIES = libkarmpart.la
56 56
 # the Part's source, library search path, and link libraries
57 57
 libkarmpart_la_SOURCES = karm_part.cpp 
58 58
 libkarmpart_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries)
59
-libkarmpart_la_LIBADD  = libkarm_shared.la $(LIB_KPARTS)
59
+libkarmpart_la_LIBADD  = libkarm_shared.la $(LIB_TDEPARTS)
60 60
 
61 61
 # this is where the desktop file will go 
62 62
 partdesktopdir   = $(kde_servicesdir)

+ 2
- 2
karm/tdeaccelmenuwatch.h Переглянути файл

@@ -2,8 +2,8 @@
2 2
 * tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
3 3
 * Generated by newclass on Thu Jan  7 15:05:26 EST 1999.
4 4
 */
5
-#ifndef KARM_K_ACCEL_MENU_WATCH_H
6
-#define KARM_K_ACCEL_MENU_WATCH_H
5
+#ifndef KARM_TDE_ACCEL_MENU_WATCH_H
6
+#define KARM_TDE_ACCEL_MENU_WATCH_H
7 7
 
8 8
 #include <tqobject.h>
9 9
 #include <tqptrlist.h>

+ 2
- 2
karm/test/Makefile.am Переглянути файл

@@ -3,11 +3,11 @@ METASOURCES = AUTO
3 3
 check_PROGRAMS = runscripts locking
4 4
 
5 5
 runscripts_SOURCES = script.cpp runscripts.cpp
6
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
6
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
7 7
 runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
8 8
 
9 9
 locking_SOURCES = locking.cpp lockerthread.cpp
10
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
10
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
11 11
 locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
12 12
 
13 13
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)

+ 3
- 3
kitchensync/src/Makefile.am Переглянути файл

@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
10 10
 bin_PROGRAMS = kitchensync
11 11
 
12 12
 kitchensync_SOURCES = main.cpp mainwindow.cpp
13
-kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
13
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
14 14
 kitchensync_LDADD = libkitchensync.la
15 15
 
16 16
 xdg_apps_DATA = kitchensync.desktop
@@ -32,7 +32,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
32 32
                             configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
33 33
                             configguisunbird.cpp
34 34
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
35
-libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
35
+libkitchensync_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
36 36
                            $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
37 37
                            $(LIB_QT)
38 38
 
@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la
41 41
 
42 42
 libkitchensyncpart_la_SOURCES = part.cpp
43 43
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
44
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
44
+libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_QT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
45 45
 
46 46
 # Resources
47 47
 kitchensyncdatadir = $(kde_datadir)/kitchensync

+ 2
- 2
kitchensync/src/memberinfo.cpp Переглянути файл

@@ -52,7 +52,7 @@ TQString MemberInfo::name() const
52 52
     nameMap.insert( "file-sync", i18n( "File" ) );
53 53
     nameMap.insert( "palm-sync", i18n( "Palm" ) );
54 54
     nameMap.insert( "tdepim-sync", i18n( "TDE PIM" ) );
55
-    nameMap.insert( "kio-sync", i18n( "Remote File" ) );
55
+    nameMap.insert( "tdeio-sync", i18n( "Remote File" ) );
56 56
     nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) );
57 57
     nameMap.insert( "evo2-sync", i18n( "Evolution" ) );
58 58
     nameMap.insert( "opie-sync", i18n( "Handheld" ) );
@@ -79,7 +79,7 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName )
79 79
   if ( pluginName == "file-sync" ) return "folder";
80 80
   if ( pluginName == "palm-sync" ) return "pda_black";
81 81
   if ( pluginName == "tdepim-sync" ) return "kontact";
82
-  if ( pluginName == "kio-sync" ) return "network";
82
+  if ( pluginName == "tdeio-sync" ) return "network";
83 83
   if ( pluginName == "irmc-sync" ) return "mobile_phone";
84 84
   if ( pluginName == "evo2-sync" ) return "evolution";
85 85
   if ( pluginName == "opie-sync" ) return "pda_blue";

+ 1
- 1
kmail/CMakeLists.txt Переглянути файл

@@ -141,7 +141,7 @@ set( ${target}_SRCS
141 141
   kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
142 142
   kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp tdelistboxdialog.cpp
143 143
   kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
144
-  tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
144
+  kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
145 145
   kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
146 146
   filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
147 147
   kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp

+ 4
- 4
kmail/Makefile.am Переглянути файл

@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
32 32
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
33 33
         ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
34 34
         ../libkcal/libkcal.la \
35
-        $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC)
35
+        $(LIB_TDEHTML) $(LIB_TDESPELL) $(LIB_TDEABC)
36 36
 
37 37
 kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
38 38
 libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
@@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
65 65
                 csshelper.cpp tdelistboxdialog.cpp \
66 66
                 actionscheduler.cpp messageproperty.cpp \
67 67
                 kmmsgpart.cpp kmmsginfo.cpp \
68
-                accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
68
+                accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
69 69
                 kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
70 70
                 kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
71 71
                 kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@@ -176,11 +176,11 @@ check_PROGRAMS = dcoptest recipienteditortest
176 176
 METASOURCES = AUTO
177 177
 
178 178
 dcoptest_SOURCES = dcoptest.cpp kmailIface.skel kmailIface.stub mailcomposerIface.skel mailcomposerIface.stub
179
-dcoptest_LDADD = $(LIB_KIO)
179
+dcoptest_LDADD = $(LIB_TDEIO)
180 180
 dcoptest_LDFLAGS = $(all_libraries)
181 181
 
182 182
 recipienteditortest_SOURCES = recipientseditortest.cpp
183
-recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC)
183
+recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_TDEIO) $(LIB_TDEABC)
184 184
 recipienteditortest_LDFLAGS = $(all_libraries)
185 185
 
186 186
 kmailIface_DCOPIDLNG = true

+ 1
- 1
kmail/folderdiaacltab.h Переглянути файл

@@ -99,7 +99,7 @@ public:
99 99
   static bool supports( KMFolder* refFolder );
100 100
 
101 101
 private slots:
102
-  // Network (KIO) slots
102
+  // Network (TDEIO) slots
103 103
   void slotConnectionResult( int, const TQString& );
104 104
   void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
105 105
   void slotMultiSetACLResult(TDEIO::Job *);

+ 1
- 1
kmail/folderdiaquotatab.h Переглянути файл

@@ -68,7 +68,7 @@ private:
68 68
   void initializeWithValuesFromFolder( KMFolder* folder );
69 69
   void showQuotaWidget();
70 70
 private slots:
71
-  // Network (KIO) slots
71
+  // Network (TDEIO) slots
72 72
   void slotConnectionResult( int, const TQString& );
73 73
   void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );
74 74
 

+ 15
- 15
kmail/headerstyle.cpp Переглянути файл

@@ -276,14 +276,14 @@ namespace KMail {
276 276
 #if 0
277 277
     // Get Instant Messaging presence
278 278
     TQString presence;
279
-    TQString kabcUid;
279
+    TQString tdeabcUid;
280 280
     if ( strategy->showHeader( "status" ) )
281 281
     {
282 282
       TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
283 283
       TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
284 284
       ::KIMProxy *imProxy = KMKernel::self()->imProxy();
285
-      kabcUid = addresses[0].uid();
286
-      presence = imProxy->presenceString( kabcUid );
285
+      tdeabcUid = addresses[0].uid();
286
+      presence = imProxy->presenceString( tdeabcUid );
287 287
     }
288 288
 #endif
289 289
 
@@ -298,7 +298,7 @@ namespace KMail {
298 298
               "\">" + i18n("[vCard]") + "</a>" );
299 299
 #if 0
300 300
       if ( !presence.isEmpty() && strategy->showHeader( "status" ) )
301
-        headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)" );
301
+        headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)" );
302 302
 #endif
303 303
 
304 304
       if ( strategy->showHeader( "organization" )
@@ -473,10 +473,10 @@ namespace KMail {
473 473
     TQString userHTML;
474 474
     TQString presence;
475 475
 
476
-    // IM presence and kabc photo
476
+    // IM presence and tdeabc photo
477 477
 
478 478
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
479
-    TQString kabcUid;
479
+    TQString tdeabcUid;
480 480
     TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
481 481
     TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
482 482
 
@@ -485,16 +485,16 @@ namespace KMail {
485 485
     int photoHeight = 60;
486 486
     if( addresses.count() == 1 )
487 487
     {
488
-      // kabcUid is embedded in im: URIs to indicate which IM contact to message
489
-      kabcUid = addresses[0].uid();
488
+      // tdeabcUid is embedded in im: URIs to indicate which IM contact to message
489
+      tdeabcUid = addresses[0].uid();
490 490
 
491 491
       if ( imProxy->initialize() ) {
492 492
           // im status
493
-          presence = imProxy->presenceString( kabcUid );
493
+          presence = imProxy->presenceString( tdeabcUid );
494 494
           if ( !presence.isEmpty() )
495 495
           {
496 496
             TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
497
-                .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
497
+                .arg( imgToDataUrl( imProxy->presenceIcon( tdeabcUid ).convertToImage() ) );
498 498
             presence += presenceIcon;
499 499
           }
500 500
       }
@@ -592,9 +592,9 @@ namespace KMail {
592 592
         userHTML = TQString( "<div class=\"senderpic\">"
593 593
             "<a href=\"im:%1\">%2<div class=\"senderstatus\">"
594 594
             "<span name=\"presence-%3\">%4</span></div></a>"
595
-            "</div>" ).arg( kabcUid )
595
+            "</div>" ).arg( tdeabcUid )
596 596
             .arg( userHTML )
597
-             .arg( kabcUid )
597
+             .arg( tdeabcUid )
598 598
             .arg( presence );
599 599
       }
600 600
     } else {
@@ -602,8 +602,8 @@ namespace KMail {
602 602
       if ( !presence.isEmpty() )
603 603
         userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">"
604 604
             "<span name=\"presence-%2\">%3</span></div></a>" )
605
-            .arg( kabcUid )
606
-            .arg( kabcUid )
605
+            .arg( tdeabcUid )
606
+            .arg( tdeabcUid )
607 607
             .arg( presence );
608 608
     }
609 609
 #if 0
@@ -766,7 +766,7 @@ namespace KMail {
766 766
                               : TQString("") )
767 767
 #if 0
768 768
                  + ( ( !presence.isEmpty() )
769
-                              ? "&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)"
769
+                              ? "&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)"
770 770
                               : TQString("") )
771 771
 #endif
772 772
                  + ( message->headerField("Organization").isEmpty()

+ 1
- 1
kmail/imapaccountbase.cpp Переглянути файл

@@ -373,7 +373,7 @@ namespace KMail {
373 373
     else
374 374
       stream << (int) 'U' << url;
375 375
 
376
-    // create the KIO-job
376
+    // create the TDEIO-job
377 377
     if ( makeConnection() != Connected )
378 378
       return;// ## doesn't handle Connecting
379 379
     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);

+ 5
- 5
kmail/imapaccountbase.h Переглянути файл

@@ -240,7 +240,7 @@ namespace KMail {
240 240
     void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
241 241
 
242 242
     /**
243
-     * The KIO-Slave died
243
+     * The TDEIO-Slave died
244 244
      */
245 245
     void slaveDied() { mSlave = 0; killAllJobs(); }
246 246
 
@@ -430,9 +430,9 @@ namespace KMail {
430 430
   protected slots:
431 431
     virtual void slotCheckQueuedFolders();
432 432
 
433
-    /// Handle a message coming from the KIO scheduler saying that the slave is now connected
433
+    /// Handle a message coming from the TDEIO scheduler saying that the slave is now connected
434 434
     void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
435
-    /// Handle an error coming from the KIO scheduler
435
+    /// Handle an error coming from the TDEIO scheduler
436 436
     void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
437 437
 
438 438
     /**
@@ -484,14 +484,14 @@ namespace KMail {
484 484
   protected:
485 485
 
486 486
   /**
487
-     * Handle an error coming from a KIO job or from a KIO slave (via the scheduler)
487
+     * Handle an error coming from a TDEIO job or from a TDEIO slave (via the scheduler)
488 488
      * and abort everything (in all cases) if abortSync is true [this is for slotSchedulerSlaveError].
489 489
      * Otherwise (abortSync==false), dimap will only abort in case of severe errors (connection broken),
490 490
      * but on "normal" errors (no permission to delete, etc.) it will ask the user.
491 491
      *
492 492
      * @param error the error code, usually job->error())
493 493
      * @param errorMsg the error message, usually job->errorText()
494
-     * @param job the kio job (can be 0). If set, removeJob will be called automatically.
494
+     * @param job the tdeio job (can be 0). If set, removeJob will be called automatically.
495 495
      * This is important! It means you should not call removeJob yourself in case of errors.
496 496
      * We can't let the caller do that, since it should only be done afterwards, and only if we didn't abort.
497 497
      *

+ 1
- 1
kmail/imapjob.cpp Переглянути файл

@@ -259,7 +259,7 @@ ImapJob::~ImapJob()
259 259
                 mit.current()->setTransferInProgress( false );
260 260
             }
261 261
           }
262
-          account->removeJob( mJob ); // remove the associated kio job
262
+          account->removeJob( mJob ); // remove the associated tdeio job
263 263
         }
264 264
         account->mJobList.remove( this ); // remove the folderjob
265 265
       }

+ 1
- 1
kmail/keyresolver.cpp Переглянути файл

@@ -586,7 +586,7 @@ struct Kleo::KeyResolver::Private {
586 586
 
587 587
   std::map<CryptoMessageFormat,FormatInfo> mFormatInfoMap;
588 588
 
589
-  // key=email address, value=crypto preferences for this contact (from kabc)
589
+  // key=email address, value=crypto preferences for this contact (from tdeabc)
590 590
   typedef std::map<TQString, ContactPreferences> ContactPreferencesMap;
591 591
   ContactPreferencesMap mContactPreferencesMap;
592 592
 };

+ 1
- 1
kmail/kmacctimap.cpp Переглянути файл

@@ -232,7 +232,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
232 232
 //-----------------------------------------------------------------------------
233 233
 void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
234 234
 {
235
-  // Make sure the folder is not referenced in any kio slave jobs
235
+  // Make sure the folder is not referenced in any tdeio slave jobs
236 236
   TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
237 237
   while ( it != mapJobData.end() ) {
238 238
      TQMap<TDEIO::Job*, jobData>::Iterator i = it;

+ 1
- 1
kmail/kmacctimap.h Переглянути файл

@@ -106,7 +106,7 @@ protected:
106 106
   friend class ::AccountManager;
107 107
   KMAcctImap(AccountManager* owner, const TQString& accountName, uint id);
108 108
   /**
109
-   * Handle an error coming from a KIO job
109
+   * Handle an error coming from a TDEIO job
110 110
    * See ImapAccountBase::handleJobError for details.
111 111
    */
112 112
   virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );

+ 1
- 1
kmail/kmail_part.cpp Переглянути файл

@@ -154,7 +154,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
154 154
 KMailPart::~KMailPart()
155 155
 {
156 156
   kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
157
-  // Running KIO jobs prevent kapp from exiting, so we need to kill them
157
+  // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
158 158
   // if they are only about checking mail (not important stuff like moving messages)
159 159
   kmkernel->abortMailCheck();
160 160
   kmkernel->acctMgr()->cancelMailCheck();

+ 2
- 2
kmail/kmcommands.cpp Переглянути файл

@@ -75,7 +75,7 @@
75 75
 #include <tdetempfile.h>
76 76
 #include <tdeimproxy.h>
77 77
 #include <kuserprofile.h>
78
-// KIO headers
78
+// TDEIO headers
79 79
 #include <tdeio/job.h>
80 80
 #include <tdeio/netaccess.h>
81 81
 
@@ -932,7 +932,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
932 932
     mOffset = 0;
933 933
     TQByteArray data;
934 934
     int size;
935
-    // Unless it is great than 64 k send the whole message. kio buffers for us.
935
+    // Unless it is great than 64 k send the whole message. tdeio buffers for us.
936 936
     if( mData.size() > (unsigned int) MAX_CHUNK_SIZE )
937 937
       size = MAX_CHUNK_SIZE;
938 938
     else

+ 1
- 1
kmail/kmcomposewin.cpp Переглянути файл

@@ -2623,7 +2623,7 @@ void KMComposeWin::addrBookSelIntoOld()
2623 2623
       dlg.setSelectedBCC( lst );
2624 2624
   }
2625 2625
 
2626
-  dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
2626
+  dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
2627 2627
 
2628 2628
   if (dlg.exec()==TQDialog::Rejected) return;
2629 2629
 

+ 1
- 1
kmail/kmcomposewin.h Переглянути файл

@@ -486,7 +486,7 @@ private slots:
486 486
   void slotIdentityChanged(uint);
487 487
 
488 488
   /**
489
-   * KIO slots for attachment insertion
489
+   * TDEIO slots for attachment insertion
490 490
    */
491 491
   void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
492 492
   void slotAttachFileResult(TDEIO::Job *);

kmail/tdemdict.cpp → kmail/kmdict.cpp Переглянути файл

@@ -5,7 +5,7 @@
5 5
 #include <config.h>
6 6
 #endif
7 7
 
8
-#include "tdemdict.h"
8
+#include "kmdict.h"
9 9
 #include "kmglobal.h"
10 10
 #include <kdebug.h>
11 11
 

kmail/tdemdict.h → kmail/kmdict.h Переглянути файл


+ 2
- 2
kmail/kmfolderdia.h Переглянути файл

@@ -60,7 +60,7 @@ namespace KMail {
60 60
  * This is the base class for tabs in the folder dialog.
61 61
  * It uses the API from ConfigModuleTab (basically: it's a widget that can load and save)
62 62
  * but it also adds support for delayed-saving:
63
- * when save() needs to use async jobs (e.g. KIO) for saving,
63
+ * when save() needs to use async jobs (e.g. TDEIO) for saving,
64 64
  * we need to delay the closing until after the jobs are finished,
65 65
  * and to cancel the saving on error.
66 66
  *
@@ -87,7 +87,7 @@ public:
87 87
   /// Called when clicking OK.
88 88
   /// If a module returns Delayed, the closing is cancelled for now,
89 89
   /// and the module can close the dialog later on (i.e. after an async
90
-  /// operation like a KIO job).
90
+  /// operation like a TDEIO job).
91 91
   virtual AccepStatus accept() {
92 92
     return save() ? Accepted : Canceled;
93 93
   }

+ 1
- 1
kmail/kmmainwin.cpp Переглянути файл

@@ -103,7 +103,7 @@ KMMainWin::~KMMainWin()
103 103
 
104 104
     if ( not_withdrawn == 0 ) {
105 105
       kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
106
-      // Running KIO jobs prevent kapp from exiting, so we need to kill them
106
+      // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
107 107
       // if they are only about checking mail (not important stuff like moving messages)
108 108
       kmkernel->abortMailCheck();
109 109
       kmkernel->acctMgr()->cancelMailCheck();

+ 1
- 1
kmail/kmmsgdict.cpp Переглянути файл

@@ -4,7 +4,7 @@
4 4
 #include "kmfolderindex.h"
5 5
 #include "kmfolder.h"
6 6
 #include "kmmsgdict.h"
7
-#include "tdemdict.h"
7
+#include "kmdict.h"
8 8
 #include "globalsettings.h"
9 9
 #include "folderstorage.h"
10 10
 

+ 1
- 1
kmail/kmreaderwin.cpp Переглянути файл

@@ -1671,7 +1671,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
1671 1671
 void KMReaderWin::updateHeader()
1672 1672
 {
1673 1673
   /*
1674
-   * TODO: mess around with KHTML DOM some more and figure out how to
1674
+   * TODO: mess around with TDEHTML DOM some more and figure out how to
1675 1675
    * replace the entire header div w/out flickering to hell and back
1676 1676
    *
1677 1677
    * DOM::NodeList divs(mViewer->document().documentElement().getElementsByTagName("div"));

+ 1
- 1
kmail/networkaccount.h Переглянути файл

@@ -107,7 +107,7 @@ namespace KMail {
107 107
     /** @return an URL for this account */
108 108
     virtual KURL getUrl() const;
109 109
 
110
-    /** @return the KIO slave for this account */
110
+    /** @return the TDEIO slave for this account */
111 111
     TDEIO::Slave * slave() const { return mSlave; }
112 112
 
113 113
     /** Kill all jobs that are currently in progress */

+ 5
- 5
kmail/popaccount.h Переглянути файл

@@ -102,12 +102,12 @@ protected:
102 102
   PopAccount(AccountManager* owner, const TQString& accountName, uint id);
103 103
 
104 104
   /**
105
-   * Start a KIO Job to get a list of messages on the pop server
105
+   * Start a TDEIO Job to get a list of messages on the pop server
106 106
    */
107 107
   void startJob();
108 108
 
109 109
   /**
110
-   * Connect up the standard signals/slots for the KIO Jobs
110
+   * Connect up the standard signals/slots for the TDEIO Jobs
111 111
    */
112 112
   void connectJob();
113 113
 
@@ -185,7 +185,7 @@ protected slots:
185 185
   void slotProcessPendingMsgs();
186 186
 
187 187
   /**
188
-   * If there are more messages to be downloaded then start a new kio job
188
+   * If there are more messages to be downloaded then start a new tdeio job
189 189
    * to get the message whose id is at the head of the queue
190 190
    */
191 191
   void slotGetNextMsg();
@@ -202,7 +202,7 @@ protected slots:
202 202
   void slotData( TDEIO::Job*, const TQByteArray &);
203 203
 
204 204
   /**
205
-   * Finished downloading the current kio job, either due to an error
205
+   * Finished downloading the current tdeio job, either due to an error
206 206
    * or because the job has been canceled or because the complete message
207 207
    * has been downloaded
208 208
    */
@@ -230,7 +230,7 @@ protected slots:
230 230
   void slotSlaveError(TDEIO::Slave *, int, const TQString &);
231 231
 
232 232
   /**
233
-   * If there are more headers to be downloaded then start a new kio job
233
+   * If there are more headers to be downloaded then start a new tdeio job
234 234
    * to get the next header
235 235
    */
236 236
   void slotGetNextHdr();

+ 1
- 1
kmail/recipientspicker.cpp Переглянути файл

@@ -579,7 +579,7 @@ void RecipientsPicker::insertRecentAddresses()
579 579
 
580 580
   TDEConfig config( "kmailrc" );
581 581
   TDEABC::Addressee::List recents =
582
-    TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses();
582
+    TDERecentAddress::RecentAddresses::self( &config )->tdeabcAddresses();
583 583
 
584 584
   TDEABC::Addressee::List::ConstIterator it;
585 585
   for( it = recents.begin(); it != recents.end(); ++it ) {

+ 1
- 1
kmail/redirectdialog.cpp Переглянути файл

@@ -132,7 +132,7 @@ void RedirectDialog::slotAddrBook()
132 132
   }
133 133
 
134 134
   dlg.setRecentAddresses(
135
-      RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
135
+      RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
136 136
 
137 137
   // Make it impossible to specify Cc or Bcc addresses as we support
138 138
   // only the Redirect-To header!

+ 2
- 2
kmail/tdelistboxdialog.h Переглянути файл

@@ -1,5 +1,5 @@
1
-#ifndef KLISTBOXDIALOG_H
2
-#define KLISTBOXDIALOG_H
1
+#ifndef TDELISTBOXDIALOG_H
2
+#define TDELISTBOXDIALOG_H
3 3
 
4 4
 #include <kdialogbase.h>
5 5
 

+ 3
- 3
kmail/tdelistviewindexedsearchline.h Переглянути файл

@@ -1,5 +1,5 @@
1
-#ifndef LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
2
-#define LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
1
+#ifndef LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
2
+#define LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
3 3
 
4 4
 /* This file is part of KMail
5 5
  * Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@@ -74,4 +74,4 @@ private:
74 74
 
75 75
 
76 76
 
77
-#endif /* LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */
77
+#endif /* LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */

+ 1
- 1
kmail/tests/Makefile.am Переглянути файл

@@ -6,7 +6,7 @@ check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
6 6
         tdeunittest_utilmodule.la \
7 7
         tdeunittest_mimelibmodule.la
8 8
 
9
-tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
9
+tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
10 10
 tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
11 11
 tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
12 12
 tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la

+ 1
- 1
kmail/tests/messagedicttests.cpp Переглянути файл

@@ -7,7 +7,7 @@
7 7
 #include <tdeunittest/runner.h>
8 8
 #include <tdeunittest/module.h>
9 9
 
10
-#include "tdemdict.h"
10
+#include "kmdict.h"
11 11
 
12 12
 #include "messagedicttests.h"
13 13
 

+ 2
- 2
kmail/tests/mimelibtests.cpp Переглянути файл

@@ -26,8 +26,8 @@
26 26
 
27 27
 using namespace KUnitTest;
28 28
 
29
-KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
30
-KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
29
+TDEUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
30
+TDEUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
31 31
 
32 32
 #include <mimelib/string.h>
33 33
 #include <mimelib/message.h>

+ 2
- 2
kmail/tests/storagelayermodule.cpp Переглянути файл

@@ -12,5 +12,5 @@
12 12
 
13 13
 using namespace KUnitTest;
14 14
 
15
-KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
16
-KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );
15
+TDEUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
16
+TDEUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );

+ 2
- 2
kmail/tests/utiltests.cpp Переглянути файл

@@ -10,8 +10,8 @@
10 10
 
11 11
 using namespace KUnitTest;
12 12
 
13
-KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
14
-KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
13
+TDEUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
14
+TDEUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
15 15
 
16 16
 #include "util.h"
17 17
 #include <mimelib/string.h>

+ 1
- 1
kmailcvt/Makefile.am Переглянути файл

@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
40 40
 kmailcvt_METASOURCES = AUTO
41 41
 
42 42
 # the library search path. 
43
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
43
+kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
44 44
 
45 45
 KDE_ICON=AUTO
46 46
 

+ 2
- 2
kmobile/Makefile.am Переглянути файл

@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
8 8
 
9 9
 INCLUDES         = $(all_includes)
10 10
 
11
-kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
11
+kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
12 12
 kmobile_LDADD   = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la
13 13
 kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
14 14
 			pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
29 29
 libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
30 30
 
31 31
 EXTRA_PROGRAMS = testlibkmobile
32
-testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
32
+testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
33 33
 testlibkmobile_LDADD = libkmobileclient.la
34 34
 testlibkmobile_SOURCES = testlibkmobile.cpp
35 35
 

+ 1
- 1
kmobile/tdeioslave/Makefile.am Переглянути файл

@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kmobile -I$(top_srcdir) $(all_includes)
5 5
 kde_module_LTLIBRARIES = tdeio_mobile.la
6 6
 
7 7
 tdeio_mobile_la_SOURCES = tdeio_mobile.cpp 
8
-tdeio_mobile_la_LIBADD = $(LIB_KIO) ../libkmobileclient.la
8
+tdeio_mobile_la_LIBADD = $(LIB_TDEIO) ../libkmobileclient.la
9 9
 tdeio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
10 10
 
11 11
 kde_services_DATA = mobile.protocol cellphone.protocol \

+ 2
- 2
kmobile/tdeioslave/tdeio_mobile.cpp Переглянути файл

@@ -37,8 +37,8 @@
37 37
 
38 38
 using namespace TDEIO;
39 39
 
40
-#define KIO_MOBILE_DEBUG_AREA 7126
41
-#define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: "
40
+#define TDEIO_MOBILE_DEBUG_AREA 7126
41
+#define PRINT_DEBUG kdDebug(TDEIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: "
42 42
 
43 43
 extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
44 44
 

+ 2
- 2
kmobile/tdeioslave/tdeio_mobile.h Переглянути файл

@@ -16,8 +16,8 @@
16 16
     Boston, MA 02110-1301, USA.
17 17
 */
18 18
 
19
-#ifndef __KIO_MOBILE_H__
20
-#define __KIO_MOBILE_H__
19
+#ifndef __TDEIO_MOBILE_H__
20
+#define __TDEIO_MOBILE_H__
21 21
 
22 22
 #include <tqstring.h>
23 23
 #include <tqvaluelist.h>

+ 3
- 3
knode/Makefile.am Переглянути файл

@@ -11,13 +11,13 @@ lib_LTLIBRARIES = libknodecommon.la
11 11
 
12 12
 kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
13 13
 libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
14
-libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
14
+libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
15 15
 
16 16
 SUBDIRS = pics filters
17 17
 
18 18
 bin_PROGRAMS = knode
19 19
 
20
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
20
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
21 21
 knode_LDADD   = libknodecommon.la
22 22
 
23 23
 kcm_knode_la_SOURCES = knconfigpages.cpp
@@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
26 26
 knconfigpages.lo: smtpaccountwidget_base.h
27 27
 
28 28
 libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
29
-libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
29
+libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDESPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
30 30
 libknodecommon_la_SOURCES =   knconfigmanager.cpp \
31 31
                   knconfig.cpp \
32 32
                   knconfigwidgets.cpp \

+ 1
- 1
knode/kncomposer.cpp Переглянути файл

@@ -1474,7 +1474,7 @@ void KNComposer::slotToBtnClicked()
1474 1474
       dlg.setSelectedTo( lst );
1475 1475
   }
1476 1476
 #endif
1477
-  dlg.setRecentAddresses( RecentAddresses::self(knGlobals.config())->kabcAddresses() );
1477
+  dlg.setRecentAddresses( RecentAddresses::self(knGlobals.config())->tdeabcAddresses() );
1478 1478
   if (dlg.exec()==TQDialog::Rejected) return;
1479 1479
 
1480 1480
   if(!to.isEmpty())

+ 3
- 3
knotes/Makefile.am Переглянути файл

@@ -27,15 +27,15 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.
27 27
 knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
28 28
 knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
29 29
                   libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
30
-                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -ltderesources -ltdeprint -ltdeutils
31
-knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
30
+                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) -ltderesources -ltdeprint -ltdeutils
31
+knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
32 32
 knotes_COMPILE_FIRST = knoteconfig.h
33 33
 
34 34
 kde_module_LTLIBRARIES  = knotes_local.la
35 35
 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
36 36
 knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
37 37
 knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la libknotesprinting.la \
38
-                          $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltderesources
38
+                          $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltderesources
39 39
 
40 40
 METASOURCES     = AUTO
41 41
 

+ 1
- 1
kode/Makefile.am Переглянути файл

@@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
14 14
 
15 15
 bin_PROGRAMS = kode
16 16
 
17
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
17
+kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
18 18
 kode_LDADD   = libkode.la -ltdeabc
19 19
 kode_SOURCES = kodemain.cpp
20 20
 

+ 2
- 2
kode/kodemain.cpp Переглянути файл

@@ -443,7 +443,7 @@ int create( TDECmdLineArgs *args )
443 443
   } else if ( createKioslave ) {
444 444
     c.setDocs( "This class implements a tdeioslave for ..." );
445 445
   
446
-    c.addBaseClass( KODE::Class( "SlaveBase", "KIO" ) );
446
+    c.addBaseClass( KODE::Class( "SlaveBase", "TDEIO" ) );
447 447
     c.addHeaderInclude( "tdeio/slavebase.h" );
448 448
     
449 449
     KODE::Function get( "get", "void" );
@@ -573,7 +573,7 @@ int create( TDECmdLineArgs *args )
573 573
     KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES",
574 574
       "tdeio_" + protocol + ".la" );
575 575
     t.setSources( className.lower() + ".cpp" );
576
-    t.setLibAdd( "$(LIB_KIO)" );
576
+    t.setLibAdd( "$(LIB_TDEIO)" );
577 577
     t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" );
578 578
   
579 579
     am.addTarget( t );

+ 1
- 1
kode/kwsdl/Makefile.am Переглянути файл

@@ -11,7 +11,7 @@ libwsdl_la_LIBADD =  -ltdecore schema/libschema.la
11 11
 
12 12
 bin_PROGRAMS = kwsdl_compiler
13 13
 
14
-kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
14
+kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
15 15
 kwsdl_compiler_LDADD   = ../libkode.la libwsdl.la
16 16
 kwsdl_compiler_SOURCES =  compiler.cpp converter.cpp creator.cpp main.cpp  \
17 17
                           namemapper.cpp 

+ 1
- 1
kode/kwsdl/converter.cpp Переглянути файл

@@ -938,7 +938,7 @@ void Converter::createTransportClass()
938 938
   queryCode += "TDEIO::TransferJob* job = TDEIO::http_post( KURL( " + url.name() + " ), postData, false );";
939 939
   queryCode += "if ( !job ) {";
940 940
   queryCode.indent();
941
-  queryCode += "kdWarning() << \"Unable to create KIO job for \" << " + url.name() + " << endl;";
941
+  queryCode += "kdWarning() << \"Unable to create TDEIO job for \" << " + url.name() + " << endl;";
942 942
   queryCode += "return;";
943 943
   queryCode.unindent();
944 944
   queryCode += "}";

+ 1
- 1
kode/kwsdl/kung/Makefile.am Переглянути файл

@@ -1,7 +1,7 @@
1 1
 INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
2 2
 
3 3
 bin_PROGRAMS = kung
4
-kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
4
+kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
5 5
 kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
6 6
                doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
7 7
                inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \

+ 1
- 1
kode/kwsdl/kung/transport.cpp Переглянути файл

@@ -38,7 +38,7 @@ void Transport::query( const TQString &xml )
38 38
   
39 39
   TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
40 40
   if ( !job ) {
41
-    kdWarning() << "Unable to create KIO job for " << mUrl << endl;
41
+    kdWarning() << "Unable to create TDEIO job for " << mUrl << endl;
42 42
     return;
43 43
   }
44 44
   

+ 1
- 1
kode/kwsdl/schema/Makefile.am Переглянути файл

@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
8 8
 libschema_la_LIBADD = -lqt-mt -ltdecore -ltdeio
9 9
 
10 10
 #bin_PROGRAMS = schematest
11
-#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
11
+#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
12 12
 #schematest_SOURCES = main.cpp
13 13
 #schematest_LDADD = libschema.la
14 14
 

+ 1
- 1
kode/kwsdl/tests/google/Makefile.am Переглянути файл

@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
5 5
 
6 6
 googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
7 7
 googletest_LDADD = -ltdecore -ltdeio
8
-googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
8
+googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
9 9
 

+ 1
- 1
kode/kwsdl/tests/google/transport.cpp Переглянути файл

@@ -41,7 +41,7 @@ void Transport::query( const TQString &xml )
41 41
   
42 42
   TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
43 43
   if ( !job ) {
44
-    kdWarning() << "Unable to create KIO job for " << mUrl << endl;
44
+    kdWarning() << "Unable to create TDEIO job for " << mUrl << endl;
45 45
     return;
46 46
   }
47 47
   

+ 1
- 1
kode/kwsdl/wscl/Makefile.am Переглянути файл

@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
7 7
 libwscl_la_LIBADD = -lqt-mt
8 8
 
9 9
 #bin_PROGRAMS = wscltest
10
-#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
10
+#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
11 11
 #wscltest_SOURCES = main.cpp
12 12
 #wscltest_LDADD = libwscl.la
13 13
 

+ 1
- 1
kode/kxml_compiler/Makefile.am Переглянути файл

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
2 2
 
3 3
 bin_PROGRAMS = kxml_compiler
4 4
 
5
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
5
+kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
6 6
 kxml_compiler_LDADD   = ../libkode.la -ltdecore
7 7
 kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
8 8
 

+ 1
- 1
konsolekalendar/Makefile.am Переглянути файл

@@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
13 13
   konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
14 14
   stdcalendar.cpp main.cpp 
15 15
 konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
16
-konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
16
+konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
17 17
 
18 18
 appsdir = $(kde_appsdir)/Utilities
19 19
 xdg_apps_DATA = konsolekalendar.desktop

+ 1
- 1
kontact/Thoughts Переглянути файл

@@ -257,7 +257,7 @@ z last used part on startup. Make sure its loading finishes and then
257 257
 z load the rest once the user can already interact with the last used
258 258
 z loaded part.
259 259
 
260
-g why do we always need the addressbook? Is libkabc not sufficient?
260
+g why do we always need the addressbook? Is libtdeabc not sufficient?
261 261
 
262 262
 Don: I guess my machine is too fast, starting parts is pretty quick here :-)
263 263
 

+ 1
- 1
kontact/interfaces/Makefile.am Переглянути файл

@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkpinterfaces.la
4 4
 
5 5
 libkpinterfaces_la_SOURCES = core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp
6 6
 libkpinterfaces_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
7
-libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_KPARTS)
7
+libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_TDEPARTS)
8 8
 
9 9
 kpincludedir = $(includedir)/kontact
10 10
 kpinclude_HEADERS = core.h plugin.h summary.h

+ 1
- 1
kontact/plugins/akregator/Makefile.am Переглянути файл

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/akregator/src -I$(
2 2
 
3 3
 kde_module_LTLIBRARIES = libkontact_akregator.la
4 4
 libkontact_akregator_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
5
-libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
5
+libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
6 6
 libkontact_akregator_la_SOURCES = akregator_plugin.cpp akregator_partiface.stub
7 7
 
8 8
 METASOURCES = AUTO

+ 1
- 1
kontact/plugins/kmail/Makefile.am Переглянути файл

@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_buil
7 7
 kde_module_LTLIBRARIES = libkontact_kmailplugin.la kcm_kmailsummary.la
8 8
 
9 9
 libkontact_kmailplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
10
-libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_KPARTS)
10
+libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_TDEPARTS)
11 11
 
12 12
 libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \
13 13
                                     summarywidget.cpp summarywidget.skel

+ 1
- 1
kontact/plugins/knode/Makefile.am Переглянути файл

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/knode -I$(top_srcd
2 2
 
3 3
 kde_module_LTLIBRARIES = libkontact_knodeplugin.la
4 4
 libkontact_knodeplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
5
-libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
5
+libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
6 6
 
7 7
 libkontact_knodeplugin_la_SOURCES = knode_plugin.cpp knodeiface.stub
8 8
 

+ 1
- 1
kontact/plugins/knotes/Makefile.am Переглянути файл

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
3 3
 kde_module_LTLIBRARIES = libkontact_knotesplugin.la
4 4
 libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
5 5
 libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
6
-                                    $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \
6
+                                    $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la \
7 7
                                     $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \
8 8
                                     $(top_builddir)/knotes/libknotesresources.la \
9 9
                                     $(top_builddir)/knotes/libknoteseditor.la \

+ 3
- 3
kontact/plugins/korganizer/Makefile.am Переглянути файл

@@ -15,7 +15,7 @@ libcommon_la_SOURCES = korg_uniqueapp.cpp
15 15
 
16 16
 libkontact_korganizerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
17 17
 libkontact_korganizerplugin_la_LIBADD = libcommon.la \
18
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
18
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
19 19
     $(top_builddir)/korganizer/libkorganizer_calendar.la
20 20
 libkontact_korganizerplugin_la_SOURCES = korganizerplugin.cpp \
21 21
                                          kcalendariface.stub \
@@ -27,7 +27,7 @@ korganizeriface_DCOPIDLNG = true
27 27
 
28 28
 libkontact_todoplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
29 29
 libkontact_todoplugin_la_LIBADD = libcommon.la \
30
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
30
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
31 31
     $(top_builddir)/korganizer/libkorganizer_calendar.la \
32 32
     $(top_builddir)/korganizer/libkorganizer.la
33 33
 libkontact_todoplugin_la_SOURCES = todoplugin.cpp \
@@ -37,7 +37,7 @@ libkontact_todoplugin_la_SOURCES = todoplugin.cpp \
37 37
 
38 38
 libkontact_journalplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
39 39
 libkontact_journalplugin_la_LIBADD = libcommon.la \
40
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
40
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
41 41
     $(top_builddir)/korganizer/libkorganizer_calendar.la
42 42
 libkontact_journalplugin_la_SOURCES = journalplugin.cpp kcalendariface.stub
43 43
 

+ 1
- 1
kontact/plugins/kpilot/Makefile.am Переглянути файл

@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
8 8
 kde_module_LTLIBRARIES = libkontact_kpilotplugin.la
9 9
 libkontact_kpilotplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
10 10
 libkontact_kpilotplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
11
-	$(LIB_KPARTS) \
11
+	$(LIB_TDEPARTS) \
12 12
 	$(top_builddir)/libtdepim/libtdepim.la \
13 13
 	$(top_builddir)/kpilot/lib/libkpilot.la
14 14
 

+ 1
- 1
kontact/plugins/newsticker/Makefile.am Переглянути файл

@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
4 4
 
5 5
 kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la
6 6
 libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
7
-libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) \
7
+libkontact_newstickerplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) \
8 8
                                         $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la
9 9
 
10 10
 libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \

+ 0
- 0
kontact/plugins/summary/Makefile.am Переглянути файл


Деякі файли не було показано, через те що забагато файлів було змінено

Завантаження…
Відмінити
Зберегти