Browse Source

Rename additional header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
0e88a100de
100 changed files with 195 additions and 195 deletions
  1. 1
    1
      dcoprss/feedbrowser.cpp
  2. 1
    1
      dcoprss/main.cpp
  3. 1
    1
      dcoprss/xmlrpciface.cpp
  4. 1
    1
      filesharing/advanced/kcm_sambaconf/dictmanager.cpp
  5. 2
    2
      filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
  6. 2
    2
      filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
  7. 3
    3
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
  8. 2
    2
      filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
  9. 1
    1
      filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
  10. 1
    1
      filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
  11. 3
    3
      filesharing/advanced/kcm_sambaconf/sambafile.cpp
  12. 1
    1
      filesharing/advanced/kcm_sambaconf/share.ui
  13. 2
    2
      filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
  14. 2
    2
      filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
  15. 1
    1
      filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
  16. 1
    1
      filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
  17. 2
    2
      filesharing/advanced/nfs/nfsdialog.cpp
  18. 3
    3
      filesharing/advanced/nfs/nfsfile.cpp
  19. 2
    2
      filesharing/advanced/nfs/nfshostdlg.cpp
  20. 3
    3
      filesharing/advanced/propsdlgplugin/propertiespage.cpp
  21. 2
    2
      filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
  22. 1
    1
      filesharing/simple/fileshare.cpp
  23. 2
    2
      filesharing/simple/groupconfigdlg.cpp
  24. 1
    1
      filesharing/simple/krichtextlabel.cpp
  25. 1
    1
      kdict/actions.h
  26. 1
    1
      kdict/applet/kdictapplet.cpp
  27. 2
    2
      kdict/dict.cpp
  28. 1
    1
      kdict/main.cpp
  29. 2
    2
      kdict/matchview.cpp
  30. 1
    1
      kdict/options.cpp
  31. 1
    1
      kdict/options.h
  32. 3
    3
      kdict/queryview.cpp
  33. 1
    1
      kdict/sets.cpp
  34. 1
    1
      kdict/toplevel.cpp
  35. 2
    2
      kget/dlgAdvanced.cpp
  36. 1
    1
      kget/dlgAutomation.cpp
  37. 2
    2
      kget/dlgConnection.cpp
  38. 3
    3
      kget/dlgDirectories.cpp
  39. 1
    1
      kget/dlgIndividual.cpp
  40. 1
    1
      kget/dlgLimits.cpp
  41. 1
    1
      kget/dlgPreferences.cpp
  42. 1
    1
      kget/docking.cpp
  43. 2
    2
      kget/droptarget.cpp
  44. 2
    2
      kget/kget_plug_in/kget_linkview.cpp
  45. 3
    3
      kget/kget_plug_in/kget_plug_in.cpp
  46. 1
    1
      kget/logwindow.cpp
  47. 2
    2
      kget/main.cpp
  48. 2
    2
      kget/safedelete.cpp
  49. 4
    4
      kget/settings.cpp
  50. 2
    2
      kget/tdefileio.cpp
  51. 4
    4
      kget/tdemainwidget.cpp
  52. 3
    3
      kget/transfer.cpp
  53. 3
    3
      kget/transferlist.cpp
  54. 2
    2
      knewsticker/common/configaccess.cpp
  55. 1
    1
      knewsticker/common/configaccess.h
  56. 1
    1
      knewsticker/common/newsengine.cpp
  57. 1
    1
      knewsticker/common/newsengine.h
  58. 1
    1
      knewsticker/common/xmlnewsaccess.cpp
  59. 2
    2
      knewsticker/knewsticker.cpp
  60. 1
    1
      knewsticker/knewstickerconfig.cpp
  61. 2
    2
      knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
  62. 1
    1
      knewsticker/newsscroller.cpp
  63. 1
    1
      knewsticker/newssourcedlgimpl.cpp
  64. 1
    1
      kopete/KABC_INTEG_NOTES
  65. 2
    2
      kopete/kopete/addaccountwizard/addaccountwizard.cpp
  66. 4
    4
      kopete/kopete/addcontactwizard/addcontactwizard.cpp
  67. 1
    1
      kopete/kopete/addcontactwizard/addcontactwizard.h
  68. 1
    1
      kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp
  69. 3
    3
      kopete/kopete/chatwindow/chatmemberslistwidget.cpp
  70. 3
    3
      kopete/kopete/chatwindow/chatmessagepart.cpp
  71. 3
    3
      kopete/kopete/chatwindow/chatview.cpp
  72. 4
    4
      kopete/kopete/chatwindow/kopetechatwindow.cpp
  73. 2
    2
      kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
  74. 4
    4
      kopete/kopete/chatwindow/kopeteemailwindow.cpp
  75. 2
    2
      kopete/kopete/chatwindow/kopeteemoticonaction.cpp
  76. 1
    1
      kopete/kopete/chatwindow/krichtexteditpart.cpp
  77. 2
    2
      kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
  78. 2
    2
      kopete/kopete/config/accounts/kopeteaccountconfig.cpp
  79. 2
    2
      kopete/kopete/config/appearance/appearanceconfig.cpp
  80. 1
    1
      kopete/kopete/config/appearance/emoticonseditdialog.cpp
  81. 1
    1
      kopete/kopete/config/appearance/tooltipeditdialog.cpp
  82. 1
    1
      kopete/kopete/config/avdevice/avdeviceconfig.cpp
  83. 1
    1
      kopete/kopete/config/behavior/behaviorconfig.cpp
  84. 1
    1
      kopete/kopete/config/identity/globalidentitiesmanager.cpp
  85. 6
    6
      kopete/kopete/config/identity/kopeteidentityconfig.cpp
  86. 1
    1
      kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
  87. 1
    1
      kopete/kopete/config/plugins/kopetepluginconfig.cpp
  88. 8
    8
      kopete/kopete/contactlist/kabcexport.cpp
  89. 2
    2
      kopete/kopete/contactlist/kopeteaddrbookexport.cpp
  90. 2
    2
      kopete/kopete/contactlist/kopeteaddrbookexport.h
  91. 4
    4
      kopete/kopete/contactlist/kopetecontactlistview.cpp
  92. 1
    1
      kopete/kopete/contactlist/kopetegrouplistaction.cpp
  93. 1
    1
      kopete/kopete/contactlist/kopetegroupviewitem.cpp
  94. 5
    5
      kopete/kopete/contactlist/kopetelviprops.cpp
  95. 1
    1
      kopete/kopete/contactlist/kopetelviprops.h
  96. 5
    5
      kopete/kopete/contactlist/kopetemetacontactlvi.cpp
  97. 4
    4
      kopete/kopete/kimifaceimpl.cpp
  98. 2
    2
      kopete/kopete/kopeteapplication.cpp
  99. 2
    2
      kopete/kopete/kopeteballoon.cpp
  100. 0
    0
      kopete/kopete/kopeteeditglobalidentitywidget.cpp

