Browse Source

Rename a number of classes to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
deac2ca49f
100 changed files with 1261 additions and 1261 deletions
  1. 25
    25
      KDE2PORTING.html
  2. 27
    27
      KDE3PORTING.html
  3. 7
    7
      TODO
  4. 22
    22
      arts/kde/kvideowidget.cpp
  5. 3
    3
      dcop/HOWTO
  6. 3
    3
      dcop/Mainpage.dox
  7. 1
    1
      interfaces/tdemediaplayer/player.h
  8. 3
    3
      interfaces/tdescript/scriptloader.cpp
  9. 6
    6
      interfaces/tdescript/scriptloader.h
  10. 1
    1
      interfaces/terminal/test/main.h
  11. 1
    1
      kab/kabapi.cc
  12. 2
    2
      kab/kabapi.h
  13. 2
    2
      kabc/addresseedialog.cpp
  14. 2
    2
      kabc/addresseedialog.h
  15. 2
    2
      kabc/addresslineedit.cpp
  16. 1
    1
      kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
  17. 1
    1
      kabc/resourceselectdialog.cpp
  18. 2
    2
      kabc/resourceselectdialog.h
  19. 2
    2
      kate/interfaces/document.h
  20. 1
    1
      kate/part/kateautoindent.cpp
  21. 2
    2
      kate/part/kateautoindent.h
  22. 6
    6
      kate/part/katebookmarks.cpp
  23. 8
    8
      kate/part/katebookmarks.h
  24. 1
    1
      kate/part/katedialogs.cpp
  25. 4
    4
      kate/part/katedialogs.h
  26. 1
    1
      kate/part/kateprinter.cpp
  27. 3
    3
      kate/part/kateschema.cpp
  28. 3
    3
      kate/part/kateschema.h
  29. 1
    1
      kate/part/katesearch.cpp
  30. 2
    2
      kate/part/katesearch.h
  31. 3
    3
      kate/part/katespell.cpp
  32. 3
    3
      kate/part/katespell.h
  33. 87
    87
      kate/part/kateview.cpp
  34. 30
    30
      kate/part/kateview.h
  35. 1
    1
      kate/part/kateviewhelpers.cpp
  36. 1
    1
      kate/part/kateviewhelpers.h
  37. 1
    1
      kate/part/test_regression.cpp
  38. 2
    2
      kate/plugins/autobookmarker/autobookmarker.cpp
  39. 1
    1
      kate/plugins/autobookmarker/autobookmarker.h
  40. 1
    1
      kate/plugins/insertfile/insertfileplugin.cpp
  41. 12
    12
      kate/plugins/isearch/ISearchPlugin.cpp
  42. 2
    2
      kate/plugins/isearch/ISearchPlugin.h
  43. 4
    4
      kate/plugins/kdatatool/kate_kdatatool.cpp
  44. 4
    4
      kate/plugins/kdatatool/kate_kdatatool.h
  45. 6
    6
      kate/plugins/wordcompletion/docwordcompletion.cpp
  46. 1
    1
      kded/kded.cpp
  47. 8
    8
      kdewidgets/kde.widgets
  48. 6
    6
      kdewidgets/tests/test.widgets
  49. 1
    1
      kinit/README.DCOP
  50. 4
    4
      kinit/kinit.cpp
  51. 73
    73
      kinit/tdelauncher.cpp
  52. 13
    13
      kinit/tdelauncher.h
  53. 4
    4
      kinit/tdelauncher_main.cpp
  54. 18
    18
      knewstuff/downloaddialog.cpp
  55. 3
    3
      knewstuff/downloaddialog.h
  56. 3
    3
      knewstuff/knewstuff.cpp
  57. 4
    4
      knewstuff/knewstuff.h
  58. 4
    4
      knewstuff/providerdialog.cpp
  59. 2
    2
      knewstuff/providerdialog.h
  60. 1
    1
      kstyles/klegacy/klegacystyle.cpp
  61. 1
    1
      kstyles/klegacy/klegacystyle.h
  62. 2
    2
      kstyles/kthemestyle/kthemestyle.cpp
  63. 5
    5
      kstyles/web/webstyle.cpp
  64. 5
    5
      kstyles/web/webstyle.h
  65. 9
    9
      tdecert/tdecertpart.cc
  66. 7
    7
      tdecert/tdecertpart.h
  67. 3
    3
      tdecore/AUTHORS
  68. 1
    1
      tdecore/DESIGN.iconloading
  69. 2
    2
      tdecore/README.kiosk
  70. 123
    123
      tdecore/kaccel.cpp
  71. 39
    39
      tdecore/kaccel.h
  72. 113
    113
      tdecore/kaccelaction.cpp
  73. 72
    72
      tdecore/kaccelaction.h
  74. 70
    70
      tdecore/kaccelbase.cpp
  75. 35
    35
      tdecore/kaccelbase.h
  76. 83
    83
      tdecore/kaccelmanager.cpp
  77. 2
    2
      tdecore/kaccelmanager.h
  78. 13
    13
      tdecore/kaccelmanager_private.h
  79. 10
    10
      tdecore/kaccelprivate.h
  80. 12
    12
      tdecore/kapplication.cpp
  81. 24
    24
      tdecore/kapplication.h
  82. 3
    3
      tdecore/kcheckaccelerators.cpp
  83. 4
    4
      tdecore/kcompletion.h
  84. 1
    1
      tdecore/kcompletionbase.cpp
  85. 7
    7
      tdecore/kdebug.areas
  86. 3
    3
      tdecore/kdebugrc
  87. 14
    14
      tdecore/kglobalaccel.cpp
  88. 15
    15
      tdecore/kglobalaccel.h
  89. 2
    2
      tdecore/kglobalaccel_emb.h
  90. 4
    4
      tdecore/kglobalaccel_mac.h
  91. 9
    9
      tdecore/kglobalaccel_win.cpp
  92. 5
    5
      tdecore/kglobalaccel_win.h
  93. 11
    11
      tdecore/kglobalaccel_x11.cpp
  94. 6
    6
      tdecore/kglobalaccel_x11.h
  95. 1
    1
      tdecore/kglobalsettings.cpp
  96. 6
    6
      tdecore/kglobalsettings.h
  97. 42
    42
      tdecore/kmanagerselection.cpp
  98. 12
    12
      tdecore/kmanagerselection.h
  99. 37
    37
      tdecore/kshortcut.cpp
  100. 0
    0
      tdecore/kshortcut.h

+ 25
- 25
KDE2PORTING.html View File

@@ -26,7 +26,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
26 26
 <LI><A HREF="#KIconLoader">KIconLoader</A></LI>
27 27
 <LI><A HREF="#KTMainWindow">KTMainWindow</A></LI>
28 28
 <LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
29
-<LI><A HREF="#KToolBar">KToolBar</A></LI>
29
+<LI><A HREF="#TDEToolBar">TDEToolBar</A></LI>
30 30
 <LI><A HREF="#launching">Starting other programs</A></LI>
31 31
 <LI><A HREF="#tdehtmlw">tdehtmlw</A></LI>
32 32
 <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
@@ -45,8 +45,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
45 45
 <LI><A HREF="#KQuickHelp">KQuickHelp</A></LI>
46 46
 <LI><A HREF="#KPixmapgradientFill">KPixmap::gradientFill</A></LI>
47 47
 <LI><A HREF="#KTabListBox">KTabListBox</A></LI>
48
-<LI><A HREF="#KToolBarButton">KToolBarButton &amp; KRadioGroup</A></LI>
49
-<LI><A HREF="#KAccel">KAccel</A></LI>
48
+<LI><A HREF="#TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></LI>
49
+<LI><A HREF="#TDEAccel">TDEAccel</A></LI>
50 50
 <LI><A HREF="#kstring">kstring.h / KString</A></LI>
51 51
 <LI><A HREF="#ktopwidget">ktopwidget.h / KTopWidget</A></LI>
52 52
 <LI><A HREF="#kbutton">kbutton.h / KButton</A></LI>
@@ -142,8 +142,8 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
142 142
   The methods tempSaveName() and checkRecoverFile() return QString
143 143
   now. The returned values must _not_ be free()d.<P>
144 144
 
145
-  helpMenu() has been moved to KMainWindow. aboutKDE(), aboutApp() and
146
-  appHelpActivated() have all been removed See section for KMainWindow
145
+  helpMenu() has been moved to TDEMainWindow. aboutKDE(), aboutApp() and
146
+  appHelpActivated() have all been removed See section for TDEMainWindow
147 147
   for more info.<P>
148 148
 
149 149
   The TDEApplication constructor has changed. Command line arguments and
@@ -248,9 +248,9 @@ in stripping off the .xpm part<P>
248 248
 
249 249
 <H3><A NAME="KTMainWindow">KTMainWindow</A></H3>
250 250
 
251
-KTMainWindow has been replaced with KMainWindow.<p>
251
+KTMainWindow has been replaced with TDEMainWindow.<p>
252 252
 
253
-The KMainWindow constructor needs a parent widget as first argument. 
253
+The TDEMainWindow constructor needs a parent widget as first argument. 
254 254
 You can use 0 for this.<p>
255 255
 setView() has been replaced with setCentralWidget().<p>
256 256
 view() has been replaced with centralWidget().<p>
@@ -271,12 +271,12 @@ mainViewGeometry() instead.<P>
271 271
 
272 272
 <H3><A NAME="KHelpMenu">KHelpMenu</A></H3>
273 273
 
274
-helpMenu() has been moved to KMainWindow from TDEApplication (kapp).<P>
274
+helpMenu() has been moved to TDEMainWindow from TDEApplication (kapp).<P>
275 275
 
276 276
 Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
277 277
 are now modeless. "About KDE" is a completely new widget.<P>
278 278
 
279
-If you used in the toplevel window (that is derived from KMainWindow)
279
+If you used in the toplevel window (that is derived from TDEMainWindow)
280 280
 "kapp-&gt;helpMenu( bool, TQString )" to get the help menu
281 281
 you must now change this to "helpMenu( TQString )". The TQString defaults
282 282
 to TQString::null so it is sufficient to write helpMenu().<P>
@@ -284,13 +284,13 @@ to TQString::null so it is sufficient to write helpMenu().<P>
284 284
 The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication
285 285
 have all been removed. If you need direct access to these or need
286 286
 access to a help menu in a class that is not derived from
287
-KMainWindow then allocate an instance of the new class KHelpMenu.
287
+TDEMainWindow then allocate an instance of the new class KHelpMenu.
288 288
 See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P>
289 289
 Espen Sand &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P>
290 290
 
291 291
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
292 292
 
293
-<H3><A NAME="KToolBar">KToolBar</A></H3>
293
+<H3><A NAME="TDEToolBar">TDEToolBar</A></H3>
294 294
 
295 295
 enable(...) is depreciated, use show()/hide() instead.<p>
296 296
 enableFloating(...) has been removed, use enableMoving() instead.<p>
@@ -588,7 +588,7 @@ this:<P>
588 588
 <TABLE><TR><TD>
589 589
     TQSplitter *split = new TQSplitter( parent );<BR>
590 590
     TQListBox *lb = new TQListBox( split );<BR>
591
-    KListView *lv = new KListView( split );<BR>
591
+    TDEListView *lv = new TDEListView( split );<BR>
592 592
     TQMultiLineEdit *ed = new TQMultiLineEdit( split );
593 593
 </TD></TR></TABLE>
594 594
 
@@ -600,17 +600,17 @@ possible if you call setOpaqueResize(true).<P>
600 600
 
601 601
 <H3><A NAME="KTreeList">KTreeList, KTreeListItem</A></H3>
602 602
 
603
-Use KListView, TQListViewItem instead. API is almost the same, you only
604
-need to add a Column (KListView::addColum) before KListView is useable.<P>
603
+Use TDEListView, TQListViewItem instead. API is almost the same, you only
604
+need to add a Column (TDEListView::addColum) before TDEListView is useable.<P>
605 605
 
606
-KListView has no addChild(), insertItem() and removeItem() calls. Inserting
607
-a root item is done by constructing a TQListViewItem with the KListView
606
+TDEListView has no addChild(), insertItem() and removeItem() calls. Inserting
607
+a root item is done by constructing a TQListViewItem with the TDEListView
608 608
 passed as the parent widget. adding a child item is done by constructing
609 609
 a TQListViewItem with the parent item as parameter. removeItem() should
610 610
 be replaced by delete &lt;pointer to item&gt;.<P>
611 611
 
612 612
 The root items are not shown in a tree fashion by default. to get this,
613
-use KListView::setDecorativeRoot(true).<P>
613
+use TDEListView::setDecorativeRoot(true).<P>
614 614
 
615 615
 Expanding and collapsing can by done by using TQListViewItem::setOpen(bool).<P>
616 616
 
@@ -685,24 +685,24 @@ unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>
685 685
 
686 686
 <H3><A NAME="KTabListBox">KTabListBox</A></H3>
687 687
 
