Browse Source

Additional kde to tde renaming

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
0ae5679aa1
100 changed files with 343 additions and 343 deletions
  1. 8
    8
      CMakeLists.txt
  2. 3
    3
      COMPILING
  3. 6
    6
      KDE2PORTING.html
  4. 10
    10
      KDE3PORTING.html
  5. 8
    8
      Mainpage.dox
  6. 4
    4
      Makefile.am.in
  7. 1
    1
      NAMING
  8. 5
    5
      README
  9. 3
    3
      TODO
  10. 1
    1
      arts/Makefile.am
  11. 3
    3
      arts/kde/CMakeLists.txt
  12. 2
    2
      arts/kde/kartsserver.cpp
  13. 1
    1
      arts/kde/mcop-dcop/Makefile.am
  14. 4
    4
      arts/knotify/CMakeLists.txt
  15. 1
    1
      arts/knotify/Makefile.am
  16. 4
    4
      arts/message/CMakeLists.txt
  17. 1
    1
      arts/message/Makefile.am
  18. 2
    2
      config.h.cmake
  19. 2
    2
      configure.in.bot
  20. 4
    4
      configure.in.in
  21. 1
    1
      configure.in.mid
  22. 4
    4
      dcop/CMakeLists.txt
  23. 4
    4
      dcop/HOWTO
  24. 4
    4
      dcop/Mainpage.dox
  25. 7
    7
      dcop/Makefile.am
  26. 2
    2
      dcop/client/CMakeLists.txt
  27. 1
    1
      dcop/client/marshall.cpp
  28. 3
    3
      dnssd/CMakeLists.txt
  29. 2
    2
      dnssd/Mainpage.dox
  30. 1
    1
      dnssd/Makefile.am
  31. 3
    3
      doc/common/README.Doxygen
  32. 1
    1
      interfaces/Makefile.am
  33. 3
    3
      interfaces/kimproxy/library/CMakeLists.txt
  34. 3
    3
      interfaces/kmediaplayer/CMakeLists.txt
  35. 3
    3
      interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
  36. 3
    3
      interfaces/kscript/CMakeLists.txt
  37. 1
    1
      interfaces/kscript/Makefile.am
  38. 2
    2
      interfaces/kscript/sample/CMakeLists.txt
  39. 1
    1
      interfaces/kspeech/Makefile.am
  40. 4
    4
      interfaces/ktexteditor/CMakeLists.txt
  41. 1
    1
      interfaces/ktexteditor/Makefile.am
  42. 3
    3
      kab/CMakeLists.txt
  43. 1
    1
      kab/Makefile.am
  44. 3
    3
      kabc/CMakeLists.txt
  45. 2
    2
      kabc/Makefile.am
  46. 2
    2
      kabc/formats/CMakeLists.txt
  47. 3
    3
      kabc/plugins/dir/CMakeLists.txt
  48. 1
    1
      kabc/plugins/evolution/Makefile.am
  49. 3
    3
      kabc/plugins/file/CMakeLists.txt
  50. 3
    3
      kabc/plugins/ldapkio/CMakeLists.txt
  51. 3
    3
      kabc/plugins/net/CMakeLists.txt
  52. 1
    1
      kabc/plugins/net/Makefile.am
  53. 1
    1
      kabc/plugins/sql/Makefile.am
  54. 12
    12
      kabc/tests/Makefile.am
  55. 3
    3
      kabc/vcard/CMakeLists.txt
  56. 2
    2
      kabc/vcard/Makefile.am
  57. 2
    2
      kabc/vcardparser/CMakeLists.txt
  58. 3
    3
      kabc/vcardparser/Makefile.am
  59. 1
    1
      kate/Mainpage.dox
  60. 1
    1
      kate/Makefile.am
  61. 3
    3
      kate/interfaces/CMakeLists.txt
  62. 6
    6
      kate/part/CMakeLists.txt
  63. 1
    1
      kate/part/Makefile.am
  64. 1
    1
      kate/part/kateprinter.cpp
  65. 1
    1
      kate/part/kateprinter.h
  66. 3
    3
      kate/plugins/insertfile/CMakeLists.txt
  67. 3
    3
      kate/plugins/isearch/CMakeLists.txt
  68. 4
    4
      kate/plugins/kdatatool/CMakeLists.txt
  69. 1
    1
      kate/plugins/kdatatool/Makefile.am
  70. 3
    3
      kate/plugins/wordcompletion/CMakeLists.txt
  71. 3
    3
      kcert/CMakeLists.txt
  72. 4
    4
      kcmshell/CMakeLists.txt
  73. 1
    1
      kcmshell/Makefile.am
  74. 4
    4
      kconf_update/CMakeLists.txt
  75. 1
    1
      kconf_update/Makefile.am
  76. 13
    13
      kdecore/CMakeLists.txt
  77. 1
    1
      kdecore/MAINTAINERS
  78. 1
    1
      kdecore/Mainpage.dox
  79. 7
    7
      kdecore/Makefile.am
  80. 1
    1
      kdecore/README
  81. 1
    1
      kdecore/README.kstartupinfo
  82. 3
    3
      kdecore/configure.in.in
  83. 1
    1
      kdecore/kaccel.cpp
  84. 1
    1
      kdecore/kaccelmanager.cpp
  85. 15
    15
      kdecore/kapplication.cpp
  86. 8
    8
      kdecore/kapplication.h
  87. 1
    1
      kdecore/kconfig.cpp
  88. 3
    3
      kdecore/kconfig_compiler/CMakeLists.txt
  89. 4
    4
      kdecore/kconfig_compiler/Makefile.am
  90. 3
    3
      kdecore/kconfig_compiler/example/Makefile.am
  91. 11
    11
      kdecore/kconfig_compiler/tests/Makefile.am
  92. 5
    5
      kdecore/kcrash.cpp
  93. 41
    41
      kdecore/kdebug.areas
  94. 1
    1
      kdecore/kdebug.cpp
  95. 1
    1
      kdecore/kdelibs_export.h
  96. 1
    1
      kdecore/kglobal.h
  97. 2
    2
      kdecore/kiconeffect.cpp
  98. 1
    1
      kdecore/kiconeffect.h
  99. 1
    1
      kdecore/kiconloader.cpp
  100. 0
    0
      kdecore/kiconloader.h

+ 8
- 8
CMakeLists.txt View File

