Browse Source

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

Timothy Pearson 6 years ago
parent
commit
64df902cf7
100 changed files with 143 additions and 143 deletions
  1. 4
    4
      CMakeLists.txt
  2. 2
    2
      MAINTAINERS
  3. 1
    1
      Mainpage.dox
  4. 2
    2
      Makefile.am.in
  5. 1
    1
      NewsLog.txt
  6. 2
    2
      README
  7. 1
    1
      README.Kolab
  8. 1
    1
      akregator/src/CMakeLists.txt
  9. 4
    4
      akregator/src/akregator_part.cpp
  10. 3
    3
      akregator/src/akregator_view.cpp
  11. 1
    1
      akregator/src/akregatorconfig.kcfgc
  12. 1
    1
      akregator/src/articlefilter.cpp
  13. 2
    2
      akregator/src/articleviewer.cpp
  14. 1
    1
      akregator/src/configdialog.h
  15. 1
    1
      akregator/src/librss/image.cpp
  16. 1
    1
      akregator/src/librss/loader.cpp
  17. 1
    1
      akregator/src/librss/loader.h
  18. 2
    2
      akregator/src/mainwindow.cpp
  19. 1
    1
      akregator/src/mainwindow.h
  20. 1
    1
      akregator/src/mk4storage/CMakeLists.txt
  21. 1
    1
      akregator/src/pageviewer.cpp
  22. 1
    1
      akregator/src/viewer.cpp
  23. 2
    2
      certmanager/certificatewizardimpl.cpp
  24. 3
    3
      certmanager/certmanager.cpp
  25. 1
    1
      certmanager/conf/appearanceconfigwidget.cpp
  26. 1
    1
      certmanager/conf/configuredialog.cpp
  27. 1
    1
      certmanager/conf/dirservconfigpage.cpp
  28. 1
    1
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  29. 2
    2
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  30. 1
    1
      certmanager/lib/CMakeLists.txt
  31. 1
    1
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  32. 1
    1
      certmanager/lib/cryptplugfactory.cpp
  33. 1
    1
      certmanager/lib/cryptplugwrapper.cpp
  34. 1
    1
      certmanager/lib/kleo/CMakeLists.txt
  35. 1
    1
      certmanager/lib/kleo/Makefile.am
  36. 1
    1
      certmanager/lib/kleo/cryptobackendfactory.cpp
  37. 1
    1
      certmanager/lib/kleo/dn.cpp
  38. 2
    2
      certmanager/lib/kleo/keyfiltermanager.cpp
  39. 3
    3
      certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
  40. 1
    1
      certmanager/lib/kleo/tdeconfigbasedkeyfilter.h
  41. 1
    1
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  42. 1
    1
      certmanager/lib/ui/keyselectiondialog.cpp
  43. 1
    1
      certmanager/lib/ui/messagebox.cpp
  44. 1
    1
      certmanager/storedtransferjob.h
  45. 1
    1
      config.h.cmake
  46. 3
    3
      dependency-graph.dot
  47. 1
    1
      kaddressbook/addresseditwidget.cpp
  48. 1
    1
      kaddressbook/addresseeconfig.h
  49. 1
    1
      kaddressbook/addresseeeditorwidget.cpp
  50. 1
    1
      kaddressbook/common/filter.cpp
  51. 1
    1
      kaddressbook/common/filter.h
  52. 1
    1
      kaddressbook/common/kabprefs.cpp
  53. 1
    1
      kaddressbook/common/kabprefs_base.kcfgc
  54. 1
    1
      kaddressbook/common/locationmap.cpp
  55. 1
    1
      kaddressbook/emaileditwidget.cpp
  56. 1
    1
      kaddressbook/extensionmanager.cpp
  57. 1
    1
      kaddressbook/features/distributionlistwidget.cpp
  58. 2
    2
      kaddressbook/imagewidget.cpp
  59. 1
    1
      kaddressbook/imeditwidget.cpp
  60. 1
    1
      kaddressbook/interfaces/configurewidget.h
  61. 1
    1
      kaddressbook/kaddressbookview.cpp
  62. 1
    1
      kaddressbook/kcmconfigs/addresseewidget.cpp
  63. 1
    1
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  64. 1
    1
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  65. 2
    2
      kaddressbook/keywidget.cpp
  66. 1
    1
      kaddressbook/ldapsearchdialog.cpp
  67. 1
    1
      kaddressbook/nameeditdialog.cpp
  68. 1
    1
      kaddressbook/phoneeditwidget.cpp
  69. 1
    1
      kaddressbook/printing/detailledstyle.cpp
  70. 1
    1
      kaddressbook/soundwidget.cpp
  71. 1
    1
      kaddressbook/thumbnailcreator/Makefile.am
  72. 1
    1
      kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
  73. 1
    1
      kaddressbook/thumbnailcreator/ldifvcardcreator.h
  74. 1
    1
      kaddressbook/viewconfigurefilterpage.cpp
  75. 1
    1
      kaddressbook/viewconfigurewidget.cpp
  76. 1
    1
      kaddressbook/viewmanager.cpp
  77. 1
    1
      kaddressbook/views/configurecardviewdialog.cpp
  78. 1
    1
      kaddressbook/views/configuretableviewdialog.cpp
  79. 1
    1
      kaddressbook/views/contactlistview.cpp
  80. 1
    1
      kaddressbook/views/kaddressbookcardview.cpp
  81. 1
    1
      kaddressbook/views/kaddressbookiconview.cpp
  82. 1
    1
      kaddressbook/views/kaddressbooktableview.cpp
  83. 2
    2
      kaddressbook/xxport/csv_xxport.cpp
  84. 1
    1
      kaddressbook/xxport/csvimportdialog.cpp
  85. 2
    2
      kaddressbook/xxport/eudora_xxport.cpp
  86. 4
    4
      kaddressbook/xxport/kde2_xxport.cpp
  87. 2
    2
      kaddressbook/xxport/ldif_xxport.cpp
  88. 2
    2
      kaddressbook/xxport/opera_xxport.cpp
  89. 2
    2
      kaddressbook/xxport/pab_xxport.cpp
  90. 2
    2
      kaddressbook/xxport/vcard_xxport.cpp
  91. 1
    1
      kalarm/CMakeLists.txt
  92. 2
    2
      kalarm/Makefile.am
  93. 4
    4
      kalarm/alarmcalendar.cpp
  94. 1
    1
      kalarm/birthdaydlg.cpp
  95. 1
    1
      kalarm/daemon.cpp
  96. 5
    5
      kalarm/editdlg.cpp
  97. 2
    2
      kalarm/functions.cpp
  98. 2
    2
      kalarm/kalarmapp.cpp
  99. 2
    2
      kalarm/kalarmd/adcalendar.cpp
  100. 0
    0
      kalarm/kalarmd/adconfigdata.cpp

