Browse Source

Rename additional header files to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
cfb328d590
100 changed files with 153 additions and 153 deletions
  1. 1
    1
      README
  2. 1
    1
      akregator/src/actionmanagerimpl.cpp
  3. 2
    2
      akregator/src/addfeeddialog.cpp
  4. 1
    1
      akregator/src/akregator_options.h
  5. 3
    3
      akregator/src/akregator_part.cpp
  6. 2
    2
      akregator/src/akregator_view.cpp
  7. 2
    2
      akregator/src/articlelistview.cpp
  8. 3
    3
      akregator/src/articleviewer.cpp
  9. 1
    1
      akregator/src/articleviewer.h
  10. 1
    1
      akregator/src/configdialog.cpp
  11. 1
    1
      akregator/src/feed.cpp
  12. 1
    1
      akregator/src/feedlist.cpp
  13. 1
    1
      akregator/src/feedlistview.cpp
  14. 1
    1
      akregator/src/frame.cpp
  15. 1
    1
      akregator/src/main.cpp
  16. 3
    3
      akregator/src/mainwindow.cpp
  17. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  18. 2
    2
      akregator/src/mk4storage/mk4confwidget.cpp
  19. 1
    1
      akregator/src/mk4storage/mk4plugin.cpp
  20. 1
    1
      akregator/src/mk4storage/storagefactorymk4impl.cpp
  21. 1
    1
      akregator/src/notificationmanager.cpp
  22. 2
    2
      akregator/src/pageviewer.cpp
  23. 2
    2
      akregator/src/pluginmanager.cpp
  24. 1
    1
      akregator/src/progressmanager.cpp
  25. 1
    1
      akregator/src/propertiesdialog.cpp
  26. 1
    1
      akregator/src/searchbar.cpp
  27. 1
    1
      akregator/src/simplenodeselector.cpp
  28. 1
    1
      akregator/src/speechclient.cpp
  29. 1
    1
      akregator/src/storagefactorydummyimpl.cpp
  30. 1
    1
      akregator/src/tabwidget.cpp
  31. 1
    1
      akregator/src/tagnodelist.cpp
  32. 1
    1
      akregator/src/tagpropertiesdialog.cpp
  33. 2
    2
      akregator/src/trayicon.cpp
  34. 2
    2
      akregator/src/viewer.cpp
  35. 1
    1
      certmanager/CMakeLists.txt
  36. 1
    1
      certmanager/aboutdata.cpp
  37. 3
    3
      certmanager/certificateinfowidgetimpl.cpp
  38. 4
    4
      certmanager/certificatewizardimpl.cpp
  39. 3
    3
      certmanager/certmanager.cpp
  40. 2
    2
      certmanager/conf/appearanceconfigpage.cpp
  41. 2
    2
      certmanager/conf/appearanceconfigwidget.cpp
  42. 1
    1
      certmanager/conf/configuredialog.cpp
  43. 3
    3
      certmanager/conf/dirservconfigpage.cpp
  44. 3
    3
      certmanager/crlview.cpp
  45. 1
    1
      certmanager/kwatchgnupg/aboutdata.cpp
  46. 1
    1
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  47. 2
    2
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  48. 3
    3
      certmanager/kwatchgnupg/main.cpp
  49. 2
    2
      certmanager/kwatchgnupg/tray.cpp
  50. 1
    1
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  51. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  52. 1
    1
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  53. 2
    2
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  54. 1
    1
      certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
  55. 1
    1
      certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
  56. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  57. 3
    3
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  58. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
  59. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  60. 2
    2
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  61. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  62. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
  63. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
  64. 2
    2
      certmanager/lib/cryptplugfactory.cpp
  65. 2
    2
      certmanager/lib/cryptplugwrapper.cpp
  66. 2
    2
      certmanager/lib/kleo/cryptobackendfactory.cpp
  67. 1
    1
      certmanager/lib/kleo/dn.cpp
  68. 1
    1
      certmanager/lib/kleo/enum.cpp
  69. 1
    1
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  70. 1
    1
      certmanager/lib/kleo/multideletejob.cpp
  71. 1
    1
      certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
  72. 1
    1
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  73. 1
    1
      certmanager/lib/tests/test_keygen.cpp
  74. 1
    1
      certmanager/lib/tests/test_keyselectiondialog.cpp
  75. 2
    2
      certmanager/lib/ui/backendconfigwidget.cpp
  76. 1
    1
      certmanager/lib/ui/cryptoconfigdialog.cpp
  77. 2
    2
      certmanager/lib/ui/cryptoconfigmodule.cpp
  78. 1
    1
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  79. 2
    2
      certmanager/lib/ui/keyapprovaldialog.cpp
  80. 2
    2
      certmanager/lib/ui/keyrequester.cpp
  81. 3
    3
      certmanager/lib/ui/keyselectiondialog.cpp
  82. 1
    1
      certmanager/lib/ui/messagebox.cpp
  83. 1
    1
      certmanager/lib/ui/messagebox.h
  84. 1
    1
      certmanager/lib/ui/passphrasedialog.cpp
  85. 1
    1
      certmanager/lib/ui/progressdialog.cpp
  86. 3
    3
      certmanager/main.cpp
  87. 1
    1
      doc/kaddressbook/index.docbook
  88. 1
    1
      doc/kpilot/configuration.docbook
  89. 1
    1
      kabc/frontend/main.cpp
  90. 2
    2
      kabc/frontend/mainWindow.ui.h
  91. 1
    1
      kabc/kabc2mutt/CMakeLists.txt
  92. 2
    2
      kabc/kabc2mutt/kabc2mutt.cpp
  93. 1
    1
      kabc/kabc2mutt/kabc2mutt.h
  94. 1
    1
      kabc/kabc2mutt/main.cpp
  95. 4
    4
      kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
  96. 2
    2
      kaddressbook/addresseditwidget.cpp
  97. 2
    2
      kaddressbook/addresseditwidget.h
  98. 1
    1
      kaddressbook/addresseeconfig.h
  99. 1
    1
      kaddressbook/addresseeeditorbase.h
  100. 0
    0
      kaddressbook/addresseeeditordialog.cpp

