Browse Source

Rename a number of classes to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
deac2ca49f
100 changed files with 1291 additions and 1291 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. +30
    -30
      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>
<LI><A HREF="#KIconLoader">KIconLoader</A></LI>
<LI><A HREF="#KTMainWindow">KTMainWindow</A></LI>
<LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
<LI><A HREF="#KToolBar">KToolBar</A></LI>
<LI><A HREF="#TDEToolBar">TDEToolBar</A></LI>
<LI><A HREF="#launching">Starting other programs</A></LI>
<LI><A HREF="#tdehtmlw">tdehtmlw</A></LI>
<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>
<LI><A HREF="#KQuickHelp">KQuickHelp</A></LI>
<LI><A HREF="#KPixmapgradientFill">KPixmap::gradientFill</A></LI>
<LI><A HREF="#KTabListBox">KTabListBox</A></LI>
<LI><A HREF="#KToolBarButton">KToolBarButton &amp; KRadioGroup</A></LI>
<LI><A HREF="#KAccel">KAccel</A></LI>
<LI><A HREF="#TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></LI>
<LI><A HREF="#TDEAccel">TDEAccel</A></LI>
<LI><A HREF="#kstring">kstring.h / KString</A></LI>
<LI><A HREF="#ktopwidget">ktopwidget.h / KTopWidget</A></LI>
<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>
The methods tempSaveName() and checkRecoverFile() return QString
now. The returned values must _not_ be free()d.<P>

helpMenu() has been moved to KMainWindow. aboutKDE(), aboutApp() and
appHelpActivated() have all been removed See section for KMainWindow
helpMenu() has been moved to TDEMainWindow. aboutKDE(), aboutApp() and
appHelpActivated() have all been removed See section for TDEMainWindow
for more info.<P>

The TDEApplication constructor has changed. Command line arguments and
@@ -248,9 +248,9 @@ in stripping off the .xpm part<P>

<H3><A NAME="KTMainWindow">KTMainWindow</A></H3>

KTMainWindow has been replaced with KMainWindow.<p>
KTMainWindow has been replaced with TDEMainWindow.<p>

The KMainWindow constructor needs a parent widget as first argument.
The TDEMainWindow constructor needs a parent widget as first argument.
You can use 0 for this.<p>
setView() has been replaced with setCentralWidget().<p>
view() has been replaced with centralWidget().<p>
@@ -271,12 +271,12 @@ mainViewGeometry() instead.<P>

<H3><A NAME="KHelpMenu">KHelpMenu</A></H3>

helpMenu() has been moved to KMainWindow from TDEApplication (kapp).<P>
helpMenu() has been moved to TDEMainWindow from TDEApplication (kapp).<P>

Both the "About KDE" and the "About &lt;Application&gt;" dialog boxes
are now modeless. "About KDE" is a completely new widget.<P>

If you used in the toplevel window (that is derived from KMainWindow)
If you used in the toplevel window (that is derived from TDEMainWindow)
"kapp-&gt;helpMenu( bool, TQString )" to get the help menu
you must now change this to "helpMenu( TQString )". The TQString defaults
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>
The old aboutKDE(), aboutApp() and appHelpActivated() of TDEApplication
have all been removed. If you need direct access to these or need
access to a help menu in a class that is not derived from
KMainWindow then allocate an instance of the new class KHelpMenu.
TDEMainWindow then allocate an instance of the new class KHelpMenu.
See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P>
Espen Sand &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="KToolBar">KToolBar</A></H3>
<H3><A NAME="TDEToolBar">TDEToolBar</A></H3>

enable(...) is depreciated, use show()/hide() instead.<p>
enableFloating(...) has been removed, use enableMoving() instead.<p>
@@ -588,7 +588,7 @@ this:<P>
<TABLE><TR><TD>
TQSplitter *split = new TQSplitter( parent );<BR>
TQListBox *lb = new TQListBox( split );<BR>
KListView *lv = new KListView( split );<BR>
TDEListView *lv = new TDEListView( split );<BR>
TQMultiLineEdit *ed = new TQMultiLineEdit( split );
</TD></TR></TABLE>

@@ -600,17 +600,17 @@ possible if you call setOpaqueResize(true).<P>

<H3><A NAME="KTreeList">KTreeList, KTreeListItem</A></H3>

Use KListView, TQListViewItem instead. API is almost the same, you only
need to add a Column (KListView::addColum) before KListView is useable.<P>
Use TDEListView, TQListViewItem instead. API is almost the same, you only
need to add a Column (TDEListView::addColum) before TDEListView is useable.<P>

KListView has no addChild(), insertItem() and removeItem() calls. Inserting
a root item is done by constructing a TQListViewItem with the KListView
TDEListView has no addChild(), insertItem() and removeItem() calls. Inserting
a root item is done by constructing a TQListViewItem with the TDEListView
passed as the parent widget. adding a child item is done by constructing
a TQListViewItem with the parent item as parameter. removeItem() should
be replaced by delete &lt;pointer to item&gt;.<P>

The root items are not shown in a tree fashion by default. to get this,
use KListView::setDecorativeRoot(true).<P>
use TDEListView::setDecorativeRoot(true).<P>

Expanding and collapsing can by done by using TQListViewItem::setOpen(bool).<P>

@@ -685,24 +685,24 @@ unbalancedGradient(), hash(), desaturate(), pattern(), fade(), blend() etc.<P>

<H3><A NAME="KTabListBox">KTabListBox</A></H3>

This widget has been replaced by the almighty KListView. Everything said
This widget has been replaced by the almighty TDEListView. Everything said
about KTreeList could be repeated here. The good thing is, that you now
can combine TreeView's and normal Tablists without problems.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="KToolBarButton">KToolBarButton &amp; KRadioGroup</A></H3>
<H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>

If you need to do anything with KToolBarButton you now need to include
&lt;ktoolbarbutton.h&gt; KRadioGroup has been renamed to KToolBarRadioGroup and
If you need to do anything with TDEToolBarButton you now need to include
&lt;ktoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
requires you to include &lt;ktoolbarradiogroup.h&gt;<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="KAccel">KAccel</A></H3>
<H3><A NAME="TDEAccel">TDEAccel</A></H3>

The functions keyToString() and stringToKey() which were previously
declared globally in kaccel.h are now static methods in KAccel.<P>
declared globally in kaccel.h are now static methods in TDEAccel.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

