Browse Source

Rename many classes and header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
d1e0cc99a2
100 changed files with 206 additions and 206 deletions
  1. 3
    3
      KDE2PORTING.html
  2. 5
    5
      KDE3PORTING.html
  3. 1
    1
      arts/kde/kvideowidget.cpp
  4. 1
    1
      dcop/dcopidl2cpp/dcopidl_test.h
  5. 1
    1
      dnssd/README
  6. 1
    1
      interfaces/tdescript/scriptloader.cpp
  7. 2
    2
      interfaces/tdescript/scriptloader.h
  8. 4
    4
      interfaces/tdetexteditor/CMakeLists.txt
  9. 4
    4
      interfaces/tdetexteditor/Makefile.am
  10. 2
    2
      interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp
  11. 2
    2
      interfaces/tdetexteditor/bloctdeselectiondcopinterface.h
  12. 2
    2
      interfaces/tdetexteditor/bloctdeselectioninterface.cpp
  13. 3
    3
      interfaces/tdetexteditor/bloctdeselectioninterface.h
  14. 1
    1
      interfaces/tdetexteditor/tdetexteditor.cpp
  15. 1
    1
      interfaces/terminal/test/main.cc
  16. 1
    1
      kab/kabapi.cc
  17. 1
    1
      kabc/addresseedialog.h
  18. 1
    1
      kabc/addresslineedit.cpp
  19. 1
    1
      kabc/ldapconfigwidget.cpp
  20. 1
    1
      kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
  21. 1
    1
      kabc/resourceselectdialog.cpp
  22. 1
    1
      kate/data/idconsole.xml
  23. 2
    2
      kate/interfaces/document.h
  24. 1
    1
      kate/part/kateautoindent.cpp
  25. 2
    2
      kate/part/katebookmarks.cpp
  26. 4
    4
      kate/part/katedialogs.cpp
  27. 1
    1
      kate/part/katedialogs.h
  28. 2
    2
      kate/part/katedocument.cpp
  29. 1
    1
      kate/part/katedocumenthelpers.cpp
  30. 1
    1
      kate/part/katefiletype.cpp
  31. 1
    1
      kate/part/katehighlight.cpp
  32. 1
    1
      kate/part/katekeyinterceptorfunctor.h
  33. 1
    1
      kate/part/kateprinter.cpp
  34. 2
    2
      kate/part/kateschema.cpp
  35. 1
    1
      kate/part/kateschema.h
  36. 1
    1
      kate/part/katesearch.cpp
  37. 1
    1
      kate/part/katespell.cpp
  38. 2
    2
      kate/part/kateview.cpp
  39. 1
    1
      kate/part/kateview.h
  40. 1
    1
      kate/part/kateviewhelpers.cpp
  41. 1
    1
      kate/part/kateviewhelpers.h
  42. 2
    2
      kate/part/test_regression.cpp
  43. 2
    2
      kate/plugins/autobookmarker/autobookmarker.cpp
  44. 1
    1
      kate/plugins/insertfile/insertfileplugin.cpp
  45. 1
    1
      kate/plugins/isearch/ISearchPlugin.cpp
  46. 2
    2
      kate/plugins/kdatatool/kate_kdatatool.cpp
  47. 1
    1
      kate/plugins/wordcompletion/docwordcompletion.cpp
  48. 1
    1
      kate/tests/highlight.xsl
  49. 1
    1
      kded/kded.cpp
  50. 7
    7
      kded/tdebuildsycoca.cpp
  51. 6
    6
      kdewidgets/kde.widgets
  52. 4
    4
      kdewidgets/pics/CMakeLists.txt
  53. 4
    4
      kdewidgets/pics/Makefile.am
  54. 5
    5
      kdewidgets/tests/test.widgets
  55. 1
    1
      knewstuff/downloaddialog.cpp
  56. 1
    1
      knewstuff/knewstuff.cpp
  57. 1
    1
      knewstuff/providerdialog.cpp
  58. 1
    1
      knewstuff/uploaddialog.cpp
  59. 1
    1
      mimetypes/application/x-linguist.desktop
  60. 1
    1
      mimetypes/application/x-xliff.desktop
  61. 1
    1
      tdecert/tdecertpart.cc
  62. 1
    1
      tdecert/tdecertpart.h
  63. 7
    7
      tdecore/CMakeLists.txt
  64. 6
    6
      tdecore/MAINTAINERS
  65. 9
    9
      tdecore/Makefile.am
  66. 2
    2
      tdecore/kapplication.cpp
  67. 2
    2
      tdecore/kcheckaccelerators.cpp
  68. 1
    1
      tdecore/kcompletion.h
  69. 2
    2
      tdecore/kglobalaccel.cpp
  70. 1
    1
      tdecore/kglobalaccel.h
  71. 2
    2
      tdecore/kglobalaccel_emb.h
  72. 2
    2
      tdecore/kglobalaccel_mac.h
  73. 2
    2
      tdecore/kglobalaccel_win.h
  74. 2
    2
      tdecore/kglobalaccel_x11.h
  75. 2
    2
      tdecore/kglobalsettings.cpp
  76. 1
    1
      tdecore/kkeynative.h
  77. 2
    2
      tdecore/kkeyserver_x11.cpp
  78. 1
    1
      tdecore/kkeyserver_x11.h
  79. 0
    0
      tdecore/network/ipv6blacklist
  80. 7
    7
      tdecore/tdeaccel.cpp
  81. 2
    2
      tdecore/tdeaccel.h
  82. 3
    3
      tdecore/tdeaccelaction.cpp
  83. 1
    1
      tdecore/tdeaccelaction.h
  84. 2
    2
      tdecore/tdeaccelbase.cpp
  85. 1
    1
      tdecore/tdeaccelbase.h
  86. 3
    3
      tdecore/tdeaccelmanager.cpp
  87. 3
    3
      tdecore/tdeconfig_compiler/checkkcfg.pl
  88. 1
    1
      tdecore/tdeshortcut.cpp
  89. 4
    4
      tdecore/tdeshortcutlist.cpp
  90. 3
    3
      tdecore/tdeshortcutmenu.cpp
  91. 1
    1
      tdecore/tdeshortcutmenu.h
  92. 5
    5
      tdecore/tdestdaccel.cpp
  93. 2
    2
      tdecore/tdestdaccel.h
  94. 3
    3
      tdecore/tests/Makefile.am
  95. 2
    2
      tdecore/tests/tdestdacceltest.cpp
  96. 1
    1
      tdehtml/domtreeview.h
  97. 4
    4
      tdehtml/ecma/kjs_debugwin.cpp
  98. 1
    1
      tdehtml/ecma/kjs_debugwin.h
  99. 1
    1
      tdehtml/misc/knsplugininstaller.cpp
  100. 0
    0
      tdehtml/rendering/render_form.h

+ 3
- 3
KDE2PORTING.html View File

@@ -694,15 +694,15 @@ can combine TreeView's and normal Tablists without problems.<P>
694 694
 <H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>
695 695
 
696 696
 If you need to do anything with TDEToolBarButton you now need to include 
697
-&lt;ktoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
698
-requires you to include &lt;ktoolbarradiogroup.h&gt;<P>
697
+&lt;tdetoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
698
+requires you to include &lt;tdetoolbarradiogroup.h&gt;<P>
699 699
 
700 700
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
701 701
 
702 702
 <H3><A NAME="TDEAccel">TDEAccel</A></H3>
703 703
 
704 704
 The functions keyToString() and stringToKey() which were previously
705
-declared globally in kaccel.h are now static methods in TDEAccel.<P>
705
+declared globally in tdeaccel.h are now static methods in TDEAccel.<P>
706 706
 
707 707
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
708 708
 

+ 5
- 5
KDE3PORTING.html View File

@@ -154,9 +154,9 @@ not be available.
154 154
 <ul>
155 155
 	<li> TDEAccel::insertItem() and TDEAccel::connectItem().
156 156
 <pre>
157
-	- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
158
-	- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
159
-	+ kaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
157
+	- tdeaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
158
+	- tdeaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
159
+	+ tdeaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
160 160
 		Key_Up, this, TQT_SLOT(scrollUp()) );
161 161
 </pre>
162 162
 	Note that a What's This parameter is now a part of the insert function.
@@ -168,8 +168,8 @@ not be available.
168 168
 	can replace it.  Note, however, that this would be handled automatically
169 169
 	by using TDEAction instead.
170 170
 <pre>
