Browse Source

Rename many classes and header files to avoid conflicts with KDE4

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

+ 3
- 3
KDE2PORTING.html View File

@@ -694,15 +694,15 @@ can combine TreeView's and normal Tablists without problems.<P>
<H3><A NAME="TDEToolBarButton">TDEToolBarButton &amp; TDERadioGroup</A></H3>

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>
&lt;tdetoolbarbutton.h&gt; TDERadioGroup has been renamed to TDEToolBarRadioGroup and
requires you to include &lt;tdetoolbarradiogroup.h&gt;<P>

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

<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 TDEAccel.<P>
declared globally in tdeaccel.h are now static methods in TDEAccel.<P>

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


+ 5
- 5
KDE3PORTING.html View File

@@ -154,9 +154,9 @@ not be available.
<ul>
<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()) );
+ kaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
- tdeaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
- tdeaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
+ tdeaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
Key_Up, this, TQT_SLOT(scrollUp()) );
</pre>
Note that a What's This parameter is now a part of the insert function.
@@ -168,8 +168,8 @@ not be available.
can replace it. Note, however, that this would be handled automatically
by using TDEAction instead.
<pre>
- kaccel-&gt;changeMenuAccel( menu, id, "file_open" );
+ menu-&gt;setAccel( kaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
- tdeaccel-&gt;changeMenuAccel( menu, id, "file_open" );
+ menu-&gt;setAccel( tdeaccel-&gt;shortcut( "file_open" ).keyCodeQt(), id );
</pre>
</li>
</ul>

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

@@ -26,7 +26,7 @@
#define XEvent void
#endif

#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include "kvideowidget.h"


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

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

#ifndef TEST_H

+ 1
- 1
dnssd/README View File

@@ -1,4 +1,4 @@
Checklist to ensure that zeroconf will work:
Chectdelist to ensure that zeroconf will work:

1) Install Avahi, at least version 0.3
2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs

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

@@ -26,7 +26,7 @@
#include <tdeconfig.h>
#include <kdesktopfile.h>
#include <kstandarsdirs.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kdebug.h>

#include <tqdir.h>

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

@@ -19,8 +19,8 @@
#ifndef _script_loader_h
#define _script_loader_h
#include <tqptrlist.h>
#include <kmainwindow.h>
#include <kaction.h>
#include <tdemainwindow.h>
#include <tdeaction.h>
#include <tdescript/scriptinterface.h>

/**

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

@@ -37,7 +37,7 @@ install( FILES
document.h view.h editor.h plugin.h editinterface.h
undointerface.h selectioninterface.h cursorinterface.h
clipboardinterface.h popupmenuinterface.h viewcursorinterface.h
searchinterface.h highlightinginterface.h blockselectioninterface.h
searchinterface.h highlightinginterface.h bloctdeselectioninterface.h
codecompletioninterface.h configinterface.h markinterface.h
printinterface.h wordwrapinterface.h dynwordwrapinterface.h
markinterfaceextension.h configinterfaceextension.h
@@ -69,7 +69,7 @@ set( target tdetexteditor )
set( ${target}_SRCS
tdetexteditor.cpp
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp
printinterface.cpp highlightinginterface.cpp markinterface.cpp
popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp
@@ -78,8 +78,8 @@ set( ${target}_SRCS
searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp
configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp
viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp
blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp
bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp
encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel
undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp
viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp

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

@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdetexteditor.la

libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \
printinterface.cpp highlightinginterface.cpp markinterface.cpp \
popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -13,8 +13,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
searchdcopinterface.cpp searchdcopinterface.skel markinterfaceextension.cpp \
configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
viewstatusmsginterface.cpp editorchooser_ui.ui editorchooser.cpp \
blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
blockselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
bloctdeselectiondcopinterface.skel documentdcopinfo.skel encodingdcopinterface.cpp \
encodingdcopinterface.skel printdcopinterface.cpp printdcopinterface.skel \
undodcopinterface.cpp undodcopinterface.skel viewcursordcopinterface.cpp \
viewcursordcopinterface.skel viewstatusmsgdcopinterface.cpp \
@@ -29,7 +29,7 @@ tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface
selectioninterface.h cursorinterface.h \
clipboardinterface.h popupmenuinterface.h \
viewcursorinterface.h searchinterface.h highlightinginterface.h \
blockselectioninterface.h codecompletioninterface.h \
bloctdeselectioninterface.h codecompletioninterface.h \
configinterface.h markinterface.h printinterface.h wordwrapinterface.h \
dynwordwrapinterface.h markinterfaceextension.h configinterfaceextension.h \
encodinginterface.h viewstatusmsginterface.h sessionconfiginterface.h editorchooser.h \

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

@@ -1,5 +1,5 @@
#include "blockselectiondcopinterface.h"
#include "blockselectioninterface.h"
#include "bloctdeselectiondcopinterface.h"
#include "bloctdeselectioninterface.h"

#include <dcopclient.h>
using namespace KTextEditor;

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

@@ -38,13 +38,13 @@ namespace KTextEditor
/**
* Returns the status of the selection mode - true indicates block selection mode is on.
* If this is true, selections applied via the SelectionInterface are handled as
* blockselections and the paste functions of the ClipboardInterface works on
* bloctdeselections and the paste functions of the ClipboardInterface works on
* rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
*/
bool blockSelectionMode ();