+ 4
- 4
CMakeLists.txt View File

@@ -97,7 +97,7 @@ option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} )
97 97
 option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} )
98 98
 option( BUILD_LIBKSIEVE "Build libksieve" ${BUILD_ALL} )
99 99
 option( BUILD_LIBKPIMEXCHANGE "Build libkpimexchange" ${BUILD_ALL} )
100
-option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
100
+option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
101 101
 option( BUILD_KMAIL "Build kmail" ${BUILD_ALL} )
102 102
 option( BUILD_AKREGATOR "Build akregator" ${BUILD_ALL} )
103 103
 option( BUILD_KALARM "Build kalarm" ${BUILD_ALL} )
@@ -115,7 +115,7 @@ option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
115 115
 option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
116 116
 option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} )
117 117
 option( BUILD_KARM "Build karm" ${BUILD_ALL} )
118
-option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
118
+option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
119 119
 option( BUILD_KANDY "Build kandy" ${BUILD_ALL} )
120 120
 option( BUILD_KNODE "Build knode" ${BUILD_ALL} )
121 121
 option( BUILD_KMOBILE "Build kmobile" ${BUILD_ALL} )
@@ -168,7 +168,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp )
168 168
 tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib )
169 169
 tde_conditional_add_subdirectory( BUILD_LIBKSIEVE libksieve )
170 170
 tde_conditional_add_subdirectory( BUILD_LIBKPIMEXCHANGE libkpimexchange )
171
-tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslaves )
171
+tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslaves )
172 172
 tde_conditional_add_subdirectory( BUILD_KMAIL kmail )
173 173
 tde_conditional_add_subdirectory( BUILD_AKREGATOR akregator )
174 174
 tde_conditional_add_subdirectory( BUILD_KALARM kalarm )
@@ -187,7 +187,7 @@ tde_conditional_add_subdirectory( BUILD_KABC kabc )
187 187
 tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )
188 188
 tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt )
189 189
 tde_conditional_add_subdirectory( BUILD_KARM karm )
190
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
190
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
191 191
 tde_conditional_add_subdirectory( BUILD_KANDY kandy )
192 192
 tde_conditional_add_subdirectory( BUILD_KNODE knode )
193 193
 tde_conditional_add_subdirectory( BUILD_KMOBILE kmobile )

+ 2
- 2
MAINTAINERS View File

@@ -7,9 +7,9 @@ kandy            Cornelius Schumacher <schumacher@kde.org>
7 7
 karm             Mark Bucciarelli <mark@hubcapconsulting.com>
8 8
 kdgantt          Kalle Dalheimer <kalle@klaralvdalens-datakonsult.se>
9 9
                  Lutz Rogowski <lutz@klaralvdalens-datakonsult.se>
10
-kfile-plugins    ?
10
+tdefile-plugins    ?
11 11
 kgantt           ? Jochen Hanff <jochen@ifb.bv.tu-berlin.de>
12
-kioslaves        ? Marc Mutz <mutz@kde.org>
12
+tdeioslaves        ? Marc Mutz <mutz@kde.org>
13 13
 kitchensync      Cornelius Schumacher <schumacher@kde.org>
14 14
                  Holger Freyther <freyther@kde.org>
15 15
 kmail            Ingo Kloecker <kloecker@kde.org>

+ 1
- 1
Mainpage.dox View File

@@ -29,7 +29,7 @@
29 29
         * - <a href="karm/html/index.html"><b>karm</b></a>
30 30
         *   (<a href="karm/html/classes.html">classes</a>)\n
31 31
         *   <i>A time tracker.</i>
32
-        * - <a href="kfile-plugins/html/index.html"><b>kfile-plugins</b></a>
32
+        * - <a href="tdefile-plugins/html/index.html"><b>tdefile-plugins</b></a>
33 33
         *   <i></i>
34 34
         * - <a href="kgantt/html/index.html"><b>kgantt</b></a>
35 35
         *   (<a href="kgantt/html/classes.html">classes</a>)\n

+ 2
- 2
Makefile.am.in View File

@@ -11,7 +11,7 @@
11 11
 COMPILE_AFTER_libkmime = libemailfunctions
12 12
 COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
13 13
 COMPILE_AFTER_libkholidays = korganizer kontact
14
-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources kfile-plugins
14
+COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources tdefile-plugins
15 15
 COMPILE_AFTER_mimelib = korn kmail
16 16
 COMPILE_AFTER_libtdenetwork = kmail knode
17 17
 COMPILE_AFTER_libksieve = kmail
@@ -28,7 +28,7 @@ COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
28 28
 COMPILE_BEFORE_karm = libtdepim tderesources
29 29
 COMPILE_BEFORE_plugins = kmail libtdepim libkcal
30 30
 COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
31
-COMPILE_BEFORE_kioslaves = libkmime libtdepim
31
+COMPILE_BEFORE_tdeioslaves = libkmime libtdepim
32 32
 COMPILE_BEFORE_libkpimexchange = libtdepim
33 33
 COMPILE_BEFORE_kalarm = libtdepim libkmime
34 34
 COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode

+ 1
- 1
NewsLog.txt View File

@@ -1475,7 +1475,7 @@ Problems addressed
1475 1475
 -------------------
1476 1476
 
1477 1477
 * Prevent crash after changing the layout and replying then. (778728)
1478
-* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
1478
+* kolab/issue2442 kolab/issue2442 (tdeioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
1479 1479
 * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
1480 1480
 * kolab/issue1700 kleopatra crashes after ldap search. (780211)
1481 1481
 * kolab/issue2168 Email attachment overlay view, header style "enterprise" : Should be made foldable (780250)

+ 2
- 2
README View File

@@ -32,7 +32,7 @@ What it is
32 32
 * kontact: Integrated PIM application
33 33
 * karm: Time tracker.
34 34
 * kitchensync: Synchronization framework, still under heavy development.
35
-* kfile-plugins: vCard KFIleItem plugin.
35
+* tdefile-plugins: vCard KFIleItem plugin.
36 36
 * knotes: yellow notes application
37 37
 * konsolecalendar: Command line tool for accessing calendar files.
38 38
 * korn: mail checker
@@ -53,7 +53,7 @@ There is also quite an amount of infrastructure in this package:
53 53
           plugin of KOrganizer
54 54
 * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of
55 55
            KOrganizer (yes, we should decide for one of the Gantt libs)
56
-* kioslaves/sieve: Sieve kioslave
56
+* tdeioslaves/sieve: Sieve tdeioslave
57 57
 * ktnef: handling of tnef data
58 58
 
59 59
 The following subdirectories have been moved to kdenonbeta/tdepim:

+ 1
- 1
README.Kolab View File

@@ -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 "kcmshell tderesources", section "kabc"
79
+  1. All available addressbook resources as seen in "tdecmshell tderesources", section "kabc"
80 80
   2. LDAP
81 81
 
82 82
 Nothing special, AFAIK

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

@@ -83,7 +83,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC
83 83
     tagset.cpp trayicon.cpp treenode.cpp treenodevisitor.cpp
84 84
     utils.cpp
85 85
   VERSION 0.0.0
86
-  LINK rsslocal-static kio-shared
86
+  LINK rsslocal-static tdeio-shared
87 87
   DESTINATION ${LIB_INSTALL_DIR}
88 88
 )