688
-This widget has been replaced by the almighty KListView. Everything said
688
+This widget has been replaced by the almighty TDEListView. Everything said
689 689
 about KTreeList could be repeated here. The good thing is, that you now
690 690
 can combine TreeView's and normal Tablists without problems.<P>
691 691
 
692 692
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
693 693
 
694
-<H3><A NAME="KToolBarButton">KToolBarButton &amp; KRadioGroup</A></H3>
694
+<H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>
695 695
 
696
-If you need to do anything with KToolBarButton you now need to include 
697
-&lt;ktoolbarbutton.h&gt; KRadioGroup has been renamed to KToolBarRadioGroup and
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 698
 requires you to include &lt;ktoolbarradiogroup.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
-<H3><A NAME="KAccel">KAccel</A></H3>
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 KAccel.<P>
705
+declared globally in kaccel.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
 
@@ -716,7 +716,7 @@ The file has been removed completely, use TQString instead. (<A HREF="mailto:mir
716 716
 
717 717
 <H3><A NAME="ktopwidget">ktopwidget.h / KTopWidget</A></H3>
718 718
 
719
-KMainWindow replaces this class completely. ktopwidget.h does not
719
+TDEMainWindow replaces this class completely. ktopwidget.h does not
720 720
 exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>
721 721
 
722 722
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -754,7 +754,7 @@ Please adjust your code accordingly.<P>
754 754
 
755 755
 <H3><A NAME="KDockWidget">KDockWidget</A></H3>
756 756
 
757
-KDockWidget inherits form KMainWindow instead of KTMainWindow now.
757
+KDockWidget inherits form TDEMainWindow instead of KTMainWindow now.
758 758
 See <A HREF="KTMainWindow">KTMainWindow</A> for more details.
759 759
 
760 760
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

+ 27
- 27
KDE3PORTING.html View File

@@ -148,11 +148,11 @@ should be replaced with methods from TDELocale::calendar().
148 148
 cases be replaced by methods in TDELocale::calendar().
149 149
 
150 150
 <H4>Accelerators Keys</H4>
151
-<h5>KAccel</h5>
151
+<h5>TDEAccel</h5>
152 152
 The following methods of been deprecated, and if KDE_NO_COMPAT is defined they will
153 153
 not be available.
154 154
 <ul>
155
-	<li> KAccel::insertItem() and KAccel::connectItem().
155
+	<li> TDEAccel::insertItem() and TDEAccel::connectItem().
156 156
 <pre>
157 157
 	- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
158 158
 	- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
@@ -163,19 +163,19 @@ not be available.
163 163
 	You might replace the TQString::null parameter with
164 164
 	<pre> i18n("Scroll the current document's contents up by one line.") </pre>
165 165
 	for example.</li>
166
-	<li> KAccel::changeMenuAccel() has been deprecated because it was
166
+	<li> TDEAccel::changeMenuAccel() has been deprecated because it was
167 167
 	never used in cvs.  If you've used it in your application, the following
168 168
 	can replace it.  Note, however, that this would be handled automatically
169
-	by using KAction instead.
169
+	by using TDEAction instead.
170 170
 <pre>
171 171
 	- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
172 172
 	+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
173 173
 </pre>
174 174
 	</li>
175 175
 </ul>
176
-The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
176
+The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
177 177
 <pre>
178
-	new KAction( i18n("Scroll Up"), Key_Up,
178
+	new TDEAction( i18n("Scroll Up"), Key_Up,
179 179
 		this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
180 180
 </pre>
181 181
 
@@ -189,25 +189,25 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
189 189
 	shortcut reassignments, which in turn used to make an expensive ungrab
190 190
 	of the old key and second grab of the new key necessary.</li>
191 191
 </ul>
192
-<h5>KStdAccel</h5>
192
+<h5>TDEStdAccel</h5>
193 193
 <ul>
194 194
 	<li><i>StdAccel::WhatThis</i> has been renamed to <i>StdAccel::WhatsThis</i>.
195 195
 	<li><i>StdAccel::Insert</i> and the corresponding <i>insert()</i>
196 196
 	have been removed. (Nobody on the list knew what its function was
197 197
 	supposed to be.)  Calls to <i>insert()</i> and the equivalent
198
-	<i>key(KStdAccel::Insert)</i> can be replaced with the former default
198
+	<i>key(TDEStdAccel::Insert)</i> can be replaced with the former default
199 199
 	of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
200 200
 	<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
201 201
 		<table border=1>
202 202
 			<tr><th>Old</th><th>New</th></tr>
203 203
 			<tr><td>TQString action(StdAccel id)</td><td>TQString name(StdAccel id)</td></tr>
204
-			<tr><td>int defaultKey(StdAccel accel)</td><td>KShortcut shortcutDefault(StdAccel id)</td></tr>
204
+			<tr><td>int defaultKey(StdAccel accel)</td><td>TDEShortcut shortcutDefault(StdAccel id)</td></tr>
205 205
 			<tr><td>TQString description(StdAccel id)</td><td>TQString label(StdAccel id)</td></tr>
206 206
 			<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
207 207
 				<td>The best method for replacing this varies.  One possibility is to use
208 208
 				<i>KKey(const TQKeyEvent*) == KKey(int)</i>.  Another is to use
209
-				<i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
210
-			<tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
209
+				<i>TDEShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
210
+			<tr><td>int key(StdAccel)</td><td>const TDEShortcut& shortcut(StdAccel)</td></tr>
211 211
 		</table></li-->
212 212
 </ul>
213 213
 
@@ -221,27 +221,27 @@ KURLBar and KURLBarItem.
221 221
 
222 222
 <H3><A NAME="tdeui">Changes in tdeui</A></H3>
223 223
 
224
-<H4>KAccelMenu</H4>
224
+<H4>TDEAccelMenu</H4>
225 225
 This class has been removed, Qt offers the same functionality.
226
-Use QPopupMenu/KPopupMenu or the XML-UI method for building menus.
226
+Use QPopupMenu/TDEPopupMenu or the XML-UI method for building menus.
227 227
 
228
-<H4>KAction</H4>
228
+<H4>TDEAction</H4>
229 229
 <ul>
230 230
 	<li>The following methods have been deprecated and will need to be
231 231
 	replaced if KDE_NO_COMPAT is defined.
232 232
 		<table border=1>
233 233
 			<tr><th>Old</th><th>New</th></tr>
234
-			<tr><td>int accel()</td><td>const KShortcut&amp; shortcut()</td></tr>
234
+			<tr><td>int accel()</td><td>const TDEShortcut&amp; shortcut()</td></tr>
235 235
 			<tr><td>int menuId()</td><td>int itemId()</td></tr>
236
-			<tr><td>void setAccel(int)</td><td>void setShortcut(const KShortcut&amp;)</td></tr>
236
+			<tr><td>void setAccel(int)</td><td>void setShortcut(const TDEShortcut&amp;)</td></tr>
237 237
 		</table></li>
238 238
 </ul>
239 239
 
240
-<h4>KActionCollection</h4>
240
+<h4>TDEActionCollection</h4>
241 241
 <ul>
242
-	<li>When constructing a KActionCollection object, a pointer to the focus widget should be passed.</li>
242
+	<li>When constructing a TDEActionCollection object, a pointer to the focus widget should be passed.</li>
243 243
 	<li>The insert(), remove(), and take() methods have been deprecated.
244
-	If you wish to keep a list of actions, use the KActionPtrList container instead.
244
+	If you wish to keep a list of actions, use the TDEActionPtrList container instead.
245 245
 	If you want to configure the shortcuts from multiple actions collections,
246 246
 	pass each collection to KKeyChooser or KKeyDialog via their insert() methods.</li>
247 247
 </ul>
@@ -322,24 +322,24 @@ KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
322 322
 present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
323 323
 as its use is basically limited to KThemeStyle.
324 324
 
325
-<H4>KAction, KToolBar, KToolBarButton and icons</H4>
325
+<H4>TDEAction, TDEToolBar, TDEToolBarButton and icons</H4>
326 326
 The preferred way for specifying icons is passing the icon names (and the icons will be loaded by KIconLoader),
327 327
 instead of using TQIconSet or TQPixmap. This results in always using the correct icon size and allows delayed
328 328
 on-demand icon loading.
329 329
 <p>
330
-Method KAction::hasIconSet() has been renamed to KAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
331
-KAction::iconSet() now has an argument specifying icon group, the old KAction::iconSet() is still available unless KDE_NO_COMPAT
330
+Method TDEAction::hasIconSet() has been renamed to TDEAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
331
+TDEAction::iconSet() now has an argument specifying icon group, the old TDEAction::iconSet() is still available unless KDE_NO_COMPAT
332 332
 is defined and returns KIcon::Small iconset, just like in KDE2.
333 333
 <p>
334
-KToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
335
-Use KToolBarButton::setIcon() (preferred) or KToolBarButton::setIconSet() instead.
334
+TDEToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
335
+Use TDEToolBarButton::setIcon() (preferred) or TDEToolBarButton::setIconSet() instead.
336 336
 
337
-<H4>KAction and derived classes</H4>
337
+<H4>TDEAction and derived classes</H4>
338 338
 The protected set* methods have been renamed to update* and they now take only one argument (i.e. setText(int, const TQString&)
339 339
 is now updateText(int) ). Because the former second argument was always the value of the a corresponding data member, you
340 340
 can simply call the accessor method (i.e. in updateText() call text() to get the text).
341 341
 
342
-<H4>KToggleAction</H4>
342
+<H4>TDEToggleAction</H4>
343 343
 exclusiveGroup() is no more virtual. setExclusiveGroup(const
344 344
 TQString&) is not a slot anymore.
345 345
 
@@ -563,7 +563,7 @@ flexibility and efficiency.
563 563
 <br><br>
564 564
 Sorting has changed radically. Previously, KFileView had protected methods QuickSort,
565 565
 compareItems() and mergeLists() to sort directory entries for displaying in the views. Now,
566
-KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, KListView)
566
+KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, TDEListView)
567 567
 sorting is utilized by letting its view-items provide a TQString key() method. Therefore,
568 568
 KFileView offers the two methods
569 569
 <ul>

+ 7
- 7
TODO View File

@@ -33,7 +33,7 @@ that we would like to make for the next binary incompatible release.
33 33
 
34 34
 - Clean up the uses of virtual_hook, use normal virtuals instead (e.g. KZip/KArchive)
35 35
 
36
-- Make it possible to create a KSystemTray without a KMainWindow and instead lazily
36
+- Make it possible to create a KSystemTray without a TDEMainWindow and instead lazily
37 37
   create the main window on demand.
38 38
 
39 39
 - Make KSystemTray's Quit option in the context menu call kapp->quit() instead of
@@ -94,12 +94,12 @@ that we would like to make for the next binary incompatible release.
94 94
   QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) .
95 95
   Keep source compatibility.
96 96
 
97
-- Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled()
97
+- Sort out reference counting of applications and TDEMainWindows: Add a setRefCountEnabled()
98 98
   function to TDEApplication; deref()ing the last reference should only quit the application
99 99
   if reference counts are enabled, and the reference count should be disabled by default
100
-  so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow
101
-  constructor call setRefCountEnabled(true), and make each KMainWindow hold its own
102
-  reference to the application. The KMainWindow should drop its app reference on hide, and
100
+  so apps that don't use a TDEMainWindow mostly continue to work. Make the TDEMainWindow
101
+  constructor call setRefCountEnabled(true), and make each TDEMainWindow hold its own
102
+  reference to the application. The TDEMainWindow should drop its app reference on hide, and
103 103
   regain it on show.
104 104
 
105 105
   Make KSysTray also hold a reference to the app. Then apps that use more than one main
@@ -159,7 +159,7 @@ that we would like to make for the next binary incompatible release.
159 159
 
160 160
 - Make API use US English, (eg. KCatalogue -> KCatalog)
161 161
 
162
-- It would be nice if some insan^H^H^H brave soul had a look at the KAccel/KShortcut/KKeyWhatever
162
+- It would be nice if some insan^H^H^H brave soul had a look at the TDEAccel/TDEShortcut/KKeyWhatever
163 163
   classes and cleaned it up.
164 164
 
165 165
 - KKeyDialog needs to be improved. It should simplify using KKeyChooser by not having to instantiate
@@ -209,7 +209,7 @@ an alternative help->contents action)
209 209
 - Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well,
210 210
   KPixmapIO can't dither, and it generally doesn't make much sense to have this class.
211 211
 
212
-- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
212
+- TDEListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
213 213
   "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
214 214
 
215 215
 - Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,

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

@@ -101,22 +101,22 @@ void KVideoWidget::init(void)
101 101
     videoHeight	     = 0;
102 102
 
103 103
     // Setup actions
104
-    new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
104
+    new TDEToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
105 105
 		       CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
106 106
 		       actionCollection(), "fullscreen_mode" );
107
-    new KRadioAction( i18n("&Half Size"), ALT+Key_0,
107
+    new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
108 108
 		      TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
109 109
 		      actionCollection(), "half_size" );