/**
* set blockselection mode to state "on"
* set bloctdeselection mode to state "on"
*/
bool setBlockSelectionMode (bool on) ;


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

@@ -18,8 +18,8 @@

// $Id$

#include "blockselectioninterface.h"
#include "blockselectiondcopinterface.h"
#include "bloctdeselectioninterface.h"
#include "bloctdeselectiondcopinterface.h"
#include "document.h"

namespace KTextEditor

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

@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/

#ifndef __tdetexteditor_blockselectioninterface_h__
#define __tdetexteditor_blockselectioninterface_h__
#ifndef __tdetexteditor_bloctdeselectioninterface_h__
#define __tdetexteditor_bloctdeselectioninterface_h__

#include <tdelibs_export.h>

@@ -51,7 +51,7 @@ class KTEXTEDITOR_EXPORT BlockSelectionInterface
/**
* Returns the status of the selection mode - true indicates block selection mode is on.
* If this is true, selections applied via the SelectionInterface are handled as
* blockselections and the paste functions of the ClipboardInterface works on
* bloctdeselections and the paste functions of the ClipboardInterface works on
* rectangular blocks of text rather than normal. (copy too, but thats clear I hope ;)
*/
virtual bool blockSelectionMode () = 0;

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

@@ -24,7 +24,7 @@
#include "plugin.h"
#include "editor.h"

#include <kaction.h>
#include <tdeaction.h>
#include <tdeparts/factory.h>
#include <tdeparts/componentfactory.h>


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

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

+ 1
- 1
kab/kabapi.cc View File

@@ -17,7 +17,7 @@
*/

#include "kabapi.h"
#include <klistbox.h>
#include <tdelistbox.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kdebug.h>

+ 1
- 1
kabc/addresseedialog.h View File

@@ -25,7 +25,7 @@

#include <kdialogbase.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>

#include "addressbook.h"


+ 1
- 1
kabc/addresslineedit.cpp View File

@@ -37,7 +37,7 @@
#include <kcursor.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kurldrag.h>

#include <kabc/stdaddressbook.h>

+ 1
- 1
kabc/ldapconfigwidget.cpp View File

@@ -30,7 +30,7 @@
#include <tqradiobutton.h>

#include <kmessagebox.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <kdialogbase.h>
#include <klocale.h>
#include <klineedit.h>

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

@@ -29,7 +29,7 @@
#include <tqhbuttongroup.h>
#include <tqradiobutton.h>

#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialogbase.h>

+ 1
- 1
kabc/resourceselectdialog.cpp View File

@@ -20,7 +20,7 @@

#include <klocale.h>
#include <kbuttonbox.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <kstdguiitem.h>

#include <tqgroupbox.h>

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

@@ -197,7 +197,7 @@
<item> host_speeds </item>
<item> hostname </item>
<item> hpkextract </item>
<item> hpklist </item>
<item> hptdelist </item>
<item> hpkremove </item>
<item> hpkval </item>
<item> hud_centerid </item>

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

@@ -27,7 +27,7 @@
#include <tdetexteditor/documentinfo.h>
#include <tdetexteditor/selectioninterface.h>
#include <tdetexteditor/selectioninterfaceext.h>
#include <tdetexteditor/blockselectioninterface.h>
#include <tdetexteditor/bloctdeselectioninterface.h>
#include <tdetexteditor/searchinterface.h>
#include <tdetexteditor/highlightinginterface.h>
#include <tdetexteditor/configinterface.h>
@@ -38,7 +38,7 @@
#include <tdetexteditor/printinterface.h>
#include <tdetexteditor/variableinterface.h>

#include <kaction.h>
#include <tdeaction.h>

class KCompletion;


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

@@ -29,7 +29,7 @@

#include <klocale.h>
#include <kdebug.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include <cctype>


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

@@ -24,8 +24,8 @@
#include "kateview.h"

#include <klocale.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
#include <kxmlguiclient.h>
#include <kxmlguifactory.h>

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

@@ -42,7 +42,7 @@
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>

#include <kaccel.h>
#include <tdeaccel.h>
#include <kapplication.h>
#include <kbuttonbox.h>
#include <kcharsets.h>
@@ -52,20 +52,20 @@
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kkeybutton.h>
#include <kkeydialog.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmimetypechooser.h>
#include <knuminput.h>
#include <tdeparts/componentfactory.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <kprocio.h>
#include <kregexpeditorinterface.h>

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

@@ -29,7 +29,7 @@

#include "../interfaces/document.h"

#include <klistview.h>
#include <tdelistview.h>
#include <kdialogbase.h>
#include <kmimetype.h>


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

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

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

@@ -24,7 +24,7 @@
#include "katedocument.h"
#include "kateview.h"

