Browse Source

Rename additional header files to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
77cbe84cb6
100 changed files with 202 additions and 202 deletions
  1. 2
    2
      doc/ksplashml/index.docbook
  2. 3
    3
      drkonqi/backtrace.cpp
  3. 5
    5
      drkonqi/debugger.cpp
  4. 2
    2
      drkonqi/drbugreport.cpp
  5. 3
    3
      drkonqi/krashconf.cpp
  6. 1
    1
      drkonqi/main.cpp
  7. 3
    3
      drkonqi/toplevel.cpp
  8. 1
    1
      kappfinder/common.cpp
  9. 1
    1
      kappfinder/main.cpp
  10. 2
    2
      kappfinder/main_install.cpp
  11. 4
    4
      kappfinder/toplevel.cpp
  12. 3
    3
      kate/app/kateapp.cpp
  13. 3
    3
      kate/app/kateconfigdialog.cpp
  14. 1
    1
      kate/app/kateconfigplugindialogpage.cpp
  15. 2
    2
      kate/app/kateconsole.cpp
  16. 2
    2
      kate/app/katedocmanager.cpp
  17. 2
    2
      kate/app/kateexternaltools.cpp
  18. 2
    2
      kate/app/katefilelist.cpp
  19. 3
    3
      kate/app/katefileselector.cpp
  20. 2
    2
      kate/app/kategrepdialog.cpp
  21. 1
    1
      kate/app/katemailfilesdialog.cpp
  22. 3
    3
      kate/app/katemain.cpp
  23. 6
    6
      kate/app/katemainwindow.cpp
  24. 4
    4
      kate/app/katemdi.cpp
  25. 3
    3
      kate/app/katemwmodonhddialog.cpp
  26. 1
    1
      kate/app/katepluginmanager.cpp
  27. 2
    2
      kate/app/katesavemodifieddialog.cpp
  28. 2
    2
      kate/app/katesession.cpp
  29. 5
    5
      kate/app/kateviewmanager.cpp
  30. 1
    1
      kate/app/kateviewspace.cpp
  31. 5
    5
      kate/app/kateviewspacecontainer.cpp
  32. 1
    1
      kate/app/kbookmarkhandler.cpp
  33. 5
    5
      kate/app/kwritemain.cpp
  34. 3
    3
      kcontrol/access/kaccess.cpp
  35. 1
    1
      kcontrol/arts/arts.cpp
  36. 1
    1
      kcontrol/arts/krichtextlabel.cpp
  37. 2
    2
      kcontrol/background/bgadvanced.cpp
  38. 2
    2
      kcontrol/background/bgdialog.cpp
  39. 1
    1
      kcontrol/background/bgmonitor.cpp
  40. 1
    1
      kcontrol/background/bgrender.cpp
  41. 1
    1
      kcontrol/background/bgsettings.cpp
  42. 1
    1
      kcontrol/background/bgwallpaper.cpp
  43. 1
    1
      kcontrol/bell/bell.cpp
  44. 2
    2
      kcontrol/clock/dtime.cpp
  45. 3
    3
      kcontrol/clock/tzone.cpp
  46. 2
    2
      kcontrol/colors/colorscm.cpp
  47. 3
    3
      kcontrol/colors/widgetcanvas.cpp
  48. 3
    3
      kcontrol/componentchooser/componentchooser.cpp
  49. 1
    1
      kcontrol/componentchooser/kcm_componentchooser.cpp
  50. 2
    2
      kcontrol/crypto/certexport.cpp
  51. 3
    3
      kcontrol/crypto/crypto.cpp
  52. 1
    1
      kcontrol/crypto/kdatetimedlg.cpp
  53. 1
    1
      kcontrol/css/kcmcss.cpp
  54. 3
    3
      kcontrol/displayconfig/displayconfig.cpp
  55. 3
    3
      kcontrol/dnssd/kcmdnssd.cpp
  56. 1
    1
      kcontrol/ebrowsing/filteropts.cpp
  57. 3
    3
      kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
  58. 2
    2
      kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
  59. 2
    2
      kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
  60. 3
    3
      kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
  61. 1
    1
      kcontrol/energy/energy.cpp
  62. 1
    1
      kcontrol/filetypes/filegroupdetails.cpp
  63. 1
    1
      kcontrol/filetypes/filetypedetails.cpp
  64. 1
    1
      kcontrol/filetypes/filetypesview.cpp
  65. 2
    2
      kcontrol/filetypes/kservicelistwidget.cpp
  66. 1
    1
      kcontrol/filetypes/kserviceselectdlg.cpp
  67. 1
    1
      kcontrol/filetypes/newtypedlg.cpp
  68. 2
    2
      kcontrol/fonts/fonts.cpp
  69. 1
    1
      kcontrol/fonts/kxftconfig.cpp
  70. 2
    2
      kcontrol/hwmanager/deviceiconview.cpp
  71. 2
    2
      kcontrol/hwmanager/devicepropsdlg.cpp
  72. 3
    3
      kcontrol/hwmanager/hwmanager.cpp
  73. 3
    3
      kcontrol/iccconfig/iccconfig.cpp
  74. 2
    2
      kcontrol/icons/icons.cpp
  75. 2
    2
      kcontrol/icons/iconthemes.cpp
  76. 1
    1
      kcontrol/info/info.cpp
  77. 1
    1
      kcontrol/info/memory.cpp
  78. 2
    2
      kcontrol/info/opengl.cpp
  79. 3
    3
      kcontrol/input/core/themepage.cpp
  80. 2
    2
      kcontrol/input/logitechmouse.cpp
  81. 2
    2
      kcontrol/input/main.cpp
  82. 1
    1
      kcontrol/input/mouse.cpp
  83. 1
    1
      kcontrol/input/mouse.h
  84. 2
    2
      kcontrol/input/xcursor/previewwidget.cpp
  85. 3
    3
      kcontrol/input/xcursor/themepage.cpp
  86. 2
    2
      kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
  87. 2
    2
      kcontrol/joystick/caldialog.cpp
  88. 1
    1
      kcontrol/joystick/joydevice.cpp
  89. 2
    2
      kcontrol/joystick/joystick.cpp
  90. 2
    2
      kcontrol/joystick/joywidget.cpp
  91. 2
    2
      kcontrol/kcontrol/aboutwidget.cpp
  92. 2
    2
      kcontrol/kcontrol/dockcontainer.cpp
  93. 1
    1
      kcontrol/kcontrol/helpwidget.cpp
  94. 1
    1
      kcontrol/kcontrol/kcrootonly.cpp
  95. 1
    1
      kcontrol/kcontrol/main.cpp
  96. 1
    1
      kcontrol/kcontrol/moduleiconview.cpp
  97. 2
    2
      kcontrol/kcontrol/modulemenu.cpp
  98. 1
    1
      kcontrol/kcontrol/modules.cpp
  99. 1
    1
      kcontrol/kcontrol/moduletreeview.cpp
  100. 0
    0
      kcontrol/kcontrol/proxywidget.cpp

+ 2
- 2
doc/ksplashml/index.docbook View File

@@ -1088,8 +1088,8 @@ appropriate plugin.</para>
1088 1088
 #include &lt;kdebug.h&gt;