@@ -716,7 +716,7 @@ The file has been removed completely, use TQString instead. (<A HREF="mailto:mir

<H3><A NAME="ktopwidget">ktopwidget.h / KTopWidget</A></H3>

KMainWindow replaces this class completely. ktopwidget.h does not
TDEMainWindow replaces this class completely. ktopwidget.h does not
exist in KDE 2. (<A HREF="mailto:mirko@kde.org">mirko@kde.org</A>)<P>

<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>

<H3><A NAME="KDockWidget">KDockWidget</A></H3>

KDockWidget inherits form KMainWindow instead of KTMainWindow now.
KDockWidget inherits form TDEMainWindow instead of KTMainWindow now.
See <A HREF="KTMainWindow">KTMainWindow</A> for more details.

<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().
cases be replaced by methods in TDELocale::calendar().

<H4>Accelerators Keys</H4>
<h5>KAccel</h5>
<h5>TDEAccel</h5>
The following methods of been deprecated, and if KDE_NO_COMPAT is defined they will
not be available.
<ul>
<li> KAccel::insertItem() and KAccel::connectItem().
<li> TDEAccel::insertItem() and TDEAccel::connectItem().
<pre>
- kaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
- kaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
@@ -163,19 +163,19 @@ not be available.
You might replace the TQString::null parameter with
<pre> i18n("Scroll the current document's contents up by one line.") </pre>
for example.</li>
<li> KAccel::changeMenuAccel() has been deprecated because it was
<li> TDEAccel::changeMenuAccel() has been deprecated because it was
never used in cvs. If you've used it in your application, the following
can replace it. Note, however, that this would be handled automatically
by using KAction instead.
by using TDEAction instead.
<pre>
- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
</pre>
</li>
</ul>
The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
<pre>
new KAction( i18n("Scroll Up"), Key_Up,
new TDEAction( i18n("Scroll Up"), Key_Up,
this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
</pre>

@@ -189,25 +189,25 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
shortcut reassignments, which in turn used to make an expensive ungrab
of the old key and second grab of the new key necessary.</li>
</ul>
<h5>KStdAccel</h5>
<h5>TDEStdAccel</h5>
<ul>
<li><i>StdAccel::WhatThis</i> has been renamed to <i>StdAccel::WhatsThis</i>.
<li><i>StdAccel::Insert</i> and the corresponding <i>insert()</i>
have been removed. (Nobody on the list knew what its function was
supposed to be.) Calls to <i>insert()</i> and the equivalent
<i>key(KStdAccel::Insert)</i> can be replaced with the former default
<i>key(TDEStdAccel::Insert)</i> can be replaced with the former default
of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
<table border=1>
<tr><th>Old</th><th>New</th></tr>
<tr><td>TQString action(StdAccel id)</td><td>TQString name(StdAccel id)</td></tr>
<tr><td>int defaultKey(StdAccel accel)</td><td>KShortcut shortcutDefault(StdAccel id)</td></tr>
<tr><td>int defaultKey(StdAccel accel)</td><td>TDEShortcut shortcutDefault(StdAccel id)</td></tr>
<tr><td>TQString description(StdAccel id)</td><td>TQString label(StdAccel id)</td></tr>
<tr><td>bool isEqual(const TQKeyEvent* pEvent, int keyQt)</td>
<td>The best method for replacing this varies. One possibility is to use
<i>KKey(const TQKeyEvent*) == KKey(int)</i>. Another is to use
<i>KShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
<tr><td>int key(StdAccel)</td><td>const KShortcut& shortcut(StdAccel)</td></tr>
<i>TDEShortcut::contains( const KKey&/KKeySequence& )</i>.</td></tr>
<tr><td>int key(StdAccel)</td><td>const TDEShortcut& shortcut(StdAccel)</td></tr>
</table></li-->
</ul>

@@ -221,27 +221,27 @@ KURLBar and KURLBarItem.

<H3><A NAME="tdeui">Changes in tdeui</A></H3>

<H4>KAccelMenu</H4>
<H4>TDEAccelMenu</H4>
This class has been removed, Qt offers the same functionality.
Use QPopupMenu/KPopupMenu or the XML-UI method for building menus.
Use QPopupMenu/TDEPopupMenu or the XML-UI method for building menus.

<H4>KAction</H4>
<H4>TDEAction</H4>
<ul>
<li>The following methods have been deprecated and will need to be
replaced if KDE_NO_COMPAT is defined.
<table border=1>
<tr><th>Old</th><th>New</th></tr>
<tr><td>int accel()</td><td>const KShortcut&amp; shortcut()</td></tr>
<tr><td>int accel()</td><td>const TDEShortcut&amp; shortcut()</td></tr>
<tr><td>int menuId()</td><td>int itemId()</td></tr>
<tr><td>void setAccel(int)</td><td>void setShortcut(const KShortcut&amp;)</td></tr>
<tr><td>void setAccel(int)</td><td>void setShortcut(const TDEShortcut&amp;)</td></tr>
</table></li>
</ul>

<h4>KActionCollection</h4>
<h4>TDEActionCollection</h4>
<ul>
<li>When constructing a KActionCollection object, a pointer to the focus widget should be passed.</li>
<li>When constructing a TDEActionCollection object, a pointer to the focus widget should be passed.</li>
<li>The insert(), remove(), and take() methods have been deprecated.
If you wish to keep a list of actions, use the KActionPtrList container instead.
If you wish to keep a list of actions, use the TDEActionPtrList container instead.
If you want to configure the shortcuts from multiple actions collections,
pass each collection to KKeyChooser or KKeyDialog via their insert() methods.</li>
</ul>
@@ -322,24 +322,24 @@ KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
as its use is basically limited to KThemeStyle.

<H4>KAction, KToolBar, KToolBarButton and icons</H4>
<H4>TDEAction, TDEToolBar, TDEToolBarButton and icons</H4>
The preferred way for specifying icons is passing the icon names (and the icons will be loaded by KIconLoader),
instead of using TQIconSet or TQPixmap. This results in always using the correct icon size and allows delayed
on-demand icon loading.
<p>
Method KAction::hasIconSet() has been renamed to KAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
KAction::iconSet() now has an argument specifying icon group, the old KAction::iconSet() is still available unless KDE_NO_COMPAT
Method TDEAction::hasIconSet() has been renamed to TDEAction::hasIcon(), the old name will still work unless KDE_NO_COMPAT is defined.
TDEAction::iconSet() now has an argument specifying icon group, the old TDEAction::iconSet() is still available unless KDE_NO_COMPAT
is defined and returns KIcon::Small iconset, just like in KDE2.
<p>
KToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
Use KToolBarButton::setIcon() (preferred) or KToolBarButton::setIconSet() instead.
TDEToolBarButton methods setPixmap(), setDefaultPixmap(), setDisabledPixmap(), setDefaultIcon() and setDisabledIcon() are deprecated.
Use TDEToolBarButton::setIcon() (preferred) or TDEToolBarButton::setIconSet() instead.

<H4>KAction and derived classes</H4>
<H4>TDEAction and derived classes</H4>
The protected set* methods have been renamed to update* and they now take only one argument (i.e. setText(int, const TQString&)
is now updateText(int) ). Because the former second argument was always the value of the a corresponding data member, you
can simply call the accessor method (i.e. in updateText() call text() to get the text).

<H4>KToggleAction</H4>
<H4>TDEToggleAction</H4>
exclusiveGroup() is no more virtual. setExclusiveGroup(const
TQString&) is not a slot anymore.

@@ -563,7 +563,7 @@ flexibility and efficiency.
<br><br>
Sorting has changed radically. Previously, KFileView had protected methods QuickSort,
compareItems() and mergeLists() to sort directory entries for displaying in the views. Now,
KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, KListView)
KFileView does not do any sorting anymore. Instead, the view's (i.e. KIconView, TDEListView)
sorting is utilized by letting its view-items provide a TQString key() method. Therefore,
KFileView offers the two methods
<ul>


+ 7
- 7
TODO View File

@@ -33,7 +33,7 @@ that we would like to make for the next binary incompatible release.

- Clean up the uses of virtual_hook, use normal virtuals instead (e.g. KZip/KArchive)

- Make it possible to create a KSystemTray without a KMainWindow and instead lazily
- Make it possible to create a KSystemTray without a TDEMainWindow and instead lazily
create the main window on demand.

- 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.
QFont/QPoint/QSize is cheap enough to justify a consistent and usable API (IMHO) .
Keep source compatibility.

- Sort out reference counting of applications and KMainWindows: Add a setRefCountEnabled()
- Sort out reference counting of applications and TDEMainWindows: Add a setRefCountEnabled()
function to TDEApplication; deref()ing the last reference should only quit the application
if reference counts are enabled, and the reference count should be disabled by default
so apps that don't use a KMainWindow mostly continue to work. Make the KMainWindow
constructor call setRefCountEnabled(true), and make each KMainWindow hold its own
reference to the application. The KMainWindow should drop its app reference on hide, and
so apps that don't use a TDEMainWindow mostly continue to work. Make the TDEMainWindow
constructor call setRefCountEnabled(true), and make each TDEMainWindow hold its own
reference to the application. The TDEMainWindow should drop its app reference on hide, and
regain it on show.

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.

- Make API use US English, (eg. KCatalogue -> KCatalog)

- It would be nice if some insan^H^H^H brave soul had a look at the KAccel/KShortcut/KKeyWhatever
- It would be nice if some insan^H^H^H brave soul had a look at the TDEAccel/TDEShortcut/KKeyWhatever
classes and cleaned it up.

- KKeyDialog needs to be improved. It should simplify using KKeyChooser by not having to instantiate
@@ -209,7 +209,7 @@ an alternative help->contents action)
- Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well,
KPixmapIO can't dither, and it generally doesn't make much sense to have this class.

- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
- TDEListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
"dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)

- 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)
videoHeight = 0;

