diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a1f952dd..3a9f23a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) -OPTION( WITH_INOTIFY "Enable inotify support for kio" ON ) +OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON ) OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF ) @@ -745,7 +745,7 @@ endif( ) # before altering the LIBR_VERSION check, # please ensure that nothing changed in the # duplicated data definitions present in -# kio/kio/kfileitem.cpp +# tdeio/tdeio/tdefileitem.cpp if( WITH_ELFICON ) pkg_search_module( LIBR libr ) @@ -886,7 +886,7 @@ configure_file( config.h.cmake config.h ) configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h ) configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h ) configure_file( kjs/global.h.in kjs/global.h ) -configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h ) +configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h ) configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) @@ -895,7 +895,7 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl ) set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp ) set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc ) -set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/kconfig_compiler/kconfig_compiler ) +set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/tdecore/tdeconfig_compiler/tdeconfig_compiler ) ##### global compiler settings ################## @@ -937,7 +937,7 @@ add_subdirectory( tdeui ) add_subdirectory( tdesu ) add_subdirectory( kjs ) add_subdirectory( tdewallet ) -add_subdirectory( kio ) +add_subdirectory( tdeio ) add_subdirectory( kded ) # FIXME this directory/target doesn't exists @@ -962,11 +962,11 @@ if( XRANDR_FOUND ) add_subdirectory( tderandr ) endif( XRANDR_FOUND ) add_subdirectory( tdehtml ) -add_subdirectory( kcmshell ) -add_subdirectory( kconf_update ) +add_subdirectory( tdecmshell ) +add_subdirectory( tdeconf_update ) add_subdirectory( kdewidgets ) add_subdirectory( kimgio ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) add_subdirectory( kstyles ) add_subdirectory( libtdemid ) add_subdirectory( libtdescreensaver ) @@ -977,7 +977,7 @@ add_subdirectory( licenses ) add_subdirectory( dnssd ) add_subdirectory( pics ) add_subdirectory( mimetypes ) -add_subdirectory( kfile-plugins ) +add_subdirectory( tdefile-plugins ) ##### install import cmake modules ############### diff --git a/KDE2PORTING.html b/KDE2PORTING.html index c373e83f5..131c74577 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -205,7 +205,7 @@ must have created a TDEApplication object before the methods can be used.

       #include <kglobal.h>
-      #include <kconfig.h>      // Needed to use TDEConfig
+      #include <tdeconfig.h>      // Needed to use TDEConfig
       #include <klocale.h>      // Needed to use KLocale
       #include <kiconloader.h>  // Needed to use KIconLoader
@@ -501,20 +501,20 @@ are necessary to convert your old KDND-based stuff to Qt DND.

libkfm has disappeared

Lots of other functionalities have been taken out of kfm, some being - now in libkio, some in libkonq.

+ now in libtdeio, some in libkonq.

Replacement table :

