Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
5159cd2beb
100 changed files with 1179 additions and 1747 deletions
  1. 9
    9
      CMakeLists.txt
  2. 8
    8
      KDE2PORTING.html
  3. 8
    8
      KDE3PORTING.html
  4. 2
    2
      Mainpage.dox
  5. 1
    1
      Makefile.am.in
  6. 2
    2
      README
  7. 3
    3
      TODO
  8. 3
    3
      arts/kde/CMakeLists.txt
  9. 3
    3
      arts/kde/kioinputstream_impl.cpp
  10. 1
    1
      arts/kde/kioinputstream_impl.h
  11. 1
    1
      arts/kde/kplayobjectcreator.cc
  12. 2
    2
      arts/kde/kplayobjectfactory.cc
  13. 1
    1
      arts/knotify/knotify.cpp
  14. 4
    4
      configure.in.in
  15. 1
    1
      configure.in.mid
  16. 3
    3
      dcop/client/dcopfind.cpp
  17. 1
    1
      dcop/client/dcopstart.cpp
  18. 1
    1
      dcop/dcopidlng/kalyptus
  19. 1
    1
      dnssd/CMakeLists.txt
  20. 0
    0
      doc/api/tdefiledialog.png
  21. 0
    221
      doc/tdelibs/man-kbuildsycoca.8.docbook
  22. 221
    0
      doc/tdelibs/man-tdebuildsycoca.8.docbook
  23. 1
    1
      interfaces/kio/CMakeLists.txt
  24. 1
    1
      interfaces/kio/Makefile.am
  25. 1
    1
      interfaces/kregexpeditor/Makefile.am
  26. 2
    2
      interfaces/tdeimproxy/library/CMakeLists.txt
  27. 1
    1
      interfaces/tdemediaplayer/CMakeLists.txt
  28. 2
    2
      interfaces/tdemediaplayer/Makefile.am
  29. 0
    46
      interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
  30. 0
    13
      interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
  31. 0
    146
      interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  32. 46
    0
      interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
  33. 13
    0
      interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
  34. 146
    0
      interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
  35. 0
    0
      interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
  36. 3
    3
      interfaces/tdescript/CMakeLists.txt
  37. 1
    1
      interfaces/tdescript/Makefile.am
  38. 1
    1
      interfaces/tdescript/sample/Makefile.am
  39. 1
    1
      interfaces/tdescript/scriptloader.cpp
  40. 2
    2
      interfaces/tdetexteditor/CMakeLists.txt
  41. 1
    1
      interfaces/tdetexteditor/Makefile.am
  42. 1
    1
      interfaces/tdetexteditor/configinterface.h
  43. 1
    1
      interfaces/tdetexteditor/editorchooser.cpp
  44. 7
    7
      kabc/CMakeLists.txt
  45. 5
    5
      kabc/Makefile.am
  46. 1
    1
      kabc/addresseehelper.cpp
  47. 1
    1
      kabc/addresslineedit.cpp
  48. 1
    1
      kabc/formatfactory.h
  49. 2
    2
      kabc/formats/CMakeLists.txt
  50. 0
    476
      kabc/kab2kabc.cpp
  51. 0
    105
      kabc/kab2kabc.desktop
  52. 1
    1
      kabc/ldapclient.cpp
  53. 1
    1
      kabc/ldapclient.h
  54. 1
    1
      kabc/ldapconfigwidget.h
  55. 3
    3
      kabc/plugins/dir/CMakeLists.txt
  56. 1
    1
      kabc/plugins/dir/resourcedir.cpp
  57. 1
    1
      kabc/plugins/dir/resourcedir.h
  58. 3
    3
      kabc/plugins/file/CMakeLists.txt
  59. 2
    2
      kabc/plugins/file/resourcefile.cpp
  60. 1
    1
      kabc/plugins/file/resourcefile.h
  61. 4
    4
      kabc/plugins/ldapkio/CMakeLists.txt
  62. 2
    2
      kabc/plugins/ldapkio/resourceldapkio.cpp
  63. 1
    1
      kabc/plugins/ldapkio/resourceldapkio.h
  64. 1
    1
      kabc/plugins/ldapkio/resourceldapkioconfig.cpp
  65. 3
    3
      kabc/plugins/net/CMakeLists.txt
  66. 2
    2
      kabc/plugins/net/resourcenet.cpp
  67. 1
    1
      kabc/plugins/net/resourcenet.h
  68. 1
    1
      kabc/plugins/sql/resourcesql.h
  69. 1
    1
      kabc/scripts/field.src.cpp
  70. 476
    0
      kabc/tdeab2tdeabc.cpp
  71. 105
    0
      kabc/tdeab2tdeabc.desktop
  72. 1
    1
      kate/data/bash.xml
  73. 1
    1
      kate/data/tcsh.xml
  74. 1
    1
      kate/data/zsh.xml
  75. 1
    1
      kate/interfaces/katecmd.cpp
  76. 3
    3
      kate/part/CMakeLists.txt
  77. 1
    1
      kate/part/kateconfig.cpp
  78. 4
    4
      kate/part/katedialogs.cpp
  79. 17
    17
      kate/part/katedocument.cpp
  80. 1
    1
      kate/part/katefiletype.cpp
  81. 1
    1
      kate/part/katehighlight.cpp
  82. 1
    1
      kate/part/katehighlight.h
  83. 2
    2
      kate/part/katejscript.cpp
  84. 1
    1
      kate/part/kateluaindentscript.cpp
  85. 2
    2
      kate/part/kateschema.h
  86. 1
    1
      kate/part/katesyntaxdocument.cpp
  87. 2
    2
      kate/part/kateview.cpp
  88. 1
    1
      kate/part/test_regression.cpp
  89. 1
    1
      kate/plugins/autobookmarker/autobookmarker.cpp
  90. 3
    3
      kate/plugins/insertfile/CMakeLists.txt
  91. 2
    2
      kate/plugins/insertfile/insertfileplugin.cpp
  92. 1
    1
      kate/plugins/isearch/ISearchPlugin.cpp
  93. 2
    2
      kate/plugins/kdatatool/CMakeLists.txt
  94. 1
    1
      kate/plugins/wordcompletion/docwordcompletion.cpp
  95. 0
    41
      kcmshell/CMakeLists.txt
  96. 0
    39
      kcmshell/Makefile.am
  97. 0
    350
      kcmshell/main.cpp
  98. 0
    104
      kcmshell/main.h
  99. 0
    34
      kconf_update/CMakeLists.txt
  100. 0
    0
      kconf_update/Mainpage.dox

+ 9
- 9
CMakeLists.txt View File

@@ -81,7 +81,7 @@ OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
81 81
 OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
82 82
 OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
83 83
 OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
84
-OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
84
+OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
85 85
 OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
86 86
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
87 87
 OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
@@ -745,7 +745,7 @@ endif( )
745 745
 # before altering the LIBR_VERSION check,
746 746
 # please ensure that nothing changed in the
747 747
 # duplicated data definitions present in
748
-# kio/kio/kfileitem.cpp
748
+# tdeio/tdeio/tdefileitem.cpp
749 749
 
750 750
 if( WITH_ELFICON )
751 751
   pkg_search_module( LIBR libr )
@@ -886,7 +886,7 @@ configure_file( config.h.cmake config.h )
886 886
 configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
887 887
 configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
888 888
 configure_file( kjs/global.h.in kjs/global.h )
889
-configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h )
889
+configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )
890 890
 configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
891 891
 
892 892
 
@@ -895,7 +895,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
895 895
 set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl )
896 896
 set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp )
897 897
 set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc )
898
-set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler )
898
+set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/tdeconfig_compiler/tdeconfig_compiler )
899 899
 
900 900
 
901 901
 ##### global compiler settings ##################
@@ -937,7 +937,7 @@ add_subdirectory( tdeui )
937 937
 add_subdirectory( tdesu )
938 938
 add_subdirectory( kjs )
939 939
 add_subdirectory( tdewallet )
940
-add_subdirectory( kio )
940
+add_subdirectory( tdeio )
941 941
 add_subdirectory( kded )
942 942
 
943 943
 # FIXME this directory/target doesn't exists
@@ -962,11 +962,11 @@ if( XRANDR_FOUND )
962 962
   add_subdirectory( tderandr )
963 963
 endif( XRANDR_FOUND )
964 964
 add_subdirectory( tdehtml )
965
-add_subdirectory( kcmshell )
966
-add_subdirectory( kconf_update )
965
+add_subdirectory( tdecmshell )
966
+add_subdirectory( tdeconf_update )
967 967
 add_subdirectory( kdewidgets )
968 968
 add_subdirectory( kimgio )
969
-add_subdirectory( kioslave )
969
+add_subdirectory( tdeioslave )
970 970
 add_subdirectory( kstyles )
971 971
 add_subdirectory( libtdemid )
972 972
 add_subdirectory( libtdescreensaver )
@@ -977,7 +977,7 @@ add_subdirectory( licenses )
977 977
 add_subdirectory( dnssd )
978 978
 add_subdirectory( pics )
979 979
 add_subdirectory( mimetypes )
980
-add_subdirectory( kfile-plugins )
980
+add_subdirectory( tdefile-plugins )
981 981
 
982 982
 
983 983
 ##### install import cmake modules ###############

+ 8
- 8
KDE2PORTING.html View File

@@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.<P>
205 205
   <TD COLSPAN="2">
206 206
     <PRE>
207 207
       #include &lt;kglobal.h&gt;
208
-      #include &lt;kconfig.h&gt;      // Needed to use TDEConfig
208
+      #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
209 209
       #include &lt;klocale.h&gt;      // Needed to use KLocale
210 210
       #include &lt;kiconloader.h&gt;  // Needed to use KIconLoader
211 211
     </PRE>
@@ -501,20 +501,20 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
501 501
 <H3><A NAME="libkfm">libkfm has disappeared</A></H3>
502 502
 
503 503
   Lots of other functionalities have been taken out of kfm, some being
504
-  now in libkio, some in libkonq.<P>
504
+  now in libtdeio, some in libkonq.<P>
505 505
  <STRONG> Replacement table :</STRONG><P>
506 506
 <TABLE BORDER="1">
507 507
 
508
-<TR><TD>KFM::download         </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
508
+<TR><TD>KFM::download         </TD><TD>-&gt; TDEIO::NetAccess::download (tdelibs/tdeio/netaccess.h)</TD></TR>
509 509
 <TR><TD>KFM::removeTempFile   </TD><TD>-&gt; TDEIO::NetAccess::removeTempFile</TD></TR>
510 510
 <TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR>
511 511
 <TR><TD>KFM::configure        </TD><TD>-&gt; see konqueror DCOP interface</TD></TR>
512
-<TR><TD>KFM::openURL          </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
512
+<TR><TD>KFM::openURL          </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/tdeio/krun.h)</TD></TR>
513 513
 <TR><TD>KFM::refreshDirectory </TD><TD>-&gt; not needed anymore since konqy/kdesktop use KDirWatch</TD></TR>
514
-<TR><TD>KFM::openProperties   </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR>
515
-<TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
516
-<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; TDEIO::Job (async, see kio/job.h)<BR>
517
-                            or TDEIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
514
+<TR><TD>KFM::openProperties   </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/tdefile/kpropsdlg.h)</TD></TR>
515
+<TR><TD>KFM::exec             </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/tdeio/krun.h)</TD></TR>
516
+<TR><TD>KFM::copy, KFM::move  </TD><TD>-&gt; TDEIO::Job (async, see tdeio/job.h)<BR>
517
+                            or TDEIO::NetAccess (sync, see tdeio/netaccess.h)</TD></TR>
518 518
 <TR><TD>DlgLocation           </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
519 519
 </TABLE>
520 520
 

+ 8
- 8
KDE3PORTING.html View File

@@ -23,7 +23,7 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
23 23
 <LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
24 24
 <LI><A HREF="#tdespell">Changes in tdespell</A></LI>