1089 1089
 #include &lt;kdialogbase.h&gt;
1090 1090
 #include &lt;kgenericfactory.h&gt;
1091
-#include &lt;kglobalsettings.h&gt;
1092
-#include &lt;klocale.h&gt;
1091
+#include &lt;tdeglobalsettings.h&gt;
1092
+#include &lt;tdelocale.h&gt;
1093 1093
 #include &lt;ksplash/objkstheme.h&gt;
1094 1094
 #include &lt;kstandarddirs.h&gt;
1095 1095
 

+ 3
- 3
drkonqi/backtrace.cpp View File

@@ -31,9 +31,9 @@
31 31
 #include <kprocess.h>
32 32
 #include <kdebug.h>
33 33
 #include <kstandarddirs.h>
34
-#include <kmessagebox.h>
35
-#include <klocale.h>
36
-#include <ktempfile.h>
34
+#include <tdemessagebox.h>
35
+#include <tdelocale.h>
36
+#include <tdetempfile.h>
37 37
 
38 38
 #include "krashconf.h"
39 39
 #include "backtrace.h"

+ 5
- 5
drkonqi/debugger.cpp View File

@@ -30,15 +30,15 @@
30 30
 #include <tqlabel.h>
31 31
 
32 32
 #include <kdialog.h>
33
-#include <klocale.h>
34
-#include <kglobal.h>
35
-#include <kglobalsettings.h>
33
+#include <tdelocale.h>
34
+#include <tdeglobal.h>
35
+#include <tdeglobalsettings.h>
36 36
 #include <tdefiledialog.h>
37
-#include <kmessagebox.h>
37
+#include <tdemessagebox.h>
38 38
 #include <kpushbutton.h>
39 39
 #include <kstdguiitem.h>
40 40
 #include <ktextbrowser.h>
41
-#include <ktempfile.h>
41
+#include <tdetempfile.h>
42 42
 
43 43
 #include "backtrace.h"
44 44
 #include "krashconf.h"

+ 2
- 2
drkonqi/drbugreport.cpp View File

@@ -28,8 +28,8 @@
28 28
 
29 29
 #include <tqmultilineedit.h>
30 30
 
31
-#include <kmessagebox.h>
32
-#include <klocale.h>
31
+#include <tdemessagebox.h>
32
+#include <tdelocale.h>
33 33
 
34 34
 #include "drbugreport.moc"
35 35
 #include "drbugreport.h"

+ 3
- 3
drkonqi/krashconf.cpp View File

@@ -26,12 +26,12 @@
26 26
  *****************************************************************/
27 27
 
28 28
 #include <tdeconfig.h>
29
-#include <kglobal.h>
29
+#include <tdeglobal.h>
30 30
 #include <tdeaboutdata.h>
31 31
 #include <tdecmdlineargs.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kdebug.h>
34
-#include <kstartupinfo.h>
34
+#include <tdestartupinfo.h>
35 35
 #include <dcopclient.h>
36 36
 #include <kmacroexpander.h>
37 37
 

+ 1
- 1
drkonqi/main.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <tdeapplication.h>
34 34
 #include <tdecmdlineargs.h>
35 35
 #include <tdeaboutdata.h>
36
-#include <klocale.h>
36
+#include <tdelocale.h>
37 37
 #include <dcopclient.h>
38 38
 
39 39
 #include "krashconf.h"

+ 3
- 3
drkonqi/toplevel.cpp View File

@@ -31,11 +31,11 @@
31 31
 
32 32
 #include "netwm.h"
33 33
 
34
-#include <klocale.h>
35
-#include <kglobal.h>
34
+#include <tdelocale.h>
35
+#include <tdeglobal.h>
36 36
 #include <kstandarddirs.h>
37 37
 #include <kbugreport.h>
38
-#include <kmessagebox.h>
38
+#include <tdemessagebox.h>
39 39
 #include <kprocess.h>
40 40
 #include <tdeapplication.h>
41 41
 #include <dcopclient.h>

+ 1
- 1
kappfinder/common.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <kdebug.h>
23 23
 #include <kdesktopfile.h>
24
-#include <kglobal.h>
24
+#include <tdeglobal.h>
25 25
 #include <kstandarddirs.h>
26 26
 
27 27
 #include <tqdir.h>

+ 1
- 1
kappfinder/main.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include <tdeaboutdata.h>
21 21
 #include <tdeapplication.h>
22 22
 #include <tdecmdlineargs.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 
25 25
 #include "toplevel.h"
26 26
 

+ 2
- 2
kappfinder/main_install.cpp View File

@@ -20,9 +20,9 @@
20 20
 */
21 21
 
22 22
 #include <tdecmdlineargs.h>
23
-#include <kglobal.h>
23
+#include <tdeglobal.h>
24 24
 #include <kinstance.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <kstandarddirs.h>
27 27
 
28 28
 #include <tqstringlist.h>

+ 4
- 4
kappfinder/toplevel.cpp View File

@@ -24,16 +24,16 @@
24 24
 #include <kbuttonbox.h>
25 25
 #include <kdebug.h>
26 26
 #include <kdesktopfile.h>
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 #include <kiconloader.h>
29
-#include <klocale.h>
30
-#include <kmessagebox.h>
29
+#include <tdelocale.h>
30
+#include <tdemessagebox.h>
31 31
 #include <kprogress.h>
32 32
 #include <kservice.h>
33 33
 #include <kservicegroup.h>
34 34
 #include <kstandarddirs.h>
35 35
 #include <kstdguiitem.h>
36
-#include <kstartupinfo.h>
36
+#include <tdestartupinfo.h>
37 37
 
38 38
 #include <tqaccel.h>
39 39
 #include <tqlabel.h>

+ 3
- 3
kate/app/kateapp.cpp View File

@@ -37,10 +37,10 @@
37 37
 #include <ktip.h>
38 38
 #include <kdebug.h>
39 39
 #include <klibloader.h>
40
-#include <kmessagebox.h>
41
-#include <klocale.h>
40
+#include <tdemessagebox.h>
41
+#include <tdelocale.h>
42 42
 #include <ksimpleconfig.h>
43
-#include <kstartupinfo.h>
43
+#include <tdestartupinfo.h>
44 44
 
45 45
 #include <tqfile.h>
46 46
 #include <tqtimer.h>

+ 3
- 3
kate/app/kateconfigdialog.cpp View File

@@ -48,12 +48,12 @@
48 48
 #include <kdebug.h>
49 49
 #include <kdialogbase.h>
50 50
 #include <kglobalaccel.h>
51
-#include <kglobal.h>
52
-#include <kglobalsettings.h>
51
+#include <tdeglobal.h>
52
+#include <tdeglobalsettings.h>
53 53
 #include <kiconloader.h>
54 54
 #include <kkeydialog.h>
55 55
 #include <tdelistbox.h>
56
-#include <klocale.h>
56
+#include <tdelocale.h>
57 57
 #include <ksimpleconfig.h>
58 58
 #include <kstdaction.h>
59 59
 #include <kstandarddirs.h>

+ 1
- 1
kate/app/kateconfigplugindialogpage.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqstringlist.h>
28 28
 #include <tqhbox.h>