+ 1
- 1
README View File

@@ -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
-* kabc/frontend: A GUI frontend for libkabc, not intended for end users.
51
+* tdeabc/frontend: A GUI frontend for libkabc, 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
akregator/src/actionmanagerimpl.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <tqwidget.h>
26 26
 #include <tdeaction.h>
27 27
 #include <tdeactioncollection.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <tdepopupmenu.h>
30 30
 #include <tdeshortcut.h>
31 31
 #include <kxmlguifactory.h>

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

@@ -29,13 +29,13 @@
29 29
 
30 30
 #include <tdeapplication.h>
31 31
 #include <kurl.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <klineedit.h>
34 34
 #include <kiconloader.h>
35 35
 #include <kicontheme.h>
36 36
 #include <kdebug.h>
37 37
 #include <ksqueezedtextlabel.h>
38
-#include <kmessagebox.h>
38
+#include <tdemessagebox.h>
39 39
 
40 40
 namespace Akregator {
41 41
 

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

@@ -26,7 +26,7 @@
26 26
 #define AKREGATOR_OPTIONS_H
27 27
 
28 28
 #include <tdecmdlineargs.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 
31 31
 namespace Akregator {
32 32
 

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

@@ -31,18 +31,18 @@
31 31
 #include <tdeconfig.h>
32 32
 #include <tdeconfigdialog.h>
33 33
 #include <tdefiledialog.h>
34
-#include <kglobalsettings.h>
34
+#include <tdeglobalsettings.h>
35 35
 #include <tdehtmldefaults.h>
36 36
 #include <kinstance.h>
37 37
 #include <tdemainwindow.h>
38
-#include <kmessagebox.h>
38
+#include <tdemessagebox.h>
39 39
 #include <knotifyclient.h>
40 40
 #include <knotifydialog.h>
41 41
 #include <tdepopupmenu.h>
42 42
 #include <kservice.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <kstdaction.h>
45
-#include <ktempfile.h>
45
+#include <tdetempfile.h>
46 46
 #include <ktrader.h>
47 47
 #include <tdeio/netaccess.h>
48 48
 #include <tdeparts/browserinterface.h>

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

@@ -73,8 +73,8 @@
73 73
 #include <kinputdialog.h>
74 74
 #include <klineedit.h>
75 75
 #include <tdelistview.h>
76
-#include <klocale.h>
77
-#include <kmessagebox.h>
76
+#include <tdelocale.h>
77
+#include <tdemessagebox.h>
78 78
 #include <kpassdlg.h>
79 79
 #include <kprocess.h>
80 80
 #include <krun.h>

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

@@ -34,9 +34,9 @@
34 34
 
35 35
 #include <kstandarddirs.h>
36 36
 #include <kdebug.h>
37
-#include <kglobal.h>
37
+#include <tdeglobal.h>
38 38
 #include <kiconloader.h>
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 #include <kcharsets.h>
41 41
 #include <kurl.h>
42 42
 

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

@@ -30,14 +30,14 @@
30 30
 #include <tdeaction.h>
31 31
 #include <tdeapplication.h>
32 32
 #include <kdebug.h>
33
-#include <kglobalsettings.h>
33
+#include <tdeglobalsettings.h>
34 34
 #include <tdehtmlview.h>
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 #include <kprocess.h>
37 37
 #include <krun.h>
38 38
 #include <kstandarddirs.h>
39 39
 #include <kshell.h>
40
-#include <kmessagebox.h>
40
+#include <tdemessagebox.h>
41 41
 #include <tdeio/netaccess.h>
42 42
 #include <libtdepim/tdefileio.h>
43 43
 

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

@@ -26,7 +26,7 @@
26 26
 #ifndef ARTICLEVIEWER_H
27 27
 #define ARTICLEVIEWER_H
28 28
 
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 
31 31
 #include <tqcolor.h>
32 32
 #include <tqfont.h>

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

@@ -25,7 +25,7 @@
25 25
 #include <tqstringlist.h>
26 26
 
27 27
 #include <kcombobox.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 
30 30
 #include "configdialog.h"
31 31
 

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

@@ -33,7 +33,7 @@
33 33
 
34 34
 #include <kurl.h>
35 35
 #include <kdebug.h>
36
-#include <kglobal.h>
36
+#include <tdeglobal.h>
37 37
 #include <kstandarddirs.h>
38 38
 
39 39
 #include "akregatorconfig.h"

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

@@ -29,7 +29,7 @@
29 29
 #include <tqvaluelist.h>
30 30
 
31 31
 #include <kdebug.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 
34 34
 #include "article.h"
35 35
 #include "feed.h"

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

@@ -42,7 +42,7 @@
42 42
 #include <kdebug.h>
43 43
 #include <kiconeffect.h>
44 44
 #include <kiconloader.h>
45
-#include <klocale.h>
45
+#include <tdelocale.h>
46 46
 #include <tdemultipledrag.h>
47 47
 #include <kstringhandler.h>
48 48
 #include <kurldrag.h>

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

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <tdeactioncollection.h>
29 29
 #include <kdebug.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <tdeparts/browserextension.h>
32 32
 #include <tdeparts/part.h>
33 33
 

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

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <dcopref.h>
28 28
 #include <tdecmdlineargs.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <knotifyclient.h>
31 31
 #include <kuniqueapplication.h>
32 32
 

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

@@ -36,11 +36,11 @@
36 36
 #include <kdebug.h>
37 37
 #include <kedittoolbar.h>
38 38
 #include <tdefiledialog.h>
39
-#include <kglobal.h>
39
+#include <tdeglobal.h>
40 40
 #include <kkeydialog.h>
41 41
 #include <klibloader.h>
42
-#include <klocale.h>
43
-#include <kmessagebox.h>
42
+#include <tdelocale.h>
43
+#include <tdemessagebox.h>
44 44
 #include <tdeparts/partmanager.h>
45 45
 #include <ksqueezedtextlabel.h>
46 46
 #include <kstandarddirs.h>

+ 1
- 1
akregator/src/mk4storage/feedstoragemk4impl.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <tqfile.h>
36 36
 
37 37
 #include <kdebug.h>
38
-#include <kglobal.h>
38
+#include <tdeglobal.h>
39 39
 #include <kstandarddirs.h>
40 40
 
41 41
 namespace Akregator {

+ 2
- 2
akregator/src/mk4storage/mk4confwidget.cpp View File

@@ -28,8 +28,8 @@
28 28
 
29 29
 #include <tqcheckbox.h>
30 30
 #include <tqlabel.h>
31
-#include <klocale.h>
32
-#include <kmessagebox.h>
31
+#include <tdelocale.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kurlrequester.h>
34 34
 
35 35
 namespace Akregator {

+ 1
- 1
akregator/src/mk4storage/mk4plugin.cpp View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include "mk4plugin.h"
26 26
 
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 
29 29
 #include "storagefactorymk4impl.h"
30 30
 #include "storagefactoryregistry.h"

+ 1
- 1
akregator/src/mk4storage/storagefactorymk4impl.cpp View File

@@ -26,7 +26,7 @@
26 26
 //#include "mk4confwidget.h"
27 27
 //#include "mk4config.h"
28 28
 
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <tqstring.h>
31 31
 #include <tqstringlist.h>
32 32
 #include <tqwidget.h>

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

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

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

@@ -34,11 +34,11 @@
34 34
 #include <kbookmark.h>
35 35
 #include <kbookmarkmanager.h>
36 36
 #include <tdeconfig.h>
37
-#include <kglobalsettings.h>
37
+#include <tdeglobalsettings.h>
38 38
 #include <tdehtml_settings.h>
39 39
 #include <tdehtmlview.h>
40 40
 #include <kiconloader.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <tdepopupmenu.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <tdestdaccel.h>

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

@@ -23,8 +23,8 @@ email                : markey@web.de
23 23
 
24 24
 #include <klibloader.h>
25 25
 #include <kdebug.h>
26
-#include <klocale.h>
27
-#include <kmessagebox.h>
26
+#include <tdelocale.h>
27
+#include <tdemessagebox.h>
28 28
 
29 29
 using std::vector;
30 30
 using Akregator::Plugin;

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

@@ -25,7 +25,7 @@
25 25
 #include <tqmap.h>
26 26
 #include <tqstylesheet.h>
27 27
 
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <kstaticdeleter.h>
30 30
 
31 31
 #include <libtdepim/progressmanager.h>

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

@@ -29,7 +29,7 @@
29 29
 #include <kcombobox.h>
30 30
 #include <klineedit.h>
31 31
 #include <kpassdlg.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <knuminput.h>
34 34
 
35 35
 #include <tqcheckbox.h>

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

@@ -30,7 +30,7 @@
30 30
 #include <kcombobox.h>
31 31
 #include <kiconloader.h>
32 32
 #include <klineedit.h>
33
-#include <klocale.h>
33
+#include <tdelocale.h>
34 34
 #include <kstandarddirs.h>
35 35
 
36 36
 #include <tqapplication.h>

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

@@ -29,7 +29,7 @@
29 29
 #include "treenodevisitor.h"
30 30
 
31 31
 #include <tdelistview.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 
34 34
 #include <tqlayout.h>
35 35
 #include <tqmap.h>

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

@@ -29,7 +29,7 @@
29 29
 #include <dcopclient.h>
30 30
 #include <tdeapplication.h>
31 31
 #include <kcharsets.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kdebug.h>
34 34
 #include <kstaticdeleter.h>
35 35
 #include <ktrader.h>

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

@@ -24,7 +24,7 @@
24 24
 #include "storagefactorydummyimpl.h"
25 25
 #include "storagedummyimpl.h"
26 26
 
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <tqstring.h>
29 29
 #include <tqstringlist.h>
30 30
 #include <tqwidget.h>

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

@@ -40,7 +40,7 @@
40 40
 #include <ktabbar.h>
41 41
 #include <tdepopupmenu.h>
42 42
 #include <krun.h>
43
-#include <klocale.h>
43
+#include <tdelocale.h>
44 44
 #include <tdehtmlview.h>
45 45
 #include <tdehtml_part.h>
46 46
 #include <kiconloader.h>

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

@@ -36,7 +36,7 @@
36 36
 #include <tqvaluelist.h>
37 37
 
38 38
 #include <tdeapplication.h>
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 
41 41
 namespace Akregator {
42 42
 

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

@@ -23,7 +23,7 @@
23 23
 */
24 24
 
25 25
 #include <kicondialog.h>
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 
28 28
 #include <tqlineedit.h>
29 29
 

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

@@ -29,8 +29,8 @@
29 29
 #include <twin.h>
30 30
 #include <kiconeffect.h>
31 31
 #include <kdebug.h>
32
-#include <klocale.h>
33
-#include <kglobalsettings.h>
32
+#include <tdelocale.h>
33
+#include <tdeglobalsettings.h>
34 34
 #include <dcopclient.h>
35 35
 #include <dcopref.h>
36 36
 #include <tdepopupmenu.h>

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

@@ -28,8 +28,8 @@
28 28
 #include <tdefiledialog.h>
29 29
 #include <tdehtmlview.h>
30 30
 #include <kiconloader.h>
31
-#include <klocale.h>
32
-#include <kmessagebox.h>
31
+#include <tdelocale.h>
32
+#include <tdemessagebox.h>
33 33
 #include <tdepopupmenu.h>
34 34
 #include <kprocess.h>
35 35
 #include <krun.h>

+ 1
- 1
certmanager/CMakeLists.txt View File

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

+ 1
- 1
certmanager/aboutdata.cpp View File

@@ -36,7 +36,7 @@
36 36
 
37 37
 #include "aboutdata.h"
38 38
 
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 
41 41
 static const char kleopatra_version[] = "0.40";
42 42
 static const char description[] = I18N_NOOP("TDE Key Manager");

+ 3
- 3
certmanager/certificateinfowidgetimpl.cpp View File

@@ -47,12 +47,12 @@
47 47
 #include <gpgmepp/keylistresult.h>
48 48
 
49 49
 // KDE
50
-#include <klocale.h>
50
+#include <tdelocale.h>
51 51
 #include <kdialogbase.h>
52
-#include <kmessagebox.h>
52
+#include <tdemessagebox.h>
53 53
 #include <kdebug.h>
54 54
 #include <kprocio.h>
55
-#include <kglobalsettings.h>
55
+#include <tdeglobalsettings.h>
56 56
 
57 57
 // TQt
58 58
 #include <tqlistview.h>

+ 4
- 4
certmanager/certificatewizardimpl.cpp View File

@@ -49,11 +49,11 @@
49 49
 #include <gpgmepp/keygenerationresult.h>
50 50
 
51 51
 // KDE
52
-#include <kabc/stdaddressbook.h>
53
-#include <kabc/addressee.h>
52
+#include <tdeabc/stdaddressbook.h>
53
+#include <tdeabc/addressee.h>
54 54
 
55
-#include <kmessagebox.h>
56
-#include <klocale.h>
55
+#include <tdemessagebox.h>
56
+#include <tdelocale.h>
57 57
 #include <tdeapplication.h>
58 58
 #include <kdebug.h>
59 59
 #include <kdialog.h>

+ 3
- 3
certmanager/certmanager.cpp View File

@@ -75,8 +75,8 @@
75 75
 #include <kprocess.h>
76 76
 #include <tdeaction.h>
77 77
 #include <tdeapplication.h>
78
-#include <klocale.h>
79
-#include <kmessagebox.h>
78
+#include <tdelocale.h>
79
+#include <tdemessagebox.h>
80 80
 #include <dcopclient.h>
81 81
 #include <tdetoolbar.h>
82 82
 #include <kstatusbar.h>
@@ -84,7 +84,7 @@
84 84
 #include <kdebug.h>
85 85
 #include <kdialogbase.h>
86 86
 #include <kkeydialog.h>
87
-#include <ktempfile.h>
87
+#include <tdetempfile.h>
88 88
 #include <tdeio/job.h>
89 89
 #include <tdeio/netaccess.h>
90 90
 #include <tdestdaccel.h>

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

@@ -32,8 +32,8 @@
32 32
 #include "appearanceconfigpage.h"
33 33
 #include <tqlayout.h>
34 34
 #include "appearanceconfigwidget.h"
35
-#include <kmessagebox.h>
36
-#include <klocale.h>
35
+#include <tdemessagebox.h>
36
+#include <tdelocale.h>
37 37
 #include <kdebug.h>
38 38
 
39 39
 #include <tdepimmacros.h>

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

@@ -43,9 +43,9 @@
43 43
 #include <tdelistview.h>
44 44
 #include <tdeconfig.h>
45 45
 #include <kdialog.h>
46
-#include <klocale.h>
46
+#include <tdelocale.h>
47 47
 #include <kdebug.h>
48
-#include <kmessagebox.h>
48
+#include <tdemessagebox.h>
49 49
 #include <tdefontdialog.h>
50 50
 #include <kcolordialog.h>
51 51
 

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

@@ -36,7 +36,7 @@
36 36
 #include <twin.h>
37 37
 #include <tdeapplication.h>
38 38
 #include <tdeconfig.h>
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 
41 41
 ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
42 42
   : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )

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

@@ -34,8 +34,8 @@
34 34
 
35 35
 #include <kleo/cryptobackendfactory.h>
36 36
 
37
-#include <kmessagebox.h>
38
-#include <klocale.h>
37
+#include <tdemessagebox.h>
38
+#include <tdelocale.h>
39 39
 #include <kdebug.h>
40 40
 #include <tdeconfig.h>
41 41
 #include <knuminput.h>
@@ -62,7 +62,7 @@ public:
62 62
   KURL::List readCurrentList() const {
63 63
 
64 64
     KURL::List lst;
65
-    // stolen from kabc/ldapclient.cpp
65
+    // stolen from tdeabc/ldapclient.cpp
66 66
     const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" );
67 67
     for ( uint j = 0; j < numHosts; j++ ) {
68 68
       const TQString num = TQString::number( j );

+ 3
- 3
certmanager/crlview.cpp View File

@@ -36,12 +36,12 @@
36 36
 
37 37
 #include "crlview.h"
38 38
 
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 #include <kprocess.h>
41
-#include <kmessagebox.h>
41
+#include <tdemessagebox.h>
42 42
 #include <kpushbutton.h>
43 43
 #include <kstdguiitem.h>
44
-#include <kglobalsettings.h>
44
+#include <tdeglobalsettings.h>
45 45
 
46 46
 #include <tqlayout.h>
47 47
 #include <tqlabel.h>

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

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "aboutdata.h"
34 34
 
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 
37 37
 static const char kwatchgnupg_version[] = "1.0";
38 38
 static const char description[] = I18N_NOOP("GnuPG log viewer");

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

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "kwatchgnupgconfig.h"
34 34
 
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 #include <kurlrequester.h>
37 37
 #include <tdeconfig.h>
38 38
 #include <tdeapplication.h>

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

@@ -38,8 +38,8 @@
38 38
 #include <kleo/cryptoconfig.h>
39 39
 
40 40
 #include <kdebug.h>
41
-#include <kmessagebox.h>
42
-#include <klocale.h>
41
+#include <tdemessagebox.h>
42
+#include <tdelocale.h>
43 43
 #include <tdeapplication.h>
44 44
 #include <tdeaction.h>
45 45
 #include <kstdaction.h>

+ 3
- 3
certmanager/kwatchgnupg/main.cpp View File

@@ -39,9 +39,9 @@
39 39
 
40 40
 #include <kuniqueapplication.h>
41 41
 #include <tdecmdlineargs.h>
42
-#include <kmessagebox.h>
43
-#include <klocale.h>
44
-#include <kglobal.h>
42
+#include <tdemessagebox.h>
43
+#include <tdelocale.h>
44
+#include <tdeglobal.h>
45 45
 #include <kiconloader.h>
46 46
 #include <kdebug.h>
47 47
 

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

@@ -34,8 +34,8 @@
34 34
 #include "kwatchgnupgmainwin.h"
35 35
 
36 36
 #include <kdebug.h>
37
-#include <klocale.h>
38
-#include <kglobal.h>
37
+#include <tdelocale.h>
38
+#include <tdeglobal.h>
39 39
 #include <kiconloader.h>
40 40
 #include <tqtooltip.h>
41 41
 

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

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

+ 2
- 2
certmanager/lib/backends/chiasmus/chiasmusjob.cpp View File

@@ -44,9 +44,9 @@
44 44
 #include <gpg-error.h>
45 45
 
46 46
 #include <kshell.h>
47
-#include <klocale.h>
47
+#include <tdelocale.h>
48 48
 #include <kdebug.h>
49
-#include <kmessagebox.h>
49
+#include <tdemessagebox.h>
50 50
 
51 51
 #include <tqtimer.h>
52 52
 #include <tqfileinfo.h>

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

@@ -39,7 +39,7 @@
39 39
 
40 40
 #include <klibloader.h>
41 41
 #include <kdebug.h>
42
-#include <klocale.h>
42
+#include <tdelocale.h>
43 43
 
44 44
 #include <tqfile.h>
45 45
 

+ 2
- 2
certmanager/lib/backends/chiasmus/obtainkeysjob.cpp View File

@@ -40,8 +40,8 @@
40 40
 
41 41
 #include "kleo/cryptoconfig.h"
42 42
 
43
-#include <klocale.h>
44
-#include <kmessagebox.h>
43
+#include <tdelocale.h>
44
+#include <tdemessagebox.h>
45 45
 #include <kshell.h>
46 46
 
47 47
 #include <tqdir.h>

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

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "symcryptrunprocessbase.h"
34 34
 
35
-#include <ktempfile.h>
35
+#include <tdetempfile.h>
36 36
 #include <kdebug.h>
37 37
 #include <kshell.h>
38 38
 

+ 1
- 1
certmanager/lib/backends/kpgp/kpgpbackendbase.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include "pgp6backend.h"
42 42
 #include "gpg1backend.h"
43 43
 
44
-#include <klocale.h>
44
+#include <tdelocale.h>
45 45
 
46 46
 #include <tqstring.h>
47 47
 

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmebackend.cpp View File

@@ -42,7 +42,7 @@
42 42
 #include <gpgmepp/context.h>
43 43
 #include <gpgmepp/engineinfo.h>
44 44
 
45
-#include <klocale.h>
45
+#include <tdelocale.h>
46 46
 #include <kstandarddirs.h>
47 47
 
48 48
 #include <tqfile.h>

+ 3
- 3
certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp View File

@@ -34,11 +34,11 @@
34 34
 #include <kdebug.h>
35 35
 #include <kprocio.h>
36 36
 #include <errno.h>
37
-#include <kmessagebox.h>
38
-#include <klocale.h>
37
+#include <tdemessagebox.h>
38
+#include <tdelocale.h>
39 39
 
40 40
 #include <assert.h>
41
-#include <ktempfile.h>
41
+#include <tdetempfile.h>
42 42
 #include <tqfile.h>
43 43
 #include <stdlib.h>
44 44
 #include <tqtextcodec.h>

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp View File

@@ -45,7 +45,7 @@
45 45
 #include <gpgmepp/encryptionresult.h>
46 46
 #include <gpgmepp/data.h>
47 47
 
48
-#include <klocale.h>
48
+#include <tdelocale.h>
49 49
 
50 50
 #include <assert.h>
51 51
 

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

@@ -46,7 +46,7 @@
46 46
 #include <gpgmepp/context.h>
47 47
 #include <gpgmepp/data.h>
48 48
 
49
-#include <klocale.h>
49
+#include <tdelocale.h>
50 50
 #include <kstandarddirs.h>
51 51
 
52 52
 #include <tqstring.h>

+ 2
- 2
certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp View File

@@ -43,8 +43,8 @@
43 43
 #include <gpgmepp/keylistresult.h>
44 44
 #include <gpg-error.h>
45 45
 
46
-#include <kmessagebox.h>
47
-#include <klocale.h>
46
+#include <tdemessagebox.h>
47
+#include <tdelocale.h>
48 48
 #include <kdebug.h>
49 49
 
50 50
 #include <tqstringlist.h>

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp View File

@@ -36,7 +36,7 @@
36 36
 
37 37
 #include "qgpgmeprogresstokenmapper.h"
38 38
 
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 
41 41
 #include <tqstring.h>
42 42
 

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

@@ -45,7 +45,7 @@
45 45
 #include <gpgmepp/data.h>
46 46
 #include <gpgmepp/key.h>
47 47
 
48
-#include <klocale.h>
48
+#include <tdelocale.h>
49 49
 
50 50
 #include <assert.h>
51 51
 

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp View File

@@ -46,7 +46,7 @@
46 46
 #include <gpgmepp/data.h>
47 47
 #include <gpgmepp/key.h>
48 48
 
49
-#include <klocale.h>
49
+#include <tdelocale.h>
50 50
 
51 51
 #include <assert.h>
52 52
 

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

@@ -38,9 +38,9 @@
38 38
 #include "cryptplugwrapperlist.h"
39 39
 
40 40
 #include <tdeconfig.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kdebug.h>
43
-#include <kmessagebox.h>
43
+#include <tdemessagebox.h>
44 44
 #include <tdeapplication.h>
45 45
 
46 46
 #include <assert.h>

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

@@ -62,8 +62,8 @@
62 62
 // kde
63 63
 #include <kdebug.h>
64 64
 #include <tdeapplication.h>
65
-#include <klocale.h>
66
-#include <kglobal.h>
65
+#include <tdelocale.h>
66
+#include <tdeglobal.h>
67 67
 #include <tdeconfig.h>
68 68
 
69 69
 // other

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

@@ -47,9 +47,9 @@
47 47
 #include <ui/backendconfigwidget.h>
48 48
 
49 49
 #include <tdeconfig.h>
50
-#include <klocale.h>
50
+#include <tdelocale.h>
51 51
 #include <kdebug.h>
52
-#include <kmessagebox.h>
52
+#include <tdemessagebox.h>
53 53
 #include <tdeapplication.h>
54 54
 
55 55
 #include <iterator>

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

@@ -41,7 +41,7 @@
41 41
 
42 42
 #include <tdeapplication.h>
43 43
 #include <tdeconfig.h>
44
-#include <klocale.h>
44
+#include <tdelocale.h>
45 45
 
46 46
 #include <tqstringlist.h>
47 47
 #include <tqvaluevector.h>

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

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "enum.h"
34 34
 
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 
37 37
 #include <tqstring.h>
38 38
 #include <tqstringlist.h>

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

@@ -38,7 +38,7 @@
38 38
 #include "cryptobackend.h"
39 39
 #include "keylistjob.h"
40 40
 
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 
43 43
 #include <tqstringlist.h>
44 44
 #include <tqtl.h>

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

@@ -38,7 +38,7 @@
38 38
 #include "cryptobackend.h"
39 39
 #include "deletejob.h"
40 40
 
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 
43 43
 #include <gpgmepp/key.h>
44 44
 #include <gpgmepp/context.h>

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

@@ -37,7 +37,7 @@
37 37
 #include "tdeconfigbasedkeyfilter.h"
38 38
 
39 39
 #include <tdeconfigbase.h>
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 
42 42
 static const struct {
43 43
   const char * name;

+ 1
- 1
certmanager/lib/tests/test_gnupgprocessbase.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <tdeapplication.h>
42 42
 #include <tdeaboutdata.h>
43 43
 #include <tdecmdlineargs.h>
44
-#include <kmessagebox.h>
44
+#include <tdemessagebox.h>
45 45
 #include <kdebug.h>
46 46
 
47 47
 #include <tqstringlist.h>

+ 1
- 1
certmanager/lib/tests/test_keygen.cpp View File

@@ -46,7 +46,7 @@
46 46
 #include <tdeapplication.h>
47 47
 #include <tdeaboutdata.h>
48 48
 #include <tdecmdlineargs.h>
49
-#include <kmessagebox.h>
49
+#include <tdemessagebox.h>
50 50
 #include <kdebug.h>
51 51
 
52 52
 #include <tqmessagebox.h>

+ 1
- 1
certmanager/lib/tests/test_keyselectiondialog.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tdeapplication.h>
38 38
 #include <tdecmdlineargs.h>
39 39
 #include <tdeaboutdata.h>
40
-#include <kglobal.h>
40
+#include <tdeglobal.h>
41 41
 #include <kiconloader.h>
42 42
 #include <kdebug.h>
43 43
 

+ 2
- 2
certmanager/lib/ui/backendconfigwidget.cpp View File

@@ -43,9 +43,9 @@
43 43
 
44 44
 #include <tdelistview.h>
45 45
 #include <kdialog.h>
46
-#include <klocale.h>
46
+#include <tdelocale.h>
47 47
 #include <kdebug.h>
48
-#include <kmessagebox.h>
48
+#include <tdemessagebox.h>
49 49
 #include <tdeapplication.h>
50 50
 #include <dcopclient.h>
51 51
 

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

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "cryptoconfigdialog.h"
33 33
 #include "cryptoconfigmodule.h"
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <tdeaccelmanager.h>
36 36
 
37 37
 Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )

+ 2
- 2
certmanager/lib/ui/cryptoconfigmodule.cpp View File

@@ -37,12 +37,12 @@
37 37
 #include <kleo/cryptoconfig.h>
38 38
 
39 39
 #include <klineedit.h>
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 #include <kdialogbase.h>
42 42
 #include <kdebug.h>
43 43
 #include <knuminput.h>
44 44
 #include <kiconloader.h>
45
-#include <kglobal.h>
45
+#include <tdeglobal.h>
46 46
 #include <kurlrequester.h>
47 47
 
48 48
 #include <tqgrid.h>

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

@@ -38,7 +38,7 @@
38 38
 
39 39
 #include "kleo/dn.h"
40 40
 
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kdebug.h>
43 43
 #include <kdialog.h>
44 44
 #include <kiconloader.h>

+ 2
- 2
certmanager/lib/ui/keyapprovaldialog.cpp View File

@@ -45,8 +45,8 @@
45 45
 #include <cryptplugfactory.h>
46 46
 #include <kleo/cryptobackend.h>
47 47
 
48
-#include <klocale.h>
49
-#include <kglobalsettings.h>
48
+#include <tdelocale.h>
49
+#include <tdeglobalsettings.h>
50 50
 #include <kseparator.h>
51 51
 
52 52
 #include <tqstringlist.h>

+ 2
- 2
certmanager/lib/ui/keyrequester.cpp View File

@@ -63,11 +63,11 @@
63 63
 #include <gpgmepp/keylistresult.h>
64 64
 
65 65
 // KDE
66
-#include <klocale.h>
66
+#include <tdelocale.h>
67 67
 #include <kiconloader.h>
68 68
 #include <kdialog.h>
69 69
 #include <kdebug.h>
70
-#include <kmessagebox.h>
70
+#include <tdemessagebox.h>
71 71
 #include <kpushbutton.h>
72 72
 
73 73
 // TQt

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

@@ -52,14 +52,14 @@
52 52
 #include <gpgmepp/keylistresult.h>
53 53
 
54 54
 // KDE
55
-#include <klocale.h>
55
+#include <tdelocale.h>
56 56
 #include <tdeapplication.h>
57
-#include <kglobal.h>
57
+#include <tdeglobal.h>
58 58
 #include <kiconloader.h>
59 59
 #include <kdebug.h>
60 60
 #include <twin.h>
61 61
 #include <tdeconfig.h>
62
-#include <kmessagebox.h>
62
+#include <tdemessagebox.h>
63 63
 #include <kprocess.h>
64 64
 #include <kactivelabel.h>
65 65
 #include <kurl.h>

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

@@ -43,7 +43,7 @@
43 43
 
44 44
 #include <tdefiledialog.h>
45 45
 #include <kdialogbase.h>
46
-#include <klocale.h>
46
+#include <tdelocale.h>
47 47
 #include <ksavefile.h>
48 48
 #include <kguiitem.h>
49 49
 #include <kdebug.h>

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

@@ -33,7 +33,7 @@
33 33
 #ifndef __KLEO_UI_MESSAGEBOX_H__
34 34
 #define __KLEO_UI_MESSAGEBOX_H__
35 35
 
36
-#include <kmessagebox.h>
36
+#include <tdemessagebox.h>
37 37
 
38 38
 namespace GpgME {
39 39
     class SigningResult;

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

@@ -54,7 +54,7 @@
54 54
 
55 55
 #include <kpassdlg.h>
56 56
 #include <kiconloader.h>
57
-#include <klocale.h>
57
+#include <tdelocale.h>
58 58
 
59 59
 #include <tqlabel.h>
60 60
 #include <tqlayout.h>

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

@@ -37,7 +37,7 @@
37 37
 #include <kleo/job.h>
38 38
 
39 39
 #include <kdebug.h>
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 
42 42
 #include <tqtimer.h>
43 43
 

+ 3
- 3
certmanager/main.cpp View File

@@ -41,9 +41,9 @@
41 41
 
42 42
 #include <tdeapplication.h>
43 43
 #include <tdecmdlineargs.h>
44
-#include <kmessagebox.h>
45
-#include <klocale.h>
46
-#include <kglobal.h>
44
+#include <tdemessagebox.h>
45
+#include <tdelocale.h>
46
+#include <tdeglobal.h>
47 47
 #include <kiconloader.h>
48 48
 
49 49
 int main( int argc, char** argv )

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

@@ -111,7 +111,7 @@ will be displayed:</para>
111 111
 <para>&kaddressbook; can use multiple resources for loading and storing
112 112
 its contacts. After starting &kaddressbook; for the first time you will have
113 113
 a default resource installed that saves all contacts in a vCard file
114
-under $HOME/.trinity/share/apps/kabc/std.vcf; you can add more resources
114
+under $HOME/.trinity/share/apps/tdeabc/std.vcf; you can add more resources
115 115
 by using the Resource Configuration dialog, which is available in
116 116
 <application>kcontrol</application> under
117 117
 <guilabel>TDE Components</guilabel>-><guilabel>TDE Resources Configuration</guilabel>:</para>

+ 1
- 1
doc/kpilot/configuration.docbook View File

@@ -1402,7 +1402,7 @@ filename of the
1402 1402
 vCard file (this will usually be a file that ends in <literal
1403 1403
 role="extension">.vcf</literal>) to sync with, of if it uses the standard
1404 1404
 &kde; address book file, it will be under the
1405
-<filename class="directory">$TDEHOME/share/apps/kabc/</filename>
1405
+<filename class="directory">$TDEHOME/share/apps/tdeabc/</filename>
1406 1406
 folder, where the <filename class="directory">$TDEHOME</filename> environment
1407 1407
 variable (typically <filename class="directory">/home/Login Name/.trinity/</filename>)
1408 1408
 points to the folder that contains your configuration and data for the &kde;

+ 1
- 1
kabc/frontend/main.cpp View File

@@ -1,7 +1,7 @@
1 1
 #include <tdeaboutdata.h>
2 2
 #include <tdeapplication.h>
3 3
 #include <kdebug.h>
4
-#include <klocale.h>
4
+#include <tdelocale.h>
5 5
 #include <tdecmdlineargs.h>
6 6
 
7 7
 #include "mainWindow.h"

+ 2
- 2
kabc/frontend/mainWindow.ui.h View File

@@ -10,10 +10,10 @@
10 10
 #include <kinputdialog.h>
11 11
 #include <tqmessagebox.h>
12 12
 
13
-#include <klocale.h>
13
+#include <tdelocale.h>
14 14
 #include <kdebug.h>
15 15
 
16
-#include <kabc/stdaddressbook.h>
16
+#include <tdeabc/stdaddressbook.h>
17 17
 
18 18
 using namespace KABC;
19 19
 

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

@@ -24,6 +24,6 @@ link_directories(
24 24
 
25 25
 tde_add_executable( kabc2mutt AUTOMOC
26 26
   SOURCES kabc2mutt.cpp main.cpp
27
-  LINK kabc-shared
27
+  LINK tdeabc-shared
28 28
   DESTINATION ${BIN_INSTALL_DIR}
29 29
 )

+ 2
- 2
kabc/kabc2mutt/kabc2mutt.cpp View File

@@ -17,9 +17,9 @@
17 17
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#include <kabc/distributionlist.h>
20
+#include <tdeabc/distributionlist.h>
21 21
 #include <tdeapplication.h>
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 
24 24
 #include <tqregexp.h>
25 25
 

+ 1
- 1
kabc/kabc2mutt/kabc2mutt.h View File

@@ -20,7 +20,7 @@
20 20
 #ifndef KABC2MUTT_H
21 21
 #define KABC2MUTT_H
22 22
 
23
-#include <kabc/stdaddressbook.h>
23
+#include <tdeabc/stdaddressbook.h>
24 24
 
25 25
 class KABC2Mutt : public TQObject
26 26
 {

+ 1
- 1
kabc/kabc2mutt/main.cpp View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 #include <tdeapplication.h>
21 21
 #include <tdecmdlineargs.h>
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 
24 24
 #include <iostream>
25 25
 

+ 4
- 4
kabc/kabcdistlistupdater/kabcdistlistupdater.cpp View File

@@ -23,11 +23,11 @@
23 23
 #include <tdecmdlineargs.h>
24 24
 #include <ksimpleconfig.h>
25 25
 #include <kdebug.h>
26
-#include <kglobal.h>
27
-#include <klocale.h>
26
+#include <tdeglobal.h>
27
+#include <tdelocale.h>
28 28
 #include <kstandarddirs.h>
29 29
 
30
-#include <kabc/stdaddressbook.h>
30
+#include <tdeabc/stdaddressbook.h>
31 31
 #include <libtdepim/distributionlist.h>
32 32
 
33 33
 static const TDECmdLineOptions options[] =
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
38 38
 
39 39
 void convertDistributionLists()
40 40
 {
41
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
41
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
42 42
   const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" );
43 43
 
44 44
   if ( entryMap.isEmpty() ) // nothing to convert

+ 2
- 2
kaddressbook/addresseditwidget.cpp View File

@@ -48,8 +48,8 @@
48 48
 #include <kinputdialog.h>
49 49
 #include <klineedit.h>
50 50
 #include <tdelistview.h>
51
-#include <klocale.h>
52
-#include <kmessagebox.h>
51
+#include <tdelocale.h>
52
+#include <tdemessagebox.h>
53 53
 #include <kseparator.h>
54 54
 
55 55
 #include "addresseditwidget.h"

+ 2
- 2
kaddressbook/addresseditwidget.h View File

@@ -27,8 +27,8 @@
27 27
 #include <tqwidget.h>
28 28
 
29 29
 #include <kdialogbase.h>
30
-#include <kabc/address.h>
31
-#include <kabc/addressee.h>
30
+#include <tdeabc/address.h>
31
+#include <tdeabc/addressee.h>
32 32
 
33 33
 #include "addresseeconfig.h"
34 34
 #include "typecombo.h"

+ 1
- 1
kaddressbook/addresseeconfig.h View File

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

+ 1
- 1
kaddressbook/addresseeeditorbase.h View File

@@ -24,7 +24,7 @@
24 24
 #ifndef ADDRESSEEEDITORBASE_H
25 25
 #define ADDRESSEEEDITORBASE_H
26 26
 
27
-#include <kabc/addressee.h>
27
+#include <tdeabc/addressee.h>
28 28
 
29 29
 #include <tqwidget.h>
30 30
 

+ 0
- 0
kaddressbook/addresseeeditordialog.cpp View File


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

Loading…
Cancel
Save