25 25
 <LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
26
-<LI><A HREF="#kfile">Changes in kfile</A></LI>
26
+<LI><A HREF="#tdefile">Changes in tdefile</A></LI>
27 27
 <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
28 28
 <LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
29 29
 </UL>
@@ -214,7 +214,7 @@ The preferred means of defining a shortcut, however, is to use <b>KAction</b>.
214 214
 <H4>KIconLoader, KIconTheme</H4>
215 215
 Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments.
216 216
 The change should affect only code using hardcoded numeric values instead of using the proper enum constants.
217
-This applies to classes KIconLoader, KIconTheme and (in kio and kfile) KMimeType, KService, KIconDialog, KIconButton,
217
+This applies to classes KIconLoader, KIconTheme and (in kio and tdefile) KMimeType, KService, KIconDialog, KIconButton,
218 218
 KURLBar and KURLBarItem.
219 219
 
220 220
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -416,7 +416,7 @@ TQString&) is not a slot anymore.
416 416
 
417 417
 <H4>KOpenWithHandler / KFileOpenWithHandler</H4>
418 418
 Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore.
419
-The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has
419
+The merging of libtdeio, libtdesycoca, libtdefile and libkssl into a single libtdeio has
420 420
 allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
421 421
 
422 422
 <H4>KMimeType, KService</H4>
@@ -520,14 +520,14 @@ disable this use a #define KDE_NO_COMPAT.
520 520
 </ul>
521 521
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
522 522
 
523
-<H3><A NAME="kfile">Changes in kfile</A></H3>
524
-The kfile-library, as used by the KFileDialog provides classes for directory browsing widgets.
523
+<H3><A NAME="tdefile">Changes in tdefile</A></H3>
524
+The tdefile-library, as used by the KFileDialog provides classes for directory browsing widgets.
525 525
 Those classes gained some new features, some parts were merged with other existing classes
526
-and in some cases the API was cleaned up/fixed. The library is now built as part of libkio
527
-library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -lkfile).
526
+and in some cases the API was cleaned up/fixed. The library is now built as part of libtdeio
527
+library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -ltdefile).
528 528
 <p>
529 529
 Even if the list of changes is long, the affected code base should be relatively small, as most
530
-parts are rarely used outside of kfile.
530
+parts are rarely used outside of tdefile.
531 531
 <p>
532 532
 The changes are:
533 533
 <H4>KFileItem</H4>

+ 2
- 2
Mainpage.dox View File

@@ -20,8 +20,8 @@
20 20
 	* - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a>
21 21
         *   (<a target="_top" href="kjs/html/classes.html">classes</a>)\n
22 22
 	*   <i>Javascript (aka. ECMAScript and JScript) support.</i>
23
-	* - <a target="_top" href="kio/html/index.html"><b>kio</b></a>
24
-        *   (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n
23
+	* - <a target="_top" href="tdeio/html/index.html"><b>kio</b></a>
24
+        *   (<a target="_top" href="tdeio/tdeio/html/classes.html">classes</a>)\n
25 25
 	*   <i>Low level access to network files. Also provides access to facilities
26 26
 	*   such as KDirWatcher which monitors directories for changes.</i>
27 27
 	* - <a target="_top" href="tdeparts/html/index.html"><b>tdeparts</b></a>

+ 1
- 1
Makefile.am.in View File

@@ -27,7 +27,7 @@ COMPILE_BEFORE_kabc = kab tderesources
27 27
 COMPILE_BEFORE_kate = interfaces tdeutils
28 28
 COMPILE_BEFORE_tdemdi = tdeutils
29 29
 COMPILE_BEFORE_tdespell2 = tdeutils
30
-COMPILE_BEFORE_kcmshell = tdeutils
30
+COMPILE_BEFORE_tdecmshell = tdeutils
31 31
 COMPILE_BEFORE_kdewidgets = kabc tdehtml
32 32
 COMPILE_BEFORE_interfaces = arts kabc
33 33
 

+ 2
- 2
README View File

@@ -42,7 +42,7 @@ Here is an alphabetical list:
42 42
 * tdecert
43 43
     Personal certification manager.
44 44
 
45
-* kconf_update
45
+* tdeconf_update
46 46
     Auto-Updater for config files.
47 47
 
48 48
 * tdecore
@@ -89,7 +89,7 @@ Here is an alphabetical list:
89 89
     contains "tdesycoca", the system configure cache containing services,
90 90
     applications, servicetypes and mimetypes.
91 91
 
92
-* kioslave
92
+* tdeioslave
93 93
     I/O subprocesses to handle files, ftp, http, gzip and bzip2 streams.
94 94
 
95 95
 * kjs

+ 3
- 3
TODO View File

@@ -180,9 +180,9 @@ that we would like to make for the next binary incompatible release.
180 180
 
181 181
 - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
182 182
 
183
-- Make libtdewalletclient part of libkio and get rid of libtdewalletclient.
183
+- Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient.
184 184
 
185
-- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
185
+- Get rid of libtdesu dependency in libtdeio, get rid of SessionData::AuthData*,
186 186
   get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization
187 187
 
188 188
 - Make functions in KHelpMenu virtual so they can be overridden (ex: to provide
@@ -215,7 +215,7 @@ an alternative help->contents action)
215 215
 - Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
216 216
   to merge that code.
217 217
 
218
-- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.
218
+- Refactor the tdeio/bookmarks code so we don't need to use the static d-pointer trick anymore.
219 219
 
220 220
 - Rename the parameters to KDEDesktopMimeType::pixmap so that they use meaningful names rather than
221 221
   just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea

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

@@ -18,8 +18,8 @@ include_directories(
18 18
   ${CMAKE_BINARY_DIR}/tdecore
19 19
   ${CMAKE_SOURCE_DIR}/tdecore
20 20
   ${CMAKE_SOURCE_DIR}/tdeui
21
-  ${CMAKE_SOURCE_DIR}/kio
22
-  ${CMAKE_SOURCE_DIR}/kio/kio
21
+  ${CMAKE_SOURCE_DIR}/tdeio
22
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
23 23
 )
24 24
 
25 25
 link_directories(
@@ -65,6 +65,6 @@ add_custom_command(
65 65
 tde_add_library( ${target} SHARED AUTOMOC
66 66
   SOURCES ${${target}_SRCS}
67 67
   VERSION 1.2.0
68
-  LINK kio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
68
+  LINK tdeio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop
69 69
   DESTINATION ${LIB_INSTALL_DIR}
70 70
 )

+ 3
- 3
arts/kde/kioinputstream_impl.cpp View File

@@ -31,9 +31,9 @@
31 31
 
32 32
 #include <kapplication.h>
33 33
 #include <kdebug.h>
34
-#include <kio/job.h>
35
-#include <kio/kmimetype.h>
36
-#include <kio/jobclasses.h>
34
+#include <tdeio/job.h>
35
+#include <tdeio/kmimetype.h>
36
+#include <tdeio/jobclasses.h>
37 37
 #include <tqtimer.h>
38 38
 #include <tqdatastream.h>
39 39
 #include "artsversion.h"

+ 1
- 1
arts/kde/kioinputstream_impl.h View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <tqobject.h>
26 26
 #include <tqcstring.h>
27
-#include <kio/jobclasses.h>
27
+#include <tdeio/jobclasses.h>
28 28
 #include <kurl.h>
29 29
 #include "artskde.h"
30 30
 #include "stdsynthmodule.h" 

+ 1
- 1
arts/kde/kplayobjectcreator.cc View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 	*/
21 21
 
22
-#include <kio/kmimetype.h>
22
+#include <tdeio/kmimetype.h>
23 23
 #include "artskde.h"
24 24
 #include "kplayobjectcreator.h"
25 25
 #include "kplayobjectcreator.moc"

+ 2
- 2
arts/kde/kplayobjectfactory.cc View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 	*/
21 21
 
22
-#include <kio/kmimetype.h>
22
+#include <tdeio/kmimetype.h>
23 23
 #include "kplayobject.h"
24 24
 #include "artskde.h"
25 25
 #include "kplayobjectfactory.h"
@@ -33,7 +33,7 @@
33 33
 #include <kdebug.h>
34 34
 #include "kaudiomanagerplay.h"
35 35
 #include <flowsystem.h>
36
-#include <kio/netaccess.h>
36
+#include <tdeio/netaccess.h>
37 37
 
38 38
 using namespace std;
39 39
 

+ 1
- 1
arts/knotify/knotify.cpp View File

@@ -50,7 +50,7 @@
50 50
 #include <kartsserver.h>
51 51
 #endif
52 52
 #include <kcmdlineargs.h>
53
-#include <kconfig.h>
53
+#include <tdeconfig.h>
54 54
 #include <kdebug.h>
55 55
 #include <kglobal.h>
56 56
 #include <klocale.h>

+ 4
- 4
configure.in.in View File

@@ -252,9 +252,9 @@ AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
252 252
 AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
253 253
 AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
254 254
 AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
255
-AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
256
-AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
257
-AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
255
+AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
256
+AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la')
257
+AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
258 258
 AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
259 259
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
260 260
 AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.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)/tdecore/kconfig_compiler/kconfig_compiler')
311
+AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_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)/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)'
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)/tdeio -I$(top_srcdir)/tdeio/tdeio -I$(top_srcdir)/tdeio/tdefile -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"

+ 3
- 3
dcop/client/dcopfind.cpp View File

@@ -166,16 +166,16 @@ bool launchApp(TQString app)
166 166
     TQDataStream arg(data, IO_WriteOnly);
167 167
     arg << app << URLs;
168 168
 
169
-    if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
169
+    if ( !dcop->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
170 170
                       data, replyType, replyData) ) {
171
-	tqWarning( "call to klauncher failed.");
171
+	tqWarning( "call to tdelauncher failed.");
172 172
         return false;
173 173
     }
174 174
     TQDataStream reply(replyData, IO_ReadOnly);
175 175
 
176 176
     if ( replyType != "serviceResult" )
177 177
     {
178
-        tqWarning( "unexpected result '%s' from klauncher.", replyType.data());
178
+        tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data());
179 179
         return false;
180 180
     }
181 181
     int result;

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

@@ -49,7 +49,7 @@ void startApp(const char *_app, int argc, const char **args)
49 49
     TQDataStream arg(data, IO_WriteOnly);
50 50
     arg << app << URLs;
51 51
 