171
-	- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
172
-	+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
171
+	- tdeaccel-&gt;changeMenuAccel( menu, id, "file_open" );
172
+	+ menu-&gt;setAccel( tdeaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
173 173
 </pre>
174 174
 	</li>
175 175
 </ul>

+ 1
- 1
arts/kde/kvideowidget.cpp View File

@@ -26,7 +26,7 @@
26 26
 #define XEvent void
27 27
 #endif
28 28
 
29
-#include <kaction.h>
29
+#include <tdeaction.h>
30 30
 #include <klocale.h>
31 31
 #include "kvideowidget.h"
32 32
 

+ 1
- 1
dcop/dcopidl2cpp/dcopidl_test.h View File

@@ -1,4 +1,4 @@
1
-#include <klistview.h>
1
+#include <tdelistview.h>
2 2
 #include "main.h"
3 3
 
4 4
 #ifndef TEST_H

+ 1
- 1
dnssd/README View File

@@ -1,4 +1,4 @@
1
-Checklist to ensure that zeroconf will work:
1
+Chectdelist to ensure that zeroconf will work:
2 2
 
3 3
 1) Install Avahi, at least version 0.3
4 4
 2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs

+ 1
- 1
interfaces/tdescript/scriptloader.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tdeconfig.h>
27 27
 #include <kdesktopfile.h>
28 28
 #include <kstandarsdirs.h>
29
-#include <kstdaccel.h>
29
+#include <tdestdaccel.h>
30 30
 #include <kdebug.h>
31 31
 
32 32
 #include <tqdir.h>

+ 2
- 2
interfaces/tdescript/scriptloader.h View File

@@ -19,8 +19,8 @@
19 19
 #ifndef _script_loader_h
20 20
 #define _script_loader_h
21 21
 #include <tqptrlist.h>
22
-#include <kmainwindow.h>
23
-#include <kaction.h>
22
+#include <tdemainwindow.h>
23
+#include <tdeaction.h>
24 24
 #include <tdescript/scriptinterface.h>
25 25
 
26 26
 /**

+ 4
- 4
interfaces/tdetexteditor/CMakeLists.txt View File

@@ -37,7 +37,7 @@ install( FILES
37 37
     document.h view.h editor.h plugin.h editinterface.h
38 38
     undointerface.h selectioninterface.h cursorinterface.h
39 39
     clipboardinterface.h popupmenuinterface.h viewcursorinterface.h
40
-    searchinterface.h highlightinginterface.h blockselectioninterface.h
40
+    searchinterface.h highlightinginterface.h bloctdeselectioninterface.h
41 41
     codecompletioninterface.h configinterface.h markinterface.h
42 42
     printinterface.h wordwrapinterface.h dynwordwrapinterface.h
43 43
     markinterfaceextension.h configinterfaceextension.h
@@ -69,7 +69,7 @@ set( target tdetexteditor )
69 69
 set( ${target}_SRCS
70 70
   tdetexteditor.cpp
71 71
   editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp
72
-  codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
72
+  codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp
73 73
   configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp
74 74
   printinterface.cpp highlightinginterface.cpp markinterface.cpp
75 75
   popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp
@@ -78,8 +78,8 @@ set( ${target}_SRCS
78 78
   searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp
79 79
   configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp
80 80
   viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp
81
-  blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
82
-  blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
81
+  bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
82
+  bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
83 83
   encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel
84 84
   undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp
85 85
   viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp

+ 4
- 4
interfaces/tdetexteditor/Makefile.am View File

@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdetexteditor.la
4 4
 
5 5
 libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
6 6
     editinterface.cpp clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
7
-    codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
7
+    codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
8 8
     configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp \
9 9
     printinterface.cpp highlightinginterface.cpp markinterface.cpp \
10 10
     popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -13,8 +13,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
13 13
     searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp \
14 14
     configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
15 15
     viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp \
16
-    blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
17
-    blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
16
+    bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
17
+    bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
18 18
     encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel \
19 19
     undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp \
20 20
     viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp \
@@ -29,7 +29,7 @@ tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface
29 29
                              selectioninterface.h cursorinterface.h \
30 30
                              clipboardinterface.h popupmenuinterface.h \
31 31
                              viewcursorinterface.h searchinterface.h highlightinginterface.h \
32
-                             blockselectioninterface.h codecompletioninterface.h \
32
+                             bloctdeselectioninterface.h codecompletioninterface.h \
33 33
                              configinterface.h markinterface.h printinterface.h wordwrapinterface.h \
34 34
                              dynwordwrapinterface.h markinterfaceextension.h configinterfaceextension.h \
35 35
                              encodinginterface.h viewstatusmsginterface.h  sessionconfiginterface.h editorchooser.h \

+ 2
- 2
interfaces/tdetexteditor/bloctdeselectiondcopinterface.cpp View File

@@ -1,5 +1,5 @@
1
-#include "blockselectiondcopinterface.h"
2
-#include "blockselectioninterface.h"
1
+#include "bloctdeselectiondcopinterface.h"
2
+#include "bloctdeselectioninterface.h"
3 3
 
4 4
 #include <dcopclient.h>
5 5
 using namespace KTextEditor;

+ 2
- 2
interfaces/tdetexteditor/bloctdeselectiondcopinterface.h View File

@@ -38,13 +38,13 @@ namespace KTextEditor
38 38
     /**
39 39
     * Returns the status of the selection mode - true indicates block selection mode is on.
40 40
     * If this is true, selections applied via the SelectionInterface are handled as
41
-    * blockselections and the paste functions of the ClipboardInterface works on
41
+    * bloctdeselections and the paste functions of the ClipboardInterface works on
42 42
     * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
43 43
     */
44 44
 		bool blockSelectionMode ();
45 45
 
46 46
 		/**
47
-		* set blockselection mode to state "on"
47
+		* set bloctdeselection mode to state "on"
48 48
 		*/
49 49
 		bool setBlockSelectionMode (bool on) ;
50 50
 

+ 2
- 2
interfaces/tdetexteditor/bloctdeselectioninterface.cpp View File

@@ -18,8 +18,8 @@
18 18
 
19 19
 // $Id$
20 20
 
21
-#include "blockselectioninterface.h"
22
-#include "blockselectiondcopinterface.h"
21
+#include "bloctdeselectioninterface.h"
22
+#include "bloctdeselectiondcopinterface.h"
23 23
 #include "document.h"
24 24
 
25 25
 namespace KTextEditor

+ 3
- 3
interfaces/tdetexteditor/bloctdeselectioninterface.h View File

@@ -16,8 +16,8 @@
16 16
    Boston, MA 02110-1301, USA.
17 17
 */
18 18
 
19
-#ifndef __tdetexteditor_blockselectioninterface_h__
20
-#define __tdetexteditor_blockselectioninterface_h__
19
+#ifndef __tdetexteditor_bloctdeselectioninterface_h__
20
+#define __tdetexteditor_bloctdeselectioninterface_h__
21 21
 
22 22
 #include <tdelibs_export.h>
23 23
 
@@ -51,7 +51,7 @@ class KTEXTEDITOR_EXPORT BlockSelectionInterface
51 51
     /**
52 52
     * Returns the status of the selection mode - true indicates block selection mode is on.
53 53
     * If this is true, selections applied via the SelectionInterface are handled as
54
-    * blockselections and the paste functions of the ClipboardInterface works on
54
+    * bloctdeselections and the paste functions of the ClipboardInterface works on
55 55
     * rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
56 56
     */
57 57
     virtual bool blockSelectionMode () = 0;

+ 1
- 1
interfaces/tdetexteditor/tdetexteditor.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include "plugin.h"
25 25
 #include "editor.h"
26 26
 
27
-#include <kaction.h>
27
+#include <tdeaction.h>
28 28
 #include <tdeparts/factory.h>
29 29
 #include <tdeparts/componentfactory.h>
30 30
 

+ 1
- 1
interfaces/terminal/test/main.cc View File

@@ -2,7 +2,7 @@
2 2
 #include <tdeparts/part.h>
3 3
 #include <ktrader.h>
4 4
 #include <klibloader.h>
5
-#include <kmainwindow.h>
5
+#include <tdemainwindow.h>
6 6
 #include <kaboutdata.h>
7 7
 #include <kcmdlineargs.h>
8 8
 #include <kapplication.h>

+ 1
- 1
kab/kabapi.cc View File

@@ -17,7 +17,7 @@
17 17
 */
18 18
 
19 19
 #include "kabapi.h"
20
-#include <klistbox.h>
20
+#include <tdelistbox.h>
21 21
 #include <kmessagebox.h>
22 22
 #include <klocale.h>
23 23
 #include <kdebug.h>

+ 1
- 1
kabc/addresseedialog.h View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <kdialogbase.h>
27 27
 #include <klineedit.h>
28
-#include <klistview.h>
28
+#include <tdelistview.h>
29 29
 
30 30
 #include "addressbook.h"
31 31
 

+ 1
- 1
kabc/addresslineedit.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <kcursor.h>
38 38
 #include <kstandarddirs.h>