// Setup actions
new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
new TDEToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" );
new KRadioAction( i18n("&Half Size"), ALT+Key_0,
new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
actionCollection(), "half_size" );
new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
actionCollection(), "normal_size" );
new KRadioAction( i18n("&Double Size"), ALT+Key_2,
new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
actionCollection(), "double_size" );

((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
((KToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
((KToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
((TDEToggleAction *)action( "normal_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
((TDEToggleAction *)action( "double_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );

action("double_size")->setEnabled(false);
action("half_size")->setEnabled(false);
@@ -232,29 +232,29 @@ bool KVideoWidget::isEmbedded()

bool KVideoWidget::isFullscreen()
{
return ((KToggleAction *)action( "fullscreen_mode" ))->isChecked();
return ((TDEToggleAction *)action( "fullscreen_mode" ))->isChecked();
}

bool KVideoWidget::isHalfSize()
{
return ((KToggleAction *)action( "half_size" ))->isChecked();
return ((TDEToggleAction *)action( "half_size" ))->isChecked();
}

bool KVideoWidget::isNormalSize()
{
return ((KToggleAction *)action( "normal_size" ))->isChecked();
return ((TDEToggleAction *)action( "normal_size" ))->isChecked();
}

bool KVideoWidget::isDoubleSize()
{
return ((KToggleAction *)action( "double_size" ))->isChecked();
return ((TDEToggleAction *)action( "double_size" ))->isChecked();
}

void KVideoWidget::setFullscreen()
{
if (!isFullscreen())
{
((KToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( true );
fullscreenActivated();
}
}
@@ -263,26 +263,26 @@ void KVideoWidget::setWindowed()
{
if (isFullscreen())
{
((KToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
((TDEToggleAction *)action( "fullscreen_mode" ))->setChecked( false );
fullscreenActivated();
}
}

void KVideoWidget::setHalfSize()
{
((KToggleAction *)action( "half_size" ))->setChecked( true );
((TDEToggleAction *)action( "half_size" ))->setChecked( true );
halfSizeActivated();
}

void KVideoWidget::setNormalSize()
{
((KToggleAction *)action( "normal_size" ))->setChecked( true );
((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
normalSizeActivated();
}

void KVideoWidget::setDoubleSize()
{
((KToggleAction *)action( "double_size" ))->setChecked( true );
((TDEToggleAction *)action( "double_size" ))->setChecked( true );
doubleSizeActivated();
}

@@ -323,18 +323,18 @@ void KVideoWidget::resizeEvent( TQResizeEvent *event )
{
if (width() == QMAX( (videoWidth / 2), minimumWidth() ) &&
height() == QMAX( (videoHeight / 2), minimumHeight() ))
((KToggleAction *)action( "half_size" ))->setChecked( true );
((TDEToggleAction *)action( "half_size" ))->setChecked( true );
else if (width() == QMAX( videoWidth, minimumWidth() ) &&
height() == QMAX( videoHeight, minimumHeight() ))
((KToggleAction *)action( "normal_size" ))->setChecked( true );
((TDEToggleAction *)action( "normal_size" ))->setChecked( true );
else if (width() == QMAX( (2 * videoWidth), minimumWidth() ) &&
height() == QMAX( (2 * videoHeight), minimumHeight() ))
((KToggleAction *)action( "double_size" ))->setChecked( true );
((TDEToggleAction *)action( "double_size" ))->setChecked( true );
else
{
((KToggleAction *)action( "half_size" ))->setChecked( false );
((KToggleAction *)action( "normal_size" ))->setChecked( false );
((KToggleAction *)action( "double_size" ))->setChecked( false );
((TDEToggleAction *)action( "half_size" ))->setChecked( false );
((TDEToggleAction *)action( "normal_size" ))->setChecked( false );
((TDEToggleAction *)action( "double_size" ))->setChecked( false );
}
}
}


+ 3
- 3
dcop/HOWTO View File

@@ -309,8 +309,8 @@ in that case the signal connection will always be deleted.
A receiver can create a non-volatile connection while the sender doesn't (yet)
exist. An anonymous DCOP connection should always be non-volatile.

The following example shows how KLauncher emits a signal whenever it notices
that an application that was started via KLauncher terminates.
The following example shows how TDELauncher emits a signal whenever it notices
that an application that was started via TDELauncher terminates.

QByteArray params;
QDataStream stream(params, IO_WriteOnly);
@@ -319,7 +319,7 @@ that an application that was started via KLauncher terminates.

The task manager of the TDE panel connects to this signal. It uses an
anonymous connection (it doesn't require that the signal is being emitted
by KLauncher) that is non-volatile:
by TDELauncher) that is non-volatile:

connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);



+ 3
- 3
dcop/Mainpage.dox View File

@@ -541,8 +541,8 @@ in that case the signal connection will always be deleted.
A receiver can create a non-volatile connection while the sender doesn't (yet)
exist. An anonymous DCOP connection should always be non-volatile.

The following example shows how KLauncher emits a signal whenever it notices
that an application that was started via KLauncher terminates:
The following example shows how TDELauncher emits a signal whenever it notices
that an application that was started via TDELauncher terminates:

\code
QByteArray params;
@@ -553,7 +553,7 @@ kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);

The task manager of the Trinity panel connects to this signal. It uses an
anonymous connection (it doesn't require that the signal is being emitted
by KLauncher) that is non-volatile:
by TDELauncher) that is non-volatile:

\code
connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);


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

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


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

@@ -33,11 +33,11 @@
#include <tqfileinfo.h>


ScriptLoader::ScriptLoader(KMainWindow *parent) : TQObject (parent)
ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
{
m_parent = parent;
m_scripts.clear();
m_theAction = new KSelectAction ( i18n("KDE Scripts"),
m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
0,
this,
TQT_SLOT(runAction()),
@@ -51,7 +51,7 @@ ScriptLoader::~ScriptLoader()
m_scripts.clear();
}

KSelectAction * ScriptLoader::getScripts()
TDESelectAction * ScriptLoader::getScripts()
{
// Get the available scripts for this application.
TQStringList pluginList = "";


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

@@ -33,12 +33,12 @@ class ScriptLoader : virtual public QObject
/**
* Default Constructor
*/
ScriptLoader(KMainWindow *parent=0);
ScriptLoader(TDEMainWindow *parent=0);
~ScriptLoader();
/** Return the a KSelectAction with all of the scripts
* @returns KSelectAction containing access to all of the scripts
/** Return the a TDESelectAction with all of the scripts
* @returns TDESelectAction containing access to all of the scripts
*/
KSelectAction *getScripts();
TDESelectAction *getScripts();
public slots:
/** Run the current action.
*/
@@ -52,8 +52,8 @@ class ScriptLoader : virtual public QObject
virtual void done(int errorCode);
private:
TQPtrList<KScriptInterface> m_scripts;
KSelectAction *m_theAction;
TDESelectAction *m_theAction;
int m_currentSelection;
KMainWindow *m_parent;
TDEMainWindow *m_parent;
};
#endif

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

@@ -3,7 +3,7 @@


class Win
: public KMainWindow
: public TDEMainWindow
{
Q_OBJECT
KParts::Part* p;


+ 1
- 1
kab/kabapi.cc View File

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


+ 2
- 2
kab/kabapi.h View File

@@ -22,7 +22,7 @@

class TQPushButton;
class TQFrame;
class KListBox;
class TDEListBox;

/**
* The class KabAPI provides a public interface to access the
@@ -189,7 +189,7 @@ protected:
/**
* This displays the overview over the addresses in the dialog.
*/
KListBox* listbox;
TDEListBox* listbox;
/**
* The index of the selected entry. This value is only valid after the
* 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 ) :
TQBoxLayout *listLayout = new TQVBoxLayout;
topLayout->addLayout( listLayout );

mAddresseeList = new KListView( topWidget );
mAddresseeList = new TDEListView( topWidget );
mAddresseeList->addColumn( i18n("Name") );
mAddresseeList->addColumn( i18n("Email") );
mAddresseeList->setAllColumnsShowFocus( true );
@@ -96,7 +96,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
topWidget );
selectedLayout->addWidget( selectedGroup );

mSelectedList = new KListView( selectedGroup );
mSelectedList = new TDEListView( selectedGroup );
mSelectedList->addColumn( i18n("Name") );
mSelectedList->addColumn( i18n("Email") );
mSelectedList->setAllColumnsShowFocus( true );


+ 2
- 2
kabc/addresseedialog.h View File

@@ -143,10 +143,10 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase

bool mMultiple;

KListView *mAddresseeList;
TDEListView *mAddresseeList;
KLineEdit *mAddresseeEdit;

KListView *mSelectedList;
TDEListView *mSelectedList;

AddressBook *mAddressBook;



+ 2
- 2
kabc/addresslineedit.cpp View File

@@ -156,12 +156,12 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
{
bool accept = false;

if (KStdAccel::shortcut(KStdAccel::SubstringCompletion).contains(KKey(e)))
if (TDEStdAccel::shortcut(TDEStdAccel::SubstringCompletion).contains(KKey(e)))
{
doCompletion(true);
accept = true;
}
else if (KStdAccel::shortcut(KStdAccel::TextCompletion).contains(KKey(e)))
else if (TDEStdAccel::shortcut(TDEStdAccel::TextCompletion).contains(KKey(e)))
{
int len = text().length();


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

@@ -293,7 +293,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
}
}

KAcceleratorManager::manage( this );
TDEAcceleratorManager::manage( this );
}

AttributesDialog::~AttributesDialog()


+ 1
- 1
kabc/resourceselectdialog.cpp View File

@@ -45,7 +45,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this );
groupBox->setTitle( i18n( "Resources" ) );

mResourceId = new KListBox( groupBox );
mResourceId = new TDEListBox( groupBox );

mainLayout->addWidget( groupBox );



+ 2
- 2
kabc/resourceselectdialog.h View File

@@ -26,7 +26,7 @@
#include <kdialog.h>
#include <kdemacros.h>

class KListBox;
class TDEListBox;

namespace KABC {

@@ -48,7 +48,7 @@ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
static Resource *getResource( AddressBook *ab, TQWidget *parent = 0 );

private:
KListBox *mResourceId;
TDEListBox *mResourceId;
TQMap<int, Resource*> mResourceMap;
};



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

@@ -77,13 +77,13 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
void slotChanged();
};

class KATEPARTINTERFACES_EXPORT ActionMenu : public KActionMenu
class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
{
Q_OBJECT

public:
ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
: KActionMenu(text, parent, name) { ; };
: TDEActionMenu(text, parent, name) { ; };
virtual ~ActionMenu () { ; };

public:


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

@@ -159,7 +159,7 @@ KateAutoIndent::~KateAutoIndent ()

//BEGIN KateViewIndentAction
KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name)
: KActionMenu (text, parent, name), doc(_doc)
: TDEActionMenu (text, parent, name), doc(_doc)
{
connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
}


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

@@ -190,9 +190,9 @@ class KateAutoIndent : public TQObject

/**
* This action provides a list of available indenters and gets plugged
* into the KateView's KActionCollection.
* into the KateView's TDEActionCollection.
*/
class KateViewIndentationAction : public KActionMenu
class KateViewIndentationAction : public TDEActionMenu
{
Q_OBJECT



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

@@ -71,34 +71,34 @@ KateBookmarks::~KateBookmarks()
{
}

void KateBookmarks::createActions( KActionCollection* ac )
void KateBookmarks::createActions( TDEActionCollection* ac )
{
m_bookmarkToggle = new KToggleAction(
m_bookmarkToggle = new TDEToggleAction(
i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
this, TQT_SLOT(toggleBookmark()),
ac, "bookmarks_toggle" );
m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );

m_bookmarkClear = new KAction(
m_bookmarkClear = new TDEAction(
i18n("Clear &All Bookmarks"), 0,
this, TQT_SLOT(clearBookmarks()),
ac, "bookmarks_clear");
m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));

m_goNext = new KAction(
m_goNext = new TDEAction(
i18n("Next Bookmark"), "next", ALT + Key_PageDown,
this, TQT_SLOT(goNext()),
ac, "bookmarks_next");
m_goNext->setWhatsThis(i18n("Go to the next bookmark."));

m_goPrevious = new KAction(
m_goPrevious = new TDEAction(
i18n("Previous Bookmark"), "previous", ALT + Key_PageUp,
this, TQT_SLOT(goPrevious()),
ac, "bookmarks_previous");
m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));

m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();

//connect the aboutToShow() and aboutToHide() signals with
//the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots


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

@@ -29,9 +29,9 @@ namespace KTextEditor { class Mark; }

namespace Kate { class View; }

class KAction;
class KToggleAction;
class KActionCollection;
class TDEAction;
class TDEToggleAction;
class TDEActionCollection;
class TQPopupMenu;
class TQMenuData;

@@ -44,7 +44,7 @@ class KateBookmarks : public TQObject
KateBookmarks( KateView* parent, Sorting sort=Position );
virtual ~KateBookmarks();

void createActions( KActionCollection* );
void createActions( TDEActionCollection* );

KateBookmarks::Sorting sorting() { return m_sorting; };
void setSorting( Sorting s ) { m_sorting = s; };
@@ -69,10 +69,10 @@ class KateBookmarks : public TQObject

private:
KateView* m_view;
KToggleAction* m_bookmarkToggle;
KAction* m_bookmarkClear;
KAction* m_goNext;
KAction* m_goPrevious;
TDEToggleAction* m_bookmarkToggle;
TDEAction* m_bookmarkClear;
TDEAction* m_goNext;
TDEAction* m_goPrevious;

Sorting m_sorting;
TQPopupMenu* m_bookmarksMenu;


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

@@ -1095,7 +1095,7 @@ void KatePartPluginListItem::stateChange(bool b)

//BEGIN PluginListView
KatePartPluginListView::KatePartPluginListView(TQWidget *parent, const char *name)
: KListView(parent, name)
: TDEListView(parent, name)
{
}



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

@@ -52,13 +52,13 @@ namespace TDEIO
class TransferJob;
}

class KAccel;
class TDEAccel;
class KColorButton;
class KComboBox;
class KIntNumInput;
class KKeyButton;
class KKeyChooser;
class KMainWindow;
class TDEMainWindow;
class KPushButton;
class KRegExpDialog;
class KIntNumInput;
@@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage
bool m_ready;
class KateDocument *m_doc;
KKeyChooser* m_keyChooser;
class KActionCollection *m_ac;
class TDEActionCollection *m_ac;
};

class KateSaveConfigTab : public KateConfigPage
@@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage

class KatePartPluginListItem;

class KatePartPluginListView : public KListView
class KatePartPluginListView : public TDEListView
{
Q_OBJECT



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

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


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

@@ -541,8 +541,8 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
// sizemanagment
TQGridLayout *grid = new TQGridLayout( this, 1, 1 );

m_fontchooser = new KFontChooser ( this, 0L, false, TQStringList(), false );
m_fontchooser->enableColumn(KFontChooser::StyleList, false);
m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false );
m_fontchooser->enableColumn(TDEFontChooser::StyleList, false);
grid->addWidget( m_fontchooser, 0, 0);

connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
@@ -1078,7 +1078,7 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
{
if ( !dynamic_cast<KateStyleListItem*>(i) ) return;

KPopupMenu m( this );
TDEPopupMenu m( this );
KateAttribute *is = i->style();
int id;
// 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
};


class KateViewSchemaAction : public KActionMenu
class KateViewSchemaAction : public TDEActionMenu
{
Q_OBJECT

public:
KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
: KActionMenu(text, parent, name) { init(); };
: TDEActionMenu(text, parent, name) { init(); };

~KateViewSchemaAction(){;};

@@ -226,7 +226,7 @@ class KateSchemaConfigFontTab : public TQWidget
void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)

private:
class KFontChooser *m_fontchooser;
class TDEFontChooser *m_fontchooser;
FontMap m_fonts;
int m_schema;



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

@@ -66,7 +66,7 @@ KateSearch::~KateSearch()
delete m_arbitraryHLList;
}

void KateSearch::createActions( KActionCollection* ac )
void KateSearch::createActions( TDEActionCollection* ac )
{
KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
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;
class KateDocument;
class KateSuperRangeList;

class KActionCollection;
class TDEActionCollection;

class KateSearch : public TQObject
{
@@ -87,7 +87,7 @@ class KateSearch : public TQObject
KateSearch( KateView* );
~KateSearch();

void createActions( KActionCollection* );
void createActions( TDEActionCollection* );

public slots:
void find();


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

@@ -51,13 +51,13 @@ KateSpell::~KateSpell()
}
}

void KateSpell::createActions( KActionCollection* ac )
void KateSpell::createActions( TDEActionCollection* ac )
{
KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
KAction *a = new KAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));

m_spellcheckSelection = new KAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
}



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

@@ -27,7 +27,7 @@

class KateView;

class KAction;
class TDEAction;
class KSpell;

class KateSpell : public TQObject
@@ -38,7 +38,7 @@ class KateSpell : public TQObject
KateSpell( KateView* );
~KateSpell();

void createActions( KActionCollection* );
void createActions( TDEActionCollection* );

void updateActions ();

@@ -69,7 +69,7 @@ class KateSpell : public TQObject

private:
KateView *m_view;
KAction *m_spellcheckSelection;
TDEAction *m_spellcheckSelection;

KSpell *m_tdespell;



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

@@ -207,8 +207,8 @@ void KateView::setupConnections()

void KateView::setupActions()
{
KActionCollection *ac = this->actionCollection ();
KAction *a;
TDEActionCollection *ac = this->actionCollection ();
TDEAction *a;

m_toggleWriteLock = 0;

@@ -221,7 +221,7 @@ void KateView::setupActions()
m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));

m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));

if (!m_doc->readOnly())
@@ -235,56 +235,56 @@ void KateView::setupActions()
a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
a->setWhatsThis(i18n("Revert the most recent undo operation"));

(new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
(new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
" current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
" when the view is resized."));

// setup Tools menu
a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
a=new TDEAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
a=new TDEAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
a->setWhatsThis(i18n("Use this to unindent a selected block of text."));

a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));

a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));

a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
ac, "tools_comment");
a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting."));