89 89
 

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

@@ -28,9 +28,9 @@
28 28
 #include <kactionclasses.h>
29 29
 #include <kactioncollection.h>
30 30
 #include <kapplication.h>
31
-#include <kconfig.h>
32
-#include <kconfigdialog.h>
33
-#include <kfiledialog.h>
31
+#include <tdeconfig.h>
32
+#include <tdeconfigdialog.h>
33
+#include <tdefiledialog.h>
34 34
 #include <kglobalsettings.h>
35 35
 #include <tdehtmldefaults.h>
36 36
 #include <kinstance.h>
@@ -44,7 +44,7 @@
44 44
 #include <kstdaction.h>
45 45
 #include <ktempfile.h>
46 46
 #include <ktrader.h>
47
-#include <kio/netaccess.h>
47
+#include <tdeio/netaccess.h>
48 48
 #include <tdeparts/browserinterface.h>
49 49
 #include <tdeparts/genericfactory.h>
50 50
 #include <tdeparts/partmanager.h>

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

@@ -62,11 +62,11 @@
62 62
 #include <kapplication.h>
63 63
 #include <kcharsets.h>
64 64
 #include <kcombobox.h>
65
-#include <kconfig.h>
65
+#include <tdeconfig.h>
66 66
 #include <kdebug.h>
67 67
 #include <kdialog.h>
68
-#include <kfiledialog.h>
69
-#include <kfileitem.h>
68
+#include <tdefiledialog.h>
69
+#include <tdefileitem.h>
70 70
 #include <tdehtml_part.h>
71 71
 #include <tdehtmlview.h>
72 72
 #include <kiconloader.h>

+ 1
- 1
akregator/src/akregatorconfig.kcfgc View File

@@ -1,4 +1,4 @@
1
-# Code generation options for kconfig_compiler
1
+# Code generation options for tdeconfig_compiler
2 2
 File=akregator.kcfg
3 3
 ClassName=Settings
4 4
 NameSpace=Akregator

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

@@ -29,7 +29,7 @@
29 29
 #include "shared.h"
30 30
 
31 31
 #include <kapplication.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kdebug.h>
34 34
 #include <kurl.h>
35 35
 

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

@@ -38,8 +38,8 @@
38 38
 #include <kstandarddirs.h>
39 39
 #include <kshell.h>
40 40
 #include <kmessagebox.h>
41
-#include <kio/netaccess.h>
42
-#include <libtdepim/kfileio.h>
41
+#include <tdeio/netaccess.h>
42
+#include <libtdepim/tdefileio.h>
43 43
 
44 44
 #include "aboutdata.h"
45 45
 #include "akregator_run.h"

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

@@ -25,7 +25,7 @@
25 25
 #ifndef AKREGATOR_CONFIGDIALOG_H
26 26
 #define AKREGATOR_CONFIGDIALOG_H
27 27
 
28
-#include <kconfigdialog.h>
28
+#include <tdeconfigdialog.h>
29 29
 
30 30
 namespace Akregator {
31 31
 

+ 1
- 1
akregator/src/librss/image.cpp View File

@@ -11,7 +11,7 @@
11 11
 #include "image.h"
12 12
 #include "tools_p.h"
13 13
 
14
-#include <kio/job.h>
14
+#include <tdeio/job.h>
15 15
 #include <kurl.h>
16 16
 
17 17
 #include <tqbuffer.h>

+ 1
- 1
akregator/src/librss/loader.cpp View File

@@ -12,7 +12,7 @@
12 12
 #include "document.h"
13 13
 #include "feeddetector.h"
14 14
 
15
-#include <kio/job.h>
15
+#include <tdeio/job.h>
16 16
 #include <kprocess.h>
17 17
 #include <kstaticdeleter.h>
18 18
 #include <kurl.h>

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

@@ -114,7 +114,7 @@ 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/kio/KIO.html#Error">as
117
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
118 118
 			 * defined by KIO</a>.
119 119
 			 */
120 120
 			virtual int errorCode() const;

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

@@ -32,10 +32,10 @@
32 32
 
33 33
 #include <kaction.h>
34 34
 #include <kapplication.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kdebug.h>
37 37
 #include <kedittoolbar.h>
38
-#include <kfiledialog.h>
38
+#include <tdefiledialog.h>
39 39
 #include <kglobal.h>
40 40
 #include <kkeydialog.h>
41 41
 #include <klibloader.h>

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

@@ -33,7 +33,7 @@
33 33
 #include <tdeparts/mainwindow.h>
34 34
 #include <tdeparts/browserinterface.h>
35 35
 #include <tdeparts/browserextension.h>
36
-#include <kio/job.h>
36
+#include <tdeio/job.h>
37 37
 
38 38
 class KActionCollection;
39 39
 class KToggleAction;

+ 1
- 1
akregator/src/mk4storage/CMakeLists.txt View File

@@ -39,6 +39,6 @@ tde_add_kpart( libakregator_mk4storage_plugin AUTOMOC
39 39
     storagefactorymk4impl.cpp
40 40
   LINK
41 41
     rsslocal-static metakitlocal-static
42
-    akregatorprivate-shared kio-shared
42
+    akregatorprivate-shared tdeio-shared
43 43
   DESTINATION ${PLUGIN_INSTALL_DIR}
44 44
 )

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

@@ -33,7 +33,7 @@
33 33
 #include <kapplication.h>
34 34
 #include <kbookmark.h>
35 35
 #include <kbookmarkmanager.h>
36
-#include <kconfig.h>
36
+#include <tdeconfig.h>
37 37
 #include <kglobalsettings.h>
38 38
 #include <tdehtml_settings.h>
39 39
 #include <tdehtmlview.h>

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

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <kaction.h>
27 27
 #include <kapplication.h>
28
-#include <kfiledialog.h>
28
+#include <tdefiledialog.h>
29 29
 #include <tdehtmlview.h>
30 30
 #include <kiconloader.h>
31 31
 #include <klocale.h>

+ 2
- 2
certmanager/certificatewizardimpl.cpp View File

@@ -60,8 +60,8 @@
60 60
 #include <kurlrequester.h>
61 61
 #include <kdcopservicestarter.h>
62 62
 #include <dcopclient.h>
63
-#include <kio/job.h>
64
-#include <kio/netaccess.h>
63
+#include <tdeio/job.h>
64
+#include <tdeio/netaccess.h>
65 65
 
66 66
 // TQt
67 67
 #include <tqlineedit.h>

+ 3
- 3
certmanager/certmanager.cpp View File

@@ -71,7 +71,7 @@
71 71
 #include <gpgmepp/key.h>
72 72
 
73 73
 // KDE
74
-#include <kfiledialog.h>
74
+#include <tdefiledialog.h>
75 75
 #include <kprocess.h>
76 76
 #include <kaction.h>
77 77
 #include <kapplication.h>
@@ -85,8 +85,8 @@
85 85
 #include <kdialogbase.h>
86 86
 #include <kkeydialog.h>
87 87
 #include <ktempfile.h>
88
-#include <kio/job.h>
89
-#include <kio/netaccess.h>
88
+#include <tdeio/job.h>
89
+#include <tdeio/netaccess.h>
90 90
 #include <kstdaccel.h>
91 91
 
92 92
 // TQt

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

@@ -41,7 +41,7 @@
41 41
 #include <kleo/keyfiltermanager.h>
42 42
 
43 43
 #include <klistview.h>
44
-#include <kconfig.h>
44
+#include <tdeconfig.h>
45 45
 #include <kdialog.h>
46 46
 #include <klocale.h>
47 47
 #include <kdebug.h>

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

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <twin.h>
37 37
 #include <kapplication.h>
38
-#include <kconfig.h>
38
+#include <tdeconfig.h>
39 39
 #include <klocale.h>
40 40
 
41 41
 ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )

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