#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>

KateBrowserExtension::KateBrowserExtension( KateDocument* doc )

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

@@ -33,7 +33,7 @@
#include <kiconloader.h>
#include <knuminput.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include <tqregexp.h>
#include <tqcheckbox.h>

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

@@ -38,7 +38,7 @@
#include <kmimetype.h>
#include <klocale.h>
#include <kregexp.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kglobalsettings.h>
#include <kdebug.h>
#include <kstandarddirs.h>

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

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

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

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

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

@@ -32,11 +32,11 @@
#include <kcolorbutton.h>
#include <kcombobox.h>
#include <kinputdialog.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kcolordialog.h>
#include <kapplication.h>
#include <kaboutdata.h>

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

@@ -30,7 +30,7 @@
#include <tqfont.h>

#include <tdeconfig.h>
#include <kaction.h>
#include <tdeaction.h>

class KateView;
class KateStyleListItem;

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

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

if( !found ) return false;


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

@@ -26,7 +26,7 @@

#include "kateview.h"

#include <kaction.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdespell.h>
#include <ksconfig.h>

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

@@ -61,10 +61,10 @@
#include <kglobal.h>
#include <kcharsets.h>
#include <kmessagebox.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kxmlguifactory.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <klibloader.h>
#include <kencodingfiledialog.h>
#include <tdemultipledrag.h>

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

@@ -222,7 +222,7 @@ class KateView : public Kate::View,
*/
inline const KateSuperCursor &selEnd () const { return selectEnd; }

// should cursor be wrapped ? take config + blockselection state in account
// should cursor be wrapped ? take config + bloctdeselection state in account
bool wrapCursor ();

// some internal functions to get selection state of a line/col

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

@@ -38,7 +38,7 @@
#include <knotifyclient.h>
#include <kglobal.h>
#include <kcharsets.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include <tqcursor.h>
#include <tqpainter.h>

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

@@ -21,7 +21,7 @@
#ifndef __KATE_VIEW_HELPERS_H__
#define __KATE_VIEW_HELPERS_H__

#include <kaction.h>
#include <tdeaction.h>
#include <klineedit.h>

#include <tqwidget.h>

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

@@ -39,11 +39,11 @@
#include <unistd.h>
#include <stdio.h>

#include <kaction.h>
#include <tdeaction.h>
#include <kcmdlineargs.h>
#include "katefactory.h"
#include <tdeio/job.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <ksimpleconfig.h>
#include <kglobalsettings.h>


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

@@ -28,12 +28,12 @@
#include <tdetexteditor/documentinfo.h>
#include <tdetexteditor/document.h>

#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmimetype.h>
#include <kmimetypechooser.h>

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

@@ -25,7 +25,7 @@

#include <assert.h>
#include <tdeio/job.h>
#include <kaction.h>
#include <tdeaction.h>
#include <tdefiledialog.h>
#include <kgenericfactory.h>
#include <klocale.h>

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

@@ -22,7 +22,7 @@
#include <tqpopupmenu.h>
#include <kgenericfactory.h>
#include <klocale.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kdebug.h>

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

@@ -20,13 +20,13 @@
#include "kate_kdatatool.h"
#include "kate_kdatatool.moc"
#include <kgenericfactory.h>
#include <kaction.h>
#include <tdeaction.h>
#include <tdetexteditor/view.h>
#include <kdebug.h>
#include <kdatatool.h>
#include <tdetexteditor/document.h>
#include <tdetexteditor/selectioninterface.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/editinterface.h>
#include <kmessagebox.h>

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

@@ -38,7 +38,7 @@
#include <kdialog.h>
#include <kgenericfactory.h>
#include <klocale.h>
#include <kaction.h>
#include <tdeaction.h>
#include <knotifyclient.h>
#include <tdeparts/part.h>
#include <kiconloader.h>

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

@@ -3,7 +3,7 @@
<!--
This file is freely distributable, created by Wilbert Berendsen (wbsoft@xs4all.nl)

This is just a simple XSLT file that converts some HTML pages to a XBEL bookmarklist.
This is just a simple XSLT file that converts some HTML pages to a XBEL bookmartdelist.
It is included here to test the new XSLT highlighting by Peter Lammich.
TODO: add better test file.

+ 1
- 1
kded/kded.cpp View File

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

+ 7
- 7
kded/tdebuildsycoca.cpp View File

@@ -695,7 +695,7 @@ static KCmdLineOptions options[] = {
{ "nosignal", I18N_NOOP("Do not signal applications to update"), 0 },
{ "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 },
{ "checkstamps", I18N_NOOP("Check file timestamps"), 0 },
{ "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
{ "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 },
{ "global", I18N_NOOP("Create global database"), 0 },
{ "menutest", I18N_NOOP("Perform menu generation test run only"), 0 },
{ "track <menu-id>", I18N_NOOP("Track menu id for debug purposes"), 0 },
@@ -798,10 +798,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
}
fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName);

bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles");
bool checkfiles = bGlobalDatabase || args->isSet("checkfiles");

bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles;
if (incremental || !chectdefiles)
bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles;
if (incremental || !checkfiles)
{
KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
TQString current_language = TDEGlobal::locale()->language();
@@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
(KSycoca::self()->timeStamp() == 0))
{
incremental = false;
chectdefiles = true;
checkfiles = true;
delete KSycoca::self();
}
}

g_changeList = new TQStringList;

bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles;
bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
TQ_UINT32 filestamp = 0;
TQStringList oldresourcedirs;
if( checkstamps && incremental )
@@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)