+ 1
- 1
dcoprss/feedbrowser.cpp View File

@@ -6,7 +6,7 @@
6 6
 #include <kdebug.h>
7 7
 #include <kdialogbase.h>
8 8
 #include <tdelistview.h>
9
-#include <klocale.h>
9
+#include <tdelocale.h>
10 10
 #include <dcopclient.h>
11 11
 
12 12
 #include <tqcstring.h>

+ 1
- 1
dcoprss/main.cpp View File

@@ -5,7 +5,7 @@
5 5
 #include <tdecmdlineargs.h>
6 6
 #include <kdebug.h>
7 7
 #include <tdeaboutdata.h>
8
-#include <klocale.h>
8
+#include <tdelocale.h>
9 9
 #include <dcopclient.h>
10 10
 #include "service.h"
11 11
 #include "query.h"

+ 1
- 1
dcoprss/xmlrpciface.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <kdebug.h>
28 28
 #include <tdeio/job.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <kmdcodec.h>
31 31
 
32 32
 #include <tqdom.h>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/dictmanager.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <tqstringlist.h>
36 36
 
37 37
 #include <kurlrequester.h> 
38
-#include <klocale.h>
38
+#include <tdelocale.h>
39 39
  
40 40
 #include "sambashare.h"
41 41
 #include "dictmanager.h" 

+ 2
- 2
filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp View File

@@ -39,10 +39,10 @@
39 39
 #include <tdepopupmenu.h>
40 40
 #include <tdeaction.h>
41 41
 #include <krestrictedline.h>
42
-#include <klocale.h>
42
+#include <tdelocale.h>
43 43
 #include <tdefiledetailview.h>
44 44
 #include <kdirlister.h>
45
-#include <kmessagebox.h>
45
+#include <tdemessagebox.h>
46 46
 #include <kurlrequester.h>
47 47
 
48 48
 #include "hiddenfileview.h"

+ 2
- 2
filesharing/advanced/kcm_sambaconf/joindomaindlg.ui View File

@@ -224,8 +224,8 @@
224 224
 </tabstops>
225 225
 <includes>
226 226
     <include location="global" impldecl="in declaration">kpassdlg.h</include>
227
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
228
-    <include location="global" impldecl="in implementation">klocale.h</include>
227
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
228
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
229 229
     <include location="local" impldecl="in implementation">joindomaindlg.ui.h</include>
230 230
 </includes>
231 231
 <Q_SLOTS>

+ 3
- 3
filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp View File

@@ -44,8 +44,8 @@
44 44
 #include <tqvbox.h>
45 45
 #include <tqlabel.h>
46 46
 
47
-#include <klocale.h>
48
-#include <kglobal.h>
47
+#include <tdelocale.h>
48
+#include <tdeglobal.h>
49 49
 #include <klineedit.h>
50 50
 #include <kurlrequester.h>
51 51
 #include <kcombobox.h>
@@ -53,7 +53,7 @@
53 53
 #include <kiconloader.h>
54 54
 #include <knuminput.h>
55 55
 #include <krestrictedline.h>
56
-#include <kmessagebox.h>
56
+#include <tdemessagebox.h>
57 57
 #include <kjanuswidget.h>
58 58
 #include <tdelistview.h>
59 59
 #include <ksimpleconfig.h>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp View File

@@ -26,8 +26,8 @@
26 26
 #include <tqregexp.h> 
27 27
 #include <tqstringlist.h> 
28 28
 
29
-#include <kmessagebox.h>
30
-#include <klocale.h>
29
+#include <tdemessagebox.h>
30
+#include <tdelocale.h>
31 31
 #include <kdebug.h>
32 32
 
33 33
 #include "passwd.h"

+ 1
- 1
filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp View File

@@ -50,7 +50,7 @@
50 50
 #include <tdeprint/kmprinter.h>
51 51
 #include <kcombobox.h>
52 52
 #include <kiconloader.h>
53
-#include <klocale.h>
53
+#include <tdelocale.h>
54 54
 
55 55
 #include <assert.h>
56 56
 

+ 1
- 1
filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <tqheader.h>
33 33
 
34 34
 #include <kdebug.h>
35
-#include <kmessagebox.h>
35
+#include <tdemessagebox.h>
36 36
 
37 37
 #include "qmultichecklistitem.moc"
38 38
 #include "qmultichecklistitem.h"

+ 3
- 3
filesharing/advanced/kcm_sambaconf/sambafile.cpp View File

@@ -26,9 +26,9 @@
26 26
 #include <tqfileinfo.h>
27 27
 #include <tdeio/job.h>
28 28
 #include <kprocess.h>
29
-#include <kmessagebox.h>
30
-#include <klocale.h>
31
-#include <ktempfile.h>
29
+#include <tdemessagebox.h>
30
+#include <tdelocale.h>
31
+#include <tdetempfile.h>
32 32
 #include <ksambashare.h>
33 33
 
34 34
 #include <pwd.h>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/share.ui View File

@@ -3251,7 +3251,7 @@ Only change something if you know what you are doing.</string>
3251 3251
 <includes>
3252 3252
     <include location="local" impldecl="in implementation">kiconloader.h</include>
3253 3253
     <include location="global" impldecl="in implementation">tqptrlist.h</include>
3254
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
3254
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
3255 3255
     <include location="global" impldecl="in implementation">kprocess.h</include>
3256 3256
     <include location="local" impldecl="in implementation">share.ui.h</include>
3257 3257
 </includes>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp View File

@@ -57,10 +57,10 @@
57 57
 #include <kdebug.h>
58 58
 #include <kcombobox.h>
59 59
 #include <kiconloader.h>
60
-#include <klocale.h>
60
+#include <tdelocale.h>
61 61
 #include <tdefiledetailview.h>
62 62
 #include <kdirlister.h>
63
-#include <kmessagebox.h>
63
+#include <tdemessagebox.h>
64 64
 #include <tdepopupmenu.h>
65 65
 #include <tdeaction.h>
66 66
 #include <krestrictedline.h>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp View File

@@ -33,8 +33,8 @@
33 33
  
34 34
 #include <tdeapplication.h> 
35 35
 #include <tdefiledialog.h>
36
-#include <klocale.h>
37
-#include <kmessagebox.h>
36
+#include <tdelocale.h>
37
+#include <tdemessagebox.h>
38 38
  
39 39
 
40 40
 #include "smbconfconfigwidget.h"

+ 1
- 1
filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <kurl.h>
35 35
 #include <kdebug.h>
36 36
 #include <kpassdlg.h>
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <kprocess.h>
39 39
 
40 40
 #include "sambafile.h"

+ 1
- 1
filesharing/advanced/kcm_sambaconf/usertabimpl.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <tqlineedit.h>
39 39
 
40 40
 #include <tdelistview.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kdebug.h>
43 43
 #include <kiconloader.h>
44 44
 #include <kinputdialog.h>

+ 2
- 2
filesharing/advanced/nfs/nfsdialog.cpp View File