39 39
 #include <kstaticdeleter.h>
40
-#include <kstdaccel.h>
40
+#include <tdestdaccel.h>
41 41
 #include <kurldrag.h>
42 42
 
43 43
 #include <kabc/stdaddressbook.h>

+ 1
- 1
kabc/ldapconfigwidget.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <tqradiobutton.h>
31 31
 
32 32
 #include <kmessagebox.h>
33
-#include <kaccelmanager.h>
33
+#include <tdeaccelmanager.h>
34 34
 #include <kdialogbase.h>
35 35
 #include <klocale.h>
36 36
 #include <klineedit.h>

+ 1
- 1
kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tqhbuttongroup.h>
30 30
 #include <tqradiobutton.h>
31 31
 
32
-#include <kaccelmanager.h>
32
+#include <tdeaccelmanager.h>
33 33
 #include <kcombobox.h>
34 34
 #include <kdebug.h>
35 35
 #include <kdialogbase.h>

+ 1
- 1
kabc/resourceselectdialog.cpp View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <klocale.h>
22 22
 #include <kbuttonbox.h>
23
-#include <klistbox.h>
23
+#include <tdelistbox.h>
24 24
 #include <kstdguiitem.h>
25 25
 
26 26
 #include <tqgroupbox.h>

+ 1
- 1
kate/data/idconsole.xml View File

@@ -197,7 +197,7 @@
197 197
 <item> host_speeds </item>
198 198
 <item> hostname </item>
199 199
 <item> hpkextract </item>
200
-<item> hpklist </item>
200
+<item> hptdelist </item>
201 201
 <item> hpkremove </item>
202 202
 <item> hpkval </item>
203 203
 <item> hud_centerid </item>

+ 2
- 2
kate/interfaces/document.h View File

@@ -27,7 +27,7 @@
27 27
 #include <tdetexteditor/documentinfo.h>
28 28
 #include <tdetexteditor/selectioninterface.h>
29 29
 #include <tdetexteditor/selectioninterfaceext.h>
30
-#include <tdetexteditor/blockselectioninterface.h>
30
+#include <tdetexteditor/bloctdeselectioninterface.h>
31 31
 #include <tdetexteditor/searchinterface.h>
32 32
 #include <tdetexteditor/highlightinginterface.h>
33 33
 #include <tdetexteditor/configinterface.h>
@@ -38,7 +38,7 @@
38 38
 #include <tdetexteditor/printinterface.h>
39 39
 #include <tdetexteditor/variableinterface.h>
40 40
 
41
-#include <kaction.h>
41
+#include <tdeaction.h>
42 42
 
43 43
 class KCompletion;
44 44
 

+ 1
- 1
kate/part/kateautoindent.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <klocale.h>
31 31
 #include <kdebug.h>
32
-#include <kpopupmenu.h>
32
+#include <tdepopupmenu.h>
33 33
 
34 34
 #include <cctype>
35 35
 

+ 2
- 2
kate/part/katebookmarks.cpp View File

@@ -24,8 +24,8 @@
24 24
 #include "kateview.h"
25 25
 
26 26
 #include <klocale.h>
27
-#include <kaction.h>
28
-#include <kpopupmenu.h>
27
+#include <tdeaction.h>
28
+#include <tdepopupmenu.h>
29 29
 #include <kstringhandler.h>
30 30
 #include <kxmlguiclient.h>
31 31
 #include <kxmlguifactory.h>

+ 4
- 4
kate/part/katedialogs.cpp View File

@@ -42,7 +42,7 @@
42 42
 #include <tdeio/jobclasses.h>
43 43
 #include <tdeio/netaccess.h>
44 44
 
45
-#include <kaccel.h>
45
+#include <tdeaccel.h>
46 46
 #include <kapplication.h>
47 47
 #include <kbuttonbox.h>
48 48
 #include <kcharsets.h>
@@ -52,20 +52,20 @@
52 52
 #include <kcombobox.h>
53 53
 #include <tdeconfig.h>
54 54
 #include <kdebug.h>
55
-#include <kfontdialog.h>
55
+#include <tdefontdialog.h>
56 56
 #include <kglobal.h>
57 57
 #include <kglobalsettings.h>
58 58
 #include <kiconloader.h>
59 59
 #include <kkeybutton.h>
60 60
 #include <kkeydialog.h>
61 61
 #include <klineedit.h>
62
-#include <klistview.h>
62
+#include <tdelistview.h>
63 63
 #include <klocale.h>
64 64
 #include <kmessagebox.h>
65 65
 #include <kmimetypechooser.h>
66 66
 #include <knuminput.h>
67 67
 #include <tdeparts/componentfactory.h>
68
-#include <kpopupmenu.h>
68
+#include <tdepopupmenu.h>
69 69
 #include <kprocess.h>
70 70
 #include <kprocio.h>
71 71
 #include <kregexpeditorinterface.h>

+ 1
- 1
kate/part/katedialogs.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include "../interfaces/document.h"
31 31
 
32
-#include <klistview.h>
32
+#include <tdelistview.h>
33 33
 #include <kdialogbase.h>
34 34
 #include <kmimetype.h>
35 35
 

+ 2
- 2
kate/part/katedocument.cpp View File

@@ -52,7 +52,7 @@
52 52
 #include <klocale.h>
53 53
 #include <kglobal.h>
54 54
 #include <kapplication.h>
55
-#include <kpopupmenu.h>
55
+#include <tdepopupmenu.h>
56 56
 #include <tdeconfig.h>
57 57
 #include <tdefiledialog.h>
58 58
 #include <kmessagebox.h>