110
-    new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
110
+    new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
111 111
 		      TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
112 112
 		      actionCollection(), "normal_size" );
113
-    new KRadioAction( i18n("&Double Size"), ALT+Key_2,
113
+    new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
114 114
 		      TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
115 115
 		      actionCollection(), "double_size" );
116 116
 
117
-    ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
118
-    ((KToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
119
-    ((KToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
117
+    ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
118
+    ((TDEToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
119
+    ((TDEToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
120 120
 
121 121
     action("double_size")->setEnabled(false);
122 122
     action("half_size")->setEnabled(false);
@@ -232,29 +232,29 @@ bool KVideoWidget::isEmbedded()
232 232
 
233 233
 bool KVideoWidget::isFullscreen()
234 234
 {
235
-    return ((KToggleAction *)action( "fullscreen_mode" ))->isChecked();
235
+    return ((TDEToggleAction *)action( "fullscreen_mode" ))->isChecked();
236 236
 }
237 237
 
238 238
 bool KVideoWidget::isHalfSize()
239 239
 {
240
-    return ((KToggleAction *)action( "half_size" ))->isChecked();
240
+    return ((TDEToggleAction *)action( "half_size" ))->isChecked();
241 241
 }
242 242
 
243 243
 bool KVideoWidget::isNormalSize()
244 244
 {
245
-    return ((KToggleAction *)action( "normal_size" ))->isChecked();
245
+    return ((TDEToggleAction *)action( "normal_size" ))->isChecked();
246 246
 }
247 247
 
248 248
 bool KVideoWidget::isDoubleSize()
249 249
 {
250
-    return ((KToggleAction *)action( "double_size" ))->isChecked();
250
+    return ((TDEToggleAction *)action( "double_size" ))->isChecked();
251 251
 }
252 252
 
253 253
 void KVideoWidget::setFullscreen()
254 254
 {
255 255
     if (!isFullscreen())
256 256
     {
257
-	((KToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
257
+	((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
258 258
 	fullscreenActivated();
259 259
     }
260 260
 }
@@ -263,26 +263,26 @@ void KVideoWidget::setWindowed()
263 263
 {
264 264
     if (isFullscreen())
265 265
     {
266
-	((KToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
266
+	((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
267 267
 	fullscreenActivated();
268 268
     }
269 269
 }
270 270
 
271 271
 void KVideoWidget::setHalfSize()
272 272
 {
273
-    ((KToggleAction *)action( "half_size" ))->setChecked( true );
273
+    ((TDEToggleAction *)action( "half_size" ))->setChecked( true );
274 274
     halfSizeActivated();
275 275
 }
276 276
 
277 277
 void KVideoWidget::setNormalSize()
278 278
 {
279
-    ((KToggleAction *)action( "normal_size" ))->setChecked( true );
279
+    ((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
280 280
     normalSizeActivated();
281 281
 }
282 282
 
283 283
 void KVideoWidget::setDoubleSize()
284 284
 {
285
-    ((KToggleAction *)action( "double_size" ))->setChecked( true );
285
+    ((TDEToggleAction *)action( "double_size" ))->setChecked( true );
286 286
     doubleSizeActivated();
287 287
 }
288 288
 
@@ -323,18 +323,18 @@ void KVideoWidget::resizeEvent( TQResizeEvent *event )
323 323
     {
324 324
 	if (width() == QMAX( (videoWidth / 2), minimumWidth() ) &&
325 325
 	         height() == QMAX( (videoHeight / 2), minimumHeight() ))
326
-	    ((KToggleAction *)action( "half_size" ))->setChecked( true );
326
+	    ((TDEToggleAction *)action( "half_size" ))->setChecked( true );
327 327
 	else if (width() == QMAX( videoWidth, minimumWidth() ) &&
328 328
 		 height() == QMAX( videoHeight, minimumHeight() ))
329
-	    ((KToggleAction *)action( "normal_size" ))->setChecked( true );
329
+	    ((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
330 330
 	else if (width() == QMAX( (2 * videoWidth), minimumWidth() ) &&
331 331
 		 height() == QMAX( (2 * videoHeight), minimumHeight() ))
332
-	    ((KToggleAction *)action( "double_size" ))->setChecked( true );
332
+	    ((TDEToggleAction *)action( "double_size" ))->setChecked( true );
333 333
 	else
334 334
 	{
335
-	    ((KToggleAction *)action( "half_size" ))->setChecked( false );
336
-	    ((KToggleAction *)action( "normal_size" ))->setChecked( false );
337
-	    ((KToggleAction *)action( "double_size" ))->setChecked( false );
335
+	    ((TDEToggleAction *)action( "half_size" ))->setChecked( false );
336
+	    ((TDEToggleAction *)action( "normal_size" ))->setChecked( false );
337
+	    ((TDEToggleAction *)action( "double_size" ))->setChecked( false );
338 338
 	}
339 339
     }
340 340
 }

+ 3
- 3
dcop/HOWTO View File

@@ -309,8 +309,8 @@ in that case the signal connection will always be deleted.
309 309
 A receiver can create a non-volatile connection while the sender doesn't (yet)
310 310
 exist. An anonymous DCOP connection should always be non-volatile.
311 311
 
312
-The following example shows how KLauncher emits a signal whenever it notices
313
-that an application that was started via KLauncher terminates.
312
+The following example shows how TDELauncher emits a signal whenever it notices
313
+that an application that was started via TDELauncher terminates.
314 314
 
315 315
    QByteArray params;
316 316
    QDataStream stream(params, IO_WriteOnly);
@@ -319,7 +319,7 @@ that an application that was started via KLauncher terminates.
319 319
 
320 320
 The task manager of the TDE panel connects to this signal. It uses an 
321 321
 anonymous connection (it doesn't require that the signal is being emitted
322
-by KLauncher) that is non-volatile:
322
+by TDELauncher) that is non-volatile:
323 323
 
324 324
    connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
325 325
 

+ 3
- 3
dcop/Mainpage.dox View File

@@ -541,8 +541,8 @@ in that case the signal connection will always be deleted.
541 541
 A receiver can create a non-volatile connection while the sender doesn't (yet)
542 542
 exist. An anonymous DCOP connection should always be non-volatile.
543 543
 
544
-The following example shows how KLauncher emits a signal whenever it notices
545
-that an application that was started via KLauncher terminates:
544
+The following example shows how TDELauncher emits a signal whenever it notices
545
+that an application that was started via TDELauncher terminates:
546 546
 
547 547
 \code
548 548
 QByteArray params;
@@ -553,7 +553,7 @@ kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
553 553
 
554 554
 The task manager of the Trinity panel connects to this signal. It uses an 
555 555
 anonymous connection (it doesn't require that the signal is being emitted
556
-by KLauncher) that is non-volatile:
556
+by TDELauncher) that is non-volatile:
557 557
 
558 558
 \code
559 559
 connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);

+ 1
- 1
interfaces/tdemediaplayer/player.h View File

@@ -39,7 +39,7 @@ namespace KMediaPlayer
39 39
  *
40 40
  * There are two servicetypes for Player:  KMediaPlayer/Player and
41 41
  * KMediaPlayer/Engine.  KMediaPlayer/Player provides a widget (accessable
42
- * through view as well as XML GUI KActions.  KMediaPlayer/Engine omits
42
+ * through view as well as XML GUI TDEActions.  KMediaPlayer/Engine omits
43 43
  * the user interface facets, for those who wish to provide their own
44 44
  * interface.
45 45
  */

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

@@ -33,11 +33,11 @@
33 33
 #include <tqfileinfo.h>
34 34
 
35 35
 
36
-ScriptLoader::ScriptLoader(KMainWindow *parent) : TQObject (parent)
36
+ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
37 37
 {
38 38
 	m_parent = parent;
39 39
 	m_scripts.clear();
40
-  	m_theAction = new KSelectAction ( i18n("KDE Scripts"),
40
+  	m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
41 41
 		0,
42 42
 		this,
43 43
 		TQT_SLOT(runAction()),
@@ -51,7 +51,7 @@ ScriptLoader::~ScriptLoader()
51 51
 	m_scripts.clear();
52 52
 }
53 53
 
54
-KSelectAction * ScriptLoader::getScripts()
54
+TDESelectAction * ScriptLoader::getScripts()
55 55
 {
56 56
 	// Get the available scripts for this application.
57 57
 	TQStringList pluginList = "";

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

@@ -33,12 +33,12 @@ class ScriptLoader : virtual public QObject
33 33
 		/** 
34 34
 		* Default Constructor
35 35
 		*/
36
-		ScriptLoader(KMainWindow *parent=0);
36
+		ScriptLoader(TDEMainWindow *parent=0);
37 37
 		~ScriptLoader();
38
-		/** Return the a KSelectAction with all of the scripts
39
-		 * @returns KSelectAction containing access to all of the scripts
38
+		/** Return the a TDESelectAction with all of the scripts
39
+		 * @returns TDESelectAction containing access to all of the scripts
40 40
 		 */
41
-		KSelectAction *getScripts();
41
+		TDESelectAction *getScripts();
42 42
 	public slots:
43 43
 		/** Run the current action.
44 44
 		*/
@@ -52,8 +52,8 @@ class ScriptLoader : virtual public QObject
52 52
 		virtual void done(int errorCode);
53 53
 	private:
54 54
 		TQPtrList<KScriptInterface> m_scripts;
55
-		KSelectAction *m_theAction;
55
+		TDESelectAction *m_theAction;
56 56
 		int m_currentSelection;
57
-		KMainWindow *m_parent;
57
+		TDEMainWindow *m_parent;
58 58
 };
59 59
 #endif

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

@@ -3,7 +3,7 @@
3 3
 
4 4
 
5 5
 class Win
6
-    : public KMainWindow
6
+    : public TDEMainWindow
7 7
 {
8 8
     Q_OBJECT
9 9
     KParts::Part* p;

+ 1
- 1
kab/kabapi.cc View File

@@ -36,7 +36,7 @@ using namespace std;
36 36
 KabAPI::KabAPI(TQWidget* parent, const char* name)
37 37
   : KDialogBase(parent, name),
38 38
     book(0),
39
-    listbox(new KListBox(this)),
39
+    listbox(new TDEListBox(this)),
40 40
     selection(-1)
41 41
 {
42 42
   TQ_CHECK_PTR(listbox);

+ 2
- 2
kab/kabapi.h View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 class TQPushButton;
24 24
 class TQFrame;
25
-class KListBox;
25
+class TDEListBox;
26 26
 
27 27
 /**
28 28
   * The class KabAPI provides a public interface to access the
@@ -189,7 +189,7 @@ protected:
189 189
   /**
190 190
    * This displays the overview over the addresses in the dialog.
191 191
    */
192
-  KListBox* listbox;
192
+  TDEListBox* listbox;
193 193
   /**
194 194
    * The index of the selected entry. This value is only valid after the
195 195
    * KabAPI dialog has been executed and accepted by the user.

+ 2
- 2
kabc/addresseedialog.cpp View File

@@ -66,7 +66,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
66 66
   TQBoxLayout *listLayout = new TQVBoxLayout;
67 67
   topLayout->addLayout( listLayout );
68 68
 
69
-  mAddresseeList = new KListView( topWidget );
69
+  mAddresseeList = new TDEListView( topWidget );
70 70
   mAddresseeList->addColumn( i18n("Name") );
71 71
   mAddresseeList->addColumn( i18n("Email") );
72 72
   mAddresseeList->setAllColumnsShowFocus( true );
@@ -96,7 +96,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
96 96
                                               topWidget );
97 97
     selectedLayout->addWidget( selectedGroup );
98 98
 
99
-    mSelectedList = new KListView( selectedGroup );
99
+    mSelectedList = new TDEListView( selectedGroup );
100 100
     mSelectedList->addColumn( i18n("Name") );
101 101
     mSelectedList->addColumn( i18n("Email") );
102 102
     mSelectedList->setAllColumnsShowFocus( true );

+ 2
- 2
kabc/addresseedialog.h View File

@@ -143,10 +143,10 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
143 143
 
144 144
     bool mMultiple;
145 145
 
146
-    KListView *mAddresseeList;
146
+    TDEListView *mAddresseeList;
147 147
     KLineEdit *mAddresseeEdit;
148 148
 
149
-    KListView *mSelectedList;
149
+    TDEListView *mSelectedList;
150 150
 
151 151
     AddressBook *mAddressBook;
152 152
 

+ 2
- 2
kabc/addresslineedit.cpp View File

@@ -156,12 +156,12 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
156 156
 {
157 157
     bool accept = false;
158 158
 
159
-    if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).contains(KKey(e)))
159
+    if (TDEStdAccel::shortcut(TDEStdAccel::SubstringCompletion).contains(KKey(e)))
160 160
     {
161 161
         doCompletion(true);
162 162
         accept = true;
163 163
     }
164
-    else if (KStdAccel::shortcut(KStdAccel::TextCompletion).contains(KKey(e)))
164
+    else if (TDEStdAccel::shortcut(TDEStdAccel::TextCompletion).contains(KKey(e)))
165 165
     {
166 166
         int len = text().length();
167 167
         

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

@@ -293,7 +293,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
293 293
     }
294 294
   }
295 295
 
296
-  KAcceleratorManager::manage( this );
296
+  TDEAcceleratorManager::manage( this );
297 297
 }
298 298
 
299 299
 AttributesDialog::~AttributesDialog()

+ 1
- 1
kabc/resourceselectdialog.cpp View File

@@ -45,7 +45,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
45 45
   TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal,  this );
46 46
   groupBox->setTitle( i18n( "Resources" ) );
47 47
 
48
-  mResourceId = new KListBox( groupBox );
48
+  mResourceId = new TDEListBox( groupBox );
49 49
 
50 50
   mainLayout->addWidget( groupBox );
51 51
 

+ 2
- 2
kabc/resourceselectdialog.h View File

@@ -26,7 +26,7 @@
26 26
 #include <kdialog.h>
27 27
 #include <kdemacros.h>
28 28
 
29
-class KListBox;
29
+class TDEListBox;
30 30
 
31 31
 namespace KABC {
32 32
 
@@ -48,7 +48,7 @@ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
48 48
     static Resource *getResource( AddressBook *ab, TQWidget *parent = 0 );
49 49
 
50 50
   private:
51
-    KListBox *mResourceId;
51
+    TDEListBox *mResourceId;
52 52
     TQMap<int, Resource*> mResourceMap;
53 53
 };
54 54
 

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

@@ -77,13 +77,13 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
77 77
     void slotChanged();
78 78
 };
79 79
 
80
-class KATEPARTINTERFACES_EXPORT ActionMenu : public KActionMenu
80
+class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
81 81
 {
82 82
   Q_OBJECT
83 83
 
84 84
   public:
85 85
     ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
86
-      : KActionMenu(text, parent, name) { ; };
86
+      : TDEActionMenu(text, parent, name) { ; };
87 87
     virtual ~ActionMenu () { ; };
88 88
 
89 89
   public:

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

@@ -159,7 +159,7 @@ KateAutoIndent::~KateAutoIndent ()
159 159
 
160 160
 //BEGIN KateViewIndentAction
161 161
 KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name)
162
-       : KActionMenu (text, parent, name), doc(_doc)
162
+       : TDEActionMenu (text, parent, name), doc(_doc)
163 163
 {
164 164
   connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
165 165
 }

+ 2
- 2
kate/part/kateautoindent.h View File

@@ -190,9 +190,9 @@ class KateAutoIndent : public TQObject
190 190
 
191 191
 /**
192 192
  * This action provides a list of available indenters and gets plugged
193
- * into the KateView's KActionCollection.
193
+ * into the KateView's TDEActionCollection.
194 194
  */
195
-class KateViewIndentationAction : public KActionMenu
195
+class KateViewIndentationAction : public TDEActionMenu
196 196
 {
197 197
   Q_OBJECT
198 198
 

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

@@ -71,34 +71,34 @@ KateBookmarks::~KateBookmarks()
71 71
 {
72 72
 }
73 73
 
74
-void KateBookmarks::createActions( KActionCollection* ac )
74
+void KateBookmarks::createActions( TDEActionCollection* ac )
75 75
 {
76
-  m_bookmarkToggle = new KToggleAction(
76
+  m_bookmarkToggle = new TDEToggleAction(
77 77
     i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
78 78
     this, TQT_SLOT(toggleBookmark()),
79 79
     ac, "bookmarks_toggle" );
80 80
   m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
81 81
   m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
82 82
 
83
-  m_bookmarkClear = new KAction(
83
+  m_bookmarkClear = new TDEAction(
84 84
     i18n("Clear &All Bookmarks"), 0,
85 85
     this, TQT_SLOT(clearBookmarks()),
86 86
     ac, "bookmarks_clear");
87 87
   m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
88 88
 
89
-  m_goNext = new KAction(
89
+  m_goNext = new TDEAction(
90 90
     i18n("Next Bookmark"), "next", ALT + Key_PageDown,
91 91
     this, TQT_SLOT(goNext()),
92 92
     ac, "bookmarks_next");
93 93
   m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
94 94
 
95
-  m_goPrevious = new KAction(
95
+  m_goPrevious = new TDEAction(
96 96
     i18n("Previous Bookmark"), "previous", ALT + Key_PageUp,
97 97
     this, TQT_SLOT(goPrevious()),
98 98
     ac, "bookmarks_previous");
99 99
   m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));
100 100
 
101
-  m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
101
+  m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
102 102
 
103 103
   //connect the aboutToShow() and aboutToHide() signals with
104 104
   //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots

+ 8
- 8
kate/part/katebookmarks.h View File

@@ -29,9 +29,9 @@ namespace KTextEditor { class Mark; }
29 29
 
30 30
 namespace Kate { class View; }
31 31
 
32
-class KAction;
33
-class KToggleAction;
34
-class KActionCollection;
32
+class TDEAction;
33
+class TDEToggleAction;
34
+class TDEActionCollection;
35 35
 class TQPopupMenu;
36 36
 class TQMenuData;
37 37
 
@@ -44,7 +44,7 @@ class KateBookmarks : public TQObject
44 44
     KateBookmarks( KateView* parent, Sorting sort=Position );
45 45
     virtual ~KateBookmarks();
46 46
 
47
-    void createActions( KActionCollection* );
47
+    void createActions( TDEActionCollection* );
48 48
 
49 49
     KateBookmarks::Sorting sorting() { return m_sorting; };
50 50
     void setSorting( Sorting s ) { m_sorting = s; };
@@ -69,10 +69,10 @@ class KateBookmarks : public TQObject
69 69
 
70 70
   private:
71 71
     KateView*                    m_view;
72
-    KToggleAction*               m_bookmarkToggle;
73
-    KAction*                     m_bookmarkClear;
74
-    KAction*                     m_goNext;
75
-    KAction*                     m_goPrevious;
72
+    TDEToggleAction*               m_bookmarkToggle;
73
+    TDEAction*                     m_bookmarkClear;
74
+    TDEAction*                     m_goNext;
75
+    TDEAction*                     m_goPrevious;
76 76
 
77 77
     Sorting                      m_sorting;
78 78
     TQPopupMenu*          m_bookmarksMenu;

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

@@ -1095,7 +1095,7 @@ void KatePartPluginListItem::stateChange(bool b)
1095 1095
 
1096 1096
 //BEGIN PluginListView
1097 1097
 KatePartPluginListView::KatePartPluginListView(TQWidget *parent, const char *name)
1098
-  : KListView(parent, name)
1098
+  : TDEListView(parent, name)
1099 1099
 {
1100 1100
 }
1101 1101
 

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

@@ -52,13 +52,13 @@ namespace TDEIO
52 52
   class TransferJob;
53 53
 }
54 54
 
55
-class KAccel;
55
+class TDEAccel;
56 56
 class KColorButton;
57 57
 class KComboBox;
58 58
 class KIntNumInput;
59 59
 class KKeyButton;
60 60
 class KKeyChooser;
61
-class KMainWindow;
61
+class TDEMainWindow;
62 62
 class KPushButton;
63 63
 class KRegExpDialog;
64 64
 class KIntNumInput;
@@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage
235 235
     bool m_ready;
236 236
     class KateDocument *m_doc;
237 237
     KKeyChooser* m_keyChooser;
238
-    class KActionCollection *m_ac;
238
+    class TDEActionCollection *m_ac;
239 239
 };
240 240
 
241 241
 class KateSaveConfigTab : public KateConfigPage
@@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage
263 263
 
264 264
 class KatePartPluginListItem;
265 265
 
266
-class KatePartPluginListView : public KListView
266
+class KatePartPluginListView : public TDEListView
267 267
 {
268 268
   Q_OBJECT
269 269
 

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

@@ -888,7 +888,7 @@ void KatePrintHeaderFooter::setHFFont()
888 888
 {
889 889
   TQFont fnt( lFontPreview->font() );
890 890
   // display a font dialog
891
-  if ( KFontDialog::getFont( fnt, false, this ) == KFontDialog::Accepted )
891
+  if ( TDEFontDialog::getFont( fnt, false, this ) == TDEFontDialog::Accepted )
892 892
   {
893 893
     // change strFont
894 894
     strFont = fnt.toString();

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

@@ -541,8 +541,8 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
541 541
     // sizemanagment
542 542
   TQGridLayout *grid = new TQGridLayout( this, 1, 1 );
543 543
 
544
-  m_fontchooser = new KFontChooser ( this, 0L, false, TQStringList(), false );
545
-  m_fontchooser->enableColumn(KFontChooser::StyleList, false);
544
+  m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false );
545
+  m_fontchooser->enableColumn(TDEFontChooser::StyleList, false);
546 546
   grid->addWidget( m_fontchooser, 0, 0);
547 547
 
548 548
   connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
@@ -1078,7 +1078,7 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
1078 1078
 {
1079 1079
   if ( !dynamic_cast<KateStyleListItem*>(i) ) return;
1080 1080
 
1081
-  KPopupMenu m( this );
1081
+  TDEPopupMenu m( this );
1082 1082
   KateAttribute *is = i->style();
1083 1083
   int id;
1084 1084
   // the title is used, because the menu obscures the context name when

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

@@ -90,13 +90,13 @@ class KateSchemaManager
90 90
 };
91 91
 
92 92
 
93
-class KateViewSchemaAction : public KActionMenu
93
+class KateViewSchemaAction : public TDEActionMenu
94 94
 {
95 95
   Q_OBJECT
96 96
 
97 97
   public:
98 98
     KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
99
-       : KActionMenu(text, parent, name) { init(); };
99
+       : TDEActionMenu(text, parent, name) { init(); };
100 100
 
101 101
     ~KateViewSchemaAction(){;};
102 102
 
@@ -226,7 +226,7 @@ class KateSchemaConfigFontTab : public TQWidget
226 226
     void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
227 227
 
228 228
   private:
229
-    class KFontChooser *m_fontchooser;
229
+    class TDEFontChooser *m_fontchooser;
230 230
     FontMap m_fonts;
231 231
     int m_schema;
232 232
 

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

@@ -66,7 +66,7 @@ KateSearch::~KateSearch()
66 66
   delete m_arbitraryHLList;
67 67
 }
68 68
 
69
-void KateSearch::createActions( KActionCollection* ac )
69
+void KateSearch::createActions( TDEActionCollection* ac )
70 70
 {
71 71
   KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
72 72
     i18n("Look up the first occurrence of a piece of text or regular expression."));

+ 2
- 2
kate/part/katesearch.h View File

@@ -37,7 +37,7 @@ class KateView;
37 37
 class KateDocument;
38 38
 class KateSuperRangeList;
39 39
 
40
-class KActionCollection;
40
+class TDEActionCollection;
41 41
 
42 42
 class KateSearch : public TQObject
43 43
 {
@@ -87,7 +87,7 @@ class KateSearch : public TQObject
87 87
     KateSearch( KateView* );
88 88
     ~KateSearch();
89 89
 
90
-    void createActions( KActionCollection* );
90
+    void createActions( TDEActionCollection* );
91 91
 
92 92
   public slots:
93 93
     void find();

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

@@ -51,13 +51,13 @@ KateSpell::~KateSpell()
51 51
   }
52 52
 }
53 53
 
54
-void KateSpell::createActions( KActionCollection* ac )
54
+void KateSpell::createActions( TDEActionCollection* ac )
55 55
 {
56 56
    KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
57
-   KAction *a = new KAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
57
+   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
58 58
    a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));
59 59
 
60
-   m_spellcheckSelection = new KAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
60
+   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
61 61
    m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
62 62
 }
63 63
 

+ 3
- 3
kate/part/katespell.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 class KateView;
29 29
 
30
-class KAction;
30
+class TDEAction;
31 31
 class KSpell;
32 32
 
33 33
 class KateSpell : public TQObject
@@ -38,7 +38,7 @@ class KateSpell : public TQObject
38 38
     KateSpell( KateView* );
39 39
     ~KateSpell();
40 40
 
41
-    void createActions( KActionCollection* );
41
+    void createActions( TDEActionCollection* );
42 42
 
43 43
     void updateActions ();
44 44
 
@@ -69,7 +69,7 @@ class KateSpell : public TQObject
69 69
 
70 70
   private:
71 71
     KateView *m_view;
72
-    KAction *m_spellcheckSelection;
72
+    TDEAction *m_spellcheckSelection;
73 73
 
74 74
     KSpell *m_tdespell;
75 75
 

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

@@ -207,8 +207,8 @@ void KateView::setupConnections()
207 207
 
208 208
 void KateView::setupActions()
209 209
 {
210
-  KActionCollection *ac = this->actionCollection ();
211
-  KAction *a;
210
+  TDEActionCollection *ac = this->actionCollection ();
211
+  TDEAction *a;
212 212
 
213 213
   m_toggleWriteLock = 0;
214 214
 
@@ -221,7 +221,7 @@ void KateView::setupActions()
221 221
   m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
222 222
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
223 223
 
224
-  m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
224
+  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
225 225
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
226 226
 
227 227
   if (!m_doc->readOnly())
@@ -235,56 +235,56 @@ void KateView::setupActions()
235 235
     a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
236 236
     a->setWhatsThis(i18n("Revert the most recent undo operation"));
237 237
 
238
-    (new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
238
+    (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
239 239
   i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
240 240
     " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
241 241
     " when the view is resized."));
242 242
 
243 243
     // setup Tools menu
244
-    a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
244
+    a=new TDEAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
245 245
     a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
246 246
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
247
-    a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
247
+    a=new TDEAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
248 248
     a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
249 249
 
250
-    a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
250
+    a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
251 251
     a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
252 252
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
253 253
 
254
-    a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
254
+    a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
255 255
     a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
256 256
 
257
-    a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
257
+    a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
258 258
         ac, "tools_comment");
259 259
     a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
260 260
         "The characters for single/multiple line comments are defined within the language's highlighting."));
261 261
 
262
-    a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
262
+    a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
263 263
                                  ac, "tools_uncomment");
264 264
     a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
265 265
     "The characters for single/multiple line comments are defined within the language's highlighting."));
266
-    a = m_toggleWriteLock = new KToggleAction(
266
+    a = m_toggleWriteLock = new TDEToggleAction(
267 267
                 i18n("&Read Only Mode"), 0, 0,
268 268
                 TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ),
269 269
                 ac, "tools_toggle_write_lock" );
270 270
     a->setWhatsThis( i18n("Lock/unlock the document for writing") );
271 271
 
272
-    a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
272
+    a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
273 273
       TQT_SLOT(uppercase()), ac, "tools_uppercase" );
274 274
     a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
275 275
       "right of the cursor if no text is selected.") );
276 276
 
277
-    a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
277
+    a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
278 278
       TQT_SLOT(lowercase()), ac, "tools_lowercase" );
279 279
     a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
280 280
       "right of the cursor if no text is selected.") );
281 281
 
282
-    a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
282
+    a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
283 283
       TQT_SLOT(capitalize()), ac, "tools_capitalize" );
284 284
     a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
285 285
       "cursor if no text is selected.") );
286 286
 
287
-    a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
287
+    a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
288 288
       TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
289 289
   }
290 290
   else
@@ -298,7 +298,7 @@ void KateView::setupActions()
298 298
   a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
299 299
   a->setWhatsThis(i18n("Print the current document."));
300 300
 
301
-  a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
301
+  a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
302 302
   a->setWhatsThis(i18n("Reload the current document from disk."));
303 303
 
304 304
   a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac);
@@ -307,7 +307,7 @@ void KateView::setupActions()
307 307
   a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac);
308 308
   a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
309 309
 
310
-  a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
310
+  a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
311 311
   a->setWhatsThis(i18n("Configure various aspects of this editor."));
312 312
 
313 313
   KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight");
@@ -324,7 +324,7 @@ void KateView::setupActions()
324 324
   new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
325 325
 
326 326
   // html export
327
-  a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
327
+  a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
328 328
   a->setWhatsThis(i18n("This command allows you to export the current document"
329 329
                       " with all highlighting information into a HTML document."));
330 330
 
@@ -334,32 +334,32 @@ void KateView::setupActions()
334 334
   m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
335 335
   a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
336 336
 
337
-  a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
337
+  a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
338 338
   a->setWhatsThis(i18n("This increases the display font size."));
339 339
 
340
-  a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
340
+  a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
341 341
   a->setWhatsThis(i18n("This decreases the display font size."));
342 342
 
343
-  a= m_toggleBlockSelection = new KToggleAction(
343
+  a= m_toggleBlockSelection = new TDEToggleAction(
344 344
     i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
345 345
     TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()),
346 346
     ac, "set_verticalSelect");
347 347
   a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
348 348
 
349
-  a= m_toggleInsert = new KToggleAction(
349
+  a= m_toggleInsert = new TDEToggleAction(
350 350
     i18n("Overwr&ite Mode"), Key_Insert,
351 351
     TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()),
352 352
     ac, "set_insert" );
353 353
   a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
354 354
 
355
-  KToggleAction *toggleAction;
356
-   a= m_toggleDynWrap = toggleAction = new KToggleAction(
355
+  TDEToggleAction *toggleAction;
356
+   a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
357 357
     i18n("&Dynamic Word Wrap"), Key_F10,
358 358
     TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()),
359 359
     ac, "view_dynamic_word_wrap" );
360 360
   a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
361 361
 
362
-  a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
362
+  a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
363 363
   a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
364 364
 
365 365
   connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int)));