@@ -37,7 +37,7 @@
37 37
 #include <kmessagebox.h>
38 38
 #include <klocale.h>
39 39
 #include <kdebug.h>
40
-#include <kconfig.h>
40
+#include <tdeconfig.h>
41 41
 #include <knuminput.h>
42 42
 #include <kdialog.h>
43 43
 

+ 1
- 1
certmanager/kwatchgnupg/kwatchgnupgconfig.cpp View File

@@ -34,7 +34,7 @@
34 34
 
35 35
 #include <klocale.h>
36 36
 #include <kurlrequester.h>
37
-#include <kconfig.h>
37
+#include <tdeconfig.h>
38 38
 #include <kapplication.h>
39 39
 
40 40
 #include <tqframe.h>

+ 2
- 2
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp View File

@@ -44,8 +44,8 @@
44 44
 #include <kaction.h>
45 45
 #include <kstdaction.h>
46 46
 #include <kprocio.h>
47
-#include <kconfig.h>
48
-#include <kfiledialog.h>
47
+#include <tdeconfig.h>
48
+#include <tdefiledialog.h>
49 49
 #include <kedittoolbar.h>
50 50
 #include <kkeydialog.h>
51 51
 

+ 1
- 1
certmanager/lib/CMakeLists.txt View File

@@ -47,6 +47,6 @@ tde_add_library( kleopatra SHARED AUTOMOC
47 47
   LINK
48 48
     kleopatra_backend_qgpgme-static
49 49
     kleopatra_backend_chiasmus-static
50
-    qgpgme-shared kio-shared
50
+    qgpgme-shared tdeio-shared
51 51
   DESTINATION ${LIB_INSTALL_DIR}
52 52
 )

+ 1
- 1
certmanager/lib/backends/chiasmus/chiasmusbackend.cpp View File

@@ -43,7 +43,7 @@
43 43
 #include "kleo/cryptoconfig.h"
44 44
 
45 45
 #include <klocale.h>
46
-#include <kconfig.h>
46
+#include <tdeconfig.h>
47 47
 #include <kshell.h>
48 48
 #include <kdebug.h>
49 49
 

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

@@ -37,7 +37,7 @@
37 37
 #include "cryptplugfactory.h"
38 38
 #include "cryptplugwrapperlist.h"
39 39
 
40
-#include <kconfig.h>
40
+#include <tdeconfig.h>
41 41
 #include <klocale.h>
42 42
 #include <kdebug.h>
43 43
 #include <kmessagebox.h>

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

@@ -64,7 +64,7 @@
64 64
 #include <kapplication.h>
65 65
 #include <klocale.h>
66 66
 #include <kglobal.h>
67
-#include <kconfig.h>
67
+#include <tdeconfig.h>
68 68
 
69 69
 // other
70 70
 #include <memory>

+ 1
- 1
certmanager/lib/kleo/CMakeLists.txt View File

@@ -43,6 +43,6 @@ tde_add_library( kleopatra_core STATIC_PIC AUTOMOC
43 43
   SOURCES
44 44
     cryptobackend.cpp cryptobackendfactory.cpp
45 45
     enum.cpp dn.cpp job.cpp multideletejob.cpp
46
-    hierarchicalkeylistjob.cpp kconfigbasedkeyfilter.cpp
46
+    hierarchicalkeylistjob.cpp tdeconfigbasedkeyfilter.cpp
47 47
     keyfiltermanager.cpp
48 48
 )

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

@@ -14,7 +14,7 @@ libkleopatra_core_la_SOURCES = \
14 14
 	multideletejob.cpp \
15 15
 	hierarchicalkeylistjob.cpp \
16 16
 	\
17
-	kconfigbasedkeyfilter.cpp \
17
+	tdeconfigbasedkeyfilter.cpp \
18 18
 	keyfiltermanager.cpp
19 19
 
20 20
 kleodir = $(includedir)/kleo

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

@@ -46,7 +46,7 @@
46 46
 #include <backends/chiasmus/chiasmusbackend.h>
47 47
 #include <ui/backendconfigwidget.h>
48 48
 
49
-#include <kconfig.h>
49
+#include <tdeconfig.h>
50 50
 #include <klocale.h>
51 51
 #include <kdebug.h>
52 52
 #include <kmessagebox.h>

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

@@ -40,7 +40,7 @@
40 40
 #include "ui/dnattributeorderconfigwidget.h"
41 41
 
42 42
 #include <kapplication.h>
43
-#include <kconfig.h>
43
+#include <tdeconfig.h>
44 44
 #include <klocale.h>
45 45
 
46 46
 #include <tqstringlist.h>

+ 2
- 2
certmanager/lib/kleo/keyfiltermanager.cpp View File

@@ -35,11 +35,11 @@
35 35
 #endif
36 36
 
37 37
 #include "keyfiltermanager.h"
38
-#include "kconfigbasedkeyfilter.h"
38
+#include "tdeconfigbasedkeyfilter.h"
39 39
 
40 40
 #include "cryptobackendfactory.h"
41 41
 
42
-#include <kconfig.h>
42
+#include <tdeconfig.h>
43 43
 
44 44
 #include <tqapplication.h>
45 45
 #include <tqregexp.h>

certmanager/lib/kleo/kconfigbasedkeyfilter.cpp → certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp View File