@@ -3976,7 +3976,7 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c,
3976 3976
         {
3977 3977
           // If bol or the character before is not in a word, up this one:
3978 3978
           // 1. if both start and p is 0, upper char.
3979
-          // 2. if blockselect or first line, and p == 0 and start-1 is not in a word, upper
3979
+          // 2. if bloctdeselect or first line, and p == 0 and start-1 is not in a word, upper
3980 3980
           // 3. if p-1 is not in a word, upper.
3981 3981
           if ( ( ! start && ! p ) ||
3982 3982
                    ( ( ln == selstart.line() || v->blockSelectionMode() ) &&

+ 1
- 1
kate/part/katedocumenthelpers.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include "katedocument.h"
25 25
 #include "kateview.h"
26 26
 
27
-#include <kpopupmenu.h>
27
+#include <tdepopupmenu.h>
28 28
 #include <klocale.h>
29 29
 
30 30
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )

+ 1
- 1
kate/part/katefiletype.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <kiconloader.h>
34 34
 #include <knuminput.h>
35 35
 #include <klocale.h>
36
-#include <kpopupmenu.h>
36
+#include <tdepopupmenu.h>
37 37
 
38 38
 #include <tqregexp.h>
39 39
 #include <tqcheckbox.h>

+ 1
- 1
kate/part/katehighlight.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <kmimetype.h>
39 39
 #include <klocale.h>
40 40
 #include <kregexp.h>
41
-#include <kpopupmenu.h>
41
+#include <tdepopupmenu.h>
42 42
 #include <kglobalsettings.h>
43 43
 #include <kdebug.h>
44 44
 #include <kstandarddirs.h>

+ 1
- 1
kate/part/katekeyinterceptorfunctor.h View File

@@ -17,7 +17,7 @@
17 17
 */
18 18
 #ifndef _KATE_KEY_INTERCEPTOR_FUNCTOR_H
19 19
 #define _KATE_KEY_INTERCEPTOR_FUNCTOR_H
20
-#include <kshortcut.h>
20
+#include <tdeshortcut.h>
21 21
 class KateKeyInterceptorFunctor {
22 22
   public:
23 23
   virtual bool operator()(KKey key)=0;

+ 1
- 1
kate/part/kateprinter.cpp View File

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

+ 2
- 2
kate/part/kateschema.cpp View File

@@ -32,11 +32,11 @@
32 32
 #include <kcolorbutton.h>
33 33
 #include <kcombobox.h>
34 34
 #include <kinputdialog.h>
35
-#include <kfontdialog.h>
35
+#include <tdefontdialog.h>
36 36
 #include <kdebug.h>
37 37
 #include <kiconloader.h>
38 38
 #include <kmessagebox.h>
39
-#include <kpopupmenu.h>
39
+#include <tdepopupmenu.h>
40 40
 #include <kcolordialog.h>
41 41
 #include <kapplication.h>
42 42
 #include <kaboutdata.h>

+ 1
- 1
kate/part/kateschema.h View File

@@ -30,7 +30,7 @@
30 30
 #include <tqfont.h>
31 31
 
32 32
 #include <tdeconfig.h>
33
-#include <kaction.h>
33
+#include <tdeaction.h>
34 34
 
35 35
 class KateView;
36 36
 class KateStyleListItem;

+ 1
- 1
kate/part/katesearch.cpp View File

@@ -696,7 +696,7 @@ bool KateSearch::doSearch( const TQString& text )
696 696
     col = foundCol+1;
697 697
   }
698 698
   while (s.flags.selected && m_view->blockSelectionMode() && found);
699
-  // in the case we want to search in selection + blockselection we need to loop
699
+  // in the case we want to search in selection + bloctdeselection we need to loop
700 700
 
701 701
   if( !found ) return false;
702 702
 

+ 1
- 1
kate/part/katespell.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include "kateview.h"
28 28
 
29
-#include <kaction.h>
29
+#include <tdeaction.h>
30 30
 #include <kstdaction.h>
31 31
 #include <tdespell.h>
32 32
 #include <ksconfig.h>

+ 2
- 2
kate/part/kateview.cpp View File

@@ -61,10 +61,10 @@
61 61
 #include <kglobal.h>
62 62
 #include <kcharsets.h>
63 63
 #include <kmessagebox.h>
64
-#include <kaction.h>
64
+#include <tdeaction.h>
65 65
 #include <kstdaction.h>
66 66
 #include <kxmlguifactory.h>
67
-#include <kaccel.h>
67
+#include <tdeaccel.h>
68 68
 #include <klibloader.h>
69 69
 #include <kencodingfiledialog.h>
70 70
 #include <tdemultipledrag.h>

+ 1
- 1
kate/part/kateview.h View File

@@ -222,7 +222,7 @@ class KateView : public Kate::View,
222 222
      */
223 223
     inline const KateSuperCursor &selEnd () const { return selectEnd; }
224 224
 
225
-    // should cursor be wrapped ? take config + blockselection state in account
225
+    // should cursor be wrapped ? take config + bloctdeselection state in account
226 226
     bool wrapCursor ();
227 227
 
228 228
     // some internal functions to get selection state of a line/col

+ 1
- 1
kate/part/kateviewhelpers.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <knotifyclient.h>
39 39
 #include <kglobal.h>
40 40
 #include <kcharsets.h>
41
-#include <kpopupmenu.h>
41
+#include <tdepopupmenu.h>
42 42
 
43 43
 #include <tqcursor.h>
44 44
 #include <tqpainter.h>

+ 1
- 1
kate/part/kateviewhelpers.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef __KATE_VIEW_HELPERS_H__
22 22
 #define __KATE_VIEW_HELPERS_H__
23 23
 
24
-#include <kaction.h>
24
+#include <tdeaction.h>
25 25
 #include <klineedit.h>
26 26
 
27 27
 #include <tqwidget.h>

+ 2
- 2
kate/part/test_regression.cpp View File

@@ -39,11 +39,11 @@
39 39
 #include <unistd.h>
40 40
 #include <stdio.h>
41 41
 
42
-#include <kaction.h>
42
+#include <tdeaction.h>
43 43
 #include <kcmdlineargs.h>
44 44
 #include "katefactory.h"
45 45
 #include <tdeio/job.h>
46
-#include <kmainwindow.h>
46
+#include <tdemainwindow.h>
47 47
 #include <ksimpleconfig.h>
48 48
 #include <kglobalsettings.h>
49 49
 

+ 2
- 2
kate/plugins/autobookmarker/autobookmarker.cpp View File

@@ -28,12 +28,12 @@
28 28
 #include <tdetexteditor/documentinfo.h>
29 29
 #include <tdetexteditor/document.h>
30 30
 
31
-#include <kaction.h>
31
+#include <tdeaction.h>
32 32
 #include <kapplication.h>
33 33
 #include <tdeconfig.h>
34 34
 #include <kgenericfactory.h>
35 35
 #include <kiconloader.h>
36
-#include <klistview.h>
36
+#include <tdelistview.h>
37 37
 #include <klocale.h>
38 38
 #include <kmimetype.h>
39 39
 #include <kmimetypechooser.h>

+ 1
- 1
kate/plugins/insertfile/insertfileplugin.cpp View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <assert.h>
27 27
 #include <tdeio/job.h>
28
-#include <kaction.h>
28
+#include <tdeaction.h>
29 29
 #include <tdefiledialog.h>
30 30
 #include <kgenericfactory.h>
31 31
 #include <klocale.h>

+ 1
- 1
kate/plugins/isearch/ISearchPlugin.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <tqpopupmenu.h>
23 23
 #include <kgenericfactory.h>
24 24
 #include <klocale.h>
25
-#include <kaction.h>
25
+#include <tdeaction.h>
26 26
 #include <kcombobox.h>
27 27
 #include <tdeconfig.h>
28 28
 #include <kdebug.h>

+ 2
- 2
kate/plugins/kdatatool/kate_kdatatool.cpp View File

@@ -20,13 +20,13 @@
20 20
 #include "kate_kdatatool.h"
21 21
 #include "kate_kdatatool.moc"
22 22
 #include <kgenericfactory.h>
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <tdetexteditor/view.h>
25 25
 #include <kdebug.h>
26 26
 #include <kdatatool.h>
27 27
 #include <tdetexteditor/document.h>
28 28
 #include <tdetexteditor/selectioninterface.h>
29
-#include <kpopupmenu.h>
29
+#include <tdepopupmenu.h>
30 30
 #include <tdetexteditor/viewcursorinterface.h>
31 31
 #include <tdetexteditor/editinterface.h>
32 32
 #include <kmessagebox.h>

+ 1
- 1
kate/plugins/wordcompletion/docwordcompletion.cpp View File

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

+ 1
- 1
kate/tests/highlight.xsl View File

@@ -3,7 +3,7 @@
3 3
 <!--
4 4
 	This file is freely distributable, created by Wilbert Berendsen (wbsoft@xs4all.nl)
5 5
 
6
-	This is just a simple XSLT file that converts some HTML pages to a XBEL bookmarklist.
6
+	This is just a simple XSLT file that converts some HTML pages to a XBEL bookmartdelist.
7 7
 	It is included here to test the new XSLT highlighting by Peter Lammich.
8 8
 	
9 9
 	TODO: add better test file.

+ 1
- 1
kded/kded.cpp View File

@@ -65,7 +65,7 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
65 65
    if(checkStamps)
66 66
       args.append("--checkstamps");
67 67
    if(delayedCheck)
68
-      args.append("--nochectdefiles");
68
+      args.append("--nocheckfiles");
69 69
    else
70 70
       checkStamps = false; // useful only during kded startup
71 71
    if (callBackObj)

+ 7
- 7
kded/tdebuildsycoca.cpp View File

@@ -695,7 +695,7 @@ static KCmdLineOptions options[] = {
695 695
    { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 },
696 696
    { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 },
697 697
    { "checkstamps", I18N_NOOP("Check file timestamps"), 0 },
698
-   { "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
698
+   { "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
699 699
    { "global", I18N_NOOP("Create global database"), 0 },
700 700
    { "menutest", I18N_NOOP("Perform menu generation test run only"), 0 },
701 701
    { "track <menu-id>", I18N_NOOP("Track menu id for debug purposes"), 0 },
@@ -798,10 +798,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
798 798
    }
799 799
    fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName);
800 800
 
801
-   bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles");
801
+   bool checkfiles = bGlobalDatabase || args->isSet("checkfiles");
802 802
 
803
-   bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles;
804
-   if (incremental || !chectdefiles)
803
+   bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles;
804
+   if (incremental || !checkfiles)
805 805
    {
806 806
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
807 807
      TQString current_language = TDEGlobal::locale()->language();
@@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
814 814
          (KSycoca::self()->timeStamp() == 0))
815 815
      {
816 816
         incremental = false;
817
-        chectdefiles = true;
817
+        checkfiles = true;
818 818
         delete KSycoca::self();
819 819
      }
820 820
    }
821 821
 
822 822
    g_changeList = new TQStringList;
823 823
 
824
-   bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles;
824
+   bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
825 825
    TQ_UINT32 filestamp = 0;
826 826
    TQStringList oldresourcedirs;
827 827
    if( checkstamps && incremental )
@@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
861 861
 
862 862
    newTimestamp = (TQ_UINT32) time(0);
863 863
 
864
-   if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
864
+   if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
865 865
    {
866 866
       TQCString qSycocaPath = TQFile::encodeName(sycocaPath());
867 867
       cSycocaPath = qSycocaPath.data();

+ 6
- 6
kdewidgets/kde.widgets View File

@@ -61,20 +61,20 @@ WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
61 61
 Group=Input (KDE)
62 62
 
63 63
 [TDEFontChooser]
64
-IncludeFile=kfontdialog.h
65
-IconSet=kfontcombo.png
64
+IncludeFile=tdefontdialog.h
65
+IconSet=tdefontcombo.png
66 66
 ToolTip=Font Chooser (KDE)
67 67
 WhatsThis=A font type, size and style selection widget complete with preview
68 68
 Group=Input (KDE)
69 69
 
70 70
 [TDEFontRequester]
71
-IncludeFile=kfontrequester.h
71
+IncludeFile=tdefontrequester.h
72 72
 ToolTip=Font Requester (KDE)
73 73
 WhatsThis=A compact font selection and preview widget
74 74
 Group=Input (KDE)
75 75
 
76 76
 [KGradientSelector]
77
-IncludeFile=kselect.h
77
+IncludeFile=tdeselect.h
78 78
 WhatsThis=A widget that allows the user to select two colors to form a gradient
79 79
 Group=Graphics (KDE)
80 80
 
@@ -115,7 +115,7 @@ ConstructorArgs=(parent, 0, name)
115 115
 
116 116
 [TDEListViewSearchLineWidget]
117 117
 ToolTip=ListView Search Line Widget (KDE)
118
-IncludeFile=klistviewsearchline.h
118
+IncludeFile=tdelistviewsearchline.h
119 119
 Group=Input (KDE)
120 120
 ConstructorArgs=(0, parent, name)
121 121
 
@@ -244,7 +244,7 @@ Group=Display (KDE)
244 244
 ConstructorArgs=(parent)
245 245
 
246 246
 [TDEActionSelector]
247
-IncludeFile=kactionselector.h
247
+IncludeFile=tdeactionselector.h
248 248
 ToolTip=A widget for selecting and arranging actions/objects
249 249
 Group=Views (KDE)
250 250
 

+ 4
- 4
kdewidgets/pics/CMakeLists.txt View File

@@ -13,15 +13,15 @@
13 13
 
14 14
 install( FILES
15 15
     klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png
16
-    kfontrequester.png kurlrequester.png kcombobox.png kiconview.png
16
+    tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png
17 17
     kintspinbox.png kled.png ksqueezedtextlabel.png  kprogress.png
18 18
     kurllabel.png kruler.png tdecmodule.png kdoublespinbox.png
19
-    kdoublenuminput.png klistbox.png klistview.png kactivelabel.png
19
+    kdoublenuminput.png tdelistbox.png tdelistview.png kactivelabel.png
20 20
     kiconbutton.png kcolorcombo.png khsselector.png kcolorbutton.png
21 21
     kgradientselector.png kdualcolorbutton.png ktimewidget.png
22 22
     kpushbutton.png kcharselect.png kdatepicker.png
23
-    kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png
23
+    kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png
24 24
     kintnuminput.png krestrictedline.png ktextedit.png
25 25
     kurlcomborequester.png kkeybutton.png kpalettetable.png
26
-    kactionselector.png kdatetable.png kdatetimewidget.png
26
+    tdeactionselector.png kdatetable.png kdatetimewidget.png
27 27
   DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics )

+ 4
- 4
kdewidgets/pics/Makefile.am View File

@@ -1,15 +1,15 @@
1 1
 kdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
2
-             kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
2
+             tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
3 3
              kled.png ksqueezedtextlabel.png  kprogress.png kurllabel.png \
4 4
              kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \
5
-             klistbox.png klistview.png kactivelabel.png kiconbutton.png \
5
+             tdelistbox.png tdelistview.png kactivelabel.png kiconbutton.png \
6 6
              kcolorcombo.png khsselector.png kcolorbutton.png \
7 7
              kgradientselector.png kdualcolorbutton.png ktimewidget.png \
8 8
              kpushbutton.png kcharselect.png kdatepicker.png \
9
-             kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png \
9
+             kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png \
10 10
              kintnuminput.png krestrictedline.png ktextedit.png \
11 11
              kurlcomborequester.png kkeybutton.png kpalettetable.png \
12
-	     kactionselector.png kdatetable.png kdatetimewidget.png 
12
+	     tdeactionselector.png kdatetable.png kdatetimewidget.png 
13 13
 
14 14
 
15 15
 kdewidgetsdatadir = $(kde_datadir)/kdewidgets/pics

+ 5
- 5
kdewidgets/tests/test.widgets View File

@@ -61,20 +61,20 @@ WhatsThis=A QCombo Box showing the installed system fonts (with preview)
61 61
 Group=Input (KDE)
62 62
 
63 63
 [TDEFontChooser]
64
-IncludeFile=kfontdialog.h
65
-IconSet=kfontcombo.png
64
+IncludeFile=tdefontdialog.h
65
+IconSet=tdefontcombo.png
66 66
 ToolTip=Font Chooser (KDE)
67 67
 WhatsThis=A font type, size and style selection widget complete with preview
68 68
 Group=Input (KDE)
69 69
 
70 70
 [TDEFontRequester]
71
-IncludeFile=kfontrequester.h
71
+IncludeFile=tdefontrequester.h
72 72
 ToolTip=Font Requester (KDE)
73 73
 WhatsThis=A compact font selection and preview widget
74 74
 Group=Input (KDE)
75 75
 
76 76
 [KGradientSelector]
77
-IncludeFile=kselect.h
77
+IncludeFile=tdeselect.h
78 78
 WhatsThis=A widget that allows the user to select two colors to form a gradient
79 79
 Group=Graphics (KDE)
80 80
 
@@ -233,7 +233,7 @@ Group=Display (KDE)
233 233
 ConstructorArgs=(parent)
234 234
 
235 235
 [TDEActionSelector]
236
-IncludeFile=kactionselector.h
236
+IncludeFile=tdeactionselector.h
237 237
 ToolTip=A widget for selecting and arranging actions/objects
238 238
 Group=Views (KDE)
239 239
 

+ 1
- 1
knewstuff/downloaddialog.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include "downloaddialog.moc"
23 23
 
24 24
 #include <klocale.h>
25
-#include <klistview.h>
25
+#include <tdelistview.h>
26 26
 #include <kdebug.h>
27 27
 #include <tdeio/job.h>
28 28
 #include <tdeio/netaccess.h>

+ 1
- 1
knewstuff/knewstuff.cpp View File

@@ -18,7 +18,7 @@
18 18
     Boston, MA 02110-1301, USA.
19 19
 */
20 20
 
21
-#include <kaction.h>
21
+#include <tdeaction.h>
22 22
 #include <kapplication.h>
23 23
 #include <kdebug.h>
24 24
 #include <klocale.h>

+ 1
- 1
knewstuff/providerdialog.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <tqstring.h>
23 23
 #include <tqlabel.h>
24 24
 
25
-#include <klistview.h>
25
+#include <tdelistview.h>
26 26
 #include <klocale.h>
27 27
 #include <kmessagebox.h>
28 28
 

+ 1
- 1
knewstuff/uploaddialog.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tqstring.h>
27 27
 #include <ktextedit.h>
28 28
 
29
-#include <klistview.h>
29
+#include <tdelistview.h>
30 30
 #include <klocale.h>
31 31
 #include <kdebug.h>
32 32
 #include <kurlrequester.h>

+ 1
- 1
mimetypes/application/x-linguist.desktop View File

@@ -18,7 +18,7 @@ Comment[cy]=Ffeil Tarddiad Cyfieithiad Qt
18 18
 Comment[da]=Qt oversættelseskildefil
19 19
 Comment[de]=Qt-Übersetzungsquelle
20 20
 Comment[el]=Πηγαίο αρχείο μετάφρασης Qt
21
-Comment[eo]=Qta tradukfontdosiero
21
+Comment[eo]=Qta tradutdefontdosiero
22 22
 Comment[es]=Archivo fuente de traducción de Qt
23 23
 Comment[et]=Qt Translationi lähtetekst
24 24
 Comment[eu]=Qt itzulpenerako iturburuko fitxategia

+ 1
- 1
mimetypes/application/x-xliff.desktop View File

@@ -15,7 +15,7 @@ Comment[csb]=Lopk dolmaczënkù XLIFF
15 15
 Comment[da]=XLIFF oversættelsesfil
16 16
 Comment[de]=XLIFF-Übersetzungsdatei
17 17
 Comment[el]=Αρχείο μεταφράσεων XLIFF
18
-Comment[eo]=XLIFF tradukfontdosiero
18
+Comment[eo]=XLIFF tradutdefontdosiero
19 19
 Comment[es]=Archivo de traducción XLIFF
20 20
 Comment[et]=XLIFF tõlkefail
21 21
 Comment[eu]=XLIFF itzulpen fitxategia

+ 1
- 1
tdecert/tdecertpart.cc View File

@@ -40,7 +40,7 @@
40 40
 #include <kprocess.h>
41 41
 #include <tqtabwidget.h>
42 42
 #include <kseparator.h>
43
-#include <klistview.h>
43
+#include <tdelistview.h>
44 44
 #include <tdeio/kmimemagic.h>
45 45
 #include <tqmultilineedit.h>
46 46
 #include <tqregexp.h>

+ 1
- 1
tdecert/tdecertpart.h View File

@@ -27,7 +27,7 @@
27 27
 #include <tdeparts/part.h>
28 28
 #include <tqptrlist.h>
29 29
 #include <tqlistview.h>
30
-#include <klistview.h>
30
+#include <tdelistview.h>
31 31
 
32 32
 class KSSLCertBox;
33 33
 class TQFrame;

+ 7
- 7
tdecore/CMakeLists.txt View File

@@ -75,14 +75,14 @@ install( FILES
75 75
     kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
76 76
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
77 77
     klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
78
-    twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h
79
-    kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h
78
+    twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
79
+    kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
80 80
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
81 81
     kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
82 82
     kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
83 83
     kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
84 84
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
85
-    kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h
85
+    kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
86 86
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
87 87
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
88 88
     kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
@@ -126,13 +126,13 @@ set( ${target}_SRCS
126 126
   ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
127 127
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
128 128
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
129
-  kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
130
-  kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp
131
-  kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp
129
+  kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
130
+  tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
131
+  kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
132 132
   kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
133 133
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
134 134
   kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
135
-  kuniqueapplication.cpp kaccelmanager.cpp ksavefile.cpp
135
+  kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
136 136
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
137 137
   kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
138 138
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp

+ 6
- 6
tdecore/MAINTAINERS View File

@@ -7,9 +7,9 @@ more logical grouping.
7 7
 
8 8
 dmalloc.cpp
9 9
 kaboutdata.cpp		David Faure <faure@kde.org>
10
-kaccel.cpp		Ellis Whitehead <ellis@kde.org>
11
-kaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
12
-kaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
10
+tdeaccel.cpp		Ellis Whitehead <ellis@kde.org>
11
+tdeaccelaction.cpp	Ellis Whitehead <ellis@kde.org>
12
+tdeaccelbase.cpp		Ellis Whitehead <ellis@kde.org>
13 13
 kallocator.cpp		Waldo Bastian <bastian@kde.org>
14 14
 kappdcopiface.cpp
15 15
 kapplication.cpp	Waldo Bastian <bastian@kde.org>
@@ -56,13 +56,13 @@ kregexp.cpp
56 56
 krfcdate.cpp		Waldo Bastian <bastian@kde.org>
57 57
 krootprop.cpp   	Lubos Lunak <l.lunak@kde.org>
58 58
 ksavefile.cpp		Waldo Bastian <bastian@kde.org>
59
-kshortcut.cpp		Ellis Whitehead <ellis@kde.org>
59
+tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
60 60
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
61 61
 ksocks.cpp
62 62
 kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
63 63
 kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
64 64
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
65
-kstdaccel.cpp		Ellis Whitehead <ellis@kde.org>
65
+tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
66 66
 kstringhandler.cpp
67 67
 tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
68 68
 tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
@@ -109,7 +109,7 @@ kprotocolinfofactory.cpp	Torben Weis <weis@kde.org> (copyright)
109 109
 kprotocolinfofactory.cpp	Waldo Bastian <bastian@kde.org> (copyright)
110 110
 kpty.cpp
111 111
 kshell.cpp		Oswald Buddenhagen <ossi@kde.org> (copyright)
112
-kshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
112
+tdeshortcutmenu.cpp	Ellis Whitehead <ellis@kde.org> (copyright)
113 113
 ktempdir.cpp		Joseph Wenninger <jowenn@kde.org> (copyright)
114 114
 kuser.cpp		Tim Jansen <tim@tjansen.de> (copyright)
115 115
 kvmallocator.cpp	Waldo Bastian (bastian@kde.org) (copyright)

+ 9
- 9
tdecore/Makefile.am View File

@@ -42,14 +42,14 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
42 42
 	kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
43 43
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
44 44
 	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
45
-	twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
46
-	kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \
45
+	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
46
+	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
47 47
 	kregexp.h kcompletion.h kstringhandler.h \
48 48
 	kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
49 49
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
50 50
 	kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
51 51
 	krandomsequence.h knotifyclient.h kiconeffect.h \
52
-	kaudioplayer.h kdcoppropertyproxy.h netwm.h kaccelmanager.h \
52
+	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
53 53
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
54 54
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
55 55
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
@@ -81,10 +81,10 @@ libtdefakes_pic.a: libtdefakes.la
81 81
 	ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
82 82
 	ranlib libtdefakes_pic.a
83 83
 
84
-noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
84
+noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
85 85
 	kcompletion_private.h netwm_p.h \
86 86
 	kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
87
-	kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
87
+	kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
88 88
 	kcheckaccelerators.h kcalendarsystemgregorian.h \
89 89
 	kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
90 90
 	kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
@@ -95,13 +95,13 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
95 95
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
96 96
 	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
97 97
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
98
-	kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
99
-	kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp \
100
-	kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp \
98
+	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
99
+	tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
100
+	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
101 101
 	kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
102 102
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
103 103
 	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
104
-	kuniqueapplication.cpp kaccelmanager.cpp \
104
+	kuniqueapplication.cpp tdeaccelmanager.cpp \
105 105
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
106 106
 	kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
107 107
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \

+ 2
- 2
tdecore/kapplication.cpp View File

@@ -77,8 +77,8 @@
77 77
 #include <kdatastream.h>
78 78
 #include <klibloader.h>
79 79
 #include <kmimesourcefactory.h>
80
-#include <kstdaccel.h>
81
-#include <kaccel.h>
80
+#include <tdestdaccel.h>
81
+#include <tdeaccel.h>
82 82
 #include "kcheckaccelerators.h"
83 83
 #include <tqptrdict.h>
84 84
 #include <kmacroexpander.h>

+ 2
- 2
tdecore/kcheckaccelerators.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include "config.h"
27 27
 
28 28
 #include "kcheckaccelerators.h"
29
-#include "kaccelmanager.h"
29
+#include "tdeaccelmanager.h"
30 30
 #include <tqpopupmenu.h>
31 31
 #include <tqapplication.h>
32 32
 #include <tqdialog.h>
@@ -42,7 +42,7 @@
42 42
 #include <tdeconfig.h>
43 43
 #include <kdebug.h>
44 44
 #include <kglobal.h>
45
-#include <kshortcut.h>
45
+#include <tdeshortcut.h>
46 46
 #include <klocale.h>
47 47
 
48 48
 /*

+ 1
- 1
tdecore/kcompletion.h View File

@@ -30,7 +30,7 @@
30 30
 #include "tdelibs_export.h"
31 31
 #include <kglobalsettings.h>
32 32
 #include <ksortablevaluelist.h>
33
-#include <kshortcut.h>
33
+#include <tdeshortcut.h>
34 34
 
35 35
 class KCompTreeNode;
36 36
 class KCompletionPrivate;

+ 2
- 2
tdecore/kglobalaccel.cpp View File

@@ -29,9 +29,9 @@
29 29
 #endif
30 30
 
31 31
 #include <tqstring.h>
32
-#include "kaccelbase.h"
32
+#include "tdeaccelbase.h"
33 33
 #include <kdebug.h>
34
-#include <kshortcut.h>
34
+#include <tdeshortcut.h>
35 35
 #include <klocale.h>
36 36
 
37 37
 //----------------------------------------------------

+ 1
- 1
tdecore/kglobalaccel.h View File

@@ -21,7 +21,7 @@
21 21
 #define _KGLOBALACCEL_H_
22 22
 
23 23
 #include <tqobject.h>
24
-#include <kshortcut.h>
24
+#include <tdeshortcut.h>
25 25
 
26 26
 class TQPopupMenu;
27 27
 class TQWidget;

+ 2
- 2
tdecore/kglobalaccel_emb.h View File

@@ -1,8 +1,8 @@
1 1
 #ifndef _KGLOBALACCEL_EMB_H
2 2
 #define _KGLOBALACCEL_EMB_H
3 3
 
4
-#include "kaccelbase.h"
5
-#include "kshortcut.h"
4
+#include "tdeaccelbase.h"
5
+#include "tdeshortcut.h"
6 6
 
7 7
 class TDEGlobalAccelPrivate
8 8
 {

+ 2
- 2
tdecore/kglobalaccel_mac.h View File

@@ -3,8 +3,8 @@
3 3
 
4 4
 #include <tqwidget.h>
5 5
 
6
-#include "kshortcut.h"
7
-#include "kaccelbase.h"
6
+#include "tdeshortcut.h"
7
+#include "tdeaccelbase.h"
8 8
 
9 9
 class TDEGlobalAccelPrivate: public TDEAccelBase
10 10
 {

+ 2
- 2
tdecore/kglobalaccel_win.h View File

@@ -23,9 +23,9 @@
23 23
 #include <tqmap.h>
24 24
 #include <tqwidget.h>
25 25
 
26
-#include "kaccelbase.h"
26
+#include "tdeaccelbase.h"
27 27
 #include "kkeyserver.h"
28
-#include "kshortcut.h"
28
+#include "tdeshortcut.h"
29 29
 
30 30
 /**
31 31
  * @internal

+ 2
- 2
tdecore/kglobalaccel_x11.h View File

@@ -23,9 +23,9 @@
23 23
 #include <tqmap.h>
24 24
 #include <tqwidget.h>
25 25
 
26
-#include "kaccelbase.h"
26
+#include "tdeaccelbase.h"
27 27
 #include "kkeyserver_x11.h"
28
-#include "kshortcut.h"
28
+#include "tdeshortcut.h"
29 29
 
30 30
 /**
31 31
  * @internal

+ 2
- 2
tdecore/kglobalsettings.cpp View File

@@ -41,10 +41,10 @@ static QRgb qt_colorref2qrgb(COLORREF col)
41 41
 
42 42
 #include <kdebug.h>
43 43
 #include <kglobal.h>
44
-#include <kshortcut.h>
44
+#include <tdeshortcut.h>
45 45
 #include <kstandarddirs.h>
46 46
 #include <kcharsets.h>
47
-#include <kaccel.h>
47
+#include <tdeaccel.h>
48 48
 #include <klocale.h>
49 49
 #include <tqfontinfo.h>
50 50
 #include <stdlib.h>

+ 1
- 1
tdecore/kkeynative.h View File

@@ -23,7 +23,7 @@
23 23
 #ifndef __KKEYNATIVE_H
24 24
 #define __KKEYNATIVE_H
25 25
 
26
-#include <kshortcut.h>
26
+#include <tdeshortcut.h>
27 27
 
28 28
 #ifdef Q_WS_X11
29 29
 typedef union _XEvent XEvent;

+ 2
- 2
tdecore/kkeyserver_x11.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include "kkeyserver_x11.h"
31 31
 #include "kkeynative.h"
32
-#include "kshortcut.h"
32
+#include "tdeshortcut.h"
33 33
 
34 34
 #include <tdeconfig.h>
35 35
 #include <kdebug.h>
@@ -1020,7 +1020,7 @@ void Variations::init( const KKey& key, bool bQt )
1020 1020
 
1021 1021
 } // end of namespace KKeyServer block
1022 1022
 
1023
-// FIXME: This needs to be moved to kshortcut.cpp, and create a 
1023
+// FIXME: This needs to be moved to tdeshortcut.cpp, and create a 
1024 1024
 //  KKeyServer::method which it will call.
1025 1025
 // Alt+SysReq => Alt+Print
1026 1026
 // Ctrl+Shift+Plus => Ctrl+Plus (en)

+ 1
- 1
tdecore/kkeyserver_x11.h View File

@@ -23,7 +23,7 @@
23 23
 #ifndef _KKEYSERVER_X11_H
24 24
 #define _KKEYSERVER_X11_H
25 25
 
26
-#include "kshortcut.h"
26
+#include "tdeshortcut.h"
27 27
 #include "kkeynative.h"
28 28
 
29 29
 /**

tdecore/network/ipv6blactdelist → tdecore/network/ipv6blacklist View File


+ 7
- 7
tdecore/tdeaccel.cpp View File

@@ -17,7 +17,7 @@
17 17
     Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#include "kaccel.h"
20
+#include "tdeaccel.h"
21 21
 
22 22
 #include <tqaccel.h>
23 23
 #include <tqguardedptr.h>
@@ -26,13 +26,13 @@
26 26
 #include <tqstring.h>
27 27
 #include <tqtimer.h>
28 28
 
29
-#include "kaccelbase.h"
29
+#include "tdeaccelbase.h"
30 30
 #include <kapplication.h>
31 31
 #include <kdebug.h>
32 32
 #include <klocale.h>
33
-#include <kshortcut.h>
33
+#include <tdeshortcut.h>
34 34
 
35
-#include "kaccelprivate.h"
35
+#include "tdeaccelprivate.h"
36 36
 
37 37
 #ifdef Q_WS_X11
38 38
 #	include <X11/Xlib.h>
@@ -43,7 +43,7 @@
43 43
 #	endif
44 44
 #endif
45 45
 
46
-// TODO: Put in kaccelbase.cpp
46
+// TODO: Put in tdeaccelbase.cpp
47 47
 //---------------------------------------------------------------------
48 48
 // TDEAccelEventHandler
49 49
 //---------------------------------------------------------------------
@@ -659,5 +659,5 @@ TQString TDEAccel::findKey( int key ) const
659 659
 void TDEAccel::virtual_hook( int, void* )
660 660
 { /*BASE::virtual_hook( id, data );*/ }
661 661
 
662
-#include "kaccel.moc"
663
-#include "kaccelprivate.moc"
662
+#include "tdeaccel.moc"
663
+#include "tdeaccelprivate.moc"

+ 2
- 2
tdecore/tdeaccel.h View File

@@ -21,8 +21,8 @@
21 21
 #define _KACCEL_H
22 22
 
23 23
 #include <tqaccel.h>
24
-#include <kshortcut.h>
25
-#include <kstdaccel.h>
24
+#include <tdeshortcut.h>
25
+#include <tdestdaccel.h>
26 26
 #include "tdelibs_export.h"
27 27
 
28 28
 class TQPopupMenu; // for obsolete insertItem() methods below

+ 3
- 3
tdecore/tdeaccelaction.cpp View File

@@ -20,8 +20,8 @@
20 20
     Boston, MA 02110-1301, USA.
21 21
 */
22 22
 
23
-#include "kaccelaction.h"
24
-#include "kaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
23
+#include "tdeaccelaction.h"
24
+#include "tdeaccelbase.h"   // for TDEAccelBase::slotRemoveAction() & emitSignal()
25 25
 
26 26
 #include <tqkeycode.h>
27 27
 
@@ -31,7 +31,7 @@
31 31
 #include <kglobal.h>
32 32
 #include <kkeynative.h>
33 33
 #include <klocale.h>
34
-#include <kshortcutlist.h>
34
+#include <tdeshortcutlist.h>
35 35
 
36 36
 //---------------------------------------------------------------------
37 37
 // TDEAccelAction

+ 1
- 1
tdecore/tdeaccelaction.h View File

@@ -25,7 +25,7 @@
25 25
 #include <tqstring.h>
26 26
 #include <tqvaluevector.h>
27 27
 
28
-#include <kshortcut.h>
28
+#include <tdeshortcut.h>
29 29
 
30 30
 class TDEAccelBase;
31 31
 

+ 2
- 2
tdecore/tdeaccelbase.cpp View File

@@ -20,7 +20,7 @@
20 20
     Boston, MA 02110-1301, USA.
21 21
 */
22 22
 
23
-#include "kaccelbase.h"
23
+#include "tdeaccelbase.h"
24 24
 
25 25
 #include <tqkeycode.h>
26 26
 #include <tqlabel.h>
@@ -33,7 +33,7 @@
33 33
 #include <kkeynative.h>
34 34
 #include "kkeyserver.h"
35 35
 #include <klocale.h>
36
-#include "kshortcutmenu.h"
36
+#include "tdeshortcutmenu.h"
37 37
 
38 38
 //---------------------------------------------------------------------
39 39
 // class TDEAccelBase::ActionInfo

+ 1
- 1
tdecore/tdeaccelbase.h View File

@@ -26,7 +26,7 @@
26 26
 #include <tqvaluevector.h>
27 27
 #include <tqvaluelist.h>
28 28
 
29
-#include "kaccelaction.h"
29
+#include "tdeaccelaction.h"
30 30
 #include "kkeyserver.h"
31 31
 
32 32
 class TQPopupMenu;

+ 3
- 3
tdecore/tdeaccelmanager.cpp View File

@@ -17,7 +17,7 @@
17 17
     Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#include "kaccelmanager.h"
20
+#include "tdeaccelmanager.h"
21 21
 
22 22
 #include <tqapplication.h>
23 23
 #include <tqcheckbox.h>
@@ -45,7 +45,7 @@
45 45
 #include <kdebug.h>
46 46
 
47 47
 
48
-#include "kaccelmanager_private.h"
48
+#include "tdeaccelmanager_private.h"
49 49
 #include "../tdeui/kstdaction_p.h"
50 50
 #include "../tdeutils/tdemultitabbar.h"
51 51
 
@@ -869,4 +869,4 @@ void TDEAcceleratorManager::setNoAccel( TQWidget *widget )
869 869
     TDEAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
870 870
 }
871 871
 
872
-#include "kaccelmanager_private.moc"
872
+#include "tdeaccelmanager_private.moc"

+ 3
- 3
tdecore/tdeconfig_compiler/checkkcfg.pl View File

@@ -24,12 +24,12 @@ if ( system( $cmd ) != 0 ) {
24 24
   exit 1;
25 25
 }
26 26
 
27
-chectdefile( $file_h );
28
-chectdefile( $file_cpp );
27
+checkfile( $file_h );
28
+checkfile( $file_cpp );
29 29
 
30 30
 exit 0;
31 31
 
32
-sub chectdefile()
32
+sub checkfile()
33 33
 {
34 34
   my $file = shift;
35 35
 

+ 1
- 1
tdecore/tdeshortcut.cpp View File

@@ -17,7 +17,7 @@
17 17
     Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#include "kshortcut.h"
20
+#include "tdeshortcut.h"
21 21
 #include "kkeynative.h"
22 22
 #include "kkeyserver.h"
23 23
 

+ 4
- 4
tdecore/tdeshortcutlist.cpp View File

@@ -1,15 +1,15 @@
1 1
 #include <tqstring.h>
2 2
 #include <tqvariant.h>
3 3
 
4
-#include <kaccel.h>
5
-#include "kaccelaction.h"
4
+#include <tdeaccel.h>
5
+#include "tdeaccelaction.h"
6 6
 #include <tdeconfig.h>
7 7
 #include <kdebug.h>
8 8
 #include <kglobal.h>
9 9
 #include <kglobalaccel.h>
10 10
 #include <kinstance.h>
11
-#include <kshortcut.h>
12
-#include "kshortcutlist.h"
11
+#include <tdeshortcut.h>
12
+#include "tdeshortcutlist.h"
13 13
 
14 14
 //---------------------------------------------------------------------
15 15
 // TDEShortcutList

+ 3
- 3
tdecore/tdeshortcutmenu.cpp View File

@@ -21,10 +21,10 @@
21 21
 #include <tqlabel.h>
22 22
 #include <tqpopupmenu.h>
23 23
 
24
-#include "kaccelaction.h"
24
+#include "tdeaccelaction.h"
25 25
 #include <kdebug.h>
26 26
 #include <kglobalsettings.h>
27
-#include "kshortcutmenu.h"
27
+#include "tdeshortcutmenu.h"
28 28
 //#include <kkeynative.h>
29 29
 
30 30
 TDEShortcutMenu::TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq )
@@ -158,4 +158,4 @@ void TDEShortcutMenu::keepItemsMatching( KKey key )
158 158
 	updateShortcuts();
159 159
 }
160 160
 
161
-#include "kshortcutmenu.moc"
161
+#include "tdeshortcutmenu.moc"

+ 1
- 1
tdecore/tdeshortcutmenu.h View File

@@ -23,7 +23,7 @@
23 23
 #include <tqmap.h>
24 24
 #include <tqpopupmenu.h>
25 25
 
26
-#include "kshortcut.h"
26
+#include "tdeshortcut.h"
27 27
 
28 28
 class TQLabel;
29 29
 

+ 5
- 5
tdecore/tdestdaccel.cpp View File

@@ -19,16 +19,16 @@
19 19
 */
20 20
 #define __KSTDACCEL_CPP_ 1
21 21
 
22
-#include "kstdaccel.h"
22
+#include "tdestdaccel.h"
23 23
 
24
-#include "kaccelaction.h"
25
-#include "kaccelbase.h"
24
+#include "tdeaccelaction.h"
25
+#include "tdeaccelbase.h"
26 26
 #include <tdeconfig.h>
27 27
 #include <kdebug.h>
28 28
 #include <kglobal.h>
29 29
 #include <klocale.h>
30
-#include <kshortcut.h>
31
-#include <kshortcutlist.h>
30
+#include <tdeshortcut.h>
31
+#include <tdeshortcutlist.h>
32 32
 
33 33
 namespace TDEStdAccel
34 34
 {

+ 2
- 2
tdecore/tdestdaccel.h View File

@@ -21,7 +21,7 @@
21 21
 #define KSTDACCEL_H
22 22
 
23 23
 #include <tqstring.h>
24
-#include <kshortcut.h>
24
+#include <tdeshortcut.h>
25 25
 #include "tdelibs_export.h"
26 26
 
27 27
 class TQKeyEvent;
@@ -35,7 +35,7 @@ class TDEAccelActions;
35 35
  * so do not hardcode the default behavior.
36 36
  *
37 37
  * If you want real configurable keybindings in your applications,
38
- * please checkout the class TDEAccel in kaccel.h
38
+ * please checkout the class TDEAccel in tdeaccel.h
39 39
  * @see TDEAccelShortcutList
40 40
  */
41 41
 namespace TDEStdAccel

+ 3
- 3
tdecore/tests/Makefile.am View File

@@ -28,9 +28,9 @@ check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
28 28
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
29 29
 	ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
30 30
 	kcharsetstest kcalendartest kmacroexpandertest kshelltest \
31
-	kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest
31
+	kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest
32 32
 
33
-TESTS = kurltest kstdacceltest
33
+TESTS = kurltest tdestdacceltest
34 34
 
35 35
 noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
36 36
 		kipctest.h kprociotest.h
@@ -75,7 +75,7 @@ kmacroexpandertest_SOURCES = kmacroexpandertest.cpp
75 75
 kshelltest_SOURCES = kshelltest.cpp
76 76
 kxerrorhandlertest_SOURCES = kxerrorhandlertest.cpp
77 77
 startserviceby_SOURCES = startserviceby.cpp
78
-kstdacceltest_SOURCES = kstdacceltest.cpp
78
+tdestdacceltest_SOURCES = tdestdacceltest.cpp
79 79
 kglobaltest_SOURCES = kglobaltest.cpp
80 80
 ktimezonestest_SOURCES = ktimezonestest.cpp
81 81
 

+ 2
- 2
tdecore/tests/tdestdacceltest.cpp View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 #include <kapplication.h>
4 4
 #include <kdebug.h>
5
-#include <kstdaccel.h>
5
+#include <tdestdaccel.h>
6 6
 #include <stdlib.h> // for exit
7 7
 
8 8
 static bool check(TQString txt, TQString a, TQString b)
@@ -24,7 +24,7 @@ static bool check(TQString txt, TQString a, TQString b)
24 24
 int main(int argc, char *argv[])
25 25
 {
26 26
   TDEApplication::disableAutoDcopRegistration();
27
-  TDEApplication app(argc,argv,"kstdacceltest",false,false);
27
+  TDEApplication app(argc,argv,"tdestdacceltest",false,false);
28 28
 
29 29
   check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
30 30
   check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" );

+ 1
- 1
tdehtml/domtreeview.h View File

@@ -18,7 +18,7 @@
18 18
 #ifndef DOMTREEVIEW_H
19 19
 #define DOMTREEVIEW_H
20 20
 
21
-#include <klistview.h>
21
+#include <tdelistview.h>
22 22
 #include <kdebug.h>
23 23
 #include <tqlistview.h>
24 24
 #include <tqptrdict.h>

+ 4
- 4
tdehtml/ecma/kjs_debugwin.cpp View File

@@ -47,12 +47,12 @@
47 47
 #include <kglobal.h>
48 48
 #include <kmessagebox.h>
49 49
 #include <kguiitem.h>
50
-#include <kpopupmenu.h>
50
+#include <tdepopupmenu.h>
51 51
 #include <kmenubar.h>
52
-#include <kaction.h>
53
-#include <kactioncollection.h>
52
+#include <tdeaction.h>
53
+#include <tdeactioncollection.h>
54 54
 #include <kglobalsettings.h>
55
-#include <kshortcut.h>
55
+#include <tdeshortcut.h>
56 56
 #include <tdeconfig.h>
57 57
 #include <tdeconfigbase.h>
58 58
 #include <kapplication.h>

+ 1
- 1
tdehtml/ecma/kjs_debugwin.h View File

@@ -34,7 +34,7 @@
34 34
 #include <tqptrstack.h>
35 35
 #include <tqcheckbox.h>
36 36
 #include <kdialogbase.h>
37
-#include <kmainwindow.h>
37
+#include <tdemainwindow.h>
38 38
 #include <tqscrollview.h>
39 39
 
40 40
 #include <kjs/debugger.h>

+ 1
- 1
tdehtml/misc/knsplugininstaller.cpp View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <kdebug.h>
27 27
 #include <kdiroperator.h> 
28
-#include <klistview.h>
28
+#include <tdelistview.h>
29 29
 #include <klocale.h>
30 30
 #include <kstddirs.h>
31 31
 #include <ktempfile.h> 

+ 0
- 0
tdehtml/rendering/render_form.h View File


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

Loading…
Cancel
Save