@@ -26,9 +26,9 @@
26 26
 #include <tqlayout.h>
27 27
 
28 28
 #include <kdebug.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 #include <tdefiledialog.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <tdelistview.h>
33 33
 #include <tdeaccel.h>
34 34
 

+ 3
- 3
filesharing/advanced/nfs/nfsfile.cpp View File

@@ -27,10 +27,10 @@
27 27
 #include <tqstringlist.h>
28 28
 
29 29
 #include <kdebug.h>
30
-#include <kmessagebox.h>
31
-#include <klocale.h>
30
+#include <tdemessagebox.h>
31
+#include <tdelocale.h>
32 32
 #include <knfsshare.h>
33
-#include <ktempfile.h>
33
+#include <tdetempfile.h>
34 34
 #include <kprocio.h>
35 35
 
36 36
 #include "nfsfile.h"

+ 2
- 2
filesharing/advanced/nfs/nfshostdlg.cpp View File

@@ -21,9 +21,9 @@
21 21
 #include <tqwhatsthis.h>
22 22
 #include <tqgroupbox.h>
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kdebug.h>
26
-#include <kmessagebox.h>
26
+#include <tdemessagebox.h>
27 27
 
28 28
 #include <assert.h>
29 29
 

+ 3
- 3
filesharing/advanced/propsdlgplugin/propertiespage.cpp View File

@@ -28,15 +28,15 @@
28 28
 #include <tdefileshare.h>
29 29
 #include <knfsshare.h>
30 30
 #include <ksambashare.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <kurl.h>
33 33
 #include <kdebug.h>
34 34
 #include <tdefile.h>
35 35
 #include <kurlrequester.h>
36
-#include <kmessagebox.h>
36
+#include <tdemessagebox.h>
37 37
 #include <klineedit.h>
38 38
 #include <kprocio.h>
39
-#include <ktempfile.h>
39
+#include <tdetempfile.h>
40 40
 
41 41
 // NFS related
42 42
 #include "../nfs/nfsfile.h"

+ 2
- 2
filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp View File

@@ -25,11 +25,11 @@
25 25
 #include <kdebug.h>
26 26
 #include <kpushbutton.h>
27 27
 #include <tdefileshare.h>
28
-#include <kmessagebox.h>
28
+#include <tdemessagebox.h>
29 29
 #include <kprocess.h>
30 30
 #include <kstandarddirs.h>
31 31
 #include <kdialog.h>
32
-#include <kglobal.h>
32
+#include <tdeglobal.h>
33 33
 
34 34
 #include "propertiespage.h"
35 35
 #include "propsdlgshareplugin.h"

+ 1
- 1
filesharing/simple/fileshare.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <tdefileshare.h>
39 39
 #include <kstandarddirs.h>
40 40
 #include <ksimpleconfig.h>
41
-#include <kmessagebox.h>
41
+#include <tdemessagebox.h>
42 42
 #include <tdeapplication.h>
43 43
 #include <kuser.h>
44 44
 #include <kurl.h>

+ 2
- 2
filesharing/simple/groupconfigdlg.cpp View File

@@ -26,10 +26,10 @@
26 26
 #include <tqvbox.h>
27 27
 #include <tqhbox.h>
28 28
 
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <kuser.h>
31 31
 #include <kdebug.h>
32
-#include <kmessagebox.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kinputdialog.h>
34 34
 #include <tdelistbox.h>
35 35
 #include <kprocess.h>

+ 1
- 1
filesharing/simple/krichtextlabel.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <tqstylesheet.h>
23 23
 #include <tqsimplerichtext.h>
24 24
 
25
-#include <kglobalsettings.h>
25
+#include <tdeglobalsettings.h>
26 26
 
27 27
 static TQString qrichtextify( const TQString& text )