@@ -1,5 +1,5 @@
1 1
 /*
2
-    kconfigbasedkeyfilter.cpp
2
+    tdeconfigbasedkeyfilter.cpp
3 3
 
4 4
     This file is part of libkleopatra, the KDE keymanagement library
5 5
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
@@ -34,9 +34,9 @@
34 34
 #include <config.h>
35 35
 #endif
36 36
 
37
-#include "kconfigbasedkeyfilter.h"
37
+#include "tdeconfigbasedkeyfilter.h"
38 38
 
39
-#include <kconfigbase.h>
39
+#include <tdeconfigbase.h>
40 40
 #include <klocale.h>
41 41
 
42 42
 static const struct {

certmanager/lib/kleo/kconfigbasedkeyfilter.h → certmanager/lib/kleo/tdeconfigbasedkeyfilter.h View File

@@ -1,5 +1,5 @@
1 1
 /*
2
-    kconfigbasedkeyfilter.h
2
+    tdeconfigbasedkeyfilter.h
3 3
 
4 4
     This file is part of libkleopatra, the KDE keymanagement library
5 5
     Copyright (c) 2004 Klarälvdalens Datakonsult AB

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

@@ -42,7 +42,7 @@
42 42
 #include <kdebug.h>
43 43
 #include <kdialog.h>
44 44
 #include <kiconloader.h>
45
-#include <kconfig.h>
45
+#include <tdeconfig.h>
46 46
 #include <kapplication.h>
47 47
 
48 48
 #include <tqtoolbutton.h>

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

@@ -58,7 +58,7 @@
58 58
 #include <kiconloader.h>
59 59
 #include <kdebug.h>
60 60
 #include <twin.h>
61
-#include <kconfig.h>
61
+#include <tdeconfig.h>
62 62
 #include <kmessagebox.h>
63 63
 #include <kprocess.h>
64 64
 #include <kactivelabel.h>

+ 1
- 1
certmanager/lib/ui/messagebox.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <gpgmepp/signingresult.h>
42 42
 #include <gpgmepp/encryptionresult.h>
43 43
 
44
-#include <kfiledialog.h>
44
+#include <tdefiledialog.h>
45 45
 #include <kdialogbase.h>
46 46
 #include <klocale.h>
47 47
 #include <ksavefile.h>

+ 1
- 1
certmanager/storedtransferjob.h View File

@@ -20,7 +20,7 @@
20 20
 #ifndef STOREDTRANSFERJOB_H
21 21
 #define STOREDTRANSFERJOB_H
22 22
 
23
-#include <kio/job.h>
23
+#include <tdeio/job.h>
24 24
 
25 25
 // To be moved to KIO?
26 26
 namespace TDEIOext {

+ 1
- 1
config.h.cmake View File

@@ -21,7 +21,7 @@
21 21
 #cmakedefine MAX_CMD_LENGTH @MAX_CMD_LENGTH@
22 22
 #cmakedefine HAVE_C99_INITIALIZERS 1
23 23
 
24
-// kioslaves
24
+// tdeioslaves
25 25
 #cmakedefine HAVE_LIBSASL2 1
26 26
 
27 27
 // kmail

+ 3
- 3
dependency-graph.dot View File

@@ -25,7 +25,7 @@ digraph "inter-dependency graph for tdepim" {
25 25
         "libemailfunctions" -> "libkpimidentities";
26 26
         "libkcal" -> "kalarm";
27 27
         "libkcal" -> "karm";
28
-        "libkcal" -> "kfile-plugins";
28
+        "libkcal" -> "tdefile-plugins";
29 29
         "libkcal" -> "kitchensync";
30 30
         "libkcal" -> "knotes";
31 31
         "libkcal" -> "konsolekalendar";
@@ -44,7 +44,7 @@ digraph "inter-dependency graph for tdepim" {
44 44
         "libtdepim" -> "kalarm";
45 45
         "libtdepim" -> "kandy";
46 46
         "libtdepim" -> "karm";
47
-        "libtdepim" -> "kioslaves";
47
+        "libtdepim" -> "tdeioslaves";
48 48
         "libtdepim" -> "kitchensync";
49 49
         "libtdepim" -> "kmail";
50 50
         "libtdepim" -> "knode";
@@ -57,7 +57,7 @@ digraph "inter-dependency graph for tdepim" {
57 57
         "libkholidays" -> "kontact";
58 58
         "libkholidays" -> "korganizer";
59 59
         "libkmime" -> "kalarm";
60
-        "libkmime" -> "kioslaves";
60
+        "libkmime" -> "tdeioslaves";
61 61
         "libkmime" -> "kmail";
62 62
         "libkmime" -> "knode";
63 63
         "libkpgp" -> "certmanager";

+ 1
- 1
kaddressbook/addresseditwidget.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <kapplication.h>
42 42
 #include <kbuttonbox.h>
43 43
 #include <kcombobox.h>
44
-#include <kconfig.h>
44
+#include <tdeconfig.h>
45 45
 #include <kdebug.h>
46 46
 #include <kdialog.h>
47 47
 #include <kiconloader.h>

+ 1
- 1
kaddressbook/addresseeconfig.h View File

@@ -25,7 +25,7 @@
25 25
 #define ADDRESSEECONFIG_H
26 26
 
27 27
 #include <kabc/addressee.h>
28
-#include <kconfig.h>
28
+#include <tdeconfig.h>
29 29
 
30 30
 using namespace KABC;
31 31
 

+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include <kabc/stdaddressbook.h>
37 37
 #include <kaccelmanager.h>
38 38
 #include <kapplication.h>
39
-#include <kconfig.h>
39
+#include <tdeconfig.h>
40 40
 #include <kcombobox.h>
41 41
 #include <kdebug.h>
42 42
 #include <kdialogbase.h>

+ 1
- 1
kaddressbook/common/filter.cpp View File

@@ -21,7 +21,7 @@
21 21
     without including the source code for TQt in the source distribution.
22 22
 */
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 #include <kdebug.h>
26 26
 
27 27
 #include "kabprefs.h"

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

@@ -29,7 +29,7 @@
29 29
 #include <tqvaluelist.h>
30 30
 
31 31
 #include <kabc/addressee.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 
34 34
 /**
35 35
   Filter for AddressBook related objects (Addressees)

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

@@ -21,7 +21,7 @@
21 21
     without including the source code for TQt in the source distribution.
22 22
 */
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 #include <klocale.h>
26 26
 #include <kstaticdeleter.h>
27 27
 

+ 1
- 1
kaddressbook/common/kabprefs_base.kcfgc View File

@@ -1,4 +1,4 @@
1
-# Code generation options for kconfig_compiler
1
+# Code generation options for tdeconfig_compiler
2 2
 File=kaddressbook.kcfg
3 3
 ClassName=KABPrefsBase
4 4
 Singleton=false

+ 1
- 1
kaddressbook/common/locationmap.cpp View File

@@ -22,7 +22,7 @@
22 22
 */
23 23
 