@@ -412,7 +412,7 @@ if( WITH_SUDO_KDESU_BACKEND )
if( __PATH_SUDO )
set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} )
else( __PATH_SUDO )
message( FATAL_ERROR "sudo was chosen as kdesu backend, but was not found in path." )
message( FATAL_ERROR "sudo was chosen as tdesu backend, but was not found in path." )
endif( __PATH_SUDO )
endif( WITH_SUDO_KDESU_BACKEND )

@@ -740,7 +740,7 @@ endif( WITH_HSPELL )

configure_file( config.h.cmake config.h )
configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
configure_file( kdecore/kdemacros.h.cmake kdecore/kdemacros.h )
configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
configure_file( kjs/global.h.in kjs/global.h )
configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
@@ -751,7 +751,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_compiler )
set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )


##### global compiler settings ##################
@@ -777,11 +777,11 @@ install( FILES
add_subdirectory( dcop )
add_subdirectory( libltdl )
add_subdirectory( kglib )
add_subdirectory( kdefx )
add_subdirectory( kdecore )
add_subdirectory( tdefx )
add_subdirectory( tdecore )
add_subdirectory( kunittest )
add_subdirectory( kdeui )
add_subdirectory( kdesu )
add_subdirectory( tdeui )
add_subdirectory( tdesu )
add_subdirectory( kjs )
add_subdirectory( kwallet )
add_subdirectory( kio )
@@ -797,7 +797,7 @@ add_subdirectory( kutils )
add_subdirectory( kspell2 )
add_subdirectory( kmdi )
add_subdirectory( kinit )
add_subdirectory( kdeprint )
add_subdirectory( tdeprint )
add_subdirectory( kab )
add_subdirectory( kresources )
add_subdirectory( kabc )

+ 3
- 3
COMPILING View File

@@ -102,11 +102,11 @@ Makefile.am but not a Makefile. If you try to compile such a directory
you will get an error like:

Making all in management
make[3]: Entering directory /home/gregturp/KDE/kdelibs/kdeprint/management'
make[3]: Entering directory /home/gregturp/KDE/kdelibs/tdeprint/management'
make[3]: *** No rule to make target all'. Stop.
make[3]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint/management'
make[3]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint/management'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint'
make[2]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory /home/gregturp/KDE/kdelibs'
make: *** [all-recursive-am] Error 2

+ 6
- 6
KDE2PORTING.html View File

@@ -30,7 +30,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#launching">Starting other programs</A></LI>
<LI><A HREF="#khtmlw">khtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></LI>
<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
<LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
<LI><A HREF="#libkfm">libkfm</A></LI>
<LI><A HREF="#KDialog">KDialog</A></LI>
@@ -175,7 +175,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
certain option was specified on the command line and your application
now automatically supports --help and --version. It aborts with a
useful error message when the command line contains a syntax error.
See kdelibs/kdecore/kcmdlineargs.h for more info.<P>
See kdelibs/tdecore/kcmdlineargs.h for more info.<P>

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

@@ -285,7 +285,7 @@ The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
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.
See KDE 2.0 API reference or khelpmenu.h (kdeui) for additional info.<P>
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>
@@ -430,7 +430,7 @@ khtmlw has been replaced with khtml.<BR>

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

<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></H3>
<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></H3>

KDE Drag and Drop is Dead. Long live Qt Xdnd.<P>

@@ -481,7 +481,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>

Much more extensive documentation on the KConfig and friends API can
be found in the kdoc generated documentation from the header files,
and in kdecore/KCONFIG_DESIGN.<P>
and in tdecore/KCONFIG_DESIGN.<P>

To use the new iterator, you will probably want to do something like
this:<P>
@@ -515,7 +515,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<TR><TD>KFM::exec </TD><TD>-&gt; "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
<TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (kdeui/klineeditdlg.h) instead</TD></TR>
<TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
</TABLE>

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

+ 10
- 10
KDE3PORTING.html View File

@@ -17,8 +17,8 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
<UL>
<LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#kab">Changes in kab</A></LI>
<LI><A HREF="#kdecore">Changes in kdecore</A></LI>
<LI><A HREF="#kdeui">Changes in kdeui</A></LI>
<LI><A HREF="#tdecore">Changes in tdecore</A></LI>
<LI><A HREF="#tdeui">Changes in tdeui</A></LI>
<LI><A HREF="#kio">Changes in kio</A></LI>
<LI><A HREF="#kparts">Changes in kparts</A></LI>
<LI><A HREF="#kspell">Changes in kspell</A></LI>
@@ -65,7 +65,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.

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

<H3><A NAME="kdecore">Changes in kdecore</A></H3>
<H3><A NAME="tdecore">Changes in tdecore</A></H3>

<H4>KDesktopWidget</H4>
KDesktopWidget is obsolete. Include &lt;tqdesktopwidget.h&gt; and use QDesktopWidget
@@ -109,7 +109,7 @@ The <i>filename()</i> method has been renamed to <i>fileName()</i>.
The old name will still work unless KDE_NO_COMPAT is defined.

<H4>KPixmapSplitter</H4>
KPixmapSplitter has now been moved to the new kdefx library.
KPixmapSplitter has now been moved to the new tdefx library.

<H4>KStringHandler</H4>
The <i>matchFilename( const TQString& filename, const TQString& pattern )</i> method has been
@@ -121,8 +121,8 @@ Due to the major changes in the TQStyle API in Qt3, KStyle has been completely
re-written. KStyle is now a thin wrapper around TQCommonStyle with a few extra
primitive elements and a simple popupMenu transparency engine. All KStyles can
now style Qt apps like designer and assistant automatically. KStyle is no longer
present in kdecore. It is now in a new library called kdefx to allow Qt apps to
use KDE's styles without having the styles linked to kdecore/kdeui.
present in tdecore. It is now in a new library called tdefx to allow Qt apps to
use KDE's styles without having the styles linked to tdecore/tdeui.

<H4>KURL</H4>
The <i>filename( bool _ignore_trailing_slash_in_path = true )</i> method has been
@@ -219,7 +219,7 @@ KURLBar and KURLBarItem.

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

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

<H4>KAccelMenu</H4>
This class has been removed, Qt offers the same functionality.
@@ -281,7 +281,7 @@ KEdit is now deprecated. You should use use KTextEditor::Editor or
KTextEdit instead.

<H4>KImageEffect</H4>
KImageEffect has now been moved to the new kdefx library.
KImageEffect has now been moved to the new tdefx library.

<H4>KMessageBox</H4>
KMessageBox now does automatic line-breaking. When using plain-text, you should
@@ -303,7 +303,7 @@ at run-time). See KDE 3.0 documentation
for more informations on this new extension.