- + - + - - - + + +
KFM::download -> TDEIO::NetAccess::download (tdelibs/kio/netaccess.h)
KFM::download -> TDEIO::NetAccess::download (tdelibs/tdeio/netaccess.h)
KFM::removeTempFile -> TDEIO::NetAccess::removeTempFile
refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it
KFM::configure -> see konqueror DCOP interface
KFM::openURL -> "(void) new KRun (url)" (tdelibs/kio/krun.h)
KFM::openURL -> "(void) new KRun (url)" (tdelibs/tdeio/krun.h)
KFM::refreshDirectory -> not needed anymore since konqy/kdesktop use KDirWatch
KFM::openProperties -> "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)
KFM::exec -> "(void) new KRun (url)" (tdelibs/kio/krun.h)
KFM::copy, KFM::move -> TDEIO::Job (async, see kio/job.h)
- or TDEIO::NetAccess (sync, see kio/netaccess.h)
KFM::openProperties -> "(void) new KPropertiesDialog (url)" (tdelibs/tdefile/kpropsdlg.h)
KFM::exec -> "(void) new KRun (url)" (tdelibs/tdeio/krun.h)
KFM::copy, KFM::move -> TDEIO::Job (async, see tdeio/job.h)
+ or TDEIO::NetAccess (sync, see tdeio/netaccess.h)
DlgLocation -> Use KLineEditDlg (tdeui/klineeditdlg.h) instead
diff --git a/KDE3PORTING.html b/KDE3PORTING.html index 645bd7612..7d6130ac4 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -23,7 +23,7 @@ or this page online.

  • Changes in tdeparts
  • Changes in tdespell
  • API-cleanup in KHTML
    • -
  • Changes in kfile
    • +
  • Changes in tdefile
  • TDE Control Center
  • Panel Applets and Extensions
    • @@ -214,7 +214,7 @@ The preferred means of defining a shortcut, however, is to use KAction.

    KIconLoader, KIconTheme

    Methods now use KIcon::Group and KIcon::Context instead of int as types for group and context arguments. The change should affect only code using hardcoded numeric values instead of using the proper enum constants. -This applies to classes KIconLoader, KIconTheme and (in kio and kfile) KMimeType, KService, KIconDialog, KIconButton, +This applies to classes KIconLoader, KIconTheme and (in kio and tdefile) KMimeType, KService, KIconDialog, KIconButton, KURLBar and KURLBarItem.

    Return to the Table of Contents

    @@ -416,7 +416,7 @@ TQString&) is not a slot anymore.

    KOpenWithHandler / KFileOpenWithHandler

    Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore. -The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has +The merging of libtdeio, libtdesycoca, libtdefile and libkssl into a single libtdeio has allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.

    KMimeType, KService

    @@ -520,14 +520,14 @@ disable this use a #define KDE_NO_COMPAT.

    Return to the Table of Contents

    -

    Changes in kfile

    -The kfile-library, as used by the KFileDialog provides classes for directory browsing widgets. +

    Changes in tdefile

    +The tdefile-library, as used by the KFileDialog provides classes for directory browsing widgets. Those classes gained some new features, some parts were merged with other existing classes -and in some cases the API was cleaned up/fixed. The library is now built as part of libkio -library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -lkfile). +and in some cases the API was cleaned up/fixed. The library is now built as part of libtdeio +library (there's no need to modify Makefiles which use $LIB_KFILE instead of hardcoding -ltdefile).

    Even if the list of changes is long, the affected code base should be relatively small, as most -parts are rarely used outside of kfile. +parts are rarely used outside of tdefile.

    The changes are:

    KFileItem

    diff --git a/Mainpage.dox b/Mainpage.dox index ef5745224..15904678c 100644 --- a/Mainpage.dox +++ b/Mainpage.dox @@ -20,8 +20,8 @@ * - kjs * (classes)\n * Javascript (aka. ECMAScript and JScript) support. - * - kio - * (classes)\n + * - kio + * (classes)\n * Low level access to network files. Also provides access to facilities * such as KDirWatcher which monitors directories for changes. * - tdeparts diff --git a/Makefile.am.in b/Makefile.am.in index 10e9219dd..83d0901fa 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -27,7 +27,7 @@ COMPILE_BEFORE_kabc = kab tderesources COMPILE_BEFORE_kate = interfaces tdeutils COMPILE_BEFORE_tdemdi = tdeutils COMPILE_BEFORE_tdespell2 = tdeutils -COMPILE_BEFORE_kcmshell = tdeutils +COMPILE_BEFORE_tdecmshell = tdeutils COMPILE_BEFORE_kdewidgets = kabc tdehtml COMPILE_BEFORE_interfaces = arts kabc diff --git a/README b/README index 1392e27c5..c96978eb9 100644 --- a/README +++ b/README @@ -42,7 +42,7 @@ Here is an alphabetical list: * tdecert Personal certification manager. -* kconf_update +* tdeconf_update Auto-Updater for config files. * tdecore @@ -89,7 +89,7 @@ Here is an alphabetical list: contains "tdesycoca", the system configure cache containing services, applications, servicetypes and mimetypes. -* kioslave +* tdeioslave I/O subprocesses to handle files, ftp, http, gzip and bzip2 streams. * kjs diff --git a/TODO b/TODO index dcbfec292..75f989156 100644 --- a/TODO +++ b/TODO @@ -180,9 +180,9 @@ that we would like to make for the next binary incompatible release. - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog -- Make libtdewalletclient part of libkio and get rid of libtdewalletclient. +- Make libtdewalletclient part of libtdeio and get rid of libtdewalletclient. -- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*, +- Get rid of libtdesu dependency in libtdeio, get rid of SessionData::AuthData*, get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization - Make functions in KHelpMenu virtual so they can be overridden (ex: to provide @@ -215,7 +215,7 @@ an alternative help->contents action) - Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint, to merge that code. -- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore. +- Refactor the tdeio/bookmarks code so we don't need to use the static d-pointer trick anymore. - Rename the parameters to KDEDesktopMimeType::pixmap so that they use meaningful names rather than just a, b, c, and d. Probably not something that has to wait for KDE 4, but seems like a good idea diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt index 3877ddb9d..3b585256d 100644 --- a/arts/kde/CMakeLists.txt +++ b/arts/kde/CMakeLists.txt @@ -18,8 +18,8 @@ include_directories( ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -65,6 +65,6 @@ add_custom_command( tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop + LINK tdeio-shared mcop artsflow_idl kmedia2_idl soundserver_idl artsflow qtmcop DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index 4ff509980..bf6b3654a 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include "artsversion.h" diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index d0a872881..1d18f6421 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "artskde.h" #include "stdsynthmodule.h" diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc index 2e8187e67..039c8a3bc 100644 --- a/arts/kde/kplayobjectcreator.cc +++ b/arts/kde/kplayobjectcreator.cc @@ -19,7 +19,7 @@ */ -#include +#include #include "artskde.h" #include "kplayobjectcreator.h" #include "kplayobjectcreator.moc" diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index db4110792..fa9e2c5a1 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -19,7 +19,7 @@ */ -#include +#include #include "kplayobject.h" #include "artskde.h" #include "kplayobjectfactory.h" @@ -33,7 +33,7 @@ #include #include "kaudiomanagerplay.h" #include -#include +#include using namespace std; diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index b8c1642f9..71006c1a7 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -50,7 +50,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/configure.in.in b/configure.in.in index c899ee519..00870d24c 100644 --- a/configure.in.in +++ b/configure.in.in @@ -252,9 +252,9 @@ AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la') AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la') AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la') AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la') -AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la') -AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la') -AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la') +AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la') +AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la') +AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la') AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la') AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la') AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la') @@ -308,7 +308,7 @@ AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl') AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng') AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp') AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/makekdewidgets') -AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/kconfig_compiler/kconfig_compiler') +AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler') ac_save_LIBS="$LIBS" LIBS="$LIBS $X_LDFLAGS -lICE" diff --git a/configure.in.mid b/configure.in.mid index 669f0d13c..bf0c8d021 100644 --- a/configure.in.mid +++ b/configure.in.mid @@ -1,7 +1,7 @@ dnl put here things which have to be done after all usual autoconf macros dnl have been run, but before the Makefiles are created -all_includes='-I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl -I$(top_srcdir)/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)' +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)' AC_SUBST(all_includes) CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp index a4bcb67bb..940d62fd6 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -166,16 +166,16 @@ bool launchApp(TQString app) TQDataStream arg(data, IO_WriteOnly); arg << app << URLs; - if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)", + if ( !dcop->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { - tqWarning( "call to klauncher failed."); + tqWarning( "call to tdelauncher failed."); return false; } TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { - tqWarning( "unexpected result '%s' from klauncher.", replyType.data()); + tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data()); return false; } int result; diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp index 737184385..a3ea04726 100644 --- a/dcop/client/dcopstart.cpp +++ b/dcop/client/dcopstart.cpp @@ -49,7 +49,7 @@ void startApp(const char *_app, int argc, const char **args) TQDataStream arg(data, IO_WriteOnly); arg << app << URLs; - if ( !dcop->call( "klauncher", "klauncher", function, data, replyType, replyData) ) { + if ( !dcop->call( "tdelauncher", "tdelauncher", function, data, replyType, replyData) ) { tqWarning( "call failed"); exit(1); } else { diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus index 41f49333d..ec16d8fa8 100644 --- a/dcop/dcopidlng/kalyptus +++ b/dcop/dcopidlng/kalyptus @@ -1514,7 +1514,7 @@ sub makeParamList($$$) } if (defined $defaultparam && $isEnum) { - # Remove any casts in enum values, for example this in kfileitem.h: + # Remove any casts in enum values, for example this in tdefileitem.h: # 'enum { Unknown = (mode_t) - 1 };' $defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/; } diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index 09d96161d..01be9831c 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -45,6 +45,6 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 LINK tdecore-shared - DEPENDENCIES kconfig_compiler + DEPENDENCIES tdeconfig_compiler DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/doc/api/kfiledialog.png b/doc/api/tdefiledialog.png similarity index 100% rename from doc/api/kfiledialog.png rename to doc/api/tdefiledialog.png diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-tdebuildsycoca.8.docbook similarity index 99% rename from doc/tdelibs/man-kbuildsycoca.8.docbook rename to doc/tdelibs/man-tdebuildsycoca.8.docbook index 670c000c0..243e0f9a5 100644 --- a/doc/tdelibs/man-kbuildsycoca.8.docbook +++ b/doc/tdelibs/man-tdebuildsycoca.8.docbook @@ -34,7 +34,7 @@ Synopsis -kbuildsycoca +tdebuildsycoca --nosignal diff --git a/interfaces/kio/CMakeLists.txt b/interfaces/kio/CMakeLists.txt index efcecf65e..a8d8a2189 100644 --- a/interfaces/kio/CMakeLists.txt +++ b/interfaces/kio/CMakeLists.txt @@ -13,5 +13,5 @@ install( FILES http.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio ) diff --git a/interfaces/kio/Makefile.am b/interfaces/kio/Makefile.am index 8fad24200..daa98db05 100644 --- a/interfaces/kio/Makefile.am +++ b/interfaces/kio/Makefile.am @@ -1,3 +1,3 @@ -kioincludedir = $(includedir)/kio +kioincludedir = $(includedir)/tdeio kioinclude_HEADERS = http.h diff --git a/interfaces/kregexpeditor/Makefile.am b/interfaces/kregexpeditor/Makefile.am index 2007129da..4e8f5af2a 100644 --- a/interfaces/kregexpeditor/Makefile.am +++ b/interfaces/kregexpeditor/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes) include_HEADERS = kregexpeditorinterface.h diff --git a/interfaces/tdeimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt index 9aa1f60ee..40974d722 100644 --- a/interfaces/tdeimproxy/library/CMakeLists.txt +++ b/interfaces/tdeimproxy/library/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -45,7 +45,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES dcopidl ) diff --git a/interfaces/tdemediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt index 00ab7f3d9..0c9355560 100644 --- a/interfaces/tdemediaplayer/CMakeLists.txt +++ b/interfaces/tdemediaplayer/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# if( ARTS_FOUND ) - add_subdirectory( kfileaudiopreview ) + add_subdirectory( tdefileaudiopreview ) endif( ARTS_FOUND ) include_directories( diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am index 0b7aded07..91ed342bd 100644 --- a/interfaces/tdemediaplayer/Makefile.am +++ b/interfaces/tdemediaplayer/Makefile.am @@ -1,8 +1,8 @@ if include_ARTS -kfileaudiopreview_subdir = kfileaudiopreview +tdefileaudiopreview_subdir = tdefileaudiopreview endif -SUBDIRS = . $(kfileaudiopreview_subdir) +SUBDIRS = . $(tdefileaudiopreview_subdir) INCLUDES = -I$(srcdir)/.. $(all_includes) lib_LTLIBRARIES = libtdemediaplayer.la diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am deleted file mode 100644 index 4f88a0c87..000000000 --- a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = kfileaudiopreview.la - -kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp -kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) - -noinst_HEADERS = kfileaudiopreview.h - -messages: - $(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt similarity index 79% rename from interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt rename to interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt index 17485b65a..8e561e1f3 100644 --- a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt @@ -19,9 +19,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/arts/kde ) @@ -31,12 +31,12 @@ link_directories( ) -##### kfileaudiopreview ######################### +##### tdefileaudiopreview ######################### -set( target kfileaudiopreview ) +set( target tdefileaudiopreview ) set( ${target}_SRCS - kfileaudiopreview.cpp + tdefileaudiopreview.cpp ) tde_add_kpart( ${target} AUTOMOC diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am new file mode 100644 index 000000000..d73cf545f --- /dev/null +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am @@ -0,0 +1,13 @@ +INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes) +METASOURCES = AUTO + +kde_module_LTLIBRARIES = tdefileaudiopreview.la + +tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp +tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined +tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) + +noinst_HEADERS = tdefileaudiopreview.h + +messages: + $(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp similarity index 93% rename from interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp rename to interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp index 1d83fc590..7dd746c4f 100644 --- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp @@ -1,4 +1,4 @@ -#include "kfileaudiopreview.h" +#include "tdefileaudiopreview.h" #include #include @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -15,7 +15,7 @@ #include -#include +#include class KFileAudioPreviewFactory : public KLibFactory { @@ -29,7 +29,7 @@ protected: } }; -K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory ) +K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory ) /////////////////////////////////////////////////////////////////// @@ -56,7 +56,7 @@ public: KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ) { - TDEGlobal::locale()->insertCatalogue("kfileaudiopreview"); + TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview"); TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); // ### @@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on ) void KFileAudioPreview::virtual_hook( int, void* ) {} -#include "kfileaudiopreview.moc" +#include "tdefileaudiopreview.moc" diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h similarity index 100% rename from interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h rename to interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h diff --git a/interfaces/tdescript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt index bcddb1068..6b57cdeb9 100644 --- a/interfaces/tdescript/CMakeLists.txt +++ b/interfaces/tdescript/CMakeLists.txt @@ -19,8 +19,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -51,6 +51,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am index 55d4cac35..03c7efc87 100644 --- a/interfaces/tdescript/Makefile.am +++ b/interfaces/tdescript/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . sample -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes) #lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la lib_LTLIBRARIES = libtdescript.la diff --git a/interfaces/tdescript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am index 77d39b28c..e20854c70 100644 --- a/interfaces/tdescript/sample/Makefile.am +++ b/interfaces/tdescript/sample/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes) kde_module_LTLIBRARIES = libshellscript.la diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index 79fa2055a..1ff34f98a 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt index a9d39edbb..0808a84f3 100644 --- a/interfaces/tdetexteditor/CMakeLists.txt +++ b/interfaces/tdetexteditor/CMakeLists.txt @@ -20,8 +20,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/kabc ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am index 5663bb761..fce0ec563 100644 --- a/interfaces/tdetexteditor/Makefile.am +++ b/interfaces/tdetexteditor/Makefile.am @@ -1,4 +1,4 @@ -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) +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) lib_LTLIBRARIES = libtdetexteditor.la diff --git a/interfaces/tdetexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h index ed6a80d81..10a6173a0 100644 --- a/interfaces/tdetexteditor/configinterface.h +++ b/interfaces/tdetexteditor/configinterface.h @@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT ConfigInterface virtual void writeConfig () = 0; /** - Read/Write the config of the part to a given kconfig object + Read/Write the config of the part to a given tdeconfig object to store the settings in a different place than the standard */ virtual void readConfig (TDEConfig *) = 0; diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp index 807d342d0..ce493018d 100644 --- a/interfaces/tdetexteditor/editorchooser.cpp +++ b/interfaces/tdetexteditor/editorchooser.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt index 5f2619cf9..57c4741fe 100644 --- a/kabc/CMakeLists.txt +++ b/kabc/CMakeLists.txt @@ -29,8 +29,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/kab ) @@ -58,7 +58,7 @@ install( FILES ##### other data ################################ -install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources ) install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc ) @@ -102,18 +102,18 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK vcards-static vcard-shared kio-shared tderesources-shared + LINK vcards-static vcard-shared tdeio-shared tderesources-shared DEPENDENCIES addressee.h dcopidl DESTINATION ${LIB_INSTALL_DIR} ) -##### kab2kabc ################################## +##### tdeab2tdeabc ################################## -set( target kab2kabc ) +set( target tdeab2tdeabc ) set( ${target}_SRCS - kab2kabc.cpp + tdeab2tdeabc.cpp ) tde_add_executable( ${target} diff --git a/kabc/Makefile.am b/kabc/Makefile.am index ef989662f..57e72aec2 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -50,13 +50,13 @@ kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \ METASOURCES = AUTO -bin_PROGRAMS = kab2kabc +bin_PROGRAMS = tdeab2tdeabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kab2kabc_LDADD = libkabc.la ../kab/libkab.la -kab2kabc_SOURCES = kab2kabc.cpp +tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la +tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp -autostart_DATA = kab2kabc.desktop +autostart_DATA = tdeab2tdeabc.desktop autostartdir = $(datadir)/autostart manager_DATA = kabc_manager.desktop diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp index 908795869..5b8998852 100644 --- a/kabc/addresseehelper.cpp +++ b/kabc/addresseehelper.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include "addresseehelper.h" diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index 76d99f634..efb0738aa 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h index 76a3704d5..ff9da5504 100644 --- a/kabc/formatfactory.h +++ b/kabc/formatfactory.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "formatplugin.h" diff --git a/kabc/formats/CMakeLists.txt b/kabc/formats/CMakeLists.txt index 327cb1ea6..60ea1c3fd 100644 --- a/kabc/formats/CMakeLists.txt +++ b/kabc/formats/CMakeLists.txt @@ -18,8 +18,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp index 568408ba2..f696ae915 100644 --- a/kabc/ldapclient.cpp +++ b/kabc/ldapclient.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h index 5f8513599..f43a644ce 100644 --- a/kabc/ldapclient.h +++ b/kabc/ldapclient.h @@ -31,7 +31,7 @@ #include #include -#include +#include namespace KABC { diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h index 0fd0dd7e5..01074292e 100644 --- a/kabc/ldapconfigwidget.h +++ b/kabc/ldapconfigwidget.h @@ -27,7 +27,7 @@ #include #include -#include +#include class TQGridLayout; class TQSpinBox; diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt index 47f81a355..737d1144e 100644 --- a/kabc/plugins/dir/CMakeLists.txt +++ b/kabc/plugins/dir/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index 0dfd0352a..6b1759f1d 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h index a7b041643..f62ee91ba 100644 --- a/kabc/plugins/dir/resourcedir.h +++ b/kabc/plugins/dir/resourcedir.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCEDIR_H #define KABC_RESOURCEDIR_H -#include +#include #include #include diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt index 3dbcd639f..f8847d7e9 100644 --- a/kabc/plugins/file/CMakeLists.txt +++ b/kabc/plugins/file/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 3e5b1fa8f..2d2008c0d 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -30,9 +30,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index 494c43ea6..3d2efe85f 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCEFILE_H #define KABC_RESOURCEFILE_H -#include +#include #include #include diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt index 150377bd9..0869c54e1 100644 --- a/kabc/plugins/ldapkio/CMakeLists.txt +++ b/kabc/plugins/ldapkio/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfiles + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefiles ) link_directories( @@ -68,6 +68,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} SOURCES ${${target}_SRCS} - LINK kabc_ldapkio-shared + LINK kabc_ldaptdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index cdf21fb82..034fb0ef8 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -29,12 +29,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h index 6f40b12f8..5c9282b9c 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.h +++ b/kabc/plugins/ldapkio/resourceldapkio.h @@ -24,7 +24,7 @@ #include #include -#include +#include class TDEConfig; diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp index 53c72aa2b..b517cffa5 100644 --- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp +++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "resourceldapkio.h" diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt index 365922d6c..e92fbfc32 100644 --- a/kabc/plugins/net/CMakeLists.txt +++ b/kabc/plugins/net/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kabc/plugins/net/resourcenet.cpp b/kabc/plugins/net/resourcenet.cpp index 78fb16256..9ef909904 100644 --- a/kabc/plugins/net/resourcenet.cpp +++ b/kabc/plugins/net/resourcenet.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/kabc/plugins/net/resourcenet.h b/kabc/plugins/net/resourcenet.h index a13bfa175..940627ecb 100644 --- a/kabc/plugins/net/resourcenet.h +++ b/kabc/plugins/net/resourcenet.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCENET_H #define KABC_RESOURCENET_H -#include +#include #include diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h index 9f1201844..770e5b73b 100644 --- a/kabc/plugins/sql/resourcesql.h +++ b/kabc/plugins/sql/resourcesql.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCESQL_H #define KABC_RESOURCESQL_H -#include +#include #include "addressbook.h" #include "resource.h" diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp index 6362d223c..2c80810b7 100644 --- a/kabc/scripts/field.src.cpp +++ b/kabc/scripts/field.src.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include "field.h" diff --git a/kabc/kab2kabc.cpp b/kabc/tdeab2tdeabc.cpp similarity index 98% rename from kabc/kab2kabc.cpp rename to kabc/tdeab2tdeabc.cpp index 11b80639a..afb688078 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/tdeab2tdeabc.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -330,7 +330,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet ) } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) { readKAddressBookEntries( *customIt, a ); } else { - a.insertCustom( "kab2kabc", TQString::number( count++ ), *customIt ); + a.insertCustom( "tdeab2tdeabc", TQString::number( count++ ), *customIt ); } } if ( idFound ) { @@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet ) int main( int argc, char **argv ) { - TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" ); + TDEAboutData aboutData( "tdeab2tdeabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kabc/kab2kabc.desktop b/kabc/tdeab2tdeabc.desktop similarity index 97% rename from kabc/kab2kabc.desktop rename to kabc/tdeab2tdeabc.desktop index 3015b3935..945f044d4 100644 --- a/kabc/kab2kabc.desktop +++ b/kabc/tdeab2tdeabc.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=kab2kabc +Name=tdeab2tdeabc Name[af]=kab-na-kabc Name[csb]=Kònwersëjô adresowi knéżczi Name[eo]=Konvertilo de "kab" al "kabc" @@ -13,8 +13,8 @@ Name[pt_BR]=Conversão de kab para kabc Name[ro]=Kab2kabc Name[sv]=Kab2kabc Name[te]=కెఎబి2కెఎబిసి -Name[zu]=i-kab2kabc -Exec=kab2kabc --disable-autostart --quiet +Name[zu]=i-tdeab2tdeabc +Exec=tdeab2tdeabc --disable-autostart --quiet Icon=misc Type=Application Comment=libkab to libkabc conversion tool. @@ -101,5 +101,5 @@ Comment[zh_TW]=libkab 至 libkabc 轉換工具 Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc Terminal=false NoDisplay=true -X-TDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true +X-TDE-autostart-condition=tdeab2tdeabcrc:Startup:EnableAutostart:true OnlyShowIn=TDE; diff --git a/kate/data/bash.xml b/kate/data/bash.xml index 84c91596d..e3bc4abdd 100644 --- a/kate/data/bash.xml +++ b/kate/data/bash.xml @@ -439,7 +439,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml index f9dffa2e4..19c94beaa 100644 --- a/kate/data/tcsh.xml +++ b/kate/data/tcsh.xml @@ -431,7 +431,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml index 5d0575ab9..e69c15354 100644 --- a/kate/data/zsh.xml +++ b/kate/data/zsh.xml @@ -497,7 +497,7 @@ dcop kdialog - kfile + tdefile xhost xmodmap xset diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp index 69263b57c..2104ef157 100644 --- a/kate/interfaces/katecmd.cpp +++ b/kate/interfaces/katecmd.cpp @@ -118,7 +118,7 @@ const TQString KateCmd::fromHistory( uint index ) const //BEGIN KateCmdShellCompletion /* A lot of the code in the below class is copied from - tdelibs/kio/kio/kshellcompletion.cpp + tdelibs/tdeio/tdeio/kshellcompletion.cpp Copyright (C) 2000 David Smith Copyright (C) 2004 Anders Lund */ diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt index 72ac36f8a..dcbc0eecd 100644 --- a/kate/part/CMakeLists.txt +++ b/kate/part/CMakeLists.txt @@ -21,9 +21,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/kjs ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdeprint diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 81b001c3c..d1c9fd1ee 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 43f5977d8..5006ddd6c 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 03c8ac638..74e5c3225 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -42,9 +42,9 @@ #include "katetemplatehandler.h" #include -#include -#include -#include +#include +#include +#include #include @@ -53,8 +53,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -1924,13 +1924,13 @@ void KateDocument::writeConfig() config->sync(); } -void KateDocument::readSessionConfig(TDEConfig *kconfig) +void KateDocument::readSessionConfig(TDEConfig *tdeconfig) { // restore the url - KURL url (kconfig->readEntry("URL")); + KURL url (tdeconfig->readEntry("URL")); // get the encoding - TQString tmpenc=kconfig->readEntry("Encoding"); + TQString tmpenc=tdeconfig->readEntry("Encoding"); if (!tmpenc.isEmpty() && (tmpenc != encoding())) setEncoding(tmpenc); @@ -1939,34 +1939,34 @@ void KateDocument::readSessionConfig(TDEConfig *kconfig) openURL (url); // restore the hl stuff - m_buffer->setHighlight(KateHlManager::self()->nameFind(kconfig->readEntry("Highlighting"))); + m_buffer->setHighlight(KateHlManager::self()->nameFind(tdeconfig->readEntry("Highlighting"))); if (hlMode() > 0) hlSetByUser = true; // indent mode - config()->setIndentationMode( (uint)kconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) ); + config()->setIndentationMode( (uint)tdeconfig->readNumEntry("Indentation Mode", config()->indentationMode() ) ); // Restore Bookmarks - TQValueList marks = kconfig->readIntListEntry("Bookmarks"); + TQValueList marks = tdeconfig->readIntListEntry("Bookmarks"); for( uint i = 0; i < marks.count(); i++ ) addMark( marks[i], KateDocument::markType01 ); } -void KateDocument::writeSessionConfig(TDEConfig *kconfig) +void KateDocument::writeSessionConfig(TDEConfig *tdeconfig) { if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/")) return; // save url - kconfig->writeEntry("URL", m_url.prettyURL() ); + tdeconfig->writeEntry("URL", m_url.prettyURL() ); // save encoding - kconfig->writeEntry("Encoding",encoding()); + tdeconfig->writeEntry("Encoding",encoding()); // save hl - kconfig->writeEntry("Highlighting", highlight()->name()); + tdeconfig->writeEntry("Highlighting", highlight()->name()); - kconfig->writeEntry("Indentation Mode", config()->indentationMode() ); + tdeconfig->writeEntry("Indentation Mode", config()->indentationMode() ); // Save Bookmarks TQValueList marks; @@ -1975,7 +1975,7 @@ void KateDocument::writeSessionConfig(TDEConfig *kconfig) ++it ) marks << it.current()->line; - kconfig->writeEntry( "Bookmarks", marks ); + tdeconfig->writeEntry( "Bookmarks", marks ); } void KateDocument::configDialog() diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index a00d39bfb..15dd7c9f6 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -25,7 +25,7 @@ #include "kateview.h" #include "katefactory.h" -#include +#include #include #include #include diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 08da7e97f..f06518649 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -32,7 +32,7 @@ #include "kateschema.h" #include "kateconfig.h" -#include +#include #include #include #include diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index 1b71e454a..8ff5e31b2 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -26,7 +26,7 @@ #include "../interfaces/document.h" -#include +#include #include #include diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 28b22c74e..f3a5cd548 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -688,7 +688,7 @@ void KateJScriptManager::collectScripts (bool force) TDEConfig df (desktopFile, true, false); df.setDesktopGroup (); - // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback + // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback TQString cmdname = df.readEntry ("X-Kate-Command"); if (cmdname.isEmpty()) { diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index c06f3864e..46cf531a7 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index f6eb8ef60..2e92812de 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include class KateView; @@ -53,7 +53,7 @@ class KateSchemaManager void update (bool readfromfile = true); /** - * return kconfig with right group set or set to Normal if not there + * return tdeconfig with right group set or set to Normal if not there */ TDEConfig *schema (uint number); diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 4093f8722..d90f5de73 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 193f411fd..22a4799d6 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -50,9 +50,9 @@ #include -#include +#include -#include +#include #include #include #include diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 4f2ef26a5..1463c8bcd 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -42,7 +42,7 @@ #include #include #include "katefactory.h" -#include +#include #include #include #include diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index ceb76eedd..cf3190c4e 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/kate/plugins/insertfile/CMakeLists.txt b/kate/plugins/insertfile/CMakeLists.txt index 0c80a1e0c..56bdfd9cd 100644 --- a/kate/plugins/insertfile/CMakeLists.txt +++ b/kate/plugins/insertfile/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index ee46a7cff..aa9f998b6 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -24,9 +24,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 26c49576d..de1c1c376 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "ISearchPlugin.h" diff --git a/kate/plugins/kdatatool/CMakeLists.txt b/kate/plugins/kdatatool/CMakeLists.txt index 1adced175..7ceccc10d 100644 --- a/kate/plugins/kdatatool/CMakeLists.txt +++ b/kate/plugins/kdatatool/CMakeLists.txt @@ -17,8 +17,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/interfaces ) diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index a468edd13..fbd5a4db7 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 903126ca8..ee693fb4a 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -18,8 +18,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -51,16 +51,16 @@ set( ${target}_SRCS # modules need this library tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared ) -#### kbuildsycoca ############################### +#### tdebuildsycoca ############################### -set( target kbuildsycoca ) +set( target tdebuildsycoca ) set( ${target}_SRCS - kbuildsycoca.cpp kbuildservicetypefactory.cpp + tdebuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp vfolder_menu.cpp @@ -68,7 +68,7 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared ) @@ -87,31 +87,31 @@ tde_add_executable( ${target} ) -#### kde-menu ################################### +#### tde-menu ################################### -set( target kde-menu ) +set( target tde-menu ) set( ${target}_SRCS - kde-menu.cpp + tde-menu.cpp ) tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) -#### kmimelist ################################## +#### tdemimelist ################################## -set( target kmimelist ) +set( target tdemimelist ) set( ${target}_SRCS - kmimelist.cpp + tdemimelist.cpp ) tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kded/DESIGN b/kded/DESIGN index e6653807b..0fffb0456 100644 --- a/kded/DESIGN +++ b/kded/DESIGN @@ -6,9 +6,9 @@ cache of servicetypes, mimetypes and services, for a particular user. It uses KDirWatch to monitor the directories contain the .desktop files. When a file is added/removed, it waits 5 seconds (in case of series of -updates), and then launches kbuildsycoca. +updates), and then launches tdebuildsycoca. -kbuildsycoca recreates the sycoca file by: +tdebuildsycoca recreates the sycoca file by: * parsing all .desktop files, replacing global ones by local ones (at any level of the hierarchy) * creating all objects in memory diff --git a/kded/Makefile.am b/kded/Makefile.am index 1baf30e4f..093b5db0e 100644 --- a/kded/Makefile.am +++ b/kded/Makefile.am @@ -20,15 +20,15 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la +tdeinit_LTLIBRARIES = kded.la tdebuildsycoca.la kded_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) kded_la_SOURCES = kded.cpp kdedmodule.cpp -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ +tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version +tdebuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) +tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp \ kbuildimageiofactory.cpp \ @@ -36,25 +36,25 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ kctimefactory.cpp \ vfolder_menu.cpp -bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist +bin_PROGRAMS = kdontchangethehostname tde-menu tdemimelist kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdontchangethehostname_LDADD = $(LIB_TDECORE) kdontchangethehostname_SOURCES = khostname.cpp -kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kmimelist_LDADD = ../kio/libkio.la -kmimelist_SOURCES = kmimelist.cpp +tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdemimelist_LDADD = ../tdeio/libtdeio.la +tdemimelist_SOURCES = tdemimelist.cpp kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kde_menu_LDADD = $(LIB_KIO) -kde_menu_SOURCES = kde-menu.cpp +kde_menu_SOURCES = tde-menu.cpp METASOURCES = AUTO include_HEADERS = kdedmodule.h -noinst_HEADERS = kbuildsycoca.h kbuildservicetypefactory.h \ +noinst_HEADERS = tdebuildsycoca.h kbuildservicetypefactory.h \ kbuildservicefactory.h kbuildservicegroupfactory.h \ kbuildimageiofactory.h kresourcelist.h \ kbuildprotocolinfofactory.h @@ -65,7 +65,7 @@ servicetypedir = $(kde_servicetypesdir) xdg_menu_DATA = applications.menu applications.menu-no-kde update_DATA = kded.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update include $(top_srcdir)/admin/Doxyfile.am diff --git a/kded/README.kded b/kded/README.kded index 1cf382279..7265a1084 100644 --- a/kded/README.kded +++ b/kded/README.kded @@ -7,19 +7,19 @@ Some of these tasks are built in, others are started on demand. Built in tasks ============== *) Checking for newly installed software and updating tdesycoca when new -software is detected. Updating of tdesycoca is done by the program kbuildsycoca +software is detected. Updating of tdesycoca is done by the program tdebuildsycoca which gets started by kded. When kded is first started it always runs -kbuildsycoca to ensure that tdesycoca is up to date. +tdebuildsycoca to ensure that tdesycoca is up to date. *) Checking for newly installed update files. Applications can install *.upd update files. These *.upd files are used to update configuration files of users, primarily when new versions of applications are installed with (slightly) different configuration file formats. Updating of configuration -files is done by kconf_update. kded starts kconf_update when it detects a -new update file. When kded is first started it always runs kconf_update to -ensure that it has not missed any update files. kconf_update keeps track +files is done by tdeconf_update. kded starts tdeconf_update when it detects a +new update file. When kded is first started it always runs tdeconf_update to +ensure that it has not missed any update files. tdeconf_update keeps track of which update files have been processed already in the config-file -kconf_updaterc. It only performs a certain update once. +tdeconf_updaterc. It only performs a certain update once. *) Checking for hostname changes. It is a really bad idea to change the hostname of a running system and it usually only happens with incorrectly @@ -42,12 +42,12 @@ and has a default of 5000 (5 seconds). CheckSycoca: This option can be used to disable checking for new software. tdesycoca will still be built when kded starts up and when applications explicitly request a rebuild of the tdesycoca database. The user can -also manually rebuild tdesycoca by running the kbuildsycoca program. +also manually rebuild tdesycoca by running the tdebuildsycoca program. The default value of this option is "true". Checking can be disabled by setting this option to "false". CheckUpdates: This option can be used to disable checking for update files. -kconf_update will still be run when kded starts up. +tdeconf_update will still be run when kded starts up. The default value of this option is "true". Checking can be disabled by setting this option to "false". diff --git a/kded/kded.cpp b/kded/kded.cpp index 11c46e064..b769fa508 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #ifdef Q_WS_X11 @@ -65,27 +65,27 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0) if(checkStamps) args.append("--checkstamps"); if(delayedCheck) - args.append("--nocheckfiles"); + args.append("--nochectdefiles"); else checkStamps = false; // useful only during kded startup if (callBackObj) { TQByteArray data; TQDataStream dataStream( data, IO_WriteOnly ); - dataStream << TQString("kbuildsycoca") << args; + dataStream << TQString("tdebuildsycoca") << args; TQCString _launcher = TDEApplication::launcher(); kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); } else { - TDEApplication::tdeinitExecWait( "kbuildsycoca", args ); + TDEApplication::tdeinitExecWait( "tdebuildsycoca", args ); } } static void runKonfUpdate() { - TDEApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); + TDEApplication::tdeinitExecWait( "tdeconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); } static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName) @@ -97,7 +97,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new } Kded::Kded(bool checkUpdates, bool new_startup) - : DCOPObject("kbuildsycoca"), DCOPObjectProxy(), + : DCOPObject("tdebuildsycoca"), DCOPObjectProxy(), b_checkUpdates(checkUpdates), m_needDelayedCheck(false), m_newStartup( new_startup ) @@ -665,7 +665,7 @@ KUpdateD::KUpdateD() TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotNewUpdateFile())); - TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "kconf_update"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update"); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) @@ -957,7 +957,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) // During startup kdesktop waits for KDED to finish. // Send a notifyDatabaseChanged signal even if the database hasn't // changed. - // If the database changed, kbuildsycoca's signal didn't go anywhere + // If the database changed, tdebuildsycoca's signal didn't go anywhere // anyway, because it was too early, so let's send this signal // unconditionnally (David) TQByteArray data; diff --git a/kded/kded.h b/kded/kded.h index 93aac0ab6..a4968624a 100644 --- a/kded/kded.h +++ b/kded/kded.h @@ -37,7 +37,7 @@ class KDirWatch; class KService; -// No need for this in libkio - apps only get readonly access +// No need for this in libtdeio - apps only get readonly access class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy { Q_OBJECT diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index ca28a5c62..6371b2534 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -24,7 +24,7 @@ #include "kded.h" #include "kdedmodule.h" -#include "kconfigdata.h" +#include "tdeconfigdata.h" typedef TQMap > KDEDObjectMap; diff --git a/kded/kde-menu.cpp b/kded/tde-menu.cpp similarity index 95% rename from kded/kde-menu.cpp rename to kded/tde-menu.cpp index 5c1a38b4d..6a8721915 100644 --- a/kded/kde-menu.cpp +++ b/kded/tde-menu.cpp @@ -42,7 +42,7 @@ static KCmdLineOptions options[] = { KCmdLineLastOption }; -static const char appName[] = "kde-menu"; +static const char appName[] = "tde-menu"; static const char appVersion[] = "1.0"; static bool utf8; @@ -60,7 +60,7 @@ static void result(const TQString &txt) static void error(int exitCode, const TQString &txt) { - tqWarning("kde-menu: %s", txt.local8Bit().data()); + tqWarning("tde-menu: %s", txt.local8Bit().data()); exit(exitCode); } @@ -113,7 +113,7 @@ int main(int argc, char **argv) "The --highlight option can be used to visually indicate to the user where\n" "in the TDE menu a specific application is located."); - TDEAboutData d(appName, I18N_NOOP("kde-menu"), appVersion, + TDEAboutData d(appName, I18N_NOOP("tde-menu"), appVersion, description, TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org"); @@ -146,11 +146,11 @@ int main(int argc, char **argv) TQStringList args; args.append("--incremental"); args.append("--checkstamps"); - TQString command = "kbuildsycoca"; + TQString command = "tdebuildsycoca"; TQCString _launcher = TDEApplication::launcher(); if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { - tqWarning("Can't talk to klauncher!"); + tqWarning("Can't talk to tdelauncher!"); command = TDEGlobal::dirs()->findExe(command); command += " " + args.join(" "); system(command.local8Bit()); diff --git a/kded/kbuildsycoca.cpp b/kded/tdebuildsycoca.cpp similarity index 94% rename from kded/kbuildsycoca.cpp rename to kded/tdebuildsycoca.cpp index 13a645395..47b7a9bf4 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -21,7 +21,7 @@ #include #include -#include "kbuildsycoca.h" +#include "tdebuildsycoca.h" #include "kresourcelist.h" #include "vfolder_menu.h" @@ -53,7 +53,7 @@ #include #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build - // GUI version of kbuildsycoca, so-called "kbuildsycocaw". + // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw". # include # include bool silent; @@ -463,7 +463,7 @@ bool KBuildSycoca::recreate() { TQString path(sycocaPath()); #ifdef Q_WS_WIN - printf("kbuildsycoca: path='%s'\n", (const char*)path); + printf("tdebuildsycoca: path='%s'\n", (const char*)path); #endif // KSaveFile first writes to a temp file. @@ -476,9 +476,9 @@ bool KBuildSycoca::recreate() } if (database->status() != 0) { - fprintf(stderr, "[kbuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status())); + fprintf(stderr, "[tdebuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status())); #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build - // GUI version of kbuildsycoca, so-called "kbuildsycocaw". + // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw". if (!silent) KMessageBox::error(0, i18n("Error creating database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); #endif @@ -505,11 +505,11 @@ bool KBuildSycoca::recreate() m_str = 0L; if (!database->close()) { - fprintf(stderr, "[kbuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data()); - fprintf(stderr, "[kbuildsycoca] Disk full?\n"); + fprintf(stderr, "[tdebuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data()); + fprintf(stderr, "[tdebuildsycoca] Disk full?\n"); #ifdef KBUILDSYCOCA_GUI if (!silent) - KMessageBox::error(0, i18n("[kbuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); + KMessageBox::error(0, i18n("[tdebuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); #endif return false; } @@ -695,7 +695,7 @@ static KCmdLineOptions options[] = { { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 }, { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 }, { "checkstamps", I18N_NOOP("Check file timestamps"), 0 }, - { "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 }, + { "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 }, { "global", I18N_NOOP("Create global database"), 0 }, { "menutest", I18N_NOOP("Perform menu generation test run only"), 0 }, { "track ", I18N_NOOP("Track menu id for debug purposes"), 0 }, @@ -706,7 +706,7 @@ static KCmdLineOptions options[] = { KCmdLineLastOption }; -static const char appName[] = "kbuildsycoca"; +static const char appName[] = "tdebuildsycoca"; static const char appVersion[] = "1.1"; class WaitForSignal : public QObject @@ -777,14 +777,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) TQCString registeredName = dcopClient->registerAs(appName, false); if (registeredName.isEmpty()) { - fprintf(stderr, "[kbuildsycoca] Warning: %s is unable to register with DCOP.\n", appName); + fprintf(stderr, "[tdebuildsycoca] Warning: %s is unable to register with DCOP.\n", appName); break; } else if (registeredName == appName) { break; // Go } - fprintf(stderr, "[kbuildsycoca] Waiting for already running %s to finish.\n", appName); + fprintf(stderr, "[tdebuildsycoca] Waiting for already running %s to finish.\n", appName); dcopClient->setNotifications( true ); while (dcopClient->isApplicationRegistered(appName)) @@ -796,12 +796,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) } dcopClient->setNotifications( false ); } - fprintf(stderr, "[kbuildsycoca] %s running...\n", appName); + fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName); - bool checkfiles = bGlobalDatabase || args->isSet("checkfiles"); + bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles"); - bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles; - if (incremental || !checkfiles) + bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles; + if (incremental || !chectdefiles) { KSycoca::self()->disableAutoRebuild(); // Prevent deadlock TQString current_language = TDEGlobal::locale()->language(); @@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) (KSycoca::self()->timeStamp() == 0)) { incremental = false; - checkfiles = true; + chectdefiles = true; delete KSycoca::self(); } } g_changeList = new TQStringList; - bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles; + bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles; TQ_UINT32 filestamp = 0; TQStringList oldresourcedirs; if( checkstamps && incremental ) @@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) newTimestamp = (TQ_UINT32) time(0); - if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs ))) + if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs ))) { TQCString qSycocaPath = TQFile::encodeName(sycocaPath()); cSycocaPath = qSycocaPath.data(); @@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) g_ctimeDict = 0; if (incremental) { - tqWarning("[kbuildsycoca] Reusing existing tdesycoca."); + tqWarning("[tdebuildsycoca] Reusing existing tdesycoca."); KSycoca *oldSycoca = KSycoca::self(); KSycocaFactoryList *factories = new KSycocaFactoryList; g_allEntries = new KSycocaEntryListList; @@ -950,10 +950,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) #ifdef KBUILDSYCOCA_GUI if (!silent) { progress.close(); - KMessageBox::information(0, i18n("[kbuildsycoca] Configuration information reloaded successfully."), capt); + KMessageBox::information(0, i18n("[tdebuildsycoca] Configuration information reloaded successfully."), capt); } #endif return 0; } -#include "kbuildsycoca.moc" +#include "tdebuildsycoca.moc" diff --git a/kded/kbuildsycoca.h b/kded/tdebuildsycoca.h similarity index 95% rename from kded/kbuildsycoca.h rename to kded/tdebuildsycoca.h index 443f5b120..51e7af337 100644 --- a/kded/kbuildsycoca.h +++ b/kded/tdebuildsycoca.h @@ -15,8 +15,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. **/ -#ifndef __kbuildsycoca_h__ -#define __kbuildsycoca_h__ +#ifndef __tdebuildsycoca_h__ +#define __tdebuildsycoca_h__ #include @@ -34,7 +34,7 @@ class TQDataStream; -// No need for this in libkio - apps only get readonly access +// No need for this in libtdeio - apps only get readonly access class KBuildSycoca : public KSycoca { Q_OBJECT diff --git a/kded/kmimelist.cpp b/kded/tdemimelist.cpp similarity index 100% rename from kded/kmimelist.cpp rename to kded/tdemimelist.cpp diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt index d68fbd3d6..a0a6f29df 100644 --- a/kdewidgets/CMakeLists.txt +++ b/kdewidgets/CMakeLists.txt @@ -23,8 +23,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am index dc30a767a..3afb3947b 100644 --- a/kdewidgets/Makefile.am +++ b/kdewidgets/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS=. pics tests AM_CXXFLAGS = -DQT_PLUGIN -INCLUDES = -I$(top_srcdir)/kfile $(all_includes) +INCLUDES = -I$(top_srcdir)/tdefile $(all_includes) bin_PROGRAMS = makekdewidgets makekdewidgets_SOURCES = makekdewidgets.cpp diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index 8e2856c53..ea84c61b7 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt index 9d97712c6..09b04a8ea 100644 --- a/kdoctools/CMakeLists.txt +++ b/kdoctools/CMakeLists.txt @@ -18,9 +18,9 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kioslave + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeioslave ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ) @@ -54,7 +54,7 @@ install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_ ##### kbzipfilter_dummy ############################## tde_add_library( kbzipfilter_dummy STATIC_PIC - SOURCES ${CMAKE_SOURCE_DIR}/kioslave/bzip2/kbzip2filter.cpp + SOURCES ${CMAKE_SOURCE_DIR}/tdeioslave/bzip2/kbzip2filter.cpp ) @@ -68,7 +68,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} SHARED SOURCES ${${target}_SRCS} - LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} + LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -83,7 +83,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} SHARED SOURCES ${${target}_SRCS} - LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} + LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -102,6 +102,6 @@ set_source_files_properties( xslt_pure.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSL tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kbzipfilter_dummy-static kio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} + LINK kbzipfilter_dummy-static tdeio-shared ${BZIP2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am index f5aab5ebe..05c3487cd 100644 --- a/kdoctools/Makefile.am +++ b/kdoctools/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kioslave -I$(top_srcdir)/kioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) +INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeioslave -I$(top_srcdir)/tdeioslave/bzip2 $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) noinst_LTLIBRARIES = libkbzipfilter_dummy.la @@ -38,10 +38,10 @@ METASOURCES = AUTO update_DATA = kio_help.upd update_SCRIPTS = move_kio_help_cache.sh -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_help.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_help.pot install-data-local: @(for subdir in customization docbook; do \ @@ -59,7 +59,7 @@ uninstall-local: -rm -rf $(DESTDIR)$(kde_datadir)/ksgmltools2/docbook kbzip2filter.cpp: - -$(LN_S) $(srcdir)/../kioslave/bzip2/kbzip2filter.cpp . + -$(LN_S) $(srcdir)/../tdeioslave/bzip2/kbzip2filter.cpp . CLEANFILES = kbzip2filter.cpp xslt_pure.o xslt_pure.cpp checkXML diff --git a/kdoctools/docbook/README.kde b/kdoctools/docbook/README.kde index df33a8cba..ae080b287 100644 --- a/kdoctools/docbook/README.kde +++ b/kdoctools/docbook/README.kde @@ -1,4 +1,4 @@ -README file for tdebase/kioslave/help/docbook +README file for tdebase/tdeioslave/help/docbook ============================================= This are copies of diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 957a0e2e5..df002df15 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -15,8 +15,8 @@ #include -#include -#include +#include +#include class HelpProtocol : public TDEIO::SlaveBase { diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd index 2f067b148..cca96f64b 100644 --- a/kdoctools/kio_help.upd +++ b/kdoctools/kio_help.upd @@ -1,3 +1,3 @@ -# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help +# Move kio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help Id=trinity_2 Script=move_kio_help_cache.sh,sh diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh index c31331c9e..f1342c5b4 100644 --- a/kdoctools/move_kio_help_cache.sh +++ b/kdoctools/move_kio_help_cache.sh @@ -1,6 +1,6 @@ #!/bin/sh -bas=`tde-config --localprefix`share/apps/kio_help +bas=`tde-config --localprefix`share/apps/tdeio_help mv "$bas/cache" "`tde-config --path cache`kio_help" rmdir "$bas" exit 0 diff --git a/kimgio/Makefile.am b/kimgio/Makefile.am index ad833c292..41ca9a892 100644 --- a/kimgio/Makefile.am +++ b/kimgio/Makefile.am @@ -81,7 +81,7 @@ kimg_hdr_la_LIBADD = $(LIB_QT) noinst_HEADERS= xview.h eps.h tiffr.h g3r.h ico.h jp2.h pcx.h tga.h rgb.h xcf.h gimp.h exr.h dds.h psd.h hdr.h -INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS) +INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/dcop -I$(top_srcdir)/libltdl $(all_includes) -Drestrict= $(EXR_FLAGS) servicedir = $(kde_servicesdir) service_DATA = png.kimgio xpm.kimgio bmp.kimgio pbm.kimgio pgm.kimgio \ diff --git a/kimgio/README b/kimgio/README index 6c9cec844..142823e6c 100644 --- a/kimgio/README +++ b/kimgio/README @@ -22,7 +22,7 @@ XCF To use these formats, you only need to: -1. link the application with the libkio library +1. link the application with the libtdeio library 2. Include the header 3. call KImageIO::registerFormats() once, somewhere in your code before you load an image. diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index 834242bf1..88be32621 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -19,8 +19,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${FREETYPE_INCLUDE_DIRS} ) @@ -94,34 +94,34 @@ tde_add_executable( ${target} ) -#### kioslave ################################### +#### tdeioslave ################################### -set( target kioslave ) +set( target tdeioslave ) tde_add_executable( ${target} AUTOMOC - SOURCES kioslave.cpp - LINK ltdlc-static kio-shared + SOURCES tdeioslave.cpp + LINK ltdlc-static tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) -#### kstartupconfig ############################# +#### tdestartupconfig ############################# -set( target kstartupconfig ) +set( target tdestartupconfig ) tde_add_executable( ${target} AUTOMOC - SOURCES kstartupconfig.cpp + SOURCES tdestartupconfig.cpp LINK tdefakes-shared ${TQT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) -#### kdostartupconfig ########################### +#### tdedostartupconfig ########################### -set( target kdostartupconfig ) +set( target tdedostartupconfig ) tde_add_executable( ${target} AUTOMOC - SOURCES kdostartupconfig.cpp + SOURCES tdedostartupconfig.cpp LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -153,15 +153,15 @@ tde_add_executable( ${target} ) -#### klauncher ################################## +#### tdelauncher ################################## -set( target klauncher ) +set( target tdelauncher ) set( ${target}_SRCS - klauncher.cpp klauncher_main.cpp autostart.cpp + tdelauncher.cpp tdelauncher_main.cpp autostart.cpp ) tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared ) diff --git a/kinit/Makefile.am b/kinit/Makefile.am index ef329980a..3090d041e 100644 --- a/kinit/Makefile.am +++ b/kinit/Makefile.am @@ -19,11 +19,11 @@ INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(TDEINIT_XFT_INCLUDES) SUBDIRS = . tests -bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper kioslave \ - kstartupconfig kdostartupconfig start_tdeinit start_tdeinit_wrapper +bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper tdeioslave \ + tdestartupconfig tdedostartupconfig start_tdeinit start_tdeinit_wrapper lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = klauncher.la +tdeinit_LTLIBRARIES = tdelauncher.la tdeinit_SOURCES = kinit.cpp setproctitle.cpp # NOTE: We link against all common libraries even if we don't need them ourselves. @@ -35,10 +35,10 @@ tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT) -kioslave_SOURCES = kioslave.cpp -kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ +tdeioslave_SOURCES = tdeioslave.cpp +tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -kioslave_LDADD = $(LIB_KIO) +tdeioslave_LDADD = $(LIB_KIO) tdeinit_wrapper_SOURCES = wrapper.c tdeinit_wrapper_LDADD = $(LIBSOCKET) @@ -55,16 +55,16 @@ lnusertemp_LDFLAGS = $(KDE_RPATH) kwrapper_SOURCES = kwrapper.c kwrapper_LDADD = $(LIBSOCKET) -klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version -klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) -klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp +tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version +tdelauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) +tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp -kstartupconfig_SOURCES = kstartupconfig.cpp -kstartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT) -kdostartupconfig_SOURCES = kdostartupconfig.cpp -kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ +tdestartupconfig_SOURCES = tdestartupconfig.cpp +tdestartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT) +tdedostartupconfig_SOURCES = tdedostartupconfig.cpp +tdedostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -kdostartupconfig_LDADD = $(LIB_TDECORE) +tdedostartupconfig_LDADD = $(LIB_TDECORE) start_tdeinit_SOURCES = start_tdeinit.c tdeinitpath = $(bindir)/tdeinit @@ -75,7 +75,7 @@ start_tdeinit_wrapper_SOURCES = start_tdeinit_wrapper.c METASOURCES = AUTO -noinst_HEADERS = klauncher.h autostart.h klauncher_cmds.h setproctitle.h +noinst_HEADERS = tdelauncher.h autostart.h tdelauncher_cmds.h setproctitle.h kwrapper.o: wrapper.c diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index 3fe0825a4..4e4ad1f56 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -22,7 +22,7 @@ #include "autostart.h" -#include +#include #include #include #include diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 6cf9293d6..63e6ab832 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -74,7 +74,7 @@ #include #include "ltdl.h" -#include "klauncher_cmds.h" +#include "tdelauncher_cmds.h" //#if defined Q_WS_X11 && ! defined K_WS_QTONLY #ifdef Q_WS_X11 @@ -169,9 +169,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err ); /* These are to link libtdeparts even if 'smart' linker is used */ #include extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); } -/* These are to link libkio even if 'smart' linker is used */ -#include -extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } +/* These are to link libtdeio even if 'smart' linker is used */ +#include +extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); } /* * Close fd's which are only useful for the parent process. @@ -429,8 +429,8 @@ static pid_t launch(int argc, const char *_name, const char *args, TQCString name; TQCString exec; - if (strcmp(_name, "klauncher") == 0) { - /* klauncher is launched in a special way: + if (strcmp(_name, "tdelauncher") == 0) { + /* tdelauncher is launched in a special way: * It has a communication socket on LAUNCHER_FD */ if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, d.launcher)) @@ -891,7 +891,7 @@ static void init_tdeinit_socket() if(connect(s, (struct sockaddr *)&server, socklen) == 0) { fprintf(stderr, "[tdeinit] Shutting down running client.\n"); - klauncher_header request_header; + tdelauncher_header request_header; request_header.cmd = LAUNCHER_TERMINATE_TDEINIT; request_header.arg_length = 0; write(s, &request_header, sizeof(request_header)); @@ -1090,7 +1090,7 @@ static void launcher_died() close(d.launcher[0]); d.launcher[0] = -1; - pid_t pid = launch( 1, "klauncher", 0 ); + pid_t pid = launch( 1, "tdelauncher", 0 ); #ifndef NDEBUG fprintf(stderr, "[tdeinit] Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result); #endif @@ -1105,7 +1105,7 @@ static void handle_launcher_request(int sock = -1) launcher = true; } - klauncher_header request_header; + tdelauncher_header request_header; char *request_data = 0L; int result = read_socket(sock, (char *) &request_header, sizeof(request_header)); if (result != 0) @@ -1141,7 +1141,7 @@ static void handle_launcher_request(int sock = -1) (request_header.cmd == LAUNCHER_EXEC_NEW))) { pid_t pid; - klauncher_header response_header; + tdelauncher_header response_header; long response_data; long l; memcpy( &l, request_data, sizeof( long )); @@ -1273,7 +1273,7 @@ static void handle_launcher_request(int sock = -1) #ifndef NDEBUG if (launcher) - fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from klauncher.\n", env_name, env_value); + fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from tdelauncher.\n", env_name, env_value); else fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from socket.\n", env_name, env_value); #endif @@ -1301,7 +1301,7 @@ static void handle_launcher_request(int sock = -1) else if (request_header.cmd == LAUNCHER_TERMINATE_TDEINIT) { #ifndef NDEBUG - fprintf(stderr,"[tdeinit] Killing tdeinit/klauncher.\n"); + fprintf(stderr,"[tdeinit] Killing tdeinit/tdelauncher.\n"); #endif if (d.launcher_pid) kill(d.launcher_pid, SIGTERM); @@ -1359,7 +1359,7 @@ static void handle_requests(pid_t waitForPid) if (d.launcher_pid) { // TODO send process died message - klauncher_header request_header; + tdelauncher_header request_header; long request_data[2]; request_header.cmd = LAUNCHER_DIED; request_header.arg_length = sizeof(long) * 2; @@ -1686,7 +1686,7 @@ int main(int argc, char **argv, char **envp) int i; pid_t pid; int launch_dcop = 1; - int launch_klauncher = 1; + int launch_tdelauncher = 1; int launch_kded = 1; int keep_running = 1; int new_startup = 0; @@ -1699,8 +1699,8 @@ int main(int argc, char **argv, char **envp) safe_argv[i] = strcpy((char*)malloc(strlen(argv[i])+1), argv[i]); if (strcmp(safe_argv[i], "--no-dcop") == 0) launch_dcop = 0; - if (strcmp(safe_argv[i], "--no-klauncher") == 0) - launch_klauncher = 0; + if (strcmp(safe_argv[i], "--no-tdelauncher") == 0) + launch_tdelauncher = 0; if (strcmp(safe_argv[i], "--no-kded") == 0) launch_kded = 0; if (strcmp(safe_argv[i], "--suicide") == 0) @@ -1717,7 +1717,7 @@ int main(int argc, char **argv, char **envp) { printf("Usage: tdeinit [options]\n"); // printf(" --no-dcop Do not start dcopserver\n"); - // printf(" --no-klauncher Do not start klauncher\n"); + // printf(" --no-tdelauncher Do not start tdelauncher\n"); printf(" --no-kded Do not start kded\n"); printf(" --suicide Terminate when no TDE applications are left running\n"); // printf(" --exit Terminate when kded has run\n"); @@ -1729,7 +1729,7 @@ int main(int argc, char **argv, char **envp) // Fork here and let parent process exit. // Parent process may only exit after all required services have been - // launched. (dcopserver/klauncher and services which start with '+') + // launched. (dcopserver/tdelauncher and services which start with '+') signal( SIGCHLD, secondary_child_handler); if (fork() > 0) // Go into background { @@ -1812,16 +1812,16 @@ int main(int argc, char **argv, char **envp) (void) lt_dlopen(TQFile::encodeName(konq).data()); } #endif - if (launch_klauncher) + if (launch_tdelauncher) { if( new_startup ) - pid = launch( 2, "klauncher", "--new-startup" ); + pid = launch( 2, "tdelauncher", "--new-startup" ); else - pid = launch( 1, "klauncher", 0 ); + pid = launch( 1, "tdelauncher", 0 ); #ifndef NDEBUG fprintf(stderr, "[tdeinit] Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result); #endif - handle_requests(pid); // Wait for klauncher to be ready + handle_requests(pid); // Wait for tdelauncher to be ready } #if defined Q_WS_X11 && ! defined K_WS_QTONLY diff --git a/kinit/kdostartupconfig.cpp b/kinit/tdedostartupconfig.cpp similarity index 96% rename from kinit/kdostartupconfig.cpp rename to kinit/tdedostartupconfig.cpp index b74417c3f..d964a900b 100644 --- a/kinit/kdostartupconfig.cpp +++ b/kinit/tdedostartupconfig.cpp @@ -24,13 +24,13 @@ DEALINGS IN THE SOFTWARE. #undef QT_NO_CAST_ASCII -// See description in kstartupconfig.cpp . +// See description in tdestartupconfig.cpp . #include #include #include #include -#include +#include #include TQString get_entry( TQString* ll ) @@ -62,8 +62,8 @@ TQString get_entry( TQString* ll ) int main() { - TDEInstance inst( "kdostartupconfig" ); - kdDebug() << "Running kdostartupconfig." << endl; + TDEInstance inst( "tdedostartupconfig" ); + kdDebug() << "Running tdedostartupconfig." << endl; TQString keysname = locateLocal( "config", "startupconfigkeys" ); TQFile keys( keysname ); if( !keys.open( IO_ReadOnly )) diff --git a/kinit/kioslave.cpp b/kinit/tdeioslave.cpp similarity index 87% rename from kinit/kioslave.cpp rename to kinit/tdeioslave.cpp index 0cb77db02..1690ca2f7 100644 --- a/kinit/kioslave.cpp +++ b/kinit/tdeioslave.cpp @@ -47,15 +47,15 @@ # endif #endif -/* These are to link libkio even if 'smart' linker is used */ -#include -extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } +/* These are to link libtdeio even if 'smart' linker is used */ +#include +extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); } int main(int argc, char **argv) { if (argc < 5) { - fprintf(stderr, "Usage: kioslave \n\nThis program is part of TDE.\n"); + fprintf(stderr, "Usage: tdeioslave \n\nThis program is part of TDE.\n"); exit(1); } TQCString libpath = argv[1]; diff --git a/kinit/klauncher.cpp b/kinit/tdelauncher.cpp similarity index 98% rename from kinit/klauncher.cpp rename to kinit/tdelauncher.cpp index 8c66789e7..306903a55 100644 --- a/kinit/klauncher.cpp +++ b/kinit/tdelauncher.cpp @@ -29,7 +29,7 @@ #include -#include +#include #include #include #include @@ -45,12 +45,12 @@ #endif -#include "kio/global.h" -#include "kio/connection.h" -#include "kio/slaveinterface.h" +#include "tdeio/global.h" +#include "tdeio/connection.h" +#include "tdeio/slaveinterface.h" -#include "klauncher.h" -#include "klauncher_cmds.h" +#include "tdelauncher.h" +#include "tdelauncher_cmds.h" //#if defined Q_WS_X11 && ! defined K_WS_QTONLY #ifdef Q_WS_X11 @@ -165,7 +165,7 @@ IdleSlave::age(time_t now) KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) // : TDEApplication( false, false ), // No Styles, No GUI : TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used - DCOPObject("klauncher"), + DCOPObject("tdelauncher"), tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ), dontBlockReading(false), newStartup( new_startup ) { @@ -181,7 +181,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()", objId(), "terminateKDE()", false ); - TQString prefix = locateLocal("socket", "klauncher"); + TQString prefix = locateLocal("socket", "tdelauncher"); KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket")); if (domainname.status() != 0) { @@ -218,7 +218,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup) mSlaveValgrindSkin = getenv("TDE_SLAVE_VALGRIND_SKIN"); tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data()); } - klauncher_header request_header; + tdelauncher_header request_header; request_header.cmd = LAUNCHER_OK; request_header.arg_length = 0; write(tdeinitSocket, &request_header, sizeof(request_header)); @@ -410,7 +410,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data, ::signal( SIGHUP, SIG_IGN); ::signal( SIGTERM, SIG_IGN); kdDebug() << "KLauncher::process ---> terminateKDE" << endl; - klauncher_header request_header; + tdelauncher_header request_header; request_header.cmd = LAUNCHER_TERMINATE_KDE; request_header.arg_length = 0; write(tdeinitSocket, &request_header, sizeof(request_header)); @@ -485,7 +485,7 @@ void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value) TQCString value(_value); if (value.isNull()) value = ""; - klauncher_header request_header; + tdelauncher_header request_header; TQByteArray requestData(name.length()+value.length()+2); memcpy(requestData.data(), name.data(), name.length()+1); memcpy(requestData.data()+name.length()+1, value.data(), value.length()+1); @@ -524,7 +524,7 @@ read_socket(int sock, char *buffer, int len) void KLauncher::slotKDEInitData(int) { - klauncher_header request_header; + tdelauncher_header request_header; TQByteArray requestData; if( dontBlockReading ) { @@ -792,7 +792,7 @@ KLauncher::requestStart(KLaunchRequest *request) { requestList.append( request ); // Send request to tdeinit. - klauncher_header request_header; + tdelauncher_header request_header; TQByteArray requestData; int length = 0; length += sizeof(long); // Nr of. Args @@ -1162,7 +1162,7 @@ KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args, request->startup_id = startup_id; #endif request->envs = envs; - if( app != "kbuildsycoca" ) // avoid stupid loop + if( app != "tdebuildsycoca" ) // avoid stupid loop { // Find service, if any - strip path if needed KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 )); @@ -1295,7 +1295,7 @@ KLauncher::requestSlave(const TQString &protocol, // kdDebug(7016) << "KLauncher: launching new slave " << _name << " with protocol=" << protocol << endl; if (mSlaveDebug == arg1) { - klauncher_header request_header; + tdelauncher_header request_header; request_header.cmd = LAUNCHER_DEBUG_WAIT; request_header.arg_length = 0; write(tdeinitSocket, &request_header, sizeof(request_header)); @@ -1303,7 +1303,7 @@ KLauncher::requestSlave(const TQString &protocol, if (mSlaveValgrind == arg1) { arg_list.prepend(TQFile::encodeName(KLibLoader::findLibrary(name))); - arg_list.prepend(TQFile::encodeName(locate("exe", "kioslave"))); + arg_list.prepend(TQFile::encodeName(locate("exe", "tdeioslave"))); name = "valgrind"; if (!mSlaveValgrindSkin.isEmpty()) { arg_list.prepend(TQCString("--tool=") + mSlaveValgrindSkin); @@ -1418,4 +1418,4 @@ KLauncher::idleTimeout() } } -#include "klauncher.moc" +#include "tdelauncher.moc" diff --git a/kinit/klauncher.h b/kinit/tdelauncher.h similarity index 99% rename from kinit/klauncher.h rename to kinit/tdelauncher.h index 37b10f059..27c49ef7f 100644 --- a/kinit/klauncher.h +++ b/kinit/tdelauncher.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/kinit/klauncher_cmds.h b/kinit/tdelauncher_cmds.h similarity index 99% rename from kinit/klauncher_cmds.h rename to kinit/tdelauncher_cmds.h index 54b13f45a..5763e5a38 100644 --- a/kinit/klauncher_cmds.h +++ b/kinit/tdelauncher_cmds.h @@ -24,7 +24,7 @@ typedef struct { long cmd; long arg_length; -} klauncher_header; +} tdelauncher_header; /* Launcher commands: */ diff --git a/kinit/klauncher_main.cpp b/kinit/tdelauncher_main.cpp similarity index 81% rename from kinit/klauncher_main.cpp rename to kinit/tdelauncher_main.cpp index f22da9386..54ab94d54 100644 --- a/kinit/klauncher_main.cpp +++ b/kinit/tdelauncher_main.cpp @@ -23,7 +23,7 @@ #include #include "kapplication.h" -#include "klauncher.h" +#include "tdelauncher.h" #include "kcmdlineargs.h" #include "kcrash.h" #include "kdebug.h" @@ -33,14 +33,14 @@ #include #include -#include "klauncher_cmds.h" +#include "tdelauncher_cmds.h" static void sig_handler(int sig_num) { // No recursion signal( SIGHUP, SIG_IGN); signal( SIGTERM, SIG_IGN); - fprintf(stderr, "[klauncher] Exiting on signal %d\n", sig_num); + fprintf(stderr, "[tdelauncher] Exiting on signal %d\n", sig_num); KLauncher::destruct(255); } @@ -55,8 +55,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) // Started via tdeinit. if (fcntl(LAUNCHER_FD, F_GETFD) == -1) { - fprintf(stderr, "%s", i18n("[klauncher] This program is not supposed to be started manually.\n" - "[klauncher] It is started automatically by tdeinit.\n").local8Bit().data()); + fprintf(stderr, "%s", i18n("[tdelauncher] This program is not supposed to be started manually.\n" + "[tdelauncher] It is started automatically by tdeinit.\n").local8Bit().data()); return 1; } @@ -82,7 +82,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false); if (dcopName.isEmpty()) { - kdWarning() << "[klauncher] DCOP communication problem!" << endl; + kdWarning() << "[tdelauncher] DCOP communication problem!" << endl; return 1; } if (dcopName == cname) @@ -90,12 +90,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) if (--maxTry == 0) { - kdWarning() << "[klauncher] Another instance of klauncher is already running!" << endl; + kdWarning() << "[tdelauncher] Another instance of tdelauncher is already running!" << endl; return 1; } // Wait a bit... - kdWarning() << "[klauncher] Waiting for already running klauncher to exit." << endl; + kdWarning() << "[tdelauncher] Waiting for already running tdelauncher to exit." << endl; sleep(1); // Try again... diff --git a/kinit/kstartupconfig.cpp b/kinit/tdestartupconfig.cpp similarity index 90% rename from kinit/kstartupconfig.cpp rename to kinit/tdestartupconfig.cpp index 3204d6f7d..373ac6787 100644 --- a/kinit/kstartupconfig.cpp +++ b/kinit/tdestartupconfig.cpp @@ -42,10 +42,10 @@ It is not possible to specify default values, but since the configuration option are processed in the order they are specified this can be solved by first specifying a group and then all the entries that need default values. -When a kconf_update script is used to update such option, kstartupconfig is run -before kconf_update and therefore cannot see the change in time. To avoid this -problem, together with the kconf_update script also the matching global config -file should be updated (any change, kstartupconfig will see the timestamp change). +When a tdeconf_update script is used to update such option, tdestartupconfig is run +before tdeconf_update and therefore cannot see the change in time. To avoid this +problem, together with the tdeconf_update script also the matching global config +file should be updated (any change, tdestartupconfig will see the timestamp change). Note that the kdeglobals config file is not used as a depedendency for other config files. @@ -58,7 +58,7 @@ followed by paths of all files that are relevant to the option. Non-existent fil have '!' prepended (for the case they'll be later created), the list of files is terminated by line containing '*'. If the timestamps of all relevant files are older than the timestamp of the startupconfigfile file, there's no need to update anything. -Otherwise kdostartupconfig is launched to create or update all the necessary files +Otherwise tdedostartupconfig is launched to create or update all the necessary files (which already requires loading KDE libraries, but this case should be rare). */ @@ -90,7 +90,7 @@ int main() strlcat( filename, "/share/config/startupconfig", 1024 ); if( access( filename, R_OK ) != 0 ) { - int ret = system( "kdostartupconfig" ); + int ret = system( "tdedostartupconfig" ); return WEXITSTATUS( ret ); } strlcpy( filename, tdehome, 1024 ); @@ -98,14 +98,14 @@ int main() struct stat st; if( stat( filename, &st ) != 0 ) { - int ret = system( "kdostartupconfig" ); + int ret = system( "tdedostartupconfig" ); return WEXITSTATUS( ret ); } time_t config_time = st.st_mtime; FILE* config = fopen( filename, "r" ); if( config == NULL ) { - int ret = system( "kdostartupconfig" ); + int ret = system( "tdedostartupconfig" ); return WEXITSTATUS( ret ); } strlcpy( filename, tdehome, 1024 ); @@ -169,7 +169,7 @@ int main() fclose( config ); if( need_update ) { - int ret = system( "kdostartupconfig" ); + int ret = system( "tdedostartupconfig" ); return WEXITSTATUS( ret ); } return 0; diff --git a/kinit/tests/Makefile.am b/kinit/tests/Makefile.am index 909e7c14b..e1157bf72 100644 --- a/kinit/tests/Makefile.am +++ b/kinit/tests/Makefile.am @@ -3,8 +3,8 @@ INCLUDES= -I$(srcdir)/../.. $(all_includes) ####### Files -check_PROGRAMS = klaunchertest +check_PROGRAMS = tdelaunchertest -klaunchertest_SOURCES = klaunchertest.cpp -klaunchertest_LDADD = $(LIB_KIO) +tdelaunchertest_SOURCES = tdelaunchertest.cpp +tdelaunchertest_LDADD = $(LIB_KIO) diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp similarity index 96% rename from kinit/tests/klaunchertest.cpp rename to kinit/tests/tdelaunchertest.cpp index 3293c07be..a8989870b 100644 --- a/kinit/tests/klaunchertest.cpp +++ b/kinit/tests/tdelaunchertest.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) { TDEApplication::tdeinitExec("konsole"); - TDEApplication k(argc, argv, "klaunchertest"); + TDEApplication k(argc, argv, "tdelaunchertest"); kapp->dcopClient()->registerAs( kapp->name()) ; diff --git a/kinit/wrapper.c b/kinit/wrapper.c index 36a75d46b..565c9a152 100644 --- a/kinit/wrapper.c +++ b/kinit/wrapper.c @@ -21,7 +21,7 @@ #include -#include "klauncher_cmds.h" +#include "tdelauncher_cmds.h" #include #include @@ -310,7 +310,7 @@ int main(int argc, char **argv) int kwrapper = 0; long arg_count; long env_count; - klauncher_header header; + tdelauncher_header header; char *start, *p, *buffer; char cwd[8192]; const char *tty = NULL; diff --git a/kio/data.protocol b/kio/data.protocol deleted file mode 100644 index 85b0e8b66..000000000 --- a/kio/data.protocol +++ /dev/null @@ -1,71 +0,0 @@ -[Protocol] -protocol=data -input=stream -output=none -reading=true -Icon=www -Class=:internet -Description=A kioslave for data URIs (rfc2397) -Description[af]= ´n kioslave vir data URIs (rfc2397) -Description[be]=Модуль kioslave для URI з даннямі (rfc2397) -Description[br]=Ur kioslave evit an URIoù roadoù (rfc2397) -Description[bs]=Kioslave za data URIs (rfc2397) -Description[ca]=Un kioslave per a URIs de dades (rfc2397) -Description[cs]=Kioslave pro datová URI (rfc2397) -Description[csb]=Plugins protokółu pòdôwków URI (rfc2397) -Description[da]=En kioslave for data-URI'er (rfc2397) -Description[de]=Ein-/Ausgabemodul für Daten-URIs (rfc2397) -Description[el]=Ένα kioslave για URI δεδομένων (rfc2397) -Description[es]=Un kioslave para datos URIs (rfc2397) -Description[et]=Andme-URI-de I/O-moodul (rfc2397) -Description[eu]=Datuen URLen (rfc2397) kioslave-a -Description[fa]=یک kioslave برای URIهای داده )rfc2397( -Description[fi]=kioslave data URI:lle (rfc2397) -Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397) -Description[fy]=In kioslave foar data-URI-adresse (rfc2397) -Description[gl]=Un kioslave para URIs de dados (rfc2397) -Description[hi]=डाटा यूआरआई (आरएफसी2397) के लिए एक के-आई-ओ-स्लेव -Description[hr]=kioslave za podatkovne URI-ije (rfc2397) -Description[hu]=KDE-protokoll adat-URI-k használataához (RFC 2397) -Description[id]=Kioslave for URI data (rfc2397) -Description[is]=kioslave fyrir gagnaslóðir (rfc2397) -Description[it]=Un kioslave per il protocollo di URI di dati (rfc2397) -Description[ja]=データ URIs (rfc2397) の kioslave -Description[ka]=URI მონაცემთა (rfc2397) დამმუშავებელი -Description[kk]=URI деректерді өңдеу kioslave модулі (rfc2397) -Description[km]=kioslave មួយ​សម្រាប់​ទិន្នន័យ URIs (rfc2397) -Description[lb]=E kioslave fir Donnéen-URIs (rfc2397) -Description[lt]=Antrinė KDE programa duomenų URI (rfc2397) -Description[mk]=kio-служител за податочни URI (rfc2397) -Description[ms]=Kioslave untuk URI data (rfc2397) -Description[nb]=kioslave for data URI-er (rfc2397) -Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397) -Description[ne]=डेटा URIs का लागि किओस्लेभ (rfc2397) -Description[nl]=Een kioslave voor data-URI-adressen (rfc2397) -Description[nn]=A kioslave for data URI-ar (rfc2397) -Description[pa]= ਡਾਟਾ URI ਲਈ kioslave(rfc2397) -Description[pl]=Wtyczka protokołu URI danych (rfc2397) -Description[pt]=Um 'kioslave' para URIs data (rfc2397) -Description[pt_BR]=Uma implementação para o protocolo de URIs de dados (rfc2397) -Description[ro]=Un dispozitiv de I/E pentru URI-urile de date (rfc2397) -Description[ru]=Обработчик URI данных (rfc2397) -Description[rw]=Kioslave y'ibyatanzwe URI (rfc2397) -Description[se]=kiošláva dáhta-URI:aid várás (rfc2397) -Description[sk]=IO klient pre dátové URI (rfc2397) -Description[sl]=kioslave za podatkovne URI-je (rfc2397) -Description[sr]=kioslave за URI-ије података (rfc2397) -Description[sr@Latn]=kioslave za URI-ije podataka (rfc2397) -Description[sv]=En I/O-slav för datawebbadresser (RFC 2397) -Description[ta]=தரவு வலைமனைகளுக்கான ஒரு kioslave (rfc2397) -Description[te]=దత్తాంశం యుఆరైల కొరకు కెఐఓబానిస (rfc2397) -Description[tg]=kioslave барои URIs (rfc2397) -Description[th]=kioslave สำหรับข้อมูล URIs (rfc2397) -Description[tr]= Veri adresleri için bir kioslave (rfc2397) -Description[tt]=Biremle URI öçen kioslave (rfc2397) -Description[uk]=Підлеглий В/В для адрес (URI) даних (rfc2397) -Description[vi]=Một kioslave cho các địa điểm URI kiểu dữ liệu (rfc2397). -Description[zh_CN]=data URI(rfc2397) 的 kioslave -DocPath=kioslave/data.html -URIMode=rawuri -defaultMimetype=application/octet-stream -determineMimetypeFromExtension=false diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am deleted file mode 100644 index 5325ce875..000000000 --- a/kio/kioexec/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -AM_CPPFLAGS = $(all_includes) - -bin_PROGRAMS = kioexec - -kioexec_SOURCES = main.cpp -kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kioexec_LDADD = $(LIB_KIO) - -noinst_HEADERS = main.h -METASOURCES = AUTO - -messages: - $(XGETTEXT) $(kioexec_SOURCES) -o $(podir)/kioexec.pot - -install-exec-local: - @rm -f $(DESTDIR)$(bindir)/kfmexec - @$(LN_S) kioexec $(DESTDIR)$(bindir)/kfmexec - -include $(top_srcdir)/admin/Doxyfile.am diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am deleted file mode 100644 index 605fef7d3..000000000 --- a/kio/misc/kfile/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -METASOURCES = AUTO - -noinst_HEADERS = fileprops.h -INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes) - -bin_PROGRAMS = kfile -kfile_SOURCES = fileprops.cpp -kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kfile_LDADD = $(LIB_KIO) - diff --git a/kio/pics/Makefile.am b/kio/pics/Makefile.am deleted file mode 100644 index db5ddb1cc..000000000 --- a/kio/pics/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -kiouiservericonsdir = $(kde_datadir)/kio_uiserver/icons -kiouiservericons_ICON = AUTO - diff --git a/knewstuff/CMakeLists.txt b/knewstuff/CMakeLists.txt index 50350f29f..4493ee385 100644 --- a/knewstuff/CMakeLists.txt +++ b/knewstuff/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( @@ -38,7 +38,7 @@ install( FILES ##### other data ################################ install( FILES types DESTINATION ${DATA_INSTALL_DIR}/knewstuff ) -install( FILES khotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES tdehotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} ) tde_install_icons( ) @@ -55,17 +55,17 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) -##### khotnewstuff ############################## +##### tdehotnewstuff ############################## -set( target khotnewstuff ) +set( target tdehotnewstuff ) set( ${target}_SRCS - khotnewstuff.cpp + tdehotnewstuff.cpp ) tde_add_executable( ${target} AUTOMOC diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am index 0f0bc9676..c15716c8e 100644 --- a/knewstuff/Makefile.am +++ b/knewstuff/Makefile.am @@ -10,11 +10,11 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \ uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \ knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp -bin_PROGRAMS = khotnewstuff +bin_PROGRAMS = tdehotnewstuff -khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -khotnewstuff_LDADD = libknewstuff.la -khotnewstuff_SOURCES = khotnewstuff.cpp +tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdehotnewstuff_LDADD = libknewstuff.la +tdehotnewstuff_SOURCES = tdehotnewstuff.cpp EXTRA_PROGRAMS = testnewstuff ghns @@ -29,7 +29,7 @@ ghns_SOURCES = ghns.cpp knewstuffdir = $(kde_datadir)/knewstuff knewstuff_DATA = types -kde_conf_DATA = khotnewstuffrc +kde_conf_DATA = tdehotnewstuffrc knsdir = $(includedir)/knewstuff kns_HEADERS = downloaddialog.h engine.h entry.h knewstuffgeneric.h knewstuff.h providerdialog.h provider.h uploaddialog.h knewstuffbutton.h knewstuffsecure.h diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index f8e03295c..3cc476254 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -24,11 +24,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index 7152a0ccd..063c2c7b9 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 1e4e6ecc3..be1d404b2 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index f467530c8..b61924243 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -16,10 +16,10 @@ #include //kde includes -#include +#include #include #include -#include +#include #include #include #include diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index a29183532..d5da6bdde 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -18,9 +18,9 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include -#include +#include #include #include #include diff --git a/knewstuff/khotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp similarity index 96% rename from knewstuff/khotnewstuff.cpp rename to knewstuff/tdehotnewstuff.cpp index 67c6c70b2..7b8ceae9c 100644 --- a/knewstuff/khotnewstuff.cpp +++ b/knewstuff/tdehotnewstuff.cpp @@ -35,7 +35,7 @@ static const KCmdLineOptions op[] = int main(int argc, char **argv) { - TDEAboutData about("khotnewstuff", "KHotNewStuff", "0.2"); + TDEAboutData about("tdehotnewstuff", "KHotNewStuff", "0.2"); TDECmdLineArgs *args; TDECmdLineArgs::init(argc, argv, &about); diff --git a/knewstuff/khotnewstuffrc b/knewstuff/tdehotnewstuffrc similarity index 100% rename from knewstuff/khotnewstuffrc rename to knewstuff/tdehotnewstuffrc diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp index f82e466ff..69c823fd0 100644 --- a/knewstuff/uploaddialog.cpp +++ b/knewstuff/uploaddialog.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt index b8534cea7..8de92d14a 100644 --- a/kstyles/plastik/config/CMakeLists.txt +++ b/kstyles/plastik/config/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( set( target kstyle_plastik_config ) set( ${target}_SRCS - plastikconf.cpp + plastitdeconf.cpp ) tde_add_kpart( ${target} AUTOMOC diff --git a/kstyles/plastik/config/Makefile.am b/kstyles/plastik/config/Makefile.am index 887c7ea89..d97df31bb 100644 --- a/kstyles/plastik/config/Makefile.am +++ b/kstyles/plastik/config/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -noinst_HEADERS = plastikconf.h +noinst_HEADERS = plastitdeconf.h kde_module_LTLIBRARIES = kstyle_plastik_config.la kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kstyle_plastik_config_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -kstyle_plastik_config_la_SOURCES = plastikconf.cpp +kstyle_plastik_config_la_SOURCES = plastitdeconf.cpp kstyle_plastik_config_la_METASOURCES = AUTO diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastitdeconf.cpp similarity index 99% rename from kstyles/plastik/config/plastikconf.cpp rename to kstyles/plastik/config/plastitdeconf.cpp index 338cdcd1e..8d3e4acfd 100644 --- a/kstyles/plastik/config/plastikconf.cpp +++ b/kstyles/plastik/config/plastitdeconf.cpp @@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE. #include #include -#include "plastikconf.h" +#include "plastitdeconf.h" extern "C" { @@ -220,4 +220,4 @@ void PlastikStyleConfig::updateChanged() emit changed(true); } -#include "plastikconf.moc" +#include "plastitdeconf.moc" diff --git a/kstyles/plastik/config/plastikconf.h b/kstyles/plastik/config/plastitdeconf.h similarity index 100% rename from kstyles/plastik/config/plastikconf.h rename to kstyles/plastik/config/plastitdeconf.h diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cc index c7649f5a5..b8210af6d 100644 --- a/libtdemid/deviceman.cc +++ b/libtdemid/deviceman.cc @@ -68,7 +68,7 @@ #if 1 #include #include -#include +#include #endif //#define DEVICEMANDEBUG diff --git a/tdecert/CMakeLists.txt b/tdecert/CMakeLists.txt index 045d77720..2a9c391e3 100644 --- a/tdecert/CMakeLists.txt +++ b/tdecert/CMakeLists.txt @@ -14,14 +14,14 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/tdecore - ${CMAKE_BINARY_DIR}/kio/kssl + ${CMAKE_BINARY_DIR}/tdeio/kssl ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile - ${CMAKE_SOURCE_DIR}/kio/kssl + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile + ${CMAKE_SOURCE_DIR}/tdeio/kssl ) link_directories( @@ -45,6 +45,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared tdeparts-shared + LINK tdeio-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am index d43ce0f5b..a6f605f4a 100644 --- a/tdecert/Makefile.am +++ b/tdecert/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes) +INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = libtdecertpart.la diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc index ebb6e77ad..08e3ec5e0 100644 --- a/tdecert/tdecertpart.cc +++ b/tdecert/tdecertpart.cc @@ -36,18 +36,18 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include #include -#include +#include K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory ) @@ -774,7 +774,7 @@ void KCertPart::slotDone() { void KCertPart::slotLaunch() { KShellProcess p; -p << "kcmshell" << "crypto"; +p << "tdecmshell" << "crypto"; p.start(TDEProcess::DontCare); } diff --git a/kcmshell/CMakeLists.txt b/tdecmshell/CMakeLists.txt similarity index 83% rename from kcmshell/CMakeLists.txt rename to tdecmshell/CMakeLists.txt index 92c2205d0..2b07bbdcc 100644 --- a/kcmshell/CMakeLists.txt +++ b/tdecmshell/CMakeLists.txt @@ -16,8 +16,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/tdeutils ) @@ -26,9 +26,9 @@ link_directories( ) -##### kcmshell ################################## +##### tdecmshell ################################## -set( target kcmshell ) +set( target tdecmshell ) set( ${target}_SRCS main.cpp main.skel diff --git a/kcmshell/Makefile.am b/tdecmshell/Makefile.am similarity index 77% rename from kcmshell/Makefile.am rename to tdecmshell/Makefile.am index 9c755d8bb..a6e1d2d74 100644 --- a/kcmshell/Makefile.am +++ b/tdecmshell/Makefile.am @@ -23,16 +23,16 @@ METASOURCES = AUTO lib_LTLIBRARIES = bin_PROGRAMS = -tdeinit_LTLIBRARIES = kcmshell.la +tdeinit_LTLIBRARIES = tdecmshell.la -kcmshell_la_SOURCES = main.cpp main.skel -kcmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE) -kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version +tdecmshell_la_SOURCES = main.cpp main.skel +tdecmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE) +tdecmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version noinst_HEADERS = main.h messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmshell.pot + $(XGETTEXT) *.cpp -o $(podir)/tdecmshell.pot include $(top_srcdir)/admin/Doxyfile.am diff --git a/kcmshell/main.cpp b/tdecmshell/main.cpp similarity index 97% rename from kcmshell/main.cpp rename to tdecmshell/main.cpp index 29aba0501..358b00ccb 100644 --- a/kcmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -120,7 +120,7 @@ bool KCMShell::isRunning() if( dcopClient()->appId() == m_dcopName ) return false; // We are the one and only. - kdDebug(780) << "kcmshell with modules '" << + kdDebug(780) << "tdecmshell with modules '" << m_dcopName << "' is already running." << endl; dcopClient()->attach(); // Reregister as anonymous @@ -157,7 +157,7 @@ void KCMShellMultiDialog::activate( TQCString asn_id ) void KCMShell::setDCOPName(const TQCString &dcopName, bool rootMode ) { - m_dcopName = "kcmshell_"; + m_dcopName = "tdecmshell_"; if( rootMode ) m_dcopName += "rootMode_"; @@ -198,7 +198,7 @@ static void setIcon(TQWidget *w, const TQString &iconName) extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) { - TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"), + TDEAboutData aboutData( "tdecmshell", I18N_NOOP("TDE Control Module"), 0, I18N_NOOP("A tool to start single TDE control modules"), TDEAboutData::License_GPL, @@ -211,7 +211,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); - TDEGlobal::locale()->setMainCatalogue("kcmshell"); + TDEGlobal::locale()->setMainCatalogue("tdecmshell"); TDECmdLineArgs::init(_argc, _argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. @@ -283,7 +283,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) } //KDialogBase::DialogType dtype = KDialogBase::Plain; // FIXME - KDialogBase::DialogType dtype = KDialogBase::IconList; // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with kcmshell in the Plain mode + KDialogBase::DialogType dtype = KDialogBase::IconList; // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with tdecmshell in the Plain mode // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );] // In fact, this method of display may be preferable to the Plain mode from a UX perspective, // as the icon shows the user what the active kcontrol module is called. diff --git a/kcmshell/main.h b/tdecmshell/main.h similarity index 88% rename from kcmshell/main.h rename to tdecmshell/main.h index f43cf98cb..f135c2a33 100644 --- a/kcmshell/main.h +++ b/tdecmshell/main.h @@ -19,8 +19,8 @@ */ -#ifndef __kcmshell_h__ -#define __kcmshell_h__ +#ifndef __tdecmshell_h__ +#define __tdecmshell_h__ #include @@ -28,7 +28,7 @@ #include /** - * The TDEApplication instance for kcmshell. + * The TDEApplication instance for tdecmshell. */ class KCMShell : public TDEApplication { @@ -41,12 +41,12 @@ public: * and then registers with DCOP. * * @param dcopName name to set the DCOP name to - * @param rootMode true if the kcmshell is embedding + * @param rootMode true if the tdecmshell is embedding */ void setDCOPName(const TQCString &dcopName, bool rootMode ); /** - * Waits until the last instance of kcmshell with the same + * Waits until the last instance of tdecmshell with the same * module as this one exits, and then exits. */ void waitForExit(); @@ -66,7 +66,7 @@ private: /** * The DCOP name which actually is registered. - * For example "kcmshell_mouse". + * For example "tdecmshell_mouse". */ TQCString m_dcopName; @@ -101,4 +101,4 @@ k_dcop: // vim: sw=4 et sts=4 -#endif //__kcmshell_h__ +#endif //__tdecmshell_h__ diff --git a/kconf_update/CMakeLists.txt b/tdeconf_update/CMakeLists.txt similarity index 83% rename from kconf_update/CMakeLists.txt rename to tdeconf_update/CMakeLists.txt index 2e25811a7..fffb66e80 100644 --- a/kconf_update/CMakeLists.txt +++ b/tdeconf_update/CMakeLists.txt @@ -20,12 +20,12 @@ link_directories( ) -##### kconf_update ############################## +##### tdeconf_update ############################## -set( target kconf_update ) +set( target tdeconf_update ) set( ${target}_SRCS - kconf_update.cpp + tdeconf_update.cpp ) tde_add_tdeinit_executable( ${target} AUTOMOC diff --git a/kconf_update/Mainpage.dox b/tdeconf_update/Mainpage.dox similarity index 82% rename from kconf_update/Mainpage.dox rename to tdeconf_update/Mainpage.dox index 9db5adb3b..2557fe1c0 100644 --- a/kconf_update/Mainpage.dox +++ b/tdeconf_update/Mainpage.dox @@ -1,6 +1,6 @@ -/** @mainpage ./kconf_update +/** @mainpage ./tdeconf_update -kconf_update is a tool designed to update config files. Over time applications +tdeconf_update is a tool designed to update config files. Over time applications sometimes need to rearrange the way configuration options are stored. Since such an update shouldn't influence the configuration options that the user has selected, the application must take care that the options stored in the @@ -13,7 +13,7 @@ several drawbacks: needed, resulting in a slower startup. - The application becomes bigger with code that will only be used once. -kconf_update addresses these problems by offering a framework to update +tdeconf_update addresses these problems by offering a framework to update configuration files without adding code to the application itself. See the README file for more information. diff --git a/kconf_update/Makefile.am b/tdeconf_update/Makefile.am similarity index 80% rename from kconf_update/Makefile.am rename to tdeconf_update/Makefile.am index afe3864d9..9041aad8a 100644 --- a/kconf_update/Makefile.am +++ b/tdeconf_update/Makefile.am @@ -20,14 +20,14 @@ INCLUDES= -I../kded $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kconf_update.la +tdeinit_LTLIBRARIES = tdeconf_update.la -kconf_update_la_SOURCES = kconf_update.cpp -kconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) -kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version +tdeconf_update_la_SOURCES = tdeconf_update.cpp +tdeconf_update_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) +tdeconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version METASOURCES = AUTO # Internal -# noinst_HEADERS = kconf_update.h +# noinst_HEADERS = tdeconf_update.h diff --git a/kconf_update/README.kconf_update b/tdeconf_update/README.tdeconf_update similarity index 78% rename from kconf_update/README.kconf_update rename to tdeconf_update/README.tdeconf_update index c8229c735..340f71eaa 100644 --- a/kconf_update/README.kconf_update +++ b/tdeconf_update/README.tdeconf_update @@ -1,4 +1,4 @@ -README kconf_update +README tdeconf_update Version: 1.1 Author: Waldo Bastian , @@ -6,7 +6,7 @@ Author: Waldo Bastian , What it does ============ -kconf_update is a tool designed to update config files. Over time applications +tdeconf_update is a tool designed to update config files. Over time applications sometimes need to rearrange the way configuration options are stored. Since such an update shouldn't influence the configuration options that the user has selected, the application must take care that the options stored in the @@ -19,7 +19,7 @@ several drawbacks: needed, resulting in a slower startup. * The application becomes bigger with code that will only be used once. -kconf_update addresses these problems by offering a framework to update +tdeconf_update addresses these problems by offering a framework to update configuration files without adding code to the application itself. @@ -27,7 +27,7 @@ How it works ============ Applications can install so called "update files" under -$TDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and +$TDEDIR/share/apps/tdeconf_update. An update file has ".upd" as extension and contains instructions for transferring/converting configuration information from one place to another. @@ -36,7 +36,7 @@ or when kded detects a new update file in the above mentioned location. Update files are separated into sections. Each section has an Id. When a section describing a configuration change has been applied, the Id will be -stored in the file "kconf_updaterc". This information is used to make sure +stored in the file "tdeconf_updaterc". This information is used to make sure that a configuration update is only performed once. If you overwrite an existing update file with a new version that contains a @@ -76,18 +76,18 @@ is used as new entries for . Existing entries can be deleted by adding lines with "# DELETE [group]key" in the output of the script. To delete a whole group use "# DELETEGROUP [group]". -