Procházet zdrojové kódy

Rename additional header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson před 6 roky
rodič
revize
ed99a30644
100 změnil soubory, kde provedl 165 přidání a 165 odebrání
  1. 1
    1
      CMakeLists.txt
  2. 2
    2
      KDE2PORTING.html
  3. 2
    2
      Mainpage.dox
  4. 1
    1
      Makefile.am.in
  5. 1
    1
      arts/kde/kaudioplaystream.cpp
  6. 1
    1
      arts/kde/kaudiorecordstream.cpp
  7. 1
    1
      arts/kde/kconverttest.cc
  8. 1
    1
      arts/kde/kiotest.cc
  9. 1
    1
      arts/kde/kiotestslow.cc
  10. 1
    1
      arts/kde/kvideowidget.cpp
  11. 1
    1
      arts/kde/mcop-dcop/kmcop.cpp
  12. 3
    3
      arts/knotify/knotify.cpp
  13. 3
    3
      arts/message/artsmessage.cc
  14. 1
    1
      configure.in.in
  15. 1
    1
      interfaces/tdeimproxy/library/tdeimproxy.cpp
  16. 2
    2
      interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
  17. 2
    2
      interfaces/tdescript/scriptloader.cpp
  18. 2
    2
      interfaces/tdescript/scriptmanager.cpp
  19. 1
    1
      interfaces/tdetexteditor/CMakeLists.txt
  20. 1
    1
      interfaces/tdetexteditor/Makefile.am
  21. 1
    1
      interfaces/tdetexteditor/editorchooser.cpp
  22. 3
    3
      interfaces/tdetexteditor/templateinterface.cpp
  23. 1
    1
      interfaces/terminal/test/main.cc
  24. 3
    3
      kab/addressbook.cc
  25. 2
    2
      kab/kabapi.cc
  26. 1
    1
      kate/part/kateautoindent.cpp
  27. 1
    1
      kate/part/katebookmarks.cpp
  28. 1
    1
      kate/part/katebuffer.cpp
  29. 1
    1
      kate/part/katecmds.cpp
  30. 2
    2
      kate/part/kateconfig.cpp
  31. 5
    5
      kate/part/katedialogs.cpp
  32. 5
    5
      kate/part/katedocument.cpp
  33. 1
    1
      kate/part/katedocument.h
  34. 1
    1
      kate/part/katedocumenthelpers.cpp
  35. 1
    1
      kate/part/katefactory.cpp
  36. 1
    1
      kate/part/katefiletype.cpp
  37. 1
    1
      kate/part/katefont.cpp
  38. 4
    4
      kate/part/katehighlight.cpp
  39. 2
    2
      kate/part/katejscript.cpp
  40. 2
    2
      kate/part/kateluaindentscript.cpp
  41. 1
    1
      kate/part/kateprinter.cpp
  42. 2
    2
      kate/part/kateschema.cpp
  43. 2
    2
      kate/part/katesearch.cpp
  44. 1
    1
      kate/part/katespell.cpp
  45. 2
    2
      kate/part/katesyntaxdocument.cpp
  46. 1
    1
      kate/part/katetextline.cpp
  47. 4
    4
      kate/part/kateview.cpp
  48. 3
    3
      kate/part/kateviewhelpers.cpp
  49. 1
    1
      kate/part/kateviewinternal.cpp
  50. 1
    1
      kate/part/test_regression.cpp
  51. 1
    1
      kate/plugins/autobookmarker/autobookmarker.cpp
  52. 3
    3
      kate/plugins/insertfile/insertfileplugin.cpp
  53. 1
    1
      kate/plugins/isearch/ISearchPlugin.cpp
  54. 1
    1
      kate/plugins/kdatatool/kate_kdatatool.cpp
  55. 1
    1
      kate/plugins/wordcompletion/docwordcompletion.cpp
  56. 2
    2
      kded/kbuildimageiofactory.cpp
  57. 2
    2
      kded/kbuildprotocolinfofactory.cpp
  58. 2
    2
      kded/kbuildservicefactory.cpp
  59. 2
    2
      kded/kbuildservicegroupfactory.cpp
  60. 2
    2
      kded/kbuildservicetypefactory.cpp
  61. 2
    2
      kded/kded.cpp
  62. 2
    2
      kded/khostname.cpp
  63. 2
    2
      kded/tde-menu.cpp
  64. 3
    3
      kded/tdebuildsycoca.cpp
  65. 1
    1
      kded/vfolder_menu.cpp
  66. 1
    1
      kdewidgets/CMakeLists.txt
  67. 1
    1
      kdewidgets/kde.widgets
  68. 1
    1
      kdewidgets/tests/test.widgets
  69. 1
    1
      kdoctools/meinproc.cpp
  70. 2
    2
      kdoctools/tdeio_help.cpp
  71. 1
    1
      kdoctools/xslt.cpp
  72. 1
    1
      kimgio/dds.cpp
  73. 1
    1
      kimgio/eps.cpp
  74. 1
    1
      kimgio/exr.cpp
  75. 1
    1
      kimgio/gimp.h
  76. 1
    1
      kimgio/hdr.cpp
  77. 1
    1
      kimgio/jp2.cpp
  78. 1
    1
      kinit/autostart.cpp
  79. 3
    3
      kinit/kinit.cpp
  80. 4
    4
      kinit/tdelauncher.cpp
  81. 1
    1
      kinit/tdelauncher_main.cpp
  82. 2
    2
      knewstuff/downloaddialog.cpp
  83. 2
    2
      knewstuff/engine.cpp
  84. 2
    2
      knewstuff/entry.cpp
  85. 1
    1
      knewstuff/ghns.cpp
  86. 1
    1
      knewstuff/knewstuff.cpp
  87. 1
    1
      knewstuff/knewstuffbutton.cpp
  88. 2
    2
      knewstuff/knewstuffgeneric.cpp
  89. 3
    3
      knewstuff/knewstuffsecure.cpp
  90. 3
    3
      knewstuff/provider.cpp
  91. 2
    2
      knewstuff/providerdialog.cpp
  92. 2
    2
      knewstuff/security.cpp
  93. 1
    1
      knewstuff/tdehotnewstuff.cpp
  94. 1
    1
      knewstuff/testnewstuff.cpp
  95. 2
    2
      knewstuff/uploaddialog.cpp
  96. 2
    2
      kstyles/highcontrast/config/highcontrastconfig.cpp
  97. 1
    1
      kstyles/klegacy/klegacystyle.cpp
  98. 1
    1
      kstyles/klegacy/plugin.cpp
  99. 1
    1
      kstyles/kthemestyle/kthemestyle.cpp
  100. 0
    0
      kstyles/plastik/config/plastitdeconf.cpp

+ 1
- 1
CMakeLists.txt Zobrazit soubor

@@ -953,7 +953,7 @@ add_subdirectory( kinit )
953 953
 add_subdirectory( tdeprint )
954 954
 add_subdirectory( kab )