@@ -369,14 +369,14 @@ void KateView::setupActions()
369 369
   list2.append(i18n("&Always On"));
370 370
   m_setDynWrapIndicators->setItems(list2);
371 371
 
372
-  a= toggleAction=m_toggleFoldingMarkers = new KToggleAction(
372
+  a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
373 373
     i18n("Show Folding &Markers"), Key_F9,
374 374
     TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()),
375 375
     ac, "view_folding_markers" );
376 376
   a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
377 377
   toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
378 378
 
379
-   a= m_toggleIconBar = toggleAction = new KToggleAction(
379
+   a= m_toggleIconBar = toggleAction = new TDEToggleAction(
380 380
     i18n("Show &Icon Border"), Key_F6,
381 381
     TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()),
382 382
     ac, "view_border");
@@ -384,21 +384,21 @@ void KateView::setupActions()
384 384
   a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
385 385
   toggleAction->setCheckedState(i18n("Hide &Icon Border"));
386 386
 
387
-  a= toggleAction=m_toggleLineNumbers = new KToggleAction(
387
+  a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
388 388
      i18n("Show &Line Numbers"), Key_F11,
389 389
      TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()),
390 390
      ac, "view_line_numbers" );
391 391
   a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
392 392
   toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
393 393
 
394
-  a= m_toggleScrollBarMarks = toggleAction = new KToggleAction(
394
+  a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
395 395
      i18n("Show Scroll&bar Marks"), 0,
396 396
      TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()),
