Browse Source

Additional kde to tde renaming

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 )
412 412
   if( __PATH_SUDO )
413 413
     set( DEFAULT_SUPER_USER_COMMAND ${__PATH_SUDO} )
414 414
   else( __PATH_SUDO )
415
-    message( FATAL_ERROR "sudo was chosen as kdesu backend, but was not found in path." )
415
+    message( FATAL_ERROR "sudo was chosen as tdesu backend, but was not found in path." )
416 416
   endif( __PATH_SUDO )
417 417
 endif( WITH_SUDO_KDESU_BACKEND )
418 418
 
@@ -740,7 +740,7 @@ endif( WITH_HSPELL )
740 740
 
741 741
 configure_file( config.h.cmake config.h )
742 742
 configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
743
-configure_file( kdecore/kdemacros.h.cmake kdecore/kdemacros.h )
743
+configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
744 744
 configure_file( kjs/global.h.in kjs/global.h )
745 745
 configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
746 746
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
@@ -751,7 +751,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
751 751
 set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
752 752
 set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
753 753
 set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
754
-set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_compiler )
754
+set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )
755 755
 
756 756
 
757 757
 ##### global compiler settings ##################
@@ -777,11 +777,11 @@ install( FILES
777 777
 add_subdirectory( dcop )
778 778
 add_subdirectory( libltdl )
779 779
 add_subdirectory( kglib )
780
-add_subdirectory( kdefx )
781
-add_subdirectory( kdecore )
780
+add_subdirectory( tdefx )
781
+add_subdirectory( tdecore )
782 782
 add_subdirectory( kunittest )
783
-add_subdirectory( kdeui )
784
-add_subdirectory( kdesu )
783
+add_subdirectory( tdeui )
784
+add_subdirectory( tdesu )
785 785
 add_subdirectory( kjs )
786 786
 add_subdirectory( kwallet )
787 787
 add_subdirectory( kio )
@@ -797,7 +797,7 @@ add_subdirectory( kutils )
797 797
 add_subdirectory( kspell2 )
798 798
 add_subdirectory( kmdi )
799 799
 add_subdirectory( kinit )
800
-add_subdirectory( kdeprint )
800
+add_subdirectory( tdeprint )
801 801
 add_subdirectory( kab )
802 802
 add_subdirectory( kresources )
803 803
 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
102 102
 you will get an error like:
103 103
 
104 104
   Making all in management
105
-  make[3]: Entering directory /home/gregturp/KDE/kdelibs/kdeprint/management'
105
+  make[3]: Entering directory /home/gregturp/KDE/kdelibs/tdeprint/management'
106 106
   make[3]: *** No rule to make target all'.  Stop.
107
-  make[3]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint/management'
107
+  make[3]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint/management'
108 108
   make[2]: *** [all-recursive] Error 1
109
-  make[2]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint'
109
+  make[2]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint'
110 110
   make[1]: *** [all-recursive] Error 1
111 111
   make[1]: Leaving directory /home/gregturp/KDE/kdelibs'
112 112
   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>
30 30
 <LI><A HREF="#launching">Starting other programs</A></LI>
31 31
 <LI><A HREF="#khtmlw">khtmlw</A></LI>
32 32
 <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
33
-<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></LI>
33
+<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
34 34
 <LI><A HREF="#KConfigBase">KConfigBase, KConfig, KSimpleConfig</A></LI>
35 35
 <LI><A HREF="#libkfm">libkfm</A></LI>
36 36
 <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>
175 175
   certain option was specified on the command line and your application 
176 176
   now automatically supports --help and --version. It aborts with a
177 177
   useful error message when the command line contains a syntax error.
178
-  See kdelibs/kdecore/kcmdlineargs.h for more info.<P>
178
+  See kdelibs/tdecore/kcmdlineargs.h for more info.<P>
179 179
 
180 180
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
181 181
 
@@ -285,7 +285,7 @@ The old aboutKDE(), aboutApp() and appHelpActivated() of KApplication
285 285
 have all been removed. If you need direct access to these or need
286 286
 access to a help menu in a class that is not derived from
287 287
 KMainWindow then allocate an instance of the new class KHelpMenu.
288
-See KDE 2.0 API reference or khelpmenu.h (kdeui) for additional info.<P>
288
+See KDE 2.0 API reference or khelpmenu.h (tdeui) for additional info.<P>
289 289
 Espen Sand &lt;<A HREF="mailto:espen@kde.org">espen@kde.org</A>&gt;<P>
290 290
 
291 291
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -430,7 +430,7 @@ khtmlw has been replaced with khtml.<BR>
430 430
 
431 431
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
432 432
 
433
-<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, kdecore/drag.h</A></H3>
433
+<H3><A NAME="KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></H3>
434 434
 
435 435
 KDE Drag and Drop is Dead.  Long live Qt Xdnd.<P>
436 436
 
@@ -481,7 +481,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
481 481
 
482 482
   Much more extensive documentation on the KConfig and friends API can
483 483
   be found in the kdoc generated documentation from the header files,
484
-  and in kdecore/KCONFIG_DESIGN.<P>
484
+  and in tdecore/KCONFIG_DESIGN.<P>
485 485
 
486 486
   To use the new iterator, you will probably want to do something like
487 487
   this:<P>
@@ -515,7 +515,7 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
515 515
 <TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR>
516 516
 <TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
517 517
                             or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
518
-<TR><TD>DlgLocation           </TD><TD>-&gt; Use KLineEditDlg (kdeui/klineeditdlg.h) instead</TD></TR>
518
+<TR><TD>DlgLocation           </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
519 519
 </TABLE>
520 520
 
521 521
 <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>
17 17
 <UL>
18 18
 <LI><A HREF="#gettingstarted">Getting Started</A></LI>
19 19
 <LI><A HREF="#kab">Changes in kab</A></LI>
20
-<LI><A HREF="#kdecore">Changes in kdecore</A></LI>
21
-<LI><A HREF="#kdeui">Changes in kdeui</A></LI>
20
+<LI><A HREF="#tdecore">Changes in tdecore</A></LI>
21
+<LI><A HREF="#tdeui">Changes in tdeui</A></LI>
22 22
 <LI><A HREF="#kio">Changes in kio</A></LI>
23 23
 <LI><A HREF="#kparts">Changes in kparts</A></LI>
24 24
 <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.
65 65
 
66 66
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
67 67
 
68
-<H3><A NAME="kdecore">Changes in kdecore</A></H3>
68
+<H3><A NAME="tdecore">Changes in tdecore</A></H3>
69 69
 
70 70
 <H4>KDesktopWidget</H4>
71 71
 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>.
109 109
 The old name will still work unless KDE_NO_COMPAT is defined.
110 110
 
111 111
 <H4>KPixmapSplitter</H4>
112
-KPixmapSplitter has now been moved to the new kdefx library.
112
+KPixmapSplitter has now been moved to the new tdefx library.
113 113
 
114 114
 <H4>KStringHandler</H4>
115 115
 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
121 121
 re-written. KStyle is now a thin wrapper around TQCommonStyle with a few extra 
122 122
 primitive elements and a simple popupMenu transparency engine. All KStyles can
123 123
 now style Qt apps like designer and assistant automatically. KStyle is no longer
124
-present in kdecore. It is now in a new library called kdefx to allow Qt apps to
125
-use KDE's styles without having the styles linked to kdecore/kdeui.
124
+present in tdecore. It is now in a new library called tdefx to allow Qt apps to
125
+use KDE's styles without having the styles linked to tdecore/tdeui.
126 126
 
127 127
 <H4>KURL</H4>
128 128
 The <i>filename( bool _ignore_trailing_slash_in_path = true )</i> method has been 
@@ -219,7 +219,7 @@ KURLBar and KURLBarItem.
219 219
 
220 220
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
221 221
 
222
-<H3><A NAME="kdeui">Changes in kdeui</A></H3>
222
+<H3><A NAME="tdeui">Changes in tdeui</A></H3>
223 223
 
224 224
 <H4>KAccelMenu</H4>
225 225
 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
281 281
 KTextEdit instead.
282 282
 
283 283
 <H4>KImageEffect</H4>
284
-KImageEffect has now been moved to the new kdefx library.
284
+KImageEffect has now been moved to the new tdefx library.
285 285
 
286 286
 <H4>KMessageBox</H4>
287 287
 KMessageBox now does automatic line-breaking. When using plain-text, you should 
@@ -303,7 +303,7 @@ at run-time). See KDE 3.0 documentation
303 303
 for more informations on this new extension.
304 304
 
305 305
 <H4>KPixmapEffect</H4>
306
-PixmapEffect has now been moved to the new kdefx library.
306
+PixmapEffect has now been moved to the new tdefx library.
307 307
 
308 308
 <H4>KProgress</H4>
309 309
 KProgress is now based on TQProgressBar.
@@ -319,7 +319,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
319 319
 
320 320
 <H4>KThemeBase, KThemeStyle</H4>
321 321
 KThemeBase and KThemeStyle have been ported over to the new QStyle/KStyle API
322
-present in Qt3/KDE3. KThemeBase is no longer in kdeui, but in kstyles/kthemestyle
322
+present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
323 323
 as its use is basically limited to KThemeStyle.
324 324
 
325 325
 <H4>KAction, KToolBar, KToolBarButton and icons</H4>

+ 8
- 8
Mainpage.dox View File

@@ -8,11 +8,11 @@
8 8
         * can subscribe or read the mailing lists for any additions and/or 
9 9
         * modifications to the API.
10 10
 	*
11
-	* - <a target="_top" href="kdecore/html/index.html"><b>kdecore</b></a>
12
-        *   (<a target="_top" href="kdecore/html/classes.html">classes</a>)\n
11
+	* - <a target="_top" href="tdecore/html/index.html"><b>tdecore</b></a>
12
+        *   (<a target="_top" href="tdecore/html/classes.html">classes</a>)\n
13 13
 	*   <i>Core Trinity classes that are not related to the user interface.</i>