24 24
 #include <kapplication.h>
25
-#include <kconfig.h>
25
+#include <tdeconfig.h>
26 26
 #include <tdeversion.h>
27 27
 #include <kglobal.h>
28 28
 #include <klocale.h>

+ 1
- 1
kaddressbook/emaileditwidget.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <tqtooltip.h>
33 33
 
34 34
 #include <kaccelmanager.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kcombobox.h>
37 37
 #include <kdebug.h>
38 38
 #include <kdialog.h>

+ 1
- 1
kaddressbook/extensionmanager.cpp View File

@@ -22,7 +22,7 @@
22 22
 */
23 23
 
24 24
 #include <kactionclasses.h>
25
-#include <kconfig.h>
25
+#include <tdeconfig.h>
26 26
 #include <kdebug.h>
27 27
 #include <klocale.h>
28 28
 #include <ktrader.h>

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

@@ -31,7 +31,7 @@
31 31
 #include <tqradiobutton.h>
32 32
 
33 33
 #include <kaccelmanager.h>
34
-#include <kconfig.h>
34
+#include <tdeconfig.h>
35 35
 #include <kdebug.h>
36 36
 #include <kglobal.h>
37 37
 #include <kinputdialog.h>

+ 2
- 2
kaddressbook/imagewidget.cpp View File

@@ -24,11 +24,11 @@
24 24
 #include <kabc/picture.h>
25 25
 #include <kdebug.h>
26 26
 #include <kdialog.h>
27
-#include <kfiledialog.h>
27
+#include <tdefiledialog.h>
28 28
 #include <kglobalsettings.h>
29 29
 #include <kiconloader.h>
30 30
 #include <kimageio.h>
31
-#include <kio/netaccess.h>
31
+#include <tdeio/netaccess.h>
32 32
 #include <klocale.h>
33 33
 #include <kmessagebox.h>
34 34
 #include <kurldrag.h>

+ 1
- 1
kaddressbook/imeditwidget.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <tqtooltip.h>
32 32
 
33 33
 #include <kaccelmanager.h>
34
-#include <kconfig.h>
34
+#include <tdeconfig.h>
35 35
 #include <kcombobox.h>
36 36
 #include <kdebug.h>
37 37
 #include <kdialog.h>

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

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <tqwidget.h>
28 28
 
29
-#include <kconfig.h>
29
+#include <tdeconfig.h>
30 30
 #include <tdepimmacros.h>
31 31
 