397 397
      ac, "view_scrollbar_marks");
398 398
   a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
399 399
   toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
400 400
 
401
-  a = toggleAction = m_toggleWWMarker = new KToggleAction(
401
+  a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
402 402
         i18n("Show Static &Word Wrap Marker"), 0,
403 403
         TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ),
404 404
         ac, "view_word_wrap_marker" );
@@ -407,13 +407,13 @@ void KateView::setupActions()
407 407
         "wrap column as defined in the editing properties" ));
408 408
   toggleAction->setCheckedState(i18n("Hide Static &Word Wrap Marker"));
409 409
 
410
-  a= m_switchCmdLine = new KAction(
410
+  a= m_switchCmdLine = new TDEAction(
411 411
      i18n("Switch to Command Line"), Key_F7,
412 412
      TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()),
413 413
      ac, "switch_to_cmd_line" );
414 414
   a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
415 415
 
416
-  a=m_setEndOfLine = new KSelectAction(i18n("&End of Line"), 0, ac, "set_eol");
416
+  a=m_setEndOfLine = new TDESelectAction(i18n("&End of Line"), 0, ac, "set_eol");
417 417
   a->setWhatsThis(i18n("Choose which line endings should be used, when you save the document"));
418 418
   TQStringList list;
419 419
   list.append("&UNIX");
@@ -437,137 +437,137 @@ void KateView::setupActions()
437 437
 
438 438
 void KateView::setupEditActions()