28 28
 {

+ 1
- 1
kdict/actions.h View File

@@ -21,7 +21,7 @@
21 21
 #include <tqguardedptr.h>
22 22
 #include <tqptrlist.h>
23 23
 #include <tdeaction.h>
24
-#include <kglobalsettings.h>
24
+#include <tdeglobalsettings.h>
25 25
 
26 26
 class KComboBox;
27 27
 class TQLabel;

+ 1
- 1
kdict/applet/kdictapplet.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tdeconfig.h>
27 27
 #include <kcombobox.h>
28 28
 #include <kiconloader.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <dcopclient.h>
31 31
 #include <tdeapplication.h>
32 32
 #include <kprocess.h>

+ 2
- 2
kdict/dict.cpp View File

@@ -25,9 +25,9 @@
25 25
 #include <tqregexp.h>
26 26
 #include <tqtextcodec.h>
27 27
 
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <kdebug.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 #include <kmdcodec.h>
32 32
 #include <kextsock.h>
33 33
 #include <ksocks.h>

+ 1
- 1
kdict/main.cpp View File

@@ -14,7 +14,7 @@
14 14
 
15 15
 #include <tdeaboutdata.h>
16 16
 #include <tdecmdlineargs.h>
17
-#include <klocale.h>
17
+#include <tdelocale.h>
18 18
 #include <tdelibs_export.h>
19 19
 
20 20
 #include "application.h"

+ 2
- 2
kdict/matchview.cpp View File

@@ -22,10 +22,10 @@
22 22
 #include <tqregexp.h>
23 23
 
24 24
 #include <tdepopupmenu.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <tdeapplication.h>
27 27
 #include <kiconloader.h>
28
-#include <kmessagebox.h>
28
+#include <tdemessagebox.h>
29 29
 
30 30
 #include "dict.h"
31 31
 #include "options.h"

+ 1
- 1
kdict/options.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kcolordialog.h>
30 30
 #include <tdeconfig.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <knumvalidator.h>
33 33
 #include <knuminput.h>
34 34
 #include <klineedit.h>

+ 1
- 1
kdict/options.h View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <tqlistbox.h>
22 22
 #include <kdialogbase.h>
23
-#include <kglobalsettings.h>
23
+#include <tdeglobalsettings.h>
24 24
 
25 25
 class TQLineEdit;
26 26
 class TQCheckBox;

+ 3
- 3
kdict/queryview.cpp View File

@@ -19,12 +19,12 @@
19 19
 #include <tqtimer.h>
20 20
 
21 21
 #include <tdefiledialog.h>
22
-#include <ktempfile.h>
22
+#include <tdetempfile.h>
23 23
 #include <tdeio/netaccess.h>
24 24
 #include <kcursor.h>
25 25
 #include <tdepopupmenu.h>
26
-#include <kmessagebox.h>
27
-#include <klocale.h>
26
+#include <tdemessagebox.h>
27
+#include <tdelocale.h>
28 28
 #include <tdehtml_events.h>
29 29
 #include <tdehtmlview.h>
30 30
 

+ 1
- 1
kdict/sets.cpp View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <kiconloader.h>
22 22
 #include <kseparator.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 
25 25
 #include "options.h"
26 26
 #include "sets.h"

+ 1
- 1
kdict/toplevel.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include <kstdaction.h>
21 21
 #include <tdeapplication.h>
22 22
 #include <kstatusbar.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <twin.h>
25 25
 #include <kedittoolbar.h>
26 26
 #include <kdebug.h>

+ 2
- 2
kget/dlgAdvanced.cpp View File

@@ -27,9 +27,9 @@
27 27
 #include <tqcheckbox.h>
28 28
 #include <tqradiobutton.h>
29 29
 
30
-#include <kprotocolmanager.h>
30
+#include <tdeprotocolmanager.h>
31 31
 
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <tdeconfig.h>
34 34
 
35 35
 #include "settings.h"

+ 1
- 1
kget/dlgAutomation.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tqlabel.h>
30 30
 #include <tqlayout.h>
31 31
 
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kdatetimewidget.h>
34 34
 #include <knuminput.h>
35 35
 #include "common.h"

+ 2
- 2
kget/dlgConnection.cpp View File

@@ -30,8 +30,8 @@
30 30
 #include <tqcheckbox.h>
31 31
 #include <tqlayout.h>
32 32
 
33
-#include <klocale.h>
34
-#include <kprotocolmanager.h>
33
+#include <tdelocale.h>
34
+#include <tdeprotocolmanager.h>
35 35
 #include <kdialog.h>
36 36
 #include <knuminput.h>
37 37
 #include <kcombobox.h>

+ 3
- 3
kget/dlgDirectories.cpp View File

@@ -33,9 +33,9 @@
33 33
 
34 34
 #include <tdefiledialog.h>
35 35
 #include <klineedit.h>
36
-#include <kglobal.h>
37
-#include <klocale.h>
38
-#include <kmessagebox.h>
36
+#include <tdeglobal.h>
37
+#include <tdelocale.h>
38
+#include <tdemessagebox.h>
39 39
 #include <kurlrequester.h>
40 40
 
41 41
 #include "settings.h"

+ 1
- 1
kget/dlgIndividual.cpp View File

@@ -40,7 +40,7 @@
40 40
 
41 41
 #include <tdeapplication.h>
42 42
 #include <tdeaction.h>
43
-#include <klocale.h>
43
+#include <tdelocale.h>
44 44
 #include <tdetoolbar.h>
45 45
 #include <krun.h>
46 46
 #include <tdeio/global.h>

+ 1
- 1
kget/dlgLimits.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tqlayout.h>
30 30
 
31 31
 #include <knuminput.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kdialog.h>
34 34
 
35 35
 #include "settings.h"

+ 1
- 1
kget/dlgPreferences.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <tqlayout.h>
29 29
 
30 30
 #include <tdeapplication.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <tdeaction.h>
33 33
 #include <kcombobox.h>
34 34
 

+ 1
- 1
kget/docking.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tdeaboutdata.h>
30 30
 #include <tdeapplication.h>
31 31
 #include <kiconloader.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <tdepopupmenu.h>
34 34
 #include <kurldrag.h>
35 35
 

+ 2
- 2
kget/droptarget.cpp View File

@@ -30,10 +30,10 @@
30 30
 #include <tdeapplication.h>
31 31
 #include <tdeconfig.h>
32 32
 #include <kiconloader.h>
33
-#include <kglobalsettings.h>
33
+#include <tdeglobalsettings.h>
34 34
 #include <tdemainwindow.h>
35 35
 #include <twin.h>
36
-#include <klocale.h>
36
+#include <tdelocale.h>
37 37
 #include <tdepopupmenu.h>
38 38
 #include <kurldrag.h>
39 39
 

+ 2
- 2
kget/kget_plug_in/kget_linkview.cpp View File

@@ -7,8 +7,8 @@
7 7
 #include <tdeapplication.h>
8 8
 #include <kiconloader.h>
9 9
 #include <tdelistviewsearchline.h>
10
-#include <klocale.h>
11
-#include <kmessagebox.h>
10
+#include <tdelocale.h>
11
+#include <tdemessagebox.h>
12 12
 #include <kprocess.h>
13 13
 #include <kstdaction.h>
14 14
 #include <tdetoolbar.h>

+ 3
- 3
kget/kget_plug_in/kget_plug_in.cpp View File

@@ -25,11 +25,11 @@
25 25
 #include <kdebug.h>
26 26
 #include <tdehtml_part.h>
27 27
 #include <kiconloader.h>
28
-#include <kglobal.h>
28
+#include <tdeglobal.h>
29 29
 #include <tdeaction.h>
30 30
 #include <kinstance.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 <krun.h>
35 35
 

+ 1
- 1
kget/logwindow.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <tqlayout.h>
29 29
 #include <tqlistview.h>
30 30
 
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <kdialog.h>
33 33
 #include <tdeaction.h>
34 34
 

+ 2
- 2
kget/main.cpp View File

@@ -26,12 +26,12 @@
26 26
 
27 27
 
28 28
 #include <twin.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <tdeaboutdata.h>
31 31
 #include <tdecmdlineargs.h>
32 32
 #include <kurl.h>
33 33
 #include <kuniqueapplication.h>
34
-#include <kstartupinfo.h>
34
+#include <tdestartupinfo.h>
35 35
 
36 36
 #include <signal.h>
37 37
 #include <unistd.h>

+ 2
- 2
kget/safedelete.cpp View File

@@ -1,5 +1,5 @@
1
-#include <klocale.h>
2
-#include <kmessagebox.h>
1
+#include <tdelocale.h>
2
+#include <tdemessagebox.h>
3 3
 #include <kurl.h>
4 4
 #include <tdeio/netaccess.h>
5 5
 

+ 4
- 4
kget/settings.cpp View File

@@ -25,12 +25,12 @@
25 25
 
26 26
 #include <tdeapplication.h>
27 27
 #include <kstandarddirs.h>
28
-#include <kglobal.h>
28
+#include <tdeglobal.h>
29 29
 #include <tdeconfig.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <twin.h>
32
-#include <kmessagebox.h>
33
-#include <kglobalsettings.h>
32
+#include <tdemessagebox.h>
33
+#include <tdeglobalsettings.h>
34 34
 #include <netwm_def.h>
35 35
 
36 36
 #include <tqdir.h>

+ 2
- 2
kget/tdefileio.cpp View File

@@ -21,8 +21,8 @@
21 21
 #include <tqfileinfo.h>
22 22
 
23 23
 #include <kdebug.h>
24
-#include <klocale.h>
25
-#include <kmessagebox.h>
24
+#include <tdelocale.h>
25
+#include <tdemessagebox.h>
26 26
 
27 27
 #include "tdefileio.h"
28 28
 

+ 4
- 4
kget/tdemainwidget.cpp View File

@@ -56,10 +56,10 @@
56 56
 #include <kiconloader.h>
57 57
 #include <kurl.h>
58 58
 #include <kurldrag.h>
59
-#include <klocale.h>
60
-#include <kglobal.h>
59
+#include <tdelocale.h>
60
+#include <tdeglobal.h>
61 61
 #include <twin.h>
62
-#include <kmessagebox.h>
62
+#include <tdemessagebox.h>
63 63
 #include <kstdaction.h>
64 64
 #include <khelpmenu.h>
65 65
 #include <kedittoolbar.h>
@@ -68,7 +68,7 @@
68 68
 #include <tdeio/netaccess.h>
69 69
 #include <knotifyclient.h>
70 70
 #include <knotifydialog.h>
71
-#include <kmenubar.h>
71
+#include <tdemenubar.h>
72 72
 #include <tdeio/renamedlg.h>
73 73
 
74 74
 #include "safedelete.h"

+ 3
- 3
kget/transfer.cpp View File

@@ -26,14 +26,14 @@
26 26
 #include <tqheader.h>
27 27
 
28 28
 #include <kurl.h>
29
-#include <kmessagebox.h>
30
-#include <klocale.h>
29
+#include <tdemessagebox.h>
30
+#include <tdelocale.h>
31 31
 #include <ksimpleconfig.h>
32 32
 #include <tdeaction.h>
33 33
 #include <kiconloader.h>
34 34
 #include <kstandarddirs.h>
35 35
 #include <twin.h>
36
-#include <kmessagebox.h>
36
+#include <tdemessagebox.h>
37 37
 
38 38
 #include <assert.h>
39 39
 #include "safedelete.h"

+ 3
- 3
kget/transferlist.cpp View File

@@ -26,11 +26,11 @@
26 26
 
27 27
 #include <tdeapplication.h>
28 28
 #include <kstandarddirs.h>
29
-#include <kglobal.h>
29
+#include <tdeglobal.h>
30 30
 #include <kiconloader.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <tdeconfig.h>
33
-#include <kmessagebox.h>
33
+#include <tdemessagebox.h>
34 34
 #include <ksimpleconfig.h>
35 35
 #include <tdeio/netaccess.h>
36 36
 

+ 2
- 2
knewsticker/common/configaccess.cpp View File

@@ -14,8 +14,8 @@
14 14
 #include <tqregexp.h>
15 15
 
16 16
 #include <kdebug.h>
17
-#include <kglobal.h>
18
-#include <kglobalsettings.h>
17
+#include <tdeglobal.h>
18
+#include <tdeglobalsettings.h>
19 19
 
20 20
 static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
21 21
 	// Arts ---------------

+ 1
- 1
knewsticker/common/configaccess.h View File

@@ -16,7 +16,7 @@
16 16
 
17 17
 #include <tdeconfig.h>
18 18
 #include <tdeio/job.h>
19
-#include <klocale.h>
19
+#include <tdelocale.h>
20 20
 
21 21
 #include <tqpixmap.h>
22 22
 #include <tqvaluelist.h>

+ 1
- 1
knewsticker/common/newsengine.cpp View File

@@ -16,7 +16,7 @@
16 16
 
17 17
 #include <tdeapplication.h>
18 18
 #include <kdebug.h>
19
-#include <kmessagebox.h>
19
+#include <tdemessagebox.h>
20 20
 #include <kprocess.h>
21 21
 #include <krun.h>
22 22
 #include <kstandarddirs.h>

+ 1
- 1
knewsticker/common/newsengine.h View File

@@ -23,7 +23,7 @@
23 23
 #include <tqpixmap.h>
24 24
 
25 25
 #include <tdeio/job.h>
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 #include <ksharedptr.h>
28 28
 
29 29
 class ConfigAccess;

+ 1
- 1
knewsticker/common/xmlnewsaccess.cpp View File

@@ -12,7 +12,7 @@
12 12
 
13 13
 #include <kcharsets.h>
14 14
 #include <kdebug.h>
15
-#include <kglobal.h>
15
+#include <tdeglobal.h>
16 16
 
17 17
 #include <tqbuffer.h>
18 18
 #include <tqdom.h>

+ 2
- 2
knewsticker/knewsticker.cpp View File

@@ -23,9 +23,9 @@
23 23
 #include <kiconloader.h>
24 24
 #include <knotifyclient.h>
25 25
 #include <kprocess.h>
26
-#include <kprotocolmanager.h>
26
+#include <tdeprotocolmanager.h>
27 27
 #include <kstandarddirs.h>
28
-#include <kstartupinfo.h>
28
+#include <tdestartupinfo.h>
29 29
 
30 30
 #include <tqcursor.h>
31 31
 #include <tqlayout.h>

+ 1
- 1
knewsticker/knewstickerconfig.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <kiconloader.h>
23 23
 #include <klineedit.h>
24 24
 #include <tdelistview.h>
25
-#include <kmessagebox.h>
25
+#include <tdemessagebox.h>
26 26
 #include <knuminput.h>
27 27
 #include <tdepopupmenu.h>
28 28
 

+ 2
- 2
knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp View File

@@ -19,11 +19,11 @@
19 19
 
20 20
 #include <tdeapplication.h>
21 21
 #include <tdelistbox.h>
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 #include <kurl.h>
24 24
 #include <kurllabel.h>
25 25
 #include <kstandarddirs.h>
26
-#include <kglobal.h>
26
+#include <tdeglobal.h>
27 27
 
28 28
 #include <tqmultilineedit.h>
29 29
 #include <tqvbox.h>

+ 1
- 1
knewsticker/newsscroller.cpp View File

@@ -18,7 +18,7 @@
18 18
 #include <kcursor.h>
19 19
 #include <kstandarddirs.h>
20 20
 #include <kurldrag.h>
21
-#include <kmessagebox.h>
21
+#include <tdemessagebox.h>
22 22
 
23 23
 #include "configaccess.h"
24 24
 #include "newsscroller.h"

+ 1
- 1
knewsticker/newssourcedlgimpl.cpp View File

@@ -15,7 +15,7 @@
15 15
 
16 16
 #include <kcombobox.h>
17 17
 #include <klineedit.h>
18
-#include <kmessagebox.h>
18
+#include <tdemessagebox.h>
19 19
 #include <knuminput.h>
20 20
 #include <kurlrequester.h>
21 21
 

+ 1
- 1
kopete/KABC_INTEG_NOTES View File

@@ -195,7 +195,7 @@ Implementation notes
195 195
 
196 196
 6) Question: how to combine all contacts in an MCs' data before saving this to kabc.