955 955
 add_subdirectory( tderesources )
956
-add_subdirectory( kabc )
956
+add_subdirectory( tdeabc )
957 957
 add_subdirectory( arts )
958 958
 add_subdirectory( interfaces )
959 959
 add_subdirectory( kate )

+ 2
- 2
KDE2PORTING.html Zobrazit soubor

@@ -204,9 +204,9 @@ must have created a TDEApplication object before the methods can be used.<P>
204 204
 <TR>
205 205
   <TD COLSPAN="2">
206 206
     <PRE>
207
-      #include &lt;kglobal.h&gt;
207
+      #include &lt;tdeglobal.h&gt;
208 208
       #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
209
-      #include &lt;klocale.h&gt;      // Needed to use TDELocale
209
+      #include &lt;tdelocale.h&gt;      // Needed to use TDELocale
210 210
       #include &lt;kiconloader.h&gt;  // Needed to use TDEIconLoader
211 211
     </PRE>
212 212
   </TD>

+ 2
- 2
Mainpage.dox Zobrazit soubor

@@ -49,8 +49,8 @@
49 49
         *   (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
50 50
 	*   <i>Defines interfaces for common components so that new implementations
51 51
 	*   can be dropped in.</i>
52
-	* - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
53
-        *   (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
52
+	* - <a target="_top" href="tdeabc/html/index.html"><b>kabc</b></a>
53
+        *   (<a target="_top" href="tdeabc/html/classes.html">classes</a>)\n
54 54
 	*   <i>Access to the Trinity address book.</i>
55 55
 	* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
56 56
         *   (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n

+ 1
- 1
Makefile.am.in Zobrazit soubor

@@ -39,7 +39,7 @@ potdir = $(kde_includes)
39 39
 pot_DATA = kde.pot
40 40
 
41 41
 messages:
42
-	cd kabc/scripts && perl ./makeaddressee
42
+	cd tdeabc/scripts && perl ./makeaddressee
43 43
 	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
44 44
 	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
45 45
 	for dir in $$mfs; do \

+ 1
- 1
arts/kde/kaudioplaystream.cpp Zobrazit soubor

@@ -26,7 +26,7 @@
26 26
 #include <artsflow.h>
27 27
 #include <soundserver.h>
28 28
 
29
-#include <kglobal.h>
29
+#include <tdeglobal.h>
30 30
 #include <kdebug.h>
31 31
 
32 32
 #include <tqstring.h>

+ 1
- 1
arts/kde/kaudiorecordstream.cpp Zobrazit soubor

@@ -29,7 +29,7 @@
29 29
 #include <artsflow.h>
30 30
 #include <soundserver.h>
31 31
 
32
-#include <kglobal.h>
32
+#include <tdeglobal.h>
33 33
 #include <kdebug.h>
34 34
 
35 35
 #include <tqstring.h>

+ 1
- 1
arts/kde/kconverttest.cc Zobrazit soubor

@@ -3,7 +3,7 @@
3 3
 #include <tqfile.h>
4 4
 #include <tqobject.h>
5 5
 
6
-#include <klocale.h>
6
+#include <tdelocale.h>
7 7
 #include <tdeaboutdata.h>
8 8
 #include <tdecmdlineargs.h>
9 9
 #include <tdeapplication.h>

+ 1
- 1
arts/kde/kiotest.cc Zobrazit soubor

@@ -2,7 +2,7 @@
2 2
 #include <kmedia2.h>
3 3
 #include <tdecmdlineargs.h>
4 4
 #include <connect.h>
5
-#include <klocale.h>
5
+#include <tdelocale.h>
6 6
 #include <tdeapplication.h>
7 7
 #include <tdeaboutdata.h>
8 8
 #include "qiomanager.h"

+ 1
- 1
arts/kde/kiotestslow.cc Zobrazit soubor

@@ -2,7 +2,7 @@
2 2
 #include <kmedia2.h>
3 3
 #include <tdecmdlineargs.h>
4 4
 #include <connect.h>
5
-#include <klocale.h>
5
+#include <tdelocale.h>
6 6
 #include <tdeapplication.h>
7 7
 #include <tdeaboutdata.h>
8 8
 #include <stdsynthmodule.h>

+ 1
- 1
arts/kde/kvideowidget.cpp Zobrazit soubor

@@ -27,7 +27,7 @@
27 27
 #endif
28 28
 
29 29
 #include <tdeaction.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include "kvideowidget.h"
32 32
 
33 33
 

+ 1
- 1
arts/kde/mcop-dcop/kmcop.cpp Zobrazit soubor

@@ -20,7 +20,7 @@
20 20
 #include <kuniqueapplication.h>
21 21
 #include <tdeaboutdata.h>
22 22
 #include <tdecmdlineargs.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <dcopclient.h>
25 25
 
26 26
 #include <tqvaluelist.h>

+ 3
- 3
arts/knotify/knotify.cpp Zobrazit soubor

@@ -52,9 +52,9 @@
52 52
 #include <tdecmdlineargs.h>
53 53
 #include <tdeconfig.h>
54 54
 #include <kdebug.h>
55
-#include <kglobal.h>
56
-#include <klocale.h>
57
-#include <kmessagebox.h>
55
+#include <tdeglobal.h>
56
+#include <tdelocale.h>
57
+#include <tdemessagebox.h>
58 58
 #include <kpassivepopup.h>
59 59
 #include <kiconloader.h>
60 60
 #include <kmacroexpander.h>

+ 3
- 3
arts/message/artsmessage.cc Zobrazit soubor

@@ -31,11 +31,11 @@ Gnome, etc. and used instead.
31 31
 
32 32
 #include <tqregexp.h>
33 33
 
34
-#include <klocale.h>
35
-#include <kglobal.h>
34
+#include <tdelocale.h>
35
+#include <tdeglobal.h>
36 36
 #include <tdeapplication.h>
37 37
 #include <tdeaboutdata.h>
38
-#include <kmessagebox.h>
38
+#include <tdemessagebox.h>
39 39
 #include <tdecmdlineargs.h>
40 40
 
41 41
 // command line options

+ 1
- 1
configure.in.in Zobrazit soubor

@@ -249,7 +249,7 @@ AC_SUBST(LIBRESOLV)
249 249
 AC_SUBST(LIBICE)
250 250
 
251 251
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
252
-AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
252
+AC_SUBST(LIB_KABC, '$(top_builddir)/tdeabc/libkabc.la')
253 253
 AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
254 254
 AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
255 255
 AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')

+ 1
- 1
interfaces/tdeimproxy/library/tdeimproxy.cpp Zobrazit soubor

@@ -27,7 +27,7 @@
27 27
 #include <tdeapplication.h>
28 28
 #include <kdcopservicestarter.h> 
29 29
 #include <kdebug.h>
30
-#include <kmessagebox.h>
30
+#include <tdemessagebox.h>
31 31
 #include <ksimpleconfig.h>
32 32
 #include <kiconloader.h>
33 33
 #include <kservice.h>

+ 2
- 2
interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp Zobrazit soubor

@@ -5,10 +5,10 @@
5 5
 #include <tqlayout.h>
6 6
 #include <tqvgroupbox.h>
7 7
 
8
-#include <kglobal.h>
8
+#include <tdeglobal.h>
9 9
 #include <tdeconfig.h>
10 10
 #include <klibloader.h>
11
-#include <klocale.h>
11
+#include <tdelocale.h>
12 12
 #include <tdemediaplayer/player.h>
13 13
 #include <kmimetype.h>
14 14
 #include <tdeparts/componentfactory.h>

+ 2
- 2
interfaces/tdescript/scriptloader.cpp Zobrazit soubor

@@ -21,8 +21,8 @@
21 21
 #include <tdeapplication.h>
22 22
 #include <tdeparts/part.h>
23 23
 #include <tdeparts/componentfactory.h>
24
-#include <kglobal.h>
25
-#include <klocale.h>
24
+#include <tdeglobal.h>
25
+#include <tdelocale.h>
26 26
 #include <tdeconfig.h>
27 27
 #include <kdesktopfile.h>
28 28
 #include <kstandarsdirs.h>

+ 2
- 2
interfaces/tdescript/scriptmanager.cpp Zobrazit soubor

@@ -5,8 +5,8 @@
5 5
 #include <kdesktopfile.h>
6 6
 #include <kstandarddirs.h>
7 7
 
8
-#include <klocale.h>
9
-#include <kmessagebox.h>
8
+#include <tdelocale.h>
9
+#include <tdemessagebox.h>
10 10
 #include <kdebug.h>
11 11
 
12 12
 //using namespace KScriptInterface;

+ 1
- 1
interfaces/tdetexteditor/CMakeLists.txt Zobrazit soubor

@@ -90,7 +90,7 @@ set( ${target}_SRCS
90 90
 tde_add_library( ${target} SHARED AUTOMOC
91 91
   SOURCES ${${target}_SRCS}
92 92
   VERSION 0.0.0
93
-  LINK tdeui-shared kabc-shared tdeparts-shared
93
+  LINK tdeui-shared tdeabc-shared tdeparts-shared
94 94
   DEPENDENCIES dcopidl dcopidl2cpp
95 95
   DESTINATION ${LIB_INSTALL_DIR}
96 96
 )

+ 1
- 1
interfaces/tdetexteditor/Makefile.am Zobrazit soubor

@@ -46,7 +46,7 @@ servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetextedit
46 46
 kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
47 47
 kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
48 48
 
49
-templateinterface.lo: $(top_builddir)/kabc/addressee.h
49
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
50 50
 
51 51
 include ../../admin/Doxyfile.am
52 52
 

+ 1
- 1
interfaces/tdetexteditor/editorchooser.cpp Zobrazit soubor

@@ -6,7 +6,7 @@
6 6
 #include <tdeconfig.h>
7 7
 #include <tqstringlist.h>
8 8
 #include <kservice.h>
9
-#include <klocale.h>
9
+#include <tdelocale.h>
10 10
 #include <tqlabel.h>
11 11
 #include <tdeapplication.h>
12 12
 #include <tqlayout.h>

+ 3
- 3
interfaces/tdetexteditor/templateinterface.cpp Zobrazit soubor

@@ -22,11 +22,11 @@
22 22
 #include <addressee.h>
23 23
 #include <addresseedialog.h>
24 24
 #include <tqstring.h>
25
-#include <klocale.h>
26
-#include <kglobal.h>
25
+#include <tdelocale.h>
26
+#include <tdeglobal.h>
27 27
 #include <tqdatetime.h>
28 28
 #include <tqregexp.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 #include <kcalendarsystem.h>
31 31
 #include <unistd.h>
32 32
 

+ 1
- 1
interfaces/terminal/test/main.cc Zobrazit soubor

@@ -8,7 +8,7 @@
8 8
 #include <tdeapplication.h>
9 9
 #include <tqdir.h>
10 10
 #include <assert.h>
11
-#include <kmessagebox.h>
11
+#include <tdemessagebox.h>
12 12
 #include <cassert>
13 13
 #include "main.h"
14 14
 #include "main.moc"

+ 3
- 3
kab/addressbook.cc Zobrazit soubor

@@ -22,11 +22,11 @@
22 22
 #include <tqstringlist.h>
23 23
 
24 24
 #include <tdeapplication.h>
25
-#include <kglobal.h>
25
+#include <tdeglobal.h>
26 26
 #include <kstandarddirs.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kdebug.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 
31 31
 extern "C" {
32 32
 #include <sys/stat.h>

+ 2
- 2
kab/kabapi.cc Zobrazit soubor

@@ -18,8 +18,8 @@
18 18
 
19 19
 #include "kabapi.h"
20 20
 #include <tdelistbox.h>
21
-#include <kmessagebox.h>
22
-#include <klocale.h>
21
+#include <tdemessagebox.h>
22
+#include <tdelocale.h>
23 23
 #include <kdebug.h>
24 24
 
25 25
 

+ 1
- 1
kate/part/kateautoindent.cpp Zobrazit soubor

@@ -27,7 +27,7 @@
27 27
 #include "katejscript.h"
28 28
 #include "kateview.h"
29 29
 
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kdebug.h>
32 32
 #include <tdepopupmenu.h>
33 33
 

+ 1
- 1
kate/part/katebookmarks.cpp Zobrazit soubor

@@ -23,7 +23,7 @@
23 23
 #include "katedocument.h"
24 24
 #include "kateview.h"
25 25
 
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 #include <tdeaction.h>
28 28
 #include <tdepopupmenu.h>
29 29
 #include <kstringhandler.h>

+ 1
- 1
kate/part/katebuffer.cpp Zobrazit soubor

@@ -31,7 +31,7 @@
31 31
 #include "kateautoindent.h"
32 32
 
33 33
 #include <kdebug.h>
34
-#include <kglobal.h>
34
+#include <tdeglobal.h>
35 35
 #include <kcharsets.h>
36 36
 
37 37
 #include <tqpopupmenu.h>

+ 1
- 1
kate/part/katecmds.cpp Zobrazit soubor

@@ -32,7 +32,7 @@
32 32
 #include "../interfaces/katecmd.h"
33 33
 
34 34
 #include <kdebug.h>
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 #include <kurl.h>
37 37
 #include <kshellcompletion.h>
38 38
 

+ 2
- 2
kate/part/kateconfig.cpp Zobrazit soubor

@@ -29,9 +29,9 @@
29 29
 
30 30
 #include <tdeapplication.h>
31 31
 #include <tdeconfig.h>
32
-#include <kglobalsettings.h>
32
+#include <tdeglobalsettings.h>
33 33
 #include <kcharsets.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <kfinddialog.h>
36 36
 #include <kreplacedialog.h>
37 37
 #include <kinstance.h>

+ 5
- 5
kate/part/katedialogs.cpp Zobrazit soubor

@@ -53,15 +53,15 @@
53 53
 #include <tdeconfig.h>
54 54
 #include <kdebug.h>
55 55
 #include <tdefontdialog.h>
56
-#include <kglobal.h>
57
-#include <kglobalsettings.h>
56
+#include <tdeglobal.h>
57
+#include <tdeglobalsettings.h>
58 58
 #include <kiconloader.h>
59 59
 #include <kkeybutton.h>
60 60
 #include <kkeydialog.h>
61 61
 #include <klineedit.h>
62 62
 #include <tdelistview.h>
63
-#include <klocale.h>
64
-#include <kmessagebox.h>
63
+#include <tdelocale.h>
64
+#include <tdemessagebox.h>
65 65
 #include <kmimetypechooser.h>
66 66
 #include <knuminput.h>
67 67
 #include <tdeparts/componentfactory.h>
@@ -72,7 +72,7 @@
72 72
 #include <krun.h>
73 73
 #include <kseparator.h>
74 74
 #include <kstandarddirs.h>
75
-#include <ktempfile.h>
75
+#include <tdetempfile.h>
76 76
 
77 77
 #include <tqbuttongroup.h>
78 78
 #include <tqcheckbox.h>

+ 5
- 5
kate/part/katedocument.cpp Zobrazit soubor

@@ -49,24 +49,24 @@
49 49
 
50 50
 #include <tdeparts/event.h>
51 51
 
52
-#include <klocale.h>
53
-#include <kglobal.h>
52
+#include <tdelocale.h>
53
+#include <tdeglobal.h>
54 54
 #include <tdeapplication.h>
55 55
 #include <tdepopupmenu.h>
56 56
 #include <tdeconfig.h>
57 57
 #include <tdefiledialog.h>
58
-#include <kmessagebox.h>
58
+#include <tdemessagebox.h>
59 59
 #include <kstdaction.h>
60 60
 #include <kiconloader.h>
61 61
 #include <kxmlguifactory.h>
62 62
 #include <kdialogbase.h>
63 63
 #include <kdebug.h>
64
-#include <kglobalsettings.h>
64
+#include <tdeglobalsettings.h>
65 65
 #include <klibloader.h>
66 66
 #include <kdirwatch.h>
67 67
 #include <twin.h>
68 68
 #include <kencodingfiledialog.h>
69
-#include <ktempfile.h>
69
+#include <tdetempfile.h>
70 70
 #include <kmdcodec.h>
71 71
 #include <kstandarddirs.h>
72 72
 

+ 1
- 1
kate/part/katedocument.h Zobrazit soubor

@@ -38,7 +38,7 @@
38 38
 #include <dcopobject.h>
39 39
 
40 40
 #include <kmimetype.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 
43 43
 #include <tqintdict.h>
44 44
 #include <tqmap.h>

+ 1
- 1
kate/part/katedocumenthelpers.cpp Zobrazit soubor

@@ -25,7 +25,7 @@
25 25
 #include "kateview.h"
26 26
 
27 27
 #include <tdepopupmenu.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 
30 30
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
31 31
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),

+ 1
- 1
kate/part/katefactory.cpp Zobrazit soubor

@@ -34,7 +34,7 @@
34 34
 #include "../interfaces/katecmd.h"
35 35
 
36 36
 #include <kvmallocator.h>
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <kdirwatch.h>
39 39
 #include <kstaticdeleter.h>
40 40
 

+ 1
- 1
kate/part/katefiletype.cpp Zobrazit soubor

@@ -32,7 +32,7 @@
32 32
 #include <kdebug.h>
33 33
 #include <kiconloader.h>
34 34
 #include <knuminput.h>
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 #include <tdepopupmenu.h>
37 37
 
38 38
 #include <tqregexp.h>

+ 1
- 1
kate/part/katefont.cpp Zobrazit soubor

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include "katefont.h"
23 23
 
24
-#include <kglobalsettings.h>
24
+#include <tdeglobalsettings.h>
25 25
 
26 26
 #include <tqfontinfo.h>
27 27
 

+ 4
- 4
kate/part/katehighlight.cpp Zobrazit soubor

@@ -33,16 +33,16 @@
33 33
 #include "kateconfig.h"
34 34
 
35 35
 #include <tdeconfig.h>
36
-#include <kglobal.h>
36
+#include <tdeglobal.h>
37 37
 #include <kinstance.h>
38 38
 #include <kmimetype.h>
39
-#include <klocale.h>
39
+#include <tdelocale.h>
40 40
 #include <kregexp.h>
41 41
 #include <tdepopupmenu.h>
42
-#include <kglobalsettings.h>
42
+#include <tdeglobalsettings.h>
43 43
 #include <kdebug.h>
44 44
 #include <kstandarddirs.h>
45
-#include <kmessagebox.h>
45
+#include <tdemessagebox.h>
46 46
 #include <kstaticdeleter.h>
47 47
 #include <tdeapplication.h>
48 48
 

+ 2
- 2
kate/part/katejscript.cpp Zobrazit soubor

@@ -35,8 +35,8 @@
35 35
 
36 36
 #include <kdebug.h>
37 37
 #include <kstandarddirs.h>
38
-#include <klocale.h>
39
-#include <kmessagebox.h>
38
+#include <tdelocale.h>
39
+#include <tdemessagebox.h>
40 40
 #include <tdeconfig.h>
41 41
 
42 42
 #include <kjs/function_object.h>

+ 2
- 2
kate/part/kateluaindentscript.cpp Zobrazit soubor

@@ -32,8 +32,8 @@
32 32
 #include <kstandarddirs.h>
33 33
 
34 34
 #include <tdeconfig.h>
35
-#include <kglobal.h>
36
-#include <klocale.h>
35
+#include <tdeglobal.h>
36
+#include <tdelocale.h>
37 37
 
38 38
 extern "C" {
39 39
 #include <lua.h> 

+ 1
- 1
kate/part/kateprinter.cpp Zobrazit soubor

@@ -35,7 +35,7 @@
35 35
 #include <kdebug.h>
36 36
 #include <kdialog.h> // for spacingHint()
37 37
 #include <tdefontdialog.h>
38
-#include <klocale.h>
38
+#include <tdelocale.h>
39 39
 #include <kprinter.h>
40 40
 #include <kurl.h>
41 41
 #include <kuser.h> // for loginName

+ 2
- 2
kate/part/kateschema.cpp Zobrazit soubor

@@ -27,7 +27,7 @@
27 27
 #include "kateview.h"
28 28
 #include "katerenderer.h"
29 29
 
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kdialogbase.h>
32 32
 #include <kcolorbutton.h>
33 33
 #include <kcombobox.h>
@@ -35,7 +35,7 @@
35 35
 #include <tdefontdialog.h>
36 36
 #include <kdebug.h>
37 37
 #include <kiconloader.h>
38
-#include <kmessagebox.h>
38
+#include <tdemessagebox.h>
39 39
 #include <tdepopupmenu.h>
40 40
 #include <kcolordialog.h>
41 41
 #include <tdeapplication.h>

+ 2
- 2
kate/part/katesearch.cpp Zobrazit soubor

@@ -31,9 +31,9 @@
31 31
 #include "kateconfig.h"
32 32
 #include "katehighlight.h"
33 33
 
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <kstdaction.h>
36
-#include <kmessagebox.h>
36
+#include <tdemessagebox.h>
37 37
 #include <kstringhandler.h>
38 38
 #include <kdebug.h>
39 39
 #include <kfinddialog.h>

+ 1
- 1
kate/part/katespell.cpp Zobrazit soubor

@@ -31,7 +31,7 @@
31 31
 #include <tdespell.h>
32 32
 #include <ksconfig.h>
33 33
 #include <kdebug.h>
34
-#include <kmessagebox.h>
34
+#include <tdemessagebox.h>
35 35
 
36 36
 KateSpell::KateSpell( KateView* view )
37 37
   : TQObject( view )

+ 2
- 2
kate/part/katesyntaxdocument.cpp Zobrazit soubor

@@ -25,8 +25,8 @@
25 25
 
26 26
 #include <kdebug.h>
27 27
 #include <kstandarddirs.h>
28
-#include <klocale.h>
29
-#include <kmessagebox.h>
28
+#include <tdelocale.h>
29
+#include <tdemessagebox.h>
30 30
 #include <tdeconfig.h>
31 31
 
32 32
 #include <tqfile.h>

+ 1
- 1
kate/part/katetextline.cpp Zobrazit soubor

@@ -23,7 +23,7 @@
23 23
 #include "katetextline.h"
24 24
 #include "katerenderer.h"
25 25
 
26
-#include <kglobal.h>
26
+#include <tdeglobal.h>
27 27
 
28 28
 #include <tqregexp.h>
29 29
 

+ 4
- 4
kate/part/kateview.cpp Zobrazit soubor

@@ -57,10 +57,10 @@
57 57
 #include <kdebug.h>
58 58
 #include <tdeapplication.h>
59 59
 #include <kcursor.h>
60
-#include <klocale.h>
61
-#include <kglobal.h>
60
+#include <tdelocale.h>
61
+#include <tdeglobal.h>
62 62
 #include <kcharsets.h>
63
-#include <kmessagebox.h>
63
+#include <tdemessagebox.h>
64 64
 #include <tdeaction.h>
65 65
 #include <kstdaction.h>
66 66
 #include <kxmlguifactory.h>
@@ -68,7 +68,7 @@
68 68
 #include <klibloader.h>
69 69
 #include <kencodingfiledialog.h>
70 70
 #include <tdemultipledrag.h>
71
-#include <ktempfile.h>
71
+#include <tdetempfile.h>
72 72
 #include <ksavefile.h>
73 73
 
74 74
 #include <tqfont.h>

+ 3
- 3
kate/part/kateviewhelpers.cpp Zobrazit soubor

@@ -33,10 +33,10 @@
33 33
 #include "kateviewinternal.h"
34 34
 
35 35
 #include <tdeapplication.h>
36
-#include <kglobalsettings.h>
37
-#include <klocale.h>
36
+#include <tdeglobalsettings.h>
37
+#include <tdelocale.h>
38 38
 #include <knotifyclient.h>
39
-#include <kglobal.h>
39
+#include <tdeglobal.h>
40 40
 #include <kcharsets.h>
41 41
 #include <tdepopupmenu.h>
42 42
 

+ 1
- 1
kate/part/kateviewinternal.cpp Zobrazit soubor

@@ -38,7 +38,7 @@
38 38
 #include <kcursor.h>
39 39
 #include <kdebug.h>
40 40
 #include <tdeapplication.h>
41
-#include <kglobalsettings.h>
41
+#include <tdeglobalsettings.h>
42 42
 #include <kurldrag.h>
43 43
 
44 44
 #include <tqstyle.h>

+ 1
- 1
kate/part/test_regression.cpp Zobrazit soubor

@@ -45,7 +45,7 @@
45 45
 #include <tdeio/job.h>
46 46
 #include <tdemainwindow.h>
47 47
 #include <ksimpleconfig.h>
48
-#include <kglobalsettings.h>
48
+#include <tdeglobalsettings.h>
49 49
 
50 50
 #include <tqcolor.h>
51 51
 #include <tqcursor.h>

+ 1
- 1
kate/plugins/autobookmarker/autobookmarker.cpp Zobrazit soubor

@@ -34,7 +34,7 @@
34 34
 #include <kgenericfactory.h>
35 35
 #include <kiconloader.h>
36 36
 #include <tdelistview.h>
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <kmimetype.h>
39 39
 #include <kmimetypechooser.h>
40 40
 #include <kprocess.h>

+ 3
- 3
kate/plugins/insertfile/insertfileplugin.cpp Zobrazit soubor

@@ -28,10 +28,10 @@
28 28
 #include <tdeaction.h>
29 29
 #include <tdefiledialog.h>
30 30
 #include <kgenericfactory.h>
31
-#include <klocale.h>
32
-#include <kmessagebox.h>
31
+#include <tdelocale.h>
32
+#include <tdemessagebox.h>
33 33
 #include <kpushbutton.h>
34
-#include <ktempfile.h>
34
+#include <tdetempfile.h>
35 35
 #include <kurl.h>
36 36
 
37 37
 #include <tqfile.h>

+ 1
- 1
kate/plugins/isearch/ISearchPlugin.cpp Zobrazit soubor

@@ -21,7 +21,7 @@
21 21
 #include <tqstyle.h>
22 22
 #include <tqpopupmenu.h>
23 23
 #include <kgenericfactory.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <tdeaction.h>
26 26
 #include <kcombobox.h>
27 27
 #include <tdeconfig.h>

+ 1
- 1
kate/plugins/kdatatool/kate_kdatatool.cpp Zobrazit soubor

@@ -29,7 +29,7 @@
29 29
 #include <tdepopupmenu.h>
30 30
 #include <tdetexteditor/viewcursorinterface.h>
31 31
 #include <tdetexteditor/editinterface.h>
32
-#include <kmessagebox.h>
32
+#include <tdemessagebox.h>
33 33
 //END includes
34 34
 
35 35
 

+ 1
- 1
kate/plugins/wordcompletion/docwordcompletion.cpp Zobrazit soubor

@@ -37,7 +37,7 @@
37 37
 #include <tdeconfig.h>
38 38
 #include <kdialog.h>
39 39
 #include <kgenericfactory.h>
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 #include <tdeaction.h>
42 42
 #include <knotifyclient.h>
43 43
 #include <tdeparts/part.h>

+ 2
- 2
kded/kbuildimageiofactory.cpp Zobrazit soubor

@@ -20,10 +20,10 @@
20 20
 #include "tdesycocadict.h"
21 21
 #include "kresourcelist.h"
22 22
 
23
-#include <kglobal.h>
23
+#include <tdeglobal.h>
24 24
 #include <kstandarddirs.h>
25 25
 #include <kdebug.h>
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 #include <assert.h>
28 28
 
29 29
 #include <kimageiofactory.h>

+ 2
- 2
kded/kbuildprotocolinfofactory.cpp Zobrazit soubor

@@ -21,11 +21,11 @@
21 21
 #include "tdesycocadict.h"
22 22
 #include "kresourcelist.h"
23 23
 
24
-#include <kglobal.h>
24
+#include <tdeglobal.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <kmessageboxwrapper.h>
27 27
 #include <kdebug.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <assert.h>
30 30
 
31 31
 KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() :

+ 2
- 2
kded/kbuildservicefactory.cpp Zobrazit soubor

@@ -23,10 +23,10 @@
23 23
 #include "kresourcelist.h"
24 24
 #include "kmimetype.h"
25 25
 
26
-#include <kglobal.h>
26
+#include <tdeglobal.h>
27 27
 #include <kstandarddirs.h>
28 28
 #include <kmessageboxwrapper.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <kdebug.h>
31 31
 #include <assert.h>
32 32
 

+ 2
- 2
kded/kbuildservicegroupfactory.cpp Zobrazit soubor

@@ -21,11 +21,11 @@
21 21
 #include "tdesycocadict.h"
22 22
 #include "kresourcelist.h"
23 23
 
24
-#include <kglobal.h>
24
+#include <tdeglobal.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <kmessageboxwrapper.h>
27 27
 #include <kdebug.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <assert.h>
30 30
 
31 31
 KBuildServiceGroupFactory::KBuildServiceGroupFactory() :

+ 2
- 2
kded/kbuildservicetypefactory.cpp Zobrazit soubor

@@ -21,11 +21,11 @@
21 21
 #include "tdesycocadict.h"
22 22
 #include "kresourcelist.h"
23 23
 
24
-#include <kglobal.h>
24
+#include <tdeglobal.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <kmessageboxwrapper.h>
27 27
 #include <kdebug.h>
28
-#include <klocale.h>
28
+#include <tdelocale.h>
29 29
 #include <assert.h>
30 30
 #include <kdesktopfile.h>
31 31
 

+ 2
- 2
kded/kded.cpp Zobrazit soubor

@@ -38,8 +38,8 @@
38 38
 #include <kuniqueapplication.h>
39 39
 #include <tdecmdlineargs.h>
40 40
 #include <tdeaboutdata.h>
41
-#include <klocale.h>
42
-#include <kglobal.h>
41
+#include <tdelocale.h>
42
+#include <tdeglobal.h>
43 43
 #include <kprocess.h>
44 44
 #include <kdebug.h>
45 45
 #include <kdirwatch.h>

+ 2
- 2
kded/khostname.cpp Zobrazit soubor

@@ -30,9 +30,9 @@
30 30
 
31 31
 #include <tdecmdlineargs.h>
32 32
 #include <tdeapplication.h>
33
-#include <klocale.h>
33
+#include <tdelocale.h>
34 34
 #include <tdeaboutdata.h>
35
-#include <kglobal.h>
35
+#include <tdeglobal.h>
36 36
 #include <kstandarddirs.h>
37 37
 #include <kprocess.h>
38 38
 #include <kde_file.h>

+ 2
- 2
kded/tde-menu.cpp Zobrazit soubor

@@ -26,8 +26,8 @@
26 26
 #include "tdeaboutdata.h"
27 27
 #include "tdeapplication.h"
28 28
 #include "tdecmdlineargs.h"
29
-#include "kglobal.h"
30
-#include "klocale.h"
29
+#include "tdeglobal.h"
30
+#include "tdelocale.h"
31 31
 #include "kservice.h"
32 32
 #include "kservicegroup.h"
33 33
 #include "kstandarddirs.h"

+ 3
- 3
kded/tdebuildsycoca.cpp Zobrazit soubor

@@ -42,12 +42,12 @@
42 42
 #include <assert.h>
43 43
 #include <tdeapplication.h>
44 44
 #include <dcopclient.h>
45
-#include <kglobal.h>
45
+#include <tdeglobal.h>
46 46
 #include <kdebug.h>
47 47
 #include <kdirwatch.h>
48 48
 #include <kstandarddirs.h>
49 49
 #include <ksavefile.h>
50
-#include <klocale.h>
50
+#include <tdelocale.h>
51 51
 #include <tdeaboutdata.h>
52 52
 #include <tdecmdlineargs.h>
53 53
 #include <kcrash.h>
@@ -55,7 +55,7 @@
55 55
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
56 56
                         // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
57 57
 # include <tqlabel.h>
58
-# include <kmessagebox.h>
58
+# include <tdemessagebox.h>
59 59
   bool silent;
60 60
   bool showprogress;
61 61
 #endif

+ 1
- 1
kded/vfolder_menu.cpp Zobrazit soubor

@@ -23,7 +23,7 @@
23 23
 #include <stdlib.h> // getenv
24 24
 
25 25
 #include <kdebug.h>
26
-#include <kglobal.h>
26
+#include <tdeglobal.h>
27 27
 #include <kstandarddirs.h>
28 28
 #include <kservice.h>
29 29
 #include <kde_file.h>

+ 1
- 1
kdewidgets/CMakeLists.txt Zobrazit soubor

@@ -61,6 +61,6 @@ add_custom_command( OUTPUT kdewidgets.cpp
61 61
 
62 62
 tde_add_kpart( ${target} AUTOMOC
63 63
   SOURCES ${${target}_SRCS}
64
-  LINK kabc-shared
64
+  LINK tdeabc-shared
65 65
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
66 66
 )

+ 1
- 1
kdewidgets/kde.widgets Zobrazit soubor

@@ -272,7 +272,7 @@ Group=Display (KDE)
272 272
 ConstructorArgs=(parent, 210, 16)
273 273
 
274 274
 [KABC::LdapConfigWidget]
275
-IncludeFile=kabc/ldapconfigwidget.h
275
+IncludeFile=tdeabc/ldapconfigwidget.h
276 276
 ToolTip=A widget which allows the user to set up LDAP connection parameters
277 277
 Group=Input (KDE)
278 278
 ConstructorArgs=(KABC::LdapConfigWidget::W_ALL, parent, name)

+ 1
- 1
kdewidgets/tests/test.widgets Zobrazit soubor

@@ -261,7 +261,7 @@ Group=Display (KDE)
261 261
 ConstructorArgs=(parent, 210, 16)
262 262
 
263 263
 [KABC::AddressLineEdit]
264
-IncludeFile=kabc/addresslineedit.h
264
+IncludeFile=tdeabc/addresslineedit.h
265 265
 ToolTip=A lineedit with LDAP and kabc completion.
266 266
 Group=Input (KDE)
267 267
 ConstructorArgs=(parent, true, name)

+ 1
- 1
kdoctools/meinproc.cpp Zobrazit soubor

@@ -19,7 +19,7 @@
19 19
 #include <tqfile.h>
20 20
 #include <tqdir.h>
21 21
 #include <tdecmdlineargs.h>
22
-#include <klocale.h>
22
+#include <tdelocale.h>
23 23
 #include <tdeaboutdata.h>
24 24
 #include <stdlib.h>
25 25
 #include <kdebug.h>

+ 2
- 2
kdoctools/tdeio_help.cpp Zobrazit soubor

@@ -25,8 +25,8 @@
25 25
 
26 26
 #include <kdebug.h>
27 27
 #include <kurl.h>
28
-#include <kglobal.h>
29
-#include <klocale.h>
28
+#include <tdeglobal.h>
29
+#include <tdelocale.h>
30 30
 #include <kstandarddirs.h>
31 31
 #include <kinstance.h>
32 32
 

+ 1
- 1
kdoctools/xslt.cpp Zobrazit soubor

@@ -12,7 +12,7 @@
12 12
 #include <xslt.h>
13 13
 #include <kinstance.h>
14 14
 #include "tdeio_help.h"
15
-#include <klocale.h>
15
+#include <tdelocale.h>
16 16
 #include <assert.h>
17 17
 #include <kfilterbase.h>
18 18
 #include <kfilterdev.h>

+ 1
- 1
kimgio/dds.cpp Zobrazit soubor

@@ -24,7 +24,7 @@
24 24
 #include <tqimage.h>
25 25
 #include <tqdatastream.h>
26 26
 
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 #include <kdebug.h>
29 29
 
30 30
 #include <math.h> // sqrtf

+ 1
- 1
kimgio/eps.cpp Zobrazit soubor

@@ -6,7 +6,7 @@
6 6
 #include <tqpainter.h>
7 7
 #include <tqprinter.h>
8 8
 #include <tdeapplication.h>
9
-#include <ktempfile.h>
9
+#include <tdetempfile.h>
10 10
 #include <kdebug.h>
11 11
 #include "eps.h"
12 12
 

+ 1
- 1
kimgio/exr.cpp Zobrazit soubor

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <kurl.h>
37 37
 #include <kprocess.h>
38
-#include <klocale.h>
38
+#include <tdelocale.h>
39 39
 #include <kgenericfactory.h>
40 40
 #include <kdebug.h>
41 41
 

+ 1
- 1
kimgio/gimp.h Zobrazit soubor

@@ -21,7 +21,7 @@
21 21
  *
22 22
  */
23 23
 
24
-#include <kglobal.h>
24
+#include <tdeglobal.h>
25 25
 
26 26
 /*
27 27
  * These are the constants and functions I extracted from The GIMP source

+ 1
- 1
kimgio/hdr.cpp Zobrazit soubor

@@ -14,7 +14,7 @@
14 14
 #include <tqdatastream.h>
15 15
 
16 16
 #include <kdebug.h>
17
-#include <kglobal.h>
17
+#include <tdeglobal.h>
18 18
 
19 19
 typedef TQ_UINT8 uchar;
20 20
 

+ 1
- 1
kimgio/jp2.cpp Zobrazit soubor

@@ -12,7 +12,7 @@
12 12
 #ifdef HAVE_STDINT_H
13 13
 #include <stdint.h>
14 14
 #endif
15
-#include <ktempfile.h>
15
+#include <tdetempfile.h>
16 16
 #include <tqcolor.h>
17 17
 #include <tqcstring.h>
18 18
 #include <tqfile.h>

+ 1
- 1
kinit/autostart.cpp Zobrazit soubor

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <tdeconfig.h>
26 26
 #include <kdesktopfile.h>
27
-#include <kglobal.h>
27
+#include <tdeglobal.h>
28 28
 #include <kstandarddirs.h>
29 29
 
30 30
 #include <stdlib.h>

+ 3
- 3
kinit/kinit.cpp Zobrazit soubor

@@ -54,11 +54,11 @@
54 54
 #include <tqfont.h>
55 55
 #include <kinstance.h>
56 56
 #include <kstandarddirs.h>
57
-#include <kglobal.h>
57
+#include <tdeglobal.h>
58 58
 #include <tdeconfig.h>
59 59
 #include <klibloader.h>
60 60
 #include <tdeapplication.h>
61
-#include <klocale.h>
61
+#include <tdelocale.h>
62 62
 
63 63
 #ifdef HAVE_SYS_PRCTL_H
64 64
 #include <sys/prctl.h>
@@ -68,7 +68,7 @@
68 68
 #endif
69 69
 
70 70
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
71
-#include <kstartupinfo.h> // schroder
71
+#include <tdestartupinfo.h> // schroder
72 72
 #endif
73 73
 
74 74
 #include <tdeversion.h>

+ 4
- 4
kinit/tdelauncher.cpp Zobrazit soubor

@@ -32,16 +32,16 @@
32 32
 #include <tdeconfig.h>
33 33
 #include <kdebug.h>
34 34
 #include <klibloader.h>
35
-#include <klocale.h>
36
-#include <kprotocolmanager.h>
35
+#include <tdelocale.h>
36
+#include <tdeprotocolmanager.h>
37 37
 #include <kprotocolinfo.h>
38 38
 #include <krun.h>
39 39
 #include <kstandarddirs.h>
40
-#include <ktempfile.h>
40
+#include <tdetempfile.h>
41 41
 #include <kurl.h>
42 42
 
43 43
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
44
-#include <kstartupinfo.h> // schroder
44
+#include <tdestartupinfo.h> // schroder
45 45
 #endif
46 46
 
47 47
 

+ 1
- 1
kinit/tdelauncher_main.cpp Zobrazit soubor

@@ -31,7 +31,7 @@
31 31
 #include <stdlib.h>
32 32
 #include <signal.h>
33 33
 #include <tqcstring.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 
36 36
 #include "tdelauncher_cmds.h"
37 37
 

+ 2
- 2
knewstuff/downloaddialog.cpp Zobrazit soubor

@@ -21,12 +21,12 @@
21 21
 #include "downloaddialog.h"
22 22
 #include "downloaddialog.moc"
23 23
 
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <tdelistview.h>
26 26
 #include <kdebug.h>
27 27
 #include <tdeio/job.h>
28 28
 #include <tdeio/netaccess.h>
29
-#include <kmessagebox.h>
29
+#include <tdemessagebox.h>
30 30
 #include <kurl.h>
31 31
 #include <tdeconfig.h>
32 32
 #include <tdeapplication.h>

+ 2
- 2
knewstuff/engine.cpp Zobrazit soubor

@@ -25,8 +25,8 @@
25 25
 #include <tdeapplication.h>
26 26
 #include <kdebug.h>
27 27
 #include <tdeio/job.h>
28
-#include <klocale.h>
29
-#include <kmessagebox.h>
28
+#include <tdelocale.h>
29
+#include <tdemessagebox.h>
30 30
 #include <kstandarddirs.h>
31 31
 
32 32
 #include "knewstuff.h"

+ 2
- 2
knewstuff/entry.cpp Zobrazit soubor

@@ -23,8 +23,8 @@
23 23
 #include <tqptrdict.h>
24 24
 #include <tqwindowdefs.h>
25 25
 
26
-#include <kglobal.h>
27
-#include <klocale.h>
26
+#include <tdeglobal.h>
27
+#include <tdelocale.h>
28 28
 
29 29
 using namespace KNS;
30 30
 

+ 1
- 1
knewstuff/ghns.cpp Zobrazit soubor

@@ -28,7 +28,7 @@
28 28
 #include <tdeaboutdata.h>
29 29
 #include <tdeapplication.h>
30 30
 #include <kdebug.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <tdecmdlineargs.h>
33 33
 #include <kprocess.h>
34 34
 #include <kdialog.h>

+ 1
- 1
knewstuff/knewstuff.cpp Zobrazit soubor

@@ -21,7 +21,7 @@
21 21
 #include <tdeaction.h>
22 22
 #include <tdeapplication.h>
23 23
 #include <kdebug.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 #include <kstandarddirs.h>
26 26
 
27 27
 #include "engine.h"

+ 1
- 1
knewstuff/knewstuffbutton.cpp Zobrazit soubor

@@ -18,7 +18,7 @@
18 18
 */
19 19
 
20 20
 #include <kiconloader.h>
21
-#include <klocale.h>
21
+#include <tdelocale.h>
22 22
 
23 23
 #include "downloaddialog.h"
24 24
 #include "knewstuffbutton.h"

+ 2
- 2
knewstuff/knewstuffgeneric.cpp Zobrazit soubor

@@ -24,11 +24,11 @@
24 24
 #include <tqdir.h>
25 25
 
26 26
 #include <kdebug.h>
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kprocess.h>
29 29
 #include <tdeconfig.h>
30 30
 #include <kstandarddirs.h>
31
-#include <kmessagebox.h>
31
+#include <tdemessagebox.h>
32 32
 #include <ktar.h>
33 33
 
34 34
 #include "entry.h"

+ 3
- 3
knewstuff/knewstuffsecure.cpp Zobrazit soubor

@@ -18,10 +18,10 @@
18 18
 //kde includes
19 19
 #include <tdeconfig.h>
20 20
 #include <kdebug.h>
21
-#include <kglobal.h>
21
+#include <tdeglobal.h>
22 22
 #include <tdeio/netaccess.h>
23
-#include <klocale.h>
24
-#include <kmessagebox.h>
23
+#include <tdelocale.h>
24
+#include <tdemessagebox.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <ktar.h>
27 27
 #include <ktempdir.h>

+ 3
- 3
knewstuff/provider.cpp Zobrazit soubor

@@ -21,9 +21,9 @@
21 21
 #include <tdeconfig.h>
22 22
 #include <kdebug.h>
23 23
 #include <tdeio/job.h>
24
-#include <kglobal.h>
25
-#include <kmessagebox.h>
26
-#include <klocale.h>
24
+#include <tdeglobal.h>
25
+#include <tdemessagebox.h>
26
+#include <tdelocale.h>
27 27
 
28 28
 #include <tqptrdict.h>
29 29
 #include <tqwindowdefs.h>

+ 2
- 2
knewstuff/providerdialog.cpp Zobrazit soubor

@@ -23,8 +23,8 @@
23 23
 #include <tqlabel.h>
24 24
 
25 25
 #include <tdelistview.h>
26
-#include <klocale.h>
27
-#include <kmessagebox.h>
26
+#include <tdelocale.h>
27
+#include <tdemessagebox.h>
28 28
 
29 29
 #include "engine.h"
30 30
 #include "provider.h"

+ 2
- 2
knewstuff/security.cpp Zobrazit soubor

@@ -22,9 +22,9 @@
22 22
  //kde includes
23 23
 #include <kdebug.h>
24 24
 #include <kinputdialog.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <kmdcodec.h>
27
-#include <kmessagebox.h>
27
+#include <tdemessagebox.h>
28 28
 #include <kpassdlg.h>
29 29
 #include <kprocio.h>
30 30
 

+ 1
- 1
knewstuff/tdehotnewstuff.cpp Zobrazit soubor

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

+ 1
- 1
knewstuff/testnewstuff.cpp Zobrazit soubor

@@ -27,7 +27,7 @@
27 27
 #include <tdeaboutdata.h>
28 28
 #include <tdeapplication.h>
29 29
 #include <kdebug.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <tdecmdlineargs.h>
32 32
 #include <kprocess.h>
33 33
 #include <kdialog.h>

+ 2
- 2
knewstuff/uploaddialog.cpp Zobrazit soubor

@@ -27,10 +27,10 @@
27 27
 #include <ktextedit.h>
28 28
 
29 29
 #include <tdelistview.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kdebug.h>
32 32
 #include <kurlrequester.h>
33
-#include <kmessagebox.h>
33
+#include <tdemessagebox.h>
34 34
 #include <tdeconfig.h>
35 35
 #include <tdeapplication.h>
36 36
 #include <kuser.h>

+ 2
- 2
kstyles/highcontrast/config/highcontrastconfig.cpp Zobrazit soubor

@@ -28,8 +28,8 @@ DEALINGS IN THE SOFTWARE.
28 28
 #include <tqlayout.h>
29 29
 #include <tqsettings.h>
30 30
 #include <kdialog.h>
31
-#include <kglobal.h>
32
-#include <klocale.h>
31
+#include <tdeglobal.h>
32
+#include <tdelocale.h>
33 33
 
34 34
 #include "highcontrastconfig.h"
35 35
 

+ 1
- 1
kstyles/klegacy/klegacystyle.cpp Zobrazit soubor

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include "klegacystyle.h"
26 26
 #include "klegacystyle.moc"
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 #include <kiconloader.h>
29 29
 
30 30
 #define INCLUDE_MENUITEM_DEF

+ 1
- 1
kstyles/klegacy/plugin.cpp Zobrazit soubor

@@ -1,5 +1,5 @@
1 1
 #include "klegacystyle.h"
2
-#include <klocale.h>
2
+#include <tdelocale.h>
3 3
 
4 4
 extern "C" {
5 5
     TDEStyle* allocate();

+ 1
- 1
kstyles/kthemestyle/kthemestyle.cpp Zobrazit soubor

@@ -53,7 +53,7 @@ Port version 0.9.7
53 53
 #include <tqpalette.h>
54 54
 #include <tqtabbar.h>
55 55
 #include <tqtoolbutton.h>
56
-#include <kglobalsettings.h>
56
+#include <tdeglobalsettings.h>
57 57
 #include <kdrawutil.h>
58 58
 #include <tqdrawutil.h>
59 59
 #include <tqprogressbar.h>

+ 0
- 0
kstyles/plastik/config/plastitdeconf.cpp Zobrazit soubor


Některé soubory nejsou zobrazny, neboť je v této revizi změněno mnoho souborů

Načítá se…
Zrušit
Uložit