52
-    if ( !dcop->call( "klauncher", "klauncher", function,  data, replyType, replyData) ) {
52
+    if ( !dcop->call( "tdelauncher", "tdelauncher", function,  data, replyType, replyData) ) {
53 53
 	tqWarning( "call failed");
54 54
         exit(1);
55 55
     } else {

+ 1
- 1
dcop/dcopidlng/kalyptus View File

@@ -1514,7 +1514,7 @@ sub makeParamList($$$)
1514 1514
 		}
1515 1515
 
1516 1516
 		if (defined $defaultparam && $isEnum) {
1517
-			# Remove any casts in enum values, for example this in kfileitem.h:
1517
+			# Remove any casts in enum values, for example this in tdefileitem.h:
1518 1518
 			#  'enum { Unknown = (mode_t) - 1 };'
1519 1519
 			$defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/;
1520 1520
 		}

+ 1
- 1
dnssd/CMakeLists.txt View File

@@ -45,6 +45,6 @@ tde_add_library( ${target} SHARED AUTOMOC
45 45
   SOURCES ${${target}_SRCS}
46 46
   VERSION 1.0.0
47 47
   LINK tdecore-shared
48
-  DEPENDENCIES kconfig_compiler
48
+  DEPENDENCIES tdeconfig_compiler
49 49
   DESTINATION ${LIB_INSTALL_DIR}
50 50
 )

doc/api/kfiledialog.png → doc/api/tdefiledialog.png View File


+ 0
- 221
doc/tdelibs/man-kbuildsycoca.8.docbook View File

@@ -1,221 +0,0 @@
1
-<?xml version="1.0" ?>
2
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
3
-  <!ENTITY % English "INCLUDE"><!-- change language only here -->
4
-]>
5
-
6
-<refentry>
7
-
8
-<refentryinfo>
9
-
10
-<author>
11
-<firstname>Darian</firstname>
12
-<surname>Lanx</surname>
13
-<affiliation>
14
-<address><email>content@openprojects.net</email></address>
15
-</affiliation>
16
-</author>
17
-
18
-<date>2001-04-25</date>
19
-<releaseinfo>0.01.01</releaseinfo>
20
-
21
-</refentryinfo>
22
-
23
-<refmeta>
24
-<refentrytitle>KBuildSycoca</refentrytitle>
25
-<manvolnum>8</manvolnum>
26
-</refmeta>
27
-
28
-<refnamediv>
29
-<refname>Description</refname>
30
-<refpurpose>Rebuilds the system configuration cache.</refpurpose>
31
-</refnamediv>
32
-
33
-<refsynopsisdiv>
34
-<title>Synopsis</title>
35
-
36
-<cmdsynopsis>
37
-<command>kbuildsycoca</command>
38
-
39
-<group>
40
-<arg choice="opt">--nosignal</arg>
41
-<arg choice="opt">--incremental</arg>
42
-<arg choice="opt">--help</arg>
43
-<arg choice="opt">--help-qt</arg>
44
-<arg choice="opt">--help-kde</arg>
45
-<arg choice="opt">--help-all</arg>
46
-<arg choice="opt">--author</arg>
47
-<arg choice="opt">-v, --version</arg>
48
-<arg choice="opt">--license</arg>
49
-</group>
50
-</cmdsynopsis>
51
-
52
-</refsynopsisdiv>
53
-
54
-<refsect1>
55
-<title>Description</title>
56
-
57
-<para>
58
-<command>kbuildsyscoca</command>, as part of the &tde; command line
59
-tools ensures the proper operation of &tde; by reading in all the
60
-<literal role="extension">.desktop</literal>, <literal
61
-role="extension">.directory</literal>, <literal
62
-role="extension">.kimgio</literal> and <literal
63
-role="extension">.protocol</literal> files to constructs a binary
64
-database. 
65
-</para>
66
-
67
-<para>
68
-&tde; itself accesses this databse during operation to provide
69
-configurational information a program needs to run.
70
-</para>
71
-
72
-<para>
73
-This tool is part of ksyscoca, which stands for &tde; System
74
-Configuration Cache
75
-</para>
76
-
77
-</refsect1>
78
-
79
-<refsect1>
80
-<title>Options</title>
81
-
82
-<variablelist>
83
-<varlistentry>
84
-<term><option>--nosignal</option></term>
85
-<listitem>
86
-<para>Don't signal applications </para>
87
-</listitem>
88
-</varlistentry>
89
-
90
-<varlistentry>
91
-<term><option>--incremental</option></term>
92
-<listitem>
93
-<para>Incremental Update</para>
94
-</listitem>
95
-</varlistentry>
96
-
97
-<!-- this entire section from here to the end of the section could be an -->
98
-<!-- entity.. or maybe just so irrelevant as to leave it out -->
99
-
100
-<varlistentry>
101
-<term><option>--help</option></term>
102
-<listitem>
103
-<para>
104
-Show help about options
105
-</para>
106
-</listitem>
107
-</varlistentry>
108
-
109
-<varlistentry>
110
-<term><option>--help-qt</option></term>
111
-<listitem>
112
-<para>
113
-Show Qt specific options
114
-</para>
115
-</listitem>
116
-</varlistentry>
117
-
118
-<varlistentry>
119
-<term><option>--help-kde</option></term>
120
-<listitem>
121
-<para>
122
-Show KDE specific options
123
-</para>
124
-</listitem>
125
-</varlistentry>
126
-
127
-<varlistentry>
128
-<term><option>--help-all</option></term>
129
-<listitem>
130
-<para>
131
-Show all options
132
-</para>
133
-</listitem>
134
-</varlistentry>
135
-
136
-<varlistentry>
137
-<term><option>--author</option></term>
138
-<listitem>
139
-<para>
140
-Show author information
141
-</para>
142
-</listitem>
143
-</varlistentry>
144
-
145
-<varlistentry>
146
-<term><option>--version</option></term>
147
-<listitem>
148
-<para>
149
-Show version information
150
-</para>
151
-</listitem>
152
-</varlistentry>
153
-
154
-<varlistentry>
155
-<term><option>--license</option></term>
156
-<listitem>
157
-<para>
158
-Show license information
159
-</para>
160
-</listitem>
161
-</varlistentry>
162
-</variablelist>
163
-
164
-</refsect1>
165
-
166
-<refsect1>
167
-<title>Usage</title>
168
-<para>
169
-A standard way to run this program is by simply specifying the following
170
-command at the prompt
171
-<userinput><command>kbuildsyscoca</command></userinput>
172
-</para>
173
-
174
-</refsect1>
175
-
176
-<refsect1>
177
-<title>Files</title>
178
-
179
-<variablelist>
180
-<varlistentry>
181
-<term><filename>/tmp/tde-$USER/ksyscoca</filename></term>
182
-<listitem>
183
-<para>...</para>
184
-</listitem>
185
-</varlistentry>
186
-</variablelist>
187
-
188
-</refsect1>
189
-
190
-<refsect1>
191
-<title>Environment Variables</title>
192
-<variablelist>
193
-<varlistentry>
194
-<term>$<envar>TDEDIRS</envar></term>
195
-<listitem>
196
-<para>Specifies which directories are part of the KDE
197
-installations</para>
198
-</listitem>
199
-</varlistentry>
200
-</variablelist>
201
-
202
-</refsect1>
203
-
204
-<refsect1>
205
-<title>See Also</title>
206
-
207
-<para>tdesycoca(3), kblah(4), knogga(6)</para>
208
-
209
-</refsect1>
210
-
211
-<refsect1>
212
-<title>Bugs</title>
213
-
214
-<para>There are no known bugs at the time of writing.</para>
215
-
216
-</refsect1>
217
-
218
-</refentry>
219
-
220
-
221
-

+ 221
- 0
doc/tdelibs/man-tdebuildsycoca.8.docbook View File

@@ -0,0 +1,221 @@
1
+<?xml version="1.0" ?>
2
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
3
+  <!ENTITY % English "INCLUDE"><!-- change language only here -->
4
+]>
5
+
6
+<refentry>
7
+
8
+<refentryinfo>
9
+
10
+<author>
11
+<firstname>Darian</firstname>
12
+<surname>Lanx</surname>
13
+<affiliation>
14
+<address><email>content@openprojects.net</email></address>
15
+</affiliation>
16
+</author>
17
+
18
+<date>2001-04-25</date>
19
+<releaseinfo>0.01.01</releaseinfo>
20
+
21
+</refentryinfo>
22
+
23
+<refmeta>
24
+<refentrytitle>KBuildSycoca</refentrytitle>
25
+<manvolnum>8</manvolnum>
26
+</refmeta>
27
+
28
+<refnamediv>
29
+<refname>Description</refname>
30
+<refpurpose>Rebuilds the system configuration cache.</refpurpose>
31
+</refnamediv>
32
+
33
+<refsynopsisdiv>
34
+<title>Synopsis</title>
35
+
36
+<cmdsynopsis>
37
+<command>tdebuildsycoca</command>
38
+
39
+<group>
40
+<arg choice="opt">--nosignal</arg>
41
+<arg choice="opt">--incremental</arg>
42
+<arg choice="opt">--help</arg>
43
+<arg choice="opt">--help-qt</arg>
44
+<arg choice="opt">--help-kde</arg>
45
+<arg choice="opt">--help-all</arg>
46
+<arg choice="opt">--author</arg>
47
+<arg choice="opt">-v, --version</arg>
48
+<arg choice="opt">--license</arg>
49
+</group>
50
+</cmdsynopsis>
51
+
52
+</refsynopsisdiv>
53
+
54
+<refsect1>
55
+<title>Description</title>
56
+
57
+<para>
58
+<command>kbuildsyscoca</command>, as part of the &tde; command line
59
+tools ensures the proper operation of &tde; by reading in all the
60
+<literal role="extension">.desktop</literal>, <literal
61
+role="extension">.directory</literal>, <literal
62
+role="extension">.kimgio</literal> and <literal
63
+role="extension">.protocol</literal> files to constructs a binary
64
+database. 
65
+</para>
66
+
67
+<para>
68
+&tde; itself accesses this databse during operation to provide
69
+configurational information a program needs to run.
70
+</para>
71
+
72
+<para>
73
+This tool is part of ksyscoca, which stands for &tde; System
74
+Configuration Cache
75
+</para>
76
+
77
+</refsect1>
78
+
79
+<refsect1>
80
+<title>Options</title>
81
+
82
+<variablelist>
83
+<varlistentry>
84
+<term><option>--nosignal</option></term>
85
+<listitem>
86
+<para>Don't signal applications </para>
87
+</listitem>
88
+</varlistentry>
89
+
90
+<varlistentry>
91
+<term><option>--incremental</option></term>
92
+<listitem>
93
+<para>Incremental Update</para>
94
+</listitem>
95
+</varlistentry>
96
+
97
+<!-- this entire section from here to the end of the section could be an -->
98
+<!-- entity.. or maybe just so irrelevant as to leave it out -->
99
+
100
+<varlistentry>
101
+<term><option>--help</option></term>
102
+<listitem>
103
+<para>
104
+Show help about options
105
+</para>
106
+</listitem>
107
+</varlistentry>
108
+
109
+<varlistentry>
110
+<term><option>--help-qt</option></term>
111
+<listitem>
112
+<para>
113
+Show Qt specific options
114
+</para>
115
+</listitem>
116
+</varlistentry>
117
+
118
+<varlistentry>
119
+<term><option>--help-kde</option></term>
120
+<listitem>
121
+<para>
122
+Show KDE specific options
123
+</para>
124
+</listitem>
125
+</varlistentry>
126
+
127
+<varlistentry>
128
+<term><option>--help-all</option></term>
129
+<listitem>
130
+<para>
131
+Show all options
132
+</para>
133
+</listitem>
134
+</varlistentry>
135
+
136
+<varlistentry>
137
+<term><option>--author</option></term>
138
+<listitem>
139
+<para>
140
+Show author information
141
+</para>
142
+</listitem>
143
+</varlistentry>
144
+
145
+<varlistentry>
146
+<term><option>--version</option></term>
147
+<listitem>
148
+<para>
149
+Show version information
150
+</para>
151
+</listitem>
152
+</varlistentry>
153
+
154
+<varlistentry>
155
+<term><option>--license</option></term>
156
+<listitem>
157
+<para>
158
+Show license information
159
+</para>
160
+</listitem>
161
+</varlistentry>
162
+</variablelist>
163
+
164
+</refsect1>
165
+
166
+<refsect1>
167
+<title>Usage</title>
168
+<para>
169
+A standard way to run this program is by simply specifying the following
170
+command at the prompt
171
+<userinput><command>kbuildsyscoca</command></userinput>
172
+</para>
173
+
174
+</refsect1>
175
+
176
+<refsect1>
177
+<title>Files</title>
178
+
179
+<variablelist>
180
+<varlistentry>
181
+<term><filename>/tmp/tde-$USER/ksyscoca</filename></term>
182
+<listitem>
183
+<para>...</para>
184
+</listitem>
185
+</varlistentry>
186
+</variablelist>
187
+
188
+</refsect1>
189
+
190
+<refsect1>
191
+<title>Environment Variables</title>
192
+<variablelist>
193
+<varlistentry>
194
+<term>$<envar>TDEDIRS</envar></term>
195
+<listitem>
196
+<para>Specifies which directories are part of the KDE
197
+installations</para>
198
+</listitem>
199
+</varlistentry>
200
+</variablelist>
201
+
202
+</refsect1>
203
+
204
+<refsect1>
205
+<title>See Also</title>
206
+
207
+<para>tdesycoca(3), kblah(4), knogga(6)</para>
208
+
209
+</refsect1>
210
+
211
+<refsect1>
212
+<title>Bugs</title>
213
+
214
+<para>There are no known bugs at the time of writing.</para>
215
+
216
+</refsect1>
217
+
218
+</refentry>
219
+
220
+
221
+