a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
ac, "tools_uncomment");
a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting."));
a = m_toggleWriteLock = new KToggleAction(
a = m_toggleWriteLock = new TDEToggleAction(
i18n("&Read Only Mode"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ),
ac, "tools_toggle_write_lock" );
a->setWhatsThis( i18n("Lock/unlock the document for writing") );

a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(uppercase()), ac, "tools_uppercase" );
a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
"right of the cursor if no text is selected.") );

a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(lowercase()), ac, "tools_lowercase" );
a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
"right of the cursor if no text is selected.") );

a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(capitalize()), ac, "tools_capitalize" );
a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
"cursor if no text is selected.") );

a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
}
else
@@ -298,7 +298,7 @@ void KateView::setupActions()
a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
a->setWhatsThis(i18n("Print the current document."));

a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
a->setWhatsThis(i18n("Reload the current document from disk."));

a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac);
@@ -307,7 +307,7 @@ void KateView::setupActions()
a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac);
a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));

a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
a->setWhatsThis(i18n("Configure various aspects of this editor."));

KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight");
@@ -324,7 +324,7 @@ void KateView::setupActions()
new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");

// html export
a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
a->setWhatsThis(i18n("This command allows you to export the current document"
" with all highlighting information into a HTML document."));

@@ -334,32 +334,32 @@ void KateView::setupActions()
m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));