439 439
 {
440
-  m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
441
-  KActionCollection* ac = m_editActions;
440
+  m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
441
+  TDEActionCollection* ac = m_editActions;
442 442
 
443
-  new KAction(
443
+  new TDEAction(
444 444
     i18n("Move Word Left"),                         CTRL + Key_Left,
445 445
     TQT_TQOBJECT(this),TQT_SLOT(wordLeft()),
446 446
     ac, "word_left" );
447
-  new KAction(
447
+  new TDEAction(
448 448
     i18n("Select Character Left"),          SHIFT +        Key_Left,
449 449
     TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()),
450 450
     ac, "select_char_left" );
451
-  new KAction(
451
+  new TDEAction(
452 452
     i18n("Select Word Left"),               SHIFT + CTRL + Key_Left,
453 453
     TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()),
454 454
     ac, "select_word_left" );
455 455
 
456
-  new KAction(
456
+  new TDEAction(
457 457
     i18n("Move Word Right"),                        CTRL + Key_Right,
458 458
     TQT_TQOBJECT(this), TQT_SLOT(wordRight()),
459 459
     ac, "word_right" );
460
-  new KAction(
460
+  new TDEAction(
461 461
     i18n("Select Character Right"),         SHIFT        + Key_Right,
462 462
     TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()),
463 463
     ac, "select_char_right" );
464
-  new KAction(
464
+  new TDEAction(
465 465
     i18n("Select Word Right"),              SHIFT + CTRL + Key_Right,
466 466
     TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()),
467 467
     ac, "select_word_right" );
468 468
 
469
-  new KAction(
469
+  new TDEAction(
470 470
     i18n("Move to Beginning of Line"),                      Key_Home,
471 471
     TQT_TQOBJECT(this), TQT_SLOT(home()),
472 472
     ac, "beginning_of_line" );
473
-  new KAction(
474
-    i18n("Move to Beginning of Document"),           KStdAccel::home(),
473
+  new TDEAction(
474
+    i18n("Move to Beginning of Document"),           TDEStdAccel::home(),
475 475
     TQT_TQOBJECT(this), TQT_SLOT(top()),
476 476
     ac, "beginning_of_document" );
477
-  new KAction(
477
+  new TDEAction(
478 478
     i18n("Select to Beginning of Line"),     SHIFT +        Key_Home,
479 479
     TQT_TQOBJECT(this), TQT_SLOT(shiftHome()),
480 480
     ac, "select_beginning_of_line" );
481
-  new KAction(
481
+  new TDEAction(
482 482
     i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
483 483
     TQT_TQOBJECT(this), TQT_SLOT(shiftTop()),
484 484
     ac, "select_beginning_of_document" );
485 485
 
486
-  new KAction(
486
+  new TDEAction(
487 487
     i18n("Move to End of Line"),                            Key_End,
488 488
     TQT_TQOBJECT(this), TQT_SLOT(end()),
489 489
     ac, "end_of_line" );
490
-  new KAction(
491
-    i18n("Move to End of Document"),                 KStdAccel::end(),
490
+  new TDEAction(
491
+    i18n("Move to End of Document"),                 TDEStdAccel::end(),
492 492
     TQT_TQOBJECT(this), TQT_SLOT(bottom()),
493 493
     ac, "end_of_document" );
494
-  new KAction(
494
+  new TDEAction(
495 495
     i18n("Select to End of Line"),           SHIFT +        Key_End,
496 496
     TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()),
497 497
     ac, "select_end_of_line" );
498
-  new KAction(
498
+  new TDEAction(
499 499
     i18n("Select to End of Document"),       SHIFT + CTRL + Key_End,
500 500
     TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()),
501 501
     ac, "select_end_of_document" );
502 502
 
503
-  new KAction(
503
+  new TDEAction(
504 504
     i18n("Select to Previous Line"),                SHIFT + Key_Up,
505 505
     TQT_TQOBJECT(this), TQT_SLOT(shiftUp()),
506 506
     ac, "select_line_up" );
507
-  new KAction(
507
+  new TDEAction(
508 508
     i18n("Scroll Line Up"),"",              CTRL +          Key_Up,
509 509
     TQT_TQOBJECT(this), TQT_SLOT(scrollUp()),
510 510
     ac, "scroll_line_up" );
511 511
 
512
-  new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
512
+  new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
513 513
 	      ac, "move_line_down");
514 514
 
515
-  new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
515
+  new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
516 516
 	      ac, "move_line_up");
517 517
 
518
-  new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
518
+  new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
519 519
 	      TQT_SLOT(cursorRight()), ac, "move_cursor_right");
520 520
 
521
-  new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
521
+  new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
522 522
 	      ac, "move_cusor_left");
523 523
 
524
-  new KAction(
524
+  new TDEAction(
525 525
     i18n("Select to Next Line"),                    SHIFT + Key_Down,
526 526
     TQT_TQOBJECT(this), TQT_SLOT(shiftDown()),
527 527
     ac, "select_line_down" );
528
-  new KAction(
528
+  new TDEAction(
529 529
     i18n("Scroll Line Down"),               CTRL +          Key_Down,
530 530
     TQT_TQOBJECT(this), TQT_SLOT(scrollDown()),
531 531
     ac, "scroll_line_down" );
532 532
 
533
-  new KAction(
534
-    i18n("Scroll Page Up"),                         KStdAccel::prior(),
533
+  new TDEAction(
534
+    i18n("Scroll Page Up"),                         TDEStdAccel::prior(),
535 535
     TQT_TQOBJECT(this), TQT_SLOT(pageUp()),
536 536
     ac, "scroll_page_up" );
537
-  new KAction(
537
+  new TDEAction(
538 538
     i18n("Select Page Up"),                         SHIFT + Key_PageUp,
539 539
     TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()),
540 540
     ac, "select_page_up" );
541
-  new KAction(
541
+  new TDEAction(
542 542
     i18n("Move to Top of View"),             CTRL +         Key_PageUp,
543 543
     TQT_TQOBJECT(this), TQT_SLOT(topOfView()),
544 544
     ac, "move_top_of_view" );
545
-  new KAction(
545
+  new TDEAction(
546 546
     i18n("Select to Top of View"),             CTRL + SHIFT +  Key_PageUp,
547 547
     TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()),
548 548
     ac, "select_top_of_view" );
549 549
 
550
-  new KAction(
551
-    i18n("Scroll Page Down"),                          KStdAccel::next(),
550
+  new TDEAction(
551
+    i18n("Scroll Page Down"),                          TDEStdAccel::next(),
552 552
     TQT_TQOBJECT(this), TQT_SLOT(pageDown()),
553 553
     ac, "scroll_page_down" );
554
-  new KAction(
554
+  new TDEAction(
555 555
     i18n("Select Page Down"),                       SHIFT + Key_PageDown,
556 556
     TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()),
557 557
     ac, "select_page_down" );
558
-  new KAction(
558
+  new TDEAction(
559 559
     i18n("Move to Bottom of View"),          CTRL +         Key_PageDown,
560 560
     TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()),
561 561
     ac, "move_bottom_of_view" );
562
-  new KAction(
562
+  new TDEAction(
563 563
     i18n("Select to Bottom of View"),         CTRL + SHIFT + Key_PageDown,
564 564
     TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()),
565 565
     ac, "select_bottom_of_view" );
566
-  new KAction(
566
+  new TDEAction(
567 567
     i18n("Move to Matching Bracket"),               CTRL + Key_6,
568 568
     TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()),
569 569
     ac, "to_matching_bracket" );
570
-  new KAction(
570
+  new TDEAction(
571 571
     i18n("Select to Matching Bracket"),      SHIFT + CTRL + Key_6,
572 572
     TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()),
573 573
     ac, "select_matching_bracket" );
@@ -575,34 +575,34 @@ void KateView::setupEditActions()
575 575
   // anders: shortcuts doing any changes should not be created in browserextension
576 576
   if ( !m_doc->readOnly() )
577 577
   {
578
-    new KAction(
578
+    new TDEAction(
579 579
       i18n("Transpose Characters"),           CTRL + Key_T,
580 580
       TQT_TQOBJECT(this), TQT_SLOT(transpose()),
581 581
       ac, "transpose_char" );
582 582
 
583
-    new KAction(
583
+    new TDEAction(
584 584
       i18n("Delete Line"),                    CTRL + Key_K,
585 585
       TQT_TQOBJECT(this), TQT_SLOT(killLine()),
586 586
       ac, "delete_line" );
587 587
 
588
-    new KAction(
589
-      i18n("Delete Word Left"),               KStdAccel::deleteWordBack(),
588
+    new TDEAction(
589
+      i18n("Delete Word Left"),               TDEStdAccel::deleteWordBack(),
590 590
       TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()),
591 591
       ac, "delete_word_left" );
592 592
 
593
-    new KAction(
594
-      i18n("Delete Word Right"),              KStdAccel::deleteWordForward(),
593
+    new TDEAction(
594
+      i18n("Delete Word Right"),              TDEStdAccel::deleteWordForward(),
595 595
       TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()),
596 596
       ac, "delete_word_right" );
597 597
 
598
-    new KAction(i18n("Delete Next Character"), Key_Delete,
598
+    new TDEAction(i18n("Delete Next Character"), Key_Delete,
599 599
                 TQT_TQOBJECT(this), TQT_SLOT(keyDelete()),
600 600
                 ac, "delete_next_character");
601 601
 
602
-    KAction *a = new KAction(i18n("Backspace"), Key_Backspace,
602
+    TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
603 603
                 TQT_TQOBJECT(this), TQT_SLOT(backspace()),
604 604
                 ac, "backspace");
605
-    KShortcut cut = a->shortcut();
605
+    TDEShortcut cut = a->shortcut();
606 606
     cut.append( KKey( SHIFT + Key_Backspace ) );
607 607
     a->setShortcut( cut );
608 608
   }
@@ -624,18 +624,18 @@ void KateView::setupEditActions()
624 624
 
625 625
 void KateView::setupCodeFolding()
626 626
 {
627
-  KActionCollection *ac=this->actionCollection();
628
-  new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
627
+  TDEActionCollection *ac=this->actionCollection();
628
+  new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
629 629
        m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
630
-  new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
630
+  new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
631 631
        TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
632
-  new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
632
+  new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
633 633
        TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
634
-  new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
634
+  new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
635 635
        TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
636 636
 
637 637
 #ifdef DEBUGACCELS
638
-  KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this));
638
+  TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this));
639 639
   debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
640 640
   debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
641 641
   debugAccels->setEnabled(true);
@@ -760,7 +760,7 @@ void KateView::slotReadWriteChanged ()
760 760
       << "edit_undo" << "edit_redo" << "tools_spelling_from_cursor"
761 761
       << "tools_spelling_selection";
762 762
 
763
-  KAction *a = 0;
763
+  TDEAction *a = 0;
764 764
   for (uint z = 0; z < l.size(); z++)
765 765
     if ((a = actionCollection()->action( l[z].ascii() )))
766 766
       a->setEnabled (m_doc->isReadWrite());
@@ -1256,7 +1256,7 @@ void KateView::updateFoldingConfig ()
1256 1256
   l << "folding_toplevel" << "folding_expandtoplevel"
1257 1257
     << "folding_collapselocal" << "folding_expandlocal";
1258 1258
 
1259
-  KAction *a = 0;
1259
+  TDEAction *a = 0;
1260 1260
   for (uint z = 0; z < l.size(); z++)
1261 1261
     if ((a = actionCollection()->action( l[z].ascii() )))
1262 1262
       a->setEnabled (m_doc->highlight() && m_doc->highlight()->allowsFolding());

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

@@ -44,10 +44,10 @@ class KateViewSchemaAction;
44 44
 class KateRenderer;
45 45
 class KateSpell;
46 46
 
47
-class KToggleAction;
48
-class KAction;
49
-class KRecentFilesAction;
50
-class KSelectAction;
47
+class TDEToggleAction;
48
+class TDEAction;
49
+class TDERecentFilesAction;
50
+class TDESelectAction;
51 51
 
52 52
 class TQGridLayout;
53 53
 
@@ -429,7 +429,7 @@ class KateView : public Kate::View,
429 429
     // Is it really necessary to have 3 methods for this?! :)
430 430
     KateDocument*  doc() const       { return m_doc; }
431 431
 
432
-    KActionCollection* editActionCollection() const { return m_editActions; }
432
+    TDEActionCollection* editActionCollection() const { return m_editActions; }
433 433
 
434 434
   public slots:
435 435
     void slotNewUndo();
@@ -472,31 +472,31 @@ class KateView : public Kate::View,
472 472
     void setupCodeFolding();
473 473
     void setupCodeCompletion();
474 474
 
475
-    KActionCollection*     m_editActions;
476
-    KAction*               m_editUndo;
477
-    KAction*               m_editRedo;
478
-    KRecentFilesAction*    m_fileRecent;
479
-    KToggleAction*         m_toggleFoldingMarkers;
480
-    KToggleAction*         m_toggleIconBar;
481
-    KToggleAction*         m_toggleLineNumbers;
482
-    KToggleAction*         m_toggleScrollBarMarks;
483
-    KToggleAction*         m_toggleDynWrap;
484
-    KSelectAction*         m_setDynWrapIndicators;
485
-    KToggleAction*         m_toggleWWMarker;
486
-    KAction*               m_switchCmdLine;
487
-
488
-    KSelectAction*         m_setEndOfLine;
489
-
490
-    KAction *m_cut;
491
-    KAction *m_copy;
492
-    KAction *m_copyHTML;
493
-    KAction *m_paste;
494
-    KAction *m_selectAll;
495
-    KAction *m_deSelect;
496
-
497
-    KToggleAction *m_toggleBlockSelection;
498
-    KToggleAction *m_toggleInsert;
499
-    KToggleAction *m_toggleWriteLock;
475
+    TDEActionCollection*     m_editActions;
476
+    TDEAction*               m_editUndo;
477
+    TDEAction*               m_editRedo;
478
+    TDERecentFilesAction*    m_fileRecent;
479
+    TDEToggleAction*         m_toggleFoldingMarkers;
480
+    TDEToggleAction*         m_toggleIconBar;
481
+    TDEToggleAction*         m_toggleLineNumbers;
482
+    TDEToggleAction*         m_toggleScrollBarMarks;
483
+    TDEToggleAction*         m_toggleDynWrap;
484
+    TDESelectAction*         m_setDynWrapIndicators;
485
+    TDEToggleAction*         m_toggleWWMarker;
486
+    TDEAction*               m_switchCmdLine;
487
+
488
+    TDESelectAction*         m_setEndOfLine;
489
+
490
+    TDEAction *m_cut;
491
+    TDEAction *m_copy;
492
+    TDEAction *m_copyHTML;
493
+    TDEAction *m_paste;
494
+    TDEAction *m_selectAll;
495
+    TDEAction *m_deSelect;
496
+
497
+    TDEToggleAction *m_toggleBlockSelection;
498
+    TDEToggleAction *m_toggleInsert;
499
+    TDEToggleAction *m_toggleWriteLock;
500 500
 
501 501
     KateDocument*          m_doc;
502 502
     KateViewInternal*      m_viewInternal;

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

@@ -1168,7 +1168,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
1168 1168
 //END KateIconBorder
1169 1169
 
1170 1170
 KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name)
1171
-       : KActionMenu (text, parent, name), doc(_doc), view (_view)
1171
+       : TDEActionMenu (text, parent, name), doc(_doc), view (_view)
1172 1172
 {
1173 1173
   connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
1174 1174
 }

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

@@ -182,7 +182,7 @@ class KateIconBorder : public TQWidget
182 182
     mutable TQColor m_oldBackgroundColor;
183 183
 };
184 184
 
185
-class KateViewEncodingAction : public KActionMenu
185
+class KateViewEncodingAction : public TDEActionMenu
186 186
 {
187 187
   Q_OBJECT
188 188
 

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

@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
511 511
 
512 512
     // create widgets
513 513
     KateFactory *fac = KateFactory::self();
514
-    KMainWindow *toplevel = new KMainWindow();
514
+    TDEMainWindow *toplevel = new TDEMainWindow();
515 515
     KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
516 516
                                           /*bBrowserView*/false,
517 517
                                           /*bReadOnly*/false,

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

@@ -253,7 +253,7 @@ void ABGlobal::writeConfig()
253 253
 class AutoBookmarkEntItem : public QListViewItem
254 254
 {
255 255
   public:
256
-    AutoBookmarkEntItem( KListView *lv, AutoBookmarkEnt *e )
256
+    AutoBookmarkEntItem( TDEListView *lv, AutoBookmarkEnt *e )
257 257
         : TQListViewItem( lv ),
258 258
         ent( e )
259 259
       {
@@ -383,7 +383,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char
383 383
 
384 384
   TQLabel *l = new TQLabel( i18n("&Patterns"), this );
385 385
   lo->addWidget( l );
386
-  lvPatterns = new KListView( this );
386
+  lvPatterns = new TDEListView( this );
387 387
   lvPatterns->addColumn( i18n("Pattern") );
388 388
   lvPatterns->addColumn( i18n("Mime Types") );
389 389
   lvPatterns->addColumn( i18n("File Masks") );

+ 1
- 1
kate/plugins/autobookmarker/autobookmarker.h View File

@@ -111,7 +111,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
111 111
     void slotEdit();
112 112
 
113 113
   private:
114
-    class KListView *lvPatterns;
114
+    class TDEListView *lvPatterns;
115 115
     class TQPushButton *btnNew, *btnDel, *btnEdit;
116 116
     ABEntityList *m_ents;
117 117
 };

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

@@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
76 76
   view->insertChildClient( this );
77 77
   setInstance( KGenericFactory<InsertFilePlugin>::instance() );
78 78
   _job = 0;
79
-  (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
79
+  (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
80 80
   setXMLFile( "tdetexteditor_insertfileui.rc" );
81 81
 }
82 82
 

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

@@ -64,11 +64,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
64 64
 
65 65
 	setInstance( KGenericFactory<ISearchPlugin>::instance() );
66 66
 
67
-	m_searchForwardAction = new KAction(
67
+	m_searchForwardAction = new TDEAction(
68 68
 		i18n("Search Incrementally"), CTRL+ALT+Key_F,
69 69
 		this, TQT_SLOT(slotSearchForwardAction()),
70 70
 		actionCollection(), "edit_isearch" );
71
-	m_searchBackwardAction = new KAction(
71
+	m_searchBackwardAction = new TDEAction(
72 72
 		i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F,
73 73
 		this, TQT_SLOT(slotSearchBackwardAction()),
74 74
 		actionCollection(), "edit_isearch_reverse" );
@@ -97,13 +97,13 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
97 97
 	m_comboAction->setAutoSized( true );
98 98
 	m_comboAction->setShortcutConfigurable( false );
99 99
 
100
-	KActionMenu* optionMenu = new KActionMenu(
100
+	TDEActionMenu* optionMenu = new TDEActionMenu(
101 101
 		i18n("Search Options"), "configure",
102 102
 		actionCollection(), "isearch_options" );
103 103
 	optionMenu->setDelayed( false );
104 104
 
105
-	KToggleAction* action = new KToggleAction(
106
-		i18n("Case Sensitive"), KShortcut(),
105
+	TDEToggleAction* action = new TDEToggleAction(
106
+		i18n("Case Sensitive"), TDEShortcut(),
107 107
 		actionCollection(), "isearch_case_sensitive" );
108 108
 	action->setShortcutConfigurable( false );
109 109
 	connect( action, TQT_SIGNAL(toggled(bool)),
@@ -111,8 +111,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
111 111
 	action->setChecked( m_caseSensitive );
112 112
 	optionMenu->insert( action );
113 113
 
114
-	action = new KToggleAction(
115
-		i18n("From Beginning"), KShortcut(),
114
+	action = new TDEToggleAction(
115
+		i18n("From Beginning"), TDEShortcut(),
116 116
 		actionCollection(), "isearch_from_beginning" );
117 117
 	action->setShortcutConfigurable( false );
118 118
 	connect( action, TQT_SIGNAL(toggled(bool)),
@@ -120,8 +120,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
120 120
 	action->setChecked( m_fromBeginning );
121 121
 	optionMenu->insert( action );
122 122
 
123
-	action = new KToggleAction(
124
-		i18n("Regular Expression"), KShortcut(),
123
+	action = new TDEToggleAction(
124
+		i18n("Regular Expression"), TDEShortcut(),
125 125
 		actionCollection(), "isearch_reg_exp" );
126 126
 	action->setShortcutConfigurable( false );
127 127
 	connect( action, TQT_SIGNAL(toggled(bool)),
@@ -129,10 +129,10 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
129 129
 	action->setChecked( m_regExp );
130 130
 	optionMenu->insert( action );
131 131
 
132
-// 	optionMenu->insert( new KActionSeparator() );
132
+// 	optionMenu->insert( new TDEActionSeparator() );
133 133
 //
134
-// 	action = new KToggleAction(
135
-// 		i18n("Auto-Wrap Search"), KShortcut(),
134
+// 	action = new TDEToggleAction(
135
+// 		i18n("Auto-Wrap Search"), TDEShortcut(),
136 136
 // 		actionCollection(), "isearch_auto_wrap" );
137 137
 // 	connect( action, TQT_SIGNAL(toggled(bool)),
138 138
 // 	         this, TQT_SLOT(setAutoWrap(bool)) );

+ 2
- 2
kate/plugins/isearch/ISearchPlugin.h View File

@@ -92,8 +92,8 @@ private:
92 92
 	KTextEditor::SearchInterface* m_searchIF;
93 93
 	KTextEditor::ViewCursorInterface* m_cursorIF;
94 94
 	KTextEditor::SelectionInterface* m_selectIF;
95
-	KAction*               m_searchForwardAction;
96
-	KAction*               m_searchBackwardAction;
95
+	TDEAction*               m_searchForwardAction;
96
+	TDEAction*               m_searchBackwardAction;
97 97
 	KWidgetAction*         m_comboAction;
98 98
 	TQGuardedPtr<TQLabel>    m_label;
99 99
 	TQGuardedPtr<KHistoryCombo> m_combo;

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

@@ -75,7 +75,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
75 75
 	view->insertChildClient (this);
76 76
 	setInstance( KGenericFactory<KDataToolPlugin>::instance() );
77 77
 
78
-	m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
78
+	m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
79 79
 	connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
80 80
 	setXMLFile("tdetexteditor_kdatatoolui.rc");
81 81
 
@@ -96,7 +96,7 @@ void KDataToolPluginView::aboutToShow()
96 96
 	m_wordUnderCursor = TQString::null;
97 97
 
98 98
 	// unplug old actions, if any:
99
-	KAction *ac;
99
+	TDEAction *ac;
100 100
 	for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) {
101 101
 		m_menu->remove(ac);
102 102
 	}
@@ -150,7 +150,7 @@ void KDataToolPluginView::aboutToShow()
150 150
 			m_singleWord = true;
151 151
 			m_singleWord_line = line;
152 152
 		} else {
153
-			m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this, 
153
+			m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, 
154 154
 					TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
155 155
 			m_menu->insert(m_notAvailable);
156 156
 			return;
@@ -172,7 +172,7 @@ void KDataToolPluginView::aboutToShow()
172 172
 	}
173 173
 
174 174
 	if( m_actionList.isEmpty() ) {
175
-		m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this,
175
+		m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this,
176 176
 			TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
177 177
 		m_menu->insert(m_notAvailable);
178 178
 	}

+ 4
- 4
kate/plugins/kdatatool/kate_kdatatool.h View File

@@ -26,7 +26,7 @@
26 26
 #include <kxmlguiclient.h>
27 27
 #include <tqguardedptr.h>
28 28
 
29
-class KActionMenu;
29
+class TDEActionMenu;
30 30
 class KDataToolInfo;
31 31
 
32 32
 namespace KTextEditor
@@ -62,9 +62,9 @@ private:
62 62
 	bool m_singleWord;
63 63
 	int m_singleWord_line, m_singleWord_start, m_singleWord_end;
64 64
 	TQString m_wordUnderCursor;
65
-	TQPtrList<KAction> m_actionList;
66
-	TQGuardedPtr<KActionMenu> m_menu;
67
-	KAction *m_notAvailable;
65
+	TQPtrList<TDEAction> m_actionList;
66
+	TQGuardedPtr<TDEActionMenu> m_menu;
67
+	TDEAction *m_notAvailable;
68 68
 protected slots:
69 69
 	void aboutToShow();
70 70
 	void slotToolActivated( const KDataToolInfo &datatoolinfo, const TQString &string );

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

@@ -130,7 +130,7 @@ struct DocWordCompletionPluginViewPrivate
130 130
   TQString last;         // last word we were trying to match
131 131
   TQString lastIns;      // latest applied completion
132 132
   TQRegExp re;           // hrm
133
-  KToggleAction *autopopup; // for accessing state
133
+  TDEToggleAction *autopopup; // for accessing state
134 134
   uint treshold;        // the required length of a word before popping up the completion list automatically
135 135
   int directionalPos;   // be able to insert "" at the correct time
136 136
 };
@@ -145,15 +145,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au
145 145
   view->insertChildClient( this );
146 146
   setInstance( KGenericFactory<DocWordCompletionPlugin>::instance() );
147 147
 
148
-  (void) new KAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
148
+  (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
149 149
     TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" );
150
-  (void) new KAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
150
+  (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
151 151
     TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" );
152
-  (void) new KAction( i18n("Pop Up Completion List"), 0, this,
152
+  (void) new TDEAction( i18n("Pop Up Completion List"), 0, this,
153 153
     TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" );
154
-  (void) new KAction( i18n("Shell Completion"), 0, this,
154
+  (void) new TDEAction( i18n("Shell Completion"), 0, this,
155 155
     TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" );
156
-  d->autopopup = new KToggleAction( i18n("Automatic Completion Popup"), 0, this,
156
+  d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this,
157 157
     TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" );
158 158
 
159 159
   d->autopopup->setChecked( autopopup );

+ 1
- 1
kded/kded.cpp View File

@@ -468,7 +468,7 @@ void Kded::runDelayedCheck()
468 468
 void Kded::recreate(bool initial)
469 469
 {
470 470
    m_recreateBusy = true;
471
-   // Using KLauncher here is difficult since we might not have a
471
+   // Using TDELauncher here is difficult since we might not have a
472 472
    // database
473 473
 
474 474
    if (!initial)

+ 8
- 8
kdewidgets/kde.widgets View File

@@ -55,19 +55,19 @@ Group=Graphics (KDE)
55 55
 ToolTip=Fullfeatured edit box with buttons (KDE)
56 56
 Group=Views (KDE)
57 57
 
58
-[KFontCombo]
58
+[TDEFontCombo]
59 59
 ToolTip=Font Combo Box (KDE)
60 60
 WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
61 61
 Group=Input (KDE)
62 62
 
63
-[KFontChooser]
63
+[TDEFontChooser]
64 64
 IncludeFile=kfontdialog.h
65 65
 IconSet=kfontcombo.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
-[KFontRequester]
70
+[TDEFontRequester]
71 71
 IncludeFile=kfontrequester.h
72 72
 ToolTip=Font Requester (KDE)
73 73
 WhatsThis=A compact font selection and preview widget
@@ -94,12 +94,12 @@ ToolTip=LED Widget (KDE)
94 94
 WhatsThis=A widget showing a light emitter diode
95 95
 Group=Display (KDE)
96 96
 
97
-[KListBox]
97
+[TDEListBox]
98 98
 ToolTip=Extended List Box (KDE)
99 99
 WhatsThis=An improved version of the TQListBox that follows KDE settings
100 100
 Group=Views (KDE)
101 101
 
102
-[KListView]
102
+[TDEListView]
103 103
 ToolTip=Extended List View (KDE)
104 104
 WhatsThis=An improved version of the TQListView that allows certain KDE extensions
105 105
 Group=Views (KDE)
@@ -108,12 +108,12 @@ Group=Views (KDE)
108 108
 ToolTip=Line Edit (KDE)
109 109
 Group=Input (KDE)
110 110
 
111
-[KListViewSearchLine]
111
+[TDEListViewSearchLine]
112 112
 ToolTip=ListView Search Line (KDE)
113 113
 Group=Input (KDE)
114 114
 ConstructorArgs=(parent, 0, name)
115 115
 
116
-[KListViewSearchLineWidget]
116
+[TDEListViewSearchLineWidget]
117 117
 ToolTip=ListView Search Line Widget (KDE)
118 118
 IncludeFile=klistviewsearchline.h
119 119
 Group=Input (KDE)
@@ -243,7 +243,7 @@ ToolTip=A widget that provides a image preview of a URL
243 243
 Group=Display (KDE)
244 244
 ConstructorArgs=(parent)
245 245
 
246
-[KActionSelector]
246
+[TDEActionSelector]
247 247
 IncludeFile=kactionselector.h
248 248
 ToolTip=A widget for selecting and arranging actions/objects
249 249
 Group=Views (KDE)

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

@@ -55,19 +55,19 @@ Group=Graphics (KDE)
55 55
 ToolTip=Fullfeatured edit box with buttons (KDE)
56 56
 Group=Views (KDE)
57 57
 
58
-[KFontCombo]
58
+[TDEFontCombo]
59 59
 ToolTip=Font Combo Box (KDE)
60 60
 WhatsThis=A QCombo Box showing the installed system fonts (with preview)
61 61
 Group=Input (KDE)
62 62
 
63
-[KFontChooser]
63
+[TDEFontChooser]
64 64
 IncludeFile=kfontdialog.h
65 65
 IconSet=kfontcombo.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
-[KFontRequester]
70
+[TDEFontRequester]
71 71
 IncludeFile=kfontrequester.h
72 72
 ToolTip=Font Requester (KDE)
73 73
 WhatsThis=A compact font selection and preview widget
@@ -94,12 +94,12 @@ ToolTip=LED Widget (KDE)
94 94
 WhatsThis=A widget showing a light emitter diode
95 95
 Group=Display (KDE)
96 96
 
97
-[KListBox]
97
+[TDEListBox]
98 98
 ToolTip=Extended List Box (KDE)
99 99
 WhatsThis=An improved version of the QListBox that follows KDE settings
100 100
 Group=Views (KDE)
101 101
 
102
-[KListView]
102
+[TDEListView]
103 103
 ToolTip=Extended List View (KDE)
104 104
 WhatsThis=An improved version of the QListView that allows certain KDE extensions
105 105
 Group=Views (KDE)
@@ -232,7 +232,7 @@ ToolTip=A widget that provides a image preview of a URL
232 232
 Group=Display (KDE)
233 233
 ConstructorArgs=(parent)
234 234
 
235
-[KActionSelector]
235
+[TDEActionSelector]
236 236
 IncludeFile=kactionselector.h
237 237
 ToolTip=A widget for selecting and arranging actions/objects
238 238
 Group=Views (KDE)

+ 1
- 1
kinit/README.DCOP View File

@@ -1,4 +1,4 @@
1
-"KLauncher" supports the following DCOP functions:
1
+"TDELauncher" supports the following DCOP functions:
2 2
 
3 3
 /**
4 4
  * Starts a program.

+ 4
- 4
kinit/kinit.cpp View File

@@ -1074,9 +1074,9 @@ static void launcher_died()
1074 1074
       return;
1075 1075
    }
1076 1076
 
1077
-   // KLauncher died... restart
1077
+   // TDELauncher died... restart
1078 1078
 #ifndef NDEBUG
1079
-   fprintf(stderr, "[tdeinit] KLauncher died unexpectedly.\n");
1079
+   fprintf(stderr, "[tdeinit] TDELauncher died unexpectedly.\n");
1080 1080
 #endif
1081 1081
    // Make sure it's really dead.
1082 1082
    if (d.launcher_pid)
@@ -1092,7 +1092,7 @@ static void launcher_died()
1092 1092
 
1093 1093
    pid_t pid = launch( 1, "tdelauncher", 0 );
1094 1094
 #ifndef NDEBUG
1095
-   fprintf(stderr, "[tdeinit] Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
1095
+   fprintf(stderr, "[tdeinit] Relaunching TDELauncher, pid = %ld result = %d\n", (long) pid, d.result);
1096 1096
 #endif
1097 1097
 }
1098 1098
 
@@ -1819,7 +1819,7 @@ int main(int argc, char **argv, char **envp)
1819 1819
       else
1820 1820
          pid = launch( 1, "tdelauncher", 0 );
1821 1821
 #ifndef NDEBUG
1822
-      fprintf(stderr, "[tdeinit] Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
1822
+      fprintf(stderr, "[tdeinit] Launched TDELauncher, pid = %ld result = %d\n", (long) pid, d.result);
1823 1823
 #endif
1824 1824
       handle_requests(pid); // Wait for tdelauncher to be ready
1825 1825
    }

+ 73
- 73
kinit/tdelauncher.cpp View File

@@ -63,7 +63,7 @@
63 63
 
64 64
 using namespace TDEIO;
65 65
 
66
-template class TQPtrList<KLaunchRequest>;
66
+template class TQPtrList<TDELaunchRequest>;
67 67
 template class TQPtrList<IdleSlave>;
68 68
 
69 69
 IdleSlave::IdleSlave(TDESocket *socket)
@@ -162,7 +162,7 @@ IdleSlave::age(time_t now)
162 162
    return (int) difftime(now, mBirthDate);
163 163
 }
164 164
 
165
-KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
165
+TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
166 166
 //  : TDEApplication( false, false ), // No Styles, No GUI
167 167
   : TDEApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
168 168
     DCOPObject("tdelauncher"),
@@ -186,7 +186,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
186 186
    if (domainname.status() != 0)
187 187
    {
188 188
       // Sever error!
189
-      tqDebug("KLauncher: Fatal error, can't create tempfile!");
189
+      tqDebug("TDELauncher: Fatal error, can't create tempfile!");
190 190
       ::exit(1);
191 191
    }
192 192
    mPoolSocketName = domainname.name();
@@ -224,12 +224,12 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
224 224
    write(tdeinitSocket, &request_header, sizeof(request_header));
225 225
 }
226 226
 
227
-KLauncher::~KLauncher()
227
+TDELauncher::~TDELauncher()
228 228
 {
229 229
    close();
230 230
 }
231 231
 
232
-void KLauncher::close()
232
+void TDELauncher::close()
233 233
 {
234 234
    if (!mPoolSocketName.isEmpty())
235 235
    {
@@ -244,15 +244,15 @@ void KLauncher::close()
244 244
 }
245 245
 
246 246
 void
247
-KLauncher::destruct(int exit_code)
247
+TDELauncher::destruct(int exit_code)
248 248
 {
249
-   if (kapp) ((KLauncher*)kapp)->close();
249
+   if (kapp) ((TDELauncher*)kapp)->close();
250 250
    // We don't delete kapp here, that's intentional.
251 251
    ::exit(exit_code);
252 252
 }
253 253
 
254 254
 bool
255
-KLauncher::process(const TQCString &fun, const TQByteArray &data,
255
+TDELauncher::process(const TQCString &fun, const TQByteArray &data,
256 256
                    TQCString &replyType, TQByteArray &replyData)
257 257
 {
258 258
    if ((fun == "exec_blind(TQCString,TQValueList<TQCString>)")
@@ -267,7 +267,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
267 267
       stream >> name >> arg_list;
268 268
       if( fun == "exec_blind(TQCString,TQValueList<TQCString>,TQValueList<TQCString>,TQCString)" )
269 269
           stream >> envs >> startup_id;
270
-      kdDebug(7016) << "KLauncher: Got exec_blind('" << name << "', ...)" << endl;
270
+      kdDebug(7016) << "TDELauncher: Got exec_blind('" << name << "', ...)" << endl;
271 271
       exec_blind( name, arg_list, envs, startup_id);
272 272
       return true;
273 273
    }
@@ -315,29 +315,29 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
315 315
       bool finished;
316 316
       if (strncmp(fun, "start_service_by_name(", 22) == 0)
317 317
       {
318
-         kdDebug(7016) << "KLauncher: Got start_service_by_name('" << serviceName << "', ...)" << endl;
318
+         kdDebug(7016) << "TDELauncher: Got start_service_by_name('" << serviceName << "', ...)" << endl;
319 319
          finished = start_service_by_name(serviceName, urls, envs, startup_id, bNoWait);
320 320
       }
321 321
       else if (strncmp(fun, "start_service_by_desktop_path(", 30) == 0)
322 322
       {
323
-         kdDebug(7016) << "KLauncher: Got start_service_by_desktop_path('" << serviceName << "', ...)" << endl;
323
+         kdDebug(7016) << "TDELauncher: Got start_service_by_desktop_path('" << serviceName << "', ...)" << endl;
324 324
          finished = start_service_by_desktop_path(serviceName, urls, envs, startup_id, bNoWait);
325 325
       }
326 326
       else if (strncmp(fun, "start_service_by_desktop_name(", 30) == 0)
327 327
       {
328
-         kdDebug(7016) << "KLauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl;
328
+         kdDebug(7016) << "TDELauncher: Got start_service_by_desktop_name('" << serviceName << "', ...)" << endl;
329 329
          finished = start_service_by_desktop_name(serviceName, urls, envs, startup_id, bNoWait );
330 330
       }
331 331
       else if ((fun == "tdeinit_exec(TQString,TQStringList)")
332 332
               || (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>)")
333 333
               || (fun == "tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)"))
334 334
       {
335
-         kdDebug(7016) << "KLauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl;
335
+         kdDebug(7016) << "TDELauncher: Got tdeinit_exec('" << serviceName << "', ...)" << endl;
336 336
          finished = tdeinit_exec(serviceName, urls, envs, startup_id, false);
337 337
       }
338 338
       else
339 339
       {
340
-         kdDebug(7016) << "KLauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl;
340
+         kdDebug(7016) << "TDELauncher: Got tdeinit_exec_wait('" << serviceName << "', ...)" << endl;
341 341
          finished = tdeinit_exec(serviceName, urls, envs, startup_id, true);
342 342
       }
343 343
       if (!finished)
@@ -397,7 +397,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
397 397
    else if (fun == "reparseConfiguration()")
398 398
    {
399 399
       TDEGlobal::config()->reparseConfiguration();
400
-      kdDebug(7016) << "KLauncher::process : reparseConfiguration" << endl;
400
+      kdDebug(7016) << "TDELauncher::process : reparseConfiguration" << endl;
401 401
       KProtocolManager::reparseConfiguration();
402 402
       IdleSlave *slave;
403 403
       for(slave = mSlaveList.first(); slave; slave = mSlaveList.next())
@@ -409,7 +409,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
409 409
    {
410 410
       ::signal( SIGHUP, SIG_IGN);
411 411
       ::signal( SIGTERM, SIG_IGN);
412
-      kdDebug() << "KLauncher::process ---> terminateKDE" << endl;
412
+      kdDebug() << "TDELauncher::process ---> terminateKDE" << endl;
413 413
       tdelauncher_header request_header;
414 414
       request_header.cmd = LAUNCHER_TERMINATE_KDE;
415 415
       request_header.arg_length = 0;
@@ -418,14 +418,14 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
418 418
    }
419 419
    else if (fun == "autoStart()")
420 420
    {
421
-      kdDebug() << "KLauncher::process ---> autoStart" << endl;
421
+      kdDebug() << "TDELauncher::process ---> autoStart" << endl;
422 422
       autoStart(1);
423 423
       replyType = "void";
424 424
       return true;
425 425
    }
426 426
    else if (fun == "autoStart(int)")
427 427
    {
428
-      kdDebug() << "KLauncher::process ---> autoStart(int)" << endl;
428
+      kdDebug() << "TDELauncher::process ---> autoStart(int)" << endl;
429 429
       TQDataStream stream(data, IO_ReadOnly);
430 430
       int phase;
431 431
       stream >> phase;
@@ -443,15 +443,15 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
443 443
 }
444 444
 
445 445
 QCStringList
446
-KLauncher::interfaces()
446
+TDELauncher::interfaces()
447 447
 {
448 448
     QCStringList ifaces = DCOPObject::interfaces();
449
-    ifaces += "KLauncher";
449
+    ifaces += "TDELauncher";
450 450
     return ifaces;
451 451
 }
452 452
 
453 453
 QCStringList
454
-KLauncher::functions()
454
+TDELauncher::functions()
455 455
 {
456 456
     QCStringList funcs = DCOPObject::functions();
457 457
     funcs << "void exec_blind(TQCString,TQValueList<TQCString>)";
@@ -480,7 +480,7 @@ KLauncher::functions()
480 480
     return funcs;
481 481
 }
482 482
 
483
-void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
483
+void TDELauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
484 484
 {
485 485
    TQCString value(_value);
486 486
    if (value.isNull())
@@ -522,7 +522,7 @@ read_socket(int sock, char *buffer, int len)
522 522
 
523 523
 
524 524
 void
525
-KLauncher::slotKDEInitData(int)
525
+TDELauncher::slotKDEInitData(int)
526 526
 {
527 527
    tdelauncher_header request_header;
528 528
    TQByteArray requestData;
@@ -572,25 +572,25 @@ KLauncher::slotKDEInitData(int)
572 572
      {
573 573
        case KService::DCOP_None:
574 574
        {
575
-         lastRequest->status = KLaunchRequest::Running;
575
+         lastRequest->status = TDELaunchRequest::Running;
576 576
          break;
577 577
        }
578 578
 
579 579
        case KService::DCOP_Unique:
580 580
        {
581
-         lastRequest->status = KLaunchRequest::Launching;
581
+         lastRequest->status = TDELaunchRequest::Launching;
582 582
          break;
583 583
        }
584 584
 
585 585
        case KService::DCOP_Wait:
586 586
        {
587
-         lastRequest->status = KLaunchRequest::Launching;
587
+         lastRequest->status = TDELaunchRequest::Launching;
588 588
          break;
589 589
        }
590 590
 
591 591
        case KService::DCOP_Multi:
592 592
        {
593
-         lastRequest->status = KLaunchRequest::Launching;
593
+         lastRequest->status = TDELaunchRequest::Launching;
594 594
          break;
595 595
        }
596 596
      }
@@ -599,7 +599,7 @@ KLauncher::slotKDEInitData(int)
599 599
    }
600 600
    if (lastRequest && (request_header.cmd == LAUNCHER_ERROR))
601 601
    {
602
-     lastRequest->status = KLaunchRequest::Error;
602
+     lastRequest->status = TDELaunchRequest::Error;
603 603
      if (!requestData.isEmpty())
604 604
         lastRequest->errorMsg = TQString::fromUtf8((char *) requestData.data());
605 605
      lastRequest = 0;
@@ -611,20 +611,20 @@ KLauncher::slotKDEInitData(int)
611 611
 }
612 612
 
613 613
 void
614
-KLauncher::processDied(pid_t pid, long /* exitStatus */)
614
+TDELauncher::processDied(pid_t pid, long /* exitStatus */)
615 615
 {
616
-   KLaunchRequest *request = requestList.first();
616
+   TDELaunchRequest *request = requestList.first();
617 617
    for(; request; request = requestList.next())
618 618
    {
619 619
       if (request->pid == pid)
620 620
       {
621 621
          if (request->dcop_service_type == KService::DCOP_Wait)
622
-            request->status = KLaunchRequest::Done;
622
+            request->status = TDELaunchRequest::Done;
623 623
          else if ((request->dcop_service_type == KService::DCOP_Unique) &&
624 624
 		(dcopClient()->isApplicationRegistered(request->dcop_name)))
625
-            request->status = KLaunchRequest::Running;
625
+            request->status = TDELaunchRequest::Running;
626 626
          else
627
-            request->status = KLaunchRequest::Error;
627
+            request->status = TDELaunchRequest::Error;
628 628
          requestDone(request);
629 629
          return;