197 197
 
198
-7) First do dupe check or 'im-info-in-kabc-not-in-kopete' check in case this information already exists in KABC.  Once added to a MC, if already associated, we can add the new contact information to kabc immediately, otherwise Deferred association accessed via MC properties dialog.
198
+7) First do dupe check or 'im-info-in-tdeabc-not-in-kopete' check in case this information already exists in KABC.  Once added to a MC, if already associated, we can add the new contact information to kabc immediately, otherwise Deferred association accessed via MC properties dialog.
199 199
 
200 200
 8) Don't remove the kabc fields, other IM clients might be using them.  So we just remove them from the Kopete contact list.  Dupe contact on the MC add contact thingy will catch if the contact is added again.  (and the user might still want to have other data like the phone number) * See the kabc section
201 201
 

+ 2
- 2
kopete/kopete/addaccountwizard/addaccountwizard.cpp View File

@@ -25,8 +25,8 @@
25 25
 #include <kdebug.h>
26 26
 #include <kiconloader.h>
27 27
 #include <tdelistview.h>
28
-#include <klocale.h>
29
-#include <kmessagebox.h>
28
+#include <tdelocale.h>
29
+#include <tdemessagebox.h>
30 30
 #include <kplugininfo.h>
31 31
 
32 32
 #include "addaccountwizardpage1.h"