a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
a->setWhatsThis(i18n("This increases the display font size."));

a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
a->setWhatsThis(i18n("This decreases the display font size."));

a= m_toggleBlockSelection = new KToggleAction(
a= m_toggleBlockSelection = new TDEToggleAction(
i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()),
ac, "set_verticalSelect");
a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));

a= m_toggleInsert = new KToggleAction(
a= m_toggleInsert = new TDEToggleAction(
i18n("Overwr&ite Mode"), Key_Insert,
TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()),
ac, "set_insert" );
a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));

KToggleAction *toggleAction;
a= m_toggleDynWrap = toggleAction = new KToggleAction(
TDEToggleAction *toggleAction;
a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
i18n("&Dynamic Word Wrap"), Key_F10,
TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()),
ac, "view_dynamic_word_wrap" );
a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));

a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));

connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int)));
@@ -369,14 +369,14 @@ void KateView::setupActions()
list2.append(i18n("&Always On"));
m_setDynWrapIndicators->setItems(list2);

a= toggleAction=m_toggleFoldingMarkers = new KToggleAction(
a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
i18n("Show Folding &Markers"), Key_F9,
TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()),
ac, "view_folding_markers" );
a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
toggleAction->setCheckedState(i18n("Hide Folding &Markers"));

a= m_toggleIconBar = toggleAction = new KToggleAction(
a= m_toggleIconBar = toggleAction = new TDEToggleAction(
i18n("Show &Icon Border"), Key_F6,
TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()),
ac, "view_border");
@@ -384,21 +384,21 @@ void KateView::setupActions()
a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
toggleAction->setCheckedState(i18n("Hide &Icon Border"));