29 29
 #include <tqlabel.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <tqpushbutton.h>
32 32
 #include <tqtooltip.h>
33 33
 #include <kiconloader.h>

+ 2
- 2
kate/app/kateconsole.cpp View File

@@ -35,9 +35,9 @@
35 35
 
36 36
 #include <kurl.h>
37 37
 #include <klibloader.h>
38
-#include <klocale.h>
38
+#include <tdelocale.h>
39 39
 #include <kdebug.h>
40
-#include <kmessagebox.h>
40
+#include <tdemessagebox.h>
41 41
 
42 42
 KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent)
43 43
  : TQVBox (parent)

+ 2
- 2
kate/app/katedocmanager.cpp View File

@@ -32,12 +32,12 @@
32 32
 
33 33
 #include <tdeparts/factory.h>
34 34
 
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 #include <kdebug.h>
37 37
 #include <tdeconfig.h>
38 38
 #include <klibloader.h>
39 39
 #include <kmdcodec.h>
40
-#include <kmessagebox.h>
40
+#include <tdemessagebox.h>
41 41
 #include <kencodingfiledialog.h>
42 42
 #include <tdeio/job.h>
43 43
 #include <twin.h>

+ 2
- 2
kate/app/kateexternaltools.cpp View File

@@ -34,9 +34,9 @@
34 34
 #include <kate/document.h>
35 35
 
36 36
 #include <tdelistbox.h>
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <kiconloader.h>
39
-#include <kmessagebox.h>
39
+#include <tdemessagebox.h>
40 40
 #include <kmimetypechooser.h>
41 41
 #include <tdeconfig.h>
42 42
 #include <krun.h>

+ 2
- 2
kate/app/katefilelist.cpp View File

@@ -40,8 +40,8 @@
40 40
 
41 41
 #include <kiconloader.h>
42 42
 #include <tdeconfig.h>
43
-#include <klocale.h>
44
-#include <kglobalsettings.h>
43
+#include <tdelocale.h>
44
+#include <tdeglobalsettings.h>
45 45
 #include <kpassivepopup.h>
46 46
 #include <kdebug.h>
47 47
 #include <tdeapplication.h>

+ 3
- 3
kate/app/katefileselector.cpp View File

@@ -52,12 +52,12 @@
52 52
 #include <kurlcombobox.h>
53 53
 #include <kurlcompletion.h>
54 54
 #include <kprotocolinfo.h>
55
-#include <kdiroperator.h>
55
+#include <tdediroperator.h>
56 56
 #include <tdeconfig.h>
57
-#include <klocale.h>
57
+#include <tdelocale.h>
58 58
 #include <kcombobox.h>
59 59
 #include <tdeaction.h>
60
-#include <kmessagebox.h>
60
+#include <tdemessagebox.h>
61 61
 #include <tdetoolbarbutton.h>
62 62
 #include <tqtoolbar.h>
63 63
 #include <tdepopupmenu.h>

+ 2
- 2
kate/app/kategrepdialog.cpp View File

@@ -37,9 +37,9 @@
37 37
 #include <tdefiledialog.h>
38 38
 #include <kprocess.h>
39 39
 #include <tdeapplication.h>
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 #include <kiconloader.h>
42
-#include <kmessagebox.h>
42
+#include <tdemessagebox.h>
43 43
 #include <kpushbutton.h>
44 44
 #include <kurlrequester.h>
45 45
 #include <kurlcompletion.h>

+ 1
- 1
kate/app/katemailfilesdialog.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include "katedocmanager.h"
23 23
 
24 24
 #include <tdelistview.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <kurl.h>
27 27
 
28 28
 #include <tqevent.h>

+ 3
- 3
kate/app/katemain.cpp View File

@@ -20,13 +20,13 @@
20 20
 #include "kateapp.h"
21 21
 
22 22
 #include <kstandarddirs.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <tdecmdlineargs.h>
25 25
 #include <tdeaboutdata.h>
26
-#include <kglobal.h>
26
+#include <tdeglobal.h>
27 27
 #include <tdeconfig.h>
28 28
 #include <kinstance.h>
29
-#include <kstartupinfo.h>
29
+#include <tdestartupinfo.h>
30 30
 #include <dcopclient.h>
31 31
 #include <dcopref.h>
32 32
 #include <kdebug.h>

+ 6
- 6
kate/app/katemainwindow.cpp View File

@@ -50,17 +50,17 @@
50 50
 #include <tdecmdlineargs.h>
51 51
 #include <kdebug.h>
52 52
 #include <kdialogbase.h>
53
-#include <kdiroperator.h>
53
+#include <tdediroperator.h>
54 54
 #include <kdockwidget.h>
55 55
 #include <kedittoolbar.h>
56 56
 #include <tdefiledialog.h>
57 57
 #include <kglobalaccel.h>
58
-#include <kglobal.h>
59
-#include <kglobalsettings.h>
58
+#include <tdeglobal.h>
59
+#include <tdeglobalsettings.h>
60 60
 #include <kiconloader.h>
61 61
 #include <kkeydialog.h>
62
-#include <klocale.h>
63
-#include <kmessagebox.h>
62
+#include <tdelocale.h>
63
+#include <tdemessagebox.h>
64 64
 #include <kmimetype.h>
65 65
 #include <kopenwith.h>
66 66
 #include <tdepopupmenu.h>
@@ -75,7 +75,7 @@
75 75
 #include <khelpmenu.h>
76 76
 #include <tdemultitabbar.h>
77 77
 #include <ktip.h>
78
-#include <kmenubar.h>
78
+#include <tdemenubar.h>
79 79
 #include <kstringhandler.h>
80 80
 #include <tqlayout.h>
81 81
 #include <tqptrvector.h>

+ 4
- 4
kate/app/katemdi.cpp View File

@@ -25,14 +25,14 @@
25 25
 
26 26
 #include <tdeaction.h>
27 27
 #include <kdebug.h>
28
-#include <kglobal.h>
29
-#include <kglobalsettings.h>
28
+#include <tdeglobal.h>
29
+#include <tdeglobalsettings.h>
30 30
 #include <tdeapplication.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <tdeconfig.h>
33 33
 #include <kiconloader.h>
34 34
 #include <tdepopupmenu.h>
35
-#include <kmessagebox.h>
35
+#include <tdemessagebox.h>
36 36
 
37 37
 #include <tqvbox.h>
38 38
 #include <tqhbox.h>

+ 3
- 3
kate/app/katemwmodonhddialog.cpp View File

@@ -26,11 +26,11 @@
26 26
 
27 27
 #include <kiconloader.h>
28 28
 #include <tdelistview.h>
29
-#include <klocale.h>
30
-#include <kmessagebox.h>
29
+#include <tdelocale.h>
30
+#include <tdemessagebox.h>
31 31
 #include <kprocio.h>
32 32
 #include <krun.h>
33
-#include <ktempfile.h>
33
+#include <tdetempfile.h>
34 34
 #include <kpushbutton.h>
35 35
 
36 36
 #include <tqlabel.h>

+ 1
- 1
kate/app/katepluginmanager.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <tdeconfig.h>
30 30
 #include <tqstringlist.h>