newTimestamp = (TQ_UINT32) time(0);

if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
{
TQCString qSycocaPath = TQFile::encodeName(sycocaPath());
cSycocaPath = qSycocaPath.data();

+ 6
- 6
kdewidgets/kde.widgets View File

@@ -61,20 +61,20 @@ WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
Group=Input (KDE)

[TDEFontChooser]
IncludeFile=kfontdialog.h
IconSet=kfontcombo.png
IncludeFile=tdefontdialog.h
IconSet=tdefontcombo.png
ToolTip=Font Chooser (KDE)
WhatsThis=A font type, size and style selection widget complete with preview
Group=Input (KDE)

[TDEFontRequester]
IncludeFile=kfontrequester.h
IncludeFile=tdefontrequester.h
ToolTip=Font Requester (KDE)
WhatsThis=A compact font selection and preview widget
Group=Input (KDE)

[KGradientSelector]
IncludeFile=kselect.h
IncludeFile=tdeselect.h
WhatsThis=A widget that allows the user to select two colors to form a gradient
Group=Graphics (KDE)

@@ -115,7 +115,7 @@ ConstructorArgs=(parent, 0, name)

[TDEListViewSearchLineWidget]
ToolTip=ListView Search Line Widget (KDE)
IncludeFile=klistviewsearchline.h
IncludeFile=tdelistviewsearchline.h
Group=Input (KDE)
ConstructorArgs=(0, parent, name)

@@ -244,7 +244,7 @@ Group=Display (KDE)
ConstructorArgs=(parent)

[TDEActionSelector]
IncludeFile=kactionselector.h
IncludeFile=tdeactionselector.h
ToolTip=A widget for selecting and arranging actions/objects
Group=Views (KDE)


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

@@ -13,15 +13,15 @@

install( FILES
klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png
kfontrequester.png kurlrequester.png kcombobox.png kiconview.png
tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png
kintspinbox.png kled.png ksqueezedtextlabel.png kprogress.png
kurllabel.png kruler.png tdecmodule.png kdoublespinbox.png
kdoublenuminput.png klistbox.png klistview.png kactivelabel.png
kdoublenuminput.png tdelistbox.png tdelistview.png kactivelabel.png
kiconbutton.png kcolorcombo.png khsselector.png kcolorbutton.png
kgradientselector.png kdualcolorbutton.png ktimewidget.png
kpushbutton.png kcharselect.png kdatepicker.png
kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png
kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png
kintnuminput.png krestrictedline.png ktextedit.png
kurlcomborequester.png kkeybutton.png kpalettetable.png
kactionselector.png kdatetable.png kdatetimewidget.png
tdeactionselector.png kdatetable.png kdatetimewidget.png
DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics )

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

@@ -1,15 +1,15 @@
kdewidgetsdata_DATA = klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
kled.png ksqueezedtextlabel.png kprogress.png kurllabel.png \
kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \
klistbox.png klistview.png kactivelabel.png kiconbutton.png \
tdelistbox.png tdelistview.png kactivelabel.png kiconbutton.png \
kcolorcombo.png khsselector.png kcolorbutton.png \
kgradientselector.png kdualcolorbutton.png ktimewidget.png \
kpushbutton.png kcharselect.png kdatepicker.png \
kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png \
kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png \
kintnuminput.png krestrictedline.png ktextedit.png \
kurlcomborequester.png kkeybutton.png kpalettetable.png \
kactionselector.png kdatetable.png kdatetimewidget.png
tdeactionselector.png kdatetable.png kdatetimewidget.png


kdewidgetsdatadir = $(kde_datadir)/kdewidgets/pics

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

@@ -61,20 +61,20 @@ WhatsThis=A QCombo Box showing the installed system fonts (with preview)
Group=Input (KDE)

[TDEFontChooser]
IncludeFile=kfontdialog.h
IconSet=kfontcombo.png
IncludeFile=tdefontdialog.h
IconSet=tdefontcombo.png
ToolTip=Font Chooser (KDE)
WhatsThis=A font type, size and style selection widget complete with preview
Group=Input (KDE)

[TDEFontRequester]
IncludeFile=kfontrequester.h
IncludeFile=tdefontrequester.h
ToolTip=Font Requester (KDE)
WhatsThis=A compact font selection and preview widget
Group=Input (KDE)

[KGradientSelector]
IncludeFile=kselect.h
IncludeFile=tdeselect.h
WhatsThis=A widget that allows the user to select two colors to form a gradient
Group=Graphics (KDE)

@@ -233,7 +233,7 @@ Group=Display (KDE)
ConstructorArgs=(parent)

[TDEActionSelector]
IncludeFile=kactionselector.h
IncludeFile=tdeactionselector.h
ToolTip=A widget for selecting and arranging actions/objects
Group=Views (KDE)


+ 1
- 1
knewstuff/downloaddialog.cpp View File

@@ -22,7 +22,7 @@
#include "downloaddialog.moc"

#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kdebug.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>

+ 1
- 1
knewstuff/knewstuff.cpp View File

@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/

#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <klocale.h>

+ 1
- 1
knewstuff/providerdialog.cpp View File

@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqlabel.h>

#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>


+ 1
- 1
knewstuff/uploaddialog.cpp View File

@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <ktextedit.h>

#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kdebug.h>
#include <kurlrequester.h>

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

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

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

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

+ 1
- 1
tdecert/tdecertpart.cc View File

@@ -40,7 +40,7 @@
#include <kprocess.h>
#include <tqtabwidget.h>
#include <kseparator.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tdeio/kmimemagic.h>
#include <tqmultilineedit.h>
#include <tqregexp.h>

+ 1
- 1
tdecert/tdecertpart.h View File

@@ -27,7 +27,7 @@
#include <tdeparts/part.h>
#include <tqptrlist.h>
#include <tqlistview.h>
#include <klistview.h>
#include <tdelistview.h>

class KSSLCertBox;
class TQFrame;

+ 7
- 7
tdecore/CMakeLists.txt View File

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

+ 6
- 6
tdecore/MAINTAINERS View File

@@ -7,9 +7,9 @@ more logical grouping.

dmalloc.cpp
kaboutdata.cpp David Faure <faure@kde.org>
kaccel.cpp Ellis Whitehead <ellis@kde.org>
kaccelaction.cpp Ellis Whitehead <ellis@kde.org>
kaccelbase.cpp Ellis Whitehead <ellis@kde.org>
tdeaccel.cpp Ellis Whitehead <ellis@kde.org>
tdeaccelaction.cpp Ellis Whitehead <ellis@kde.org>
tdeaccelbase.cpp Ellis Whitehead <ellis@kde.org>
kallocator.cpp Waldo Bastian <bastian@kde.org>
kappdcopiface.cpp
kapplication.cpp Waldo Bastian <bastian@kde.org>
@@ -56,13 +56,13 @@ kregexp.cpp
krfcdate.cpp Waldo Bastian <bastian@kde.org>
krootprop.cpp Lubos Lunak <l.lunak@kde.org>
ksavefile.cpp Waldo Bastian <bastian@kde.org>
kshortcut.cpp Ellis Whitehead <ellis@kde.org>
tdeshortcut.cpp Ellis Whitehead <ellis@kde.org>
ksimpleconfig.cpp Waldo Bastian <bastian@kde.org>
ksocks.cpp
kstandarddirs.cpp Waldo Bastian <bastian@kde.org>
kstartupinfo.cpp Lubos Lunak <l.lunak@kde.org>
kstaticdeleter.cpp Stephan Kulow <coolo@kde.org>
kstdaccel.cpp Ellis Whitehead <ellis@kde.org>
tdestdaccel.cpp Ellis Whitehead <ellis@kde.org>
kstringhandler.cpp
tdesycoca.cpp Waldo Bastian <bastian@kde.org>
tdesycocadict.cpp Waldo Bastian <bastian@kde.org>
@@ -109,7 +109,7 @@ kprotocolinfofactory.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright)
kpty.cpp
kshell.cpp Oswald Buddenhagen <ossi@kde.org> (copyright)
kshortcutmenu.cpp Ellis Whitehead <ellis@kde.org> (copyright)
tdeshortcutmenu.cpp Ellis Whitehead <ellis@kde.org> (copyright)
ktempdir.cpp Joseph Wenninger <jowenn@kde.org> (copyright)
kuser.cpp Tim Jansen <tim@tjansen.de> (copyright)
kvmallocator.cpp Waldo Bastian (bastian@kde.org) (copyright)