+ 4
- 4
kopete/kopete/addcontactwizard/addcontactwizard.cpp View File

@@ -47,7 +47,7 @@
47 47
 #include <tqvbox.h>
48 48
 #include <tdeapplication.h>
49 49
 #include <tdeconfig.h>
50
-#include <klocale.h>
50
+#include <tdelocale.h>
51 51
 #include <kiconloader.h>
52 52
 
53 53
 #include <tdeversion.h>
@@ -58,9 +58,9 @@
58 58
 #include <kdebug.h>
59 59
 #include <tdelistview.h>
60 60
 // used for its AddresseeItem class
61
-#include <kabc/addresseedialog.h>
62
-#include <kabc/addressbook.h>
63
-#include <kabc/stdaddressbook.h>
61
+#include <tdeabc/addresseedialog.h>
62
+#include <tdeabc/addressbook.h>
63
+#include <tdeabc/stdaddressbook.h>
64 64
 
65 65
 #include <addcontactpage.h>
66 66
 #include "addressbookselectorwidget.h"

+ 1
- 1
kopete/kopete/addcontactwizard/addcontactwizard.h View File

@@ -25,7 +25,7 @@
25 25
 #include <tqmap.h>
26 26
 
27 27
 #include <kdebug.h>
28
-#include <kabc/addressbook.h>
28
+#include <tdeabc/addressbook.h>
29 29
 #include "addcontactwizard_base.h"
30 30
 
31 31
 class AddContactPage;

+ 1
- 1
kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <addcontactpage.h>
22 22
 
23 23
 #include <kiconloader.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 #include "kopetecontactlist.h"
27 27
 #include "kopetemetacontact.h"

+ 3
- 3
kopete/kopete/chatwindow/chatmemberslistwidget.cpp View File

@@ -25,9 +25,9 @@
25 25
 #include "kopeteaccount.h"
26 26
 #include "kopetemetacontact.h"
27 27
 
28
-#include <kabc/stdaddressbook.h>
29
-#include <kabc/addressee.h>
30
-#include <kabc/vcardconverter.h>
28
+#include <tdeabc/stdaddressbook.h>
29
+#include <tdeabc/addressee.h>
30
+#include <tdeabc/vcardconverter.h>
31 31
 #include <kdebug.h>
32 32
 #include <tdemultipledrag.h>
33 33
 #include <tdepopupmenu.h>

+ 3
- 3
kopete/kopete/chatwindow/chatmessagepart.cpp View File

@@ -52,13 +52,13 @@
52 52
 #include <tdeversion.h>
53 53
 #include <tdefiledialog.h>
54 54
 #include <tdehtmlview.h>
55
-#include <klocale.h>
56
-#include <kmessagebox.h>
55
+#include <tdelocale.h>
56
+#include <tdemessagebox.h>
57 57
 #include <tdemultipledrag.h>
58 58
 #include <tdepopupmenu.h>
59 59
 #include <krun.h>
60 60
 #include <kstringhandler.h>
61
-#include <ktempfile.h>
61
+#include <tdetempfile.h>
62 62
 #include <kurldrag.h>
63 63
 #include <tdeio/netaccess.h>
64 64
 #include <tdeio/job.h>

+ 3
- 3
kopete/kopete/chatwindow/chatview.cpp View File

@@ -35,13 +35,13 @@
35 35
 #include <tdeconfig.h>
36 36
 #include <ktabwidget.h>
37 37
 #include <kdebug.h>
38
-#include <klocale.h>
39
-#include <kmessagebox.h>
38
+#include <tdelocale.h>
39
+#include <tdemessagebox.h>
40 40
 #include <tdepopupmenu.h>
41 41
 #include <kstringhandler.h>
42 42
 #include <twin.h>
43 43
 #include <kurldrag.h>
44
-#include <kglobalsettings.h>
44
+#include <tdeglobalsettings.h>
45 45
 #include <kgenericfactory.h>
46 46
 #include <tdehtmlview.h>
47 47
 #include <ksyntaxhighlighter.h>

+ 4
- 4
kopete/kopete/chatwindow/kopetechatwindow.cpp View File

@@ -28,14 +28,14 @@
28 28
 
29 29
 #include <tdeapplication.h>
30 30
 #include <kcursor.h>
31
-#include <klocale.h>
32
-#include <kmenubar.h>
31
+#include <tdelocale.h>
32
+#include <tdemenubar.h>
33 33
 #include <tdeconfig.h>
34 34
 #include <tdepopupmenu.h>
35 35
 #include <kiconloader.h>
36 36
 #include <kdebug.h>
37 37
 #include <twin.h>
38
-#include <ktempfile.h>
38
+#include <tdetempfile.h>
39 39
 #include <kkeydialog.h>
40 40
 #include <kedittoolbar.h>
41 41
 #include <kstatusbar.h>
@@ -46,7 +46,7 @@
46 46
 #include <kstringhandler.h>
47 47
 #include <ksqueezedtextlabel.h>
48 48
 #include <tdestdaccel.h>
49
-#include <kglobalsettings.h>
49
+#include <tdeglobalsettings.h>
50 50
 
51 51
 #include "chatmessagepart.h"
52 52
 #include "chattexteditpart.h"

+ 2
- 2
kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <kdirlister.h>
26 26
 #include <kdebug.h>
27 27
 #include <kurl.h>
28
-#include <kglobal.h>
28
+#include <tdeglobal.h>
29 29
 #include <karchive.h>
30 30
 #include <kzip.h>
31 31
 #include <ktar.h>
@@ -33,7 +33,7 @@
33 33
 #include <tdeio/netaccess.h>
34 34
 #include <kstaticdeleter.h>
35 35
 #include <tdeconfig.h>
36
-#include <kglobal.h>
36
+#include <tdeglobal.h>
37 37
 
38 38
 #include "kopetechatwindowstyle.h"
39 39
 

+ 4
- 4
kopete/kopete/chatwindow/kopeteemailwindow.cpp View File

@@ -40,14 +40,14 @@
40 40
 #include <tdeversion.h>
41 41
 #include <kedittoolbar.h>
42 42
 #include <tdefontdialog.h>
43
-#include <kglobalsettings.h>
43
+#include <tdeglobalsettings.h>
44 44
 #include <tdehtmlview.h>