a= toggleAction=m_toggleLineNumbers = new KToggleAction(
a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
i18n("Show &Line Numbers"), Key_F11,
TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()),
ac, "view_line_numbers" );
a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
toggleAction->setCheckedState(i18n("Hide &Line Numbers"));

a= m_toggleScrollBarMarks = toggleAction = new KToggleAction(
a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
i18n("Show Scroll&bar Marks"), 0,
TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()),
ac, "view_scrollbar_marks");
a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));

a = toggleAction = m_toggleWWMarker = new KToggleAction(
a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
i18n("Show Static &Word Wrap Marker"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ),
ac, "view_word_wrap_marker" );
@@ -407,13 +407,13 @@ void KateView::setupActions()
"wrap column as defined in the editing properties" ));
toggleAction->setCheckedState(i18n("Hide Static &Word Wrap Marker"));

a= m_switchCmdLine = new KAction(
a= m_switchCmdLine = new TDEAction(
i18n("Switch to Command Line"), Key_F7,
TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()),
ac, "switch_to_cmd_line" );
a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));

a=m_setEndOfLine = new KSelectAction(i18n("&End of Line"), 0, ac, "set_eol");
a=m_setEndOfLine = new TDESelectAction(i18n("&End of Line"), 0, ac, "set_eol");
a->setWhatsThis(i18n("Choose which line endings should be used, when you save the document"));
TQStringList list;
list.append("&UNIX");
@@ -437,137 +437,137 @@ void KateView::setupActions()