31
-#include <kmessagebox.h>
31
+#include <tdemessagebox.h>
32 32
 #include <kdebug.h>
33 33
 #include <tqfile.h>
34 34
 

+ 2
- 2
kate/app/katesavemodifieddialog.cpp View File

@@ -19,7 +19,7 @@
19 19
 #include "katesavemodifieddialog.h"
20 20
 #include "katesavemodifieddialog.moc"
21 21
 
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 #include <tqlistview.h>
24 24
 #include <tdelistview.h>
25 25
 #include <kguiitem.h>
@@ -29,7 +29,7 @@
29 29
 #include <tqlabel.h>
30 30
 #include <tqpushbutton.h>
31 31
 #include <kiconloader.h>
32
-#include <kmessagebox.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kdebug.h>
34 34
 #include <kencodingfiledialog.h>
35 35
 #include <tdetexteditor/encodinginterface.h>

+ 2
- 2
kate/app/katesession.cpp View File

@@ -24,13 +24,13 @@
24 24
 #include "katedocmanager.h"
25 25
 
26 26
 #include <kstandarddirs.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kdebug.h>
29 29
 #include <kdirwatch.h>
30 30
 #include <tdelistview.h>
31 31
 #include <kinputdialog.h>
32 32
 #include <kiconloader.h>
33
-#include <kmessagebox.h>
33
+#include <tdemessagebox.h>
34 34
 #include <kmdcodec.h>
35 35
 #include <kstdguiitem.h>
36 36
 #include <kpushbutton.h>

+ 5
- 5
kate/app/kateviewmanager.cpp View File

@@ -31,18 +31,18 @@
31 31
 #include <tdeaction.h>
32 32
 #include <tdecmdlineargs.h>
33 33
 #include <kdebug.h>
34
-#include <kdiroperator.h>
34
+#include <tdediroperator.h>
35 35
 #include <kdockwidget.h>
36 36
 #include <kencodingfiledialog.h>
37 37
 #include <kiconloader.h>
38
-#include <kglobal.h>
39
-#include <klocale.h>
38
+#include <tdeglobal.h>
39
+#include <tdelocale.h>
40 40
 #include <tdetoolbar.h>
41
-#include <kmessagebox.h>
41
+#include <tdemessagebox.h>
42 42
 #include <ksimpleconfig.h>
43 43
 #include <kstdaction.h>
44 44
 #include <kstandarddirs.h>
45
-#include <kglobalsettings.h>
45
+#include <tdeglobalsettings.h>
46 46
 #include <tdestdaccel.h>
47 47
 
48 48
 #include <tdetexteditor/encodinginterface.h>

+ 1
- 1
kate/app/kateviewspace.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include "katesession.h"
29 29
 
30 30
 #include <kiconloader.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <ksqueezedtextlabel.h>
33 33
 #include <tdeconfig.h>
34 34
 #include <kdebug.h>

+ 5
- 5
kate/app/kateviewspacecontainer.cpp View File

@@ -32,18 +32,18 @@
32 32
 #include <tdeaction.h>
33 33
 #include <tdecmdlineargs.h>
34 34
 #include <kdebug.h>
35
-#include <kdiroperator.h>
35
+#include <tdediroperator.h>
36 36
 #include <kdockwidget.h>
37 37
 #include <kencodingfiledialog.h>
38 38
 #include <kiconloader.h>
39
-#include <kglobal.h>
40
-#include <klocale.h>
39
+#include <tdeglobal.h>
40
+#include <tdelocale.h>
41 41
 #include <tdetoolbar.h>
42
-#include <kmessagebox.h>
42
+#include <tdemessagebox.h>
43 43
 #include <ksimpleconfig.h>
44 44
 #include <kstdaction.h>
45 45
 #include <kstandarddirs.h>
46
-#include <kglobalsettings.h>
46
+#include <tdeglobalsettings.h>
47 47
 #include <kstringhandler.h>
48 48
 
49 49
 #include <tdetexteditor/encodinginterface.h>

+ 1
- 1
kate/app/kbookmarkhandler.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <tdepopupmenu.h>
29 29
 #include <ksavefile.h>
30 30
 #include <kstandarddirs.h>
31
-#include <kdiroperator.h>
31
+#include <tdediroperator.h>
32 32
 #include <tdeaction.h>
33 33
 
34 34
 #include "kbookmarkhandler.h"

+ 5
- 5
kate/app/kwritemain.cpp View File

@@ -38,24 +38,24 @@
38 38
 #include <dcopclient.h>
39 39
 #include <kurldrag.h>
40 40
 #include <kencodingfiledialog.h>
41
-#include <kdiroperator.h>
41
+#include <tdediroperator.h>
42 42
 #include <kiconloader.h>
43 43
 #include <tdeaboutdata.h>
44 44
 #include <kstatusbar.h>
45 45
 #include <kstdaction.h>
46 46
 #include <tdeaction.h>
47 47
 #include <kdebug.h>
48
-#include <kglobal.h>
48
+#include <tdeglobal.h>
49 49
 #include <tdeapplication.h>
50
-#include <klocale.h>
50
+#include <tdelocale.h>
51 51
 #include <kurl.h>
52 52
 #include <tdeconfig.h>
53 53
 #include <tdecmdlineargs.h>
54
-#include <kmessagebox.h>
54
+#include <tdemessagebox.h>
55 55
 #include <kkeydialog.h>
56 56
 #include <kedittoolbar.h>
57 57
 #include <tdeparts/event.h>
58
-#include <kmenubar.h>
58
+#include <tdemenubar.h>
59 59
 
60 60
 #include <tqdropsite.h>
61 61
 #include <tqdragobject.h>

+ 3
- 3
kcontrol/access/kaccess.cpp View File

@@ -8,15 +8,15 @@
8 8
 #include <tqlabel.h>
9 9
 
10 10
 #include <kdialogbase.h>
11
-#include <kmessagebox.h>
11
+#include <tdemessagebox.h>
12 12
 #include <kcombobox.h>
13 13
 #include <kiconloader.h>
14 14
 #include <kdebug.h>
15 15
 #include <kaudioplayer.h>
16 16
 #include <knotifyclient.h>
17 17
 #include <tdeconfig.h>
18
-#include <kglobal.h>
19
-#include <klocale.h>
18
+#include <tdeglobal.h>
19
+#include <tdelocale.h>
20 20
 #include <netwm.h>
21 21
 #include <tdeshortcut.h>
22 22
 #include <kkeynative.h>

+ 1
- 1
kcontrol/arts/arts.cpp View File

@@ -42,7 +42,7 @@
42 42
 #include <kdebug.h>
43 43
 #include <kdialog.h>
44 44
 #include <klineedit.h>
45
-#include <kmessagebox.h>
45
+#include <tdemessagebox.h>
46 46
 #include <kprocess.h>
47 47
 #include <krichtextlabel.h>
48 48
 #include <ksimpleconfig.h>