45 45
 #include <kiconloader.h>
46 46
 #include <kkeydialog.h>
47 47
 #include <klibloader.h>
48
-#include <klocale.h>
49
-#include <kmenubar.h>
50
-#include <kmessagebox.h>
48
+#include <tdelocale.h>
49
+#include <tdemenubar.h>
50
+#include <tdemessagebox.h>
51 51
 #include <tdepopupmenu.h>
52 52
 #include <kpushbutton.h>
53 53
 #include <ktextedit.h>

+ 2
- 2
kopete/kopete/chatwindow/kopeteemoticonaction.cpp View File

@@ -26,8 +26,8 @@
26 26
 
27 27
 #include <tdeapplication.h>
28 28
 #include <kdebug.h>
29
-#include <klocale.h>
30
-#include <kmenubar.h>
29
+#include <tdelocale.h>
30
+#include <tdemenubar.h>
31 31
 #include <tdepopupmenu.h>
32 32
 #include <tdetoolbar.h>
33 33
 #include <tdetoolbarbutton.h>

+ 1
- 1
kopete/kopete/chatwindow/krichtexteditpart.cpp View File

@@ -1,7 +1,7 @@
1 1
 #include <ktextedit.h>
2 2
 #include <tdeaction.h>
3 3
 #include <kcolordialog.h>
4
-#include <kglobalsettings.h>
4
+#include <tdeglobalsettings.h>
5 5
 #include <tdefontdialog.h>
6 6
 #include <kdebug.h>
7 7
 #include <tdeconfig.h>

+ 2
- 2
kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp View File

@@ -31,8 +31,8 @@
31 31
 #include <tdeunittest/module.h>
32 32
 #include <kinstance.h>
33 33
 #include <kdebug.h>
34
-#include <kglobal.h>
35
-#include <klocale.h>
34
+#include <tdeglobal.h>
35
+#include <tdelocale.h>
36 36
 
37 37
 #include <kopetechatwindowstyle.h>
38 38
 

+ 2
- 2
kopete/kopete/config/accounts/kopeteaccountconfig.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <kgenericfactory.h>
30 30
 #include <kiconloader.h>
31 31
 #include <tdelistview.h>
32
-#include <klocale.h>
33
-#include <kmessagebox.h>
32
+#include <tdelocale.h>
33
+#include <tdemessagebox.h>
34 34
 
35 35
 #include "addaccountwizard.h"
36 36
 #include "editaccountwidget.h"

+ 2
- 2
kopete/kopete/config/appearance/appearanceconfig.cpp View File

@@ -50,8 +50,8 @@
50 50
 #include <tdeio/netaccess.h>
51 51
 #include <tdehtmlview.h>
52 52
 #include <klineedit.h>
53
-#include <klocale.h>
54
-#include <kmessagebox.h>
53
+#include <tdelocale.h>
54
+#include <tdemessagebox.h>
55 55
 #include <kpushbutton.h>
56 56
 #include <kstandarddirs.h>
57 57
 #include <ktextedit.h>

+ 1
- 1
kopete/kopete/config/appearance/emoticonseditdialog.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include "kopeteprefs.h"
21 21
 #include "kopeteemoticons.h"
22 22
 
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <tdelistview.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <tdefiledialog.h>

+ 1
- 1
kopete/kopete/config/appearance/tooltipeditdialog.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kiconloader.h>
30 30
 #include <tdelistview.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 
33 33
 class TooltipItem : public TDEListViewItem