+ 1
- 1
interfaces/kio/CMakeLists.txt View File

@@ -13,5 +13,5 @@
13 13
 
14 14
 install( FILES
15 15
     http.h
16
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
16
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
17 17
 

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

@@ -1,3 +1,3 @@
1
-kioincludedir = $(includedir)/kio
1
+kioincludedir = $(includedir)/tdeio
2 2
 kioinclude_HEADERS = http.h
3 3
 

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

@@ -1,6 +1,6 @@
1 1
 # $Id$
2 2
 
3
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
3
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
4 4
 
5 5
 include_HEADERS = kregexpeditorinterface.h
6 6
 

+ 2
- 2
interfaces/tdeimproxy/library/CMakeLists.txt View File

@@ -18,7 +18,7 @@ include_directories(
18 18
   ${CMAKE_SOURCE_DIR}/dcop
19 19
   ${CMAKE_SOURCE_DIR}/tdecore
20 20
   ${CMAKE_SOURCE_DIR}/tdeui
21
-  ${CMAKE_SOURCE_DIR}/kio/kio
21
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
22 22
 )
23 23
 
24 24
 link_directories(
@@ -45,7 +45,7 @@ set( ${target}_SRCS
45 45
 tde_add_library( ${target} SHARED AUTOMOC
46 46
   SOURCES ${${target}_SRCS}
47 47
   VERSION 0.0.0
48
-  LINK kio-shared
48
+  LINK tdeio-shared
49 49
   DESTINATION ${LIB_INSTALL_DIR}
50 50
   DEPENDENCIES dcopidl
51 51
 )

+ 1
- 1
interfaces/tdemediaplayer/CMakeLists.txt View File

@@ -10,7 +10,7 @@
10 10
 #################################################
11 11
 
12 12
 if( ARTS_FOUND )
13
-  add_subdirectory( kfileaudiopreview )
13
+  add_subdirectory( tdefileaudiopreview )
14 14
 endif( ARTS_FOUND )
15 15
 
16 16
 include_directories(

+ 2
- 2
interfaces/tdemediaplayer/Makefile.am View File

@@ -1,8 +1,8 @@
1 1
 if include_ARTS
2
-kfileaudiopreview_subdir = kfileaudiopreview
2
+tdefileaudiopreview_subdir = tdefileaudiopreview
3 3
 endif
4 4
 
5
-SUBDIRS = . $(kfileaudiopreview_subdir)
5
+SUBDIRS = . $(tdefileaudiopreview_subdir)
6 6
 INCLUDES = -I$(srcdir)/.. $(all_includes)
7 7
 
8 8
 lib_LTLIBRARIES = libtdemediaplayer.la

+ 0
- 46
interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt View File

@@ -1,46 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010 Serghei Amelian
4
-#  serghei (DOT) amelian (AT) gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${TQT_INCLUDE_DIRS}
14
-  ${ARTS_INCLUDE_DIRS}
15
-  ${CMAKE_CURRENT_BINARY_DIR}
16
-  ${CMAKE_BINARY_DIR}/tdecore
17
-  ${CMAKE_SOURCE_DIR}
18
-  ${CMAKE_SOURCE_DIR}/dcop
19
-  ${CMAKE_SOURCE_DIR}/interfaces
20
-  ${CMAKE_SOURCE_DIR}/tdecore
21
-  ${CMAKE_SOURCE_DIR}/tdeui
22
-  ${CMAKE_SOURCE_DIR}/kio
23
-  ${CMAKE_SOURCE_DIR}/kio/kio
24
-  ${CMAKE_SOURCE_DIR}/kio/kfile
25
-  ${CMAKE_SOURCE_DIR}/arts/kde
26
-)
27
-
28
-link_directories(
29
-  ${TQT_LIBRARY_DIRS}
30
-  ${ARTS_LIBRARY_DIRS}
31
-)
32
-
33
-
34
-##### kfileaudiopreview #########################
35
-
36
-set( target kfileaudiopreview )
37
-
38
-set( ${target}_SRCS
39
-  kfileaudiopreview.cpp
40
-)
41
-
42
-tde_add_kpart( ${target} AUTOMOC
43
-  SOURCES ${${target}_SRCS}
44
-  LINK tdemediaplayer-shared artskde-shared
45
-  DESTINATION ${PLUGIN_INSTALL_DIR}
46
-)

+ 0
- 13
interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am View File

@@ -1,13 +0,0 @@
1
-INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
2
-METASOURCES = AUTO
3
-
4
-kde_module_LTLIBRARIES = kfileaudiopreview.la
5
-
6
-kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
7
-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
8
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
9
-
10
-noinst_HEADERS = kfileaudiopreview.h
11
-
12
-messages:
13
-	$(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot

+ 0
- 146
interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp View File

@@ -1,146 +0,0 @@
1
-#include "kfileaudiopreview.h"
2
-
3
-#include <tqcheckbox.h>
4
-#include <tqhbox.h>
5
-#include <tqlayout.h>
6
-#include <tqvgroupbox.h>
7
-
8
-#include <kglobal.h>
9
-#include <kconfig.h>
10
-#include <klibloader.h>
11
-#include <klocale.h>
12
-#include <tdemediaplayer/player.h>
13
-#include <kmimetype.h>
14
-#include <tdeparts/componentfactory.h>
15
-
16
-#include <kplayobjectfactory.h>
17
-
18
-#include <config-kfile.h>
19
-
20
-class KFileAudioPreviewFactory : public KLibFactory
21
-{
22
-protected:
23
-    virtual TQObject *createObject( TQObject *parent, const char *name,
24
-                           const char *className, const TQStringList & args)
25
-    {
26
-        Q_UNUSED(className);
27
-        Q_UNUSED(args);
28
-        return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
29
-    }
30
-};
31
-
32
-K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory )
33
-
34
-
35
-///////////////////////////////////////////////////////////////////
36
-///////////////////////////////////////////////////////////////////
37
-
38
-
39
-class KFileAudioPreview::KFileAudioPreviewPrivate
40
-{
41
-public:
42
-    KFileAudioPreviewPrivate( TQWidget *parent )
43
-    {
44
-        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
45
-    }
46
-
47
-    ~KFileAudioPreviewPrivate()
48
-    {
49
-        delete player;
50
-    }
51
-
52
-    KMediaPlayer::Player *player;
53
-};
54
-
55
-
56
-KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
57
-    : KPreviewWidgetBase( parent, name )
58
-{
59
-    TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");    
60
-
61
-    TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
62
-    // ###
63
-    TQStringList::ConstIterator it = formats.begin();
64
-    for ( ; it != formats.end(); ++it )
65
-        m_supportedFormats.insert( *it, (void*) 1 );
66
-
67
-    TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this );
68
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
69
-    layout->addWidget( box );
70
-
71
-    (void) new TQWidget( box ); // spacer
72
-
73
-    d = new KFileAudioPreviewPrivate( 0L ); // not box -- being reparented anyway
74
-    if ( d->player ) // only if there actually is a component...
75
-    {
76
-        setSupportedMimeTypes( formats );
77
-        KMediaPlayer::View *view = d->player->view();
78
-        view->setEnabled( false );
79
-
80
-        // if we have access to the video widget, show it above the player
81
-        // So, reparent first the video widget, then the view.
82
-        if ( view->videoWidget() )
83
-        {
84
-            TQHBox *frame = new TQHBox( box );
85
-            frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
86
-            frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
87
-            view->videoWidget()->reparent( frame, TQPoint(0,0) );
88
-        }
89
-
90
-        view->reparent( box, TQPoint(0,0) );
91
-    }
92
-
93
-    m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
94
-    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
95
-    m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
96
-    connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
97
-}
98
-
99
-KFileAudioPreview::~KFileAudioPreview()
100
-{
101
-    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
102
-    config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
103
-
104
-    delete d;
105
-}
106
-
107
-void KFileAudioPreview::showPreview( const KURL &url )
108
-{
109
-    if ( !d->player || !url.isValid() )
110
-        return;
111
-
112
-    KMimeType::Ptr mt = KMimeType::findByURL( url );
113
-    bool supported = m_supportedFormats.find( mt->name() );
114
-    d->player->view()->setEnabled( supported );
115
-    if ( !supported )
116
-        return;
117
-
118
-    static_cast<KParts::ReadOnlyPart*>(d->player)->openURL( url );
119
-    if ( m_autoPlay->isChecked() )
120
-        d->player->play();
121
-}
122
-
123
-void KFileAudioPreview::clearPreview()
124
-{
125
-    if ( d->player )
126
-    {
127
-        d->player->stop();
128
-        d->player->closeURL();
129
-    }
130
-}
131
-
132
-void KFileAudioPreview::toggleAuto( bool on )
133
-{
134
-    if ( !d->player )
135
-        return;
136
-
137
-    if ( on && m_currentURL.isValid() && d->player->view()->isEnabled() )
138
-        d->player->play();
139
-    else
140
-        d->player->stop();
141
-}
142
-
143
-void KFileAudioPreview::virtual_hook( int, void* )
144
-{}
145
-
146
-#include "kfileaudiopreview.moc"

+ 46
- 0
interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt View File

@@ -0,0 +1,46 @@
1
+#################################################
2
+#
3
+#  (C) 2010 Serghei Amelian
4
+#  serghei (DOT) amelian (AT) gmail.com
5
+#
6
+#  Improvements and feedback are welcome
7
+#
8
+#  This file is released under GPL >= 2
9
+#
10
+#################################################
11
+
12
+include_directories(
13
+  ${TQT_INCLUDE_DIRS}
14
+  ${ARTS_INCLUDE_DIRS}
15
+  ${CMAKE_CURRENT_BINARY_DIR}
16
+  ${CMAKE_BINARY_DIR}/tdecore
17
+  ${CMAKE_SOURCE_DIR}
18
+  ${CMAKE_SOURCE_DIR}/dcop
19
+  ${CMAKE_SOURCE_DIR}/interfaces
20
+  ${CMAKE_SOURCE_DIR}/tdecore
21
+  ${CMAKE_SOURCE_DIR}/tdeui
22
+  ${CMAKE_SOURCE_DIR}/tdeio
23
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
24
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
25
+  ${CMAKE_SOURCE_DIR}/arts/kde
26
+)
27
+
28
+link_directories(
29
+  ${TQT_LIBRARY_DIRS}
30
+  ${ARTS_LIBRARY_DIRS}
31
+)
32
+
33
+
34
+##### tdefileaudiopreview #########################
35
+
36
+set( target tdefileaudiopreview )
37
+
38
+set( ${target}_SRCS
39
+  tdefileaudiopreview.cpp
40
+)
41
+
42
+tde_add_kpart( ${target} AUTOMOC
43
+  SOURCES ${${target}_SRCS}
44
+  LINK tdemediaplayer-shared artskde-shared
45
+  DESTINATION ${PLUGIN_INSTALL_DIR}
46
+)

+ 13
- 0
interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am View File

@@ -0,0 +1,13 @@
1
+INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
2
+METASOURCES = AUTO
3
+
4
+kde_module_LTLIBRARIES = tdefileaudiopreview.la
5
+
6
+tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
7
+tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
8
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
9
+
10
+noinst_HEADERS = tdefileaudiopreview.h
11
+
12
+messages:
13
+	$(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot

+ 146
- 0
interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp View File

@@ -0,0 +1,146 @@
1
+#include "tdefileaudiopreview.h"
2
+
3
+#include <tqcheckbox.h>
4
+#include <tqhbox.h>
5
+#include <tqlayout.h>
6
+#include <tqvgroupbox.h>
7
+
8
+#include <kglobal.h>
9
+#include <tdeconfig.h>
10
+#include <klibloader.h>
11
+#include <klocale.h>
12
+#include <tdemediaplayer/player.h>
13
+#include <kmimetype.h>
14
+#include <tdeparts/componentfactory.h>
15
+
16
+#include <kplayobjectfactory.h>
17
+
18
+#include <config-tdefile.h>
19
+
20
+class KFileAudioPreviewFactory : public KLibFactory
21
+{
22
+protected:
23
+    virtual TQObject *createObject( TQObject *parent, const char *name,
24
+                           const char *className, const TQStringList & args)
25
+    {
26
+        Q_UNUSED(className);
27
+        Q_UNUSED(args);
28
+        return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
29
+    }
30
+};
31
+
32
+K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory )
33
+
34
+
35
+///////////////////////////////////////////////////////////////////
36
+///////////////////////////////////////////////////////////////////
37
+
38
+
39
+class KFileAudioPreview::KFileAudioPreviewPrivate
40
+{
41
+public:
42
+    KFileAudioPreviewPrivate( TQWidget *parent )
43
+    {
44
+        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
45
+    }
46
+
47
+    ~KFileAudioPreviewPrivate()
48
+    {
49
+        delete player;
50
+    }
51
+
52
+    KMediaPlayer::Player *player;
53
+};
54
+
55
+
56
+KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
57
+    : KPreviewWidgetBase( parent, name )
58
+{
59
+    TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");    
60
+
61
+    TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
62
+    // ###
63
+    TQStringList::ConstIterator it = formats.begin();
64
+    for ( ; it != formats.end(); ++it )
65
+        m_supportedFormats.insert( *it, (void*) 1 );
66
+
67
+    TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this );
68
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
69
+    layout->addWidget( box );
70
+
71
+    (void) new TQWidget( box ); // spacer
72
+
73
+    d = new KFileAudioPreviewPrivate( 0L ); // not box -- being reparented anyway
74
+    if ( d->player ) // only if there actually is a component...
75
+    {
76
+        setSupportedMimeTypes( formats );
77
+        KMediaPlayer::View *view = d->player->view();
78
+        view->setEnabled( false );
79
+
80
+        // if we have access to the video widget, show it above the player
81
+        // So, reparent first the video widget, then the view.
82
+        if ( view->videoWidget() )
83
+        {
84
+            TQHBox *frame = new TQHBox( box );
85
+            frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
86
+            frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
87
+            view->videoWidget()->reparent( frame, TQPoint(0,0) );
88
+        }
89
+
90
+        view->reparent( box, TQPoint(0,0) );
91
+    }
92
+
93
+    m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
94
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
95
+    m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
96
+    connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
97
+}
98
+
99
+KFileAudioPreview::~KFileAudioPreview()
100
+{
101
+    TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
102
+    config.writeEntry( "Autoplay sounds", m_autoPlay->isChecked() );
103
+
104
+    delete d;
105
+}
106
+
107
+void KFileAudioPreview::showPreview( const KURL &url )
108
+{
109
+    if ( !d->player || !url.isValid() )
110
+        return;
111
+
112
+    KMimeType::Ptr mt = KMimeType::findByURL( url );
113
+    bool supported = m_supportedFormats.find( mt->name() );
114
+    d->player->view()->setEnabled( supported );
115
+    if ( !supported )
116
+        return;
117
+
118
+    static_cast<KParts::ReadOnlyPart*>(d->player)->openURL( url );
119
+    if ( m_autoPlay->isChecked() )
120
+        d->player->play();
121
+}
122
+
123
+void KFileAudioPreview::clearPreview()
124
+{
125
+    if ( d->player )
126
+    {
127
+        d->player->stop();
128
+        d->player->closeURL();
129
+    }
130
+}
131
+
132
+void KFileAudioPreview::toggleAuto( bool on )
133
+{
134
+    if ( !d->player )
135
+        return;
136
+
137
+    if ( on && m_currentURL.isValid() && d->player->view()->isEnabled() )
138
+        d->player->play();
139
+    else
140
+        d->player->stop();
141
+}
142
+
143
+void KFileAudioPreview::virtual_hook( int, void* )
144
+{}
145
+
146
+#include "tdefileaudiopreview.moc"

interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h → interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h View File


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

@@ -19,8 +19,8 @@ include_directories(
19 19
   ${CMAKE_SOURCE_DIR}
20 20
   ${CMAKE_SOURCE_DIR}/tdecore
21 21
   ${CMAKE_SOURCE_DIR}/tdeui
22
-  ${CMAKE_SOURCE_DIR}/kio
23
-  ${CMAKE_SOURCE_DIR}/kio/kio
22
+  ${CMAKE_SOURCE_DIR}/tdeio
23
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
24 24
 )
25 25
 
26 26
 link_directories(
@@ -51,6 +51,6 @@ set( ${target}_SRCS
51 51
 tde_add_library( ${target} SHARED AUTOMOC
52 52
   SOURCES ${${target}_SRCS}
53 53
   VERSION 0.0.0
54
-  LINK kio-shared
54
+  LINK tdeio-shared
55 55
   DESTINATION ${LIB_INSTALL_DIR}
56 56
 )

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

@@ -1,6 +1,6 @@
1 1
 SUBDIRS = . sample
2 2
 
3
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
3
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
4 4
 
5 5
 #lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
6 6
 lib_LTLIBRARIES = libtdescript.la

+ 1
- 1
interfaces/tdescript/sample/Makefile.am View File

@@ -1,4 +1,4 @@
1
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
1
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
2 2
 
3 3
 kde_module_LTLIBRARIES = libshellscript.la
4 4
 

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

@@ -23,7 +23,7 @@
23 23
 #include <tdeparts/componentfactory.h>
24 24
 #include <kglobal.h>
25 25
 #include <klocale.h>
26
-#include <kconfig.h>
26
+#include <tdeconfig.h>
27 27
 #include <kdesktopfile.h>
28 28
 #include <kstandarsdirs.h>
29 29
 #include <kstdaccel.h>

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

@@ -20,8 +20,8 @@ include_directories(
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21 21
   ${CMAKE_SOURCE_DIR}/tdecore
22 22
   ${CMAKE_SOURCE_DIR}/tdeui
23
-  ${CMAKE_SOURCE_DIR}/kio
24
-  ${CMAKE_SOURCE_DIR}/kio/kio
23
+  ${CMAKE_SOURCE_DIR}/tdeio
24
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
25 25
   ${CMAKE_SOURCE_DIR}/kabc
26 26
   ${CMAKE_SOURCE_DIR}/interfaces
27 27
 )

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

@@ -1,4 +1,4 @@
1
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
1
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces  -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
2 2
 
3 3
 lib_LTLIBRARIES = libtdetexteditor.la
4 4
 

+ 1
- 1
interfaces/tdetexteditor/configinterface.h View File

@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT ConfigInterface
57 57
     virtual void writeConfig () = 0;           
58 58
                                                                          
59 59
     /**
60
-      Read/Write the config of the part to a given kconfig object
60
+      Read/Write the config of the part to a given tdeconfig object
61 61
       to store the settings in a different place than the standard
62 62
     */
63 63
     virtual void readConfig (TDEConfig *) = 0;

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

@@ -3,7 +3,7 @@
3 3
 
4 4
 #include <tqcombobox.h>
5 5
 #include <ktrader.h>
6
-#include <kconfig.h>
6
+#include <tdeconfig.h>
7 7
 #include <tqstringlist.h>
8 8
 #include <kservice.h>
9 9
 #include <klocale.h>

+ 7
- 7
kabc/CMakeLists.txt View File

@@ -29,8 +29,8 @@ include_directories(
29 29
   ${CMAKE_SOURCE_DIR}/dcop
30 30
   ${CMAKE_SOURCE_DIR}/tdecore
31 31
   ${CMAKE_SOURCE_DIR}/tdeui
32
-  ${CMAKE_SOURCE_DIR}/kio
33
-  ${CMAKE_SOURCE_DIR}/kio/kio
32
+  ${CMAKE_SOURCE_DIR}/tdeio
33
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
34 34
   ${CMAKE_SOURCE_DIR}/kab
35 35
 )
36 36
 
@@ -58,7 +58,7 @@ install( FILES
58 58
 
59 59
 ##### other data ################################
60 60
 
61
-install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
61
+install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
62 62
 install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
63 63
 install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
64 64
 
@@ -102,18 +102,18 @@ set( ${target}_SRCS
102 102
 tde_add_library( ${target} SHARED AUTOMOC
103 103
   SOURCES ${${target}_SRCS}
104 104
   VERSION 1.2.0
105
-  LINK vcards-static vcard-shared kio-shared tderesources-shared
105
+  LINK vcards-static vcard-shared tdeio-shared tderesources-shared
106 106
   DEPENDENCIES addressee.h dcopidl
107 107
   DESTINATION ${LIB_INSTALL_DIR}
108 108
 )
109 109
 
110 110
 
111
-##### kab2kabc ##################################
111
+##### tdeab2tdeabc ##################################
112 112
 
113
-set( target kab2kabc )
113
+set( target tdeab2tdeabc )
114 114
 
115 115
 set( ${target}_SRCS
116
-  kab2kabc.cpp
116
+  tdeab2tdeabc.cpp
117 117
 )
118 118
 
119 119
 tde_add_executable( ${target}

+ 5
- 5
kabc/Makefile.am View File

@@ -50,13 +50,13 @@ kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
50 50
 
51 51
 METASOURCES = AUTO
52 52
 
53
-bin_PROGRAMS = kab2kabc
53
+bin_PROGRAMS = tdeab2tdeabc
54 54
 
55
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
56
-kab2kabc_LDADD = libkabc.la ../kab/libkab.la
57
-kab2kabc_SOURCES = kab2kabc.cpp
55
+tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
56
+tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la
57
+tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
58 58
 
59
-autostart_DATA = kab2kabc.desktop
59
+autostart_DATA = tdeab2tdeabc.desktop
60 60
 autostartdir = $(datadir)/autostart
61 61
 
62 62
 manager_DATA = kabc_manager.desktop

+ 1
- 1
kabc/addresseehelper.cpp View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 #include <tqapplication.h>
21 21
 
22
-#include <kconfig.h>
22
+#include <tdeconfig.h>
23 23
 #include <klocale.h>
24 24
 
25 25
 #include "addresseehelper.h"

+ 1
- 1
kabc/addresslineedit.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <tqdragobject.h>
34 34
 
35 35
 #include <kcompletionbox.h>
36
-#include <kconfig.h>
36
+#include <tdeconfig.h>
37 37
 #include <kcursor.h>
38 38
 #include <kstandarddirs.h>
39 39
 #include <kstaticdeleter.h>

+ 1
- 1
kabc/formatfactory.h View File

@@ -24,7 +24,7 @@
24 24
 #include <tqdict.h>
25 25
 #include <tqstring.h>
26 26
 
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <klibloader.h>
29 29
 
30 30
 #include "formatplugin.h"

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

@@ -18,8 +18,8 @@ include_directories(
18 18
   ${CMAKE_SOURCE_DIR}
19 19
   ${CMAKE_SOURCE_DIR}/dcop
20 20
   ${CMAKE_SOURCE_DIR}/tdecore
21
-  ${CMAKE_SOURCE_DIR}/kio
22
-  ${CMAKE_SOURCE_DIR}/kio/kio
21
+  ${CMAKE_SOURCE_DIR}/tdeio
22
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
23 23
 )
24 24
 
25 25
 link_directories(

+ 0
- 476
kabc/kab2kabc.cpp View File

@@ -1,476 +0,0 @@
1
-/*
2
-    This file is part of libkabc.
3
-    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4
-
5
-    This library is free software; you can redistribute it and/or
6
-    modify it under the terms of the GNU Library General Public
7
-    License as published by the Free Software Foundation; either
8
-    version 2 of the License, or (at your option) any later version.
9
-
10
-    This library is distributed in the hope that it will be useful,
11
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
12
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
-    Library General Public License for more details.
14
-
15
-    You should have received a copy of the GNU Library General Public License
16
-    along with this library; see the file COPYING.LIB.  If not, write to
17
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18
-    Boston, MA 02110-1301, USA.
19
-*/
20
-
21
-#include <tqfile.h>
22
-#include <tqtextstream.h>
23
-
24
-#include <kabapi.h>
25
-#include <kaboutdata.h>
26
-#include <kapplication.h>
27
-#include <kcmdlineargs.h>
28
-#include <kconfig.h>
29
-#include <kdebug.h>
30
-#include <kglobal.h>
31
-#include <klocale.h>
32
-#include <kmessagebox.h>
33
-#include <kstandarddirs.h>
34
-
35
-#include "addressbook.h"
36
-#include "stdaddressbook.h"
37
-
38
-using namespace KABC;
39
-
40
-static const KCmdLineOptions options[] =
41
-{
42
-  { "disable-autostart", I18N_NOOP( "Disable automatic startup on login" ), 0 },
43
-  { "quiet", "", 0 },
44
-  { "o", 0, 0 },
45
-  { "override", I18N_NOOP( "Override existing entries" ), "1" },
46
-  KCmdLineLastOption
47
-};
48
-
49
-void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
50
-{
51
-  kdDebug() << "KMAILENTRY: " << kmailEntry << endl;
52
-
53
-  TQString entry = kmailEntry.simplifyWhiteSpace();
54
-  if ( entry.isEmpty() ) return;
55
-
56
-  TQString email;
57
-  TQString name;
58
-  TQString comment;
59
-
60
-  if ( entry.at( entry.length() -1 ) == ')' ) {
61
-    int br = entry.findRev( '(' );
62
-    if ( br >= 0 ) {
63
-      comment = entry.mid( br + 1, entry.length() - br - 2 );
64
-      entry.truncate( br );
65
-      if ( entry.at( entry.length() - 1 ).isSpace() ) {
66
-        entry.truncate( br - 1 );
67
-      }
68
-    }
69
-  }
70
-
71
-  int posSpace = entry.findRev( ' ' );
72
-  if ( posSpace < 0 ) {
73
-    email = entry;
74
-    if ( !comment.isEmpty() ) {
75
-      name = comment;
76
-      comment = "";
77
-    }
78
-  } else {
79
-    email = entry.mid( posSpace + 1 );
80
-    name = entry.left( posSpace );
81
-  }
82
-
83
-  if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) {
84
-    email = email.mid( 1, email.length() - 2 );
85
-  }
86
-  if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) {
87
-    name = name.mid( 1, name.length() - 2 );
88
-  }
89
-  if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) {
90
-    name = name.mid( 1, name.length() - 2 );
91
-  }
92
-
93
-  if ( name.at( name.length() -1 ) == ')' ) {
94
-    int br = name.findRev( '(' );
95
-    if ( br >= 0 ) {
96
-      comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
97
-      name.truncate( br );
98
-      if ( name.at( name.length() - 1 ).isSpace() ) {
99
-        name.truncate( br - 1 );
100
-      }
101
-    }
102
-  }
103
-
104
-  kdDebug() << "  EMAIL   : " << email   << endl;
105
-  kdDebug() << "  NAME    : " << name    << endl;
106
-  kdDebug() << "  COMMENT : " << comment << endl;
107
-
108
-  KABC::Addressee::List al = ab->findByEmail( email );
109
-  if ( al.isEmpty() ) {
110
-    KABC::Addressee a;
111
-    a.setNameFromString( name );
112
-    a.insertEmail( email );
113
-    a.setNote( comment );
114
-
115
-    ab->insertAddressee( a );
116
-
117
-    kdDebug() << "--INSERTED: " << a.realName() << endl;
118
-  }
119
-}
120
-
121
-void importKMailAddressBook( KABC::AddressBook *ab )
122
-{
123
-  TQString fileName = locateLocal( "data", "kmail/addressbook" );
124
-  TQString kmailConfigName = locate( "config", "kmailrc" );
125
-  if ( !kmailConfigName.isEmpty() ) {
126
-    TDEConfig cfg( kmailConfigName );
127
-    cfg.setGroup( "Addressbook" );
128
-    fileName = cfg.readPathEntry( "default", fileName );
129
-  }
130
-  if ( !KStandardDirs::exists( fileName ) ) {
131
-    kdDebug(5700) << "Couldn't find KMail addressbook." << endl;
132
-    return;
133
-  }
134
-
135
-  TQFile f( fileName );
136
-  if ( !f.open(IO_ReadOnly) ) {
137
-    kdDebug(5700) << "Couldn't open file '" << fileName << "'" << endl;
138
-    return;
139
-  }
140
-
141
-  TQStringList kmailEntries;
142
-
143
-  TQTextStream t( &f );
144
-  while ( !t.eof() ) {
145
-    kmailEntries.append( t.readLine() );
146
-  }
147
-  f.close();
148
-
149
-  TQStringList::ConstIterator it;
150
-  for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) {
151
-    if ( (*it).at( 0 ) == '#' ) continue;
152
-    bool insideQuote = false;
153
-    int end = (*it).length() - 1;
154
-    for ( int i = end; i; i-- ) {
155
-      if ( (*it).at( i ) == '"' ) {
156
-        if ( insideQuote )
157
-          insideQuote = false;
158
-        else
159
-          insideQuote = true;
160
-      } else if ( (*it).at( i ) == ',' && !insideQuote ) {
161
-        readKMailEntry( (*it).mid( i + 1, end - i ), ab );
162
-        end = i - 1;
163
-      }
164
-    }
165
-
166
-    readKMailEntry( (*it).mid( 0, end + 1 ), ab );
167
-  }
168
-}
169
-
170
-void readKAddressBookEntries( const TQString &dataString, Addressee &a )
171
-{
172
-  // Strip "KMail:1.0" prefix and "[EOS]" suffix.
173
-  TQString str = dataString.mid( 11, dataString.length() - 24 );
174
-
175
-  TQStringList entries = TQStringList::split( "\n[EOR]\n ", str );
176
-
177
-  Address homeAddress( Address::Home );
178
-  Address businessAddress( Address::Work );
179
-  Address otherAddress;
180
-
181
-  TQStringList::ConstIterator it;
182
-  for ( it = entries.begin(); it != entries.end(); ++it ) {
183
-    int pos = (*it).find( "\n" );
184
-    TQString fieldName = (*it).left( pos );
185
-    TQString fieldValue = (*it).mid( pos + 2 );
186
-
187
-    if ( fieldName == "X-HomeFax" ) {
188
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home |
189
-                                                    PhoneNumber::Fax ) );
190
-    } else if ( fieldName == "X-OtherPhone" ) {
191
-      a.insertPhoneNumber( PhoneNumber( fieldValue, 0 ) );
192
-    } else if ( fieldName == "X-PrimaryPhone" ) {
193
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Pref ) );
194
-    } else if ( fieldName == "X-BusinessFax" ) {
195
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Work |
196
-                                                    PhoneNumber::Fax ) );
197
-    } else if ( fieldName == "X-CarPhone" ) {
198
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Car ) );
199
-    } else if ( fieldName == "X-MobilePhone" ) {
200
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Cell ) );
201
-    } else if ( fieldName == "X-ISDN" ) {
202
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Isdn ) );
203
-    } else if ( fieldName == "X-OtherFax" ) {
204
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Fax ) );
205
-    } else if ( fieldName == "X-Pager" ) {
206
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Pager ) );
207
-    } else if ( fieldName == "X-BusinessPhone" ) {
208
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Work ) );
209
-    } else if ( fieldName == "X-HomePhone" ) {
210
-      a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home ) );
211
-    } else if ( fieldName == "X-HomeAddress" ) {
212
-      homeAddress.setLabel( fieldValue );
213
-    } else if ( fieldName == "X-HomeAddressStreet" ) {
214
-      homeAddress.setStreet( fieldValue );
215
-    } else if ( fieldName == "X-HomeAddressCity" ) {
216
-      homeAddress.setLocality( fieldValue );
217
-    } else if ( fieldName == "X-HomeAddressPostalCode" ) {
218
-      homeAddress.setPostalCode( fieldValue );
219
-    } else if ( fieldName == "X-HomeAddressState" ) {
220
-      homeAddress.setRegion( fieldValue );
221
-    } else if ( fieldName == "X-HomeAddressCountry" ) {
222
-      homeAddress.setCountry( fieldValue );
223
-    } else if ( fieldName == "X-BusinessAddress" ) {
224
-      businessAddress.setLabel( fieldValue );
225
-    } else if ( fieldName == "X-BusinessAddressStreet" ) {
226
-      businessAddress.setStreet( fieldValue );
227
-    } else if ( fieldName == "X-BusinessAddressCity" ) {
228
-      businessAddress.setLocality( fieldValue );
229
-    } else if ( fieldName == "X-BusinessAddressPostalCode" ) {
230
-      businessAddress.setPostalCode( fieldValue );
231
-    } else if ( fieldName == "X-BusinessAddressState" ) {
232
-      businessAddress.setRegion( fieldValue );
233
-    } else if ( fieldName == "X-BusinessAddressCountry" ) {
234
-      businessAddress.setCountry( fieldValue );
235
-    } else if ( fieldName == "X-OtherAddress" ) {
236
-      otherAddress.setLabel( fieldValue );
237
-    } else if ( fieldName == "X-OtherAddressStreet" ) {
238
-      otherAddress.setStreet( fieldValue );
239
-    } else if ( fieldName == "X-OtherAddressCity" ) {
240
-      otherAddress.setLocality( fieldValue );
241
-    } else if ( fieldName == "X-OtherAddressPostalCode" ) {
242
-      otherAddress.setPostalCode( fieldValue );
243
-    } else if ( fieldName == "X-OtherAddressState" ) {
244
-      otherAddress.setRegion( fieldValue );
245
-    } else if ( fieldName == "X-OtherAddressCountry" ) {
246
-      otherAddress.setCountry( fieldValue );
247
-    } else if ( fieldName == "NICKNAME" ) {
248
-      a.setNickName( fieldValue );
249
-    } else if ( fieldName == "ORG" ) {
250
-      a.setOrganization( fieldValue );
251
-    } else if ( fieldName == "ROLE" ) {
252
-      a.setRole( fieldValue );
253
-    } else if ( fieldName == "BDAY" ) {
254
-      a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) );
255
-    } else if ( fieldName == "WEBPAGE" ) {
256
-      a.setUrl( KURL( fieldValue ) );
257
-    } else if ( fieldName == "N" ) {
258
-    } else if ( fieldName == "X-FirstName" ) {
259
-    } else if ( fieldName == "X-MiddleName" ) {
260
-    } else if ( fieldName == "X-LastName" ) {
261
-    } else if ( fieldName == "X-Title" ) {
262
-    } else if ( fieldName == "X-Suffix" ) {
263
-    } else if ( fieldName == "X-FileAs" ) {
264
-    } else if ( fieldName == "EMAIL" ) {
265
-      a.insertEmail( fieldValue, true );
266
-    } else if ( fieldName == "X-E-mail2" ) {
267
-      a.insertEmail( fieldValue );
268
-    } else if ( fieldName == "X-E-mail3" ) {
269
-      a.insertEmail( fieldValue );
270
-    } else if ( fieldName == "X-Notes" ) {
271
-    } else {
272
-      a.insertCustom( "KADDRESSBOOK", fieldName, fieldValue );
273
-    }
274
-  }
275
-
276
-  if ( !homeAddress.isEmpty() ) a.insertAddress( homeAddress );
277
-  if ( !businessAddress.isEmpty() ) a.insertAddress( businessAddress );
278
-  if ( !otherAddress.isEmpty() ) a.insertAddress( otherAddress );
279
-}
280
-
281
-void importKab( KABC::AddressBook *ab, bool override, bool quiet )
282
-{
283
-  TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" );
284
-  fileName += "addressbook.kab";
285
-  if ( !TQFile::exists( fileName ) ) {
286
-    if ( !quiet ) {
287
-      KMessageBox::error( 0, "<qt>" + i18n( "Address book file <b>%1</b> not found! Make sure the old address book is located there and you have read permission for this file." )
288
-                          .arg( fileName ) + "</qt>" );
289
-    }
290
-    kdDebug(5700) << "No KDE 2 addressbook found." << endl;
291
-    return;
292
-  }
293
-
294
-  kdDebug(5700) << "Converting old-style kab addressbook to "
295
-               "new-style kabc addressbook." << endl;
296
-
297
-  KabAPI kab( 0 );
298
-  if ( kab.init() != ::AddressBook::NoError ) {
299
-    kdDebug(5700) << "Error initing kab" << endl;
300
-    exit( 1 );
301
-  }
302
-
303
-  KabKey key;
304
-  ::AddressBook::Entry entry;
305
-
306
-  int num = kab.addressbook()->noOfEntries();
307
-
308
-  kdDebug(5700) << "kab Addressbook has " << num << " entries." << endl;
309
-
310
-  for ( int i = 0; i < num; ++i ) {
311
-    if ( ::AddressBook::NoError != kab.addressbook()->getKey( i, key ) ) {
312
-      kdDebug(5700) << "Error getting key for index " << i << " from kab." << endl;
313
-      continue;
314
-    }
315
-    if ( ::AddressBook::NoError != kab.addressbook()->getEntry( key, entry ) ) {
316
-      kdDebug(5700) << "Error getting entry for index " << i << " from kab." << endl;
317
-      continue;
318
-    }
319
-
320
-    Addressee a;
321
-
322
-    // Convert custom entries
323
-    int count = 0;
324
-    bool idFound = false;
325
-    TQStringList::ConstIterator customIt;
326
-    for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) {
327
-      if ( (*customIt).startsWith( "X-KABC-UID:" ) ) {
328
-        a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) );
329
-        idFound = true;
330
-      } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
331
-        readKAddressBookEntries( *customIt, a );
332
-      } else {
333
-        a.insertCustom( "kab2kabc", TQString::number( count++ ), *customIt );
334
-      }
335
-    }
336
-    if ( idFound ) {
337
-      if ( !override ) continue;
338
-    } else {
339
-      entry.custom << "X-KABC-UID:" + a.uid();
340
-      ::AddressBook::ErrorCode error = kab.addressbook()->change( key, entry );
341
-      if ( error != ::AddressBook::NoError ) {
342
-        kdDebug(5700) << "kab.change returned with error " << error << endl;
343
-      } else {
344
-        kdDebug(5700) << "Wrote back to kab uid " << a.uid() << endl;
345
-      }
346
-    }
347
-
348
-    a.setTitle( entry.title );
349
-    a.setFormattedName( entry.fn );
350
-    a.setPrefix( entry.nameprefix );
351
-    a.setGivenName( entry.firstname );
352
-    a.setAdditionalName( entry.middlename );
353
-    a.setFamilyName( entry.lastname );
354
-    a.setBirthday( entry.birthday );
355
-
356
-    TQStringList::ConstIterator emailIt;
357
-    for ( emailIt = entry.emails.begin(); emailIt != entry.emails.end(); ++emailIt )
358
-      a.insertEmail( *emailIt );
359
-
360
-    TQStringList::ConstIterator phoneIt;
361
-    for ( phoneIt = entry.telephone.begin(); phoneIt != entry.telephone.end(); ++phoneIt ) {
362
-      int kabType = (*phoneIt++).toInt();
363
-      if ( phoneIt == entry.telephone.end() ) break;
364
-      TQString number = *phoneIt;
365
-      int type = 0;
366
-      if ( kabType == ::AddressBook::Fixed ) type = PhoneNumber::Voice;
367
-      else if ( kabType == ::AddressBook::Mobile ) type = PhoneNumber::Cell | PhoneNumber::Voice;
368
-      else if ( kabType == ::AddressBook::Fax ) type = PhoneNumber::Fax;
369
-      else if ( kabType == ::AddressBook::Modem ) type = PhoneNumber::Modem;
370
-      a.insertPhoneNumber( PhoneNumber( number, type ) );
371
-    }
372
-
373
-    if ( entry.URLs.count() > 0 ) {
374
-      a.setUrl( KURL( entry.URLs.first() ) );
375
-      if ( entry.URLs.count() > 1 ) {
376
-        kdWarning() << "More than one URL. Ignoring all but the first." << endl;
377
-      }
378
-    }
379
-
380
-    int noAdr = entry.noOfAddresses();
381
-    for ( int j = 0; j < noAdr; ++j ) {
382
-      ::AddressBook::Entry::Address kabAddress;
383
-      entry.getAddress( j, kabAddress );
384
-
385
-      Address adr;
386
-
387
-      adr.setStreet( kabAddress.address );
388
-      adr.setPostalCode( kabAddress.zip );
389
-      adr.setLocality( kabAddress.town );
390
-      adr.setCountry( kabAddress.country );
391
-      adr.setRegion( kabAddress.state );
392
-
393
-      TQString label;
394
-      if ( !kabAddress.headline.isEmpty() ) label += kabAddress.headline + "\n";
395
-      if ( !kabAddress.position.isEmpty() ) label += kabAddress.position + "\n";
396
-      if ( !kabAddress.org.isEmpty() ) label += kabAddress.org + "\n";
397
-      if ( !kabAddress.orgUnit.isEmpty() ) label += kabAddress.orgUnit + "\n";
398
-      if ( !kabAddress.orgSubUnit.isEmpty() ) label += kabAddress.orgSubUnit + "\n";
399
-      if ( !kabAddress.deliveryLabel.isEmpty() ) label += kabAddress.deliveryLabel + "\n";
400
-      adr.setLabel( label );
401
-
402
-      a.insertAddress( adr );
403
-    }
404
-
405
-    TQString note = entry.comment;
406
-
407
-    if ( !entry.user1.isEmpty() ) note += "\nUser1: " + entry.user1;
408
-    if ( !entry.user2.isEmpty() ) note += "\nUser2: " + entry.user2;
409
-    if ( !entry.user3.isEmpty() ) note += "\nUser3: " + entry.user3;
410
-    if ( !entry.user4.isEmpty() ) note += "\nUser4: " + entry.user4;
411
-
412
-    if ( !entry.keywords.count() == 0 ) note += "\nKeywords: " + entry.keywords.join( ", " );
413
-
414
-    TQStringList::ConstIterator talkIt;
415
-    for ( talkIt = entry.talk.begin(); talkIt != entry.talk.end(); ++talkIt ) {
416
-      note += "\nTalk: " + (*talkIt);
417
-    }
418
-
419
-    a.setNote( note );
420
-
421
-    a.setPrefix( entry.rank + a.prefix() );  // Add rank to prefix
422
-
423
-    a.setCategories( entry.categories );
424
-
425
-    kdDebug(5700) << "Addressee: " << a.familyName() << endl;
426
-
427
-    ab->insertAddressee( a );
428
-  }
429
-
430
-  kab.save( true );
431
-}
432
-
433
-int main( int argc, char **argv )
434
-{
435
-  TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
436
-  aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
437
-
438
-  TDECmdLineArgs::init( argc, argv, &aboutData );
439
-  TDECmdLineArgs::addCmdLineOptions( options );
440
-
441
-  TDEApplication app;
442
-
443
-  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
444
-
445
-  bool override = false;
446
-
447
-  if ( args->isSet( "override" ) ) {
448
-    kdDebug() << "Override existing entries." << endl;
449
-
450
-    override = true;
451
-  }
452
-
453
-  bool quiet = false;
454
-
455
-  if ( args->isSet( "quiet" ) )
456
-    quiet = true;
457
-
458
-  if ( args->isSet( "disable-autostart" ) ) {
459
-    kdDebug() << "Disable autostart." << endl;
460
-
461
-    TDEConfig *config = app.config();
462
-    config->setGroup( "Startup" );
463
-    config->writeEntry( "EnableAutostart", false );
464
-  }
465
-
466
-  KABC::AddressBook *kabcBook = StdAddressBook::self();
467
-
468
-  importKMailAddressBook( kabcBook );
469
-
470
-  importKab( kabcBook, override, quiet );
471
-
472
-  StdAddressBook::save();
473
-
474
-  kdDebug(5700) << "Saved kabc addressbook to '" << kabcBook->identifier() << "'" << endl;
475
-}
476
-