<H4>KPixmapEffect</H4>
PixmapEffect has now been moved to the new kdefx library.
PixmapEffect has now been moved to the new tdefx library.

<H4>KProgress</H4>
KProgress is now based on TQProgressBar.
@@ -319,7 +319,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.

<H4>KThemeBase, KThemeStyle</H4>
KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
present in Qt3/KDE3. KThemeBase is no longer in kdeui, but in kstyles/kthemestyle
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>

+ 8
- 8
Mainpage.dox View File

@@ -8,11 +8,11 @@
* can subscribe or read the mailing lists for any additions and/or
* modifications to the API.
*
* - <a target="_top" href="kdecore/html/index.html"><b>kdecore</b></a>
* (<a target="_top" href="kdecore/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdecore/html/index.html"><b>tdecore</b></a>
* (<a target="_top" href="tdecore/html/classes.html">classes</a>)\n
* <i>Core Trinity classes that are not related to the user interface.</i>
* - <a target="_top" href="kdeui/html/index.html"><b>kdeui</b></a>
* (<a target="_top" href="kdeui/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a>
* (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
* <i>Trinity User interface classes such as widgets.</i>
* - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a>
* (<a target="_top" href="khtml/html/classes.html">classes</a>)\n
@@ -30,8 +30,8 @@
* - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a>
* (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
* <i>The DCOP communications library.</i>
* - <a target="_top" href="kdefx/html/index.html"><b>kdefx</b></a>
* (<a target="_top" href="kdefx/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
* (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
* <i>A library with pixmap effects.</i>
* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a>
* (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n
@@ -39,8 +39,8 @@
* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a>
* (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
* <i>Midi library.</i>
* - <a target="_top" href="kdeprint/html/index.html"><b>kdeprint</b></a>
* (<a target="_top" href="kdeprint/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
* (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
* <i>High level printer control functionality.</i>
* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a>
* (<a target="_top" href="krandr/html/classes.html">classes</a>)\n

+ 4
- 4
Makefile.am.in View File

@@ -18,10 +18,10 @@
# Boston, MA 02110-1301, USA.


COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post
COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post
COMPILE_BEFORE_doc = kdoctools
COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml krandr
COMPILE_AFTER_kdeprint = kate khtml
COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
COMPILE_AFTER_tdeprint = kate khtml
COMPILE_BEFORE_khtml = kutils
COMPILE_BEFORE_kabc = kab kresources
COMPILE_BEFORE_kate = interfaces kutils
@@ -53,7 +53,7 @@ messages:
find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
echo ./kdecore/kde-config.cpp.in >> files ;\
echo ./tdecore/kde-config.cpp.in >> files ;\
$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
: > kde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot

+ 1
- 1
NAMING View File

@@ -16,7 +16,7 @@ use both "xxxx.la" and "libxxxx.la" as names for DSOs!!
KDEInit Loadable Modules
========================
Name: <appname>.la
Definition: kdeinit_LTLIBRARIES = <appname>.la
Definition: tdeinit_LTLIBRARIES = <appname>.la
LDFLAGS: -module $(KDE_PLUGIN)



+ 5
- 5
README View File

@@ -45,23 +45,23 @@ Here is an alphabetical list:
* kconf_update
Auto-Updater for config files.

* kdecore
* tdecore
This is the core collection of KDE stuff. Non GUI classes reside here.

* kded
The KDE daemon checks for newly installed software, update files
or hostname changes and takes according actions.

* kdefx
* tdefx
Library with pixmap effects.

* kdeprint
* tdeprint
The very versatile printing subsystem of KDE.

* kdesu
* tdesu
Library for password entering and handling

* kdeui
* tdeui
The main collection of misc. user interface classes (widgets).
KSpell and related classes are a frontend to ispell for use within a
GUI app.

+ 3
- 3
TODO View File

@@ -71,7 +71,7 @@ that we would like to make for the next binary incompatible release.
- Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
if Simon's solution works.

- Merge kdelibs/kdecore/kuser.h and kdeadmin/kuser/kuser.h.
- Merge kdelibs/tdecore/kuser.h and kdeadmin/kuser/kuser.h.

- Simplify memory management with KParts. The part and the widget delete each other,
which in fact makes it more complex to handle. The part owns the widget so it
@@ -173,7 +173,7 @@ that we would like to make for the next binary incompatible release.
- Get rid of KXMLClient::conserveMemory() and the conserveMemory argument in createGUI. It created
too many problems in the past. Not worth the trouble.

- Split KProtocolInfo into KProtocolInfoBase in kdecore (with almost everything)
- Split KProtocolInfo into KProtocolInfoBase in tdecore (with almost everything)
and KProtocolInfo in kio (with the methods taking a KURL, which need KProtocolManager)

- Rename KDirNotify_stub and update API (no need for '*' arguments anymore)
@@ -221,7 +221,7 @@ an alternative help->contents action)
just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea
to have here for later doing.

- Move KRichTextLabel into kdeui if still required with Qt 4.
- Move KRichTextLabel into tdeui if still required with Qt 4.

- Add the concept of a session to KIO, in particular for KHTML so that it can
have all of its jobs associated in some way (a unique key of sorts). Will

+ 1
- 1
arts/Makefile.am View File

@@ -4,6 +4,6 @@ else
SUBDIRS = knotify
endif

DOXYGEN_REFERENCES = kio kdecore kdeui
DOXYGEN_REFERENCES = kio tdecore tdeui
include ../admin/Doxyfile.am


+ 3
- 3
arts/kde/CMakeLists.txt View File

@@ -15,9 +15,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)

+ 2
- 2
arts/kde/kartsserver.cpp View File

@@ -77,7 +77,7 @@ Arts::SoundServerV2 KArtsServer::server(void)

X11CommConfig.sync();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();

if(rt)
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
@@ -91,7 +91,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
// We could have a race-condition here.
// The correct way to do it is to make artsd fork-and-exit
// after starting to listen to connections (and running artsd
// directly instead of using kdeinit), but this is better
// directly instead of using tdeinit), but this is better
// than nothing.
int time = 0;
do

+ 1
- 1
arts/kde/mcop-dcop/Makefile.am View File

@@ -3,7 +3,7 @@ INCLUDES= -I$(includedir)/arts -I$(top_srcdir)/arts/kde $(all_includes)

bin_PROGRAMS=
lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kmcop.la
tdeinit_LTLIBRARIES = kmcop.la

kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel
kmcop_la_LIBADD = ../libartskde.la

+ 4
- 4
arts/knotify/CMakeLists.txt View File

@@ -14,11 +14,11 @@ include_directories(
${ARTS_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/arts/kde
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
)

link_directories(
@@ -43,7 +43,7 @@ set( ${target}_SRCS
if( ARTS_FOUND )
set( LIBS artskde-shared )
else( ARTS_FOUND )
set( LIBS kdeui-shared )
set( LIBS tdeui-shared )
endif( ARTS_FOUND )

tde_add_kpart( ${target} AUTOMOC

+ 1
- 1
arts/knotify/Makefile.am View File

@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
check_PROGRAMS = knotifytest
knotifytest_SOURCES = knotifytest.cpp
knotifytest_LDADD = $(LIB_KDECORE)
knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor

noinst_HEADERS = knotify.h


+ 4
- 4
arts/message/CMakeLists.txt View File

@@ -11,9 +11,9 @@

include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
)

link_directories(
@@ -31,6 +31,6 @@ set( ${target}_SRCS

tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
LINK kdeui-shared
LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 1
- 1
arts/message/Makefile.am View File

@@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage

artsmessage_SOURCES = artsmessage.cc

artsmessage_LDADD = ../../kdeui/libtdeui.la
artsmessage_LDADD = ../../tdeui/libtdeui.la
artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)

+ 2
- 2
config.h.cmake View File

@@ -692,10 +692,10 @@
/* Enable prevention against poor Linux OOM-killer */
#cmakedefine KDEINIT_OOM_PROTECT 1

/* Use FontConfig in kdeinit */
/* Use FontConfig in tdeinit */
#cmakedefine KDEINIT_USE_FONTCONFIG 1

/* Use Xft preinitialization in kdeinit */
/* Use Xft preinitialization in tdeinit */
#cmakedefine KDEINIT_USE_XFT 1

/* Suffix for lib directories */

+ 2
- 2
configure.in.bot View File

@@ -52,7 +52,7 @@ if test -z "$LIBXML_CFLAGS"; then
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform."
echo "You can find a copy of libxml2 in the kdesupport module if you're using CVS."
echo "You can find a copy of libxml2 in the tdesupport module if you're using CVS."
echo ""
all_tests=bad
fi
@@ -64,7 +64,7 @@ if test -z "$LIBXSLT_CFLAGS"; then
echo "so if you want helpfiles you should consider installing it."
echo "Have a look at ftp://xmlsoft.org/ for sources, or find a binary"
echo "package for your platform."
echo "You can find a copy of libxslt in the kdesupport module if you're using CVS."
echo "You can find a copy of libxslt in the tdesupport module if you're using CVS."
echo ""
all_tests=bad
fi

+ 4
- 4
configure.in.in View File

@@ -250,13 +250,13 @@ AC_SUBST(LIBICE)

AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libtdecore.la')
AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libtdeui.la')
AC_SUBST(LIB_KDECORE, '$(top_builddir)/tdecore/libtdecore.la')
AC_SUBST(LIB_KDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libtdeprint.la')
AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
@@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler')
AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler')

ac_save_LIBS="$LIBS"
LIBS="$LIBS $X_LDFLAGS -lICE"

+ 1
- 1
configure.in.mid View File

@@ -1,7 +1,7 @@
dnl put here things which have to be done after all usual autoconf macros
dnl have been run, but before the Makefiles are created

all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/kdefx -I$(top_builddir)/kdecore -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/tdefx -I$(top_builddir)/tdecore -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio -I$(top_srcdir)/kio/kfile -I$(top_srcdir) $(QT_INCLUDES) $(X_INCLUDES) $(KDE_INCLUDES) $(USER_INCLUDES)'
AC_SUBST(all_includes)

CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"

+ 4
- 4
dcop/CMakeLists.txt View File

@@ -20,8 +20,8 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(
@@ -53,7 +53,7 @@ tde_add_library( ${target} SHARED AUTOMOC
)


#### dcopserver (kdeinit) #######################
#### dcopserver (tdeinit) #######################

set( target dcopserver )

@@ -61,7 +61,7 @@ set( ${target}_SRCS
dcopserver.cpp dcopsignals.cpp
)

tde_add_kdeinit_executable( ${target} AUTOMOC
tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kICE-static DCOP-shared
)

+ 4
- 4
dcop/HOWTO View File

@@ -464,7 +464,7 @@ Sometimes it might be interesting to use DCOP between processes
belonging to different users, e.g. a frontend process running
with the user's id, and a backend process running as root.

For this you can use kdesu with the --nonewdcop option. kdesu will
For this you can use tdesu with the --nonewdcop option. tdesu will
then forward the address of the DCOP server as well as the authentication
information to the new user.

@@ -479,9 +479,9 @@ carefully reviewed that your DCOPClient does not provide objects/functions
that could be abused for privilege escalation.


Example: kdesu --nonewdcop -u root -c kcmroot
Example: tdesu --nonewdcop -u root -c kcmroot

This will, after kdesu got the root password, execute kcmroot as root,
This will, after tdesu got the root password, execute kcmroot as root,
talking to the user's dcop server.


@@ -503,7 +503,7 @@ int main(int argc, char **argv)

Compiled with:

g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -lkdecore
g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore

on Linux yields the following memory use statistics:


+ 4
- 4
dcop/Mainpage.dox View File

@@ -377,15 +377,15 @@ second process where to find the authentication information.
(Note that this implies that the second process is able to
read the authentication file, so it will probably only work
if the second process runs as root. If it should run as another
user, a similar approach to what kdesu does with xauth must
user, a similar approach to what tdesu does with xauth must
be taken. In fact, it would be a very good idea to add DCOP
support to kdesu!)
support to tdesu!)

For example

ICEAUTHORITY=~user/.ICEauthority kdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
ICEAUTHORITY=~user/.ICEauthority tdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`

will, after kdesu got the root password, execute kcmroot as root, talking
will, after tdesu got the root password, execute kcmroot as root, talking
to the user's dcop server.



+ 7
- 7
dcop/Makefile.am View File

@@ -33,7 +33,7 @@ lib_LTLIBRARIES = libDCOP.la
libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck

include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
noinst_HEADERS = version.h dcopglobal.h dcopserver.h testdcop.h dcopsignals.h dcop-path.h
@@ -43,27 +43,27 @@ METASOURCES = AUTO
# dcopstub needs to go first for --enable-final to work
libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp

kdeinit_LTLIBRARIES = dcopserver.la
tdeinit_LTLIBRARIES = dcopserver.la
dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)

dcopserver_shutdown_SOURCES = dcopserver_shutdown.c

testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdcop_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la

dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
dcop_deadlock_test_LDADD = ../kdecore/libtdecore.la
dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la

testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)

EXTRA_DIST = HOWTO ICE Mainpage.dox

DOXYGEN_REFERENCES = kdecore
DOXYGEN_REFERENCES = tdecore
DOXYGEN_EXCLUDE = KDE-ICE
include ../admin/Doxyfile.am

+ 2
- 2
dcop/client/CMakeLists.txt View File

@@ -13,8 +13,8 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_BINARY_DIR}/tdecore
)

link_directories(

+ 1
- 1
dcop/client/marshall.cpp View File

@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/

#define KDE_QT_ONLY
#include "../../kdecore/kurl.cpp"
#include "../../tdecore/kurl.cpp"

bool mkBool( const TQString& s )
{

+ 3
- 3
dnssd/CMakeLists.txt View File

@@ -13,9 +13,9 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(
@@ -44,7 +44,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
LINK kdecore-shared
LINK tdecore-shared
DEPENDENCIES kconfig_compiler
DESTINATION ${LIB_INSTALL_DIR}
)

+ 2
- 2
dnssd/Mainpage.dox View File

@@ -33,8 +33,8 @@ Jakub Stachowski

*/

// Trinity5: get rid of kdeui reference when settings.kcfgc is changed
// DOXYGEN_REFERENCES = kdecore kdeui
// Trinity5: get rid of tdeui reference when settings.kcfgc is changed
// DOXYGEN_REFERENCES = tdecore tdeui
// DOXYGEN_SET_PROJECT_NAME = DNSSD
// DOXYGEN_SET_EXCLUDE_PATTERNS += */dnssd/avahi* */dnssd/mdnsd*
// vim:ts=4:sw=4:expandtab:filetype=doxygen

+ 1
- 1
dnssd/Makefile.am View File

@@ -14,7 +14,7 @@ libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h
libkdnssd_la_LIBADD = ../kdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0

#kde_kcfg_DATA = kcm_kdnssd.kcfg

+ 3
- 3
doc/common/README.Doxygen View File

@@ -75,14 +75,14 @@ Differences with current dox: <TODO>
# autoconf and configure. Run it in the "top builddir" with one argument,
# the "top srcdir". Something like this:
#
# cd /mnt/build/kdepim
# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim
# cd /mnt/build/tdepim
# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim
#
# You can also build single subdirs (for instance, after updating some
# dox and you don't want to rebuild for the enitre module) by giving the
# subdirectory _relative to the top srcdir_ as a second argument:
#
# sh /mnt/src/kdepim/doc/api/doxygen.sh /mnt/src/kdepim kpilot/lib
# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib
#
# When generating dox for kdelibs, a tag file for Qt is also created.
# The location of Qt is specified indirectly through $QTDOCDIR or,

+ 1
- 1
interfaces/Makefile.am View File

@@ -1,5 +1,5 @@
SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech

DOXYGEN_REFERENCES = kdecore kdefx kdeui kparts dcop
DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop
DOXYGEN_SET_RECURSIVE = YES
include ../admin/Doxyfile.am

+ 3
- 3
interfaces/kimproxy/library/CMakeLists.txt View File

@@ -14,10 +14,10 @@ add_subdirectory( icons )
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
)


+ 3
- 3
interfaces/kmediaplayer/CMakeLists.txt View File

@@ -16,12 +16,12 @@ endif( ARTS_FOUND )
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
)

link_directories(

+ 3
- 3
interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt View File

@@ -13,12 +13,12 @@ include_directories(
${TQT_INCLUDE_DIRS}
${ARTS_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile

+ 3
- 3
interfaces/kscript/CMakeLists.txt View File

@@ -15,10 +15,10 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)

+ 1
- 1
interfaces/kscript/Makefile.am View File

@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_
#lib_LTLIBRARIES = libkscriptloader.la libkscript.la
lib_LTLIBRARIES = libkscript.la
#libkscriptloader_la_SOURCES = scriptloader.cpp
#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#libkscriptloader_la_LIBADD = $(LIB_KPARTS)

libkscript_la_SOURCES = scriptmanager.cpp

+ 2
- 2
interfaces/kscript/sample/CMakeLists.txt View File

@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/interfaces/kscript
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(

+ 1
- 1
interfaces/kspeech/Makefile.am View File

@@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
# Define DCOP/Text-to-Speech Service Type.
kde_servicetypes_DATA = dcoptexttospeech.desktop

DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
include ../../admin/Doxyfile.am

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

@@ -14,12 +14,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kabc
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kabc
@@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
LINK kdeui-shared kabc-shared kparts-shared
LINK tdeui-shared kabc-shared kparts-shared
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)

+ 1
- 1
interfaces/ktexteditor/Makefile.am View File

@@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp


libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)

ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \

+ 3
- 3
kab/CMakeLists.txt View File

@@ -12,9 +12,9 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
)

link_directories(

+ 1
- 1
kab/Makefile.am View File

@@ -10,6 +10,6 @@ libkab_la_SOURCES = \
qconfigDB.cc

libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
libkab_la_LIBADD = ../kdeui/libtdeui.la
libkab_la_LIBADD = ../tdeui/libtdeui.la

libkab_la_METASOURCES = AUTO

+ 3
- 3
kabc/CMakeLists.txt View File

@@ -24,11 +24,11 @@ include_directories(
# external includes
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kab

+ 2
- 2
kabc/Makefile.am View File

@@ -52,7 +52,7 @@ METASOURCES = AUTO

bin_PROGRAMS = kab2kabc

kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kab2kabc_LDADD = libkabc.la ../kab/libkab.la
kab2kabc_SOURCES = kab2kabc.cpp

@@ -62,7 +62,7 @@ autostartdir = $(datadir)/autostart
manager_DATA = kabc_manager.desktop
managerdir = $(kde_servicesdir)/kresources

DOXYGEN_REFERENCES = kdecore kdeui
DOXYGEN_REFERENCES = tdecore tdeui

map_DATA = countrytransl.map
mapdir = $(kde_datadir)/kabc

+ 2
- 2
kabc/formats/CMakeLists.txt View File

@@ -14,10 +14,10 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc

${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
)

+ 3
- 3
kabc/plugins/dir/CMakeLists.txt View File

@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc

${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile

+ 1
- 1
kabc/plugins/evolution/Makefile.am View File

@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp

kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../kdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la

METASOURCES = AUTO


+ 3
- 3
kabc/plugins/file/CMakeLists.txt View File

@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc

${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile

+ 3
- 3
kabc/plugins/ldapkio/CMakeLists.txt View File

@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc

${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfiles

+ 3
- 3
kabc/plugins/net/CMakeLists.txt View File

@@ -15,11 +15,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/kabc

${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile

+ 1
- 1
kabc/plugins/net/Makefile.am View File

@@ -11,7 +11,7 @@ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h

kde_module_LTLIBRARIES = kabc_net.la
kabc_net_la_SOURCES = resourcenetplugin.cpp
kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../kdecore/.libs/ -lkdecore
kabc_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore
kabc_net_la_LIBADD = libkabc_net.la

METASOURCES = AUTO

+ 1
- 1
kabc/plugins/sql/Makefile.am View File

@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la
kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp

kabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kabc_sql_la_LIBADD = ../../libkabc.la ../../../kdeui/libtdeui.la
kabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la

METASOURCES = AUTO


+ 12
- 12
kabc/tests/Makefile.am View File

@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries)
testlock_SOURCES = testlock.cpp

testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testldapclient_SOURCES = testldapclient.cpp

EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit

testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testkabc_SOURCES = testkabc.cpp

testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddressee_SOURCES = testaddressee.cpp

testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddresseelist_SOURCES = testaddresseelist.cpp

testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddressfmt_SOURCES = testaddressfmt.cpp

testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testkabcdlg_SOURCES = testkabcdlg.cpp

testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdistlist_SOURCES = testdistlist.cpp

testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testaddresslineedit_SOURCES = testaddresslineedit.cpp

bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigread_SOURCES = bigread.cpp

bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigwrite_SOURCES = bigwrite.cpp

testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testdb_SOURCES = testdb.cpp

kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kabcargl_SOURCES = kabcargl.cpp


+ 3
- 3
kabc/vcard/CMakeLists.txt View File

@@ -15,8 +15,8 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/generated
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(
@@ -35,6 +35,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 0.0.0
LINK kdecore-shared
LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)

+ 2
- 2
kabc/vcard/Makefile.am View File

@@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)

check_PROGRAMS = testwrite testread

testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testwrite_LDADD = libvcard.la
testwrite_SOURCES = testwrite.cpp

testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testread_LDADD = libvcard.la
testread_SOURCES = testread.cpp

+ 2
- 2
kabc/vcardparser/CMakeLists.txt View File

@@ -11,8 +11,8 @@

include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(

+ 3
- 3
kabc/vcardparser/Makefile.am View File

@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h

check_PROGRAMS = testread testwrite testread2

testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread_SOURCES = testread.cpp

testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread2_SOURCES = testread2.cpp testutils.cpp

testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testwrite_SOURCES = testwrite.cpp


+ 1
- 1
kate/Mainpage.dox View File

@@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
@lgpl

*/
// DOXYGEN_REFERENCES = kdecore kio kdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
// DOXYGEN_SET_PROJECT_NAME = Kate
// vim:ts=4:sw=4:expandtab:filetype=doxygen

+ 1
- 1
kate/Makefile.am View File

@@ -6,6 +6,6 @@ messages:
$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot

DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
include ../admin/Doxyfile.am


+ 3
- 3
kate/interfaces/CMakeLists.txt View File

@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces
)


+ 6
- 6
kate/part/CMakeLists.txt View File

@@ -15,18 +15,18 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kjs
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdefx
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kjs
${CMAKE_SOURCE_DIR}/kutils
${CMAKE_SOURCE_DIR}/kdeprint
${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
${LUA_INCLUDE_DIRS}
@@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_kpart( ${target}
SOURCES dummy.cpp
EMBED kate-static
LINK kjs-shared kdeprint-shared katepartinterfaces-shared kutils-shared
LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 1
- 1
kate/part/Makefile.am View File

@@ -20,7 +20,7 @@ libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_

libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)

INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/kdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/kdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)

METASOURCES = AUTO


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

@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
* Copyright (c) 2001-2002 Michael Goffioul <kdeprint@swing.be>
* Copyright (c) 2001-2002 Michael Goffioul <tdeprint@swing.be>
* Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk>
* Copyright (c) 2002, 2003 Anders Lund <anders@alweb.dk>
*

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

@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
* Copyright (c) 2002 Michael Goffioul <kdeprint@swing.be>
* Copyright (c) 2002 Michael Goffioul <tdeprint@swing.be>
* Complete rewrite on Sat Jun 15 2002 (c) Anders Lund <anders@alweb.dk>
*
* This library is free software; you can redistribute it and/or

+ 3
- 3
kate/plugins/insertfile/CMakeLists.txt View File

@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile

+ 3
- 3
kate/plugins/isearch/CMakeLists.txt View File

@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces
)


+ 4
- 4
kate/plugins/kdatatool/CMakeLists.txt View File

@@ -12,11 +12,11 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdefx
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/interfaces

+ 1
- 1
kate/plugins/kdatatool/Makefile.am View File

@@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kdefx $(all_includes)
INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
METASOURCES = AUTO

# Install this plugin in the KDE modules directory

+ 3
- 3
kate/plugins/wordcompletion/CMakeLists.txt View File

@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/interfaces
)


+ 3
- 3
kcert/CMakeLists.txt View File

@@ -13,11 +13,11 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_BINARY_DIR}/kio/kssl
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile

+ 4
- 4
kcmshell/CMakeLists.txt View File

@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kutils
@@ -34,7 +34,7 @@ set( ${target}_SRCS
main.cpp main.skel
)

tde_add_kdeinit_executable( ${target} AUTOMOC
tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kutils-shared
DEPENDENCIES dcopidl

+ 1
- 1
kcmshell/Makefile.am View File

@@ -23,7 +23,7 @@ METASOURCES = AUTO

lib_LTLIBRARIES =
bin_PROGRAMS =
kdeinit_LTLIBRARIES = kcmshell.la
tdeinit_LTLIBRARIES = kcmshell.la

kcmshell_la_SOURCES = main.cpp main.skel
kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_KDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_KFILE)

+ 4
- 4
kconf_update/CMakeLists.txt View File

@@ -11,8 +11,8 @@

include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(
@@ -28,7 +28,7 @@ set( ${target}_SRCS
kconf_update.cpp
)

tde_add_kdeinit_executable( ${target} AUTOMOC
tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kdecore-shared
LINK tdecore-shared
)

+ 1
- 1
kconf_update/Makefile.am View File

@@ -20,7 +20,7 @@ INCLUDES= -I../kded $(all_includes)

bin_PROGRAMS =
lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = kconf_update.la
tdeinit_LTLIBRARIES = kconf_update.la

kconf_update_la_SOURCES = kconf_update.cpp
kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)

+ 13
- 13
kdecore/CMakeLists.txt View File

@@ -27,8 +27,8 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/network
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/libltdl
${CMAKE_SOURCE_DIR}/kdefx
${CMAKE_SOURCE_DIR}/kdeui
${CMAKE_SOURCE_DIR}/tdefx
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
${LIBART_INCLUDE_DIRS}
${LIBIDN_INCLUDE_DIRS}
@@ -90,7 +90,7 @@ install( FILES eventsrc

##### libtdecore ################################

set( target kdecore )
set( target tdecore )

set( ${target}_SRCS
libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
@@ -120,7 +120,7 @@ set( ${target}_SRCS
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
kqiodevicegzip_p.cpp ktimezones.cpp
)
@@ -128,16 +128,16 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 4.2.0
EMBED kdecorenetwork-static
LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
EMBED tdecorenetwork-static
LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)


##### kdefakes_nonpic ###########################
##### tdefakes_nonpic ###########################

set( target kdefakes_nonpic )
set( target tdefakes_nonpic )

set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -148,9 +148,9 @@ tde_add_library( ${target} STATIC
DESTINATION ${LIB_INSTALL_DIR}
)

##### kdefakes_pic ##############################
##### tdefakes_pic ##############################

set( target kdefakes_pic )
set( target tdefakes_pic )

set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -164,7 +164,7 @@ tde_add_library( ${target} STATIC_PIC

##### libtdefakes ###############################

set( target kdefakes )
set( target tdefakes )

set( ${target}_SRCS
fakes.c vsnprintf.c
@@ -185,7 +185,7 @@ configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY )

tde_add_executable( kde-config
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp
LINK kdecore-shared
LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@@ -204,6 +204,6 @@ tde_add_executable(kgrantpty SETUID

tde_add_executable( kdetcompmgr
SOURCES kdetcompmgr.cpp
LINK kdecore-shared
LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 1
- 1
kdecore/MAINTAINERS View File

@@ -104,7 +104,7 @@ klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright)
kmacroexpander.cpp
kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org> (copyright)
kmountpoint.cpp Waldo Bastian <bastian@kde.org> (copyright)
kprotocolinfo_kdecore.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfo_tdecore.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Torben Weis <weis@kde.org> (copyright)
kprotocolinfofactory.cpp Waldo Bastian <bastian@kde.org> (copyright)
kpty.cpp

+ 1
- 1
kdecore/Mainpage.dox View File

@@ -5,7 +5,7 @@ as the configuration system, IPC, internationalization and locale
support, site-independent access to the filesystem and a large number
of other (but no less important) things.
<p>
All Trinity applications should link to the kdecore library. Also, using a
All Trinity applications should link to the tdecore library. Also, using a
KApplication derived class instead of TQApplication is almost
mandatory if you expect your application to behave nicely within the
Trinity environment.

+ 7
- 7
kdecore/Makefile.am View File

@@ -20,7 +20,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.

INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes) $(LIBART_CFLAGS)
INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore/network $(all_includes) $(LIBART_CFLAGS)

if include_SVGICONS
SVGICONS=svgicons
@@ -117,20 +117,20 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \
kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
kqiodevicegzip_p.cpp ktimezones.cpp

libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck

libtdecore_la_METASOURCES = AUTO

SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore
SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore

kdebugdir = $(kde_confdir)
kdebug_DATA = kdebug.areas kdebugrc language.codes
@@ -154,7 +154,7 @@ install-data-local:
uninstall-local:
-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h

# If you add a color palette file here, please change kdelibs/kdeui/kcolordialog.cpp too to allow to translate the name
# If you add a color palette file here, please change kdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
colorsdir = $(kde_confdir)/colors

@@ -188,7 +188,7 @@ install-exec-hook:

DISTCLEANFILES = kde-config.cpp

DOXYGEN_REFERENCES = dcop kdeui kparts kio
DOXYGEN_REFERENCES = dcop tdeui kparts kio
DOXYGEN_EXCLUDE = malloc kde_file.h
DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES


+ 1
- 1
kdecore/README View File

@@ -1,3 +1,3 @@
This is the KDE "core" library. The kdecore library provides basic non user
This is the KDE "core" library. The tdecore library provides basic non user
interface functionality.


+ 1
- 1
kdecore/README.kstartupinfo View File

@@ -88,7 +88,7 @@ The KStartupInfo classes :
--------------------------

In some cases, or if you are interested in getting the ASN information, you
have to use the KStartupInfo classes in kdelibs/kdecore.
have to use the KStartupInfo classes in kdelibs/tdecore.

Receiving the application startup notification information :
------------------------------------------------------------

+ 3
- 3
kdecore/configure.in.in View File

@@ -1,7 +1,7 @@
dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])

dnl Compile in kde_bindir to safely find kdesu_stub.
dnl Compile in kde_bindir to safely find tdesu_stub.
if test "$exec_prefix" = "NONE"; then
bindir_str="\"$prefix/bin\""
else
@@ -167,9 +167,9 @@ AC_TRY_LINK(dnl

AC_CHECK_HEADERS(sys/mount.h)

dnl AC_OUTPUT(kdecore/kde-config.cpp)
dnl AC_OUTPUT(tdecore/kde-config.cpp)

AM_CONFIG_HEADER(kdecore/kdemacros.h)
AM_CONFIG_HEADER(tdecore/kdemacros.h)

SVGICONS=

+ 1
- 1
kdecore/kaccel.cpp View File

@@ -523,7 +523,7 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )

const TQString& KAccel::configGroup() const
{ return d->configGroup(); }
// for kdegames/ksirtet
// for tdegames/ksirtet
void KAccel::setConfigGroup( const TQString& s )
{ d->setConfigGroup( s ); }


+ 1
- 1
kdecore/kaccelmanager.cpp View File

@@ -46,7 +46,7 @@


#include "kaccelmanager_private.h"
#include "../kdeui/kstdaction_p.h"
#include "../tdeui/kstdaction_p.h"
#include "../kutils/kmultitabbar.h"



+ 15
- 15
kdecore/kapplication.cpp View File

@@ -1440,18 +1440,18 @@ bool KApplication::sessionSaving() const
void KApplication::startKdeinit()
{
#ifndef Q_WS_WIN //TODO
KInstance inst( "startkdeinitlock" );
KLockFile lock( locateLocal( "tmp", "startkdeinitlock", &inst ));
KInstance inst( "starttdeinitlock" );
KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
lock.lock();
DCOPClient cl;
if( cl.attach())
return; // whoever held the lock has already started dcopserver
}
// Try to launch kdeinit.
TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"));
// Try to launch tdeinit.
TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"));
if (srv.isEmpty())
srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
if (srv.isEmpty())
return;
if (kapp && (Tty != kapp->type()))
@@ -2884,7 +2884,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
TQString error;
// TODO this should check if cmd has a .desktop file, and use data from it, together
// with sending more ASN data
if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
if (Tty != kapp->type())
TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
@@ -3006,7 +3006,7 @@ startServiceInternal( const TQCString &function,
// make sure there is id, so that user timestamp exists
stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id );
#endif
if( function.left( 12 ) != "kdeinit_exec" )
if( function.left( 12 ) != "tdeinit_exec" )
stream << noWait;

if (!dcopClient->call(_launcher, _launcher,
@@ -3100,32 +3100,32 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
}

int
KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid )
{
return kdeinitExec( name, args, error, pid, "" );
return tdeinitExec( name, args, error, pid, "" );
}

int
KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id )
{
return startServiceInternal("kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
name, args, error, 0, pid, startup_id, false);
}

int
KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid )
{
return kdeinitExecWait( name, args, error, pid, "" );
return tdeinitExecWait( name, args, error, pid, "" );
}

int
KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id )
{
return startServiceInternal("kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
name, args, error, 0, pid, startup_id, false);
}


+ 8
- 8
kdecore/kapplication.h View File

@@ -814,10 +814,10 @@ public:
TQString *error=0, TQCString *dcopService=0, int *pid = 0, const TQCString &startup_id = "", bool noWait = false );

/**
* Starts a program via kdeinit.
* Starts a program via tdeinit.
*
* program name and arguments are converted to according to the
* local encoding and passed as is to kdeinit.
* local encoding and passed as is to tdeinit.
*
* @param name Name of the program to start
* @param args Arguments to pass to the program
@@ -830,16 +830,16 @@ public:
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
static int kdeinitExec( const TQString& name, const TQStringList &args,
static int tdeinitExec( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with startup_id = ""
static int kdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
static int tdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
TQString *error=0, int *pid = 0 );

/**
* Starts a program via kdeinit and wait for it to finish.
* Starts a program via tdeinit and wait for it to finish.
*
* Like kdeinitExec(), but it waits till the program is finished.
* Like tdeinitExec(), but it waits till the program is finished.
* As such it behaves similar to the system(...) function.
*
* @param name Name of the program to start
@@ -853,10 +853,10 @@ public:
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
static int kdeinitExecWait( const TQString& name, const TQStringList &args,
static int tdeinitExecWait( const TQString& name, const TQStringList &args,
TQString *error, int *pid, const TQCString& startup_id );
// KDE4 merge with above with startup_id = ""
static int kdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
static int tdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
TQString *error=0, int *pid = 0 );

/**

+ 1
- 1
kdecore/kconfig.cpp View File

@@ -294,7 +294,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile)
{
TQStringList args;
args << "--check" << updateFile;
KApplication::kdeinitExecWait("kconf_update", args);
KApplication::tdeinitExecWait("kconf_update", args);
reparseConfiguration();
}
setGroup(oldGroup);

+ 3
- 3
kdecore/kconfig_compiler/CMakeLists.txt View File

@@ -11,8 +11,8 @@

include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/kdecore
${CMAKE_SOURCE_DIR}/kdecore
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore
)

link_directories(
@@ -24,6 +24,6 @@ link_directories(

tde_add_executable( kconfig_compiler
SOURCES kconfig_compiler.cpp
LINK kdecore-shared
LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 4
- 4
kdecore/kconfig_compiler/Makefile.am View File

@@ -1,10 +1,10 @@
SUBDIRS = example tests

AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)

bin_PROGRAMS = kconfig_compiler

kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kconfig_compiler_LDADD = $(LIB_KDECORE)
kconfig_compiler_SOURCES = kconfig_compiler.cpp

@@ -13,6 +13,6 @@ TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
check-local:
for i in $(TESTFILES); \
do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \
$(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done
perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
$(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done

+ 3
- 3
kdecore/kconfig_compiler/example/Makefile.am View File

@@ -1,13 +1,13 @@
AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)

check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = autoexample

example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
example_LDADD = $(LIB_KDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp

autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp

+ 11
- 11
kdecore/kconfig_compiler/tests/Makefile.am View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"

check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer

@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
test_dpointer.cpp test_dpointer.h \
md5sums

test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test1_LDADD = $(LIB_KDECORE)
test1_SOURCES = test1main.cpp test1.cpp

test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
test2_LDADD = $(LIB_KDECORE)
test2_SOURCES = test2main.cpp test2.cpp