+ 9
- 9
tdecore/Makefile.am View File

@@ -42,14 +42,14 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
kcmdlineargs.h tdeconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \
twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
kregexp.h kcompletion.h kstringhandler.h \
kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
kallocator.h kvmallocator.h kcrash.h krfcdate.h \
kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
krandomsequence.h knotifyclient.h kiconeffect.h \
kaudioplayer.h kdcoppropertyproxy.h netwm.h kaccelmanager.h \
kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
@@ -81,10 +81,10 @@ libtdefakes_pic.a: libtdefakes.la
ar cru libtdefakes_pic.a fakes_pic.o vsnprintf_pic.o
ranlib libtdefakes_pic.a

noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
kcompletion_private.h netwm_p.h \
kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
kcheckaccelerators.h kcalendarsystemgregorian.h \
kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
@@ -95,13 +95,13 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
kckey.cpp kshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
kaccelaction.cpp kshortcutmenu.cpp kaccelbase.cpp kaccel.cpp \
kglobalaccel_x11.cpp kglobalaccel.cpp kstdaccel.cpp kshortcutlist.cpp \
kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
kuniqueapplication.cpp kaccelmanager.cpp \
kuniqueapplication.cpp tdeaccelmanager.cpp \
ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
kcmdlineargs.cpp kaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
kaudioplayer.cpp kdcoppropertyproxy.cpp \