+ 0
- 105
kabc/kab2kabc.desktop View File

@@ -1,105 +0,0 @@
1
-[Desktop Entry]
2
-Name=kab2kabc
3
-Name[af]=kab-na-kabc
4
-Name[csb]=Kònwersëjô adresowi knéżczi
5
-Name[eo]=Konvertilo de "kab" al "kabc"
6
-Name[fr]=KAB2KABC
7
-Name[fy]=Kab2kabc
8
-Name[hu]=Kab2kabc
9
-Name[it]=Kab2Kabc
10
-Name[nl]=Kab2kabc
11
-Name[pl]=Konwersja książki adresowej
12
-Name[pt_BR]=Conversão de  kab para kabc
13
-Name[ro]=Kab2kabc
14
-Name[sv]=Kab2kabc
15
-Name[te]=కెఎబి2కెఎబిసి
16
-Name[zu]=i-kab2kabc
17
-Exec=kab2kabc --disable-autostart --quiet
18
-Icon=misc
19
-Type=Application
20
-Comment=libkab to libkabc conversion tool.
21
-Comment[af]=libkab na libkabc omskakeling program.
22
-Comment[ar]=أداة تحويل libkab إلى libkabc.
23
-Comment[az]=libkab - libkabc dönüşdürmə vasitəsi.
24
-Comment[be]=Інструмент пераўтварэння libkab у libkabc.
25
-Comment[bg]=Програма за конвертиране на libkab до libkabc.
26
-Comment[bn]=libkab থেকে libkabc-তে পরিবর্তন করার প্রোগ্রাম।
27
-Comment[bs]=alat za pretvaranje libkab u libkabc.
28
-Comment[ca]=Eina de conversió de libkab a libkabc.
29
-Comment[cs]=Převod dat z libkab do libkabc.
30
-Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc.
31
-Comment[cy]=erfyn trosi libkab i libkabc
32
-Comment[da]=libkab-til-libkabc-konverteringsværktøj.
33
-Comment[de]=Konvertierung von libkab in libkabc
34
-Comment[el]=Εργαλείο μετατροπής από το libkab στο libkabc.
35
-Comment[eo]=Konvertilo de "libkab" al "libkabc"
36
-Comment[es]=Conversor libkab a libkabc.
37
-Comment[et]=libkab -> libkabc teisendamine
38
-Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna.
39
-Comment[fa]=ابزار تبدیل libkab به libcabc.
40
-Comment[fi]=libkab-libkabc -muunnin
41
-Comment[fr]=Outil de conversion de libkab vers libkabc.
42
-Comment[fy]=Konversjeprogramma fan libkab nei libkabc.
43
-Comment[ga]=Uirlis tiontaithe ó libkab go libkabc.
44
-Comment[gl]=Ferramenta de conversión de libkab a libkabc.
45
-Comment[he]=כלי המרה מ־libkab ל־libkabc
46
-Comment[hi]=libkab से libkabc बदलने वाला औजार
47
-Comment[hr]=Alat za pretvaranje iz libkab u libkabc
48
-Comment[hsb]=libkab -> libkabc konwerter
49
-Comment[hu]=libkab -> libkabc konvertáló.
50
-Comment[id]=konverter libkab ke libkabc.
51
-Comment[is]=libkab í libkabc breytingatól.
52
-Comment[it]=Strumento di conversione da libkab a libkabc.
53
-Comment[ja]=libkab から libkabc への変換ツール
54
-Comment[ka]=libkab => libkabc გარდაქმნის ხელსაწყო.
55
-Comment[kk]=libkab дегеннен libkabc дегенге айналдыру құралы.
56
-Comment[km]=ឧបករណ៍​បម្លែង​ពី libkab ទៅ libkabc
57
-Comment[ko]=libkab을 libkabc로 바꿔주는 연장.
58
-Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
59
-Comment[lt]=libkab į libkabc konvertavimo įrankis.
60
-Comment[lv]=libkab uz libkabc kovertēšanas rīks.
61
-Comment[mk]=алатка за претворање од libkab во libkabc.
62
-Comment[mn]=libkab-аас libkabc-руу хөрвүүлэгч
63
-Comment[ms]=perkakasan penukaran libkab to libkabc.
64
-Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
65
-Comment[nb]=libkab til libkabc konverteringsverktøy.
66
-Comment[nds]=Warktüüch för't Ümwanneln vun libkab na libkabc.
67
-Comment[ne]=libkab to libkabc रूपान्तरण उपकरण ।
68
-Comment[nl]=Conversieprogramma van libkab naar libkabc.
69
-Comment[nn]=Konverterer libkab til libkabc
70
-Comment[nso]=Sebereka sa phetosetso ya libkab go libkabc
71
-Comment[pa]=libkab ਤੋ libkabc ਤਬਦੀਲੀ ਸੰਦ।
72
-Comment[pl]=Narzędzie do konwersji z libkab do libkabc.
73
-Comment[pt]=Ferramenta de conversão de libkab para libkabc.
74
-Comment[pt_BR]=Ferramenta de conversão de libkab para libkabc.
75
-Comment[ro]=Utilitar de conversie de la "libkab" la "libkabc".
76
-Comment[ru]=утилита преобразования libkab в libkabc.
77
-Comment[rw]=Igikoresho cy'ihindura libkab muri libkabc.
78
-Comment[se]=konverterenreaidu libkab:as libkabc:ai
79
-Comment[sk]=Prevod dát z libkab do libkabc.
80
-Comment[sl]=Orodje za pretvorbo iz libkab v libkabc
81
-Comment[sq]=Vegla për shëndrimin e libkab në libkabc.
82
-Comment[sr]=Алат за конверзију из libkab-а у libkabc.
83
-Comment[sr@Latn]=Alat za konverziju iz libkab-a u libkabc.
84
-Comment[ss]=Lithulusi lekutjintja le-libkab kuya ku-libkabc.
85
-Comment[sv]=Konverteringsverktyg från libkab till libkabc
86
-Comment[ta]=libkab இலிருந்து libkabc க்கு மாற்றும் கருவி.
87
-Comment[te]=libkab నుంచి libkabc కు మార్చు పనిముట్టు
88
-Comment[tg]=асбоби дигаргунсози libkab ба libkabc
89
-Comment[th]=เครื่องมือเปลี่ยน libkab เป็น libkabc
90
-Comment[tr]=libkab' tan libkabc' ye dönüştürme aracı
91
-Comment[tt]=libkab-›libkabc äyländerü qoralı.
92
-Comment[uk]=Засіб перетворення libkab до libkabc.
93
-Comment[uz]=libkab'ni libkabc'ga aylantiradigan vosita.
94
-Comment[uz@cyrillic]=libkab'ни libkabc'га айлантирадиган восита.
95
-Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc
96
-Comment[vi]=Công cụ chuyển đổi libkab sang libkabc.
97
-Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela.
98
-Comment[zh_CN]=libkab 到 libkabc 的转换工具。
99
-Comment[zh_HK]=libkab 至 libkabc 的轉換工具
100
-Comment[zh_TW]=libkab 至 libkabc 轉換工具
101
-Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
102
-Terminal=false
103
-NoDisplay=true
104
-X-TDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
105
-OnlyShowIn=TDE;