14
-	* - <a target="_top" href="kdeui/html/index.html"><b>kdeui</b></a>
15
-        *   (<a target="_top" href="kdeui/html/classes.html">classes</a>)\n
14
+	* - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a>
15
+        *   (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
16 16
 	*   <i>Trinity User interface classes such as widgets.</i>
17 17
 	* - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a>
18 18
         *   (<a target="_top" href="khtml/html/classes.html">classes</a>)\n
@@ -30,8 +30,8 @@
30 30
 	* - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a>
31 31
         *   (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
32 32
 	*   <i>The DCOP communications library.</i>
33
-	* - <a target="_top" href="kdefx/html/index.html"><b>kdefx</b></a>
34
-        *   (<a target="_top" href="kdefx/html/classes.html">classes</a>)\n
33
+	* - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
34
+        *   (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
35 35
 	*   <i>A library with pixmap effects.</i>
36 36
 	* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a>
37 37
         *   (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n
@@ -39,8 +39,8 @@
39 39
 	* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a>
40 40
         *   (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
41 41
 	*   <i>Midi library.</i>
42
-	* - <a target="_top" href="kdeprint/html/index.html"><b>kdeprint</b></a>
43
-        *   (<a target="_top" href="kdeprint/html/classes.html">classes</a>)\n
42
+	* - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
43
+        *   (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
44 44
 	*   <i>High level  printer control functionality.</i>
45 45
 	* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a>
46 46
         *   (<a target="_top" href="krandr/html/classes.html">classes</a>)\n

+ 4
- 4
Makefile.am.in View File

@@ -18,10 +18,10 @@
18 18
 #    Boston, MA 02110-1301, USA.
19 19
 
20 20
 
21
-COMPILE_FIRST = dcop libltdl kdefx kdecore kunittest kdeui kdesu kjs kwallet kio kded kded_post
21
+COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post
22 22
 COMPILE_BEFORE_doc = kdoctools
23
-COMPILE_AFTER_kparts = kspell2 kmdi kdeprint kinit kate interfaces kcert khtml krandr
24
-COMPILE_AFTER_kdeprint = kate khtml
23
+COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
24
+COMPILE_AFTER_tdeprint = kate khtml
25 25
 COMPILE_BEFORE_khtml = kutils
26 26
 COMPILE_BEFORE_kabc = kab kresources
27 27
 COMPILE_BEFORE_kate = interfaces kutils
@@ -53,7 +53,7 @@ messages:
53 53
 	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
54 54
 	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
55 55
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
56
-	echo ./kdecore/kde-config.cpp.in >> files ;\
56
+	echo ./tdecore/kde-config.cpp.in >> files ;\
57 57
 	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
58 58
 	: > kde.pot ;\
59 59
 	$(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!!
16 16
 KDEInit Loadable Modules
17 17
 ========================
18 18
 Name: <appname>.la
19
-Definition: kdeinit_LTLIBRARIES = <appname>.la
19
+Definition: tdeinit_LTLIBRARIES = <appname>.la
20 20
 LDFLAGS: -module $(KDE_PLUGIN)
21 21
 
22 22
 

+ 5
- 5
README View File

@@ -45,23 +45,23 @@ Here is an alphabetical list:
45 45
 * kconf_update
46 46
     Auto-Updater for config files.
47 47
 
48
-* kdecore
48
+* tdecore
49 49
     This is the core collection of KDE stuff. Non GUI classes reside here.
50 50
 
51 51
 * kded
52 52
     The KDE daemon checks for newly installed software, update files
53 53
     or hostname changes and takes according actions.
54 54
 
55
-* kdefx
55
+* tdefx
56 56
     Library with pixmap effects.
57 57
 
58
-* kdeprint
58
+* tdeprint
59 59
     The very versatile printing subsystem of KDE.
60 60
 
61
-* kdesu
61
+* tdesu
62 62
     Library for password entering and handling
63 63
 
64
-* kdeui
64
+* tdeui
65 65
     The main collection of misc. user interface classes (widgets).
66 66
     KSpell and related classes are a frontend to ispell for use within a
67 67
     GUI app.

+ 3
- 3
TODO View File

@@ -71,7 +71,7 @@ that we would like to make for the next binary incompatible release.
71 71
 - Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
72 72
   if Simon's solution works.
73 73
 
74
-- Merge kdelibs/kdecore/kuser.h and kdeadmin/kuser/kuser.h.
74
+- Merge kdelibs/tdecore/kuser.h and kdeadmin/kuser/kuser.h.
75 75
 
76 76
 - Simplify memory management with KParts. The part and the widget delete each other,
77 77
   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.
173 173
 - Get rid of KXMLClient::conserveMemory() and the conserveMemory argument in createGUI. It created
174 174
   too many problems in the past. Not worth the trouble.
175 175
 
176
-- Split KProtocolInfo into KProtocolInfoBase in kdecore (with almost everything) 
176
+- Split KProtocolInfo into KProtocolInfoBase in tdecore (with almost everything) 
177 177
   and KProtocolInfo in kio (with the methods taking a KURL, which need KProtocolManager)
178 178
 
179 179
 - Rename KDirNotify_stub and update API (no need for '*' arguments anymore)
@@ -221,7 +221,7 @@ an alternative help->contents action)
221 221
   just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea
222 222
   to have here for later doing.
223 223
 
224
-- Move KRichTextLabel into kdeui if still required with Qt 4.
224
+- Move KRichTextLabel into tdeui if still required with Qt 4.
225 225
 
226 226
 - Add the concept of a session to KIO, in particular for KHTML so that it can
227 227
   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
4 4
 SUBDIRS = knotify
5 5
 endif
6 6
 
7
-DOXYGEN_REFERENCES = kio kdecore kdeui
7
+DOXYGEN_REFERENCES = kio tdecore tdeui
8 8
 include ../admin/Doxyfile.am
9 9
 

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

@@ -15,9 +15,9 @@ include_directories(
15 15
   ${CMAKE_CURRENT_BINARY_DIR}
16 16
   ${CMAKE_BINARY_DIR}
17 17
   ${CMAKE_CURRENT_SOURCE_DIR}
18
-  ${CMAKE_BINARY_DIR}/kdecore
19
-  ${CMAKE_SOURCE_DIR}/kdecore
20
-  ${CMAKE_SOURCE_DIR}/kdeui
18
+  ${CMAKE_BINARY_DIR}/tdecore
19
+  ${CMAKE_SOURCE_DIR}/tdecore
20
+  ${CMAKE_SOURCE_DIR}/tdeui
21 21
   ${CMAKE_SOURCE_DIR}/kio
22 22
   ${CMAKE_SOURCE_DIR}/kio/kio
23 23
 )

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

@@ -77,7 +77,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
77 77
 
78 78
 	X11CommConfig.sync();
79 79
 	
80
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
80
+	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
81 81
 
82 82
 	if(rt)
83 83
 		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
@@ -91,7 +91,7 @@ Arts::SoundServerV2 KArtsServer::server(void)
91 91
 		// We could have a race-condition here.
92 92
 		// The correct way to do it is to make artsd fork-and-exit
93 93
 		// after starting to listen to connections (and running artsd
94
-		// directly instead of using kdeinit), but this is better
94
+		// directly instead of using tdeinit), but this is better
95 95
 		// than nothing.
96 96
 		int time = 0;
97 97
 		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)
3 3
 
4 4
 bin_PROGRAMS=
5 5
 lib_LTLIBRARIES =
6
-kdeinit_LTLIBRARIES = kmcop.la
6
+tdeinit_LTLIBRARIES = kmcop.la
7 7
 
8 8
 kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel
9 9
 kmcop_la_LIBADD	= ../libartskde.la

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

@@ -14,11 +14,11 @@ include_directories(
14 14
   ${ARTS_INCLUDE_DIRS}
15 15
   ${CMAKE_CURRENT_BINARY_DIR}
16 16
   ${CMAKE_BINARY_DIR}
17
-  ${CMAKE_BINARY_DIR}/kdecore
17
+  ${CMAKE_BINARY_DIR}/tdecore
18 18
   ${CMAKE_SOURCE_DIR}/arts/kde
19 19
   ${CMAKE_SOURCE_DIR}/dcop
20
-  ${CMAKE_SOURCE_DIR}/kdecore
21
-  ${CMAKE_SOURCE_DIR}/kdeui
20
+  ${CMAKE_SOURCE_DIR}/tdecore
21
+  ${CMAKE_SOURCE_DIR}/tdeui
22 22
 )
23 23
 
24 24
 link_directories(
@@ -43,7 +43,7 @@ set( ${target}_SRCS
43 43
 if( ARTS_FOUND )
44 44
   set( LIBS artskde-shared )
45 45
 else( ARTS_FOUND )
46
-  set( LIBS kdeui-shared )
46
+  set( LIBS tdeui-shared )
47 47
 endif( ARTS_FOUND )
48 48
 
49 49
 tde_add_kpart( ${target} AUTOMOC

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

@@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
15 15
 check_PROGRAMS		= knotifytest
16 16
 knotifytest_SOURCES	= knotifytest.cpp
17 17
 knotifytest_LDADD	= $(LIB_KDECORE)
18
-knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
18
+knotifytest_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
19 19
 
20 20
 noinst_HEADERS	=  knotify.h
21 21
 

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

@@ -11,9 +11,9 @@
11 11
 
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14
-  ${CMAKE_BINARY_DIR}/kdecore
15
-  ${CMAKE_SOURCE_DIR}/kdecore
16
-  ${CMAKE_SOURCE_DIR}/kdeui
14
+  ${CMAKE_BINARY_DIR}/tdecore
15
+  ${CMAKE_SOURCE_DIR}/tdecore
16
+  ${CMAKE_SOURCE_DIR}/tdeui
17 17
 )
18 18
 
19 19
 link_directories(
@@ -31,6 +31,6 @@ set( ${target}_SRCS
31 31
 
32 32
 tde_add_executable( ${target}
33 33
   SOURCES ${${target}_SRCS}
34
-  LINK kdeui-shared
34
+  LINK tdeui-shared
35 35
   DESTINATION ${BIN_INSTALL_DIR}
36 36
 )

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

@@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage
4 4
 
5 5
 artsmessage_SOURCES = artsmessage.cc
6 6
 
7
-artsmessage_LDADD = ../../kdeui/libtdeui.la
7
+artsmessage_LDADD = ../../tdeui/libtdeui.la
8 8
 artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)

+ 2
- 2
config.h.cmake View File

@@ -692,10 +692,10 @@
692 692
 /* Enable prevention against poor Linux OOM-killer */
693 693
 #cmakedefine KDEINIT_OOM_PROTECT 1
694 694
 
695
-/* Use FontConfig in kdeinit */
695
+/* Use FontConfig in tdeinit */
696 696
 #cmakedefine KDEINIT_USE_FONTCONFIG 1
697 697
 
698
-/* Use Xft preinitialization in kdeinit */
698
+/* Use Xft preinitialization in tdeinit */
699 699
 #cmakedefine KDEINIT_USE_XFT 1
700 700
 
701 701
 /* Suffix for lib directories */

+ 2
- 2
configure.in.bot View File

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

+ 4
- 4
configure.in.in View File

@@ -250,13 +250,13 @@ AC_SUBST(LIBICE)
250 250
 
251 251
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
252 252
 AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
253
-AC_SUBST(LIB_KDECORE, '$(top_builddir)/kdecore/libtdecore.la')
254
-AC_SUBST(LIB_KDEUI, '$(top_builddir)/kdeui/libtdeui.la')
253
+AC_SUBST(LIB_KDECORE, '$(top_builddir)/tdecore/libtdecore.la')
254
+AC_SUBST(LIB_KDEUI, '$(top_builddir)/tdeui/libtdeui.la')
255 255
 AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
256 256
 AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
257 257
 AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
258 258
 AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
259
-AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/kdeprint/libtdeprint.la')
259
+AC_SUBST(LIB_KDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
260 260
 AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
261 261
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
262 262
 AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
@@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
308 308
 AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
309 309
 AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
310 310
 AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets')
311
-AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/kdecore/kconfig_compiler/kconfig_compiler')
311
+AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler')
312 312
 
313 313
 ac_save_LIBS="$LIBS"
314 314
 LIBS="$LIBS $X_LDFLAGS -lICE"

+ 1
- 1
configure.in.mid View File

@@ -1,7 +1,7 @@
1 1
 dnl put here things which have to be done after all usual autoconf macros
2 2
 dnl have been run, but before the Makefiles are created
3 3
 
4
-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)'
4
+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)'
5 5
 AC_SUBST(all_includes)
6 6
 
7 7
 CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"

+ 4
- 4
dcop/CMakeLists.txt View File

@@ -20,8 +20,8 @@ include_directories(
20 20
   ${CMAKE_CURRENT_BINARY_DIR}
21 21
   ${CMAKE_BINARY_DIR}
22 22
   ${CMAKE_CURRENT_SOURCE_DIR}
23
-  ${CMAKE_BINARY_DIR}/kdecore
24
-  ${CMAKE_SOURCE_DIR}/kdecore
23
+  ${CMAKE_BINARY_DIR}/tdecore
24
+  ${CMAKE_SOURCE_DIR}/tdecore
25 25
 )
26 26
 
27 27
 link_directories(
@@ -53,7 +53,7 @@ tde_add_library( ${target} SHARED AUTOMOC
53 53
 )
54 54
 
55 55
 
56
-#### dcopserver (kdeinit) #######################
56
+#### dcopserver (tdeinit) #######################
57 57
 
58 58
 set( target dcopserver )
59 59
 
@@ -61,7 +61,7 @@ set( ${target}_SRCS
61 61
   dcopserver.cpp dcopsignals.cpp
62 62
 )
63 63
 
64
-tde_add_kdeinit_executable( ${target} AUTOMOC
64
+tde_add_tdeinit_executable( ${target} AUTOMOC
65 65
   SOURCES ${${target}_SRCS}
66 66
   LINK kICE-static DCOP-shared
67 67
 )

+ 4
- 4
dcop/HOWTO View File

@@ -464,7 +464,7 @@ Sometimes it might be interesting to use DCOP between processes
464 464
 belonging to different users, e.g. a frontend process running
465 465
 with the user's id, and a backend process running as root.
466 466
 
467
-For this you can use kdesu with the --nonewdcop option. kdesu will
467
+For this you can use tdesu with the --nonewdcop option. tdesu will
468 468
 then forward the address of the DCOP server as well as the authentication
469 469
 information to the new user. 
470 470
 
@@ -479,9 +479,9 @@ carefully reviewed that your DCOPClient does not provide objects/functions
479 479
 that could be abused for privilege escalation.
480 480
 
481 481
 
482
-Example: kdesu --nonewdcop -u root -c kcmroot
482
+Example: tdesu --nonewdcop -u root -c kcmroot
483 483
 
484
-This will, after kdesu got the root password, execute kcmroot as root,
484
+This will, after tdesu got the root password, execute kcmroot as root,
485 485
 talking to the user's dcop server.
486 486
 
487 487
 
@@ -503,7 +503,7 @@ int main(int argc, char **argv)
503 503
 
504 504
 Compiled with:
505 505
 
506
-g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -lkdecore
506
+g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore
507 507
 
508 508
 on Linux yields the following memory use statistics:
509 509
 

+ 4
- 4
dcop/Mainpage.dox View File

@@ -377,15 +377,15 @@ second process where to find the authentication information.
377 377
 (Note that this implies that the second process is able to
378 378
 read the authentication file, so it will probably only work
379 379
 if the second process runs as root. If it should run as another
380
-user, a similar approach to what kdesu does with xauth must
380
+user, a similar approach to what tdesu does with xauth must
381 381
 be taken. In fact, it would be a very good idea to add DCOP
382
-support to kdesu!)
382
+support to tdesu!)
383 383
 
384 384
 For example
385 385
 
386
-ICEAUTHORITY=~user/.ICEauthority kdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
386
+ICEAUTHORITY=~user/.ICEauthority tdesu root -c kcmroot -dcopserver `cat ~user/.DCOPserver`
387 387
 
388
-will, after kdesu got the root password, execute kcmroot as root, talking
388
+will, after tdesu got the root password, execute kcmroot as root, talking
389 389
 to the user's dcop server.
390 390
 
391 391
 

+ 7
- 7
dcop/Makefile.am View File

@@ -33,7 +33,7 @@ lib_LTLIBRARIES  = libDCOP.la
33 33
 libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
34 34
 libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
35 35
 libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
36
-libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
36
+libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck
37 37
 
38 38
 include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
39 39
 noinst_HEADERS = version.h dcopglobal.h dcopserver.h testdcop.h dcopsignals.h dcop-path.h
@@ -43,27 +43,27 @@ METASOURCES = AUTO
43 43
 # dcopstub needs to go first for --enable-final to work
44 44
 libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
45 45
 
46
-kdeinit_LTLIBRARIES = dcopserver.la
46
+tdeinit_LTLIBRARIES = dcopserver.la
47 47
 dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
48 48
 dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
49 49
 dcopserver_la_LIBADD  = libDCOP.la $(LIB_QT)
50 50
 
51 51
 dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
52 52
 
53
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
53
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
54 54
 testdcop_SOURCES = testdcop.cpp
55 55
 testdcop_LDADD = libDCOP.la
56 56
 
57
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
57
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
58 58
 dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
59
-dcop_deadlock_test_LDADD = ../kdecore/libtdecore.la
59
+dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
60 60
 
61
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
61
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
62 62
 testdcopc_SOURCES = testdcopc.c dcopc.c
63 63
 testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
64 64
 
65 65
 EXTRA_DIST = HOWTO ICE Mainpage.dox
66 66
 
67
-DOXYGEN_REFERENCES = kdecore
67
+DOXYGEN_REFERENCES = tdecore
68 68
 DOXYGEN_EXCLUDE = KDE-ICE
69 69
 include ../admin/Doxyfile.am

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

@@ -13,8 +13,8 @@ include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_BINARY_DIR}
15 15
   ${CMAKE_SOURCE_DIR}/dcop
16
-  ${CMAKE_SOURCE_DIR}/kdecore
17
-  ${CMAKE_BINARY_DIR}/kdecore
16
+  ${CMAKE_SOURCE_DIR}/tdecore
17
+  ${CMAKE_BINARY_DIR}/tdecore
18 18
 )
19 19
 
20 20
 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.
21 21
 ******************************************************************/
22 22
 
23 23
 #define KDE_QT_ONLY
24
-#include "../../kdecore/kurl.cpp"
24
+#include "../../tdecore/kurl.cpp"
25 25
 
26 26
 bool mkBool( const TQString& s )
27 27
 {

+ 3
- 3
dnssd/CMakeLists.txt View File

@@ -13,9 +13,9 @@ include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15 15
   ${CMAKE_BINARY_DIR}
16
-  ${CMAKE_BINARY_DIR}/kdecore
16
+  ${CMAKE_BINARY_DIR}/tdecore
17 17
   ${CMAKE_SOURCE_DIR}
18
-  ${CMAKE_SOURCE_DIR}/kdecore
18
+  ${CMAKE_SOURCE_DIR}/tdecore
19 19
 )
20 20
 
21 21
 link_directories(
@@ -44,7 +44,7 @@ set( ${target}_SRCS
44 44
 tde_add_library( ${target} SHARED AUTOMOC
45 45
   SOURCES ${${target}_SRCS}
46 46
   VERSION 1.0.0
47
-  LINK kdecore-shared
47
+  LINK tdecore-shared
48 48
   DEPENDENCIES kconfig_compiler
49 49
   DESTINATION ${LIB_INSTALL_DIR}
50 50
 )

+ 2
- 2
dnssd/Mainpage.dox View File

@@ -33,8 +33,8 @@ Jakub Stachowski
33 33
 
34 34
 */
35 35
 
36
-// Trinity5: get rid of kdeui reference when settings.kcfgc is changed
37
-// DOXYGEN_REFERENCES = kdecore kdeui
36
+// Trinity5: get rid of tdeui reference when settings.kcfgc is changed
37
+// DOXYGEN_REFERENCES = tdecore tdeui
38 38
 // DOXYGEN_SET_PROJECT_NAME = DNSSD
39 39
 // DOXYGEN_SET_EXCLUDE_PATTERNS += */dnssd/avahi* */dnssd/mdnsd*
40 40
 // 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 \
14 14
 dnssdincludedir = $(includedir)/dnssd
15 15
 dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
16 16
 	publicservice.h servicebase.h servicebrowser.h settings.h
17
-libkdnssd_la_LIBADD = ../kdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
17
+libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
18 18
 libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
19 19
 
20 20
 #kde_kcfg_DATA = kcm_kdnssd.kcfg

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

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

+ 1
- 1
interfaces/Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech
2 2
 
3
-DOXYGEN_REFERENCES = kdecore kdefx kdeui kparts dcop
3
+DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop
4 4
 DOXYGEN_SET_RECURSIVE = YES
5 5
 include ../admin/Doxyfile.am

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

@@ -14,10 +14,10 @@ add_subdirectory( icons )
14 14
 include_directories(
15 15
   ${TQT_INCLUDE_DIRS}
16 16
   ${CMAKE_CURRENT_BINARY_DIR}
17
-  ${CMAKE_BINARY_DIR}/kdecore
17
+  ${CMAKE_BINARY_DIR}/tdecore
18 18
   ${CMAKE_SOURCE_DIR}/dcop
19
-  ${CMAKE_SOURCE_DIR}/kdecore
20
-  ${CMAKE_SOURCE_DIR}/kdeui
19
+  ${CMAKE_SOURCE_DIR}/tdecore
20
+  ${CMAKE_SOURCE_DIR}/tdeui
21 21
   ${CMAKE_SOURCE_DIR}/kio/kio
22 22
 )
23 23
 

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

@@ -16,12 +16,12 @@ endif( ARTS_FOUND )
16 16
 include_directories(
17 17
   ${TQT_INCLUDE_DIRS}
18 18
   ${CMAKE_CURRENT_BINARY_DIR}
19
-  ${CMAKE_BINARY_DIR}/kdecore
19
+  ${CMAKE_BINARY_DIR}/tdecore
20 20
   ${CMAKE_SOURCE_DIR}
21 21
   ${CMAKE_SOURCE_DIR}/interfaces
22 22
   ${CMAKE_SOURCE_DIR}/dcop
23
-  ${CMAKE_SOURCE_DIR}/kdecore
24
-  ${CMAKE_SOURCE_DIR}/kdeui
23
+  ${CMAKE_SOURCE_DIR}/tdecore
24
+  ${CMAKE_SOURCE_DIR}/tdeui
25 25
 )
26 26
 
27 27
 link_directories(

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

@@ -13,12 +13,12 @@ include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${ARTS_INCLUDE_DIRS}
15 15
   ${CMAKE_CURRENT_BINARY_DIR}
16
-  ${CMAKE_BINARY_DIR}/kdecore
16
+  ${CMAKE_BINARY_DIR}/tdecore
17 17
   ${CMAKE_SOURCE_DIR}
18 18
   ${CMAKE_SOURCE_DIR}/dcop
19 19
   ${CMAKE_SOURCE_DIR}/interfaces
20
-  ${CMAKE_SOURCE_DIR}/kdecore
21
-  ${CMAKE_SOURCE_DIR}/kdeui
20
+  ${CMAKE_SOURCE_DIR}/tdecore
21
+  ${CMAKE_SOURCE_DIR}/tdeui
22 22
   ${CMAKE_SOURCE_DIR}/kio
23 23
   ${CMAKE_SOURCE_DIR}/kio/kio
24 24
   ${CMAKE_SOURCE_DIR}/kio/kfile

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

@@ -15,10 +15,10 @@ include_directories(
15 15
   ${TQT_INCLUDE_DIRS}
16 16
   ${CMAKE_CURRENT_BINARY_DIR}
17 17
   ${CMAKE_CURRENT_SOURCE_DIR}
18
-  ${CMAKE_BINARY_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}
20
-  ${CMAKE_SOURCE_DIR}/kdecore
21
-  ${CMAKE_SOURCE_DIR}/kdeui
20
+  ${CMAKE_SOURCE_DIR}/tdecore
21
+  ${CMAKE_SOURCE_DIR}/tdeui
22 22
   ${CMAKE_SOURCE_DIR}/kio
23 23
   ${CMAKE_SOURCE_DIR}/kio/kio
24 24
 )

+ 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_
5 5
 #lib_LTLIBRARIES = libkscriptloader.la libkscript.la
6 6
 lib_LTLIBRARIES = libkscript.la
7 7
 #libkscriptloader_la_SOURCES = scriptloader.cpp
8
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
8
+#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
9 9
 #libkscriptloader_la_LIBADD = $(LIB_KPARTS)
10 10
 
11 11
 libkscript_la_SOURCES = scriptmanager.cpp

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

@@ -12,10 +12,10 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}/interfaces/kscript
17 17
   ${CMAKE_SOURCE_DIR}/dcop
18
-  ${CMAKE_SOURCE_DIR}/kdecore
18
+  ${CMAKE_SOURCE_DIR}/tdecore
19 19
 )
20 20
 
21 21
 link_directories(

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

@@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
6 6
 # Define DCOP/Text-to-Speech Service Type.
7 7
 kde_servicetypes_DATA = dcoptexttospeech.desktop
8 8
 
9
-DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
9
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
10 10
 include ../../admin/Doxyfile.am

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

@@ -14,12 +14,12 @@ include_directories(
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15 15
   ${CMAKE_BINARY_DIR}
16 16
   ${CMAKE_CURRENT_SOURCE_DIR}
17
-  ${CMAKE_BINARY_DIR}/kdecore
17
+  ${CMAKE_BINARY_DIR}/tdecore
18 18
   ${CMAKE_BINARY_DIR}/kabc
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21
-  ${CMAKE_SOURCE_DIR}/kdecore
22
-  ${CMAKE_SOURCE_DIR}/kdeui
21
+  ${CMAKE_SOURCE_DIR}/tdecore
22
+  ${CMAKE_SOURCE_DIR}/tdeui
23 23
   ${CMAKE_SOURCE_DIR}/kio
24 24
   ${CMAKE_SOURCE_DIR}/kio/kio
25 25
   ${CMAKE_SOURCE_DIR}/kabc
@@ -90,7 +90,7 @@ set( ${target}_SRCS
90 90
 tde_add_library( ${target} SHARED AUTOMOC
91 91
   SOURCES ${${target}_SRCS}
92 92
   VERSION 0.0.0
93
-  LINK kdeui-shared kabc-shared kparts-shared
93
+  LINK tdeui-shared kabc-shared kparts-shared
94 94
   DEPENDENCIES dcopidl dcopidl2cpp
95 95
   DESTINATION ${LIB_INSTALL_DIR}
96 96
 )

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

@@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
22 22
     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
23 23
 
24 24
 
25
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
25
+libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
26 26
 libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI)
27 27
 
28 28
 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 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
16
-  ${CMAKE_SOURCE_DIR}/kdecore
17
-  ${CMAKE_SOURCE_DIR}/kdeui
15
+  ${CMAKE_BINARY_DIR}/tdecore
16
+  ${CMAKE_SOURCE_DIR}/tdecore
17
+  ${CMAKE_SOURCE_DIR}/tdeui
18 18
 )
19 19
 
20 20
 link_directories(

+ 1
- 1
kab/Makefile.am View File

@@ -10,6 +10,6 @@ libkab_la_SOURCES	= \
10 10
 	qconfigDB.cc 
11 11
 
12 12
 libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
13
-libkab_la_LIBADD = ../kdeui/libtdeui.la
13
+libkab_la_LIBADD = ../tdeui/libtdeui.la
14 14
 
15 15
 libkab_la_METASOURCES = AUTO

+ 3
- 3
kabc/CMakeLists.txt View File

@@ -24,11 +24,11 @@ include_directories(
24 24
   # external includes
25 25
   ${TQT_INCLUDE_DIRS}
26 26
   ${CMAKE_BINARY_DIR}
27
-  ${CMAKE_BINARY_DIR}/kdecore
27
+  ${CMAKE_BINARY_DIR}/tdecore
28 28
   ${CMAKE_SOURCE_DIR}
29 29
   ${CMAKE_SOURCE_DIR}/dcop
30
-  ${CMAKE_SOURCE_DIR}/kdecore
31
-  ${CMAKE_SOURCE_DIR}/kdeui
30
+  ${CMAKE_SOURCE_DIR}/tdecore
31
+  ${CMAKE_SOURCE_DIR}/tdeui
32 32
   ${CMAKE_SOURCE_DIR}/kio
33 33
   ${CMAKE_SOURCE_DIR}/kio/kio
34 34
   ${CMAKE_SOURCE_DIR}/kab

+ 2
- 2
kabc/Makefile.am View File

@@ -52,7 +52,7 @@ METASOURCES = AUTO
52 52
 
53 53
 bin_PROGRAMS = kab2kabc
54 54
 
55
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
55
+kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
56 56
 kab2kabc_LDADD = libkabc.la ../kab/libkab.la
57 57
 kab2kabc_SOURCES = kab2kabc.cpp
58 58
 
@@ -62,7 +62,7 @@ autostartdir = $(datadir)/autostart
62 62
 manager_DATA = kabc_manager.desktop
63 63
 managerdir = $(kde_servicesdir)/kresources
64 64
 
65
-DOXYGEN_REFERENCES = kdecore kdeui
65
+DOXYGEN_REFERENCES = tdecore tdeui
66 66
 
67 67
 map_DATA = countrytransl.map
68 68
 mapdir = $(kde_datadir)/kabc

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

@@ -14,10 +14,10 @@ include_directories(
14 14
   ${CMAKE_SOURCE_DIR}/kabc
15 15
 
16 16
   ${TQT_INCLUDE_DIRS}
17
-  ${CMAKE_BINARY_DIR}/kdecore
17
+  ${CMAKE_BINARY_DIR}/tdecore
18 18
   ${CMAKE_SOURCE_DIR}
19 19
   ${CMAKE_SOURCE_DIR}/dcop
20
-  ${CMAKE_SOURCE_DIR}/kdecore
20
+  ${CMAKE_SOURCE_DIR}/tdecore
21 21
   ${CMAKE_SOURCE_DIR}/kio
22 22
   ${CMAKE_SOURCE_DIR}/kio/kio
23 23
 )

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

@@ -15,11 +15,11 @@ include_directories(
15 15
   ${CMAKE_SOURCE_DIR}/kabc
16 16
 
17 17
   ${TQT_INCLUDE_DIRS}
18
-  ${CMAKE_BINARY_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21
-  ${CMAKE_SOURCE_DIR}/kdecore
22
-  ${CMAKE_SOURCE_DIR}/kdeui
21
+  ${CMAKE_SOURCE_DIR}/tdecore
22
+  ${CMAKE_SOURCE_DIR}/tdeui
23 23
   ${CMAKE_SOURCE_DIR}/kio
24 24
   ${CMAKE_SOURCE_DIR}/kio/kio
25 25
   ${CMAKE_SOURCE_DIR}/kio/kfile

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

@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
8 8
 kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
9 9
 
10 10
 kabc_evo_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
11
-kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../kdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
11
+kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
12 12
 
13 13
 METASOURCES = AUTO
14 14
 

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

@@ -15,11 +15,11 @@ include_directories(
15 15
   ${CMAKE_SOURCE_DIR}/kabc
16 16
 
17 17
   ${TQT_INCLUDE_DIRS}
18
-  ${CMAKE_BINARY_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21
-  ${CMAKE_SOURCE_DIR}/kdecore
22
-  ${CMAKE_SOURCE_DIR}/kdeui
21
+  ${CMAKE_SOURCE_DIR}/tdecore
22
+  ${CMAKE_SOURCE_DIR}/tdeui
23 23
   ${CMAKE_SOURCE_DIR}/kio
24 24
   ${CMAKE_SOURCE_DIR}/kio/kio
25 25
   ${CMAKE_SOURCE_DIR}/kio/kfile

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

@@ -15,11 +15,11 @@ include_directories(
15 15
   ${CMAKE_SOURCE_DIR}/kabc
16 16
 
17 17
   ${TQT_INCLUDE_DIRS}
18
-  ${CMAKE_BINARY_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21
-  ${CMAKE_SOURCE_DIR}/kdecore
22
-  ${CMAKE_SOURCE_DIR}/kdeui
21
+  ${CMAKE_SOURCE_DIR}/tdecore
22
+  ${CMAKE_SOURCE_DIR}/tdeui
23 23
   ${CMAKE_SOURCE_DIR}/kio
24 24
   ${CMAKE_SOURCE_DIR}/kio/kio
25 25
   ${CMAKE_SOURCE_DIR}/kio/kfiles

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

@@ -15,11 +15,11 @@ include_directories(
15 15
   ${CMAKE_SOURCE_DIR}/kabc
16 16
 
17 17
   ${TQT_INCLUDE_DIRS}
18
-  ${CMAKE_BINARY_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21
-  ${CMAKE_SOURCE_DIR}/kdecore
22
-  ${CMAKE_SOURCE_DIR}/kdeui
21
+  ${CMAKE_SOURCE_DIR}/tdecore
22
+  ${CMAKE_SOURCE_DIR}/tdeui
23 23
   ${CMAKE_SOURCE_DIR}/kio
24 24
   ${CMAKE_SOURCE_DIR}/kio/kio
25 25
   ${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
11 11
 
12 12
 kde_module_LTLIBRARIES = kabc_net.la
13 13
 kabc_net_la_SOURCES = resourcenetplugin.cpp
14
-kabc_net_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../kdecore/.libs/ -lkdecore
14
+kabc_net_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -L../../../tdecore/.libs/ -ltdecore
15 15
 kabc_net_la_LIBADD	= libkabc_net.la
16 16
 
17 17
 METASOURCES = AUTO

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

@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_sql.la
8 8
 kabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
9 9
 
10 10
 kabc_sql_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
11
-kabc_sql_la_LIBADD	= ../../libkabc.la ../../../kdeui/libtdeui.la
11
+kabc_sql_la_LIBADD	= ../../libkabc.la ../../../tdeui/libtdeui.la
12 12
 
13 13
 METASOURCES = AUTO
14 14
 

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

@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
12 12
 testlock_LDFLAGS = $(all_libraries)
13 13
 testlock_SOURCES = testlock.cpp
14 14
 
15
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
15
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
16 16
 testldapclient_SOURCES = testldapclient.cpp
17 17
 
18 18
 EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
19 19
   testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
20 20
 
21
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21
+testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
22 22
 testkabc_SOURCES = testkabc.cpp
23 23
 
24
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
24
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
25 25
 testaddressee_SOURCES = testaddressee.cpp
26 26
 
27
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
27
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
28 28
 testaddresseelist_SOURCES = testaddresseelist.cpp
29 29
 
30
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
30
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
31 31
 testaddressfmt_SOURCES = testaddressfmt.cpp
32 32
 
33
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
33
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
34 34
 testkabcdlg_SOURCES = testkabcdlg.cpp
35 35
 
36
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
36
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
37 37
 testdistlist_SOURCES = testdistlist.cpp
38 38
 
39
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
39
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
40 40
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
41 41
 
42
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
42
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
43 43
 bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
44 44
 bigread_SOURCES = bigread.cpp
45 45
 
46
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
46
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
47 47
 bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
48 48
 bigwrite_SOURCES = bigwrite.cpp
49 49
 
50
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
50
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
51 51
 testdb_SOURCES = testdb.cpp
52 52
 
53
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
53
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
54 54
 kabcargl_SOURCES = kabcargl.cpp
55 55
 

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

@@ -15,8 +15,8 @@ include_directories(
15 15
   ${CMAKE_BINARY_DIR}
16 16
   ${CMAKE_CURRENT_SOURCE_DIR}/include
17 17
   ${CMAKE_CURRENT_SOURCE_DIR}/include/generated
18
-  ${CMAKE_BINARY_DIR}/kdecore
19
-  ${CMAKE_SOURCE_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19
+  ${CMAKE_SOURCE_DIR}/tdecore
20 20
 )
21 21
 
22 22
 link_directories(
@@ -35,6 +35,6 @@ set( ${target}_SRCS
35 35
 tde_add_library( ${target} SHARED
36 36
   SOURCES ${${target}_SRCS}
37 37
   VERSION 0.0.0
38
-  LINK kdecore-shared
38
+  LINK tdecore-shared
39 39
   DESTINATION ${LIB_INSTALL_DIR}
40 40
 )

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

@@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
12 12
 
13 13
 check_PROGRAMS = testwrite testread
14 14
 
15
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
15
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
16 16
 testwrite_LDADD = libvcard.la 
17 17
 testwrite_SOURCES = testwrite.cpp
18 18
 
19
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
19
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
20 20
 testread_LDADD = libvcard.la 
21 21
 testread_SOURCES = testread.cpp

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

@@ -11,8 +11,8 @@
11 11
 
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14
-  ${CMAKE_BINARY_DIR}/kdecore
15
-  ${CMAKE_SOURCE_DIR}/kdecore
14
+  ${CMAKE_BINARY_DIR}/tdecore
15
+  ${CMAKE_SOURCE_DIR}/tdecore
16 16
 )
17 17
 
18 18
 link_directories(

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

@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
8 8
 
9 9
 check_PROGRAMS = testread testwrite testread2
10 10
 
11
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
11
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
12 12
 testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
13 13
 testread_SOURCES = testread.cpp
14 14
 
15
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
15
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
16 16
 testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
17 17
 testread2_SOURCES = testread2.cpp testutils.cpp
18 18
 
19
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
19
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
20 20
 testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
21 21
 testwrite_SOURCES = testwrite.cpp
22 22
 

+ 1
- 1
kate/Mainpage.dox View File

@@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
31 31
 @lgpl
32 32
 
33 33
 */
34
-// DOXYGEN_REFERENCES = kdecore kio kdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
34
+// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
35 35
 // DOXYGEN_SET_PROJECT_NAME = Kate
36 36
 // vim:ts=4:sw=4:expandtab:filetype=doxygen

+ 1
- 1
kate/Makefile.am View File

@@ -6,6 +6,6 @@ messages:
6 6
 	$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
7 7
 	$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
8 8
 
9
-DOXYGEN_REFERENCES = kdecore dcop kio kdeui kparts
9
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
10 10
 include ../admin/Doxyfile.am
11 11
 

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

@@ -12,10 +12,10 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}
17
-  ${CMAKE_SOURCE_DIR}/kdecore
18
-  ${CMAKE_SOURCE_DIR}/kdeui
17
+  ${CMAKE_SOURCE_DIR}/tdecore
18
+  ${CMAKE_SOURCE_DIR}/tdeui
19 19
   ${CMAKE_SOURCE_DIR}/interfaces
20 20
 )
21 21
 

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

@@ -15,18 +15,18 @@ include_directories(
15 15
   ${CMAKE_BINARY_DIR}
16 16
   ${CMAKE_BINARY_DIR}/kjs
17 17
   ${CMAKE_CURRENT_SOURCE_DIR}
18
-  ${CMAKE_BINARY_DIR}/kdecore
18
+  ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21
-  ${CMAKE_SOURCE_DIR}/kdefx
22
-  ${CMAKE_SOURCE_DIR}/kdecore
23
-  ${CMAKE_SOURCE_DIR}/kdeui
21
+  ${CMAKE_SOURCE_DIR}/tdefx
22
+  ${CMAKE_SOURCE_DIR}/tdecore
23
+  ${CMAKE_SOURCE_DIR}/tdeui
24 24
   ${CMAKE_SOURCE_DIR}/kio
25 25
   ${CMAKE_SOURCE_DIR}/kio/kio
26 26
   ${CMAKE_SOURCE_DIR}/kio/kfile
27 27
   ${CMAKE_SOURCE_DIR}/kjs
28 28
   ${CMAKE_SOURCE_DIR}/kutils
29
-  ${CMAKE_SOURCE_DIR}/kdeprint
29
+  ${CMAKE_SOURCE_DIR}/tdeprint
30 30
   ${CMAKE_SOURCE_DIR}/interfaces
31 31
   ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
32 32
   ${LUA_INCLUDE_DIRS}
@@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
72 72
 tde_add_kpart( ${target}
73 73
   SOURCES dummy.cpp
74 74
   EMBED kate-static
75
-  LINK kjs-shared kdeprint-shared katepartinterfaces-shared kutils-shared
75
+  LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared
76 76
   DESTINATION ${PLUGIN_INSTALL_DIR}
77 77
 )

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

@@ -20,7 +20,7 @@ libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_
20 20
 
21 21
 libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
22 22
 
23
-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)
23
+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)
24 24
 
25 25
 METASOURCES = AUTO
26 26
 

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

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

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

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

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

@@ -12,10 +12,10 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}
17
-  ${CMAKE_SOURCE_DIR}/kdecore
18
-  ${CMAKE_SOURCE_DIR}/kdeui
17
+  ${CMAKE_SOURCE_DIR}/tdecore
18
+  ${CMAKE_SOURCE_DIR}/tdeui
19 19
   ${CMAKE_SOURCE_DIR}/kio
20 20
   ${CMAKE_SOURCE_DIR}/kio/kio
21 21
   ${CMAKE_SOURCE_DIR}/kio/kfile

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

@@ -12,10 +12,10 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}
17
-  ${CMAKE_SOURCE_DIR}/kdecore
18
-  ${CMAKE_SOURCE_DIR}/kdeui
17
+  ${CMAKE_SOURCE_DIR}/tdecore
18
+  ${CMAKE_SOURCE_DIR}/tdeui
19 19
   ${CMAKE_SOURCE_DIR}/interfaces
20 20
 )
21 21
 

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

@@ -12,11 +12,11 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}
17
-  ${CMAKE_SOURCE_DIR}/kdecore
18
-  ${CMAKE_SOURCE_DIR}/kdefx
19
-  ${CMAKE_SOURCE_DIR}/kdeui
17
+  ${CMAKE_SOURCE_DIR}/tdecore
18
+  ${CMAKE_SOURCE_DIR}/tdefx
19
+  ${CMAKE_SOURCE_DIR}/tdeui
20 20
   ${CMAKE_SOURCE_DIR}/kio
21 21
   ${CMAKE_SOURCE_DIR}/kio/kio
22 22
   ${CMAKE_SOURCE_DIR}/interfaces

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

@@ -1,4 +1,4 @@
1
-INCLUDES    = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kdefx $(all_includes)
1
+INCLUDES    = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
2 2
 METASOURCES = AUTO
3 3
 
4 4
 # Install this plugin in the KDE modules directory

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

@@ -12,10 +12,10 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}
17
-  ${CMAKE_SOURCE_DIR}/kdecore
18
-  ${CMAKE_SOURCE_DIR}/kdeui
17
+  ${CMAKE_SOURCE_DIR}/tdecore
18
+  ${CMAKE_SOURCE_DIR}/tdeui
19 19
   ${CMAKE_SOURCE_DIR}/interfaces
20 20
 )
21 21
 

+ 3
- 3
kcert/CMakeLists.txt View File

@@ -13,11 +13,11 @@ include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15 15
   ${CMAKE_BINARY_DIR}
16
-  ${CMAKE_BINARY_DIR}/kdecore
16
+  ${CMAKE_BINARY_DIR}/tdecore
17 17
   ${CMAKE_BINARY_DIR}/kio/kssl
18 18
   ${CMAKE_SOURCE_DIR}
19
-  ${CMAKE_SOURCE_DIR}/kdecore
20
-  ${CMAKE_SOURCE_DIR}/kdeui
19
+  ${CMAKE_SOURCE_DIR}/tdecore
20
+  ${CMAKE_SOURCE_DIR}/tdeui
21 21
   ${CMAKE_SOURCE_DIR}/kio
22 22
   ${CMAKE_SOURCE_DIR}/kio/kio
23 23
   ${CMAKE_SOURCE_DIR}/kio/kfile

+ 4
- 4
kcmshell/CMakeLists.txt View File

@@ -12,10 +12,10 @@
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14 14
   ${CMAKE_CURRENT_BINARY_DIR}
15
-  ${CMAKE_BINARY_DIR}/kdecore
15
+  ${CMAKE_BINARY_DIR}/tdecore
16 16
   ${CMAKE_SOURCE_DIR}/dcop
17
-  ${CMAKE_SOURCE_DIR}/kdecore
18
-  ${CMAKE_SOURCE_DIR}/kdeui
17
+  ${CMAKE_SOURCE_DIR}/tdecore
18
+  ${CMAKE_SOURCE_DIR}/tdeui
19 19
   ${CMAKE_SOURCE_DIR}/kio
20 20
   ${CMAKE_SOURCE_DIR}/kio/kio
21 21
   ${CMAKE_SOURCE_DIR}/kutils
@@ -34,7 +34,7 @@ set( ${target}_SRCS
34 34
   main.cpp main.skel
35 35
 )
36 36
 
37
-tde_add_kdeinit_executable( ${target} AUTOMOC
37
+tde_add_tdeinit_executable( ${target} AUTOMOC
38 38
   SOURCES ${${target}_SRCS}
39 39
   LINK kutils-shared
40 40
   DEPENDENCIES dcopidl

+ 1
- 1
kcmshell/Makefile.am View File

@@ -23,7 +23,7 @@ METASOURCES = AUTO
23 23
 
24 24
 lib_LTLIBRARIES = 
25 25
 bin_PROGRAMS = 
26
-kdeinit_LTLIBRARIES = kcmshell.la
26
+tdeinit_LTLIBRARIES = kcmshell.la
27 27
 
28 28
 kcmshell_la_SOURCES = main.cpp main.skel
29 29
 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 @@
11 11
 
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14
-  ${CMAKE_BINARY_DIR}/kdecore
15
-  ${CMAKE_SOURCE_DIR}/kdecore
14
+  ${CMAKE_BINARY_DIR}/tdecore
15
+  ${CMAKE_SOURCE_DIR}/tdecore
16 16
 )
17 17
 
18 18
 link_directories(
@@ -28,7 +28,7 @@ set( ${target}_SRCS
28 28
   kconf_update.cpp
29 29
 )
30 30
 
31
-tde_add_kdeinit_executable( ${target} AUTOMOC
31
+tde_add_tdeinit_executable( ${target} AUTOMOC
32 32
   SOURCES ${${target}_SRCS}
33
-  LINK kdecore-shared
33
+  LINK tdecore-shared
34 34
 )

+ 1
- 1
kconf_update/Makefile.am View File

@@ -20,7 +20,7 @@ INCLUDES= -I../kded $(all_includes)
20 20
 
21 21
 bin_PROGRAMS = 
22 22
 lib_LTLIBRARIES =
23
-kdeinit_LTLIBRARIES = kconf_update.la
23
+tdeinit_LTLIBRARIES = kconf_update.la
24 24
 
25 25
 kconf_update_la_SOURCES = kconf_update.cpp
26 26
 kconf_update_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)

+ 13
- 13
kdecore/CMakeLists.txt View File

@@ -27,8 +27,8 @@ include_directories(
27 27
   ${CMAKE_CURRENT_SOURCE_DIR}/network
28 28
   ${CMAKE_SOURCE_DIR}/dcop
29 29
   ${CMAKE_SOURCE_DIR}/libltdl
30
-  ${CMAKE_SOURCE_DIR}/kdefx
31
-  ${CMAKE_SOURCE_DIR}/kdeui
30
+  ${CMAKE_SOURCE_DIR}/tdefx
31
+  ${CMAKE_SOURCE_DIR}/tdeui
32 32
   ${CMAKE_SOURCE_DIR}/kio/kio
33 33
   ${LIBART_INCLUDE_DIRS}
34 34
   ${LIBIDN_INCLUDE_DIRS}
@@ -90,7 +90,7 @@ install( FILES eventsrc
90 90
 
91 91
 ##### libtdecore ################################
92 92
 
93
-set( target kdecore )
93
+set( target tdecore )
94 94
 
95 95
 set( ${target}_SRCS
96 96
   libintl.cpp kapplication.cpp kdebug.cpp netwm.cpp
@@ -120,7 +120,7 @@ set( ${target}_SRCS
120 120
   kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp
121 121
   kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
122 122
   ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp
123
-  kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
123
+  kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp
124 124
   kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp
125 125
   kqiodevicegzip_p.cpp ktimezones.cpp
126 126
 )
@@ -128,16 +128,16 @@ set( ${target}_SRCS
128 128
 tde_add_library( ${target} SHARED AUTOMOC
129 129
   SOURCES ${${target}_SRCS}
130 130
   VERSION 4.2.0
131
-  EMBED kdecorenetwork-static
132
-  LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
131
+  EMBED tdecorenetwork-static
132
+  LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM
133 133
   DEPENDENCIES dcopidl dcopidl2cpp
134 134
   DESTINATION ${LIB_INSTALL_DIR}
135 135
 )
136 136
 
137 137
 
138
-##### kdefakes_nonpic ###########################
138
+##### tdefakes_nonpic ###########################
139 139
 
140
-set( target kdefakes_nonpic )
140
+set( target tdefakes_nonpic )
141 141
 
142 142
 set( ${target}_SRCS
143 143
   fakes.c vsnprintf.c
@@ -148,9 +148,9 @@ tde_add_library( ${target} STATIC
148 148
   DESTINATION ${LIB_INSTALL_DIR}
149 149
 )
150 150
 
151
-##### kdefakes_pic ##############################
151
+##### tdefakes_pic ##############################
152 152
 
153
-set( target kdefakes_pic )
153
+set( target tdefakes_pic )
154 154
 
155 155
 set( ${target}_SRCS
156 156
   fakes.c vsnprintf.c
@@ -164,7 +164,7 @@ tde_add_library( ${target} STATIC_PIC
164 164
 
165 165
 ##### libtdefakes ###############################
166 166
 
167
-set( target kdefakes )
167
+set( target tdefakes )
168 168
 
169 169
 set( ${target}_SRCS
170 170
   fakes.c vsnprintf.c
@@ -185,7 +185,7 @@ configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY )
185 185
 
186 186
 tde_add_executable( kde-config
187 187
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kde-config.cpp
188
-  LINK kdecore-shared
188
+  LINK tdecore-shared
189 189
   DESTINATION ${BIN_INSTALL_DIR}
190 190
 )
191 191
 
@@ -204,6 +204,6 @@ tde_add_executable(kgrantpty SETUID
204 204
 
205 205
 tde_add_executable( kdetcompmgr
206 206
   SOURCES kdetcompmgr.cpp
207
-  LINK kdecore-shared
207
+  LINK tdecore-shared
208 208
   DESTINATION ${BIN_INSTALL_DIR}
209 209
 )

+ 1
- 1
kdecore/MAINTAINERS View File

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

+ 1
- 1
kdecore/Mainpage.dox View File

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

+ 7
- 7
kdecore/Makefile.am View File

@@ -20,7 +20,7 @@
20 20
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 21
 #    Boston, MA 02110-1301, USA.
22 22
 
23
-INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes) $(LIBART_CFLAGS)
23
+INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore/network $(all_includes) $(LIBART_CFLAGS)
24 24
 
25 25
 if include_SVGICONS
26 26
 SVGICONS=svgicons
@@ -117,20 +117,20 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
117 117
 	kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \
118 118
 	kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
119 119
 	ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp \
120
-	kprotocolinfo_kdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
120
+	kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp \
121 121
 	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
122 122
 	kqiodevicegzip_p.cpp ktimezones.cpp
123 123
 
124 124
 libtdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
125 125
 libtdecore_la_LIBADD = malloc/libklmalloc.la network/libtdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la \
126
-	$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/kdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
126
+	$(LIBART_LIBS) $(LIB_IDN) $(top_builddir)/tdefx/libtdefx.la $(LIB_QT) $(LIBSM) $(LIB_X11) $(LIBZ) $(LIBDL)
127 127
 libtdecore_la_NMCHECK = $(srcdir)/libtdecore.nmcheck
128 128
 libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
129
-	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
129
+	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/standard_weak.nmcheck
130 130
 
131 131
 libtdecore_la_METASOURCES = AUTO
132 132
 
133
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/kdecore
133
+SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore
134 134
 
135 135
 kdebugdir = $(kde_confdir)
136 136
 kdebug_DATA = kdebug.areas kdebugrc language.codes
@@ -154,7 +154,7 @@ install-data-local:
154 154
 uninstall-local:
155 155
 	-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h
156 156
 
157
-# If you add a color palette file here, please change kdelibs/kdeui/kcolordialog.cpp too to allow to translate the name
157
+# If you add a color palette file here, please change kdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
158 158
 colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
159 159
 colorsdir = $(kde_confdir)/colors
160 160
 
@@ -188,7 +188,7 @@ install-exec-hook:
188 188
 
189 189
 DISTCLEANFILES = kde-config.cpp
190 190
 
191
-DOXYGEN_REFERENCES = dcop kdeui kparts kio
191
+DOXYGEN_REFERENCES = dcop tdeui kparts kio
192 192
 DOXYGEN_EXCLUDE = malloc kde_file.h
193 193
 DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
194 194
 

+ 1
- 1
kdecore/README View File

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

+ 1
- 1
kdecore/README.kstartupinfo View File

@@ -88,7 +88,7 @@ The KStartupInfo classes :
88 88
 --------------------------
89 89
 
90 90
  In some cases, or if you are interested in getting the ASN information, you
91
-have to use the KStartupInfo classes in kdelibs/kdecore.
91
+have to use the KStartupInfo classes in kdelibs/tdecore.
92 92
 
93 93
 Receiving the application startup notification information :
94 94
 ------------------------------------------------------------

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

@@ -1,7 +1,7 @@
1 1
 dnl Compile in the exec prefix to help kstddirs in finding dynamic libs
2 2
 AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading])
3 3
 
4
-dnl Compile in kde_bindir to safely find kdesu_stub.
4
+dnl Compile in kde_bindir to safely find tdesu_stub.
5 5
 if test "$exec_prefix" = "NONE"; then
6 6
     bindir_str="\"$prefix/bin\""
7 7
 else
@@ -167,9 +167,9 @@ AC_TRY_LINK(dnl
167 167
 
168 168
 AC_CHECK_HEADERS(sys/mount.h)  
169 169
 
170
-dnl AC_OUTPUT(kdecore/kde-config.cpp)
170
+dnl AC_OUTPUT(tdecore/kde-config.cpp)
171 171
 
172
-AM_CONFIG_HEADER(kdecore/kdemacros.h)
172
+AM_CONFIG_HEADER(tdecore/kdemacros.h)
173 173
 
174 174
 SVGICONS=
175 175
 	

+ 1
- 1
kdecore/kaccel.cpp View File

@@ -523,7 +523,7 @@ bool KAccel::setShortcut( const TQString& sAction, const KShortcut& cut )
523 523
 
524 524
 const TQString& KAccel::configGroup() const
525 525
 	{ return d->configGroup(); }
526
-// for kdegames/ksirtet
526
+// for tdegames/ksirtet
527 527
 void KAccel::setConfigGroup( const TQString& s )
528 528
 	{ d->setConfigGroup( s ); }
529 529
 

+ 1
- 1
kdecore/kaccelmanager.cpp View File

@@ -46,7 +46,7 @@
46 46
 
47 47
 
48 48
 #include "kaccelmanager_private.h"
49
-#include "../kdeui/kstdaction_p.h"
49
+#include "../tdeui/kstdaction_p.h"
50 50
 #include "../kutils/kmultitabbar.h"
51 51
 
52 52
 

+ 15
- 15
kdecore/kapplication.cpp View File

@@ -1440,18 +1440,18 @@ bool KApplication::sessionSaving() const
1440 1440
 void KApplication::startKdeinit()
1441 1441
 {
1442 1442
 #ifndef Q_WS_WIN //TODO
1443
-  KInstance inst( "startkdeinitlock" );
1444
-  KLockFile lock( locateLocal( "tmp", "startkdeinitlock", &inst ));
1443
+  KInstance inst( "starttdeinitlock" );
1444
+  KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
1445 1445
   if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) {
1446 1446
      lock.lock();
1447 1447
      DCOPClient cl;
1448 1448
      if( cl.attach())
1449 1449
          return; // whoever held the lock has already started dcopserver
1450 1450
   }
1451
-  // Try to launch kdeinit.
1452
-  TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"));
1451
+  // Try to launch tdeinit.
1452
+  TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"));
1453 1453
   if (srv.isEmpty())
1454
-     srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
1454
+     srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
1455 1455
   if (srv.isEmpty())
1456 1456
      return;
1457 1457
   if (kapp && (Tty != kapp->type()))
@@ -2884,7 +2884,7 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
2884 2884
    TQString error;
2885 2885
    // TODO this should check if cmd has a .desktop file, and use data from it, together
2886 2886
    // with sending more ASN data
2887
-   if (kdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
2887
+   if (tdeinitExec(cmd, cmdTokens, &error, NULL, startup_id ))
2888 2888
      if (Tty != kapp->type())
2889 2889
        TQMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Mail Client"),
2890 2890
              i18n("Could not launch the mail client:\n\n%1").arg(error), i18n("&OK"));
@@ -3006,7 +3006,7 @@ startServiceInternal( const TQCString &function,
3006 3006
    // make sure there is id, so that user timestamp exists
3007 3007
    stream << ( startup_id.isEmpty() ? KStartupInfo::createNewStartupId() : startup_id );
3008 3008
 #endif
3009
-   if( function.left( 12 ) != "kdeinit_exec" )
3009
+   if( function.left( 12 ) != "tdeinit_exec" )
3010 3010
        stream << noWait;
3011 3011
 
3012 3012
    if (!dcopClient->call(_launcher, _launcher,
@@ -3100,32 +3100,32 @@ KApplication::startServiceByDesktopName( const TQString& _name, const TQStringLi
3100 3100
 }
3101 3101
 
3102 3102
 int
3103
-KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
3103
+KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
3104 3104
                            TQString *error, int *pid )
3105 3105
 {
3106
-    return kdeinitExec( name, args, error, pid, "" );
3106
+    return tdeinitExec( name, args, error, pid, "" );
3107 3107
 }
3108 3108
 
3109 3109
 int
3110
-KApplication::kdeinitExec( const TQString& name, const TQStringList &args,
3110
+KApplication::tdeinitExec( const TQString& name, const TQStringList &args,
3111 3111
                            TQString *error, int *pid, const TQCString& startup_id )
3112 3112
 {
3113
-   return startServiceInternal("kdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
3113
+   return startServiceInternal("tdeinit_exec(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
3114 3114
         name, args, error, 0, pid, startup_id, false);
3115 3115
 }
3116 3116
 
3117 3117
 int
3118
-KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
3118
+KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
3119 3119
                            TQString *error, int *pid )
3120 3120
 {
3121
-    return kdeinitExecWait( name, args, error, pid, "" );
3121
+    return tdeinitExecWait( name, args, error, pid, "" );
3122 3122
 }
3123 3123
 
3124 3124
 int
3125
-KApplication::kdeinitExecWait( const TQString& name, const TQStringList &args,
3125
+KApplication::tdeinitExecWait( const TQString& name, const TQStringList &args,
3126 3126
                            TQString *error, int *pid, const TQCString& startup_id )
3127 3127
 {
3128
-   return startServiceInternal("kdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
3128
+   return startServiceInternal("tdeinit_exec_wait(TQString,TQStringList,TQValueList<TQCString>,TQCString)",
3129 3129
         name, args, error, 0, pid, startup_id, false);
3130 3130
 }
3131 3131
 

+ 8
- 8
kdecore/kapplication.h View File

@@ -814,10 +814,10 @@ public:
814 814
                 TQString *error=0, TQCString *dcopService=0, int *pid = 0, const TQCString &startup_id = "", bool noWait = false );
815 815
 
816 816
   /**
817
-   * Starts a program via kdeinit.
817
+   * Starts a program via tdeinit.
818 818
    *
819 819
    * program name and arguments are converted to according to the
820
-   * local encoding and passed as is to kdeinit.
820
+   * local encoding and passed as is to tdeinit.
821 821
    *
822 822
    * @param name Name of the program to start
823 823
    * @param args Arguments to pass to the program
@@ -830,16 +830,16 @@ public:
830 830
    *           "" ( empty string ) is the default
831 831
    * @return an error code indicating success (== 0) or failure (> 0).
832 832
    */
833
-  static int kdeinitExec( const TQString& name, const TQStringList &args,
833
+  static int tdeinitExec( const TQString& name, const TQStringList &args,
834 834
                 TQString *error, int *pid, const TQCString& startup_id );
835 835
   // KDE4 merge with above with startup_id = ""
836
-  static int kdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
836
+  static int tdeinitExec( const TQString& name, const TQStringList &args=TQStringList(),
837 837
                 TQString *error=0, int *pid = 0 );
838 838
 
839 839
   /**
840
-   * Starts a program via kdeinit and wait for it to finish.
840
+   * Starts a program via tdeinit and wait for it to finish.
841 841
    *
842
-   * Like kdeinitExec(), but it waits till the program is finished.
842
+   * Like tdeinitExec(), but it waits till the program is finished.
843 843
    * As such it behaves similar to the system(...) function.
844 844
    *
845 845
    * @param name Name of the program to start
@@ -853,10 +853,10 @@ public:
853 853
    *           "" ( empty string ) is the default
854 854
    * @return an error code indicating success (== 0) or failure (> 0).
855 855
    */
856
-  static int kdeinitExecWait( const TQString& name, const TQStringList &args,
856
+  static int tdeinitExecWait( const TQString& name, const TQStringList &args,
857 857
                 TQString *error, int *pid, const TQCString& startup_id );
858 858
   // KDE4 merge with above with startup_id = ""
859
-  static int kdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
859
+  static int tdeinitExecWait( const TQString& name, const TQStringList &args=TQStringList(),
860 860
                 TQString *error=0, int *pid = 0 );
861 861
 
862 862
   /**

+ 1
- 1
kdecore/kconfig.cpp View File

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

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

@@ -11,8 +11,8 @@
11 11
 
12 12
 include_directories(
13 13
   ${TQT_INCLUDE_DIRS}
14
-  ${CMAKE_BINARY_DIR}/kdecore
15
-  ${CMAKE_SOURCE_DIR}/kdecore
14
+  ${CMAKE_BINARY_DIR}/tdecore
15
+  ${CMAKE_SOURCE_DIR}/tdecore
16 16
 )
17 17
 
18 18
 link_directories(
@@ -24,6 +24,6 @@ link_directories(
24 24
 
25 25
 tde_add_executable( kconfig_compiler
26 26
   SOURCES kconfig_compiler.cpp
27
-  LINK kdecore-shared
27
+  LINK tdecore-shared
28 28
   DESTINATION ${BIN_INSTALL_DIR}
29 29
 )

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

@@ -1,10 +1,10 @@
1 1
 SUBDIRS = example tests
2 2
 
3
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
3
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
4 4
 
5 5
 bin_PROGRAMS = kconfig_compiler
6 6
 
7
-kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
7
+kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
8 8
 kconfig_compiler_LDADD = $(LIB_KDECORE)
9 9
 kconfig_compiler_SOURCES = kconfig_compiler.cpp
10 10
 
@@ -13,6 +13,6 @@ TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
13 13
 check-local:
14 14
 	for i in $(TESTFILES); \
15 15
 	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
16
-	  perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \
17
-          $(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done
16
+	  perl $(top_srcdir)/tdecore/kconfig_compiler/checkkcfg.pl \
17
+          $(top_srcdir)/tdecore/kconfig_compiler/tests/$$i; done
18 18
 	  

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

@@ -1,13 +1,13 @@
1
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
1
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
2 2
 
3 3
 check_PROGRAMS = example # autoexample
4 4
 EXTRA_PROGRAMS = autoexample
5 5
 
6
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
6
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
7 7
 example_LDADD = $(LIB_KDECORE)
8 8
 example_SOURCES = example.cpp exampleprefs_base.cpp
9 9
 
10
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
10
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
11 11
 autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
12 12
 autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
13 13
   autoexample.cpp  

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

@@ -1,4 +1,4 @@
1
-AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
1
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
2 2
 
3 3
 check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
4 4
 
@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
14 14
 						 test_dpointer.cpp test_dpointer.h \
15 15
              md5sums
16 16
 
17
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
17
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
18 18
 test1_LDADD = $(LIB_KDECORE)
19 19
 test1_SOURCES = test1main.cpp test1.cpp
20 20
 
21
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
22 22
 test2_LDADD = $(LIB_KDECORE)
23 23
 test2_SOURCES = test2main.cpp test2.cpp
24 24
 
25
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
25
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
26 26
 test3_LDADD = $(LIB_KDECORE)
27 27
 test3_SOURCES = test3main.cpp test3.cpp
28 28
 
29
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
29
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
30 30
 test4_LDADD = $(LIB_KDECORE)
31 31
 test4_SOURCES = test4main.cpp test4.cpp
32 32
 
33
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
33
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
34 34
 test5_LDADD = $(LIB_KDECORE)
35 35
 test5_SOURCES = test5main.cpp test5.cpp
36 36
 
37
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
37
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
38 38
 test6_LDADD = $(LIB_KDECORE)
39 39
 test6_SOURCES = test6main.cpp test6.cpp
40 40
 
41
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
41
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
42 42
 test7_LDADD = $(LIB_KDECORE)
43 43
 test7_SOURCES = test7main.cpp test7.cpp
44 44
 
45
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
45
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
46 46
 test8_LDADD = $(LIB_KDECORE)
47 47
 test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
48 48
 
49
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
49
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
50 50
 test9_LDADD = $(LIB_KDECORE)
51 51
 test9_SOURCES = test9main.cpp test9.cpp
52 52
 
53
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
53
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
54 54
 test_dpointer_LDADD = $(LIB_KDECORE)
55 55
 test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
56 56
 

+ 5
- 5
kdecore/kcrash.cpp View File

@@ -177,7 +177,7 @@ KCrash::defaultCrashHandler (int sig)
177 177
           argv[i++] = "--appname";
178 178
           argv[i++] = appName;
179 179
           if (KApplication::loadedByKdeinit)
180
-            argv[i++] = "--kdeinit";
180
+            argv[i++] = "--tdeinit";
181 181
 
182 182
           // only add apppath if it's not NULL
183 183
           if (appPath) {
@@ -314,10 +314,10 @@ void KCrash::startDrKonqi( const char* argv[], int argc )
314 314
   }
315 315
 }
316 316
 
317
-// If we can't reach kdeinit we can still at least try to fork()
317
+// If we can't reach tdeinit we can still at least try to fork()
318 318
 void KCrash::startDirectly( const char* argv[], int )
319 319
 {
320
-  fprintf( stderr, "KCrash cannot reach kdeinit, launching directly.\n" );
320
+  fprintf( stderr, "KCrash cannot reach tdeinit, launching directly.\n" );
321 321
   pid_t pid = fork();
322 322
   if (pid <= 0)
323 323
   {
@@ -483,13 +483,13 @@ static int openSocket()
483 483
      return -1;
484 484
   }
485 485
 
486
-  if (strlen(sock_file)+strlen(display)+strlen("/kdeinit_")+2 > MAX_SOCK_FILE)
486
+  if (strlen(sock_file)+strlen(display)+strlen("/tdeinit_")+2 > MAX_SOCK_FILE)
487 487
   {
488 488
      fprintf(stderr, "Warning: Socket name will be too long.\n");
489 489
      free(display);
490 490
      return -1;
491 491
   }
492
-  strcat(sock_file, "/kdeinit_");
492
+  strcat(sock_file, "/tdeinit_");
493 493
   strcat(sock_file, display);
494 494
   free(display);
495 495
 

+ 41
- 41
kdecore/kdebug.areas View File

@@ -5,48 +5,48 @@
5 5
 #
6 6
 #Format : number<tab>description
7 7
 
8
-125        kdecore (KAccel)
9
-126        kdecore (KURL)
8
+125        tdecore (KAccel)
9
+126        tdecore (KURL)
10 10
 127        kio (KProtocolInfo)
11
-128        kdecore (KRegExp)
12
-129        kdecore (KAction)
11
+128        tdecore (KRegExp)
12
+129        tdecore (KAction)
13 13
 130        kio (KPasswdServer)
14
-131        kdecore (KAcceleratorManager)
15
-150        kdecore (KLibLoader)
16
-160        kdecore (KNotifyClient)
17
-170        kdecore (KNetwork socket)
18
-171        kdecore (KSocks)
19
-172        kdecore (KStartupInfo)
20
-173        kdecore (KLocale)
21
-174        kdecore (KProcIO)
22
-175        kdecore (KProcess)
23
-176        kdecore (KWin)
24
-177        kdecore (KConfigSkeleton)
25
-178        kdecore (KConfigDialogManager)
26
-179        kdecore (KNetwork resolver)
27
-180        kdecore (kdelibs)
28
-200        kdeui (KMainWindow)
29
-220        kdeui (KToolBar)
30
-230        kdeui (KCommand)
31
-240        kdeui (kdelibs)
14
+131        tdecore (KAcceleratorManager)
15
+150        tdecore (KLibLoader)
16
+160        tdecore (KNotifyClient)
17
+170        tdecore (KNetwork socket)
18
+171        tdecore (KSocks)
19
+172        tdecore (KStartupInfo)
20
+173        tdecore (KLocale)
21
+174        tdecore (KProcIO)
22
+175        tdecore (KProcess)
23
+176        tdecore (KWin)
24
+177        tdecore (KConfigSkeleton)
25
+178        tdecore (KConfigDialogManager)
26
+179        tdecore (KNetwork resolver)
27
+180        tdecore (kdelibs)
28
+200        tdeui (KMainWindow)
29
+220        tdeui (KToolBar)
30
+230        tdeui (KCommand)
31
+240        tdeui (kdelibs)
32 32
 250        kfile (kdelibs)
33
-264        kdecore (KIconLoader)
34
-265        kdecore (KIconEffect)
35
-270        kdeui (KRootPixmap)
36
-280        kdeui (KSharedPixmap)
37
-281        kdeui (KCModule)
38
-282        kdeui (KDockWidget)
39
-290        kdeui (KPixmapIO)
40
-291        kdeui (KAboutDialog)
41
-292        kdeui (KComboBox)
42
-293        kdeui (KLineEdit)
43
-294        kdeui (KEdit)
44
-295        kdeui (KMenuBar)
45
-296        kdeui (KPopupMenu)
46
-298        kdeui (KDatePicker)
33
+264        tdecore (KIconLoader)
34
+265        tdecore (KIconEffect)
35
+270        tdeui (KRootPixmap)
36
+280        tdeui (KSharedPixmap)
37
+281        tdeui (KCModule)
38
+282        tdeui (KDockWidget)
39
+290        tdeui (KPixmapIO)
40
+291        tdeui (KAboutDialog)
41
+292        tdeui (KComboBox)
42
+293        tdeui (KLineEdit)
43
+294        tdeui (KEdit)
44
+295        tdeui (KMenuBar)
45
+296        tdeui (KPopupMenu)
46
+298        tdeui (KDatePicker)
47 47
 399        kimgio
48 48
 400        artskde
49
-500        kdeprint
49
+500        tdeprint
50 50
 700        kutils (KSettings::Dialog)
51 51
 701        kutils (KSettings::Dispatcher)
52 52
 702        kutils (KPluginSelector)
@@ -61,7 +61,7 @@
61 61
 780        kcmshell (kdelibs)
62 62
 790        kimproxy (kdelibs)
63 63
 800        kabapi (kdelibs)
64
-900        kdesu (kdelibs)
64
+900        tdesu (kdelibs)
65 65
 912        ksmartcard (kdelibs)
66 66
 
67 67
 
@@ -74,8 +74,8 @@
74 74
 1202        konqueror
75 75
 1203        libkonq
76 76
 1204        kdesktop
77
-1205        kdesud
78
-1206        kdesu
77
+1205        tdesud
78
+1206        tdesu
79 79
 1207        kdesktop (Minicli)
80 80
 1208        kcontrol
81 81
 1210        kicker
@@ -151,7 +151,7 @@
151 151
 5150        libkleopatra
152 152
 
153 153
 
154
-# kdepim
154
+# tdepim
155 155
 5200        kitchensync
156 156
 5201        kitchensync (Konnector)
157 157
 5202        kitchensync (OpieKonnector)

+ 1
- 1
kdecore/kdebug.cpp View File

@@ -289,7 +289,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
289 289
   }
290 290
   case 1: // Message Box
291 291
   {
292
-      // Since we are in kdecore here, we cannot use KMsgBox and use
292
+      // Since we are in tdecore here, we cannot use KMsgBox and use
293 293
       // TQMessageBox instead
294 294
       if ( !kDebug_data->aAreaName.isEmpty() )
295 295
           aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );

+ 1
- 1
kdecore/kdelibs_export.h View File

@@ -67,7 +67,7 @@
67 67
 
68 68
 #endif /*_KDELIBS_EXPORT_H*/
69 69
 
70
-/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
70
+/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
71 71
    between 'class' keyword and <classname>: */
72 72
 #ifdef KDE_DEPRECATED
73 73
 # ifndef KDECORE_EXPORT_DEPRECATED

+ 1
- 1
kdecore/kglobal.h View File

@@ -227,7 +227,7 @@ int KDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
227 227
  * support, site-independent access to the filesystem and a large number
228 228
  * of other (but no less important) things.
229 229
  *
230
- * All KDE applications should link to the kdecore library. Also, using a
230
+ * All KDE applications should link to the tdecore library. Also, using a
231 231
  * KApplication derived class instead of TQApplication is almost
232 232
  * mandatory if you expect your application to behave nicely within the
233 233
  * KDE environment.

+ 2
- 2
kdecore/kiconeffect.cpp View File

@@ -1,7 +1,7 @@
1 1
 /* vi: ts=8 sts=4 sw=4
2 2
  * $Id$
3 3
  *
4
- * This file is part of the KDE project, module kdecore.
4
+ * This file is part of the KDE project, module tdecore.
5 5
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
6 6
  * with minor additions and based on ideas from
7 7
  * Torsten Rahn <torsten@kde.org>
@@ -279,7 +279,7 @@ TQPixmap KIconEffect::apply(TQPixmap pixmap, int effect, float value,
279 279
     return result;
280 280
 }
281 281
 
282
-// Taken from KImageEffect. We don't want to link kdecore to kdeui! As long
282
+// Taken from KImageEffect. We don't want to link tdecore to tdeui! As long
283 283
 // as this code is not too big, it doesn't seem much of a problem to me.
284 284
 
285 285
 void KIconEffect::toGray(TQImage &img, float value)

+ 1
- 1
kdecore/kiconeffect.h View File

@@ -1,6 +1,6 @@
1 1
 /* vi: ts=8 sts=4 sw=4
2 2
  *
3
- * This file is part of the KDE project, module kdecore.
3
+ * This file is part of the KDE project, module tdecore.
4 4
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
5 5
  * with minor additions and based on ideas from
6 6
  * Torsten Rahn <torsten@kde.org>

+ 1
- 1
kdecore/kiconloader.cpp View File

@@ -2,7 +2,7 @@
2 2
  *
3 3
  * $Id$
4 4
  *
5
- * This file is part of the KDE project, module kdecore.
5
+ * This file is part of the KDE project, module tdecore.
6 6
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
7 7
  *                    Antonio Larrosa <larrosa@kde.org>
8 8
  *

+ 0
- 0
kdecore/kiconloader.h View File


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

Loading…
Cancel
Save