+ 2
- 2
tdecore/kapplication.cpp View File

@@ -77,8 +77,8 @@
#include <kdatastream.h>
#include <klibloader.h>
#include <kmimesourcefactory.h>
#include <kstdaccel.h>
#include <kaccel.h>
#include <tdestdaccel.h>
#include <tdeaccel.h>
#include "kcheckaccelerators.h"
#include <tqptrdict.h>
#include <kmacroexpander.h>

+ 2
- 2
tdecore/kcheckaccelerators.cpp View File

@@ -26,7 +26,7 @@
#include "config.h"

#include "kcheckaccelerators.h"
#include "kaccelmanager.h"
#include "tdeaccelmanager.h"
#include <tqpopupmenu.h>
#include <tqapplication.h>
#include <tqdialog.h>
@@ -42,7 +42,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include <klocale.h>

/*

+ 1
- 1
tdecore/kcompletion.h View File

@@ -30,7 +30,7 @@
#include "tdelibs_export.h"
#include <kglobalsettings.h>
#include <ksortablevaluelist.h>
#include <kshortcut.h>
#include <tdeshortcut.h>

class KCompTreeNode;
class KCompletionPrivate;

+ 2
- 2
tdecore/kglobalaccel.cpp View File

@@ -29,9 +29,9 @@
#endif

#include <tqstring.h>
#include "kaccelbase.h"
#include "tdeaccelbase.h"
#include <kdebug.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include <klocale.h>

//----------------------------------------------------

+ 1
- 1
tdecore/kglobalaccel.h View File

@@ -21,7 +21,7 @@
#define _KGLOBALACCEL_H_

#include <tqobject.h>
#include <kshortcut.h>
#include <tdeshortcut.h>

class TQPopupMenu;
class TQWidget;

+ 2
- 2
tdecore/kglobalaccel_emb.h View File

@@ -1,8 +1,8 @@
#ifndef _KGLOBALACCEL_EMB_H
#define _KGLOBALACCEL_EMB_H

#include "kaccelbase.h"
#include "kshortcut.h"
#include "tdeaccelbase.h"
#include "tdeshortcut.h"

class TDEGlobalAccelPrivate
{

+ 2
- 2
tdecore/kglobalaccel_mac.h View File

@@ -3,8 +3,8 @@

#include <tqwidget.h>

#include "kshortcut.h"
#include "kaccelbase.h"
#include "tdeshortcut.h"
#include "tdeaccelbase.h"

class TDEGlobalAccelPrivate: public TDEAccelBase
{

+ 2
- 2
tdecore/kglobalaccel_win.h View File

@@ -23,9 +23,9 @@
#include <tqmap.h>
#include <tqwidget.h>

#include "kaccelbase.h"
#include "tdeaccelbase.h"
#include "kkeyserver.h"
#include "kshortcut.h"
#include "tdeshortcut.h"

/**
* @internal

+ 2
- 2
tdecore/kglobalaccel_x11.h View File

@@ -23,9 +23,9 @@
#include <tqmap.h>
#include <tqwidget.h>

#include "kaccelbase.h"
#include "tdeaccelbase.h"
#include "kkeyserver_x11.h"
#include "kshortcut.h"
#include "tdeshortcut.h"

/**
* @internal

+ 2
- 2
tdecore/kglobalsettings.cpp View File

@@ -41,10 +41,10 @@ static QRgb qt_colorref2qrgb(COLORREF col)

#include <kdebug.h>
#include <kglobal.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include <kstandarddirs.h>
#include <kcharsets.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <klocale.h>
#include <tqfontinfo.h>
#include <stdlib.h>

+ 1
- 1
tdecore/kkeynative.h View File

@@ -23,7 +23,7 @@
#ifndef __KKEYNATIVE_H
#define __KKEYNATIVE_H

#include <kshortcut.h>
#include <tdeshortcut.h>

#ifdef Q_WS_X11
typedef union _XEvent XEvent;

+ 2
- 2
tdecore/kkeyserver_x11.cpp View File

@@ -29,7 +29,7 @@

#include "kkeyserver_x11.h"
#include "kkeynative.h"
#include "kshortcut.h"
#include "tdeshortcut.h"

#include <tdeconfig.h>
#include <kdebug.h>
@@ -1020,7 +1020,7 @@ void Variations::init( const KKey& key, bool bQt )

} // end of namespace KKeyServer block

// FIXME: This needs to be moved to kshortcut.cpp, and create a
// FIXME: This needs to be moved to tdeshortcut.cpp, and create a
// KKeyServer::method which it will call.
// Alt+SysReq => Alt+Print
// Ctrl+Shift+Plus => Ctrl+Plus (en)

+ 1
- 1
tdecore/kkeyserver_x11.h View File

@@ -23,7 +23,7 @@
#ifndef _KKEYSERVER_X11_H
#define _KKEYSERVER_X11_H

#include "kshortcut.h"
#include "tdeshortcut.h"
#include "kkeynative.h"

/**

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


+ 7
- 7
tdecore/tdeaccel.cpp View File

@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/

#include "kaccel.h"
#include "tdeaccel.h"

#include <tqaccel.h>
#include <tqguardedptr.h>
@@ -26,13 +26,13 @@
#include <tqstring.h>
#include <tqtimer.h>

#include "kaccelbase.h"
#include "tdeaccelbase.h"
#include <kapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kshortcut.h>
#include <tdeshortcut.h>

#include "kaccelprivate.h"
#include "tdeaccelprivate.h"

#ifdef Q_WS_X11
# include <X11/Xlib.h>
@@ -43,7 +43,7 @@
# endif
#endif

// TODO: Put in kaccelbase.cpp
// TODO: Put in tdeaccelbase.cpp
//---------------------------------------------------------------------
// TDEAccelEventHandler
//---------------------------------------------------------------------
@@ -659,5 +659,5 @@ TQString TDEAccel::findKey( int key ) const
void TDEAccel::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }

#include "kaccel.moc"
#include "kaccelprivate.moc"
#include "tdeaccel.moc"
#include "tdeaccelprivate.moc"

+ 2
- 2
tdecore/tdeaccel.h View File

@@ -21,8 +21,8 @@
#define _KACCEL_H

#include <tqaccel.h>
#include <kshortcut.h>
#include <kstdaccel.h>
#include <tdeshortcut.h>
#include <tdestdaccel.h>
#include "tdelibs_export.h"

class TQPopupMenu; // for obsolete insertItem() methods below

+ 3
- 3
tdecore/tdeaccelaction.cpp View File

@@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA.
*/