+ 1
- 1
kabc/ldapclient.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <tqurl.h>
31 31
 
32 32
 #include <kapplication.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <kdebug.h>
35 35
 #include <kmdcodec.h>
36 36
 #include <kprotocolinfo.h>

+ 1
- 1
kabc/ldapclient.h View File

@@ -31,7 +31,7 @@
31 31
 #include <tqguardedptr.h>
32 32
 #include <tqtimer.h>
33 33
 
34
-#include <kio/job.h>
34
+#include <tdeio/job.h>
35 35
 
36 36
 namespace KABC {
37 37
 

+ 1
- 1
kabc/ldapconfigwidget.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <kabc/ldapurl.h>
29 29
 #include <kabc/ldif.h>
30
-#include <kio/job.h>
30
+#include <tdeio/job.h>
31 31
 
32 32
 class TQGridLayout;
33 33
 class TQSpinBox;

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

@@ -20,9 +20,9 @@ include_directories(
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21 21
   ${CMAKE_SOURCE_DIR}/tdecore
22 22
   ${CMAKE_SOURCE_DIR}/tdeui
23
-  ${CMAKE_SOURCE_DIR}/kio
24
-  ${CMAKE_SOURCE_DIR}/kio/kio
25
-  ${CMAKE_SOURCE_DIR}/kio/kfile
23
+  ${CMAKE_SOURCE_DIR}/tdeio
24
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
25
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
26 26
 )
27 27
 
28 28
 link_directories(

+ 1
- 1
kabc/plugins/dir/resourcedir.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tqwidget.h>
30 30
 
31 31
 #include <kapplication.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kdebug.h>
34 34
 #include <kgenericfactory.h>
35 35
 #include <kglobal.h>

+ 1
- 1
kabc/plugins/dir/resourcedir.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef KABC_RESOURCEDIR_H
22 22
 #define KABC_RESOURCEDIR_H
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 #include <kdirwatch.h>
26 26
 
27 27
 #include <sys/types.h>

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

@@ -20,9 +20,9 @@ include_directories(
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21 21
   ${CMAKE_SOURCE_DIR}/tdecore
22 22
   ${CMAKE_SOURCE_DIR}/tdeui
23
-  ${CMAKE_SOURCE_DIR}/kio
24
-  ${CMAKE_SOURCE_DIR}/kio/kio
25
-  ${CMAKE_SOURCE_DIR}/kio/kfile
23
+  ${CMAKE_SOURCE_DIR}/tdeio
24
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
25
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
26 26
 )
27 27
 
28 28
 link_directories(

+ 2
- 2
kabc/plugins/file/resourcefile.cpp View File

@@ -30,9 +30,9 @@
30 30
 #include <tqtimer.h>
31 31
 
32 32
 #include <kapplication.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <kdebug.h>
35
-#include <kio/scheduler.h>
35
+#include <tdeio/scheduler.h>
36 36
 #include <klocale.h>
37 37
 #include <ksavefile.h>
38 38
 #include <kstandarddirs.h>

+ 1
- 1
kabc/plugins/file/resourcefile.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef KABC_RESOURCEFILE_H
22 22
 #define KABC_RESOURCEFILE_H
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 #include <kdirwatch.h>
26 26
 
27 27
 #include <sys/types.h>

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

@@ -20,9 +20,9 @@ include_directories(
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21 21
   ${CMAKE_SOURCE_DIR}/tdecore
22 22
   ${CMAKE_SOURCE_DIR}/tdeui
23
-  ${CMAKE_SOURCE_DIR}/kio
24
-  ${CMAKE_SOURCE_DIR}/kio/kio
25
-  ${CMAKE_SOURCE_DIR}/kio/kfiles
23
+  ${CMAKE_SOURCE_DIR}/tdeio
24
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
25
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefiles
26 26
 )
27 27
 
28 28
 link_directories(
@@ -68,6 +68,6 @@ set( ${target}_SRCS
68 68
 
69 69
 tde_add_kpart( ${target}
70 70
   SOURCES ${${target}_SRCS}
71
-  LINK kabc_ldapkio-shared
71
+  LINK kabc_ldaptdeio-shared
72 72
   DESTINATION ${PLUGIN_INSTALL_DIR}
73 73
 )

+ 2
- 2
kabc/plugins/ldapkio/resourceldapkio.cpp View File

@@ -29,12 +29,12 @@
29 29
 #include <kstandarddirs.h>
30 30
 #include <klineedit.h>
31 31
 #include <klocale.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kstringhandler.h>
34 34
 #include <ktempfile.h>
35 35
 
36 36
 #include <stdlib.h>
37
-#include <kio/netaccess.h>
37
+#include <tdeio/netaccess.h>
38 38
 #include <kabc/ldif.h>
39 39
 #include <kabc/ldapurl.h>
40 40
 

+ 1
- 1
kabc/plugins/ldapkio/resourceldapkio.h View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <kabc/resource.h>
26 26
 #include <kabc/ldif.h>
27
-#include <kio/job.h>
27
+#include <tdeio/job.h>
28 28
 
29 29
 class TDEConfig;
30 30
 

+ 1
- 1
kabc/plugins/ldapkio/resourceldapkioconfig.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include <klocale.h>
37 37
 #include <klineedit.h>
38 38
 #include <kmessagebox.h>
39
-#include <kio/netaccess.h>
39
+#include <tdeio/netaccess.h>
40 40
 
41 41
 #include "resourceldapkio.h"
42 42
 

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

@@ -20,9 +20,9 @@ include_directories(
20 20
   ${CMAKE_SOURCE_DIR}/dcop
21 21
   ${CMAKE_SOURCE_DIR}/tdecore
22 22
   ${CMAKE_SOURCE_DIR}/tdeui
23
-  ${CMAKE_SOURCE_DIR}/kio
24
-  ${CMAKE_SOURCE_DIR}/kio/kio
25
-  ${CMAKE_SOURCE_DIR}/kio/kfile
23
+  ${CMAKE_SOURCE_DIR}/tdeio
24
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
25
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
26 26
 )
27 27
 
28 28
 link_directories(

+ 2
- 2
kabc/plugins/net/resourcenet.cpp View File

@@ -21,8 +21,8 @@
21 21
 #include <tqfile.h>
22 22
 
23 23
 #include <kdebug.h>
24
-#include <kio/netaccess.h>
25
-#include <kio/scheduler.h>
24
+#include <tdeio/netaccess.h>
25
+#include <tdeio/scheduler.h>
26 26
 #include <klocale.h>
27 27
 #include <ksavefile.h>
28 28
 #include <ktempfile.h>

+ 1
- 1
kabc/plugins/net/resourcenet.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef KABC_RESOURCENET_H
22 22
 #define KABC_RESOURCENET_H
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 
26 26
 #include <sys/types.h>
27 27
 

+ 1
- 1
kabc/plugins/sql/resourcesql.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef KABC_RESOURCESQL_H
22 22
 #define KABC_RESOURCESQL_H
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 
26 26
 #include "addressbook.h"
27 27
 #include "resource.h"

+ 1
- 1
kabc/scripts/field.src.cpp View File

@@ -19,7 +19,7 @@
19 19
 */
20 20
 
21 21
 #include <klocale.h>
22
-#include <kconfig.h>
22
+#include <tdeconfig.h>
23 23
 #include <kglobal.h>
24 24
 
25 25
 #include "field.h"

+ 476
- 0
kabc/tdeab2tdeabc.cpp View File

@@ -0,0 +1,476 @@
1
+/*
2
+    This file is part of libkabc.
3
+    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4
+
5
+    This library is free software; you can redistribute it and/or
6
+    modify it under the terms of the GNU Library General Public
7
+    License as published by the Free Software Foundation; either
8
+    version 2 of the License, or (at your option) any later version.
9
+
10
+    This library is distributed in the hope that it will be useful,
11
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
+    Library General Public License for more details.
14
+
15
+    You should have received a copy of the GNU Library General Public License
16
+    along with this library; see the file COPYING.LIB.  If not, write to
17
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18
+    Boston, MA 02110-1301, USA.