void KateView::setupEditActions()
{
m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
KActionCollection* ac = m_editActions;
m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
TDEActionCollection* ac = m_editActions;

new KAction(
new TDEAction(
i18n("Move Word Left"), CTRL + Key_Left,
TQT_TQOBJECT(this),TQT_SLOT(wordLeft()),
ac, "word_left" );
new KAction(
new TDEAction(
i18n("Select Character Left"), SHIFT + Key_Left,
TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()),
ac, "select_char_left" );
new KAction(
new TDEAction(
i18n("Select Word Left"), SHIFT + CTRL + Key_Left,
TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()),
ac, "select_word_left" );

new KAction(
new TDEAction(
i18n("Move Word Right"), CTRL + Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(wordRight()),
ac, "word_right" );
new KAction(
new TDEAction(
i18n("Select Character Right"), SHIFT + Key_Right,
TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()),
ac, "select_char_right" );
new KAction(
new TDEAction(
i18n("Select Word Right"), SHIFT + CTRL + Key_Right,
TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()),
ac, "select_word_right" );

new KAction(
new TDEAction(
i18n("Move to Beginning of Line"), Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(home()),
ac, "beginning_of_line" );
new KAction(
i18n("Move to Beginning of Document"), KStdAccel::home(),
new TDEAction(
i18n("Move to Beginning of Document"), TDEStdAccel::home(),
TQT_TQOBJECT(this), TQT_SLOT(top()),
ac, "beginning_of_document" );
new KAction(
new TDEAction(
i18n("Select to Beginning of Line"), SHIFT + Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(shiftHome()),
ac, "select_beginning_of_line" );
new KAction(
new TDEAction(
i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
TQT_TQOBJECT(this), TQT_SLOT(shiftTop()),
ac, "select_beginning_of_document" );

new KAction(
new TDEAction(
i18n("Move to End of Line"), Key_End,
TQT_TQOBJECT(this), TQT_SLOT(end()),
ac, "end_of_line" );
new KAction(
i18n("Move to End of Document"), KStdAccel::end(),
new TDEAction(
i18n("Move to End of Document"), TDEStdAccel::end(),
TQT_TQOBJECT(this), TQT_SLOT(bottom()),
ac, "end_of_document" );
new KAction(
new TDEAction(
i18n("Select to End of Line"), SHIFT + Key_End,
TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()),
ac, "select_end_of_line" );
new KAction(
new TDEAction(
i18n("Select to End of Document"), SHIFT + CTRL + Key_End,
TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()),
ac, "select_end_of_document" );

new KAction(
new TDEAction(
i18n("Select to Previous Line"), SHIFT + Key_Up,
TQT_TQOBJECT(this), TQT_SLOT(shiftUp()),
ac, "select_line_up" );
new KAction(
new TDEAction(
i18n("Scroll Line Up"),"", CTRL + Key_Up,
TQT_TQOBJECT(this), TQT_SLOT(scrollUp()),
ac, "scroll_line_up" );

new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
ac, "move_line_down");

new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
ac, "move_line_up");

new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(cursorRight()), ac, "move_cursor_right");

new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
ac, "move_cusor_left");

new KAction(
new TDEAction(
i18n("Select to Next Line"), SHIFT + Key_Down,
TQT_TQOBJECT(this), TQT_SLOT(shiftDown()),
ac, "select_line_down" );
new KAction(
new TDEAction(
i18n("Scroll Line Down"), CTRL + Key_Down,
TQT_TQOBJECT(this), TQT_SLOT(scrollDown()),
ac, "scroll_line_down" );

new KAction(
i18n("Scroll Page Up"), KStdAccel::prior(),
new TDEAction(
i18n("Scroll Page Up"), TDEStdAccel::prior(),
TQT_TQOBJECT(this), TQT_SLOT(pageUp()),
ac, "scroll_page_up" );
new KAction(
new TDEAction(
i18n("Select Page Up"), SHIFT + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()),
ac, "select_page_up" );
new KAction(
new TDEAction(
i18n("Move to Top of View"), CTRL + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(topOfView()),
ac, "move_top_of_view" );
new KAction(
new TDEAction(
i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp,
TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()),
ac, "select_top_of_view" );

new KAction(
i18n("Scroll Page Down"), KStdAccel::next(),
new TDEAction(
i18n("Scroll Page Down"), TDEStdAccel::next(),
TQT_TQOBJECT(this), TQT_SLOT(pageDown()),
ac, "scroll_page_down" );
new KAction(
new TDEAction(
i18n("Select Page Down"), SHIFT + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()),
ac, "select_page_down" );
new KAction(
new TDEAction(
i18n("Move to Bottom of View"), CTRL + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()),
ac, "move_bottom_of_view" );
new KAction(
new TDEAction(
i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown,
TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()),
ac, "select_bottom_of_view" );
new KAction(
new TDEAction(
i18n("Move to Matching Bracket"), CTRL + Key_6,
TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()),
ac, "to_matching_bracket" );
new KAction(
new TDEAction(
i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6,
TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()),
ac, "select_matching_bracket" );
@@ -575,34 +575,34 @@ void KateView::setupEditActions()
// anders: shortcuts doing any changes should not be created in browserextension
if ( !m_doc->readOnly() )
{
new KAction(
new TDEAction(
i18n("Transpose Characters"), CTRL + Key_T,
TQT_TQOBJECT(this), TQT_SLOT(transpose()),
ac, "transpose_char" );

new KAction(
new TDEAction(
i18n("Delete Line"), CTRL + Key_K,
TQT_TQOBJECT(this), TQT_SLOT(killLine()),
ac, "delete_line" );

new KAction(
i18n("Delete Word Left"), KStdAccel::deleteWordBack(),
new TDEAction(
i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(),
TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()),
ac, "delete_word_left" );

new KAction(
i18n("Delete Word Right"), KStdAccel::deleteWordForward(),
new TDEAction(
i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(),
TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()),
ac, "delete_word_right" );

new KAction(i18n("Delete Next Character"), Key_Delete,
new TDEAction(i18n("Delete Next Character"), Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(keyDelete()),
ac, "delete_next_character");

KAction *a = new KAction(i18n("Backspace"), Key_Backspace,
TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
TQT_TQOBJECT(this), TQT_SLOT(backspace()),
ac, "backspace");
KShortcut cut = a->shortcut();
TDEShortcut cut = a->shortcut();
cut.append( KKey( SHIFT + Key_Backspace ) );
a->setShortcut( cut );
}
@@ -624,18 +624,18 @@ void KateView::setupEditActions()

void KateView::setupCodeFolding()
{
KActionCollection *ac=this->actionCollection();
new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
TDEActionCollection *ac=this->actionCollection();
new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");

#ifdef DEBUGACCELS
KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this));
TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this));
debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
debugAccels->setEnabled(true);
@@ -760,7 +760,7 @@ void KateView::slotReadWriteChanged ()
<< "edit_undo" << "edit_redo" << "tools_spelling_from_cursor"
<< "tools_spelling_selection";

KAction *a = 0;
TDEAction *a = 0;
for (uint z = 0; z < l.size(); z++)
if ((a = actionCollection()->action( l[z].ascii() )))
a->setEnabled (m_doc->isReadWrite());
@@ -1256,7 +1256,7 @@ void KateView::updateFoldingConfig ()
l << "folding_toplevel" << "folding_expandtoplevel"
<< "folding_collapselocal" << "folding_expandlocal";

KAction *a = 0;
TDEAction *a = 0;
for (uint z = 0; z < l.size(); z++)
if ((a = actionCollection()->action( l[z].ascii() )))
a->setEnabled (m_doc->highlight() && m_doc->highlight()->allowsFolding());


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

@@ -44,10 +44,10 @@ class KateViewSchemaAction;
class KateRenderer;
class KateSpell;

class KToggleAction;
class KAction;
class KRecentFilesAction;
class KSelectAction;
class TDEToggleAction;
class TDEAction;
class TDERecentFilesAction;
class TDESelectAction;

class TQGridLayout;

@@ -429,7 +429,7 @@ class KateView : public Kate::View,
// Is it really necessary to have 3 methods for this?! :)
KateDocument* doc() const { return m_doc; }

KActionCollection* editActionCollection() const { return m_editActions; }
TDEActionCollection* editActionCollection() const { return m_editActions; }

public slots:
void slotNewUndo();
@@ -472,31 +472,31 @@ class KateView : public Kate::View,
void setupCodeFolding();
void setupCodeCompletion();

KActionCollection* m_editActions;
KAction* m_editUndo;
KAction* m_editRedo;
KRecentFilesAction* m_fileRecent;
KToggleAction* m_toggleFoldingMarkers;
KToggleAction* m_toggleIconBar;
KToggleAction* m_toggleLineNumbers;
KToggleAction* m_toggleScrollBarMarks;
KToggleAction* m_toggleDynWrap;
KSelectAction* m_setDynWrapIndicators;
KToggleAction* m_toggleWWMarker;
KAction* m_switchCmdLine;
KSelectAction* m_setEndOfLine;
KAction *m_cut;
KAction *m_copy;
KAction *m_copyHTML;
KAction *m_paste;
KAction *m_selectAll;
KAction *m_deSelect;
KToggleAction *m_toggleBlockSelection;
KToggleAction *m_toggleInsert;
KToggleAction *m_toggleWriteLock;
TDEActionCollection* m_editActions;
TDEAction* m_editUndo;
TDEAction* m_editRedo;
TDERecentFilesAction* m_fileRecent;
TDEToggleAction* m_toggleFoldingMarkers;
TDEToggleAction* m_toggleIconBar;
TDEToggleAction* m_toggleLineNumbers;
TDEToggleAction* m_toggleScrollBarMarks;
TDEToggleAction* m_toggleDynWrap;
TDESelectAction* m_setDynWrapIndicators;
TDEToggleAction* m_toggleWWMarker;
TDEAction* m_switchCmdLine;
TDESelectAction* m_setEndOfLine;
TDEAction *m_cut;
TDEAction *m_copy;
TDEAction *m_copyHTML;
TDEAction *m_paste;
TDEAction *m_selectAll;
TDEAction *m_deSelect;
TDEToggleAction *m_toggleBlockSelection;
TDEToggleAction *m_toggleInsert;
TDEToggleAction *m_toggleWriteLock;

KateDocument* m_doc;
KateViewInternal* m_viewInternal;


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

@@ -1168,7 +1168,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
//END KateIconBorder

KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name)
: KActionMenu (text, parent, name), doc(_doc), view (_view)
: TDEActionMenu (text, parent, name), doc(_doc), view (_view)
{
connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
}


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

@@ -182,7 +182,7 @@ class KateIconBorder : public TQWidget
mutable TQColor m_oldBackgroundColor;
};

class KateViewEncodingAction : public KActionMenu
class KateViewEncodingAction : public TDEActionMenu
{
Q_OBJECT



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

@@ -511,7 +511,7 @@ int main(int argc, char *argv[])

// create widgets
KateFactory *fac = KateFactory::self();
KMainWindow *toplevel = new KMainWindow();
TDEMainWindow *toplevel = new TDEMainWindow();
KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
/*bBrowserView*/false,
/*bReadOnly*/false,


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

@@ -253,7 +253,7 @@ void ABGlobal::writeConfig()
class AutoBookmarkEntItem : public QListViewItem
{
public:
AutoBookmarkEntItem( KListView *lv, AutoBookmarkEnt *e )
AutoBookmarkEntItem( TDEListView *lv, AutoBookmarkEnt *e )
: TQListViewItem( lv ),
ent( e )
{
@@ -383,7 +383,7 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char

TQLabel *l = new TQLabel( i18n("&Patterns"), this );
lo->addWidget( l );
lvPatterns = new KListView( this );
lvPatterns = new TDEListView( this );
lvPatterns->addColumn( i18n("Pattern") );
lvPatterns->addColumn( i18n("Mime Types") );
lvPatterns->addColumn( i18n("File Masks") );


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

@@ -111,7 +111,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
void slotEdit();

private:
class KListView *lvPatterns;
class TDEListView *lvPatterns;
class TQPushButton *btnNew, *btnDel, *btnEdit;
ABEntityList *m_ents;
};


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

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



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

@@ -64,11 +64,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )

setInstance( KGenericFactory<ISearchPlugin>::instance() );

m_searchForwardAction = new KAction(
m_searchForwardAction = new TDEAction(
i18n("Search Incrementally"), CTRL+ALT+Key_F,
this, TQT_SLOT(slotSearchForwardAction()),
actionCollection(), "edit_isearch" );
m_searchBackwardAction = new KAction(
m_searchBackwardAction = new TDEAction(
i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F,
this, TQT_SLOT(slotSearchBackwardAction()),
actionCollection(), "edit_isearch_reverse" );
@@ -97,13 +97,13 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
m_comboAction->setAutoSized( true );
m_comboAction->setShortcutConfigurable( false );

KActionMenu* optionMenu = new KActionMenu(
TDEActionMenu* optionMenu = new TDEActionMenu(
i18n("Search Options"), "configure",
actionCollection(), "isearch_options" );
optionMenu->setDelayed( false );

KToggleAction* action = new KToggleAction(
i18n("Case Sensitive"), KShortcut(),
TDEToggleAction* action = new TDEToggleAction(
i18n("Case Sensitive"), TDEShortcut(),
actionCollection(), "isearch_case_sensitive" );
action->setShortcutConfigurable( false );
connect( action, TQT_SIGNAL(toggled(bool)),
@@ -111,8 +111,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
action->setChecked( m_caseSensitive );
optionMenu->insert( action );

action = new KToggleAction(
i18n("From Beginning"), KShortcut(),
action = new TDEToggleAction(
i18n("From Beginning"), TDEShortcut(),
actionCollection(), "isearch_from_beginning" );
action->setShortcutConfigurable( false );
connect( action, TQT_SIGNAL(toggled(bool)),
@@ -120,8 +120,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
action->setChecked( m_fromBeginning );
optionMenu->insert( action );

action = new KToggleAction(
i18n("Regular Expression"), KShortcut(),
action = new TDEToggleAction(
i18n("Regular Expression"), TDEShortcut(),
actionCollection(), "isearch_reg_exp" );
action->setShortcutConfigurable( false );
connect( action, TQT_SIGNAL(toggled(bool)),
@@ -129,10 +129,10 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
action->setChecked( m_regExp );
optionMenu->insert( action );

// optionMenu->insert( new KActionSeparator() );
// optionMenu->insert( new TDEActionSeparator() );
//
// action = new KToggleAction(
// i18n("Auto-Wrap Search"), KShortcut(),
// action = new TDEToggleAction(
// i18n("Auto-Wrap Search"), TDEShortcut(),
// actionCollection(), "isearch_auto_wrap" );