#include "kaccelaction.h"
#include "kaccelbase.h" // for TDEAccelBase::slotRemoveAction() & emitSignal()
#include "tdeaccelaction.h"
#include "tdeaccelbase.h" // for TDEAccelBase::slotRemoveAction() & emitSignal()

#include <tqkeycode.h>

@@ -31,7 +31,7 @@
#include <kglobal.h>
#include <kkeynative.h>
#include <klocale.h>
#include <kshortcutlist.h>
#include <tdeshortcutlist.h>

//---------------------------------------------------------------------
// TDEAccelAction

+ 1
- 1
tdecore/tdeaccelaction.h View File

@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqvaluevector.h>

#include <kshortcut.h>
#include <tdeshortcut.h>

class TDEAccelBase;


+ 2
- 2
tdecore/tdeaccelbase.cpp View File

@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/

#include "kaccelbase.h"
#include "tdeaccelbase.h"

#include <tqkeycode.h>
#include <tqlabel.h>
@@ -33,7 +33,7 @@
#include <kkeynative.h>
#include "kkeyserver.h"
#include <klocale.h>
#include "kshortcutmenu.h"
#include "tdeshortcutmenu.h"

//---------------------------------------------------------------------
// class TDEAccelBase::ActionInfo

+ 1
- 1
tdecore/tdeaccelbase.h View File

@@ -26,7 +26,7 @@
#include <tqvaluevector.h>
#include <tqvaluelist.h>

#include "kaccelaction.h"
#include "tdeaccelaction.h"
#include "kkeyserver.h"

class TQPopupMenu;

+ 3
- 3
tdecore/tdeaccelmanager.cpp View File

@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/

#include "kaccelmanager.h"
#include "tdeaccelmanager.h"

#include <tqapplication.h>
#include <tqcheckbox.h>
@@ -45,7 +45,7 @@
#include <kdebug.h>


#include "kaccelmanager_private.h"
#include "tdeaccelmanager_private.h"
#include "../tdeui/kstdaction_p.h"
#include "../tdeutils/tdemultitabbar.h"

@@ -869,4 +869,4 @@ void TDEAcceleratorManager::setNoAccel( TQWidget *widget )
TDEAcceleratorManagerPrivate::ignored_widgets[widget] = 1;
}

#include "kaccelmanager_private.moc"
#include "tdeaccelmanager_private.moc"

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

@@ -24,12 +24,12 @@ if ( system( $cmd ) != 0 ) {
exit 1;
}

chectdefile( $file_h );
chectdefile( $file_cpp );
checkfile( $file_h );
checkfile( $file_cpp );

exit 0;