+ 1
- 1
kcontrol/arts/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
 {

+ 2
- 2
kcontrol/background/bgadvanced.cpp View File

@@ -34,8 +34,8 @@
34 34
 
35 35
 #include <tdeconfig.h>
36 36
 #include <kcolorbutton.h>
37
-#include <klocale.h>
38
-#include <kmessagebox.h>
37
+#include <tdelocale.h>
38
+#include <tdemessagebox.h>
39 39
 #include <kpixmap.h>
40 40
 #include <kstandarddirs.h>
41 41
 #include <twin.h>

+ 2
- 2
kcontrol/background/bgdialog.cpp View File

@@ -44,10 +44,10 @@
44 44
 #include <kdebug.h>
45 45
 #include <tdefiledialog.h>
46 46
 #include <tdefilemetainfo.h>
47
-#include <kglobal.h>
47
+#include <tdeglobal.h>
48 48
 #include <kiconloader.h>
49 49
 #include <kimageio.h>
50
-#include <klocale.h>
50
+#include <tdelocale.h>
51 51
 #include <kpixmap.h>
52 52
 #include <kstandarddirs.h>
53 53
 #include <kstringhandler.h>

+ 1
- 1
kcontrol/background/bgmonitor.cpp View File

@@ -23,7 +23,7 @@
23 23
  */
24 24
 
25 25
 #include <kdebug.h>
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 #include <kpixmap.h>
28 28
 #include <kstandarddirs.h>
29 29
 #include <kurldrag.h>

+ 1
- 1
kcontrol/background/bgrender.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <kimageeffect.h>
28 28
 #include <kprocess.h>
29 29
 #include <kpixmapio.h>
30
-#include <ktempfile.h>
30
+#include <tdetempfile.h>
31 31
 #include <kcursor.h>
32 32
 #include <kmimetype.h>
33 33
 #include <tdefilemetainfo.h>

+ 1
- 1
kcontrol/background/bgsettings.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <dcopclient.h>
24 24
 #include <tdeapplication.h>
25 25
 #include <kdebug.h>
26
-#include <kglobalsettings.h>
26
+#include <tdeglobalsettings.h>
27 27
 #include <ksimpleconfig.h>
28 28
 #include <kstandarddirs.h>
29 29
 #include <krandomsequence.h>

+ 1
- 1
kcontrol/background/bgwallpaper.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <tdefiledialog.h>
31 31
 #include <kimageio.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kstandarddirs.h>
34 34
 #include <kurldrag.h>
35 35
 

+ 1
- 1
kcontrol/bell/bell.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tdeapplication.h>
30 30
 #include <tdeconfig.h>
31 31
 #include <kdialog.h>
32
-#include <kglobal.h>
32
+#include <tdeglobal.h>
33 33
 #include <knotifyclient.h>
34 34
 #include <knuminput.h>
35 35
 

+ 2
- 2
kcontrol/clock/dtime.cpp View File

@@ -33,9 +33,9 @@
33 33
 #include <tqregexp.h>
34 34
 
35 35
 #include <kdebug.h>
36
-#include <klocale.h>
36
+#include <tdelocale.h>
37 37
 #include <kprocess.h>
38
-#include <kmessagebox.h>
38
+#include <tdemessagebox.h>
39 39
 #include <kdialog.h>
40 40
 #include <tdeconfig.h>
41 41
 

+ 3
- 3
kcontrol/clock/tzone.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <tqfile.h>
30 30
 
31 31
 #include <kdebug.h>
32
-#include <klocale.h>
33
-#include <kmessagebox.h>
32
+#include <tdelocale.h>
33
+#include <tdemessagebox.h>
34 34
 #include <kdialog.h>
35 35
 #include <tdeio/netaccess.h>
36 36
 
@@ -39,7 +39,7 @@
39 39
 #include "tzone.moc"
40 40
 
41 41
 #if defined(USE_SOLARIS)
42
-#include <ktempfile.h>
42
+#include <tdetempfile.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <sys/param.h>
45 45
 #include <sys/types.h>

+ 2
- 2
kcontrol/colors/colorscm.cpp View File

@@ -26,11 +26,11 @@
26 26
 #include <kcursor.h>
27 27
 #include <tdefiledialog.h>
28 28
 #include <kgenericfactory.h>
29
-#include <kglobalsettings.h>
29
+#include <tdeglobalsettings.h>
30 30
 #include <kinputdialog.h>
31 31
 #include <tdeio/netaccess.h>
32 32
 #include <kipc.h>
33
-#include <kmessagebox.h>
33
+#include <tdemessagebox.h>
34 34
 #include <kprocess.h>
35 35
 #include <kstandarddirs.h>
36 36
 #include <tdeaboutdata.h>

+ 3
- 3
kcontrol/colors/widgetcanvas.cpp View File

@@ -15,9 +15,9 @@
15 15
 
16 16
 #include <kcolordrag.h>
17 17
 #include <kpixmapeffect.h>
18
-#include <kglobalsettings.h>
18
+#include <tdeglobalsettings.h>
19 19
 #include <tdeconfig.h>
20
-#include <klocale.h>
20
+#include <tdelocale.h>
21 21
 #include <kpixmap.h>
22 22
 
23 23
 #include "widgetcanvas.h"
@@ -280,7 +280,7 @@ void WidgetCanvas::drawSampleWidgets()
280 280
 
281 281
     TDEConfig * c = new TDEConfig("kcmfonts");
282 282
 
283
-    // Keep in sync with kglobalsettings.
283
+    // Keep in sync with tdeglobalsettings.
284 284
 
285 285
     TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
286 286
     windowFontGuess.setPixelSize(12);

+ 3
- 3
kcontrol/componentchooser/componentchooser.cpp View File

@@ -28,10 +28,10 @@
28 28
 #include <dcopclient.h>
29 29
 
30 30
 #include <tdeapplication.h>
31
-#include <kemailsettings.h>
31
+#include <tdeemailsettings.h>
32 32
 #include <kipc.h>
33
-#include <klocale.h>
34
-#include <kmessagebox.h>
33
+#include <tdelocale.h>
34
+#include <tdemessagebox.h>
35 35
 #include <kopenwith.h>
36 36
 #include <ksimpleconfig.h>
37 37
 #include <kstandarddirs.h>

+ 1
- 1
kcontrol/componentchooser/kcm_componentchooser.cpp View File

@@ -16,7 +16,7 @@
16 16
 #include <tqlayout.h>
17 17
 
18 18
 #include <tdeaboutdata.h>
19
-#include <kglobal.h>
19
+#include <tdeglobal.h>
20 20
 
21 21
 #include "kcm_componentchooser.h"
22 22
 #include "kcm_componentchooser.moc"

+ 2
- 2
kcontrol/crypto/certexport.cpp View File

@@ -31,9 +31,9 @@
31 31
 #include <tqvbuttongroup.h>
32 32
 #include <tqlayout.h>
33 33
 #include <tqlabel.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <kdebug.h>
36
-#include <kmessagebox.h>
36
+#include <tdemessagebox.h>
37 37
 #include <ksslall.h>
38 38
 
39 39
 

+ 3
- 3
kcontrol/crypto/crypto.cpp View File

@@ -56,11 +56,11 @@
56 56
 #include <kdialog.h>
57 57
 #include <tdefiledialog.h>
58 58
 #include <kgenericfactory.h>
59
-#include <kglobal.h>
59
+#include <tdeglobal.h>
60 60
 #include <klineedit.h>
61
-#include <klocale.h>
61
+#include <tdelocale.h>
62 62
 #include <kmdcodec.h>
63
-#include <kmessagebox.h>
63
+#include <tdemessagebox.h>
64 64
 #include <kpassdlg.h>
65 65
 #include <kprocess.h>
66 66
 #include <kpushbutton.h>

+ 1
- 1
kcontrol/crypto/kdatetimedlg.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include "kdatetimedlg.h"
26 26
 #include <tqlayout.h>
27 27
 #include <tqlabel.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <kdebug.h>
30 30
 #include <kdatepicker.h>
31 31
 #include <kpushbutton.h>

+ 1
- 1
kcontrol/css/kcmcss.cpp View File

@@ -11,7 +11,7 @@
11 11
 #include <kdialogbase.h>
12 12
 #include <tdefontdialog.h>
13 13
 #include <kgenericfactory.h>
14
-#include <kglobalsettings.h>
14
+#include <tdeglobalsettings.h>
15 15
 #include <kstandarddirs.h>
16 16
 #include <kurlrequester.h>
17 17
 

+ 3
- 3
kcontrol/displayconfig/displayconfig.cpp View File

@@ -34,10 +34,10 @@
34 34
 #include <kcombobox.h>
35 35
 #include <kdebug.h>
36 36
 #include <kdialog.h>
37
-#include <kglobal.h>
37
+#include <tdeglobal.h>
38 38
 #include <tdelistview.h>
39
-#include <klocale.h>
40
-#include <kmessagebox.h>
39
+#include <tdelocale.h>
40
+#include <tdemessagebox.h>
41 41
 #include <tdepopupmenu.h>
42 42
 #include <kinputdialog.h>
43 43
 #include <kurlrequester.h>

+ 3
- 3
kcontrol/dnssd/kcmdnssd.cpp View File

@@ -32,15 +32,15 @@
32 32
 #include <tqcursor.h>
33 33
 #include <tqbuttongroup.h>
34 34
 
35
-#include <klocale.h>
36
-#include <kglobal.h>
35
+#include <tdelocale.h>
36
+#include <tdeglobal.h>
37 37
 #include <tdeparts/genericfactory.h>
38 38
 #include <kprocess.h>
39 39
 #include <klineedit.h>
40 40
 #include <kpassdlg.h>
41 41
 #include <ksimpleconfig.h>
42 42
 #include <tdeapplication.h>
43
-#include <kmessagebox.h>
43
+#include <tdemessagebox.h>
44 44
 
45 45
 #include "kcmdnssd.h"
46 46
 #include <dnssd/settings.h>

+ 1
- 1
kcontrol/ebrowsing/filteropts.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <tqlabel.h>
26 26
 
27 27
 #include <dcopclient.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 
30 30
 #include "filteropts.h"
31 31
 

+ 3
- 3
kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp View File

@@ -28,15 +28,15 @@
28 28
 #include <tqwhatsthis.h>
29 29
 
30 30
 #include <kdebug.h>
31
-#include <kglobal.h>
31
+#include <tdeglobal.h>
32 32
 #include <dcopref.h>
33 33
 #include <tdeapplication.h>
34 34
 #include <kcombobox.h>
35 35
 #include <tdeconfig.h>
36 36
 #include <kiconloader.h>
37 37
 #include <tdelistview.h>
38
-#include <klocale.h>
39
-#include <kmessagebox.h>
38
+#include <tdelocale.h>
39
+#include <tdemessagebox.h>
40 40
 #include <kservice.h>
41 41
 #include <ksimpleconfig.h>
42 42
 #include <kstandarddirs.h>

+ 2
- 2
kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp View File

@@ -21,10 +21,10 @@
21 21
 #include <unistd.h>
22 22
 
23 23
 #include <kdebug.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kurl.h>
26 26
 #include <kinstance.h>
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 
29 29
 #include "ikwsopts.h"
30 30
 #include "kuriikwsfiltereng.h"

+ 2
- 2
kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp View File

@@ -22,9 +22,9 @@
22 22
 #include <unistd.h>
23 23
 
24 24
 #include <kdebug.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <kinstance.h>
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 
29 29
 #include "ikwsopts.h"
30 30
 #include "kuriikwsfiltereng.h"

+ 3
- 3
kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp View File

@@ -22,12 +22,12 @@
22 22
 #include <tqwhatsthis.h>
23 23
 
24 24
 #include <tdeapplication.h>
25
-#include <klocale.h>
26
-#include <kglobal.h>
25
+#include <tdelocale.h>
26
+#include <tdeglobal.h>
27 27
 #include <kcharsets.h>
28 28
 #include <klineedit.h>
29 29
 #include <kcombobox.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 
32 32
 #include "searchproviderdlg_ui.h"
33 33
 #include "searchproviderdlg.h"

+ 1
- 1
kcontrol/energy/energy.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kcursor.h>
32 32
 #include <kdialog.h>
33 33
 #include <kiconloader.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <knuminput.h>
36 36
 #include <krun.h>
37 37
 #include <kstandarddirs.h>

+ 1
- 1
kcontrol/filetypes/filegroupdetails.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <tqradiobutton.h>
23 23
 #include <tqwhatsthis.h>
24 24
 #include <kdialog.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 
27 27
 FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
28 28
     : TQWidget( parent, name )

+ 1
- 1
kcontrol/filetypes/filetypedetails.cpp View File

@@ -10,7 +10,7 @@
10 10
 #include <kicondialog.h>
11 11
 #include <klineedit.h>
12 12
 #include <kinputdialog.h>
13
-#include <klocale.h>
13
+#include <tdelocale.h>
14 14
 
15 15
 #include "kservicelistwidget.h"
16 16
 #include "filetypedetails.h"

+ 1
- 1
kcontrol/filetypes/filetypesview.cpp View File

@@ -15,7 +15,7 @@
15 15
 #include <kipc.h>
16 16
 #include <klineedit.h>
17 17
 #include <tdelistview.h>
18
-#include <klocale.h>
18
+#include <tdelocale.h>
19 19
 #include <kstandarddirs.h>
20 20
 
21 21
 #include "newtypedlg.h"

+ 2
- 2
kcontrol/filetypes/kservicelistwidget.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 <kmessagebox.h>
29
+#include <tdelocale.h>
30
+#include <tdemessagebox.h>
31 31
 #include <knotifyclient.h>
32 32
 #include <kopenwith.h>
33 33
 

+ 1
- 1
kcontrol/filetypes/kserviceselectdlg.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include "kserviceselectdlg.moc"
21 21
 #include "kservicelistwidget.h"
22 22
 
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 
25 25
 #include <tqvbox.h>
26 26
 #include <tqlabel.h>

+ 1
- 1
kcontrol/filetypes/newtypedlg.cpp View File

@@ -4,7 +4,7 @@
4 4
 #include <tqwhatsthis.h>
5 5
 #include <tqcombobox.h>
6 6
 
7
-#include <klocale.h>
7
+#include <tdelocale.h>
8 8
 #include <klineedit.h>
9 9
 
10 10
 #include "newtypedlg.h"

+ 2
- 2
kcontrol/fonts/fonts.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tdeapplication.h>
27 27
 #include <kgenericfactory.h>
28 28
 #include <kipc.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 #include <knuminput.h>
31 31
 #include <kprocio.h>
32 32
 #include <ksimpleconfig.h>
@@ -522,7 +522,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
522 522
 
523 523
   TQValueList<TQFont> defaultFontList;
524 524
 
525
-  // Keep in sync with tdelibs/tdecore/kglobalsettings.cpp
525
+  // Keep in sync with tdelibs/tdecore/tdeglobalsettings.cpp
526 526
 
527 527
   TQFont f0("Sans Serif", 10);
528 528
   TQFont f1("Monospace", 10);

+ 1
- 1
kcontrol/fonts/kxftconfig.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tqregexp.h>
27 27
 #include <tqfile.h>
28 28
 #include <tqpaintdevice.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <klargefile.h>
31 31
 #include <tqdir.h>
32 32
 #include <tqsettings.h>

+ 2
- 2
kcontrol/hwmanager/deviceiconview.cpp View File

@@ -21,11 +21,11 @@
21 21
 #include <tqheader.h>
22 22
 #include <tqcursor.h>
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <kservicegroup.h>
27 27
 #include <kiconloader.h>
28
-#include <kmessagebox.h>
28
+#include <tdemessagebox.h>
29 29
 
30 30
 #include <kdebug.h>
31 31
 

+ 2
- 2
kcontrol/hwmanager/devicepropsdlg.cpp View File

@@ -34,11 +34,11 @@
34 34
 
35 35
 #include <kbuttonbox.h>
36 36
 #include <kcombobox.h>
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <tdeapplication.h>
39 39
 #include <klineedit.h>
40 40
 #include <kstdguiitem.h>
41
-#include <kmessagebox.h>
41
+#include <tdemessagebox.h>
42 42
 
43 43
 #include "devicepropsdlg.h"
44 44
 

+ 3
- 3
kcontrol/hwmanager/hwmanager.cpp View File

@@ -32,10 +32,10 @@
32 32
 #include <kcombobox.h>
33 33
 #include <kdebug.h>
34 34
 #include <kdialog.h>
35
-#include <kglobal.h>
35
+#include <tdeglobal.h>
36 36
 #include <tdelistview.h>
37
-#include <klocale.h>
38
-#include <kmessagebox.h>
37
+#include <tdelocale.h>
38
+#include <tdemessagebox.h>
39 39
 #include <tdepopupmenu.h>
40 40
 #include <kinputdialog.h>
41 41
 #include <kurlrequester.h>

+ 3
- 3
kcontrol/iccconfig/iccconfig.cpp View File

@@ -32,10 +32,10 @@
32 32
 #include <kcombobox.h>
33 33
 #include <kdebug.h>
34 34
 #include <kdialog.h>
35
-#include <kglobal.h>
35
+#include <tdeglobal.h>
36 36
 #include <tdelistview.h>
37
-#include <klocale.h>
38
-#include <kmessagebox.h>
37
+#include <tdelocale.h>
38
+#include <tdemessagebox.h>
39 39
 #include <tdepopupmenu.h>
40 40
 #include <kinputdialog.h>
41 41
 #include <kurlrequester.h>

+ 2
- 2
kcontrol/icons/icons.cpp View File

@@ -25,9 +25,9 @@
25 25
 #include <kiconeffect.h>
26 26
 #include <kiconloader.h>
27 27
 #include <kipc.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <kseparator.h>
30
-#include <kglobalsettings.h>
30
+#include <tdeglobalsettings.h>
31 31
 #include <dcopclient.h>
32 32
 
33 33
 #include "icons.h"

+ 2
- 2
kcontrol/icons/iconthemes.cpp View File

@@ -30,14 +30,14 @@
30 30
 #include <tdeapplication.h>
31 31
 #include <kstandarddirs.h>
32 32
 #include <kservice.h>
33
-#include <klocale.h>
33
+#include <tdelocale.h>
34 34
 #include <ksimpleconfig.h>
35 35
 #undef Unsorted
36 36
 #include <kipc.h>
37 37
 
38 38
 #include <tdelistview.h>
39 39
 #include <kurlrequesterdlg.h>
40
-#include <kmessagebox.h>
40
+#include <tdemessagebox.h>
41 41
 #include <kprogress.h>
42 42
 #include <kiconloader.h>
43 43
 

+ 1
- 1
kcontrol/info/info.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <tqwhatsthis.h>
32 32
 #include <tqlayout.h>
33 33
 
34
-#include <kglobalsettings.h>
34
+#include <tdeglobalsettings.h>
35 35
 #include <kiconloader.h>
36 36
 #include <kdialog.h>
37 37
 

+ 1
- 1
kcontrol/info/memory.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tqdrawutil.h>
30 30
 #include <tqtooltip.h>
31 31
 
32
-#include <kglobal.h>
32
+#include <tdeglobal.h>
33 33
 #include <kdialog.h>
34 34
 #include <kseparator.h>
35 35
 

+ 2
- 2
kcontrol/info/opengl.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <tqfile.h>
30 30
 #include <tqstring.h>
31 31
 
32
-#include <klocale.h>
33
-#include <kmessagebox.h>
32
+#include <tdelocale.h>
33
+#include <tdemessagebox.h>
34 34
 #include <kdebug.h>
35 35
 
36 36
 #include <X11/Xlib.h>

+ 3
- 3
kcontrol/input/core/themepage.cpp View File

@@ -19,14 +19,14 @@
19 19
  * Boston, MA 02110-1301, USA.
20 20
  */
21 21
 
22
-#include <kglobal.h>
22
+#include <tdeglobal.h>
23 23
 #include <kstandarddirs.h>
24 24
 #include <kurl.h>
25 25
 #include <kprocess.h>
26 26
 #include <tdeio/job.h>
27 27
 #include <tdeio/netaccess.h>
28
-#include <kmessagebox.h>
29
-#include <klocale.h>
28
+#include <tdemessagebox.h>
29
+#include <tdelocale.h>
30 30
 #include <tdeconfig.h>
31 31
 #include <tdelistview.h>
32 32
 #include <kdialog.h>

+ 2
- 2
kcontrol/input/logitechmouse.cpp View File

@@ -31,8 +31,8 @@
31 31
 
32 32
 #include <kdebug.h>
33 33
 #include <kdialog.h>
34
-#include <klocale.h>
35
-#include <kmessagebox.h>
34
+#include <tdelocale.h>
35
+#include <tdemessagebox.h>
36 36
 
37 37
 #include <config.h>
38 38
 

+ 2
- 2
kcontrol/input/main.cpp View File

@@ -25,8 +25,8 @@
25 25
 #  include <config.h>
26 26
 #endif
27 27
 
28
-#include <klocale.h>
29
-#include <kglobal.h>
28
+#include <tdelocale.h>
29
+#include <tdeglobal.h>
30 30
 #include <tdeconfig.h>
31 31
 #include <dcopref.h>
32 32
 #include <tqfile.h>

+ 1
- 1
kcontrol/input/mouse.cpp View File

@@ -56,7 +56,7 @@
56 56
 #include <tqtabwidget.h>
57 57
 #include <tqradiobutton.h>
58 58
 
59
-#include <klocale.h>
59
+#include <tdelocale.h>
60 60
 #include <kdialog.h>
61 61
 #include <tdeconfig.h>
62 62
 #include <kstandarddirs.h>

+ 1
- 1
kcontrol/input/mouse.h View File

@@ -40,7 +40,7 @@
40 40
 
41 41
 #include <tdeapplication.h>
42 42
 
43
-#include <kglobalsettings.h>
43
+#include <tdeglobalsettings.h>
44 44
 #include <knuminput.h>
45 45
 
46 46
 #include <config.h>

+ 2
- 2
kcontrol/input/xcursor/previewwidget.cpp View File

@@ -16,7 +16,7 @@
16 16
  * Boston, MA 02110-1301, USA.
17 17
  */
18 18
 
19
-#include <kglobal.h>
19
+#include <tdeglobal.h>
20 20
 
21 21
 #include <tqwidget.h>
22 22
 #include <tqpainter.h>
@@ -24,7 +24,7 @@
24 24
 #include <tqstring.h>
25 25
 #include <tqcursor.h>
26 26
 
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 
29 29
 #include <X11/Xlib.h>
30 30
 #include <X11/Xutil.h>

+ 3
- 3
kcontrol/input/xcursor/themepage.cpp View File

@@ -20,14 +20,14 @@
20 20
 #  include <config.h>
21 21
 #endif
22 22
 
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <tdeaboutdata.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <tdelistview.h>
27 27
 #include <ksimpleconfig.h>
28
-#include <kglobalsettings.h>
28
+#include <tdeglobalsettings.h>
29 29
 #include <kdialog.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 #include <kurlrequesterdlg.h>
32 32
 #include <tdeio/job.h>
33 33
 #include <tdeio/netaccess.h>

+ 2
- 2
kcontrol/ioslaveinfo/kcmioslaveinfo.cpp View File

@@ -36,10 +36,10 @@
36 36
 #include <kdebug.h>
37 37
 #include <kdialog.h>
38 38
 #include <kgenericfactory.h>
39
-#include <kglobal.h>
39
+#include <tdeglobal.h>
40 40
 #include <kiconloader.h>
41 41
 #include <tdeio/job.h>
42
-#include <klocale.h>
42
+#include <tdelocale.h>
43 43
 #include <kprotocolinfo.h>
44 44
 #include <kstandarddirs.h>
45 45
 

+ 2
- 2
kcontrol/joystick/caldialog.cpp View File

@@ -27,8 +27,8 @@
27 27
 #include <tqapplication.h>
28 28
 #include <tqvbox.h>
29 29
 
30
-#include <klocale.h>
31
-#include <kmessagebox.h>
30
+#include <tdelocale.h>
31
+#include <tdemessagebox.h>
32 32
 #include <kdebug.h>
33 33
 
34 34
 //--------------------------------------------------------------

+ 1
- 1
kcontrol/joystick/joydevice.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include "joydevice.h"
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kdebug.h>
26 26
 
27 27
 #include <sys/types.h>

+ 2
- 2
kcontrol/joystick/joystick.cpp View File

@@ -21,8 +21,8 @@
21 21
 
22 22
 #include <tdeaboutdata.h>
23 23
 #include <kgenericfactory.h>
24
-#include <kglobal.h>
25
-#include <klocale.h>
24
+#include <tdeglobal.h>
25
+#include <tdelocale.h>
26 26
 
27 27
 #include "joystick.h"
28 28
 #include "joywidget.h"

+ 2
- 2
kcontrol/joystick/joywidget.cpp View File

@@ -34,9 +34,9 @@
34 34
 #include <tqfontmetrics.h>
35 35
 #include <tqpushbutton.h>
36 36
 
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <kdialog.h>
39
-#include <kmessagebox.h>
39
+#include <tdemessagebox.h>
40 40
 #include <kiconloader.h>
41 41
 
42 42
 //--------------------------------------------------------------

+ 2
- 2
kcontrol/kcontrol/aboutwidget.cpp View File

@@ -24,12 +24,12 @@
24 24
 #include <tqfile.h>
25 25
 
26 26
 #include <kstandarddirs.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kdebug.h>
29 29
 #include <kpixmap.h>
30 30
 #include <kpixmapeffect.h>
31 31
 #include <kcursor.h>
32
-#include <kglobalsettings.h>
32
+#include <tdeglobalsettings.h>
33 33
 #include <tdehtml_part.h>
34 34
 #include <tdeapplication.h>
35 35
 #include <kiconloader.h>

+ 2
- 2
kcontrol/kcontrol/dockcontainer.cpp View File

@@ -26,8 +26,8 @@
26 26
 #include <tqpushbutton.h>
27 27
 
28 28
 #include <tdeapplication.h>
29
-#include <kmessagebox.h>
30
-#include <klocale.h>
29
+#include <tdemessagebox.h>
30
+#include <tdelocale.h>
31 31
 #include <kdebug.h>
32 32
 #include <kdialog.h>
33 33
 #include <kiconloader.h>

+ 1
- 1
kcontrol/kcontrol/helpwidget.cpp View File

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

+ 1
- 1
kcontrol/kcontrol/kcrootonly.cpp View File

@@ -19,7 +19,7 @@
19 19
 #include <tqlayout.h>
20 20
 #include <tqlabel.h>
21 21
 
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 
24 24
 #include "kcrootonly.h"
25 25
 

+ 1
- 1
kcontrol/kcontrol/main.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tdecmdlineargs.h>
38 38
 #include <dcopclient.h>
39 39
 #include <tdeaboutdata.h>
40
-#include <kglobalsettings.h>
40
+#include <tdeglobalsettings.h>
41 41
 #include <tdeconfig.h>
42 42
 #include <kdebug.h>
43 43
 

+ 1
- 1
kcontrol/kcontrol/moduleiconview.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqheader.h>
22 22
 #include <tqcursor.h>
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <kservicegroup.h>
27 27
 #include <kiconloader.h>

+ 2
- 2
kcontrol/kcontrol/modulemenu.cpp View File

@@ -27,8 +27,8 @@ that is intentional :-]
27 27
 #include <tqpoint.h>
28 28
 #include <tqcursor.h>
29 29
 
30
-#include <klocale.h>
31
-#include <kglobal.h>
30
+#include <tdelocale.h>
31
+#include <tdeglobal.h>
32 32
 #include <kstandarddirs.h>
33 33
 #include <kiconloader.h>
34 34
 #include <kservicegroup.h>

+ 1
- 1
kcontrol/kcontrol/modules.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kservicegroup.h>
30 30
 #include <kprocess.h>
31 31
 #include <qxembed.h>
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 #include <kstandarddirs.h>
34 34
 
35 35
 

+ 1
- 1
kcontrol/kcontrol/moduletreeview.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <tqpainter.h>
24 24
 #include <tqbitmap.h>
25 25
 
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 #include <kiconloader.h>
28 28
 #include <kservicegroup.h>
29 29
 #include <kdebug.h>

+ 0
- 0
kcontrol/kcontrol/proxywidget.cpp View File


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

Loading…
Cancel
Save