32 32
 namespace KABC {

+ 1
- 1
kaddressbook/kaddressbookview.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <kabc/addressbook.h>
28 28
 #include <kabc/distributionlistdialog.h>
29
-#include <kconfig.h>
29
+#include <tdeconfig.h>
30 30
 #include <kdebug.h>
31 31
 #include <klocale.h>
32 32
 #include <kxmlguifactory.h>

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

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include <kbuttonbox.h>
34 34
 #include <kcombobox.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kdialog.h>
37 37
 #include <kinputdialog.h>
38 38
 #include <klocale.h>

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

@@ -32,7 +32,7 @@
32 32
 #include <tqtooltip.h>
33 33
 #include <tqcombobox.h>
34 34
 
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kdebug.h>
37 37
 #include <kdialog.h>
38 38
 #include <klistview.h>

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

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include <kapplication.h>
33 33
 #include <kbuttonbox.h>
34
-#include <kconfig.h>
34
+#include <tdeconfig.h>
35 35
 #include <klistview.h>
36 36
 #include <klocale.h>
37 37
 

+ 2
- 2
kaddressbook/keywidget.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <kapplication.h>
30 30
 #include <kcombobox.h>
31 31
 #include <kdialog.h>
32
-#include <kfiledialog.h>
33
-#include <kio/netaccess.h>
32
+#include <tdefiledialog.h>
33
+#include <tdeio/netaccess.h>
34 34
 #include <kinputdialog.h>
35 35
 #include <klocale.h>
36 36
 #include <kmessagebox.h>

+ 1
- 1
kaddressbook/ldapsearchdialog.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <kapplication.h>
34 34
 #include <kbuttonbox.h>
35 35
 #include <kcombobox.h>
36
-#include <kconfig.h>
36
+#include <tdeconfig.h>
37 37
 #include <klineedit.h>
38 38
 #include <klocale.h>
39 39
 #include <kmessagebox.h>

+ 1
- 1
kaddressbook/nameeditdialog.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <kaccelmanager.h>
35 35
 #include <kapplication.h>
36 36
 #include <kbuttonbox.h>
37
-#include <kconfig.h>
37
+#include <tdeconfig.h>
38 38
 #include <klineedit.h>
39 39
 #include <klistview.h>
40 40
 #include <kcombobox.h>

+ 1
- 1
kaddressbook/phoneeditwidget.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <kapplication.h>
36 36
 #include <kbuttonbox.h>
37 37
 #include <kcombobox.h>
38
-#include <kconfig.h>
38
+#include <tdeconfig.h>
39 39
 #include <kdebug.h>
40 40
 #include <kiconloader.h>
41 41
 #include <klineedit.h>

+ 1
- 1
kaddressbook/printing/detailledstyle.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <kapplication.h>
25 25
 #include <tqcheckbox.h>
26 26
 #include <kcolorbutton.h>
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <kdebug.h>
29 29
 #include <kdialog.h>
30 30
 #include <kfontcombo.h>

+ 1
- 1
kaddressbook/soundwidget.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <kdebug.h>
27 27
 #include <kdialog.h>
28 28
 #include <kiconloader.h>
29
-#include <kio/netaccess.h>
29
+#include <tdeio/netaccess.h>
30 30
 #include <klocale.h>
31 31
 #include <ktempfile.h>
32 32
 #include <kurlrequester.h>

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

@@ -1,4 +1,4 @@
1
-# kioslave to generate thumbnails for vCard and LDIF-Files in Konqueror
1
+# tdeioslave to generate thumbnails for vCard and LDIF-Files in Konqueror
2 2
 INCLUDES = $(all_includes)
3 3
 
4 4
 kde_module_LTLIBRARIES = ldifvcardthumbnail.la

+ 1
- 1
kaddressbook/thumbnailcreator/ldifvcardcreator.cpp View File

@@ -20,7 +20,7 @@
20 20
 /*
21 21
  *  - ldifvcardthumbnail -
22 22
  *
23
- *  kioslave which generates tumbnails for vCard and LDIF files.
23
+ *  tdeioslave which generates tumbnails for vCard and LDIF files.
24 24
  *  The thumbnails are used e.g. by Konqueror or in the file selection
25 25
  *  dialog.
26 26
  *

+ 1
- 1
kaddressbook/thumbnailcreator/ldifvcardcreator.h View File

@@ -22,7 +22,7 @@
22 22
 #define VCARD_LDIFCREATOR_H
23 23
 
24 24
 #include <tqpixmap.h>
25
-#include <kio/thumbcreator.h>
25
+#include <tdeio/thumbcreator.h>
26 26
 #include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
27 27
 
28 28
 class KPixmapSplitter;

+ 1
- 1
kaddressbook/viewconfigurefilterpage.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tqlayout.h>
27 27
 #include <tqradiobutton.h>
28 28
 
29
-#include <kconfig.h>
29
+#include <tdeconfig.h>
30 30
 #include <kcombobox.h>
31 31
 #include <kdialog.h>
32 32
 #include <klocale.h>

+ 1
- 1
kaddressbook/viewconfigurewidget.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <tqvbox.h>
26 26
 
27 27
 #include <kapplication.h>
28
-#include <kconfig.h>
28
+#include <tdeconfig.h>
29 29
 #include <kdebug.h>
30 30
 #include <kglobal.h>
31 31
 #include <kiconloader.h>

+ 1
- 1
kaddressbook/viewmanager.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kabc/addressbook.h>
30 30
 #include <kabc/vcardconverter.h>
31 31
 #include <kactionclasses.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kdebug.h>
34 34
 #include <tdeversion.h>
35 35
 #include <kiconloader.h>

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

@@ -36,7 +36,7 @@
36 36
 #include <kglobalsettings.h>
37 37
 #include <klocale.h>
38 38
 #include <kiconloader.h>
39
-#include <kconfig.h>
39
+#include <tdeconfig.h>
40 40
 #include <kfontdialog.h>
41 41
 #include <kpushbutton.h>
42 42
 

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

@@ -36,7 +36,7 @@
36 36
 #include <kurlrequester.h>
37 37
 #include <kiconloader.h>
38 38
 #include <kimageio.h>
39
-#include <kconfig.h>
39
+#include <tdeconfig.h>
40 40
 
41 41
 #include "configuretableviewdialog.h"
42 42
 

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

@@ -33,7 +33,7 @@
33 33
 #include <klocale.h>
34 34
 #include <kglobalsettings.h>
35 35
 #include <kdebug.h>
36
-#include <kconfig.h>
36
+#include <tdeconfig.h>
37 37
 #include <kapplication.h>
38 38
 #include <kurl.h>
39 39
 #include <kabc/addressbook.h>

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

@@ -30,7 +30,7 @@
30 30
 
31 31
 #include <kabc/addressbook.h>
32 32
 #include <kabc/addressee.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <kdebug.h>
35 35
 #include <klocale.h>
36 36
 

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

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kabc/addressbook.h>
30 30
 #include <kabc/addressee.h>
31
-#include <kconfig.h>
31
+#include <tdeconfig.h>
32 32
 #include <kdebug.h>
33 33
 #include <kglobal.h>
34 34
 #include <kiconloader.h>

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

@@ -38,7 +38,7 @@
38 38
 
39 39
 #include <kabc/addressbook.h>
40 40
 #include <kapplication.h>
41
-#include <kconfig.h>
41
+#include <tdeconfig.h>
42 42
 #include <kcolorbutton.h>
43 43
 #include <kdebug.h>
44 44
 #include <kglobal.h>

+ 2
- 2
kaddressbook/xxport/csv_xxport.cpp View File

@@ -23,8 +23,8 @@
23 23
 
24 24
 #include <tqfile.h>
25 25
 
26
-#include <kfiledialog.h>
27
-#include <kio/netaccess.h>
26
+#include <tdefiledialog.h>
27
+#include <tdeio/netaccess.h>
28 28
 #include <klocale.h>
29 29
 #include <kmessagebox.h>
30 30
 #include <ktempfile.h>

+ 1
- 1
kaddressbook/xxport/csvimportdialog.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <kapplication.h>
36 36
 #include <kdebug.h>
37 37
 #include <kdialogbase.h>
38
-#include <kfiledialog.h>
38
+#include <tdefiledialog.h>
39 39
 #include <klineedit.h>
40 40
 #include <klocale.h>
41 41
 #include <kinputdialog.h>

+ 2
- 2
kaddressbook/xxport/eudora_xxport.cpp View File

@@ -23,8 +23,8 @@
23 23
 
24 24
 #include <tqfile.h>
25 25
 
26
-#include <kfiledialog.h>
27
-#include <kio/netaccess.h>
26
+#include <tdefiledialog.h>
27
+#include <tdeio/netaccess.h>
28 28
 #include <klocale.h>
29 29
 #include <kmessagebox.h>
30 30
 #include <ktempfile.h>

+ 4
- 4
kaddressbook/xxport/kde2_xxport.cpp View File

@@ -24,8 +24,8 @@
24 24
 #include <tqfile.h>
25 25
 
26 26
 #include <kdebug.h>
27
-#include <kfiledialog.h>
28
-#include <kio/netaccess.h>
27
+#include <tdefiledialog.h>
28
+#include <tdeio/netaccess.h>
29 29
 #include <klocale.h>
30 30
 #include <kmessagebox.h>
31 31
 #include <kprocess.h>
@@ -62,10 +62,10 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
62 62
   TDEProcess proc;
63 63
 
64 64
   if ( result == KMessageBox::Yes ) {
65
-    proc << "kab2kabc";
65
+    proc << "tdeab2tdeabc";
66 66
     proc << "--override";
67 67
   } else if ( result == KMessageBox::No )
68
-    proc << "kab2kabc";
68
+    proc << "tdeab2tdeabc";
69 69
   else {
70 70
     kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
71 71
     return KABC::AddresseeList();

+ 2
- 2
kaddressbook/xxport/ldif_xxport.cpp View File

@@ -35,8 +35,8 @@
35 35
 
36 36
 #include <tqfile.h>
37 37
 
38
-#include <kfiledialog.h>
39
-#include <kio/netaccess.h>
38
+#include <tdefiledialog.h>
39
+#include <tdeio/netaccess.h>
40 40
 #include <klocale.h>
41 41
 #include <kmdcodec.h>
42 42
 #include <kmessagebox.h>

+ 2
- 2
kaddressbook/xxport/opera_xxport.cpp View File

@@ -25,8 +25,8 @@
25 25
 #include <tqfile.h>
26 26
 #include <tqregexp.h>
27 27
 
28
-#include <kfiledialog.h>
29
-#include <kio/netaccess.h>
28
+#include <tdefiledialog.h>
29
+#include <tdeio/netaccess.h>
30 30
 #include <klocale.h>
31 31
 #include <kmessagebox.h>
32 32
 #include <ktempfile.h>

+ 2
- 2
kaddressbook/xxport/pab_xxport.cpp View File

@@ -25,8 +25,8 @@
25 25
 #include <tqfile.h>
26 26
 
27 27
 #include <kdebug.h>
28
-#include <kfiledialog.h>
29
-#include <kio/netaccess.h>
28
+#include <tdefiledialog.h>
29
+#include <tdeio/netaccess.h>
30 30
 #include <klocale.h>
31 31
 #include <kmessagebox.h>
32 32
 #include <kprocess.h>

+ 2
- 2
kaddressbook/xxport/vcard_xxport.cpp View File

@@ -30,8 +30,8 @@
30 30
 
31 31
 #include <kabc/vcardconverter.h>
32 32
 #include <kdialogbase.h>
33
-#include <kfiledialog.h>
34
-#include <kio/netaccess.h>
33
+#include <tdefiledialog.h>
34
+#include <tdeio/netaccess.h>
35 35
 #include <klocale.h>
36 36
 #include <kmessagebox.h>
37 37
 #include <ktempfile.h>

+ 1
- 1
kalarm/CMakeLists.txt View File

@@ -59,7 +59,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Applications RE
59 59
 tde_add_executable( kalarm AUTOMOC
60 60
   SOURCES
61 61
     birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp
62
-    emailidcombo.cpp find.cpp pickfileradio.cpp
62
+    emailidcombo.cpp find.cpp pictdefileradio.cpp
63 63
     calendarcompat.cpp eventlistviewbase.cpp alarmlistview.cpp
64 64
     kamail.cpp timeselector.cpp fontcolourbutton.cpp
65 65
     alarmtimewidget.cpp fontcolour.cpp soundpicker.cpp

+ 2
- 2
kalarm/Makefile.am View File

@@ -20,7 +20,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
20 20
 	eventlistviewbase.cpp alarmlistview.cpp kamail.cpp timeselector.cpp \
21 21
 	templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
22 22
 	templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
23
-	emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
23
+	emailidcombo.cpp find.cpp pictdefileradio.cpp calendarcompat.cpp
24 24
 kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdenetwork/qgpgme
25 25
 if include_ARTS
26 26
 ARTSLIB = -lartskde
@@ -37,7 +37,7 @@ noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
37 37
 	editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \
38 38
 	fontcolour.h fontcolourbutton.h functions.h kalarm.h kalarmapp.h \
39 39
 	kamail.h karecurrence.h latecancel.h mainwindow.h mainwindowbase.h \
40
-	messagewin.h pickfileradio.h prefdlg.h preferences.h recurrenceedit.h \
40
+	messagewin.h pictdefileradio.h prefdlg.h preferences.h recurrenceedit.h \
41 41
 	recurrenceeditprivate.h reminder.h repetition.h sounddlg.h \
42 42
 	soundpicker.h specialactions.h startdaytimer.h templatedlg.h \
43 43
 	templatelistview.h templatemenuaction.h templatepickdlg.h timeselector.h \

+ 4
- 4
kalarm/alarmcalendar.cpp View File

@@ -31,12 +31,12 @@
31 31
 #include <kmessagebox.h>
32 32
 #include <kstandarddirs.h>
33 33
 #include <kstaticdeleter.h>
34
-#include <kconfig.h>
34
+#include <tdeconfig.h>
35 35
 #include <kaboutdata.h>
36
-#include <kio/netaccess.h>
37
-#include <kfileitem.h>
36
+#include <tdeio/netaccess.h>
37
+#include <tdefileitem.h>
38 38
 #include <ktempfile.h>
39
-#include <kfiledialog.h>
39
+#include <tdefiledialog.h>
40 40
 #include <dcopclient.h>
41 41
 #include <kdebug.h>
42 42
 

+ 1
- 1
kalarm/birthdaydlg.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <klocale.h>
31 31
 #include <kglobal.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kmessagebox.h>
34 34
 #include <kaccel.h>
35 35
 #include <kabc/addressbook.h>

+ 1
- 1
kalarm/daemon.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <tqiconset.h>
25 25
 
26 26
 #include <kstandarddirs.h>
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <kaboutdata.h>
29 29
 #include <kmessagebox.h>
30 30
 #include <dcopclient.h>

+ 5
- 5
kalarm/editdlg.cpp View File

@@ -39,11 +39,11 @@
39 39
 
40 40
 #include <kglobal.h>
41 41
 #include <klocale.h>
42
-#include <kconfig.h>
43
-#include <kfiledialog.h>
42
+#include <tdeconfig.h>
43
+#include <tdefiledialog.h>
44 44
 #include <kiconloader.h>
45
-#include <kio/netaccess.h>
46
-#include <kfileitem.h>
45
+#include <tdeio/netaccess.h>
46
+#include <tdefileitem.h>
47 47
 #include <kmessagebox.h>
48 48
 #include <kurldrag.h>
49 49
 #include <kurlcompletion.h>
@@ -71,7 +71,7 @@
71 71
 #include "latecancel.h"
72 72
 #include "lineedit.h"
73 73
 #include "mainwindow.h"
74
-#include "pickfileradio.h"
74
+#include "pictdefileradio.h"
75 75
 #include "preferences.h"
76 76
 #include "radiobutton.h"
77 77
 #include "recurrenceedit.h"

+ 2
- 2
kalarm/functions.cpp View File

@@ -38,14 +38,14 @@
38 38
 #include <tqdir.h>
39 39
 #include <tqregexp.h>
40 40
 
41
-#include <kconfig.h>
41
+#include <tdeconfig.h>
42 42
 #include <kaction.h>
43 43
 #include <kglobal.h>
44 44
 #include <klocale.h>
45 45
 #include <kstdguiitem.h>
46 46
 #include <kstdaccel.h>
47 47
 #include <kmessagebox.h>
48
-#include <kfiledialog.h>
48
+#include <tdefiledialog.h>
49 49
 #include <dcopclient.h>
50 50
 #include <dcopref.h>
51 51
 #include <kdcopservicestarter.h>

+ 2
- 2
kalarm/kalarmapp.cpp View File

@@ -32,12 +32,12 @@
32 32
 #include <kcmdlineargs.h>
33 33
 #include <klocale.h>
34 34
 #include <kstandarddirs.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kaboutdata.h>
37 37
 #include <dcopclient.h>
38 38
 #include <kprocess.h>
39 39
 #include <ktempfile.h>
40
-#include <kfileitem.h>
40
+#include <tdefileitem.h>
41 41
 #include <kstdguiitem.h>
42 42
 #include <ktrader.h>
43 43
 #include <kstaticdeleter.h>

+ 2
- 2
kalarm/kalarmd/adcalendar.cpp View File

@@ -24,8 +24,8 @@
24 24
 #include <tqfile.h>
25 25
 
26 26
 #include <ktempfile.h>
27
-#include <kio/job.h>
28
-#include <kio/jobclasses.h>
27
+#include <tdeio/job.h>
28
+#include <tdeio/jobclasses.h>
29 29
 #include <kdebug.h>
30 30
 
31 31
 #include "adcalendar.moc"

+ 0
- 0
kalarm/kalarmd/adconfigdata.cpp View File


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

Loading…
Cancel
Save