34 34
 {

+ 1
- 1
kopete/kopete/config/avdevice/avdeviceconfig.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <tqslider.h>
29 29
 
30 30
 #include <kplugininfo.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <kpushbutton.h>
33 33
 #include <kgenericfactory.h>
34 34
 #include <ktrader.h>

+ 1
- 1
kopete/kopete/config/behavior/behaviorconfig.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <kdebug.h>
31 31
 #include <kplugininfo.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kpushbutton.h>
34 34
 #include <kgenericfactory.h>
35 35
 #include <ktrader.h>

+ 1
- 1
kopete/kopete/config/identity/globalidentitiesmanager.cpp View File

@@ -24,7 +24,7 @@
24 24
 // KDE includes
25 25
 #include <kdebug.h>
26 26
 #include <ksavefile.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kurl.h>
29 29
 #include <kstandarddirs.h>
30 30
 

+ 6
- 6
kopete/kopete/config/identity/kopeteidentityconfig.cpp View File

@@ -35,10 +35,10 @@
35 35
 #include <kdebug.h>
36 36
 #include <kgenericfactory.h>
37 37
 #include <kiconloader.h>
38
-#include <klocale.h>
39
-#include <kmessagebox.h>
38
+#include <tdelocale.h>
39
+#include <tdemessagebox.h>
40 40
 #include <kstandarddirs.h>
41
-#include <kglobal.h>
41
+#include <tdeglobal.h>
42 42
 #include <kurlrequester.h>
43 43
 #include <kinputdialog.h>
44 44
 #include <kpixmapregionselectordialog.h>
@@ -48,9 +48,9 @@
48 48
 #include <tdeio/netaccess.h>
49 49
 
50 50
 // KDE KABC(AddressBook) includes
51
-#include <kabc/addresseedialog.h>
52
-#include <kabc/stdaddressbook.h>
53
-#include <kabc/addressee.h>
51
+#include <tdeabc/addresseedialog.h>
52
+#include <tdeabc/stdaddressbook.h>
53
+#include <tdeabc/addressee.h>
54 54
 
55 55
 // Kopete include
56 56
 #include "kabcpersistence.h"

+ 1
- 1
kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc View File

@@ -5,4 +5,4 @@ Singleton=true
5 5
 Mutators=true
6 6
 MemberVariables=private
7 7
 GlobalEnums=true
8
-IncludeFiles=klocale.h
8
+IncludeFiles=tdelocale.h

+ 1
- 1
kopete/kopete/config/plugins/kopetepluginconfig.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqtimer.h>
22 22
 
23 23
 #include <kdebug.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kpluginselector.h>
26 26
 #include <ksettings/dispatcher.h>
27 27
 

+ 8
- 8
kopete/kopete/contactlist/kabcexport.cpp View File

@@ -25,14 +25,14 @@
25 25
 #include <tqptrlist.h>
26 26
 #include <tqmap.h>
27 27
 
28
-#include <klocale.h>
29
-#include <kmessagebox.h>
30
-#include <kabc/addressee.h>
31
-#include <kabc/addressbook.h>
32
-#include <kabc/phonenumber.h>
33
-#include <kabc/picture.h>
34
-#include <kabc/resource.h>
35
-#include <kabc/stdaddressbook.h>
28
+#include <tdelocale.h>
29
+#include <tdemessagebox.h>
30
+#include <tdeabc/addressee.h>
31
+#include <tdeabc/addressbook.h>
32
+#include <tdeabc/phonenumber.h>
33
+#include <tdeabc/picture.h>
34
+#include <tdeabc/resource.h>
35
+#include <tdeabc/stdaddressbook.h>
36 36
 
37 37
 #include <kabcpersistence.h>
38 38
 #include <kopetecontact.h>

+ 2
- 2
kopete/kopete/contactlist/kopeteaddrbookexport.cpp View File

@@ -18,14 +18,14 @@
18 18
     *************************************************************************
19 19
 */
20 20
 
21
-#include <kabc/phonenumber.h>
21
+#include <tdeabc/phonenumber.h>
22 22
 #include <tqcombobox.h>
23 23
 #include <tqlabel.h>
24 24
 
25 25
 #include <kdialogbase.h>
26 26
 #include <kiconloader.h>
27 27
 #include <tdelistbox.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 
30 30
 #include "kopeteaccount.h"
31 31
 #include "kopeteglobal.h"

+ 2
- 2
kopete/kopete/contactlist/kopeteaddrbookexport.h View File

@@ -21,8 +21,8 @@
21 21
 #ifndef KOPETEADDRBOOKEXPORT_H
22 22
 #define KOPETEADDRBOOKEXPORT_H
23 23
 
24
-#include <kabc/stdaddressbook.h>
25
-#include <kabc/addressee.h>
24
+#include <tdeabc/stdaddressbook.h>
25
+#include <tdeabc/addressee.h>
26 26
 
27 27
 #include "kopetecontactproperty.h"
28 28
 

+ 4
- 4
kopete/kopete/contactlist/kopetecontactlistview.cpp View File

@@ -37,14 +37,14 @@
37 37
 #include <tdeapplication.h>
38 38
 #include <kdebug.h>
39 39
 #include <kiconloader.h>
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 #include <tdemainwindow.h>
42
-#include <kmessagebox.h>
42
+#include <tdemessagebox.h>
43 43
 #include <tdepopupmenu.h>
44 44
 #include <kurldrag.h>
45 45
 #include <tdemultipledrag.h>
46
-#include <kabc/stdaddressbook.h>
47
-#include <kabc/vcardconverter.h>
46
+#include <tdeabc/stdaddressbook.h>
47
+#include <tdeabc/vcardconverter.h>
48 48
 
49 49
 #include <tdeversion.h>
50 50
 #include <kinputdialog.h>

+ 1
- 1
kopete/kopete/contactlist/kopetegrouplistaction.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <kdebug.h>
23 23
 #include <kguiitem.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <tdeaction.h>
26 26
 #include <twin.h>
27 27
 #include <kcmultidialog.h>

+ 1
- 1
kopete/kopete/contactlist/kopetegroupviewitem.cpp View File

@@ -18,7 +18,7 @@
18 18
 
19 19
 #include <tqpainter.h>
20 20
 
21
-#include <klocale.h>
21
+#include <tdelocale.h>
22 22
 #include <kiconloader.h>
23 23
 #include <kdebug.h>
24 24
 #include <tdeapplication.h>

+ 5
- 5
kopete/kopete/contactlist/kopetelviprops.cpp View File

@@ -36,12 +36,12 @@
36 36
 #include <tdefiledialog.h>
37 37
 #include <kicondialog.h>
38 38
 #include <kiconloader.h>
39
-#include <klocale.h>
40
-#include <kmessagebox.h>
39
+#include <tdelocale.h>
40
+#include <tdemessagebox.h>
41 41
 #include <kurlrequester.h>
42
-#include <kabc/addresseedialog.h>
43
-#include <kabc/stdaddressbook.h>
44
-#include <kabc/addressee.h>
42
+#include <tdeabc/addresseedialog.h>
43
+#include <tdeabc/stdaddressbook.h>
44
+#include <tdeabc/addressee.h>
45 45
 #include <kstandarddirs.h>
46 46
 #include <kurlrequester.h>
47 47
 

+ 1
- 1
kopete/kopete/contactlist/kopetelviprops.h View File

@@ -20,7 +20,7 @@
20 20
 #define KOPETELVIPROPS_H
21 21
 
22 22
 #include <kdialogbase.h>
23
-#include <kabc/sound.h>
23
+#include <tdeabc/sound.h>
24 24
 
25 25
 #include "kopetemetacontact.h"
26 26
 

+ 5
- 5
kopete/kopete/contactlist/kopetemetacontactlvi.cpp View File

@@ -29,16 +29,16 @@
29 29
 #include <kiconeffect.h>
30 30
 #include <kimageeffect.h>
31 31
 #include <kiconloader.h>
32
-#include <klocale.h>
33
-#include <kmessagebox.h>
32
+#include <tdelocale.h>
33
+#include <tdemessagebox.h>
34 34
 #include <kpassivepopup.h>
35 35
 #include <tdepopupmenu.h>
36
-#include <kglobal.h>
36
+#include <tdeglobal.h>
37 37
 #include <tdeconfig.h>
38 38
 #include <tdeapplication.h>
39 39
 
40
-#include <kabc/addressbook.h>
41
-#include <kabc/addressee.h>
40
+#include <tdeabc/addressbook.h>
41
+#include <tdeabc/addressee.h>
42 42
 
43 43
 #include <tdeversion.h>
44 44
 #include <kinputdialog.h>

+ 4
- 4
kopete/kopete/kimifaceimpl.cpp View File

@@ -20,11 +20,11 @@
20 20
 #include <dcopclient.h>
21 21
 #include <tdeapplication.h>
22 22
 #include <kiconloader.h>
23
-#include <klocale.h>
24
-#include <kmessagebox.h>
23
+#include <tdelocale.h>
24
+#include <tdemessagebox.h>
25 25
 #include <kplugininfo.h>
26
-#include <kabc/addressbook.h>
27
-#include <kabc/stdaddressbook.h>
26
+#include <tdeabc/addressbook.h>
27
+#include <tdeabc/stdaddressbook.h>
28 28
 
29 29
 #include "kopeteaccount.h"
30 30
 #include "kopeteaccountmanager.h"

+ 2
- 2
kopete/kopete/kopeteapplication.cpp View File

@@ -25,9 +25,9 @@
25 25
 
26 26
 #include <tdeconfig.h>
27 27
 #include <kdebug.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <tdecmdlineargs.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 
32 32
 #include "addaccountwizard.h"
33 33
 #include "kabcpersistence.h"

+ 2
- 2
kopete/kopete/kopeteballoon.cpp View File

@@ -25,11 +25,11 @@
25 25
 #include <tqtimer.h>
26 26
 
27 27
 #include <tdeversion.h>
28
-#include <kglobalsettings.h>
28
+#include <tdeglobalsettings.h>
29 29
 
30 30
 #include <tdeapplication.h>
31 31
 #include <kdialog.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kstandarddirs.h>
34 34
 #include <kprotocolinfo.h>
35 35
 #include <kurl.h>

+ 0
- 0
kopete/kopete/kopeteeditglobalidentitywidget.cpp View File


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

Loading…
Cancel
Save