sub chectdefile()
sub checkfile()
{
my $file = shift;


+ 1
- 1
tdecore/tdeshortcut.cpp View File

@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/

#include "kshortcut.h"
#include "tdeshortcut.h"
#include "kkeynative.h"
#include "kkeyserver.h"


+ 4
- 4
tdecore/tdeshortcutlist.cpp View File

@@ -1,15 +1,15 @@
#include <tqstring.h>
#include <tqvariant.h>

#include <kaccel.h>
#include "kaccelaction.h"
#include <tdeaccel.h>
#include "tdeaccelaction.h"
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalaccel.h>
#include <kinstance.h>
#include <kshortcut.h>
#include "kshortcutlist.h"
#include <tdeshortcut.h>
#include "tdeshortcutlist.h"

//---------------------------------------------------------------------
// TDEShortcutList

+ 3
- 3
tdecore/tdeshortcutmenu.cpp View File

@@ -21,10 +21,10 @@
#include <tqlabel.h>
#include <tqpopupmenu.h>

#include "kaccelaction.h"
#include "tdeaccelaction.h"
#include <kdebug.h>
#include <kglobalsettings.h>
#include "kshortcutmenu.h"
#include "tdeshortcutmenu.h"
//#include <kkeynative.h>

TDEShortcutMenu::TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq )
@@ -158,4 +158,4 @@ void TDEShortcutMenu::keepItemsMatching( KKey key )
updateShortcuts();
}

#include "kshortcutmenu.moc"
#include "tdeshortcutmenu.moc"

+ 1
- 1
tdecore/tdeshortcutmenu.h View File

@@ -23,7 +23,7 @@
#include <tqmap.h>
#include <tqpopupmenu.h>

#include "kshortcut.h"
#include "tdeshortcut.h"

class TQLabel;


+ 5
- 5
tdecore/tdestdaccel.cpp View File

@@ -19,16 +19,16 @@
*/
#define __KSTDACCEL_CPP_ 1

#include "kstdaccel.h"
#include "tdestdaccel.h"

#include "kaccelaction.h"
#include "kaccelbase.h"
#include "tdeaccelaction.h"
#include "tdeaccelbase.h"
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
#include <kshortcut.h>
#include <kshortcutlist.h>
#include <tdeshortcut.h>
#include <tdeshortcutlist.h>

namespace TDEStdAccel
{

+ 2
- 2
tdecore/tdestdaccel.h View File

@@ -21,7 +21,7 @@
#define KSTDACCEL_H

#include <tqstring.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include "tdelibs_export.h"

class TQKeyEvent;
@@ -35,7 +35,7 @@ class TDEAccelActions;
* so do not hardcode the default behavior.
*
* If you want real configurable keybindings in your applications,
* please checkout the class TDEAccel in kaccel.h
* please checkout the class TDEAccel in tdeaccel.h
* @see TDEAccelShortcutList
*/
namespace TDEStdAccel

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

@@ -28,9 +28,9 @@ check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \
cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
kcharsetstest kcalendartest kmacroexpandertest kshelltest \
kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest
kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest

TESTS = kurltest kstdacceltest
TESTS = kurltest tdestdacceltest

noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \
kipctest.h kprociotest.h
@@ -75,7 +75,7 @@ kmacroexpandertest_SOURCES = kmacroexpandertest.cpp
kshelltest_SOURCES = kshelltest.cpp
kxerrorhandlertest_SOURCES = kxerrorhandlertest.cpp
startserviceby_SOURCES = startserviceby.cpp
kstdacceltest_SOURCES = kstdacceltest.cpp
tdestdacceltest_SOURCES = tdestdacceltest.cpp
kglobaltest_SOURCES = kglobaltest.cpp
ktimezonestest_SOURCES = ktimezonestest.cpp


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

@@ -2,7 +2,7 @@

#include <kapplication.h>
#include <kdebug.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <stdlib.h> // for exit

static bool check(TQString txt, TQString a, TQString b)
@@ -24,7 +24,7 @@ static bool check(TQString txt, TQString a, TQString b)
int main(int argc, char *argv[])
{
TDEApplication::disableAutoDcopRegistration();
TDEApplication app(argc,argv,"kstdacceltest",false,false);
TDEApplication app(argc,argv,"tdestdacceltest",false,false);

check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" );
check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" );

+ 1
- 1
tdehtml/domtreeview.h View File

@@ -18,7 +18,7 @@
#ifndef DOMTREEVIEW_H
#define DOMTREEVIEW_H

#include <klistview.h>
#include <tdelistview.h>
#include <kdebug.h>
#include <tqlistview.h>
#include <tqptrdict.h>

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

@@ -47,12 +47,12 @@
#include <kglobal.h>
#include <kmessagebox.h>
#include <kguiitem.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmenubar.h>
#include <kaction.h>
#include <kactioncollection.h>
#include <tdeaction.h>
#include <tdeactioncollection.h>
#include <kglobalsettings.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include <tdeconfig.h>
#include <tdeconfigbase.h>
#include <kapplication.h>

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

@@ -34,7 +34,7 @@
#include <tqptrstack.h>
#include <tqcheckbox.h>
#include <kdialogbase.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <tqscrollview.h>

#include <kjs/debugger.h>

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

@@ -25,7 +25,7 @@

#include <kdebug.h>
#include <kdiroperator.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kstddirs.h>
#include <ktempfile.h>

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


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

Loading…
Cancel
Save