From 7574a7287e2e121c9d5c91a5f4ea38c5b3ae2a04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:28:57 -0600 Subject: [PATCH] Additional kde to tde renaming --- CMakeLists.txt | 10 +- README | 4 +- applnk/compat/passwords.desktop | 130 +++++++++--------- config.h.cmake | 4 +- doc/faq/install.docbook | 4 +- doc/faq/webbrowse.docbook | 2 +- doc/glossary/CMakeLists.txt | 2 +- doc/glossary/index.docbook | 4 +- doc/glossary/kdeprintingglossary.docbook | 16 +-- doc/kcontrol/passwords/index.docbook | 4 +- doc/kdeprint/CMakeLists.txt | 2 +- doc/kdeprint/add-printer-wiz.docbook | 18 +-- doc/kdeprint/cups-config.docbook | 14 +- doc/kdeprint/cupsoptions.docbook | 16 +-- doc/kdeprint/extensions.docbook | 2 +- doc/kdeprint/final-word.docbook | 12 +- doc/kdeprint/getting-started.docbook | 24 ++-- doc/kdeprint/highlights.docbook | 76 +++++----- doc/kdeprint/index.docbook | 24 ++-- doc/kdeprint/lprng.docbook | 2 +- doc/kdeprint/tech-overview.docbook | 74 +++++----- doc/kdeprint/theory.docbook | 4 +- doc/kdesu/CMakeLists.txt | 2 +- doc/kdesu/index.docbook | 80 +++++------ doc/kdesu/man-kdesu.1.docbook | 38 ++--- doc/kioslave/index.docbook | 2 +- doc/kioslave/print.docbook | 10 +- doc/konqueror/faq.docbook | 2 +- doc/konqueror/filemanager.docbook | 2 +- doc/userguide/base-kde-applications.docbook | 4 +- doc/userguide/kde-as-root.docbook | 6 +- doc/userguide/kde-for-admins.docbook | 84 +++++------ doc/userguide/konsole-intro.docbook | 4 +- drkonqi/Makefile.am | 2 +- drkonqi/krashconf.cpp | 4 +- drkonqi/main.cpp | 2 +- kappfinder/CMakeLists.txt | 2 +- kappfinder/Makefile.am | 4 +- kate/app/CMakeLists.txt | 8 +- kate/app/Makefile.am | 2 +- kate/app/katemain.cpp | 2 +- kate/interfaces/Makefile.am | 2 +- kate/utils/CMakeLists.txt | 2 +- kcheckpass/CMakeLists.txt | 2 +- kcheckpass/Makefile.am | 2 +- kcminit/CMakeLists.txt | 8 +- kcminit/Makefile.am | 2 +- kcminit/main.cpp | 4 +- kcontrol/access/CMakeLists.txt | 6 +- kcontrol/access/Makefile.am | 2 +- kcontrol/arts/arts.cpp | 2 +- kcontrol/bell/CMakeLists.txt | 2 +- kcontrol/bell/Makefile.am | 2 +- kcontrol/crypto/Makefile.am | 2 +- kcontrol/crypto/crypto.cpp | 2 +- kcontrol/css/Makefile.am | 2 +- kcontrol/displayconfig/Makefile.am | 2 +- kcontrol/dnssd/CMakeLists.txt | 2 +- kcontrol/dnssd/kcmdnssd.cpp | 2 +- kcontrol/filetypes/Makefile.am | 2 +- kcontrol/fonts/CMakeLists.txt | 2 +- kcontrol/fonts/fonts.cpp | 2 +- kcontrol/iccconfig/Makefile.am | 2 +- kcontrol/info/CMakeLists.txt | 2 +- kcontrol/ioslaveinfo/Makefile.am | 2 +- kcontrol/joystick/CMakeLists.txt | 2 +- kcontrol/kcontrol/CMakeLists.txt | 4 +- kcontrol/kcontrol/Makefile.am | 2 +- kcontrol/kcontrol/aboutwidget.cpp | 4 +- kcontrol/kcontrol/modules.cpp | 12 +- kcontrol/keys/Makefile.am | 2 +- kcontrol/keys/kaccelaction.h | 2 +- kcontrol/keys/modifiers.cpp | 2 +- kcontrol/kfontinst/ChangeLog | 2 +- kcontrol/kfontinst/kio/CMakeLists.txt | 2 +- kcontrol/kfontinst/kio/KioFonts.cpp | 2 +- kcontrol/kfontinst/kio/Makefile.am | 2 +- kcontrol/kfontinst/viewpart/CMakeLists.txt | 2 +- kcontrol/kfontinst/viewpart/Makefile.am | 2 +- kcontrol/konqhtml/Makefile.am | 2 +- kcontrol/konsole/Makefile.am | 2 +- kcontrol/krdb/CMakeLists.txt | 2 +- kcontrol/krdb/krdb.cpp | 2 +- kcontrol/launch/CMakeLists.txt | 2 +- kcontrol/locale/kcmlocale.cpp | 6 +- kcontrol/nics/Makefile.am | 2 +- kcontrol/performance/CMakeLists.txt | 2 +- kcontrol/performance/Makefile.am | 2 +- kcontrol/privacy/kprivacymanager.cpp | 2 +- kcontrol/randr/CMakeLists.txt | 2 +- kcontrol/smartcard/Makefile.am | 2 +- kcontrol/smartcard/nosmartcardbase.ui | 2 +- kcontrol/smserver/CMakeLists.txt | 2 +- kcontrol/smserver/Makefile.am | 2 +- kcontrol/spellchecking/CMakeLists.txt | 2 +- kcontrol/spellchecking/Makefile.am | 2 +- kcontrol/style/keramik/CMakeLists.txt | 2 +- kcontrol/taskbar/Makefile.am | 2 +- kcontrol/usbview/CMakeLists.txt | 2 +- kcontrol/view1394/CMakeLists.txt | 2 +- kcontrol/xinerama/CMakeLists.txt | 2 +- kcontrol/xinerama/Makefile.am | 2 +- kdebugdialog/CMakeLists.txt | 2 +- kdepasswd/Makefile.am | 2 +- kdepasswd/kcm/chfnprocess.cpp | 2 +- kdepasswd/kcm/chfnprocess.h | 2 +- kdepasswd/kdepasswd.cpp | 2 +- kdepasswd/passwd.cpp | 4 +- kdepasswd/passwd.h | 4 +- kdepasswd/passwddlg.cpp | 2 +- kdepasswd/passwddlg.h | 2 +- kdeprint/CMakeLists.txt | 4 +- kdeprint/Makefile.am | 2 +- kdeprint/kdeprint_part/CMakeLists.txt | 6 +- kdeprint/kdeprint_part/Makefile.am | 12 +- kdeprint/kdeprint_part/kdeprint_part.rc | 2 +- kdeprint/kdeprint_part/printpart.cpp | 12 +- kdeprint/kdeprint_part/printpart.h | 2 +- kdeprint/kdeprintfax/CMakeLists.txt | 18 +-- kdeprint/kdeprintfax/Makefile.am | 24 ++-- kdeprint/kdeprintfax/anytops | 4 +- kdeprint/kdeprintfax/conffax.cpp | 2 +- kdeprint/kdeprintfax/conffax.h | 2 +- kdeprint/kdeprintfax/conffilters.cpp | 6 +- kdeprint/kdeprintfax/conffilters.h | 2 +- kdeprint/kdeprintfax/confgeneral.cpp | 2 +- kdeprint/kdeprintfax/confgeneral.h | 2 +- kdeprint/kdeprintfax/configdlg.cpp | 4 +- kdeprint/kdeprintfax/configdlg.h | 2 +- kdeprint/kdeprintfax/confsystem.cpp | 2 +- kdeprint/kdeprintfax/confsystem.h | 2 +- kdeprint/kdeprintfax/defcmds.cpp | 2 +- kdeprint/kdeprintfax/defcmds.h | 2 +- kdeprint/kdeprintfax/faxab.cpp | 2 +- kdeprint/kdeprintfax/faxab.h | 2 +- kdeprint/kdeprintfax/faxctrl.cpp | 8 +- kdeprint/kdeprintfax/faxctrl.h | 4 +- kdeprint/kdeprintfax/filterdlg.cpp | 2 +- kdeprint/kdeprintfax/filterdlg.h | 2 +- kdeprint/kdeprintfax/kdeprintfax.cpp | 8 +- kdeprint/kdeprintfax/kdeprintfax.desktop | 4 +- kdeprint/kdeprintfax/kdeprintfax.h | 2 +- kdeprint/kdeprintfax/kdeprintfaxui.rc | 2 +- kdeprint/kdeprintfax/main.cpp | 10 +- kdeprint/kjobviewer/CMakeLists.txt | 6 +- kdeprint/kjobviewer/Makefile.am | 4 +- kdeprint/kjobviewer/kjobviewer.cpp | 8 +- kdeprint/kjobviewer/kjobviewer.h | 4 +- kdeprint/kjobviewer/main.cpp | 4 +- kdeprint/kprinter/CMakeLists.txt | 6 +- kdeprint/kprinter/Makefile.am | 4 +- kdeprint/kprinter/kprinter.desktop | 2 +- kdeprint/kprinter/main.cpp | 2 +- kdeprint/kprinter/printwrapper.cpp | 8 +- kdeprint/kprinter/printwrapper.h | 2 +- kdeprint/printmgr/CMakeLists.txt | 2 +- kdeprint/printmgr/Makefile.am | 2 +- kdeprint/printmgr/kcmprintmgr.cpp | 6 +- kdeprint/printmgr/kcmprintmgr.h | 2 +- kdeprint/printmgr/printers.desktop | 2 +- kdeprint/slave/CMakeLists.txt | 2 +- kdeprint/slave/Makefile.am | 2 +- kdeprint/slave/kio_print.cpp | 18 +-- kdeprint/slave/kio_print.h | 2 +- kdeprint/slave/templates/CMakeLists.txt | 6 +- kdeprint/slave/templates/Makefile.am | 6 +- kdeprint/slave/templates/class.template | 4 +- kdeprint/slave/templates/driver.template | 4 +- kdeprint/slave/templates/jobs.template | 4 +- kdeprint/slave/templates/printer.template | 4 +- kdeprint/slave/templates/pseudo.template | 4 +- kdesktop/CMakeLists.txt | 4 +- kdesktop/DESIGN | 2 +- kdesktop/Makefile.am | 2 +- kdesktop/kshadowengine.h | 2 +- kdesktop/kwebdesktop/Makefile.am | 2 +- kdesktop/lock/Makefile.am | 2 +- kdesktop/lock/infodlg.cc | 2 +- kdesktop/lock/lockdlg.cc | 2 +- kdesktop/lock/querydlg.cc | 2 +- kdesktop/lock/sakdlg.cc | 2 +- kdesktop/lock/securedlg.cc | 2 +- kdesktop/minicli.cpp | 4 +- kdesu/CMakeLists.txt | 4 +- kdesu/ChangeLog | 16 +-- kdesu/FAQ | 6 +- kdesu/LICENSE.readme | 2 +- kdesu/Makefile.am | 2 +- kdesu/README | 4 +- kdesu/configure.in.in | 14 +- kdesu/kdesu/CMakeLists.txt | 8 +- kdesu/kdesu/Makefile.am | 16 +-- kdesu/kdesu/kdesu.cpp | 14 +- kdesu/kdesu/sudlg.cpp | 4 +- kdesu/kdesu/sudlg.h | 2 +- kdesu/kdesud/CMakeLists.txt | 12 +- kdesu/kdesud/Makefile.am | 22 +-- kdesu/kdesud/handler.cpp | 12 +- kdesu/kdesud/handler.h | 2 +- kdesu/kdesud/kdesud.cpp | 28 ++-- kdesu/kdesud/lexer.cpp | 4 +- kdesu/kdesud/lexer.h | 4 +- kdesu/kdesud/repo.cpp | 2 +- kdesu/kdesud/repo.h | 2 +- kdesu/kdesud/secure.cpp | 4 +- kdesu/kdesud/secure.h | 2 +- kdialog/Makefile.am | 2 +- kdm/kfrontend/CMakeLists.txt | 2 +- kdm/kfrontend/Makefile.am | 4 +- kdm/kfrontend/sakdlg.cc | 2 +- kdmlib/CMakeLists.txt | 6 +- kdmlib/kdmtsak.h | 32 ++--- kfind/Makefile.am | 2 +- khelpcenter/CMakeLists.txt | 6 +- khelpcenter/Makefile.am | 6 +- khelpcenter/htmlsearch/Makefile.am | 2 +- khelpcenter/kcmhelpcenter.cpp | 2 +- khotkeys/app/CMakeLists.txt | 6 +- khotkeys/app/Makefile.am | 2 +- khotkeys/kcontrol/CMakeLists.txt | 2 +- khotkeys/kcontrol/init.cpp | 4 +- khotkeys/kcontrol/kcmkhotkeys.cpp | 2 +- khotkeys/kcontrol/menuedit.cpp | 2 +- kicker/DESIGN | 6 +- kicker/applets/clock/Makefile.am | 2 +- kicker/applets/clock/clock.cpp | 2 +- kicker/applets/launcher/Makefile.am | 2 +- kicker/applets/menu/CMakeLists.txt | 2 +- kicker/applets/minipager/Makefile.am | 2 +- .../applets/naughty/NaughtyProcessMonitor.cpp | 6 +- kicker/applets/systemtray/Makefile.am | 2 +- kicker/applets/taskbar/Makefile.am | 2 +- kicker/extensions/dockbar/CMakeLists.txt | 2 +- kicker/extensions/kasbar/Makefile.am | 4 +- kicker/kicker/CMakeLists.txt | 6 +- kicker/kicker/Makefile.am | 2 +- kicker/kicker/core/kicker.cpp | 2 +- kicker/libkicker/kshadowengine.h | 2 +- kicker/menuext/CMakeLists.txt | 2 +- kicker/menuext/Makefile.am | 2 +- kicker/menuext/find/CMakeLists.txt | 2 +- kicker/menuext/kate/CMakeLists.txt | 2 +- kicker/menuext/kate/katesessionmenu.cpp | 2 +- kicker/menuext/kdeprint/CMakeLists.txt | 6 +- kicker/menuext/kdeprint/Makefile.am | 12 +- kicker/menuext/kdeprint/print_mnu.cpp | 26 ++-- kicker/menuext/kdeprint/print_mnu.h | 2 +- kicker/menuext/kdeprint/printmenu.desktop | 2 +- kicker/menuext/konq-profiles/konqy_menu.cpp | 10 +- kicker/menuext/konsole/konsole_mnu.cpp | 8 +- kicker/menuext/prefmenu/CMakeLists.txt | 2 +- kicker/menuext/remote/CMakeLists.txt | 2 +- kicker/proxy/CMakeLists.txt | 8 +- kicker/proxy/Makefile.am | 4 +- kicker/taskmanager/CMakeLists.txt | 2 +- kioslave/DEBUG.howto | 26 ++-- kioslave/about/Makefile.am | 2 +- kioslave/cgi/kcmcgi/Makefile.am | 2 +- kioslave/finger/Makefile.am | 2 +- kioslave/fish/Makefile.am | 2 +- kioslave/home/kdedmodule/CMakeLists.txt | 2 +- kioslave/mac/Makefile.am | 2 +- kioslave/man/Makefile.am | 6 +- kioslave/media/mediamanager/CMakeLists.txt | 4 +- kioslave/media/mediamanager/halbackend.cpp | 32 ++--- kioslave/media/medianotifier/CMakeLists.txt | 2 +- kioslave/media/mounthelper/Makefile.am | 2 +- kioslave/nfs/Makefile.am | 2 +- kioslave/nfs/kio_nfs.cpp | 2 +- kioslave/remote/kdedmodule/CMakeLists.txt | 2 +- kioslave/sftp/CHANGELOG | 2 +- kioslave/sftp/Makefile.am | 2 +- kioslave/sftp/kio_sftp.cpp | 2 +- kioslave/sftp/process.cpp | 6 +- kioslave/sftp/process.h | 2 +- kioslave/system/kdedmodule/CMakeLists.txt | 2 +- kioslave/tar/Makefile.am | 2 +- kioslave/thumbnail/CMakeLists.txt | 6 +- kioslave/thumbnail/Makefile.am | 2 +- kioslave/trash/Makefile.am | 2 +- klipper/CMakeLists.txt | 2 +- klipper/Makefile.am | 2 +- kmenuedit/CMakeLists.txt | 8 +- kmenuedit/Makefile.am | 2 +- knetattach/Makefile.am | 2 +- konqueror/CMakeLists.txt | 4 +- konqueror/DESIGN | 2 +- konqueror/Makefile.am | 2 +- konqueror/about/konq_aboutpage.cc | 18 +-- konqueror/client/CMakeLists.txt | 4 +- konqueror/client/Makefile.am | 2 +- konqueror/keditbookmarks/CMakeLists.txt | 4 +- konqueror/keditbookmarks/Makefile.am | 4 +- konqueror/konq_combo.cc | 2 +- konqueror/konq_mainwindow.cc | 2 +- konqueror/preloader/CMakeLists.txt | 2 +- konqueror/preloader/preloader.cc | 2 +- .../shellcmdplugin/kshellcmdexecutor.cpp | 2 +- .../sidebar/trees/history_module/Makefile.am | 2 +- konsole/konsole/CMakeLists.txt | 8 +- konsole/konsole/Makefile.am | 6 +- konsole/konsole/konsole.cpp | 2 +- konsole/konsole/printsettings.cpp | 2 +- konsole/konsole/printsettings.h | 4 +- kpager/CMakeLists.txt | 2 +- kpager/Makefile.am | 2 +- kpersonalizer/Makefile.am | 2 +- kreadconfig/CMakeLists.txt | 4 +- kreadconfig/Makefile.am | 2 +- krootbacking/CMakeLists.txt | 2 +- kscreensaver/CMakeLists.txt | 4 +- kscreensaver/Makefile.am | 2 +- ksmserver/CMakeLists.txt | 6 +- ksmserver/Makefile.am | 4 +- ksmserver/README | 4 +- ksmserver/server.cpp | 4 +- ksplashml/Makefile.am | 2 +- ksplashml/themeengine/CMakeLists.txt | 2 +- ksplashml/themeengine/default/Makefile.am | 2 +- ksplashml/themeengine/simple/Makefile.am | 2 +- ksplashml/themeengine/standard/Makefile.am | 2 +- ksplashml/themeengine/unified/Makefile.am | 2 +- kstart/CMakeLists.txt | 2 +- kstart/Makefile.am | 2 +- ksysguard/Makefile.in.temp | 2 +- ksysguard/gui/Makefile.am | 2 +- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 4 +- ksysguard/gui/ksgrd/CMakeLists.txt | 2 +- ksysguard/ksysguardd/Irix/ProcessList.c | 2 +- ksysguard/ksysguardd/Linux/ProcessList.c | 8 +- ksysguard/ksysguardd/Makefile.am | 2 +- ksystraycmd/CMakeLists.txt | 2 +- ksystraycmd/Makefile.am | 2 +- ktip/CMakeLists.txt | 2 +- ktip/Makefile.am | 2 +- ktip/tips | 8 +- kwin/CMakeLists.txt | 6 +- kwin/COMPLIANCE | 4 +- kwin/HACKING | 2 +- kwin/Makefile.am | 2 +- kwin/README | 2 +- kwin/clients/PORTING | 2 +- kwin/clients/b2/CMakeLists.txt | 2 +- kwin/clients/b2/config/CMakeLists.txt | 2 +- kwin/clients/default/CMakeLists.txt | 2 +- kwin/clients/default/config/CMakeLists.txt | 2 +- kwin/clients/keramik/CMakeLists.txt | 2 +- kwin/clients/keramik/Makefile.am | 2 +- kwin/clients/keramik/config/CMakeLists.txt | 2 +- kwin/clients/kwmtheme/Makefile.am | 2 +- .../kwmtheme/cli_installer/Makefile.am | 2 +- kwin/clients/laptop/CMakeLists.txt | 2 +- kwin/clients/modernsystem/CMakeLists.txt | 2 +- .../modernsystem/config/CMakeLists.txt | 2 +- kwin/clients/plastik/CMakeLists.txt | 2 +- kwin/clients/plastik/config/CMakeLists.txt | 2 +- kwin/clients/quartz/CMakeLists.txt | 2 +- kwin/clients/quartz/config/CMakeLists.txt | 2 +- kwin/clients/redmond/CMakeLists.txt | 2 +- kwin/clients/web/CMakeLists.txt | 2 +- kwin/data/CMakeLists.txt | 4 +- kwin/kcmkwin/kwindecoration/CMakeLists.txt | 2 +- kwin/kcmkwin/kwinoptions/CMakeLists.txt | 2 +- kwin/kcmkwin/kwinrules/CMakeLists.txt | 6 +- kwin/kcmkwin/kwinrules/Makefile.am | 2 +- kwin/killer/CMakeLists.txt | 2 +- kwin/killer/Makefile.am | 2 +- kwin/lib/CMakeLists.txt | 6 +- kwin/rules.cpp | 2 +- kwin/tools/Makefile.am | 2 +- kwin/workspace.cpp | 2 +- kxkb/CMakeLists.txt | 6 +- kxkb/Makefile.am | 2 +- kxkb/kcmlayout.cpp | 2 +- libkonq/Makefile.am | 2 +- libkonq/favicons/CMakeLists.txt | 2 +- nsplugins/CMakeLists.txt | 2 +- nsplugins/kcm_nsplugins.cpp | 2 +- nsplugins/test/Makefile.am | 2 +- startkde | 28 ++-- tqt3integration/libqtkde/CMakeLists.txt | 2 +- tqt3integration/module/CMakeLists.txt | 2 +- tqt3integration/utils/CMakeLists.txt | 2 +- 383 files changed, 1020 insertions(+), 1020 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7f75bbd..2144bd402 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ option( WITH_XDAMAGE "Enable xdamage support" OFF ) option( WITH_XEXT "Enable xext support" OFF ) option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF ) option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF ) -option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF ) +option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF ) option( WITH_PAM "kdm should use PAM" OFF ) option( WITH_SHADOW "kdm should use shadow passwords" OFF ) option( WITH_XDMCP "xdmcp support for kdm" OFF ) @@ -96,14 +96,14 @@ option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} ) option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} ) option( BUILD_KLIPPER "Build klipper" ${BUILD_ALL} ) option( BUILD_KMENUEDIT "Build kmenuedit" ${BUILD_ALL} ) -option( BUILD_KDEPRINT "Build kdeprint" ${BUILD_ALL} ) +option( BUILD_KDEPRINT "Build tdeprint" ${BUILD_ALL} ) option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} ) option( BUILD_KDEPASSWD "Build kdepasswd" ${BUILD_ALL} ) option( BUILD_KTIP "Build ktip" ${BUILD_ALL} ) option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} ) option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} ) option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} ) -option( BUILD_KDESU "Build kdesu" ${BUILD_ALL} ) +option( BUILD_KDESU "Build tdesu" ${BUILD_ALL} ) option( BUILD_KDM "Build kdm" ${BUILD_ALL} ) option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} ) option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} ) @@ -170,14 +170,14 @@ tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop ) tde_conditional_add_subdirectory( BUILD_KONSOLE konsole ) tde_conditional_add_subdirectory( BUILD_KLIPPER klipper ) tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit ) -tde_conditional_add_subdirectory( BUILD_KDEPRINT kdeprint ) +tde_conditional_add_subdirectory( BUILD_KDEPRINT tdeprint ) tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer ) tde_conditional_add_subdirectory( BUILD_KDEPASSWD kdepasswd ) tde_conditional_add_subdirectory( BUILD_KTIP ktip ) tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject ) tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog ) tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig ) -tde_conditional_add_subdirectory( BUILD_KDESU kdesu ) +tde_conditional_add_subdirectory( BUILD_KDESU tdesu ) tde_conditional_add_subdirectory( BUILD_KDM kdm ) tde_conditional_add_subdirectory( BUILD_KSMSERVER ksmserver ) tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml ) diff --git a/README b/README index f04df1ce3..c14e21c07 100644 --- a/README +++ b/README @@ -50,13 +50,13 @@ libraries. Here is an overview of the directories: * kdebugdialog Allows you to specify which debug messages you want to see. -* kdeprint +* tdeprint The KDE printing system. * kdesktop You guessed it: the desktop above the panel. -* kdesu +* tdesu A graphical front end to "su". * kdialog diff --git a/applnk/compat/passwords.desktop b/applnk/compat/passwords.desktop index e7b016d6b..9e04a2228 100644 --- a/applnk/compat/passwords.desktop +++ b/applnk/compat/passwords.desktop @@ -173,74 +173,74 @@ Comment[zh_CN]=配置密码设置 Comment[zh_TW]=設定密碼 Comment[zu]=Hlanganisela izilungiselelo zamagama-okudlula -Keywords=Passwords,kdesu,Echo characters,Remember passwords,Timeout -Keywords[ar]=كلمات المرور ، kdesu ، رموز الصدى ، تذكّر كلمات المرور ، الفترات الزمنية -Keywords[az]=Şifrələr,kdesu,Əks etmə Xarakterləri,şifrələri yadda saxla,vaxt dolması -Keywords[be]=Паролі,Запамінанне пароляў,Тэрмін чакання,Passwords,kdesu,Echo characters,Remember passwords,Timeout -Keywords[bg]=парола, потребителска, знаци, Passwords, kdesu, Echo characters, Remember passwords, Timeout -Keywords[ca]=Contrasenyes,kdesu,Caràcters amb eco,Recordar contrasenyes,Temps d'expiració -Keywords[cs]=Heslo,kdesu,Zapamatování hesla,Prodleva -Keywords[csb]=Parole,kdesu,pòwtôrzanié znaków,pòmión znaków,pamiãtanié parolów,limit czasu -Keywords[cy]=Cyfrineiriau,kdesu,Nodau atsain,Cofio cyfrineiriau,Goramser -Keywords[da]=Kodeord,kdesu,Ekko-tegn,Husk kodeord,Timeout,Udløb +Keywords=Passwords,tdesu,Echo characters,Remember passwords,Timeout +Keywords[ar]=كلمات المرور ، tdesu ، رموز الصدى ، تذكّر كلمات المرور ، الفترات الزمنية +Keywords[az]=Şifrələr,tdesu,Əks etmə Xarakterləri,şifrələri yadda saxla,vaxt dolması +Keywords[be]=Паролі,Запамінанне пароляў,Тэрмін чакання,Passwords,tdesu,Echo characters,Remember passwords,Timeout +Keywords[bg]=парола, потребителска, знаци, Passwords, tdesu, Echo characters, Remember passwords, Timeout +Keywords[ca]=Contrasenyes,tdesu,Caràcters amb eco,Recordar contrasenyes,Temps d'expiració +Keywords[cs]=Heslo,tdesu,Zapamatování hesla,Prodleva +Keywords[csb]=Parole,tdesu,pòwtôrzanié znaków,pòmión znaków,pamiãtanié parolów,limit czasu +Keywords[cy]=Cyfrineiriau,tdesu,Nodau atsain,Cofio cyfrineiriau,Goramser +Keywords[da]=Kodeord,tdesu,Ekko-tegn,Husk kodeord,Timeout,Udløb Keywords[de]=Passwörter,Kdesu,Timeout,Zeitlimit -Keywords[el]=Κωδικοί πρόσβασης,kdesu,Εμφάνιση χαρακτήρων,διατήρηση στη μνήμη κωδικών πρόσβασης,Χρονικό όριο -Keywords[eo]=pasvorto,kdesu,eĥosigno,memoru pasvorton,tempolimo -Keywords[es]=Contraseñas,kdesu,Caracteres con eco,Recordar contraseñas,Tiempo de expiración -Keywords[et]=paroolid,kdesu,tagasiside,paroolide meeldejätmine,taimaut,aegumine -Keywords[eu]=Pasahitzak,kdesu,Echo karaktereak,Gogoratu pasahitzak,Denbora-muga -Keywords[fa]=اسم رمز‌ها، kdesu، پژواک نویسه‌ها، یادآوری اسم رمزها، اتمام وقت -Keywords[fi]=Salasanat,kdesu,Kaiutettavat merkit,Muista salasanat,Aikavalvonta -Keywords[fr]=mot de passe,mots de passe,kdesu,caractères d'affichage,mémoriser les mots de passe,mémorisation des mots de passe,enregistrement des mots de passe,enregistrer les mots de passe,délai,sécurité -Keywords[fy]=wachtwurden,kdesu,wachtwurden ûnthâlden,timeout,tiidslimyt,asterisken -Keywords[ga]=Focail fhaire,kdesu,Carachtair macalla,Meabhraigh focail fhaire,Teorainn ama -Keywords[gl]=Contrasinais,kdesu,carácteres eco,Lembrar contrasinais,Tempo de espera -Keywords[he]=הצגת תווים,שמירת ססמאות,זמן מוקצב,kdesu,ססמאות, Passwords,kdesu,Echo characters,Remember passwords,Timeout +Keywords[el]=Κωδικοί πρόσβασης,tdesu,Εμφάνιση χαρακτήρων,διατήρηση στη μνήμη κωδικών πρόσβασης,Χρονικό όριο +Keywords[eo]=pasvorto,tdesu,eĥosigno,memoru pasvorton,tempolimo +Keywords[es]=Contraseñas,tdesu,Caracteres con eco,Recordar contraseñas,Tiempo de expiración +Keywords[et]=paroolid,tdesu,tagasiside,paroolide meeldejätmine,taimaut,aegumine +Keywords[eu]=Pasahitzak,tdesu,Echo karaktereak,Gogoratu pasahitzak,Denbora-muga +Keywords[fa]=اسم رمز‌ها، tdesu، پژواک نویسه‌ها، یادآوری اسم رمزها، اتمام وقت +Keywords[fi]=Salasanat,tdesu,Kaiutettavat merkit,Muista salasanat,Aikavalvonta +Keywords[fr]=mot de passe,mots de passe,tdesu,caractères d'affichage,mémoriser les mots de passe,mémorisation des mots de passe,enregistrement des mots de passe,enregistrer les mots de passe,délai,sécurité +Keywords[fy]=wachtwurden,tdesu,wachtwurden ûnthâlden,timeout,tiidslimyt,asterisken +Keywords[ga]=Focail fhaire,tdesu,Carachtair macalla,Meabhraigh focail fhaire,Teorainn ama +Keywords[gl]=Contrasinais,tdesu,carácteres eco,Lembrar contrasinais,Tempo de espera +Keywords[he]=הצגת תווים,שמירת ססמאות,זמן מוקצב,tdesu,ססמאות, Passwords,tdesu,Echo characters,Remember passwords,Timeout Keywords[hi]=पासवर्ड,केडीईएसयू,अक्षरों को ऐसे दिखाएँ,पासवर्ड याद रखें,समय बीता -Keywords[hr]=Passwords,kdesu,Echo characters,Remember passwords,Timeout, šifre,zapamti šifre, prekoračenje vremena -Keywords[hsb]=Passwords,kdesu,Echo characters,Remember passwords,Timeout, maksimalny čas, spomjatkować, hesło -Keywords[hu]=jelszavak,kdesu,karakterkijelzés,jelszómentés,időtúllépés -Keywords[is]=Lykilorð,kdesu,muna lykilorð,útrunninn,tími -Keywords[it]=Password,kdesu,caratteri password,ricorda password,tempo massimo -Keywords[ja]=パスワード,kdesu,エコー文字,パスワードを保存,タイムアウト -Keywords[ka]=პაროლები, kdesu, Echo სიმბოლოები, პაროლების დამახსოვრება, დრო ამოიწურა -Keywords[km]=ពាក្យ​សម្ងាត់,kdesu,បង្ហាញ​តួអក្សរ,ចងចាំ​ពាក្យ​សម្ងាត់,អស់​ពេល -Keywords[lo]=ລະຫັດຜ່ານ,kdesu,ສະແດງອັກສອນ, ຈື່ລະຫັດຜ່ານ,ຫມົດເວລາ -Keywords[lt]=Slaptažodžiai,kdesu,Echo simboliai,Įsiminti slaptažodžius,Galiojimo laikas -Keywords[lv]=Paroles,kdesu,Eho simboli,Atcerēties paroles,Noildze -Keywords[mk]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,Лозинки,Ехо на знаци,памти лозинки,истек на време +Keywords[hr]=Passwords,tdesu,Echo characters,Remember passwords,Timeout, šifre,zapamti šifre, prekoračenje vremena +Keywords[hsb]=Passwords,tdesu,Echo characters,Remember passwords,Timeout, maksimalny čas, spomjatkować, hesło +Keywords[hu]=jelszavak,tdesu,karakterkijelzés,jelszómentés,időtúllépés +Keywords[is]=Lykilorð,tdesu,muna lykilorð,útrunninn,tími +Keywords[it]=Password,tdesu,caratteri password,ricorda password,tempo massimo +Keywords[ja]=パスワード,tdesu,エコー文字,パスワードを保存,タイムアウト +Keywords[ka]=პაროლები, tdesu, Echo სიმბოლოები, პაროლების დამახსოვრება, დრო ამოიწურა +Keywords[km]=ពាក្យ​សម្ងាត់,tdesu,បង្ហាញ​តួអក្សរ,ចងចាំ​ពាក្យ​សម្ងាត់,អស់​ពេល +Keywords[lo]=ລະຫັດຜ່ານ,tdesu,ສະແດງອັກສອນ, ຈື່ລະຫັດຜ່ານ,ຫມົດເວລາ +Keywords[lt]=Slaptažodžiai,tdesu,Echo simboliai,Įsiminti slaptažodžius,Galiojimo laikas +Keywords[lv]=Paroles,tdesu,Eho simboli,Atcerēties paroles,Noildze +Keywords[mk]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,Лозинки,Ехо на знаци,памти лозинки,истек на време Keywords[mn]=Нууц үгс,Kdesu,Хугацааны хязгаар,Хугацааны хязгаар -Keywords[ms]=Katalaluan,kdesu,Gema aksara,Ingat katalaluan,Masa Tamat -Keywords[nb]=Passord,kdesu,tegnekko,husk passord,tidsavbrudd -Keywords[nds]=Passwöör,kdesu,Teken wiesen,Passwöör marken,Timeout,Tietgrenz +Keywords[ms]=Katalaluan,tdesu,Gema aksara,Ingat katalaluan,Masa Tamat +Keywords[nb]=Passord,tdesu,tegnekko,husk passord,tidsavbrudd +Keywords[nds]=Passwöör,tdesu,Teken wiesen,Passwöör marken,Timeout,Tietgrenz Keywords[ne]=पासवर्ड, केडीई एस यू, इको क्यारेक्टर, पासवर्ड स्मरण, समय समाप्ति -Keywords[nl]=wachtwoorden,kdesu,wachtwoorden onthouden,timeout,tijdslimiet,asterisken -Keywords[nn]=passord,kdesu,teiknekko,hugs passord,ekko,tidsgrense -Keywords[nso]=Mantsuphetiso,kdesu,dihlaka ts a Echo,Gopola mantsuphetiso,Phelelo ya Nako -Keywords[pa]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,ਗੁਪਤ-ਕੋਡ -Keywords[pl]=Hasła,kdesu,powtarzanie znaków,echo znaków,pamiętanie haseł,limit czasu -Keywords[pt]=Senhas,kdesu,caracteres de eco,lembrar a senha,tempo limite -Keywords[pt_BR]=senhas,kdesu,ecoar caracteres,lembrar senhas,tempo limite, timeout -Keywords[ro]=parole,kdesu,ecou caractere,amintește parole,limită de timp -Keywords[rw]=Amagambobanga,kdesu,Inyuguti Echo,Kwibuka amagambobanga, Igihecyarenze -Keywords[se]=beassansánit,kdesu,mearaskádja,muitte beassansániid,áigemearri -Keywords[sk]=Heslá,kdesu,zobrazované znaky,zapamätanie hesiel,Timeout -Keywords[sl]=gesla,kdesu,zapomni si gesla,zakasnitev -Keywords[sr]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,лозинке, запамти лозинке,прекорачење времена -Keywords[sr@Latn]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,lozinke, zapamti lozinke,prekoračenje vremena -Keywords[sv]=Lösenord,kdesu,Eka tecken,Kom ihåg lösenord,Tidsgräns -Keywords[ta]=கடவுச்சொற்கள்,kdesu,எதிரொலிக்கும் எழுத்துகள்,கடவுச்சொற்களை நினைவில் கொள்,நேரமுடிவு +Keywords[nl]=wachtwoorden,tdesu,wachtwoorden onthouden,timeout,tijdslimiet,asterisken +Keywords[nn]=passord,tdesu,teiknekko,hugs passord,ekko,tidsgrense +Keywords[nso]=Mantsuphetiso,tdesu,dihlaka ts a Echo,Gopola mantsuphetiso,Phelelo ya Nako +Keywords[pa]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,ਗੁਪਤ-ਕੋਡ +Keywords[pl]=Hasła,tdesu,powtarzanie znaków,echo znaków,pamiętanie haseł,limit czasu +Keywords[pt]=Senhas,tdesu,caracteres de eco,lembrar a senha,tempo limite +Keywords[pt_BR]=senhas,tdesu,ecoar caracteres,lembrar senhas,tempo limite, timeout +Keywords[ro]=parole,tdesu,ecou caractere,amintește parole,limită de timp +Keywords[rw]=Amagambobanga,tdesu,Inyuguti Echo,Kwibuka amagambobanga, Igihecyarenze +Keywords[se]=beassansánit,tdesu,mearaskádja,muitte beassansániid,áigemearri +Keywords[sk]=Heslá,tdesu,zobrazované znaky,zapamätanie hesiel,Timeout +Keywords[sl]=gesla,tdesu,zapomni si gesla,zakasnitev +Keywords[sr]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,лозинке, запамти лозинке,прекорачење времена +Keywords[sr@Latn]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,lozinke, zapamti lozinke,prekoračenje vremena +Keywords[sv]=Lösenord,tdesu,Eka tecken,Kom ihåg lösenord,Tidsgräns +Keywords[ta]=கடவுச்சொற்கள்,tdesu,எதிரொலிக்கும் எழுத்துகள்,கடவுச்சொற்களை நினைவில் கொள்,நேரமுடிவு Keywords[te]=పాస్ వర్డులు, కెడిఈఎస్ యూ, చూపించే అక్షరాలు, పాస్ వర్డులు గుర్తుపెట్టుకో, సమయం అయిపోయింది -Keywords[th]=รหัสผ่าน,kdesu,แสดงอักขระ,จำรหัสผ่าน,หมดเวลา -Keywords[tr]=Paralolar,kdesu,Yankı karakterleri,paraloları hatırla,zaman aşımı -Keywords[uk]=паролі,kdesu,символ луни,запам'ятати паролі,тайм-аут -Keywords[uz]=Maxfiy soʻzlar,kdesu,Echo characters,Maxfiy soʻzlarni eslab qolish,Taymaut -Keywords[uz@cyrillic]=Махфий сўзлар,kdesu,Echo characters,Махфий сўзларни эслаб қолиш,Таймаут -Keywords[ven]=Phasiwede,kdesu,vhaanewa vha Echo,Humbula phasiwede,U fhela ha tshifhinga -Keywords[vi]=Mật khẩu,kdesu,Ký tự vọng,Nhớ mật khẩu,Giới hạn thời gian -Keywords[wa]=Sicrets, mots di passe,kdesu,caracteres echo,si sovni des screts, si sovni des mots d' passe,Timeout -Keywords[xh]=Amagama okugqitha,kdesu,iimpawu zesandi somkhwazo,Khumbula amagama okugqitha,Ixesha lokuphuma -Keywords[zh_CN]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,密码,超时,密码,回显字符,记住密码 -Keywords[zh_TW]=Passwords,kdesu,Echo characters,Remember passwords,Timeout,密碼,回應字元,記住密碼,作業逾時 -Keywords[zu]=Amagama-okudlula,kdesu,Izimpawu zomsindo wokumemeza,Khumbula amagama-okudlula,Isikhathi sokuphuma +Keywords[th]=รหัสผ่าน,tdesu,แสดงอักขระ,จำรหัสผ่าน,หมดเวลา +Keywords[tr]=Paralolar,tdesu,Yankı karakterleri,paraloları hatırla,zaman aşımı +Keywords[uk]=паролі,tdesu,символ луни,запам'ятати паролі,тайм-аут +Keywords[uz]=Maxfiy soʻzlar,tdesu,Echo characters,Maxfiy soʻzlarni eslab qolish,Taymaut +Keywords[uz@cyrillic]=Махфий сўзлар,tdesu,Echo characters,Махфий сўзларни эслаб қолиш,Таймаут +Keywords[ven]=Phasiwede,tdesu,vhaanewa vha Echo,Humbula phasiwede,U fhela ha tshifhinga +Keywords[vi]=Mật khẩu,tdesu,Ký tự vọng,Nhớ mật khẩu,Giới hạn thời gian +Keywords[wa]=Sicrets, mots di passe,tdesu,caracteres echo,si sovni des screts, si sovni des mots d' passe,Timeout +Keywords[xh]=Amagama okugqitha,tdesu,iimpawu zesandi somkhwazo,Khumbula amagama okugqitha,Ixesha lokuphuma +Keywords[zh_CN]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,密码,超时,密码,回显字符,记住密码 +Keywords[zh_TW]=Passwords,tdesu,Echo characters,Remember passwords,Timeout,密碼,回應字元,記住密碼,作業逾時 +Keywords[zu]=Amagama-okudlula,tdesu,Izimpawu zomsindo wokumemeza,Khumbula amagama-okudlula,Isikhathi sokuphuma diff --git a/config.h.cmake b/config.h.cmake index 235275827..cdf1db888 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -79,11 +79,11 @@ // kcontrol/input #cmakedefine HAVE_LIBUSB 1 -// kdeprint +// tdeprint #cmakedefine HAVE_SIGACTION 1 #cmakedefine HAVE_SIGSET 1 -// kdesu +// tdesu #cmakedefine HAVE_STRUCT_UCRED 1 #cmakedefine HAVE_GETPEEREID 1 #cmakedefine HAVE_SYS_SELECT_H 1 diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook index d428f0ae5..a0edad92d 100644 --- a/doc/faq/install.docbook +++ b/doc/faq/install.docbook @@ -167,7 +167,7 @@ server. -kdegames +tdegames Optional Various games like &kmahjongg;, &ksnake;, &kasteroids;, and @@ -206,7 +206,7 @@ download manager &kget;, and several other network-related programs. -kdepim +tdepim Optional Personal information management tools. Contains the email client &kmail;, the newsreader &knode; and other related programs. diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook index b80c7ae1a..94315dcf9 100644 --- a/doc/faq/webbrowse.docbook +++ b/doc/faq/webbrowse.docbook @@ -19,7 +19,7 @@ url="http://www.konqueror.org">http://www.konqueror.org where a Can I run &konqueror; without running &kde;? -Yes. Just install &Qt;, kdelibs and kdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "kdeinit" before running &konqueror;, it usually helps. +Yes. Just install &Qt;, kdelibs and kdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "tdeinit" before running &konqueror;, it usually helps. This is of course the same for any other &kde; application. diff --git a/doc/glossary/CMakeLists.txt b/doc/glossary/CMakeLists.txt index decd03348..73a84f204 100644 --- a/doc/glossary/CMakeLists.txt +++ b/doc/glossary/CMakeLists.txt @@ -10,5 +10,5 @@ ################################################# tde_create_handbook( - FILES checkxrefs index.docbook kdeprintingglossary.docbook + FILES checkxrefs index.docbook tdeprintingglossary.docbook DESTINATION khelpcenter/glossary ) diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook index 4aba44c53..f089c0bad 100644 --- a/doc/glossary/index.docbook +++ b/doc/glossary/index.docbook @@ -2,7 +2,7 @@ - + ]> @@ -10,7 +10,7 @@ -&glossary-kdeprinting; +&glossary-tdeprinting; Technologies diff --git a/doc/glossary/kdeprintingglossary.docbook b/doc/glossary/kdeprintingglossary.docbook index 7a9311c73..6a0f35a34 100644 --- a/doc/glossary/kdeprintingglossary.docbook +++ b/doc/glossary/kdeprintingglossary.docbook @@ -5,7 +5,7 @@ "customization/dtd/kdex.dtd" [ - + ]> @@ -170,7 +170,7 @@ Authentication BSD-style printing IPP - KDEPrint + KDEPrint LPR/LPD PPD @@ -184,7 +184,7 @@ is a valuable resource to answer many questions that anyone new to &CUPS; printing might have at first. - KDEPrint Handbook + KDEPrint Handbook @@ -715,7 +715,7 @@ now. - + KDEPrint The new printing functionality of &kde; since version 2.2 consists of several modules that translate the features and settings @@ -736,16 +736,16 @@ now. BSD-style printing &CUPS; kprinter - KDEPrint Handbook + KDEPrint Handbook - + KDEPrint Handbook... ...is the name of the reference document that describes KDEPrint functions to users and administrators. You can load it into Konqueror by - typing "help:/kdeprint" into the address field. The KDEPrint website is the resource for updates to this documentation, as well as PDF versions suitable for printing it. It is authored and maintained by Kurt @@ -1260,7 +1260,7 @@ now. has an "Add Printer Wizard" to make RLPR usage even easier. The kprinter command allows switching to RLPR "on the fly" at any time. - KDEPrint + KDEPrint kprinter printcap diff --git a/doc/kcontrol/passwords/index.docbook b/doc/kcontrol/passwords/index.docbook index 3aa2ed0bc..b2be11f36 100644 --- a/doc/kcontrol/passwords/index.docbook +++ b/doc/kcontrol/passwords/index.docbook @@ -31,7 +31,7 @@ Introduction This module of the &kcontrol; gives you options for configuring the way in -which the &kdesu; program treats passwords. &kdesu; will ask you for a password +which the &tdesu; program treats passwords. &tdesu; will ask you for a password when you try to carry out some privileged actions, such as changing the date/time stored in your system clock, or adding new users on your computer. @@ -69,7 +69,7 @@ choose a time period in minutes using the spinner labeled and 1200 minutes, or use the arrows on the spinner.) If the Remember passwords option has been selected, -kdesu will not ask you for a password for the length +tdesu will not ask you for a password for the length of time specified, after you have given the password once. Keep in mind, however, that this makes your workstation less secure. diff --git a/doc/kdeprint/CMakeLists.txt b/doc/kdeprint/CMakeLists.txt index 30f7f022c..3a1f95d9e 100644 --- a/doc/kdeprint/CMakeLists.txt +++ b/doc/kdeprint/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kdeprint ) +tde_create_handbook( DESTINATION tdeprint ) diff --git a/doc/kdeprint/add-printer-wiz.docbook b/doc/kdeprint/add-printer-wiz.docbook index 6b6ada4ea..28d5791d2 100644 --- a/doc/kdeprint/add-printer-wiz.docbook +++ b/doc/kdeprint/add-printer-wiz.docbook @@ -20,7 +20,7 @@ your box. change a setting. -The &kdeprint; wizard introduction screen +The &tdeprint; wizard introduction screen decide which setting could be useful. -&kdeprint; wizard network scan +&tdeprint; wizard network scan -In the &kdeprint; wizard, you can enter network details +In the &tdeprint; wizard, you can enter network details directly, or you can scan the network automatically. @@ -115,14 +115,14 @@ printer with &IPP;), you have an option for scanning the network. Be careful when applying this; in some environments network scanning is considered to be hostile and harmful! -In the case of SMB, &kdeprint; will use the +In the case of SMB, &tdeprint; will use the Samba utilities nmblookup and smbclient (which need to be installed for this to work) to retrieve the information it presents in a tree structure. In the case of &IPP; (Port 631) and TCP -Network/AppSocket (Port 9100) &kdeprint; will try to open the port and, +Network/AppSocket (Port 9100) &tdeprint; will try to open the port and, if successful, send an ipp-get-printer-attribute request to the printer. For newer &HP; printers the latter usually works, because they support both AppSocket and &IPP;. @@ -137,13 +137,13 @@ timeout to use. your network, if you use the scanning technique. -&kdeprint; wizard network configuration dialog +&tdeprint; wizard network configuration dialog -In the &kdeprint; wizard, you can enter parameters to have the +In the &tdeprint; wizard, you can enter parameters to have the wizard scan parts of your network. @@ -163,7 +163,7 @@ first, then the device model in the right part. This split window shows all &PPD;s found by &CUPS; in its standard repository of installable &PPD;s. This repository normally is /usr/share/cups/model/. If you want your -driver to be found automatically by &CUPS; and &kdeprint;, place it in +driver to be found automatically by &CUPS; and &tdeprint;, place it in there. @@ -215,7 +215,7 @@ url="http://www.linuxprinting.org">http://www.linuxprinting.org And ask for help. At a later stage, a document detailing the differences between the different driver and &PPD; models will appear at http://kdeprint.sourceforge.net/ +url="http://tdeprint.sourceforge.net">http://tdeprint.sourceforge.net/ Watch out for this! Via the Other... button you are able to diff --git a/doc/kdeprint/cups-config.docbook b/doc/kdeprint/cups-config.docbook index 3196c9af3..304fe9514 100644 --- a/doc/kdeprint/cups-config.docbook +++ b/doc/kdeprint/cups-config.docbook @@ -15,7 +15,7 @@ configuration file for that daemon is normally located in ASCII file with a syntax similar to the configuration file of the Apache web server. It is a good idea to create a backup copy, just in case something goes wrong with the -configuration through &kdeprint;/&CUPS; Server Configuration +configuration through &tdeprint;/&CUPS; Server Configuration dialogs: cp /etc/cups/cupsd.conf /etc/cups/cupsd.conf.bak @@ -52,7 +52,7 @@ class="directory">/usr/share/doc/cups/ or always refer to the original &CUPS; documentation. &CUPS; is, much like &kde; in a rapid development process. There are constantly new features being added. New features might for times be only configurable by -directly editing the configuration files. The &kdeprint; &GUI; might not +directly editing the configuration files. The &tdeprint; &GUI; might not have caught up with &CUPS; development. Just in case you want to look at the original configuration files @@ -198,12 +198,12 @@ http://www.linuxprinting.org/newsportal/ -And finally, there will be a WebSite for &kdeprint; and related -documentation, at -http://kdeprint.sourceforge.net/ +And finally, there will be a WebSite for &tdeprint; and related +documentation, at +http://tdeprint.sourceforge.net/ In the next section I will step you through most of the -configuration options of &kdeprint; with &CUPS;. +configuration options of &tdeprint; with &CUPS;. @@ -442,7 +442,7 @@ to. By default &CUPS; will use root@hostname. Contrary to what the quickhelp suggests, it is also legal to send an email full of praise and enthusiasm about &CUPS; and -&kdeprint; to the server administrator. +&tdeprint; to the server administrator. diff --git a/doc/kdeprint/cupsoptions.docbook b/doc/kdeprint/cupsoptions.docbook index dc886d21c..bd0ba95a3 100644 --- a/doc/kdeprint/cupsoptions.docbook +++ b/doc/kdeprint/cupsoptions.docbook @@ -2,14 +2,14 @@ &CUPS; options presently not available through &kcontrol; This chapter gives you some hints about further configuration -possibilities which may not be available through the &kdeprint; &GUI; +possibilities which may not be available through the &tdeprint; &GUI; interface to &CUPS;. Overview of provided features All of the most often used features and functions &CUPS; provides -are supported in &kdeprint;. +are supported in &tdeprint;. @@ -38,13 +38,13 @@ a start. There you find a link to locally available &CUPS; documentation in HTML and PDF if you are new to &CUPS;. -&CUPS; is accessible through other means than &kdeprint;: +&CUPS; is accessible through other means than &tdeprint;: commandline and browser are two native &CUPS; interfaces. The many commandline utilities add up to the most complete control you have on &CUPS;. The web interface is only a subset of all available configuration or control options. -This is also true for &kdeprint;. Generally, as &CUPS; develops, +This is also true for &tdeprint;. Generally, as &CUPS; develops, most new features will first be implemented through the commandline. Be sure to check the latest versions of the man pages for &CUPS; to stay up-to-date with new features after you install a new version. @@ -103,7 +103,7 @@ filter (1) - cups file conversion filter interfaces -Outside &kdeprint;: Hints & Tips Tricks with &CUPS; on the +<title>Outside &tdeprint;: Hints & Tips Tricks with &CUPS; on the Commandline Here are a few examples of options that are presently only @@ -288,9 +288,9 @@ handy. -Troubleshooting &CUPS; in &kdeprint; +Troubleshooting &CUPS; in &tdeprint; -This section of the &kdeprint; Handbook will live from the +This section of the &tdeprint; Handbook will live from the readers' feedback. Here is just a small beginning. @@ -587,7 +587,7 @@ with the name lp. Maybe printers it sees on the network into a Class name lp. All jobs destined to lp are sent to this class and the first available member prints it. So if you had this nice fellow (who listened closely -when you raved about &CUPS; and &kdeprint;) install &CUPS; and poke +when you raved about &CUPS; and &tdeprint;) install &CUPS; and poke around the system...get the idea? Take my advice: choose a unique name for any network printer! diff --git a/doc/kdeprint/extensions.docbook b/doc/kdeprint/extensions.docbook index 3995272c2..c14691d51 100644 --- a/doc/kdeprint/extensions.docbook +++ b/doc/kdeprint/extensions.docbook @@ -1,5 +1,5 @@ -&kdeprint; Extensions To All Print Subsystems +&tdeprint; Extensions To All Print Subsystems <quote>Virtual</quote> Printers diff --git a/doc/kdeprint/final-word.docbook b/doc/kdeprint/final-word.docbook index ed2ae029a..175afb2f1 100644 --- a/doc/kdeprint/final-word.docbook +++ b/doc/kdeprint/final-word.docbook @@ -72,7 +72,7 @@ community. Not least within the &kde; project... ;-) Jean-Eric Cuendet for starting kups and qtcups, the predecessors of -&kdeprint; +&tdeprint; Michael Goffioul for doing all the hard work recently @@ -101,14 +101,14 @@ writing Caveats -&kdeprint; has been developed on a system using &CUPS; 1.1.6. -&kdeprint; has been tested on other versions of &CUPS; and so +&tdeprint; has been developed on a system using &CUPS; 1.1.6. +&tdeprint; has been tested on other versions of &CUPS; and so far no incompatibilities are known. By the time of writing this Handbook, &CUPS; 1.1.9 is out with a few new features -not yet supported by &kdeprint;. Of course you are able to -access these features, but you will need to bypass &kdeprint; +not yet supported by &tdeprint;. Of course you are able to +access these features, but you will need to bypass &tdeprint; and use the &CUPS; command-line tools or edit configuration -files manually. &kdeprint;'s development will go on and this +files manually. &tdeprint;'s development will go on and this Handbook strives to always be the best available user documentation resource for it. diff --git a/doc/kdeprint/getting-started.docbook b/doc/kdeprint/getting-started.docbook index cb360379f..9ef1500b7 100644 --- a/doc/kdeprint/getting-started.docbook +++ b/doc/kdeprint/getting-started.docbook @@ -1,11 +1,11 @@ Getting Started -This chapter of the &kdeprint; Handbook will walk you through most -of the configuration or selection options of &kdeprint;. It will mainly +This chapter of the &tdeprint; Handbook will walk you through most +of the configuration or selection options of &tdeprint;. It will mainly deal with &CUPS; in this version, as the author is most familiar with -it, and also because &kdeprint; started off with supporting &CUPS; -best. Later versions of the &kdeprint; software and editions of this +it, and also because &tdeprint; started off with supporting &CUPS; +best. Later versions of the &tdeprint; software and editions of this handbook will support and explore other printing systems more closely. @@ -13,7 +13,7 @@ systems more closely. Selecting Your Print Subsystem You need to define your print subsystem, before you are able to -install any printer with the &kdeprint; framework. There are two areas +install any printer with the &tdeprint; framework. There are two areas where you can define this: either in &kcontrol; (The Printing Manager section), or directly and on the fly from the print dialog. @@ -51,7 +51,7 @@ your box prior to your selection, or before it takes effect. -On it's first startup, &kdeprint; will try an autodetection. This +On it's first startup, &tdeprint; will try an autodetection. This only works for: @@ -78,13 +78,13 @@ your selection. The author's personal recommendation is subsystem will take effect for all &kde; applications. Different users may have different print subsystems in use, if those do exist on the computer and are compliant with each other. Their settings are -stored in the kdeprintrc. This file is unique to +stored in the tdeprintrc. This file is unique to every user, and is normally installed in -$HOME/.kde/share/config/kdeprintrc. +$HOME/.kde/share/config/tdeprintrc. This file is not intended to be directly editable, and all -available options can be set from the &kdeprint; &GUI;. +available options can be set from the &tdeprint; &GUI;. You may even select a different printer subsystem, on the fly, from @@ -97,7 +97,7 @@ the &kprinter; dialog box. Once you have chosen your preferred and installed print subsystem, you are ready to investigate, configure administer and work with this -system through the &kdeprint; framework. +system through the &tdeprint; framework. Navigate to K Menu Preferences System @@ -131,10 +131,10 @@ choices at your fingertips than with any other printing system. &CUPS; is new to most Linux users (even the senior hackers amongst us), and it is quite easy to use. But it is at the same time very different from other printing systems. -Therfor the &CUPS; part in the &kdeprint; Handbook is naturally +Therfor the &CUPS; part in the &tdeprint; Handbook is naturally the most detailed. -Future editions of the &kdeprint; handbook will describe in +Future editions of the &tdeprint; handbook will describe in more detail the other systems. --> diff --git a/doc/kdeprint/highlights.docbook b/doc/kdeprint/highlights.docbook index 85e0e348f..72982c10c 100644 --- a/doc/kdeprint/highlights.docbook +++ b/doc/kdeprint/highlights.docbook @@ -1,19 +1,19 @@ - -&kdeprint;'s Highlights + +&tdeprint;'s Highlights -The new &kdeprint; system includes more than one highlight. +The new &tdeprint; system includes more than one highlight. Having worked in an environment in the past that is not exactly sophisticated, as far as printing is concerned, take a look at some of -the benefits that come with &kdeprint; +the benefits that come with &tdeprint; The <quote>Add Printer</quote> Wizard -&kdeprint; has an Add Printer Wizard. The Add +&tdeprint; has an Add Printer Wizard. The Add Printer Wizard helps you with adding and configuring a new printer. Of course, you may do this manually as well. -&kdeprint; helps you discover printers. It is able +&tdeprint; helps you discover printers. It is able to scan the environment for available devices and queues. This works for network connections using TCP (AppSocket, aka &HP; -A screenshot of the &kdeprint; PrintJob Viewer shows the information +A screenshot of the &tdeprint; PrintJob Viewer shows the information you get: Job-ID, target printer, job name, job owner, job status and job -size. In the next &kdeprint; release you will also see information about the +size. In the next &tdeprint; release you will also see information about the number of pages (as &CUPS; calculates it; see chapter on page accounting for more information about its merits and limitations). -A screenshot of the &kdeprint; PrintJob Viewer +A screenshot of the &tdeprint; PrintJob Viewer - + -Here's a screenshot of the &kdeprint; PrintJob Viewer. +Here's a screenshot of the &tdeprint; PrintJob Viewer. -A screenshot of the &kdeprint; PrintJob +A screenshot of the &tdeprint; PrintJob Viewer. @@ -106,7 +106,7 @@ to see this: -Here's a screenshot of the &kdeprint; PrintJob Viewer. +Here's a screenshot of the &tdeprint; PrintJob Viewer. @@ -116,7 +116,7 @@ to see this: Modules for different print subsystems -&kdeprint; uses different modules to realize the interface to the +&tdeprint; uses different modules to realize the interface to the possible print subsystems. Not all the modules are yet developed fully, but you will have basic printing functionality with: @@ -142,7 +142,7 @@ Modules for other print subsystems, such as PLP, PPR and PDQ may be available later. -&kdeprint; makes &kde; much more flexible. It gives freedom of +&tdeprint; makes &kde; much more flexible. It gives freedom of choice to &kde; 2.2 users. To use different available print subsystems, these must, of course, be installed independently from &kde;. In former versions, users were stuck with the old LPD @@ -152,19 +152,19 @@ appear on the scene. - -More &kdeprint; <quote>Goodies</quote> + +More &tdeprint; <quote>Goodies</quote> Benefitting all Print SubSystems. -Some specific features of &kdeprint; depend on the chosen print +Some specific features of &tdeprint; depend on the chosen print subsystem. This dependency might exist because those features are only -implemented there; remember, &kdeprint; is an intermediate layer between +implemented there; remember, &tdeprint; is an intermediate layer between &kde; applications, and the print subsystem, but it's no replacement for any print subsystem by itself. Such dependency may exist for another -reason: that &kdeprint; has not yet implemented an interface to all the +reason: that &tdeprint; has not yet implemented an interface to all the features of all the subsystems. -Other features include benefits from &kdeprint; that are +Other features include benefits from &tdeprint; that are independent of the chosen print subsystem, and are available with all of them. At present there are special or virtual printers, and some generic @@ -183,7 +183,7 @@ displaying on screen using &kghostview;. Special Printers -Amongst these additional &kdeprint; features are a few +Amongst these additional &tdeprint; features are a few special or virtual printers: These special printers may: @@ -232,7 +232,7 @@ configurable on a per-user basis. Generic Pre-Filtering -&kdeprint; provides you with a framework to define and configure +&tdeprint; provides you with a framework to define and configure your own pre-filters. These pre-filters may take effect before they are passed to your print subsystem for further processing, but after the (&PostScript;, @@ -264,13 +264,13 @@ any one of those formats. This makes an extension of the concept very easy for experienced developers, but end-user configuration is also done through an intuitive graphical user interface. So, fear not, you don't need to learn -XML because of &kdeprint;! +XML because of &tdeprint;! Multiple Pages Per Sheet Filter -This is a predefined filter that installs with &kdeprint;. It +This is a predefined filter that installs with &tdeprint;. It allows you to create a modified &PostScript; output, from &PostScript; input, that prints 1, 2, or 4 logical pages on a single sheet of paper. @@ -280,7 +280,7 @@ paper. Enscript Text Filter -This is a predefined filter that installs with &kdeprint;. It +This is a predefined filter that installs with &tdeprint;. It allows you to create &PostScript; output from any text file input, that includes syntax highlighting for program listings, pretty-printing, and nice configurable page frames and headers. @@ -315,9 +315,9 @@ side. These can then be folded to make a pamphlet. -&CUPS; Support: the Most Important Module in &kdeprint; +&CUPS; Support: the Most Important Module in &tdeprint; -&kdeprint; contains a module for &CUPS;. &CUPS;, the +&tdeprint; contains a module for &CUPS;. &CUPS;, the Common &UNIX; Printing System (http://www.cups.org/), is the most advanced, powerful and flexible of all print subsystems on &UNIX; and @@ -325,7 +325,7 @@ other &UNIX;-like operating systems. It is still quite new on the horizon, but is based on IPP, the Internet Printing Protocol, the newly emerging standard for the future of network printing. &CUPS; is clearly the print system of choice for Michael -Goffioul, the principal &kdeprint; developer. +Goffioul, the principal &tdeprint; developer. Experienced &kde; users may already be familiar with Michael's utilities qtcups and @@ -360,9 +360,9 @@ restart it. -&kdeprint; — The Heir +&tdeprint; — The Heir -The &CUPS; Module in &kdeprint; now contains all (and more) +The &CUPS; Module in &tdeprint; now contains all (and more) functions that were provided by qtcups and kups in former &kde; versions. @@ -372,7 +372,7 @@ functions that were provided by qtcups and kcmshell printers from now on. -The &kdeprint; module for &CUPS; also lets you fully administer +The &tdeprint; module for &CUPS; also lets you fully administer the print subsystem, just like kups did before. It can start, stop and configure your &CUPS; daemon. It can also start, stop, add and delete printers (&ie; printer @@ -385,7 +385,7 @@ different default setting of print options. &kprinter; — Graphical Print Command -&kdeprint;'s &CUPS; module gives you access to a graphical +&tdeprint;'s &CUPS; module gives you access to a graphical print command, like qtcups did before. @@ -469,16 +469,16 @@ for you. Read more about this in . Plans for Future Development What you have now is the first, already very feature-rich -version of &kdeprint;. This version is, of course, fully usable for +version of &tdeprint;. This version is, of course, fully usable for printing. You might even think that it was never so easy (not even back in the days when you had to use &Microsoft; &Windows;). - In the future, &kdeprint; will become even better. It will do a + In the future, &tdeprint; will become even better. It will do a better job of detecting your installed print subsystem -itself. Already &kdeprint; is doing quite well in automatically +itself. Already &tdeprint; is doing quite well in automatically sensing if you have &CUPS; on your system. But in many cases you will -have to tell &kdeprint; what you are using, if you want to keep a +have to tell &tdeprint; what you are using, if you want to keep a legacy print system. The most important improvement in the near future will be a @@ -511,7 +511,7 @@ a virtual folder to the services section of the &konqueror; navigation panel, giving a nice integrated way to browse and manage your print system via the &URL; print:/manager. -Please contact Michael Goffioul at kdeprint@swing.be +Please contact Michael Goffioul at tdeprint@swing.be with any further user or developer suggestions. diff --git a/doc/kdeprint/index.docbook b/doc/kdeprint/index.docbook index 79ef27770..977d9a6f4 100644 --- a/doc/kdeprint/index.docbook +++ b/doc/kdeprint/index.docbook @@ -20,7 +20,7 @@ - + ]> @@ -28,7 +28,7 @@ -The &kdeprint; Handbook +The &tdeprint; Handbook @@ -43,7 +43,7 @@ Michael Goffioul -
kdeprint@swing.be
+
tdeprint@swing.be
 Developer @@ -72,8 +72,8 @@ 1.00.04 -This handbook describes &kdeprint;. &kdeprint; is not a standalone -program. It is the new printing framework for &kde; 2.2. &kdeprint; +This handbook describes &tdeprint;. &tdeprint; is not a standalone +program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;). @@ -81,7 +81,7 @@ is an intermediate layer between &kde; (or other) applications and the selected KDE kdebase -kdeprint +tdeprint print printing CUPS @@ -93,8 +93,8 @@ is an intermediate layer between &kde; (or other) applications and the selected Introduction -This handbook describes &kdeprint;. &kdeprint; is not a standalone -program. It is the new printing framework for &kde; 2.2. &kdeprint; +This handbook describes &tdeprint;. &tdeprint; is not a standalone +program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;). @@ -104,7 +104,7 @@ printing system. At the time of writing, &CUPS; is the best supported printing subsystem, and it is the best documented. This handbook is a work in progress, and later versions of the -&kdeprint; software and editions of this handbook will support and +&tdeprint; software and editions of this handbook will support and explore more closely other printing systems. In the meantime, even if your printing subsystem is not yet well @@ -123,7 +123,7 @@ subsystem you use. To configure your printing subsystem from &kcontrol;, go to SystemPrinting Manager and select your subsystem. Or you can -let &kdeprint; try to determine it... +let &tdeprint; try to determine it... &CUPS; Printing Manager dialog: overview via &kcontrol; @@ -173,8 +173,8 @@ settings Credits And Licenses -&kdeprint; copyright 2001, Michael Goffioul -kdeprint@swing.be +&tdeprint; copyright 2001, Michael Goffioul +tdeprint@swing.be &underGPL; Documentation copyright 2001, Kurt Pfeifle, diff --git a/doc/kdeprint/lprng.docbook b/doc/kdeprint/lprng.docbook index 5117664e0..78db2615b 100644 --- a/doc/kdeprint/lprng.docbook +++ b/doc/kdeprint/lprng.docbook @@ -1,7 +1,7 @@ <application>LPRng</application> -An LPRng module for &kdeprint; is in +An LPRng module for &tdeprint; is in development, and hopefully available for the &kde; 2.3 release. diff --git a/doc/kdeprint/tech-overview.docbook b/doc/kdeprint/tech-overview.docbook index 96b3888e9..7a81a48a2 100644 --- a/doc/kdeprint/tech-overview.docbook +++ b/doc/kdeprint/tech-overview.docbook @@ -1,25 +1,25 @@ Technical Overview -This chapter aims to give a technical overview of &kdeprint; which +This chapter aims to give a technical overview of &tdeprint; which non-programmers can comprehend. -&kdeprint; is a new and revolutionary tool to give easy access to +&tdeprint; is a new and revolutionary tool to give easy access to printing services for both &kde; users and &kde; developers. -A Brief Description of &kdeprint; +A Brief Description of &tdeprint; -You can access the functions of &kdeprint; in different ways: +You can access the functions of &tdeprint; in different ways: through the Printing Manger in the &kcontrol;, through the kprinter command or through the dialog that pops up if you want to print. - + What it is <emphasis>not</emphasis> -&kdeprint; is not a replacement for the -printing subsystem itself. &kdeprint; does not +&tdeprint; is not a replacement for the +printing subsystem itself. &tdeprint; does not therefore give provision for spooling, and it does not do the basic processing of &PostScript; or other print data. @@ -28,15 +28,15 @@ other print data. What it <emphasis>is</emphasis> -&kdeprint; is an intermediate layer between the spooling and the +&tdeprint; is an intermediate layer between the spooling and the data processing print subsystem (as installed), and the application that -seeks to print. &kdeprint; provides a common interface for &kde; +seeks to print. &tdeprint; provides a common interface for &kde; developers and &kde; users, to various supported print subsystems. At the same time, it is customizable, and highly configurable. -&kdeprint; is easy to use for both &kde; developers and end-users. +&tdeprint; is easy to use for both &kde; developers and end-users. Developers can port their applications, with minimal changes, to use -&kdeprint; instead of the old &Qt; print system. Users +&tdeprint; instead of the old &Qt; print system. Users can easily choose and configure their print subsystem. For a reference to new &kde; users: &Qt; is the basic library and @@ -48,24 +48,24 @@ developed by TrollTech, a Norwegian software company. -&kdeprint; -- Different Usage for Different People +&tdeprint; -- Different Usage for Different People -&kdeprint; has different faces for different people. +&tdeprint; has different faces for different people. -What users and administrators can do with &kdeprint; +What users and administrators can do with &tdeprint; -&kdeprint; allows users and/or administrators, depending on their +&tdeprint; allows users and/or administrators, depending on their rights, access to printing subsystems (&CUPS;, LPD, RLPR, LPRng, PDQ &etc;) through a &kde; graphical user -interface (&GUI;). Using &kdeprint;, they can print, administer jobs, +interface (&GUI;). Using &tdeprint;, they can print, administer jobs, printers and the printing daemon, all in a comfortable manner. Experienced users will like the capability to plug any working filter for the print data between the output of their application and the input, into the chosen print subsystem. Some examples for this -already ship with plain vanilla &kdeprint;. Read +already ship with plain vanilla &tdeprint;. Read on. @@ -80,34 +80,34 @@ service was provided by the QPrinter class, a library function of the &Qt; Toolkit. The QPrinter class relied on the out-moded Line Printer Daemon (LPD). The -&kdeprint; library bases itself firmly on the more modern Common &UNIX; +&tdeprint; library bases itself firmly on the more modern Common &UNIX; Printing System (&CUPS;), while at the same time keeping backward compatibility with LPD and other legacy, or less elaborate, print systems. It also leaves the door open for any new development that might occur. -For &kde; developers to use the new &kdeprint; class in their +For &kde; developers to use the new &tdeprint; class in their applications, they require only minimal changes to their code: for every call of QPrinter, they just need to change this to KPrinter. Replacing one (!) letter in a few spots, and automatically they are done; their application can then use -all of the features of the new &kdeprint; library. +all of the features of the new &tdeprint; library. More ambitious developers, or ones with special requirements, can -do more: despite &kdeprint;'s feature-rich framework, they are still able +do more: despite &tdeprint;'s feature-rich framework, they are still able to customize the print dialog of their application by creating an additional Tab, where their -extensions to the standard &kdeprint; will feel right at home. +extensions to the standard &tdeprint; will feel right at home. This last mentioned feature has not been used widely inside -&kde; so far, as developers are not yet fully aware of &kdeprint;'s +&kde; so far, as developers are not yet fully aware of &tdeprint;'s power. Expect more of this in the near future. One example I discovered is the &kcron; application. It lets you edit the crontab through a &GUI;. The developers have implemented a printing feature that lets you (or root) choose if you want to print the whole of crontab (for all users) or -just the part that is marked. You can see the effects on &kdeprint; +just the part that is marked. You can see the effects on &tdeprint; in the following screenshots. This shot shows a sample from the &kcron; utility. @@ -127,22 +127,22 @@ cron table or just the marked part of it. The dialog to configure &kcron;'s printing options: the additional tab titled Cron Options is from inside -&kcron;, not &kdeprint;; it is a special extension added by the +&kcron;, not &tdeprint;; it is a special extension added by the &kcron; developers for printing purposes, not originating from, but -executed by &kdeprint;. Developers of other applications are free +executed by &tdeprint;. Developers of other applications are free to implement their own goodies, if they feel need for it. -&kcron;'s addition to the &kdeprint; dialog. +&kcron;'s addition to the &tdeprint; dialog. -&kcron;'s addition to the &kdeprint; dialog. +&kcron;'s addition to the &tdeprint; dialog. -&kcron;'s addition to the &kdeprint; dialog. +&kcron;'s addition to the &tdeprint; dialog. @@ -150,9 +150,9 @@ format="PNG"/> -What &kdeprint; offers to everybody... +What &tdeprint; offers to everybody... -&kdeprint;'s easy-to-use interface for all supported print subsystems +&tdeprint;'s easy-to-use interface for all supported print subsystems of course does not eliminate basic traditional weaknesses of some of those systems. But it smooths some rough edges. Different users may use different printing systems on the same box. A user is free to even @@ -169,7 +169,7 @@ working remotely over any distance (like every TCP/IP based protocol), LPD lacks bi-directional communication, authentication, access control and encryption support. -&kdeprint; can use &CUPS; to support: +&tdeprint; can use &CUPS; to support: @@ -188,14 +188,14 @@ eavesdropping, or at least make it much more difficult. -This makes &kdeprint; a much more robust and reliable solution +This makes &tdeprint; a much more robust and reliable solution than using the venerable LPD. -How to access &kdeprint; +How to access &tdeprint; -You get access to &kdeprint;, or parts of it, in four different +You get access to &tdeprint;, or parts of it, in four different ways: @@ -214,14 +214,14 @@ window: this also opens the printing dialog. fileref="kcontrol-icon.png" format="PNG"/> button, starting &kcontrol;, and then go to SystemPrinting -Manager. This opens the &kdeprint; +Manager. This opens the &tdeprint; administration which is part of the &kcontrolcenter; and also lets you switch to other parts of the &kcontrol; from a command line (&konsole; or mini-CLI) type kcmshell . -This opens just the &kdeprint; part of &kcontrol; to change your settings +This opens just the &tdeprint; part of &kcontrol; to change your settings diff --git a/doc/kdeprint/theory.docbook b/doc/kdeprint/theory.docbook index a90aa2755..7b137f1c3 100644 --- a/doc/kdeprint/theory.docbook +++ b/doc/kdeprint/theory.docbook @@ -348,7 +348,7 @@ anything other than the originally supported &OS;s: &Microsoft; &Windows; and &MacOS;. Through its brilliant move to fully support and utilize the existing &PPD; specification, &CUPS; now gives the power to use all features of modern printers to users of &Linux; and &Linux;-like -systems. &kdeprint; makes its usage even more comfortable than the +systems. &tdeprint; makes its usage even more comfortable than the &CUPS; developers ever dreamed of. &CUPS; can use original &Windows; &PPD;s, distributed by the @@ -568,7 +568,7 @@ internet and printed. &CUPS; is the most advanced implementation of &IPP; on all &OS; platforms. That makes &CUPS; a crucial ally to help "conquer the -desktop" for projects like &kde;. &kdeprint; is the best utility to +desktop" for projects like &kde;. &tdeprint; is the best utility to make &CUPS; core functionality available to &kde; Desktop users. diff --git a/doc/kdesu/CMakeLists.txt b/doc/kdesu/CMakeLists.txt index e0a216477..9c562330f 100644 --- a/doc/kdesu/CMakeLists.txt +++ b/doc/kdesu/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kdesu ) +tde_create_handbook( DESTINATION tdesu ) diff --git a/doc/kdesu/index.docbook b/doc/kdesu/index.docbook index 800d20b10..81c71cf17 100644 --- a/doc/kdesu/index.docbook +++ b/doc/kdesu/index.docbook @@ -1,7 +1,7 @@ + @@ -10,7 +10,7 @@ -The &kdesu; handbook +The &tdesu; handbook &Geert.Jansen; &Geert.Jansen.mail; @@ -28,7 +28,7 @@ 1.00.00 -&kdesu; is a graphical front end for the &UNIX; +&tdesu; is a graphical front end for the &UNIX; su command. @@ -43,13 +43,13 @@ Introduction -Welcome to &kdesu;! &kdesu; is a graphical front end for the +Welcome to &tdesu;! &tdesu; is a graphical front end for the &UNIX; su command for the K Desktop Environment. It allows you to run a program as different user by supplying the -password for that user. &kdesu; is an unprivileged program; it uses +password for that user. &tdesu; is an unprivileged program; it uses the system's su. -&kdesu; has one additional feature: it can remember passwords +&tdesu; has one additional feature: it can remember passwords for you. If you are using this feature, you only need to enter the password once for each command. See for more information on this and a @@ -63,13 +63,13 @@ glue instead of a pure &GUI; program. - -Using &kdesu; + +Using &tdesu; -Usage of &kdesu; is easy. The syntax is like this: +Usage of &tdesu; is easy. The syntax is like this: -kdesu +tdesu @@ -89,7 +89,7 @@ user -kdesu +tdesu &kde; Generic Options Qt Generic Options @@ -101,7 +101,7 @@ user This specifies the program to run as root. It has to be passed in one argument. So if, for example, you want to start a new file manager, you -would enter at the prompt: kdesu @@ -110,10 +110,10 @@ would enter at the prompt: kdesu -This option allow efficient use of &kdesu; in -.desktop files. It tells &kdesu; to examine the +This option allow efficient use of &tdesu; in +.desktop files. It tells &tdesu; to examine the file specified by file. If this file is -writable by the current user, &kdesu; will execute the command as the +writable by the current user, &tdesu; will execute the command as the current user. If it is not writable, the command is executed as user user (defaults to root). file is evaluated like this: if @@ -121,7 +121,7 @@ current user. If it is not writable, the command is executed as user taken as an absolute filename. Otherwise, it is taken as the name of a global &kde; configuration file. For example: to configure the K display manager, kdm, you could issue -kdesu @@ -130,7 +130,7 @@ kdmrc just the name, without any extension. For instance to run kfmclient and show the &konqueror; icon in the password dialog: -kdesu kfmclient +tdesu kfmclient @@ -155,7 +155,7 @@ password checkbox in the password dialog. -Stop the kdesu daemon. See Stop the tdesu daemon. See . @@ -166,7 +166,7 @@ standard su instead. user -While the most common use for &kdesu; is to run a command as +While the most common use for &tdesu; is to run a command as the superuser, you can supply any user name and the appropriate password. @@ -183,12 +183,12 @@ password. X authentication The program you execute will run under the root user id and will -generally have no authority to access your X display. &kdesu; gets +generally have no authority to access your X display. &tdesu; gets around this by adding an authentication cookie for your display to a temporary .Xauthority file. After the command exits, this file is removed. -If you don't use X cookies, you are on your own. &kdesu; will +If you don't use X cookies, you are on your own. &tdesu; will detect this and will not add a cookie but you will have to make sure that root is allowed to access to your display. @@ -197,18 +197,18 @@ that root is allowed to access to your display. Interface to <command>su</command> -&kdesu; uses the sytem's su for acquiring -priviliges. In this section, I explain the details of how &kdesu; does +&tdesu; uses the sytem's su for acquiring +priviliges. In this section, I explain the details of how &tdesu; does this. Because some su implementations (&ie; the one from &RedHat;) don't want to read the password from -stdin, &kdesu; creates a pty/tty pair and executes +stdin, &tdesu; creates a pty/tty pair and executes su with it's standard filedescriptors connected to the tty. To execute the command the user selected, rather than an -interactive shell, &kdesu; uses the argument with +interactive shell, &tdesu; uses the argument with su. This argument is understood by every shell that I know of so it should work portably. su passes this argument to the target user's shell, and the @@ -216,9 +216,9 @@ shell executes the program. Example command: su . Instead of executing the user command directly with -su, &kdesu; executes a little stub program called -kdesu_stub. This stub (running as the -target user), requests some information from &kdesu; over the pty/tty +su, &tdesu; executes a little stub program called +tdesu_stub. This stub (running as the +target user), requests some information from &tdesu; over the pty/tty channel (the stub's stdin and stdout) and then executes the user's program. The information passed over is: the X display, an X authentication cookie (if available), the PATH and the @@ -231,7 +231,7 @@ command line. Password Checking -&kdesu; will check the password you entered and gives an error +&tdesu; will check the password you entered and gives an error message if it is not correct. The checking is done by executing a test program: /bin/true. If this succeeds, the password is assumed to be correct. @@ -241,25 +241,25 @@ password is assumed to be correct. Password Keeping -For your comfort, &kdesu; implements a keep +For your comfort, &tdesu; implements a keep password feature. If you are interested in security, you should read this paragraph. -Allowing &kdesu; to remember passwords opens up a (small) -security hole in your system. Obviously, &kdesu; does not allow +Allowing &tdesu; to remember passwords opens up a (small) +security hole in your system. Obviously, &tdesu; does not allow anybody but your user id to use the passwords, but, if done without caution, this would lowers root's security level to that of a normal user (you). A hacker who breaks into your account, would get -root access. &kdesu; tries +root access. &tdesu; tries to prevent this. The security scheme it uses is, in my opinion at least, reasonably safe and is explained here. -&kdesu; uses a daemon, called -kdesud. The daemon listens to a &UNIX; +&tdesu; uses a daemon, called +tdesud. The daemon listens to a &UNIX; socket in /tmp for commands. The mode of the socket is 0600 so that only your user id can connect to it. If -password keeping is enabled, &kdesu; executes commands through this +password keeping is enabled, &tdesu; executes commands through this daemon. It writes the command and root's password to the socket and the daemon executes the command using su, as describe @@ -271,7 +271,7 @@ not have to supply the password. To keep hackers who broke into your account from stealing passwords from the daemon (for example, by attaching a debugger), the daemon is installed set-group-id nogroup. This should prevent all normal users (including you) from -getting passwords from the kdesud +getting passwords from the tdesud process. Also, the daemon sets the DISPLAY environment variable to the value it had when it was started. The only thing a hacker can do is execute an application on your display. @@ -292,12 +292,12 @@ yourself if you want to use it or not. Author -&kdesu; +&tdesu; Copyright 2000 &Geert.Jansen; -&kdesu; is written by &Geert.Jansen;. It is somewhat based on -Pietro Iglio's &kdesu;, version 0.3. Pietro and I agreed that I will +&tdesu; is written by &Geert.Jansen;. It is somewhat based on +Pietro Iglio's &tdesu;, version 0.3. Pietro and I agreed that I will maintain this program in the future. The author can be reached through email at &Geert.Jansen.mail;. diff --git a/doc/kdesu/man-kdesu.1.docbook b/doc/kdesu/man-kdesu.1.docbook index b9c5ac4ca..fd99812fd 100644 --- a/doc/kdesu/man-kdesu.1.docbook +++ b/doc/kdesu/man-kdesu.1.docbook @@ -12,18 +12,18 @@ -kdesu +tdesu 1 -kdesu +tdesu Runs a program with elevated privileges -kdesu +tdesu @@ -43,7 +43,7 @@ user -kdesu +tdesu KDE Generic Options Qt Generic Options @@ -51,13 +51,13 @@ user Description -&kdesu; is a graphical front end for the +&tdesu; is a graphical front end for the &UNIX; su command for the K Desktop Environment. It allows you to run a program as different user by supplying the -password for that user. &kdesu; is an unprivileged program; it uses +password for that user. &tdesu; is an unprivileged program; it uses the system's su. -&kdesu; has one additional feature: it can optionally remember passwords +&tdesu; has one additional feature: it can optionally remember passwords for you. If you are using this feature, you only need to enter the password once for each command. @@ -73,7 +73,7 @@ from .desktop files. This specifies the program to run as root. It has to be passed in one argument. So if, for example, you want to start a new file manager, you -would enter at the prompt: kdesu @@ -82,10 +82,10 @@ would enter at the prompt: kdesu -This option allow efficient use of &kdesu; in -.desktop files. It tells &kdesu; to examine the +This option allow efficient use of &tdesu; in +.desktop files. It tells &tdesu; to examine the file specified by file. If this file is -writable by the current user, &kdesu; will execute the command as the +writable by the current user, &tdesu; will execute the command as the current user. If it is not writable, the command is executed as user user (defaults to root). file is evaluated like this: if @@ -93,7 +93,7 @@ current user. If it is not writable, the command is executed as user taken as an absolute filename. Otherwise, it is taken as the name of a global &kde; configuration file. For example: to configure the K display manager, kdm, you could issue -kdesu @@ -124,9 +124,9 @@ password checkbox in the password dialog. -Stop the kdesu daemon. This is the daemon that caches +Stop the tdesu daemon. This is the daemon that caches successful passwords in the background. This feature may also be disabled with - when &kdesu; is initially run. + when &tdesu; is initially run. @@ -136,7 +136,7 @@ standard su instead. user -While the most common use for &kdesu; is to run a command as +While the most common use for &tdesu; is to run a command as the superuser, you can supply any user name and the appropriate password. @@ -151,10 +151,10 @@ password. su(1) More detailed user documentation is available from help:/kdesu +url="help:/tdesu">help:/tdesu (either enter this URL into &konqueror;, or run khelpcenter -help:/kdesu). +help:/tdesu). @@ -163,13 +163,13 @@ url="help:/kdesu">help:/kdesu Run kfmclient as user jim, and show the &konqueror; icon in the password dialog: -kdesu kfmclient +tdesu kfmclient Authors -&kdesu; was written by +&tdesu; was written by GeertJansen jansen@kde.org and PietroIglio iglio@fub.it. diff --git a/doc/kioslave/index.docbook b/doc/kioslave/index.docbook index 6f70d6e23..d76ba7d0a 100644 --- a/doc/kioslave/index.docbook +++ b/doc/kioslave/index.docbook @@ -40,7 +40,7 @@ -KDEPrint"> +KDEPrint"> FerdinandGassauer'> f.gassauer@aon.at'> diff --git a/doc/kioslave/print.docbook b/doc/kioslave/print.docbook index 034eddab1..557636aab 100644 --- a/doc/kioslave/print.docbook +++ b/doc/kioslave/print.docbook @@ -13,7 +13,7 @@ The print KIOSlave gives quick access to browse -different &kdeprint; sections via virtual folders. +different &tdeprint; sections via virtual folders. These folders provide some information about and quick access to your print subsystem. @@ -116,7 +116,7 @@ or print:printers/printer_name print:/manager or print:manager -opens a page very similar to the &kdeprint; +opens a page very similar to the &tdeprint; Manager module inside the &kde; Control Center. Switch to a different printing system here or do every other administrative task. @@ -157,9 +157,9 @@ or print:printers/printer_name the Quick Command utility (started via &Alt;F2) -You can learn more about printing and &kdeprint;'s powerful abilities -by reading the &kdeprint; Handbook -locally or at the &kdeprint; +You can learn more about printing and &tdeprint;'s powerful abilities +by reading the &tdeprint; Handbook +locally or at the &tdeprint; Website where there are documents online (HTML and PDF),containing window manager, launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running -kdeinit before running &konqueror;; it usually +tdeinit before running &konqueror;; it usually helps. diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook index c6fb880ba..b63fbfbb7 100644 --- a/doc/konqueror/filemanager.docbook +++ b/doc/konqueror/filemanager.docbook @@ -862,7 +862,7 @@ easier. ToolsExecute Shell Command... (&Ctrl; E) opens a small command line dialog window where -you can enter a shell command such as ps -ax | grep kdeinit +you can enter a shell command such as ps -ax | grep tdeinit . Note that it does not support full featured terminal control characters, so applications such as top and less will not work properly, but it is available immediately diff --git a/doc/userguide/base-kde-applications.docbook b/doc/userguide/base-kde-applications.docbook index 863271b37..917855c69 100644 --- a/doc/userguide/base-kde-applications.docbook +++ b/doc/userguide/base-kde-applications.docbook @@ -128,7 +128,7 @@ - + @@ -229,7 +229,7 @@ Related Information - See http://kontact.kde.org and http://kdepim.kde.org for more information. + See http://kontact.kde.org and http://tdepim.kde.org for more information. &kontact; Handbook diff --git a/doc/userguide/kde-as-root.docbook b/doc/userguide/kde-as-root.docbook index 7e6bb6fe9..c97f2e5f5 100644 --- a/doc/userguide/kde-as-root.docbook +++ b/doc/userguide/kde-as-root.docbook @@ -19,14 +19,14 @@ Some &Linux; distributions have tried to stress this point so much that they have disabled the root account altogether, and instead use the sudo model. Nevertheless, the basic security model in sudo is the same as su, and thus they share the same security strengths and weaknesses, essentially. -If you should ever need to run a program with Super User privileges, then it is always recommend that you use &kdesu;. From &konsole; or from hitting &Alt;F2, enter kdesu application, and the application will be run with the appropriate Super User privileges. +If you should ever need to run a program with Super User privileges, then it is always recommend that you use &tdesu;. From &konsole; or from hitting &Alt;F2, enter tdesu application, and the application will be run with the appropriate Super User privileges. -Even if you have set up your system to use sudo, or you are on a distribution that uses sudo, such as &kubuntu;, you should still use &kdesu;. The program will be appropriately modified by the developers to use the correct settings. You should not, however, ever use sudo application to run an application with root permissions; it can derange permissions of certain configuration files for a program. Running a graphical applications as root in general is not a good idea, but using &kdesu; will always be your safest bet with it. +Even if you have set up your system to use sudo, or you are on a distribution that uses sudo, such as &kubuntu;, you should still use &tdesu;. The program will be appropriately modified by the developers to use the correct settings. You should not, however, ever use sudo application to run an application with root permissions; it can derange permissions of certain configuration files for a program. Running a graphical applications as root in general is not a good idea, but using &tdesu; will always be your safest bet with it. Related Information -&kdesu; Handbook +&tdesu; Handbook diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index f5d98e019..6424ea965 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -833,22 +833,22 @@ are two very important lines in the startkde script: -LD_BIND_NOW=true kdeinit +kcminit +knotify and kwrapper +LD_BIND_NOW=true tdeinit +kcminit +knotify and kwrapper ksmserver $KDEWM -The first line starts the kdeinit master process. -The kdeinit master process is used to start all other +The first line starts the tdeinit master process. +The tdeinit master process is used to start all other &kde; processes. It show up in the output of ps - as kdeinit: -Running.... The arguments after kdeinit + as tdeinit: +Running.... The arguments after tdeinit are the names of additional processes to be started. The + -indicates that kdeinit needs to wait till the process has -finished. kdeinit also starts +indicates that tdeinit needs to wait till the process has +finished. tdeinit also starts dcopserver, klauncher and kded. -The second of the two lines asks kdeinit to start +The second of the two lines asks tdeinit to start the ksmserver session manager process. The session manager determines the lifetime of the session. When this process exits, the user is logged out. @@ -910,18 +910,18 @@ needed - -<command>kdeinit</command> -kdeinit is used to start all other &kde; -programs. kdeinit can start normal binary program files -as well as kdeinit loadable modules + +<command>tdeinit</command> +tdeinit is used to start all other &kde; +programs. tdeinit can start normal binary program files +as well as tdeinit loadable modules (KLMs). KLMs work just like binary program files but can be started more efficiently. KLMs live in $KDEDIR/lib/trinity The drawback is that programs started this way appear as -kdeinit in the output of +tdeinit in the output of top and ps. Use top or ps to see the actual program name: @@ -929,20 +929,20 @@ to see the actual program name: %ps -waba 23184 0.2 2.1 23428 11124 ? S 21:41 0:00 kdeinit: Running... -waba 23187 0.1 2.1 23200 11124 ? S 21:41 0:00 kdeinit: dcopserver --nosid -waba 23189 0.2 2.4 25136 12496 ? S 21:41 0:00 kdeinit: klauncher -waba 23192 0.7 2.8 25596 14772 ? S 21:41 0:00 kdeinit: kded -waba 23203 0.8 3.4 31516 17892 ? S 21:41 0:00 kdeinit: +waba 23184 0.2 2.1 23428 11124 ? S 21:41 0:00 tdeinit: Running... +waba 23187 0.1 2.1 23200 11124 ? S 21:41 0:00 tdeinit: dcopserver --nosid +waba 23189 0.2 2.4 25136 12496 ? S 21:41 0:00 tdeinit: klauncher +waba 23192 0.7 2.8 25596 14772 ? S 21:41 0:00 tdeinit: kded +waba 23203 0.8 3.4 31516 17892 ? S 21:41 0:00 tdeinit: knotify -kdeinit: Running... indicates the -master kdeinit process. The other processes listed are +tdeinit: Running... indicates the +master tdeinit process. The other processes listed are programs started as KLMs. -When kdeinit starts for the first time it will +When tdeinit starts for the first time it will launch dcopserver, klauncher, and kded, as well as any additional programs specified on its command line in the startkde script, normally @@ -1019,7 +1019,7 @@ startup problems. klauncher is a daemon which is responsible for service activation within &kde;. It operates in close connection with the -kdeinit master process to start new processes. &kde; +tdeinit master process to start new processes. &kde; applications communicate with klauncher over &DCOP; in order to start new applications or services. @@ -1029,7 +1029,7 @@ either indicates a serious problem with the dcopserver or that klauncher crashed. klauncher can be restarted by restarting -kdeinit from a console window. Make sure that +tdeinit from a console window. Make sure that $HOME, $DISPLAY and the various $KDEDIR(S) are set correctly when doing so! @@ -1205,7 +1205,7 @@ on a multi-head system. (Since &kde; 3.2.3) Set this variable to spawn KIO-slaves directly from the application process itself. By default KIO-slaves are spawned using -klauncher/kdeinit. This option is +klauncher/tdeinit. This option is useful if the KIO-slave should run in the same environment as the application. This can be the case with Clearcase. @@ -1228,7 +1228,7 @@ lookups. $KDE_IS_PRELINKED (Since &kde; 3.2) - Set this variable to indicate that you have prelinked your &kde; binaries and libraries. This will turn off -kdeinit. +tdeinit. @@ -1243,7 +1243,7 @@ locale. (Since &kde; 3.2) Automatically set to true by &kde; startup, it is used by ⪚ &konqueror; to know if it should consider remaining in memory for future re-use when being closed. If not set, &konqueror; will exit -after being closed (⪚ &kdesu; does that, it's also useful for +after being closed (⪚ &tdesu; does that, it's also useful for debugging). @@ -1314,21 +1314,21 @@ $KDEDIRS and profiles as well. Used by - -The kdeinit Mystery + +The tdeinit Mystery -kdeinit is used to start all other &kde; -programs. kdeinit can start normal binary program f iles -as well as kdeinit loadable modules +tdeinit is used to start all other &kde; +programs. tdeinit can start normal binary program f iles +as well as tdeinit loadable modules (KLMs). KLMs work just like binary program files but can be started more efficiently. KLMs live in $KDEDIR/lib/trinity The drawback is that programs started this way appear as -kdeinit in the +tdeinit in the output of top and ps. Use top or ps to see the actual program name: @@ -1336,14 +1336,14 @@ output of top and ps. Use % ps aux | grep bastian -bastian 26061 0.0 2.2 24284 11492 ? S 21:27 0:00 kdeinit: Running... -bastian 26064 0.0 2.2 24036 11524 ? S 21:27 0:00 kdeinit: dcopserver -bastian 26066 0.1 2.5 26056 12988 ? S 21:27 0:00 kdeinit: klauncher -bastian 26069 0.4 3.2 27356 16744 ? S 21:27 0:00 kdeinit: kded -bastian 26161 0.2 2.7 25344 14096 ? S 21:27 0:00 kdeinit: ksmserver -bastian 26179 1.1 3.4 29716 17812 ? S 21:27 0:00 kdeinit: kicker -bastian 26192 0.4 3.0 26776 15452 ? S 21:27 0:00 kdeinit: klipper -bastian 26195 1.0 3.5 29200 18368 ? S 21:27 0:00 kdeinit: kdesktop +bastian 26061 0.0 2.2 24284 11492 ? S 21:27 0:00 tdeinit: Running... +bastian 26064 0.0 2.2 24036 11524 ? S 21:27 0:00 tdeinit: dcopserver +bastian 26066 0.1 2.5 26056 12988 ? S 21:27 0:00 tdeinit: klauncher +bastian 26069 0.4 3.2 27356 16744 ? S 21:27 0:00 tdeinit: kded +bastian 26161 0.2 2.7 25344 14096 ? S 21:27 0:00 tdeinit: ksmserver +bastian 26179 1.1 3.4 29716 17812 ? S 21:27 0:00 tdeinit: kicker +bastian 26192 0.4 3.0 26776 15452 ? S 21:27 0:00 tdeinit: klipper +bastian 26195 1.0 3.5 29200 18368 ? S 21:27 0:00 tdeinit: kdesktop As you might have noticed, this has another side effect, making it @@ -1353,7 +1353,7 @@ difficult to kill a process that is causing trouble: kdesktop: no process killed You might be tempted to try killall -kdeinit, but killing all kdeinit processes will have +tdeinit, but killing all tdeinit processes will have the effect of shutting down all of &kde;. In effect, total destruction! diff --git a/doc/userguide/konsole-intro.docbook b/doc/userguide/konsole-intro.docbook index d42b4f59a..ec168ac22 100644 --- a/doc/userguide/konsole-intro.docbook +++ b/doc/userguide/konsole-intro.docbook @@ -81,8 +81,8 @@ action="simul">&Ctrl;&Alt;S and enter the new name. If you find the need to run any &kde; program with root privileges, you can use the &kdesu; command with the switch -from the command line like this: kdesu +class="username">root privileges, you can use the &tdesu; command with the switch +from the command line like this: tdesu , using the switch will prevent &kde; from remembering your passwords. diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am index 087517bea..362079094 100644 --- a/drkonqi/Makefile.am +++ b/drkonqi/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE bin_PROGRAMS = drkonqi # Libraries: -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor LDADD = $(LIB_KDEUI) $(LIB_KIO) # toplevel.cpp must be last in row due to X-headers being included. (--enable-final) diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 7c276cf41..e3a525174 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -63,7 +63,7 @@ void KrashConfig :: readConfig() KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); m_signalnum = args->getOption( "signal" ).toInt(); m_pid = args->getOption( "pid" ).toInt(); - m_startedByKdeinit = args->isSet("kdeinit"); + m_startedByKdeinit = args->isSet("tdeinit"); m_safeMode = args->isSet("safer"); m_execname = args->getOption( "appname" ); if ( !args->getOption( "apppath" ).isEmpty() ) @@ -150,7 +150,7 @@ void KrashConfig :: expandString(TQString &str, bool shell, const TQString &temp { TQMap map; map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); - map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname; + map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("tdeinit") : m_execname; map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber()); map[TQString::tqfromLatin1("signame")] = signalName(); map[TQString::tqfromLatin1("progname")] = programName(); diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index 9fba35a20..635a49265 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -52,7 +52,7 @@ static const KCmdLineOptions options[] = {"programname ", I18N_NOOP("Translated name of the program"), 0}, {"pid ", I18N_NOOP("The PID of the program"), 0}, {"startupid ", I18N_NOOP("Startup ID of the program"), 0}, - {"kdeinit", I18N_NOOP("The program was started by kdeinit"), 0}, + {"tdeinit", I18N_NOOP("The program was started by tdeinit"), 0}, {"safer", I18N_NOOP("Disable arbitrary disk access"), 0}, KCmdLineLastOption }; diff --git a/kappfinder/CMakeLists.txt b/kappfinder/CMakeLists.txt index 52d002960..504326bb2 100644 --- a/kappfinder/CMakeLists.txt +++ b/kappfinder/CMakeLists.txt @@ -42,5 +42,5 @@ tde_add_executable( kappfinder AUTOMOC tde_add_executable( kappfinder_install AUTOMOC SOURCES main_install.cpp common.cpp - LINK kdeui-shared + LINK tdeui-shared ) diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am index 136ac1044..52d00e455 100644 --- a/kappfinder/Makefile.am +++ b/kappfinder/Makefile.am @@ -3,12 +3,12 @@ SUBDIRS = apps bin_PROGRAMS = kappfinder kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp kappfinder_LDADD = $(LIB_KDEUI) $(LIB_KIO) -kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_PROGRAMS = kappfinder_install kappfinder_install_SOURCES = main_install.cpp common.cpp kappfinder_install_LDADD = $(LIB_KDEUI) -kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = $(all_includes) METASOURCES = AUTO diff --git a/kate/app/CMakeLists.txt b/kate/app/CMakeLists.txt index 513a37fd2..8c2d1515f 100644 --- a/kate/app/CMakeLists.txt +++ b/kate/app/CMakeLists.txt @@ -51,21 +51,21 @@ tde_add_library( ${target} SHARED AUTOMOC ) -##### kate (kdeinit) ############################ +##### kate (tdeinit) ############################ set( target kate ) -tde_add_kdeinit_executable( ${target} +tde_add_tdeinit_executable( ${target} SOURCES katemain.cpp LINK kateinterfaces-shared ) -##### kwrite (kdeinit) ########################## +##### kwrite (tdeinit) ########################## set( target kwrite ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES kwritemain.cpp LINK kateinterfaces-shared katepartinterfaces-shared ) diff --git a/kate/app/Makefile.am b/kate/app/Makefile.am index 6175f3203..957df959f 100644 --- a/kate/app/Makefile.am +++ b/kate/app/Makefile.am @@ -1,6 +1,6 @@ lib_LTLIBRARIES = libkateinterfaces.la bin_PROGRAMS = -kdeinit_LTLIBRARIES = kate.la kwrite.la +tdeinit_LTLIBRARIES = kate.la kwrite.la libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 371161de0..fedb89b7c 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -162,7 +162,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) if (!kateApp.isEmpty()) { kdDebug () << "kate app: " << kateApp << endl; - // make kdeinit happy + // make tdeinit happy client.registerAs( "kate" ); DCOPRef kRef (kateApp, "KateApplication"); diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am index 65a8b3598..84a5aff33 100644 --- a/kate/interfaces/Makefile.am +++ b/kate/interfaces/Makefile.am @@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces -libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h kateincludedir = $(includedir)/kate diff --git a/kate/utils/CMakeLists.txt b/kate/utils/CMakeLists.txt index b40f77047..f2fe04e14 100644 --- a/kate/utils/CMakeLists.txt +++ b/kate/utils/CMakeLists.txt @@ -36,5 +36,5 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt index 72df22f75..831193d60 100644 --- a/kcheckpass/CMakeLists.txt +++ b/kcheckpass/CMakeLists.txt @@ -26,7 +26,7 @@ tde_add_executable( kcheckpass AUTOMOC SOURCES kcheckpass.c checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c checkpass_osfc2passwd.c checkpass_aix.c - LINK kdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY} + LINK tdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcheckpass/Makefile.am b/kcheckpass/Makefile.am index bc8342301..0ccd2174e 100644 --- a/kcheckpass/Makefile.am +++ b/kcheckpass/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = kcheckpass kcheckpass_SOURCES = kcheckpass.c \ checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \ checkpass_osfc2passwd.c checkpass_aix.c -kcheckpass_LDADD = -lkdefakes $(PASSWDLIBS) $(LIBSOCKET) +kcheckpass_LDADD = -ltdefakes $(PASSWDLIBS) $(LIBSOCKET) kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) noinst_HEADERS = kcheckpass.h diff --git a/kcminit/CMakeLists.txt b/kcminit/CMakeLists.txt index b18a551c7..d379930ab 100644 --- a/kcminit/CMakeLists.txt +++ b/kcminit/CMakeLists.txt @@ -21,17 +21,17 @@ link_directories( ) -##### kcminit (kdeinit) ######################### +##### kcminit (tdeinit) ######################### -tde_add_kdeinit_executable( kcminit AUTOMOC +tde_add_tdeinit_executable( kcminit AUTOMOC SOURCES main.cpp main.skel LINK kutils-shared ) -##### kcminit_startup (kdeinit) ################# +##### kcminit_startup (tdeinit) ################# -tde_add_kdeinit_executable( kcminit_startup AUTOMOC +tde_add_tdeinit_executable( kcminit_startup AUTOMOC SOURCES main.cpp main.skel LINK kutils-shared ) diff --git a/kcminit/Makefile.am b/kcminit/Makefile.am index fc77b98cc..c64cf1ea2 100644 --- a/kcminit/Makefile.am +++ b/kcminit/Makefile.am @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -kdeinit_LTLIBRARIES = kcminit.la kcminit_startup.la +tdeinit_LTLIBRARIES = kcminit.la kcminit_startup.la bin_PROGRAMS= lib_LTLIBRARIES= diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 226b22287..4ccbad12a 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -179,7 +179,7 @@ KCMInit::KCMInit( KCmdLineArgs* args ) config.setGroup("X11"); bool multihead = !config.readBoolEntry( "disableMultihead", false) && (ScreenCount(qt_xdisplay()) > 1); - // Pass env. var to kdeinit. + // Pass env. var to tdeinit. TQCString name = "KDE_MULTIHEAD"; TQCString value = multihead ? "true" : "false"; TQByteArray params; @@ -220,7 +220,7 @@ void KCMInit::runPhase2() extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { - // kdeinit waits for kcminit to finish, but during KDE startup + // tdeinit waits for kcminit to finish, but during KDE startup // only important kcm's are started very early in the login process, // the rest is delayed, so fork and make parent return after the initial phase pipe( ready ); diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt index bbd9ed9c0..bc13f53cd 100644 --- a/kcontrol/access/CMakeLists.txt +++ b/kcontrol/access/CMakeLists.txt @@ -36,9 +36,9 @@ tde_add_kpart( kcm_access AUTOMOC ) -##### kaccess (kdeinit) ######################### +##### kaccess (tdeinit) ######################### -tde_add_kdeinit_executable( kaccess AUTOMOC +tde_add_tdeinit_executable( kaccess AUTOMOC SOURCES kaccess.cpp main.cpp - LINK kdeui-shared + LINK tdeui-shared ) diff --git a/kcontrol/access/Makefile.am b/kcontrol/access/Makefile.am index f57c865b3..dcbfab2eb 100644 --- a/kcontrol/access/Makefile.am +++ b/kcontrol/access/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO bin_PROGRAMS = lib_LTLIBRARIES = kde_module_LTLIBRARIES = kcm_access.la -kdeinit_LTLIBRARIES = kaccess.la +tdeinit_LTLIBRARIES = kaccess.la kaccess_la_SOURCES = kaccess.cpp main.cpp kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 88c8e7fe9..ae65419a9 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -74,7 +74,7 @@ static bool startArts() delete config; if (startServer) - kapp->kdeinitExec(startRealtime?"artswrapper":"artsd", + kapp->tdeinitExec(startRealtime?"artswrapper":"artsd", TQStringList::split(" ",args)); return startServer; } diff --git a/kcontrol/bell/CMakeLists.txt b/kcontrol/bell/CMakeLists.txt index f45d4ec76..732bde555 100644 --- a/kcontrol/bell/CMakeLists.txt +++ b/kcontrol/bell/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES bell.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_bell AUTOMOC SOURCES bell.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/bell/Makefile.am b/kcontrol/bell/Makefile.am index 3c3d94181..cc04d63a5 100644 --- a/kcontrol/bell/Makefile.am +++ b/kcontrol/bell/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_bell.la kcm_bell_la_SOURCES = bell.cpp kcm_bell_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_bell_la_LIBADD = -lkdeui +kcm_bell_la_LIBADD = -ltdeui AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/crypto/Makefile.am b/kcontrol/crypto/Makefile.am index 73a79653d..84ef0a0cd 100644 --- a/kcontrol/crypto/Makefile.am +++ b/kcontrol/crypto/Makefile.am @@ -6,7 +6,7 @@ kcm_crypto_la_SOURCES = crypto.cpp certexport.cpp kdatetimedlg.cpp AM_CXXFLAGS = $(CXXFLAGS) -DLIBDIR=$(libdir) kcm_crypto_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(SSL_LDFLAGS) -module -avoid-version -no-undefined -kcm_crypto_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSSL) +kcm_crypto_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSSL) METASOURCES = AUTO diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 910f65136..f6db43497 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -2029,7 +2029,7 @@ void KCryptoConfig::offerImportToKMail( const TQString& certFile ) proc << "--import-certificate"; proc << certFile; if ( !proc.start( KProcess::DontCare ) ) - KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the kdepim package." ) ); + KMessageBox::error( this, i18n( "Could not execute Kleopatra. You might have to install or update the tdepim package." ) ); } } diff --git a/kcontrol/css/Makefile.am b/kcontrol/css/Makefile.am index 9f55b5a75..10d2f3d4f 100644 --- a/kcontrol/css/Makefile.am +++ b/kcontrol/css/Makefile.am @@ -6,7 +6,7 @@ templatedir = $(kde_datadir)/kcmcss kde_module_LTLIBRARIES = kcm_css.la kcm_css_la_SOURCES = template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui kcm_css_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_css_la_LIBADD = -lkdeui $(LIB_KIO) +kcm_css_la_LIBADD = -ltdeui $(LIB_KIO) METASOURCES = AUTO diff --git a/kcontrol/displayconfig/Makefile.am b/kcontrol/displayconfig/Makefile.am index 7fcfe17c1..55fabd507 100644 --- a/kcontrol/displayconfig/Makefile.am +++ b/kcontrol/displayconfig/Makefile.am @@ -5,7 +5,7 @@ kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displaycon kcm_displayconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined -kcm_displayconfig_la_LIBADD = -lkdeui $(LIB_KIO) $(LIB_XRANDR) +kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) METASOURCES = AUTO diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt index 03cb8f87a..bb9050274 100644 --- a/kcontrol/dnssd/CMakeLists.txt +++ b/kcontrol/dnssd/CMakeLists.txt @@ -31,6 +31,6 @@ set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR tde_add_kpart( kcm_kdnssd AUTOMOC SOURCES configdialog.ui kcmdnssd.cpp - LINK kdnssd-shared kdeui-shared + LINK kdnssd-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 6fae0b216..3b3f85f96 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -97,7 +97,7 @@ void KCMDnssd::save() KProcess *proc = new KProcess; - *proc << "kdesu"; + *proc << "tdesu"; if (enableZeroconf->isChecked()) { if (KMessageBox::warningYesNo( this, scaryMessage, i18n("Enable Zeroconf Network Browsing"), KGuiItem(i18n("Enable Browsing")), KGuiItem(i18n("Don't Enable Browsing")) ) == KMessageBox::Yes) { diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am index 4190cd718..4f25b9def 100644 --- a/kcontrol/filetypes/Makefile.am +++ b/kcontrol/filetypes/Makefile.am @@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails keditfiletype_SOURCES = keditfiletype.cpp keditfiletype_LDADD = libfiletypes.la $(LIB_KIO) -keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot diff --git a/kcontrol/fonts/CMakeLists.txt b/kcontrol/fonts/CMakeLists.txt index 76a335aa9..46787bcd6 100644 --- a/kcontrol/fonts/CMakeLists.txt +++ b/kcontrol/fonts/CMakeLists.txt @@ -53,7 +53,7 @@ install( FILES fonts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_fonts AUTOMOC SOURCES fonts.cpp - LINK kxftconfig-static krdb-static kdeui-shared + LINK kxftconfig-static krdb-static tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 481ae9c7f..163d6f378 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -522,7 +522,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) TQValueList defaultFontList; - // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp + // Keep in sync with kdelibs/tdecore/kglobalsettings.cpp TQFont f0("Sans Serif", 10); TQFont f1("Monospace", 10); diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am index 3484a3708..9d8aec569 100644 --- a/kcontrol/iccconfig/Makefile.am +++ b/kcontrol/iccconfig/Makefile.am @@ -5,7 +5,7 @@ kcm_iccconfig_la_SOURCES = iccconfig.cpp iccconfigbase.ui iccconfig.skel kcm_iccconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined -kcm_iccconfig_la_LIBADD = -lkdeui $(LIB_KIO) $(LIB_XRANDR) +kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) METASOURCES = AUTO diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt index 531f52780..fdd30ef2f 100644 --- a/kcontrol/info/CMakeLists.txt +++ b/kcontrol/info/CMakeLists.txt @@ -36,6 +36,6 @@ install( FILES tde_add_kpart( kcm_info AUTOMOC SOURCES main.cpp memory.cpp opengl.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ioslaveinfo/Makefile.am b/kcontrol/ioslaveinfo/Makefile.am index 14150d57c..75def7ba6 100644 --- a/kcontrol/ioslaveinfo/Makefile.am +++ b/kcontrol/ioslaveinfo/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_ioslaveinfo.la kcm_ioslaveinfo_la_SOURCES = kcmioslaveinfo.cpp kcm_ioslaveinfo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_ioslaveinfo_la_LIBADD = -lkdeui $(LIB_KIO) +kcm_ioslaveinfo_la_LIBADD = -ltdeui $(LIB_KIO) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/joystick/CMakeLists.txt b/kcontrol/joystick/CMakeLists.txt index 14d6bc487..4cc1060f0 100644 --- a/kcontrol/joystick/CMakeLists.txt +++ b/kcontrol/joystick/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_kpart( kcm_joystick AUTOMOC SOURCES joystick.cpp joywidget.cpp poswidget.cpp joydevice.cpp caldialog.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt index a197d7347..401d1d25c 100644 --- a/kcontrol/kcontrol/CMakeLists.txt +++ b/kcontrol/kcontrol/CMakeLists.txt @@ -30,7 +30,7 @@ install( FILES kinfocenterui.rc DESTINATION ${DATA_INSTALL_DIR}/kinfocenter ) install( FILES KControl.desktop kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kcontrol (kdeinit) ######################## +##### kcontrol (tdeinit) ######################## set( target kcontrol ) @@ -42,7 +42,7 @@ set( ${target}_SRCS searchwidget.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK khtml-shared ) diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am index 2f2c3a6bc..dd20b9224 100644 --- a/kcontrol/kcontrol/Makefile.am +++ b/kcontrol/kcontrol/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . about bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kcontrol.la +tdeinit_LTLIBRARIES = kcontrol.la kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ helpwidget.cpp dockcontainer.cpp aboutwidget.cpp \ diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 9c7d25898..614a65e7b 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -111,9 +111,9 @@ void AboutWidget::updatePixmap() TQTextStream t( &f ); TQString res = t.read(); - res = res.arg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.arg( "@import \"%1\";" ).arg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.arg( "" ); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index b2ece7c33..88d2124ae 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -168,10 +168,10 @@ void ConfigModule::runAsRoot() // prepare the process to run the kcmshell TQString cmd = service()->exec().stripWhiteSpace(); bool kdeshell = false; - if (cmd.left(5) == "kdesu") + if (cmd.left(5) == "tdesu") { cmd = TQString(cmd.remove(0,5)).stripWhiteSpace(); - // remove all kdesu switches + // remove all tdesu switches while( cmd.length() > 1 && cmd[ 0 ] == '-' ) { int pos = cmd.find( ' ' ); @@ -186,14 +186,14 @@ void ConfigModule::runAsRoot() } // run the process - TQString kdesu = KStandardDirs::findExe("kdesu"); - if (!kdesu.isEmpty()) + TQString tdesu = KStandardDirs::findExe("tdesu"); + if (!tdesu.isEmpty()) { _rootProcess = new KProcess; - *_rootProcess << kdesu; + *_rootProcess << tdesu; *_rootProcess << "--nonewdcop"; // We have to disable the keep-password feature because - // in that case the modules is started through kdesud and kdesu + // in that case the modules is started through tdesud and tdesu // returns before the module is running and that doesn't work. // We also don't have a way to close the module in that case. *_rootProcess << "--n"; // Don't keep password. diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am index 1af35102e..e2d897c64 100644 --- a/kcontrol/keys/Makefile.am +++ b/kcontrol/keys/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = kcm_keys.la kcm_keys_la_SOURCES = shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp -kcm_keys_la_LIBADD = -lkdeui -lkio +kcm_keys_la_LIBADD = -ltdeui -lkio kcm_keys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index 144427d9c..6a41d3a05 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -1,4 +1,4 @@ -// THIS FILE IS A COPY OF kdelibs/kdecore/kaccelaction.h AND MUST BE KEPT +// THIS FILE IS A COPY OF kdelibs/tdecore/kaccelaction.h AND MUST BE KEPT // IN SYNC WITH THAT FILE. /* This file is part of the KDE libraries diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 02ec7dc4d..8cde6989e 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -115,7 +115,7 @@ void ModifiersModule::save() if( bMacSwap ) setupMacModifierKeys(); else - kapp->kdeinitExec("kxkb"); + kapp->tdeinitExec("kxkb"); m_bMacSwapOrig = bMacSwap; updateWidgets(); } diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index b00a53f1e..11bba7e9c 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -345,7 +345,7 @@ KDE3.1 -> KDE3.2 0.8.2->0.8.3 ============ -1. Modified 'kfontinst.kdelnk' so that kdesu is now used - so that a user will automatically be prompted +1. Modified 'kfontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted for the root password. 2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst") 3. Corrected size of Configure dialog. diff --git a/kcontrol/kfontinst/kio/CMakeLists.txt b/kcontrol/kfontinst/kio/CMakeLists.txt index abb65350b..9c6d0ad83 100644 --- a/kcontrol/kfontinst/kio/CMakeLists.txt +++ b/kcontrol/kfontinst/kio/CMakeLists.txt @@ -34,6 +34,6 @@ install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION tde_add_kpart( kio_fonts AUTOMOC SOURCES KioFonts.cpp - LINK kxftconfig-static kfontinst-shared kdesu-shared + LINK kxftconfig-static kfontinst-shared tdesu-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index cef1fd9dd..96abb89db 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kio/Makefile.am b/kcontrol/kfontinst/kio/Makefile.am index ad0f2ea8e..a2643d8b2 100644 --- a/kcontrol/kfontinst/kio/Makefile.am +++ b/kcontrol/kfontinst/kio/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kio_fonts.la kio_fonts_la_SOURCES = \ KioFonts.cpp -kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la +kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/kfontinst/viewpart/CMakeLists.txt index e58fb7cc6..630d1aff4 100644 --- a/kcontrol/kfontinst/viewpart/CMakeLists.txt +++ b/kcontrol/kfontinst/viewpart/CMakeLists.txt @@ -51,5 +51,5 @@ tde_add_executable( kfontview AUTOMOC tde_add_library( kfontinstprint STATIC_PIC SOURCES KfiPrint.cpp - LINK kdeprint-shared + LINK tdeprint-shared ) diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am index f7c365475..4379ab4f1 100644 --- a/kcontrol/kfontinst/viewpart/Makefile.am +++ b/kcontrol/kfontinst/viewpart/Makefile.am @@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR METASOURCES = AUTO kfontview_LDADD = $(LIB_KPARTS) -kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = kfontview xdg_apps_DATA = kfontview.desktop diff --git a/kcontrol/konqhtml/Makefile.am b/kcontrol/konqhtml/Makefile.am index 87cf8a664..a16c324e4 100644 --- a/kcontrol/konqhtml/Makefile.am +++ b/kcontrol/konqhtml/Makefile.am @@ -13,7 +13,7 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \ filteropts.cpp kcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui +kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop diff --git a/kcontrol/konsole/Makefile.am b/kcontrol/konsole/Makefile.am index 622e7fa71..91be65e2a 100644 --- a/kcontrol/konsole/Makefile.am +++ b/kcontrol/konsole/Makefile.am @@ -4,7 +4,7 @@ kcm_konsole_la_SOURCES = schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp \ schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui kcm_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_konsole_la_LIBADD = -lkdeui $(LIB_KIO) +kcm_konsole_la_LIBADD = -ltdeui $(LIB_KIO) AM_CPPFLAGS = $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/krdb/CMakeLists.txt b/kcontrol/krdb/CMakeLists.txt index 95b99bdd2..669875032 100644 --- a/kcontrol/krdb/CMakeLists.txt +++ b/kcontrol/krdb/CMakeLists.txt @@ -34,5 +34,5 @@ install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) tde_add_library( krdb STATIC_PIC AUTOMOC SOURCES krdb.cpp - LINK kdecore-shared + LINK tdecore-shared ) diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index d2e4731bd..dfeb7c69e 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -88,7 +88,7 @@ static void applyGtkStyles(bool active, int version) if (!active) ::unlink(TQFile::encodeName(gtkkde)); - // Pass env. var to kdeinit. + // Pass env. var to tdeinit. TQCString name = gtkEnvVar(version); TQCString value = TQFile::encodeName(list.join(":")); TQByteArray params; diff --git a/kcontrol/launch/CMakeLists.txt b/kcontrol/launch/CMakeLists.txt index 511363f3c..d0c384f4b 100644 --- a/kcontrol/launch/CMakeLists.txt +++ b/kcontrol/launch/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES kcmlaunch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_launch AUTOMOC SOURCES kcmlaunch.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index c2ca4c310..5a3dc8b50 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -124,7 +124,7 @@ void KLocaleConfig::slotInstallLanguage() { KProcess *proc = new KProcess; - *proc << "kdesu"; + *proc << "tdesu"; *proc << "qt-language-selector --mode install"; TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); @@ -136,7 +136,7 @@ void KLocaleConfig::slotUninstallLanguage() { KProcess *proc = new KProcess; - *proc << "kdesu"; + *proc << "tdesu"; *proc << "qt-language-selector --mode uninstall"; TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); @@ -148,7 +148,7 @@ void KLocaleConfig::slotSelectLanguage() { KProcess *proc = new KProcess; - *proc << "kdesu"; + *proc << "tdesu"; *proc << "qt-language-selector --mode select"; TQApplication::connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotLanguageSelectorExited(KProcess *))); diff --git a/kcontrol/nics/Makefile.am b/kcontrol/nics/Makefile.am index 9cd225329..6bcf92088 100644 --- a/kcontrol/nics/Makefile.am +++ b/kcontrol/nics/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_nic.la kcm_nic_la_SOURCES = nic.cpp kcm_nic_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_nic_la_LIBADD = -lkdeui $(LIB_KIO) $(LIBSOCKET) +kcm_nic_la_LIBADD = -ltdeui $(LIB_KIO) $(LIBSOCKET) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/performance/CMakeLists.txt b/kcontrol/performance/CMakeLists.txt index 5c4a2a20a..59f5b2b02 100644 --- a/kcontrol/performance/CMakeLists.txt +++ b/kcontrol/performance/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES kcmkonqyperformance.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidd tde_add_kpart( kcm_performance AUTOMOC SOURCES kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/performance/Makefile.am b/kcontrol/performance/Makefile.am index 5ae59d89e..8f7904990 100644 --- a/kcontrol/performance/Makefile.am +++ b/kcontrol/performance/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_performance.la kcm_performance_la_SOURCES = kcmperformance.cpp konqueror.cpp konqueror_ui.ui system.cpp system_ui.ui kcm_performance_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_performance_la_LIBADD = -lkdeui +kcm_performance_la_LIBADD = -ltdeui AM_CPPFLAGS= $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 098c3e75f..257dc6e27 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -134,7 +134,7 @@ bool KPrivacyManager::clearWebHistory() if(!isApplicationRegistered("konqueror")) { kdDebug() << "couldn't find Konqueror instance, preloading." << endl; - kapp->kdeinitExec("konqueror", args, 0,0); + kapp->tdeinitExec("konqueror", args, 0,0); } return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 23999116e..3e816f2fb 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -31,7 +31,7 @@ install( FILES krandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} tde_add_kpart( kcm_randr AUTOMOC SOURCES krandrmodule.cpp - LINK kdeui-shared krandr-shared + LINK tdeui-shared krandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/smartcard/Makefile.am b/kcontrol/smartcard/Makefile.am index 940dfaacc..ee2546c66 100644 --- a/kcontrol/smartcard/Makefile.am +++ b/kcontrol/smartcard/Makefile.am @@ -5,7 +5,7 @@ kcm_smartcard_la_SOURCES = smartcard.cpp smartcardbase.ui nosmartcardbase.ui sma kcm_smartcard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_smartcard_la_LIBADD = -lkdeui -lksmartcard $(LIB_KIO) +kcm_smartcard_la_LIBADD = -ltdeui -lksmartcard $(LIB_KIO) METASOURCES = AUTO diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index 2620af0b5..968171316 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -44,7 +44,7 @@ -1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'kdeinit' and then try reloading the KDE Control Center to see if this message goes away. +1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'tdeinit' and then try reloading the KDE Control Center to see if this message goes away. 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed. diff --git a/kcontrol/smserver/CMakeLists.txt b/kcontrol/smserver/CMakeLists.txt index 0f80ac7fa..a4d0b4df8 100644 --- a/kcontrol/smserver/CMakeLists.txt +++ b/kcontrol/smserver/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES kcmsmserver.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_smserver AUTOMOC SOURCES kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/smserver/Makefile.am b/kcontrol/smserver/Makefile.am index 7cecaf66e..8b1ac7f50 100644 --- a/kcontrol/smserver/Makefile.am +++ b/kcontrol/smserver/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_smserver.la kcm_smserver_la_SOURCES = kcmsmserver.cpp smserverconfigdlg.ui smserverconfigimpl.cpp kcm_smserver_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_smserver_la_LIBADD = -lkdeui +kcm_smserver_la_LIBADD = -ltdeui AM_CPPFLAGS= $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/spellchecking/CMakeLists.txt b/kcontrol/spellchecking/CMakeLists.txt index a6616de45..5f7de3be5 100644 --- a/kcontrol/spellchecking/CMakeLists.txt +++ b/kcontrol/spellchecking/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES spellchecking.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_spellchecking AUTOMOC SOURCES spellchecking.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/spellchecking/Makefile.am b/kcontrol/spellchecking/Makefile.am index e4740eb8e..41c9a17f2 100644 --- a/kcontrol/spellchecking/Makefile.am +++ b/kcontrol/spellchecking/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_spellchecking.la kcm_spellchecking_la_SOURCES = spellchecking.cpp kcm_spellchecking_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_spellchecking_la_LIBADD = -lkdeui +kcm_spellchecking_la_LIBADD = -ltdeui AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt index a4cf8c9b7..b68be1c2e 100644 --- a/kcontrol/style/keramik/CMakeLists.txt +++ b/kcontrol/style/keramik/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_kpart( kstyle_keramik_config AUTOMOC SOURCES keramikconf.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/taskbar/Makefile.am b/kcontrol/taskbar/Makefile.am index bd458e1be..c3da2a34a 100644 --- a/kcontrol/taskbar/Makefile.am +++ b/kcontrol/taskbar/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_taskbar.la kcm_taskbar_la_SOURCES = kcmtaskbarui.ui kcmtaskbar.cpp kcm_taskbar_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_taskbar_la_LIBADD = $(top_builddir)/kicker/taskbar/libtaskbar.la -lkdeui +kcm_taskbar_la_LIBADD = $(top_builddir)/kicker/taskbar/libtaskbar.la -ltdeui AM_CPPFLAGS = -I$(top_builddir)/kicker/taskbar $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/usbview/CMakeLists.txt b/kcontrol/usbview/CMakeLists.txt index b33305d0e..a55aacbd7 100644 --- a/kcontrol/usbview/CMakeLists.txt +++ b/kcontrol/usbview/CMakeLists.txt @@ -37,6 +37,6 @@ endif( ) tde_add_kpart( kcm_usb AUTOMOC SOURCES kcmusb.cpp usbdevices.cpp usbdb.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/view1394/CMakeLists.txt b/kcontrol/view1394/CMakeLists.txt index e691ead03..e0ab3b2ce 100644 --- a/kcontrol/view1394/CMakeLists.txt +++ b/kcontrol/view1394/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES oui.db DESTINATION ${DATA_INSTALL_DIR}/kcmview1394 ) tde_add_kpart( kcm_view1394 AUTOMOC SOURCES view1394widget.ui view1394.cpp - LINK kdeui-shared ${LIBRAW1394_LIBRARIES} + LINK tdeui-shared ${LIBRAW1394_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/xinerama/CMakeLists.txt b/kcontrol/xinerama/CMakeLists.txt index 5cd2765fe..1a7419eb0 100644 --- a/kcontrol/xinerama/CMakeLists.txt +++ b/kcontrol/xinerama/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES xinerama.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) tde_add_kpart( kcm_xinerama AUTOMOC SOURCES kcmxinerama.cpp xineramawidget.ui - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/xinerama/Makefile.am b/kcontrol/xinerama/Makefile.am index 5b0da6939..c7be54e04 100644 --- a/kcontrol/xinerama/Makefile.am +++ b/kcontrol/xinerama/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_xinerama.la kcm_xinerama_la_SOURCES = kcmxinerama.cpp xineramawidget.ui kcm_xinerama_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_xinerama_la_LIBADD = -lkdeui +kcm_xinerama_la_LIBADD = -ltdeui METASOURCES = AUTO diff --git a/kdebugdialog/CMakeLists.txt b/kdebugdialog/CMakeLists.txt index f03f958c1..8c478bbc9 100644 --- a/kdebugdialog/CMakeLists.txt +++ b/kdebugdialog/CMakeLists.txt @@ -27,6 +27,6 @@ tde_add_executable( kdebugdialog AUTOMOC SOURCES main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp klistdebugdialog.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdepasswd/Makefile.am b/kdepasswd/Makefile.am index d206a092b..a24c5e2e0 100644 --- a/kdepasswd/Makefile.am +++ b/kdepasswd/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = kcm bin_PROGRAMS = kdepasswd kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp -kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdepasswd_LDADD = $(LIB_KIO) METASOURCES = AUTO diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp index 4f6af0add..56bd546da 100644 --- a/kdepasswd/kcm/chfnprocess.cpp +++ b/kdepasswd/kcm/chfnprocess.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include #include #include "chfnprocess.h" diff --git a/kdepasswd/kcm/chfnprocess.h b/kdepasswd/kcm/chfnprocess.h index 4f129b643..d29ccc538 100644 --- a/kdepasswd/kcm/chfnprocess.h +++ b/kdepasswd/kcm/chfnprocess.h @@ -12,7 +12,7 @@ #define CHFNPROC_H #include -#include +#include class ChfnProcess : public PtyProcess { diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index ae75554dd..38638c288 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen */ diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp index 89bbbdf82..9d29333fc 100644 --- a/kdepasswd/passwd.cpp +++ b/kdepasswd/passwd.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * passwd.cpp: Change a user's password. @@ -28,7 +28,7 @@ #include #include -#include +#include #include "passwd.h" diff --git a/kdepasswd/passwd.h b/kdepasswd/passwd.h index 72590740d..a5a75d5ff 100644 --- a/kdepasswd/passwd.h +++ b/kdepasswd/passwd.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen */ @@ -10,7 +10,7 @@ #define __Passwd_h_Included__ #include -#include +#include /** * A C++ API to passwd. diff --git a/kdepasswd/passwddlg.cpp b/kdepasswd/passwddlg.cpp index edfdd8b8b..833195031 100644 --- a/kdepasswd/passwddlg.cpp +++ b/kdepasswd/passwddlg.cpp @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen */ diff --git a/kdepasswd/passwddlg.h b/kdepasswd/passwddlg.h index 853a8ac19..3e81856e9 100644 --- a/kdepasswd/passwddlg.h +++ b/kdepasswd/passwddlg.h @@ -2,7 +2,7 @@ * * $Id$ * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen */ diff --git a/kdeprint/CMakeLists.txt b/kdeprint/CMakeLists.txt index 8cbe437bb..1065c69af 100644 --- a/kdeprint/CMakeLists.txt +++ b/kdeprint/CMakeLists.txt @@ -12,6 +12,6 @@ add_subdirectory( printmgr ) add_subdirectory( kjobviewer ) add_subdirectory( kprinter ) -add_subdirectory( kdeprintfax ) +add_subdirectory( tdeprintfax ) add_subdirectory( slave ) -add_subdirectory( kdeprint_part ) +add_subdirectory( tdeprint_part ) diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am index 81364da3d..1bbc21ff7 100644 --- a/kdeprint/Makefile.am +++ b/kdeprint/Makefile.am @@ -1 +1 @@ -SUBDIRS = printmgr kjobviewer kprinter kdeprintfax slave kdeprint_part +SUBDIRS = printmgr kjobviewer kprinter tdeprintfax slave tdeprint_part diff --git a/kdeprint/kdeprint_part/CMakeLists.txt b/kdeprint/kdeprint_part/CMakeLists.txt index dbc3b1a42..6de7ddb91 100644 --- a/kdeprint/kdeprint_part/CMakeLists.txt +++ b/kdeprint/kdeprint_part/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES kdeprint_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdeprint_part ) -install( FILES kdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdeprint_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdeprint_part ) +install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libtdeprint_part (module) ################# tde_add_kpart( libtdeprint_part AUTOMOC SOURCES printpart.cpp - LINK kdeprint_management-shared kparts-shared + LINK tdeprint_management-shared kparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/kdeprint_part/Makefile.am b/kdeprint/kdeprint_part/Makefile.am index 8f13f5692..e27404a0f 100644 --- a/kdeprint/kdeprint_part/Makefile.am +++ b/kdeprint/kdeprint_part/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdeprint_part.la libtdeprint_part_la_SOURCES = printpart.cpp libtdeprint_part_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libtdeprint_part_la_LIBADD = -lkdeprint_management $(LIB_KPARTS) +libtdeprint_part_la_LIBADD = -ltdeprint_management $(LIB_KPARTS) noinst_HEADERS = printpart.h @@ -12,13 +12,13 @@ METASOURCES = AUTO INCLUDES = $(all_includes) # service -myservice_DATA = kdeprint_part.desktop +myservice_DATA = tdeprint_part.desktop myservicedir = $(kde_servicesdir) # UI file -myrcfile_DATA = kdeprint_part.rc -myrcfiledir = $(kde_datadir)/kdeprint_part +myrcfile_DATA = tdeprint_part.rc +myrcfiledir = $(kde_datadir)/tdeprint_part messages: rc.cpp - $(EXTRACTRC) kdeprint_part.rc >> rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kdeprint_part.pot + $(EXTRACTRC) tdeprint_part.rc >> rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/tdeprint_part.pot diff --git a/kdeprint/kdeprint_part/kdeprint_part.rc b/kdeprint/kdeprint_part/kdeprint_part.rc index bb1db8edf..a69e76490 100644 --- a/kdeprint/kdeprint_part/kdeprint_part.rc +++ b/kdeprint/kdeprint_part/kdeprint_part.rc @@ -1,5 +1,5 @@ - + Print Manager Toolbar diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp index d2f865e20..5d5d7b154 100644 --- a/kdeprint/kdeprint_part/printpart.cpp +++ b/kdeprint/kdeprint_part/printpart.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -19,8 +19,8 @@ #include "printpart.h" -#include -#include +#include +#include #include #include #include @@ -39,7 +39,7 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , : KParts::ReadOnlyPart(parent, name) { setInstance(PrintPartFactory::instance()); - instance()->iconLoader()->addAppDir("kdeprint"); + instance()->iconLoader()->addAppDir("tdeprint"); m_extension = new PrintPartExtension(this); m_view = new KMMainView(parentWidget, "MainView", actionCollection()); @@ -56,7 +56,7 @@ PrintPart::~PrintPart() KAboutData *PrintPart::createAboutData() { - return new KAboutData(I18N_NOOP("kdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); + return new KAboutData(I18N_NOOP("tdeprint_part"), I18N_NOOP("A Konqueror Plugin for Print Management"), "0.1"); } bool PrintPart::openFile() @@ -66,7 +66,7 @@ bool PrintPart::openFile() void PrintPart::initActions() { - setXMLFile("kdeprint_part.rc"); + setXMLFile("tdeprint_part.rc"); } PrintPartExtension::PrintPartExtension(PrintPart *parent) diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h index c84fed1cc..df543b210 100644 --- a/kdeprint/kdeprint_part/printpart.h +++ b/kdeprint/kdeprint_part/printpart.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kdeprintfax/CMakeLists.txt b/kdeprint/kdeprintfax/CMakeLists.txt index 9c6e5095f..538719474 100644 --- a/kdeprint/kdeprintfax/CMakeLists.txt +++ b/kdeprint/kdeprintfax/CMakeLists.txt @@ -22,21 +22,21 @@ link_directories( ##### other data ################################ -tde_install_icons( kdeprintfax ) -tde_install_icons( abentry DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax/icons ) -install( FILES kdeprintfax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kdeprintfaxui.rc faxfilters DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax ) -install( PROGRAMS anytops DESTINATION ${DATA_INSTALL_DIR}/kdeprintfax ) +tde_install_icons( tdeprintfax ) +tde_install_icons( abentry DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax/icons ) +install( FILES tdeprintfax.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdeprintfaxui.rc faxfilters DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax ) +install( PROGRAMS anytops DESTINATION ${DATA_INSTALL_DIR}/tdeprintfax ) -##### kdeprintfax (executable) ################## +##### tdeprintfax (executable) ################## -tde_add_executable( kdeprintfax AUTOMOC +tde_add_executable( tdeprintfax AUTOMOC SOURCES - main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp + main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp - LINK kabc-shared kdeprint-shared + LINK kabc-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdeprint/kdeprintfax/Makefile.am b/kdeprint/kdeprintfax/Makefile.am index 6685031cb..cd0d39900 100644 --- a/kdeprint/kdeprintfax/Makefile.am +++ b/kdeprint/kdeprintfax/Makefile.am @@ -1,23 +1,23 @@ INCLUDES= $(all_includes) -bin_PROGRAMS = kdeprintfax -kdeprintfax_SOURCES = main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ +bin_PROGRAMS = tdeprintfax +tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp -kdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc -kdeprintfax_METASOURCES = AUTO +tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc +tdeprintfax_METASOURCES = AUTO -xdg_apps_DATA = kdeprintfax.desktop +xdg_apps_DATA = tdeprintfax.desktop -uidir = $(kde_datadir)/kdeprintfax -ui_DATA = kdeprintfaxui.rc faxfilters +uidir = $(kde_datadir)/tdeprintfax +ui_DATA = tdeprintfaxui.rc faxfilters private_SCRIPTS = anytops -privatedir = $(kde_datadir)/kdeprintfax +privatedir = $(kde_datadir)/tdeprintfax messages: rc.cpp - $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/kdeprintfax.pot + $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/tdeprintfax.pot -KDE_ICON = kdeprintfax +KDE_ICON = tdeprintfax pic_ICON = abentry -picdir = $(kde_datadir)/kdeprintfax/icons +picdir = $(kde_datadir)/tdeprintfax/icons diff --git a/kdeprint/kdeprintfax/anytops b/kdeprint/kdeprintfax/anytops index 4e67b49e9..9718831dc 100755 --- a/kdeprint/kdeprintfax/anytops +++ b/kdeprint/kdeprintfax/anytops @@ -29,8 +29,8 @@ while true; do shift ;; -v) - echo "Anytops v1.0: (c) 2001, Michael Goffioul "; - echo "Small script to convert any file type into PS. Part of kdeprintfax." + echo "Anytops v1.0: (c) 2001, Michael Goffioul "; + echo "Small script to convert any file type into PS. Part of tdeprintfax." exit 0 ;; *) diff --git a/kdeprint/kdeprintfax/conffax.cpp b/kdeprint/kdeprintfax/conffax.cpp index ca6b0d180..1f3b8c3c5 100644 --- a/kdeprint/kdeprintfax/conffax.cpp +++ b/kdeprint/kdeprintfax/conffax.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/conffax.h b/kdeprint/kdeprintfax/conffax.h index bf31c2990..cf76f2b71 100644 --- a/kdeprint/kdeprintfax/conffax.h +++ b/kdeprint/kdeprintfax/conffax.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/conffilters.cpp b/kdeprint/kdeprintfax/conffilters.cpp index 7f33136d9..d32f33ea8 100644 --- a/kdeprint/kdeprintfax/conffilters.cpp +++ b/kdeprint/kdeprintfax/conffilters.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -85,7 +85,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) void ConfFilters::load() { - TQFile f(locate("data","kdeprintfax/faxfilters")); + TQFile f(locate("data","tdeprintfax/faxfilters")); if (f.exists() && f.open(IO_ReadOnly)) { TQTextStream t(&f); @@ -108,7 +108,7 @@ void ConfFilters::load() void ConfFilters::save() { TQListViewItem *item = m_filters->firstChild(); - TQFile f(locateLocal("data","kdeprintfax/faxfilters")); + TQFile f(locateLocal("data","tdeprintfax/faxfilters")); if (f.open(IO_WriteOnly)) { TQTextStream t(&f); diff --git a/kdeprint/kdeprintfax/conffilters.h b/kdeprint/kdeprintfax/conffilters.h index c4eb1f5c2..871b44bec 100644 --- a/kdeprint/kdeprintfax/conffilters.h +++ b/kdeprint/kdeprintfax/conffilters.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp index a7d8ac3e7..db3ef916a 100644 --- a/kdeprint/kdeprintfax/confgeneral.cpp +++ b/kdeprint/kdeprintfax/confgeneral.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h index e94ac7422..2962b0b0b 100644 --- a/kdeprint/kdeprintfax/confgeneral.h +++ b/kdeprint/kdeprintfax/confgeneral.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/configdlg.cpp b/kdeprint/kdeprintfax/configdlg.cpp index a3616cf54..526b767ff 100644 --- a/kdeprint/kdeprintfax/configdlg.cpp +++ b/kdeprint/kdeprintfax/configdlg.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -37,7 +37,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name) TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); m_fax = new ConfFax(page2, "Fax"); - TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("kdeprintfax")); + TQVBox *page3 = addVBoxPage(i18n("System"), i18n("Fax System Selection"), DesktopIcon("tdeprintfax")); m_system = new ConfSystem(page3, "System"); TQVBox *page4 = addVBoxPage(i18n("Filters"), i18n("Filters Configuration"), DesktopIcon("filter")); diff --git a/kdeprint/kdeprintfax/configdlg.h b/kdeprint/kdeprintfax/configdlg.h index 1e312b57b..6fabd2011 100644 --- a/kdeprint/kdeprintfax/configdlg.h +++ b/kdeprint/kdeprintfax/configdlg.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp index 7410a0191..91c23adb6 100644 --- a/kdeprint/kdeprintfax/confsystem.cpp +++ b/kdeprint/kdeprintfax/confsystem.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/confsystem.h b/kdeprint/kdeprintfax/confsystem.h index 9306df9f3..0ce8971f0 100644 --- a/kdeprint/kdeprintfax/confsystem.h +++ b/kdeprint/kdeprintfax/confsystem.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp index 123956377..a2d58c17e 100644 --- a/kdeprint/kdeprintfax/defcmds.cpp +++ b/kdeprint/kdeprintfax/defcmds.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kdeprintfax/defcmds.h b/kdeprint/kdeprintfax/defcmds.h index f76094709..90d67b83f 100644 --- a/kdeprint/kdeprintfax/defcmds.h +++ b/kdeprint/kdeprintfax/defcmds.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp index a54375867..ad50ac9fb 100644 --- a/kdeprint/kdeprintfax/faxab.cpp +++ b/kdeprint/kdeprintfax/faxab.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/faxab.h b/kdeprint/kdeprintfax/faxab.h index f50748217..8b50c204a 100644 --- a/kdeprint/kdeprintfax/faxab.h +++ b/kdeprint/kdeprintfax/faxab.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp index eed9d5816..c1b1b1a0d 100644 --- a/kdeprint/kdeprintfax/faxctrl.cpp +++ b/kdeprint/kdeprintfax/faxctrl.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ */ #include "faxctrl.h" -#include "kdeprintfax.h" +#include "tdeprintfax.h" #include "defcmds.h" #include @@ -486,11 +486,11 @@ void FaxCtrl::filter() } else { - TQString tmp = locateLocal("tmp","kdeprintfax_") + kapp->randomString(8); + TQString tmp = locateLocal("tmp","tdeprintfax_") + kapp->randomString(8); m_filteredfiles.prepend(tmp); m_tempfiles.append(tmp); m_process->clearArguments(); - *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters")) + *m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters")) << TQString::tqfromLatin1("--mime=%1").arg(mimeType) << "-p" << pageSize() << KProcess::quote(m_files[0]) << KProcess::quote(tmp); diff --git a/kdeprint/kdeprintfax/faxctrl.h b/kdeprint/kdeprintfax/faxctrl.h index accbd6556..a7e16a850 100644 --- a/kdeprint/kdeprintfax/faxctrl.h +++ b/kdeprint/kdeprintfax/faxctrl.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ #include #include -#include "kdeprintfax.h" +#include "tdeprintfax.h" class KProcess; class TQTextEdit; diff --git a/kdeprint/kdeprintfax/filterdlg.cpp b/kdeprint/kdeprintfax/filterdlg.cpp index 5e6f018a1..0324863bc 100644 --- a/kdeprint/kdeprintfax/filterdlg.cpp +++ b/kdeprint/kdeprintfax/filterdlg.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/filterdlg.h b/kdeprint/kdeprintfax/filterdlg.h index f0736bc88..ab4fd0406 100644 --- a/kdeprint/kdeprintfax/filterdlg.h +++ b/kdeprint/kdeprintfax/filterdlg.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp index 0b0e59b6b..24ad58a0e 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.cpp +++ b/kdeprint/kdeprintfax/kdeprintfax.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ * */ -#include "kdeprintfax.h" +#include "tdeprintfax.h" #include "faxab.h" #include "faxctrl.h" #include "configdlg.h" @@ -106,7 +106,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) ); TQLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw); KSystemTray *m_tray = new KSystemTray(this); - m_tray->setPixmap(SmallIcon("kdeprintfax")); + m_tray->setPixmap(SmallIcon("tdeprintfax")); m_tray->show(); m_comment = new TQTextEdit(mainw); // I don't understand why anyone would want to turn off word wrap. It makes @@ -604,4 +604,4 @@ bool KdeprintFax::manualFaxDialog( TQString& number, TQString& name, TQString& e return false; } -#include "kdeprintfax.moc" +#include "tdeprintfax.moc" diff --git a/kdeprint/kdeprintfax/kdeprintfax.desktop b/kdeprint/kdeprintfax/kdeprintfax.desktop index a33f9292f..dc9c90bab 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.desktop +++ b/kdeprint/kdeprintfax/kdeprintfax.desktop @@ -90,8 +90,8 @@ GenericName[zh_TW]=傳真工具 GenericName[zu]=Isisebenzi se-Fax Type=Application -Exec=kdeprintfax -caption "%c" %i %m %u -Icon=kdeprintfax +Exec=tdeprintfax -caption "%c" %i %m %u +Icon=tdeprintfax Terminal=false X-DCOP-ServiceType=Multi Categories=Qt;KDE;Utility;X-KDE-Utilities-Peripherals; diff --git a/kdeprint/kdeprintfax/kdeprintfax.h b/kdeprint/kdeprintfax/kdeprintfax.h index ac54d8b61..fc1a02f7f 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.h +++ b/kdeprint/kdeprintfax/kdeprintfax.h @@ -1,5 +1,5 @@ /* - * kdeprintfax - a small fax utility + * tdeprintfax - a small fax utility * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify diff --git a/kdeprint/kdeprintfax/kdeprintfaxui.rc b/kdeprint/kdeprintfax/kdeprintfaxui.rc index 09c2be6f2..ae233a6da 100644 --- a/kdeprint/kdeprintfax/kdeprintfaxui.rc +++ b/kdeprint/kdeprintfax/kdeprintfaxui.rc @@ -1,5 +1,5 @@ - + &File diff --git a/kdeprint/kdeprintfax/main.cpp b/kdeprint/kdeprintfax/main.cpp index c1a92fd12..4fe22a3b6 100644 --- a/kdeprint/kdeprintfax/main.cpp +++ b/kdeprint/kdeprintfax/main.cpp @@ -1,5 +1,5 @@ /* - * kdeprintfax - a interface to fax-packages + * tdeprintfax - a interface to fax-packages * Copyright (C) 2001 Michael Goffioul * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ * */ -#include "kdeprintfax.h" +#include "tdeprintfax.h" #include #include @@ -30,7 +30,7 @@ TQString debugFlag; int oneShotFlag = false; static const char description[] = - I18N_NOOP("A small fax utility to be used with kdeprint."); + I18N_NOOP("A small fax utility to be used with tdeprint."); // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE @@ -47,10 +47,10 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"), + KAboutData aboutData( "tdeprintfax", I18N_NOOP("KdeprintFax"), "1.0", description, KAboutData::License_GPL, "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org"); - aboutData.addAuthor("Michael Goffioul",0, "kdeprint@swing.be"); + aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication::addCmdLineOptions(); diff --git a/kdeprint/kjobviewer/CMakeLists.txt b/kdeprint/kjobviewer/CMakeLists.txt index 1bba4ea65..332fa7fc4 100644 --- a/kdeprint/kjobviewer/CMakeLists.txt +++ b/kdeprint/kjobviewer/CMakeLists.txt @@ -29,9 +29,9 @@ install( FILES kjobviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kjobviewerui.rc DESTINATION ${DATA_INSTALL_DIR}/kjobviewer ) -##### kjobviewer (kdeinit) ###################### +##### kjobviewer (tdeinit) ###################### -tde_add_kdeinit_executable( kjobviewer AUTOMOC +tde_add_tdeinit_executable( kjobviewer AUTOMOC SOURCES kjobviewer.cpp main.cpp - LINK kdeprint_management-shared + LINK tdeprint_management-shared ) diff --git a/kdeprint/kjobviewer/Makefile.am b/kdeprint/kjobviewer/Makefile.am index 56be89334..5362ad033 100644 --- a/kdeprint/kjobviewer/Makefile.am +++ b/kdeprint/kjobviewer/Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) bin_PROGRAMS= lib_LTLIBRARIES= -kdeinit_LTLIBRARIES = kjobviewer.la +tdeinit_LTLIBRARIES = kjobviewer.la kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp kjobviewer_la_METASOURCES = AUTO -kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) +kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_KDEUI) kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h diff --git a/kdeprint/kjobviewer/kjobviewer.cpp b/kdeprint/kjobviewer/kjobviewer.cpp index fc251d664..0fb23e7ba 100644 --- a/kdeprint/kjobviewer/kjobviewer.cpp +++ b/kdeprint/kjobviewer/kjobviewer.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,9 +18,9 @@ **/ #include "kjobviewer.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/kdeprint/kjobviewer/kjobviewer.h b/kdeprint/kjobviewer/kjobviewer.h index 022194d1a..967262de2 100644 --- a/kdeprint/kjobviewer/kjobviewer.h +++ b/kdeprint/kjobviewer/kjobviewer.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +21,7 @@ #define KJOBVIEWER_H #include -#include +#include #include class KMJobViewer; diff --git a/kdeprint/kjobviewer/main.cpp b/kdeprint/kjobviewer/main.cpp index 47176d743..e75a00e13 100644 --- a/kdeprint/kjobviewer/main.cpp +++ b/kdeprint/kjobviewer/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -36,7 +36,7 @@ static KCmdLineOptions options[] = { extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); - aboutData.addAuthor("Michael Goffioul",0,"kdeprint@swing.be"); + aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be"); KCmdLineArgs::init(argc,argv,&aboutData); KCmdLineArgs::addCmdLineOptions(options); KJobViewerApp::addCmdLineOptions(); diff --git a/kdeprint/kprinter/CMakeLists.txt b/kdeprint/kprinter/CMakeLists.txt index 121c97f5e..0849ebe12 100644 --- a/kdeprint/kprinter/CMakeLists.txt +++ b/kdeprint/kprinter/CMakeLists.txt @@ -26,9 +26,9 @@ link_directories( ) -##### kprinter (kdeinit) ######################## +##### kprinter (tdeinit) ######################## -tde_add_kdeinit_executable( kprinter AUTOMOC +tde_add_tdeinit_executable( kprinter AUTOMOC SOURCES main.cpp printwrapper.cpp - LINK kdeprint-shared + LINK tdeprint-shared ) diff --git a/kdeprint/kprinter/Makefile.am b/kdeprint/kprinter/Makefile.am index 83c78cb91..4cab98880 100644 --- a/kdeprint/kprinter/Makefile.am +++ b/kdeprint/kprinter/Makefile.am @@ -4,10 +4,10 @@ INCLUDES = $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kprinter.la +tdeinit_LTLIBRARIES = kprinter.la kprinter_la_SOURCES = main.cpp printwrapper.cpp -kprinter_la_LIBADD = -lkdeprint +kprinter_la_LIBADD = -ltdeprint kprinter_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) kprinter_la_METASOURCES = AUTO diff --git a/kdeprint/kprinter/kprinter.desktop b/kdeprint/kprinter/kprinter.desktop index cd4a823e5..bb2de4735 100644 --- a/kdeprint/kprinter/kprinter.desktop +++ b/kdeprint/kprinter/kprinter.desktop @@ -3,7 +3,7 @@ Exec=kprinter Icon=kjobviewer Terminal=false Type=Application -DocPath=kdeprint/index.html +DocPath=tdeprint/index.html X-KDE-StartupNotify=true Name=KPrinter Name[af]=KDrukker diff --git a/kdeprint/kprinter/main.cpp b/kdeprint/kprinter/main.cpp index dd49103c5..5d1667cee 100644 --- a/kdeprint/kprinter/main.cpp +++ b/kdeprint/kprinter/main.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp index f8fe1a46d..effa3dea3 100644 --- a/kdeprint/kprinter/printwrapper.cpp +++ b/kdeprint/kprinter/printwrapper.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -42,9 +42,9 @@ #include #include -#include -#include -#include +#include +#include +#include void signal_handler(int); TQString tempFile; diff --git a/kdeprint/kprinter/printwrapper.h b/kdeprint/kprinter/printwrapper.h index 55ddcdf75..e34e8d964 100644 --- a/kdeprint/kprinter/printwrapper.h +++ b/kdeprint/kprinter/printwrapper.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/printmgr/CMakeLists.txt b/kdeprint/printmgr/CMakeLists.txt index 847996abf..af68abb3f 100644 --- a/kdeprint/printmgr/CMakeLists.txt +++ b/kdeprint/printmgr/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES printers.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_printmgr AUTOMOC SOURCES kcmprintmgr.cpp - LINK kdeprint_management-shared + LINK tdeprint_management-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/printmgr/Makefile.am b/kdeprint/printmgr/Makefile.am index b10f8359e..d0932829a 100644 --- a/kdeprint/printmgr/Makefile.am +++ b/kdeprint/printmgr/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_printmgr.la kcm_printmgr_la_SOURCES = kcmprintmgr.cpp kcm_printmgr_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_printmgr_la_LIBADD = -lkdeprint_management +kcm_printmgr_la_LIBADD = -ltdeprint_management noinst_HEADERS = kcmprintmgr.h diff --git a/kdeprint/printmgr/kcmprintmgr.cpp b/kdeprint/printmgr/kcmprintmgr.cpp index 0d0f8b170..34b773070 100644 --- a/kdeprint/printmgr/kcmprintmgr.cpp +++ b/kdeprint/printmgr/kcmprintmgr.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,7 +18,7 @@ **/ #include "kcmprintmgr.h" -#include "kdeprint/kmmainview.h" +#include "tdeprint/kmmainview.h" #include @@ -51,7 +51,7 @@ KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList new KAboutData(I18N_NOOP("kcmprintmgr"), I18N_NOOP("KDE Printing Management"), 0, 0, KAboutData::License_GPL, I18N_NOOP("(c) 2000 - 2002 Michael Goffioul")); - about->addAuthor("Michael Goffioul", 0, "kdeprint@swing.be"); + about->addAuthor("Michael Goffioul", 0, "tdeprint@swing.be"); setAboutData(about); } diff --git a/kdeprint/printmgr/kcmprintmgr.h b/kdeprint/printmgr/kcmprintmgr.h index 126930931..e82bc730f 100644 --- a/kdeprint/printmgr/kcmprintmgr.h +++ b/kdeprint/printmgr/kcmprintmgr.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/printmgr/printers.desktop b/kdeprint/printmgr/printers.desktop index 0b5d605e9..38820b20b 100644 --- a/kdeprint/printmgr/printers.desktop +++ b/kdeprint/printmgr/printers.desktop @@ -2,7 +2,7 @@ Exec=kcmshell printers Icon=printmgr Type=Application -DocPath=kdeprint/index.html +DocPath=tdeprint/index.html MimeType=print/manager; X-KDE-ModuleType=Library diff --git a/kdeprint/slave/CMakeLists.txt b/kdeprint/slave/CMakeLists.txt index cfac6d998..db9162a1b 100644 --- a/kdeprint/slave/CMakeLists.txt +++ b/kdeprint/slave/CMakeLists.txt @@ -34,6 +34,6 @@ install( FILES print.protocol printdb.protocol DESTINATION ${SERVICES_INSTALL_DI tde_add_kpart( kio_print AUTOMOC SOURCES kio_print.cpp - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeprint/slave/Makefile.am b/kdeprint/slave/Makefile.am index b4352d4d8..5e5e04123 100644 --- a/kdeprint/slave/Makefile.am +++ b/kdeprint/slave/Makefile.am @@ -7,7 +7,7 @@ INCLUDES= $(all_includes) kde_module_LTLIBRARIES = kio_print.la kio_print_la_SOURCES = kio_print.cpp -kio_print_la_LIBADD = $(LIB_KIO) -lkdeprint +kio_print_la_LIBADD = $(LIB_KIO) -ltdeprint kio_print_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp index ebb6b859f..d8bb4cf6e 100644 --- a/kdeprint/slave/kio_print.cpp +++ b/kdeprint/slave/kio_print.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,11 +18,11 @@ **/ #include "kio_print.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { - TQFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename)); + TQFile f(locate("data", TQString::tqfromLatin1("tdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { TQTextStream t(&f); @@ -789,12 +789,12 @@ void KIO_Print::showData(const TQString& pathname) /** * Locate a data in this order: - * - $KDEDIR/share/apps/kdeprint/template/ + * - $KDEDIR/share/apps/tdeprint/template/ * - as a desktop icon */ TQString KIO_Print::locateData(const TQString& item) { - TQString path = locate("data", "kdeprint/template/"+item); + TQString path = locate("data", "tdeprint/template/"+item); if (path.isEmpty()) path = KGlobal::iconLoader()->iconPath(item, KIcon::Desktop, true); return path; diff --git a/kdeprint/slave/kio_print.h b/kdeprint/slave/kio_print.h index 7f622cb6b..954a3045f 100644 --- a/kdeprint/slave/kio_print.h +++ b/kdeprint/slave/kio_print.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2001 Michael Goffioul + * Copyright (c) 2001 Michael Goffioul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/kdeprint/slave/templates/CMakeLists.txt b/kdeprint/slave/templates/CMakeLists.txt index 31f11cf6a..f2344a0df 100644 --- a/kdeprint/slave/templates/CMakeLists.txt +++ b/kdeprint/slave/templates/CMakeLists.txt @@ -16,10 +16,10 @@ install( FILES box-top-middle.png bar-bottom-middle.png bar-top-right.png box-bottom-right.png box-top-right.png bar-bottom-right.png - bottom-left.png box-centre-kdeprint.png + bottom-left.png box-centre-tdeprint.png top-left.png bar-middle-left.png bottom-middle.png box-middle-left.png top-middle.png bar-middle-right.png - bottom-right.png box-middle-right.png top-right-kdeprint.png + bottom-right.png box-middle-right.png top-right-tdeprint.png bar-top-left.png box-bottom-left.png box-top-left.png htmlstyles.css - DESTINATION ${DATA_INSTALL_DIR}/kdeprint/template ) + DESTINATION ${DATA_INSTALL_DIR}/tdeprint/template ) diff --git a/kdeprint/slave/templates/Makefile.am b/kdeprint/slave/templates/Makefile.am index 7fde236a2..3f23f9d2d 100644 --- a/kdeprint/slave/templates/Makefile.am +++ b/kdeprint/slave/templates/Makefile.am @@ -13,7 +13,7 @@ template_DATA = class.template \ box-top-right.png \ bar-bottom-right.png \ bottom-left.png \ - box-centre-kdeprint.png \ + box-centre-tdeprint.png \ top-left.png \ bar-middle-left.png \ bottom-middle.png \ @@ -22,10 +22,10 @@ template_DATA = class.template \ bar-middle-right.png \ bottom-right.png \ box-middle-right.png \ - top-right-kdeprint.png \ + top-right-tdeprint.png \ bar-top-left.png \ box-bottom-left.png \ box-top-left.png \ htmlstyles.css -templatedir = $(kde_datadir)/kdeprint/template +templatedir = $(kde_datadir)/tdeprint/template diff --git a/kdeprint/slave/templates/class.template b/kdeprint/slave/templates/class.template index 4cbc075ab..b6a79a1fd 100644 --- a/kdeprint/slave/templates/class.template +++ b/kdeprint/slave/templates/class.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
- +
@@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
+ "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">

 %1

diff --git a/kdeprint/slave/templates/driver.template b/kdeprint/slave/templates/driver.template index d5c8af111..8ba428e74 100644 --- a/kdeprint/slave/templates/driver.template +++ b/kdeprint/slave/templates/driver.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
- +
@@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
+ "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">

 %1

diff --git a/kdeprint/slave/templates/jobs.template b/kdeprint/slave/templates/jobs.template index 6c326feec..684899aba 100644 --- a/kdeprint/slave/templates/jobs.template +++ b/kdeprint/slave/templates/jobs.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
- +
@@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
+ "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">

 %1

diff --git a/kdeprint/slave/templates/printer.template b/kdeprint/slave/templates/printer.template index 44d6ba82b..3bdfa8665 100644 --- a/kdeprint/slave/templates/printer.template +++ b/kdeprint/slave/templates/printer.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
- +
@@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
+ "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">

 %1

diff --git a/kdeprint/slave/templates/pseudo.template b/kdeprint/slave/templates/pseudo.template index d6dec46df..a5acc24d1 100644 --- a/kdeprint/slave/templates/pseudo.template +++ b/kdeprint/slave/templates/pseudo.template @@ -22,7 +22,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
- +
@@ -88,7 +88,7 @@ body {margin: 0px; padding: 0px; background-color: #418ade;}
+ "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">

 %1

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index 3c83764c2..a7047e550 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -72,7 +72,7 @@ tde_add_executable( kxdglauncher ) -##### kdesktop (kdeinit) ######################## +##### kdesktop (tdeinit) ######################## set( target kdesktop ) @@ -86,7 +86,7 @@ set( ${target}_SRCS kfileividesktop.cpp kdesktopapp.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kdesktopsettings-static bgnd-static dmctl-static diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN index e2a6a2b8b..f13a7b2f5 100644 --- a/kdesktop/DESIGN +++ b/kdesktop/DESIGN @@ -37,7 +37,7 @@ lock* : screen saver/locker Libs used by KDesktop ====================== -kdecore, kdeui, kfile - usual stuff :) +tdecore, tdeui, kfile - usual stuff :) libkio - I/O stuff, mimetypes, services, registry libkonq - properties dialog, templates ("new") menu, dir lister, settings diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index 994a44c12..6c7b869f8 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = . lock pics patterns programs init kwebdesktop bin_PROGRAMS = kcheckrunning kxdglauncher lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kdesktop.la +tdeinit_LTLIBRARIES = kdesktop.la noinst_LTLIBRARIES = libkdesktopsettings.la libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h index 4a9d6b7eb..3443eda40 100644 --- a/kdesktop/kshadowengine.h +++ b/kdesktop/kshadowengine.h @@ -80,7 +80,7 @@ class KShadowEngine TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor); private: - // No static objects in libs, and no static deleters in kdefx... + // No static objects in libs, and no static deleters in tdefx... //static KShadowSettings s_defaultShadowSettings; KShadowSettings *m_shadowSettings; diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am index 6d1d9fac2..eb8d759cf 100644 --- a/kdesktop/kwebdesktop/Makefile.am +++ b/kdesktop/kwebdesktop/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop METASOURCES = AUTO kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc -kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am index 3b16ff479..b2d886e50 100644 --- a/kdesktop/lock/Makefile.am +++ b/kdesktop/lock/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kdesktop/lock INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes) -kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB) ####### Files diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index da83535c8..ff4553b8e 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 1cec74e2c..9ff990820 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index 639772ace..ec9b88b04 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index 8b00e5408..ff1c4470f 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc index 4577f5784..532b9044e 100644 --- a/kdesktop/lock/securedlg.cc +++ b/kdesktop/lock/securedlg.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index f60eff4a5..17d636b01 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include @@ -544,7 +544,7 @@ int Minicli::runCommand() // through SuProcess without providing the user password if (m_iPriority < 50) { - // from kdesu_stub.c + // from tdesu_stub.c int val = 20 - (int) (((double) m_iPriority) * 40 / 100 + 0.5); cmd = "nice -n " + TQString::number( val ) + " " + cmd; } diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt index 5461732be..c1fef3ba8 100644 --- a/kdesu/CMakeLists.txt +++ b/kdesu/CMakeLists.txt @@ -49,5 +49,5 @@ else() set( DEFAULT_SUPER_USER_COMMAND su CACHE INTERNAL "" FORCE ) endif() -add_subdirectory( kdesu ) -add_subdirectory( kdesud ) +add_subdirectory( tdesu ) +add_subdirectory( tdesud ) diff --git a/kdesu/ChangeLog b/kdesu/ChangeLog index 7ef6d2de2..ad44b81a5 100644 --- a/kdesu/ChangeLog +++ b/kdesu/ChangeLog @@ -8,7 +8,7 @@ Wed, 26 Jan 00 Geert Jansen Sat, 18 Dec 99 Geert Jansen * Add DCOP authentication cookies. - * Fixed SMP install of kdesud. + * Fixed SMP install of tdesud. Sat, 23 Oct 99 Geert Jansen @@ -17,14 +17,14 @@ Sat, 23 Oct 99 Geert Jansen Tue, 28 Sep 99 Geert Jansen - * Integrating kdesu into kdebase + * Integrating tdesu into kdebase Sat, 25 Sep 99 Geert Jansen * BIG change: su to other user than root. This required a different way to pass X cookies and stuff to the target process. See - common/kdesu_stub.c for more info. - * Fixed a bug in kdesud/lexer.cpp + common/tdesu_stub.c for more info. + * Fixed a bug in tdesud/lexer.cpp Thu, 23 Sep 99 Geert Jansen @@ -32,7 +32,7 @@ Thu, 23 Sep 99 Geert Jansen * The execution of processes is more efficient now: 2 processess instead of 3 and 1 tempfile instead of 2. This way possible by setting the XAUTHORITY env. var. to $HOME/.Xauthority instead of making a new one. - * Fixed a subtle bug in kdesud. kdesud catches SIGCHLD to handle child + * Fixed a subtle bug in tdesud. tdesud catches SIGCHLD to handle child exits but this is incompatible with "class RootProcess", which does a waitpid() and depends on getting the exit code. * Only connect to daemon when necessary. @@ -46,11 +46,11 @@ Wed, 22 Sep 99 Geert Jansen Wed, 8 Sep 99 Geert Jansen - * If started as root, kdesu does not ask for a password anymore. + * If started as root, tdesu does not ask for a password anymore. Wed, 1 Sep 99 Geert Jansen - * Deferred instantiation of kapp in kdesu.cpp. + * Deferred instantiation of kapp in tdesu.cpp. * Finished porting to KDE2. Sun, 29 Aug 99 Geert Jansen @@ -114,7 +114,7 @@ Thu, 20 May 99 Geert Jansen Fri, 09 Apr 99 Geert Jansen - * Backport to KDE 1.1. Release as kdesu-0.9.tar.gz + * Backport to KDE 1.1. Release as tdesu-0.9.tar.gz Mon, 22 Mar 99 Geert Jansen diff --git a/kdesu/FAQ b/kdesu/FAQ index e5a60fbeb..b7d1499c7 100644 --- a/kdesu/FAQ +++ b/kdesu/FAQ @@ -9,11 +9,11 @@ A: No program is 100% safe. However, KDE su is not setuid root and it Q: How safe is password keeping? A: Enabling password keeping is less secure that disabling it. However, the - scheme kdesu uses to keep passwords prevents everyone (including you, the + scheme tdesu uses to keep passwords prevents everyone (including you, the user) from accessing them. Please see the HTML documentation for a full description of this scheme. -Q: Can I execute tty applications with kdesu? +Q: Can I execute tty applications with tdesu? A: No. TTY application will probably never be supported. Use the Unix su for those. NOTE: As of version 0.94, tty _output_ _only_ is supported with the `-t' @@ -32,7 +32,7 @@ A: KDE su needs to setup a pty/tty pair for communicating with `su'. This is that is not a tty. Setting up a pty/tty pair is not completely portable. Q: A good debug tip? -A: If kdesu doesn't fire up your application, use the '-t' switch. +A: If tdesu doesn't fire up your application, use the '-t' switch. This way, you'll get terminal output. Maybe there is something wrong with the program you're trying to run. diff --git a/kdesu/LICENSE.readme b/kdesu/LICENSE.readme index 025de076d..234d3c1d8 100644 --- a/kdesu/LICENSE.readme +++ b/kdesu/LICENSE.readme @@ -1,4 +1,4 @@ -kdesu - a KDE front end to su +tdesu - a KDE front end to su Copyright (c) 1998 by Pietro Iglio Copyright (c) 1999,2000 by Geert Jansen diff --git a/kdesu/Makefile.am b/kdesu/Makefile.am index cac8b9a8b..a07d47884 100644 --- a/kdesu/Makefile.am +++ b/kdesu/Makefile.am @@ -1 +1 @@ -SUBDIRS = kdesu kdesud +SUBDIRS = tdesu tdesud diff --git a/kdesu/README b/kdesu/README index 6a141b0e7..caa2e0d48 100644 --- a/kdesu/README +++ b/kdesu/README @@ -10,8 +10,8 @@ What is it? Usage: - $ kdesu -h - $ kdesu -c konsole + $ tdesu -h + $ tdesu -c konsole Please see the HTML documentation! diff --git a/kdesu/configure.in.in b/kdesu/configure.in.in index 5c0798344..512825786 100644 --- a/kdesu/configure.in.in +++ b/kdesu/configure.in.in @@ -46,17 +46,17 @@ AC_MSG_RESULT($nogroup) AC_SUBST(nogroup) AC_CHECK_FUNCS(getpeereid) -AC_ARG_WITH(sudo-kdesu-backend, - AC_HELP_STRING([--with-sudo-kdesu-backend], - [use sudo as backend for kdesu (default is su)]), +AC_ARG_WITH(sudo-tdesu-backend, + AC_HELP_STRING([--with-sudo-tdesu-backend], + [use sudo as backend for tdesu (default is su)]), [ if test x$withval = xyes; then - use_kdesu_backend="sudo" + use_tdesu_backend="sudo" else - use_kdesu_backend="su" + use_tdesu_backend="su" fi ], - use_kdesu_backend="su" + use_tdesu_backend="su" ) -AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_kdesu_backend", [Use su or sudo]) +AC_DEFINE_UNQUOTED(DEFAULT_SUPER_USER_COMMAND, "$use_tdesu_backend", [Use su or sudo]) diff --git a/kdesu/kdesu/CMakeLists.txt b/kdesu/kdesu/CMakeLists.txt index b18fbfb57..7eb878140 100644 --- a/kdesu/kdesu/CMakeLists.txt +++ b/kdesu/kdesu/CMakeLists.txt @@ -21,10 +21,10 @@ link_directories( ) -##### kdesu (executable) ######################## +##### tdesu (executable) ######################## -tde_add_executable( kdesu AUTOMOC - SOURCES kdesu.cpp sudlg.cpp - LINK kdesu-shared kio-shared +tde_add_executable( tdesu AUTOMOC + SOURCES tdesu.cpp sudlg.cpp + LINK tdesu-shared kio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesu/kdesu/Makefile.am b/kdesu/kdesu/Makefile.am index 4b18e7580..f322f0a6f 100644 --- a/kdesu/kdesu/Makefile.am +++ b/kdesu/kdesu/Makefile.am @@ -1,15 +1,15 @@ -## Makefile.am for kdesu by Geert Jansen +## Makefile.am for tdesu by Geert Jansen INCLUDES= $(all_includes) -## kdesu -bin_PROGRAMS = kdesu -kdesu_SOURCES = kdesu.cpp sudlg.cpp -kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kdesu_LDADD = $(LIB_KIO) -lkdesu -kdesu_METASOURCES = AUTO +## tdesu +bin_PROGRAMS = tdesu +tdesu_SOURCES = tdesu.cpp sudlg.cpp +tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdesu_LDADD = $(LIB_KIO) -ltdesu +tdesu_METASOURCES = AUTO noinst_HEADERS = sudlg.h ## Messages messages: - $(XGETTEXT) $(kdesu_SOURCES) -o $(podir)/kdesu.pot + $(XGETTEXT) $(tdesu_SOURCES) -o $(podir)/tdesu.pot diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp index 3d18b8764..d6aeebc6f 100644 --- a/kdesu/kdesu/kdesu.cpp +++ b/kdesu/kdesu/kdesu.cpp @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1998 Pietro Iglio * Copyright (C) 1999,2000 Geert Jansen */ @@ -39,9 +39,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "sudlg.h" @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) if (duser && duser[0]) options[3].def = duser; - KAboutData aboutData("kdesu", I18N_NOOP("KDE su"), + KAboutData aboutData("tdesu", I18N_NOOP("KDE su"), Version, I18N_NOOP("Runs a program with elevated privileges."), KAboutData::License_Artistic, "Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"); @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineArgs::addCmdLineOptions(options); KApplication::disableAutoDcopRegistration(); - // kdesu doesn't process SM events, so don't even connect to ksmserver + // tdesu doesn't process SM events, so don't even connect to ksmserver TQCString session_manager = getenv( "SESSION_MANAGER" ); unsetenv( "SESSION_MANAGER" ); KApplication app; @@ -272,7 +272,7 @@ static int startApp() just_started = true; } - // Try to exec the command with kdesud. + // Try to exec the command with tdesud. bool keep = !args->isSet("n") && have_daemon; bool terminal = true; bool new_dcop = args->isSet("newdcop"); diff --git a/kdesu/kdesu/sudlg.cpp b/kdesu/kdesu/sudlg.cpp index 483633739..cfda9168c 100644 --- a/kdesu/kdesu/sudlg.cpp +++ b/kdesu/kdesu/sudlg.cpp @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen */ @@ -11,7 +11,7 @@ #include #include -#include +#include #include "sudlg.h" KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton) diff --git a/kdesu/kdesu/sudlg.h b/kdesu/kdesu/sudlg.h index 4277ca67c..64a283a0e 100644 --- a/kdesu/kdesu/sudlg.h +++ b/kdesu/kdesu/sudlg.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 2000 Geert Jansen */ diff --git a/kdesu/kdesud/CMakeLists.txt b/kdesu/kdesud/CMakeLists.txt index 5e7fe6cbb..2696a8197 100644 --- a/kdesu/kdesud/CMakeLists.txt +++ b/kdesu/kdesud/CMakeLists.txt @@ -23,13 +23,13 @@ link_directories( ) -##### kdesud (executable) ####################### +##### tdesud (executable) ####################### -tde_add_executable( kdesud - SOURCES kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp - LINK kdesu-shared +tde_add_executable( tdesud + SOURCES tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp + LINK tdesu-shared DESTINATION ${BIN_INSTALL_DIR} ) -install( CODE "execute_process( COMMAND chown root:${nogroup} \$ENV{DESTDIR}${_destination}/kdesud )" ) -install( CODE "execute_process( COMMAND chmod 2755 \$ENV{DESTDIR}${_destination}/kdesud )" ) +install( CODE "execute_process( COMMAND chown root:${nogroup} \$ENV{DESTDIR}${_destination}/tdesud )" ) +install( CODE "execute_process( COMMAND chmod 2755 \$ENV{DESTDIR}${_destination}/tdesud )" ) diff --git a/kdesu/kdesud/Makefile.am b/kdesu/kdesud/Makefile.am index 07e11dd15..140cbce06 100644 --- a/kdesu/kdesud/Makefile.am +++ b/kdesu/kdesud/Makefile.am @@ -1,31 +1,31 @@ -## Makefile.am for kdesud +## Makefile.am for tdesud INCLUDES = $(all_includes) KDE_CXXFLAGS = $(KDE_USE_FPIE) -bin_PROGRAMS = kdesud -kdesud_SOURCES = kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp -kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) -kdesud_LDADD = $(LIB_KDECORE) -lkdesu $(LIBSOCKET) +bin_PROGRAMS = tdesud +tdesud_SOURCES = tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp +tdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) +tdesud_LDADD = $(LIB_KDECORE) -ltdesu $(LIBSOCKET) noinst_HEADERS = repo.h handler.h lexer.h secure.h -## kdesud needs to be suid or sgid something +## tdesud needs to be suid or sgid something install-data-local: @echo "********************************************************" @echo "" - @echo "For security reasons, kdesud is installed setgid nogroup." + @echo "For security reasons, tdesud is installed setgid nogroup." @echo "Kdesud is the daemon that implements the password caching." @echo "" - @echo "You should NOT use the password caching feature if kdesud is" + @echo "You should NOT use the password caching feature if tdesud is" @echo "not installed setgid nogroup." @echo "" @echo "********************************************************" install-exec-hook: - @(chown root:@nogroup@ $(DESTDIR)$(bindir)/kdesud && chmod 2755 $(DESTDIR)$(bindir)/kdesud) \ - || echo "Error: Could not install kdesud as setgid nogroup!!\n" \ + @(chown root:@nogroup@ $(DESTDIR)$(bindir)/tdesud && chmod 2755 $(DESTDIR)$(bindir)/tdesud) \ + || echo "Error: Could not install tdesud as setgid nogroup!!\n" \ "The password caching feature is disabled." messages: - $(XGETTEXT) $(kdesud_SOURCES) -o $(podir)/kdesud.pot + $(XGETTEXT) $(tdesud_SOURCES) -o $(podir)/tdesud.pot diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp index 1d52a58ac..2a744b217 100644 --- a/kdesu/kdesud/handler.cpp +++ b/kdesu/kdesud/handler.cpp @@ -1,8 +1,8 @@ /* - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * - * handler.cpp: A connection handler for kdesud. + * handler.cpp: A connection handler for tdesud. */ @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include "handler.h" #include "repo.h" @@ -32,7 +32,7 @@ // Global repository extern Repository *repo; -void kdesud_cleanup(); +void tdesud_cleanup(); ConnectionHandler::ConnectionHandler(int fd) : SocketSecurity(fd), m_exitCode(0), m_hasExitCode(false), m_needExitCode(false), m_pid(0) @@ -490,7 +490,7 @@ int ConnectionHandler::doCommand(TQCString buf) goto parse_error; kdDebug(1205) << "Stopping by command" << endl; respond(Res_OK); - kdesud_cleanup(); + tdesud_cleanup(); exit(0); default: diff --git a/kdesu/kdesud/handler.h b/kdesu/kdesud/handler.h index 785d1179f..8728efe78 100644 --- a/kdesu/kdesud/handler.h +++ b/kdesu/kdesud/handler.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp index f4b4081e9..d369aaf9b 100644 --- a/kdesu/kdesud/kdesud.cpp +++ b/kdesu/kdesud/kdesud.cpp @@ -1,12 +1,12 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * - * kdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su. + * tdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su. * - * The socket $KDEHOME/socket-$(HOSTNAME)/kdesud_$(display) is used for communication with + * The socket $KDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with * client programs. * * The protocol: Client initiates the connection. All commands and responses @@ -67,8 +67,8 @@ #include #include #include -#include -#include +#include +#include #include #include "repo.h" @@ -93,7 +93,7 @@ Display *x11Display; int pipeOfDeath[2]; -void kdesud_cleanup() +void tdesud_cleanup() { unlink(sock); } @@ -106,7 +106,7 @@ extern "C" int xio_errhandler(Display *); int xio_errhandler(Display *) { kdError(1205) << "Fatal IO error, exiting...\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); return 1; //silence compilers } @@ -138,7 +138,7 @@ extern "C" { void signal_exit(int sig) { kdDebug(1205) << "Exiting on signal " << sig << "\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); } @@ -168,7 +168,7 @@ int create_socket() // strip the screen number from the display display.replace(TQRegExp("\\.[0-9]+$"), ""); - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(static_cast(display)))); + sock = TQFile::encodeName(locateLocal("socket", TQString("tdesud_%1").arg(static_cast(display)))); int stat_err=lstat(sock, &s); if(!stat_err && S_ISLNK(s.st_mode)) { kdWarning(1205) << "Someone is running a symlink attack on you\n"; @@ -191,7 +191,7 @@ int create_socket() } } else { - kdWarning(1205) << "kdesud is already running\n"; + kdWarning(1205) << "tdesud is already running\n"; return -1; } @@ -251,8 +251,8 @@ int main(int argc, char *argv[]) { prctl(PR_SET_DUMPABLE, 0); - KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"), - Version, I18N_NOOP("Daemon used by kdesu"), + KAboutData aboutData("tdesud", I18N_NOOP("KDE su daemon"), + Version, I18N_NOOP("Daemon used by tdesu"), KAboutData::License_Artistic, "Copyright (c) 1999,2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"), @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) if (listen(sockfd, 1) < 0) { kdError(1205) << "listen(): " << ERR << "\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); } int maxfd = sockfd; @@ -286,7 +286,7 @@ int main(int argc, char *argv[]) if (pid == -1) { kdError(1205) << "fork():" << ERR << "\n"; - kdesud_cleanup(); + tdesud_cleanup(); exit(1); } if (pid) diff --git a/kdesu/kdesud/lexer.cpp b/kdesu/kdesud/lexer.cpp index d9fbf4639..f1932f07d 100644 --- a/kdesu/kdesud/lexer.cpp +++ b/kdesu/kdesud/lexer.cpp @@ -1,9 +1,9 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * - * lexer.cpp: A lexer for the kdesud protocol. See kdesud.cpp for a + * lexer.cpp: A lexer for the tdesud protocol. See tdesud.cpp for a * description of the protocol. */ diff --git a/kdesu/kdesud/lexer.h b/kdesu/kdesud/lexer.h index 1ca55b907..d8f529cd8 100644 --- a/kdesu/kdesud/lexer.h +++ b/kdesu/kdesud/lexer.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ @@ -10,7 +10,7 @@ class TQCString; /** - * This is a lexer for the kdesud protocol. + * This is a lexer for the tdesud protocol. */ class Lexer { diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp index cc0f79ae5..e923d6411 100644 --- a/kdesu/kdesud/repo.cpp +++ b/kdesu/kdesud/repo.cpp @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdesu/kdesud/repo.h b/kdesu/kdesud/repo.h index 24c156a34..70027793f 100644 --- a/kdesu/kdesud/repo.h +++ b/kdesu/kdesud/repo.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdesu/kdesud/secure.cpp b/kdesu/kdesud/secure.cpp index 3abda20bc..9b30ab4ee 100644 --- a/kdesu/kdesud/secure.cpp +++ b/kdesu/kdesud/secure.cpp @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * secure.cpp: Peer credentials for a UNIX socket. @@ -67,7 +67,7 @@ SocketSecurity::SocketSecurity(int sockfd) if (!warned_him) { kdWarning() << "Using void socket security. Please add support for your" << endl; - kdWarning() << "platform to kdesu/kdesud/secure.cpp" << endl; + kdWarning() << "platform to tdesu/tdesud/secure.cpp" << endl; warned_him = TRUE; } diff --git a/kdesu/kdesud/secure.h b/kdesu/kdesud/secure.h index 8e122fac3..edf58d9c6 100644 --- a/kdesu/kdesud/secure.h +++ b/kdesu/kdesud/secure.h @@ -1,6 +1,6 @@ /* vi: ts=8 sts=4 sw=4 * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen */ diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am index 76ae1d345..974228ed6 100644 --- a/kdialog/Makefile.am +++ b/kdialog/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS = kdialog kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel kdialog_LDADD = $(LIB_KIO) -kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kdm/kfrontend/CMakeLists.txt b/kdm/kfrontend/CMakeLists.txt index e3093b0fe..cd432af4b 100644 --- a/kdm/kfrontend/CMakeLists.txt +++ b/kdm/kfrontend/CMakeLists.txt @@ -67,7 +67,7 @@ tde_add_executable( kdm_greet AUTOMOC kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp kgapp.cpp sakdlg.cc - LINK kdmthemer-static kdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK} + LINK kdmthemer-static tdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdm/kfrontend/Makefile.am b/kdm/kfrontend/Makefile.am index 6b7ba14bb..c1e985b99 100644 --- a/kdm/kfrontend/Makefile.am +++ b/kdm/kfrontend/Makefile.am @@ -24,11 +24,11 @@ kdm_greet_SOURCES = \ kdmadmindialog.cpp \ kgreeter.cpp \ kgapp.cpp -kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4) krootimage_SOURCES = krootimage.cpp -krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) METASOURCES = AUTO diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc index b19e18ed0..5fbb27346 100644 --- a/kdm/kfrontend/sakdlg.cc +++ b/kdm/kfrontend/sakdlg.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kdmlib/CMakeLists.txt b/kdmlib/CMakeLists.txt index f3e8d708e..4b2e54dc0 100644 --- a/kdmlib/CMakeLists.txt +++ b/kdmlib/CMakeLists.txt @@ -33,7 +33,7 @@ install( FILES kgreeterplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} ) tde_add_kpart( kgreet_classic AUTOMOC SOURCES kgreet_classic.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -42,7 +42,7 @@ tde_add_kpart( kgreet_classic AUTOMOC tde_add_kpart( kgreet_pam AUTOMOC SOURCES kgreet_pam.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -51,7 +51,7 @@ tde_add_kpart( kgreet_pam AUTOMOC tde_add_kpart( kgreet_winbind AUTOMOC SOURCES kgreet_winbind.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdmlib/kdmtsak.h b/kdmlib/kdmtsak.h index c9664ae34..9c512a59b 100644 --- a/kdmlib/kdmtsak.h +++ b/kdmlib/kdmtsak.h @@ -80,48 +80,48 @@ inline int tde_sak_verify_calling_process() if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "kdm")) { authorized = true; } - else if (procparent == "kdeinit") { - printf("kdeinit detected\n\r"); + else if (procparent == "tdeinit") { + printf("tdeinit detected\n\r"); // A bit more digging is needed to see if this is an authorized process or not - // Get the kdeinit command - char kdeinitcmdline[8192]; + // Get the tdeinit command + char tdeinitcmdline[8192]; FILE *fp = fopen(TQString("/proc/%1/cmdline").arg(parentproc).ascii(),"r"); if (fp != NULL) { - if (fgets (kdeinitcmdline, 8192, fp) != NULL) + if (fgets (tdeinitcmdline, 8192, fp) != NULL) fclose (fp); } - kdeinitcmdline[8191] = 0; - TQString kdeinitCommand = kdeinitcmdline; + tdeinitcmdline[8191] = 0; + TQString tdeinitCommand = tdeinitcmdline; // Also get the environment, specifically the path - TQString kdeinitEnvironment; - char kdeinitenviron[8192]; + TQString tdeinitEnvironment; + char tdeinitenviron[8192]; fp = fopen(TQString("/proc/%1/environ").arg(parentproc).ascii(),"r"); if (fp != NULL) { int c; int pos = 0; do { c = fgetc(fp); - kdeinitenviron[pos] = c; + tdeinitenviron[pos] = c; pos++; if (c == 0) { - TQString curEnvLine = kdeinitenviron; + TQString curEnvLine = tdeinitenviron; if (curEnvLine.startsWith("PATH=")) { - kdeinitEnvironment = curEnvLine.mid(5); + tdeinitEnvironment = curEnvLine.mid(5); } pos = 0; } } while ((c != EOF) && (pos < 8192)); fclose (fp); } - kdeinitenviron[8191] = 0; + tdeinitenviron[8191] = 0; #ifdef DEBUG - printf("Called executable name is: %s\n\r", kdeinitCommand.ascii()); - printf("Environment is: %s\n\r", kdeinitEnvironment.ascii()); + printf("Called executable name is: %s\n\r", tdeinitCommand.ascii()); + printf("Environment is: %s\n\r", tdeinitEnvironment.ascii()); #endif - if ((kdeinitCommand == "kdesktop [kdeinit]") && (kdeinitEnvironment.startsWith(KDE_BINDIR))) { + if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(KDE_BINDIR))) { authorized = true; } else { diff --git a/kfind/Makefile.am b/kfind/Makefile.am index 5724043d2..9e4867c6f 100644 --- a/kfind/Makefile.am +++ b/kfind/Makefile.am @@ -33,4 +33,4 @@ kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp kfind_LDADD = libkfind_common.la $(LIB_KPARTS) # the library search path. -kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/khelpcenter/CMakeLists.txt b/khelpcenter/CMakeLists.txt index 71840b081..795eb39dd 100644 --- a/khelpcenter/CMakeLists.txt +++ b/khelpcenter/CMakeLists.txt @@ -37,9 +37,9 @@ install( FILES DESTINATION ${DATA_INSTALL_DIR}/khelpcenter ) -##### khelpcenter (kdeinit) ##################### +##### khelpcenter (tdeinit) ##################### -tde_add_kdeinit_executable( khelpcenter AUTOMOC +tde_add_tdeinit_executable( khelpcenter AUTOMOC SOURCES navigator.cpp navigatoritem.cpp navigatorappitem.cpp view.cpp searchwidget.cpp searchengine.cpp docmetainfo.cpp @@ -58,6 +58,6 @@ tde_add_kdeinit_executable( khelpcenter AUTOMOC tde_add_executable( khc_indexbuilder AUTOMOC SOURCES khc_indexbuilder.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am index e258ba172..19c3f52b2 100644 --- a/khelpcenter/Makefile.am +++ b/khelpcenter/Makefile.am @@ -6,11 +6,11 @@ METASOURCES = AUTO bin_PROGRAMS = khc_indexbuilder lib_LTLIBRARIES = -khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor khc_indexbuilder_LDADD = $(LIB_KDECORE) khc_indexbuilder_SOURCES = khc_indexbuilder.cpp -kdeinit_LTLIBRARIES = khelpcenter.la +tdeinit_LTLIBRARIES = khelpcenter.la khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) khelpcenter_la_LIBADD = $(LIB_KHTML) @@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \ EXTRA_PROGRAMS = testmetainfo -testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testmetainfo_LDADD = $(LIB_KDECORE) docentry.lo docmetainfo.lo \ docentrytraverser.lo htmlsearch.lo testmetainfo_SOURCES = testmetainfo.cpp diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am index 04d6109c5..fc06b1ed6 100644 --- a/khelpcenter/htmlsearch/Makefile.am +++ b/khelpcenter/htmlsearch/Makefile.am @@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/ wrapper_SCRIPTS = meinproc_wrapper khtmlindex_SOURCES = index.cpp -khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor khtmlindex_LDADD = libhtmlsearch.la $(LIB_KDEUI) xpm_DATA = unchecked.xpm checked.xpm diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index a08722393..28e9e5523 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -468,7 +468,7 @@ void KCMHelpCenter::startIndexProcess() mProcess = new KProcess; if ( mRunAsRoot ) { - *mProcess << "kdesu" << "--nonewdcop"; + *mProcess << "tdesu" << "--nonewdcop"; kdDebug() << "Run as root" << endl; } diff --git a/khotkeys/app/CMakeLists.txt b/khotkeys/app/CMakeLists.txt index 8d5cc8fef..789d4ea7f 100644 --- a/khotkeys/app/CMakeLists.txt +++ b/khotkeys/app/CMakeLists.txt @@ -31,14 +31,14 @@ install( FILES khotkeys.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) tde_add_kpart( kded_khotkeys AUTOMOC SOURCES kded.cpp kded.skel - LINK khotkeys_shared-shared kdeinit_kded-shared + LINK khotkeys_shared-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### khotkeys (kdeinit) ######################## +##### khotkeys (tdeinit) ######################## -tde_add_kdeinit_executable( khotkeys AUTOMOC +tde_add_tdeinit_executable( khotkeys AUTOMOC SOURCES app.cpp app.skel LINK khotkeys_shared-shared ) diff --git a/khotkeys/app/Makefile.am b/khotkeys/app/Makefile.am index 274f4b57e..726b40374 100644 --- a/khotkeys/app/Makefile.am +++ b/khotkeys/app/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = khotkeys.la +tdeinit_LTLIBRARIES = khotkeys.la kde_module_LTLIBRARIES = kded_khotkeys.la khotkeys_la_SOURCES = app.cpp app.skel diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt index e8c08a0ec..73f295447 100644 --- a/khotkeys/kcontrol/CMakeLists.txt +++ b/khotkeys/kcontrol/CMakeLists.txt @@ -53,6 +53,6 @@ tde_add_kpart( kcm_khotkeys AUTOMOC tde_add_kpart( kcm_khotkeys_init AUTOMOC SOURCES init.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 67dc2ee6e..4bc587494 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -33,14 +33,14 @@ extern "C" // kded modules in such case. TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") - kapp->kdeinitExec( "khotkeys" ); + kapp->tdeinitExec( "khotkeys" ); else { DCOPRef ref( "kded", "kded" ); if( !ref.call( "loadModule", TQCString( "khotkeys" ))) { kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl; - kapp->kdeinitExec( "khotkeys" ); + kapp->tdeinitExec( "khotkeys" ); } } } diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index eb38ef7cc..54b3125a0 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -133,7 +133,7 @@ void Module::save() if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) { kdDebug( 1217 ) << "launching new khotkeys daemon" << endl; - KApplication::kdeinitExec( "khotkeys" ); + KApplication::tdeinitExec( "khotkeys" ); } else { diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 199f59750..efab89d8b 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -194,7 +194,7 @@ void khotkeys_send_reread_config() if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) { kdDebug( 1217 ) << "launching new khotkeys daemon" << endl; - KApplication::kdeinitExec( "khotkeys" ); + KApplication::tdeinitExec( "khotkeys" ); } else { diff --git a/kicker/DESIGN b/kicker/DESIGN index ca7fa7b2c..dd66260f0 100644 --- a/kicker/DESIGN +++ b/kicker/DESIGN @@ -62,12 +62,12 @@ these files should be moved to kdebase/kicker/kcm (... add docu here about the structure of the kcm stuff and how it uses DCOP to communicate with the panels ...) -In kdelibs/kdeui there are two classes that are quite important to kicker. +In kdelibs/tdeui there are two classes that are quite important to kicker. The first is KPanelApplet, which is the base class of all kicker applets. The other class is KPanelExtension, which is the base class of all kicker extensions. -These classes are in kdeui so that other applications besides kicker may +These classes are in tdeui so that other applications besides kicker may use these facilities, either to provide their own applet/extension facilities or so as to provide kicker applets/extensions. This strategy should be re-examined in KDE4 and the APIs of both classes cleaned up @@ -77,7 +77,7 @@ extensively. --------------------- applets/ The basic set of applets. Everything here subclasses from KPanelApplet found -in kdelibs/kdeui. These can be assumed to exist at startup and are allowed, +in kdelibs/tdeui. These can be assumed to exist at startup and are allowed, if not encouraged to, access kicker internals. buttons/ diff --git a/kicker/applets/clock/Makefile.am b/kicker/applets/clock/Makefile.am index b87e0d8e7..aab460112 100644 --- a/kicker/applets/clock/Makefile.am +++ b/kicker/applets/clock/Makefile.am @@ -19,7 +19,7 @@ clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) srcdoc: - kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -lkdecore -lkdeui -lkfile + kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 6eb40993d..74e6a6c99 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -1515,7 +1515,7 @@ void ClockApplet::contextMenuActivated(int result) preferences(); break; case 103: - proc << locate("exe", "kdesu"); + proc << locate("exe", "tdesu"); proc << "--nonewdcop"; proc << TQString("%1 kde-clock.desktop --lang %2") .arg(locate("exe", "kcmshell")) diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am index a101c6ccf..cc06542b5 100644 --- a/kicker/applets/launcher/Makefile.am +++ b/kicker/applets/launcher/Makefile.am @@ -24,4 +24,4 @@ messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -lkdecore -lkdeui + kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui diff --git a/kicker/applets/menu/CMakeLists.txt b/kicker/applets/menu/CMakeLists.txt index b0accd9a7..772348e3a 100644 --- a/kicker/applets/menu/CMakeLists.txt +++ b/kicker/applets/menu/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES menuapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets tde_add_kpart( menu_panelapplet AUTOMOC SOURCES menuapplet.cpp menuapplet.skel - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/applets/minipager/Makefile.am b/kicker/applets/minipager/Makefile.am index da149f468..d84f1993c 100644 --- a/kicker/applets/minipager/Makefile.am +++ b/kicker/applets/minipager/Makefile.am @@ -22,4 +22,4 @@ messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -lkdecore -lkdeui -lkfile + kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -lkfile diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 0a9d5c676..aaca4213e 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -254,7 +254,7 @@ NaughtyProcessMonitor::processName(ulong pid) const s += char(c); } - // Now strip 'kdeinit:' prefix. + // Now strip 'tdeinit:' prefix. TQString tqunicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) @@ -279,7 +279,7 @@ NaughtyProcessMonitor::processName(ulong pid) const return i18n("Unknown") ; } - // Now strip 'kdeinit:' prefix. + // Now strip 'tdeinit:' prefix. TQString tqunicode(TQString::fromLocal8Bit(argv[0])); free (argv) ; @@ -287,7 +287,7 @@ NaughtyProcessMonitor::processName(ulong pid) const TQStringList parts(TQStringList::split(' ', tqunicode)); - TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; + TQString processName = parts[0] == "tdeinit:" ? parts[1] : parts[0]; int lastSlash = processName.findRev('/'); diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am index 849795a9e..33a0be11c 100644 --- a/kicker/applets/systemtray/Makefile.am +++ b/kicker/applets/systemtray/Makefile.am @@ -21,4 +21,4 @@ messages: $(XGETTEXT) *.cpp *.h -o $(podir)/ksystemtrayapplet.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -lkdecore -lkdeui -lkfile + kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -lkfile diff --git a/kicker/applets/taskbar/Makefile.am b/kicker/applets/taskbar/Makefile.am index 35cb337e6..700cf27d8 100644 --- a/kicker/applets/taskbar/Makefile.am +++ b/kicker/applets/taskbar/Makefile.am @@ -19,4 +19,4 @@ messages: $(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -lkdecore -lkdeui -lkfile + kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -lkfile diff --git a/kicker/extensions/dockbar/CMakeLists.txt b/kicker/extensions/dockbar/CMakeLists.txt index 3fb274a80..9758f527c 100644 --- a/kicker/extensions/dockbar/CMakeLists.txt +++ b/kicker/extensions/dockbar/CMakeLists.txt @@ -35,6 +35,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index 247837a6d..2209e3335 100644 --- a/kicker/extensions/kasbar/Makefile.am +++ b/kicker/extensions/kasbar/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA) bin_PROGRAMS = kasbar kasbar_SOURCES = kasbarapp.cpp -kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kasbar_LDADD = libkasbar.la \ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) @@ -46,7 +46,7 @@ messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kasbarextension.pot srcdoc: - $(kde_bindir)/kdoc -a -p -d classdocs -n 'Kasbar2' ../../taskmanager/*.h *.h -lqt -lkdecore -lkdeui + $(kde_bindir)/kdoc -a -p -d classdocs -n 'Kasbar2' ../../taskmanager/*.h *.h -lqt -ltdecore -ltdeui .PHONY: changes changes: diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt index dc5053d5a..5ec37ac53 100644 --- a/kicker/kicker/CMakeLists.txt +++ b/kicker/kicker/CMakeLists.txt @@ -42,16 +42,16 @@ install( PROGRAMS tde_add_executable( kicker-3.4-reverseLayout SOURCES kicker-3.4-reverseLayout.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin ) -##### kicker (kdeinit) ########################## +##### kicker (tdeinit) ########################## configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) -tde_add_kdeinit_executable( kicker +tde_add_tdeinit_executable( kicker SOURCES dummy.cpp EMBED kicker_core-static LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared kutils-shared diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index 9a89a0ac0..b1a037275 100644 --- a/kicker/kicker/Makefile.am +++ b/kicker/kicker/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = core interfaces ui buttons . bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kicker.la +tdeinit_LTLIBRARIES = kicker.la CLEANFILES = dummy.cpp diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index ce7de00c0..7ba06c61c 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -270,7 +270,7 @@ void Kicker::slotRestart() char ** o_argv = new char*[2]; o_argv[0] = strdup("kicker"); o_argv[1] = 0L; - execv(TQFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv); + execv(TQFile::encodeName(locate("exe", "tdeinit_wrapper")), o_argv); exit(1); } diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 0c44e1816..1ddc093ff 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -82,7 +82,7 @@ public: TQImage makeShadow(const TQPixmap& textPixmap, const TQColor &bgColor); private: - // No static objects in libs, and no static deleters in kdefx... + // No static objects in libs, and no static deleters in tdefx... //static KShadowSettings s_defaultShadowSettings; KShadowSettings *m_shadowSettings; diff --git a/kicker/menuext/CMakeLists.txt b/kicker/menuext/CMakeLists.txt index 2d214e656..ca6eb3766 100644 --- a/kicker/menuext/CMakeLists.txt +++ b/kicker/menuext/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_subdirectory( find ) -add_subdirectory( kdeprint ) +add_subdirectory( tdeprint ) add_subdirectory( prefmenu ) add_subdirectory( recentdocs ) add_subdirectory( konsole ) diff --git a/kicker/menuext/Makefile.am b/kicker/menuext/Makefile.am index 6d672d29a..31254dff7 100644 --- a/kicker/menuext/Makefile.am +++ b/kicker/menuext/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = find kdeprint prefmenu recentdocs konsole konq-profiles remote system kate +SUBDIRS = find tdeprint prefmenu recentdocs konsole konq-profiles remote system kate diff --git a/kicker/menuext/find/CMakeLists.txt b/kicker/menuext/find/CMakeLists.txt index 5769dfc09..d4cf03be0 100644 --- a/kicker/menuext/find/CMakeLists.txt +++ b/kicker/menuext/find/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES kfind.desktop websearch.desktop DESTINATION ${DATA_INSTALL_DIR}/k tde_add_kpart( kickermenu_find AUTOMOC SOURCES findmenu.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/kate/CMakeLists.txt b/kicker/menuext/kate/CMakeLists.txt index fee34696e..4afbc89c8 100644 --- a/kicker/menuext/kate/CMakeLists.txt +++ b/kicker/menuext/kate/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES katesessionmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/me tde_add_kpart( kickermenu_kate AUTOMOC SOURCES katesessionmenu.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 7326d8fb0..9b237a703 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -143,7 +143,7 @@ void KateSessionMenu::slotExec( int id ) else if ( id > 2 ) args << m_sessions[ id-3 ]; - kapp->kdeinitExec("kate", args); + kapp->tdeinitExec("kate", args); } diff --git a/kicker/menuext/kdeprint/CMakeLists.txt b/kicker/menuext/kdeprint/CMakeLists.txt index b6cc714eb..a013bcf82 100644 --- a/kicker/menuext/kdeprint/CMakeLists.txt +++ b/kicker/menuext/kdeprint/CMakeLists.txt @@ -24,10 +24,10 @@ link_directories( install( FILES printmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) -##### kickermenu_kdeprint (module) ############## +##### kickermenu_tdeprint (module) ############## -tde_add_kpart( kickermenu_kdeprint AUTOMOC +tde_add_kpart( kickermenu_tdeprint AUTOMOC SOURCES print_mnu.cpp - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/kdeprint/Makefile.am b/kicker/menuext/kdeprint/Makefile.am index 051c087fb..c8ad7858a 100644 --- a/kicker/menuext/kdeprint/Makefile.am +++ b/kicker/menuext/kdeprint/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kickermenu_kdeprint.la +kde_module_LTLIBRARIES = kickermenu_tdeprint.la -kickermenu_kdeprint_la_SOURCES = print_mnu.cpp -kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint +kickermenu_tdeprint_la_SOURCES = print_mnu.cpp +kickermenu_tdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version +kickermenu_tdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -ltdeprint -kickermenu_kdeprint_la_METASOURCES = AUTO +kickermenu_tdeprint_la_METASOURCES = AUTO desktopmenu_DATA = printmenu.desktop desktopmenudir = $(kde_datadir)/kicker/menuext messages: - $(XGETTEXT) *.cpp -o $(podir)/libkickermenu_kdeprint.pot + $(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tdeprint.pot diff --git a/kicker/menuext/kdeprint/print_mnu.cpp b/kicker/menuext/kdeprint/print_mnu.cpp index eb2dbd8ab..dee220d80 100644 --- a/kicker/menuext/kdeprint/print_mnu.cpp +++ b/kicker/menuext/kdeprint/print_mnu.cpp @@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include -K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu) +K_EXPORT_KICKER_MENUEXT(tdeprint, PrintMenu) #define ADD_PRINTER_ID 0 #define KDEPRINT_SETTINGS_ID 1 @@ -43,10 +43,10 @@ K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu) PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/) : KPanelMenu("", parent, name) { - static bool kdeprintIconsInitialized = false; - if ( !kdeprintIconsInitialized ) { - KGlobal::iconLoader()->addAppDir("kdeprint"); - kdeprintIconsInitialized = true; + static bool tdeprintIconsInitialized = false; + if ( !tdeprintIconsInitialized ) { + KGlobal::iconLoader()->addAppDir("tdeprint"); + tdeprintIconsInitialized = true; } } @@ -65,9 +65,9 @@ void PrintMenu::initialize() if ((KMManager::self()->printerOperationMask() & KMManager::PrinterCreation) && KMManager::self()->hasManagement()) insertItem(SmallIconSet("wizard"), i18n("Add Printer..."), ADD_PRINTER_ID); - insertItem(SmallIconSet("kdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID); + insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID); if (KMManager::self()->serverOperationMask() & KMManager::ServerConfigure) - insertItem(SmallIconSet("kdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID); + insertItem(SmallIconSet("tdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID); insertSeparator(); insertItem(SmallIconSet("kcontrol"), i18n("Print Manager"), PRINT_MANAGER_ID); insertItem(SmallIconSet("konqueror"), i18n("Print Browser (Konqueror)"), PRINT_BROWSER_ID); @@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID) switch (ID) { case ADD_PRINTER_ID: - kapp->kdeinitExec("kaddprinterwizard"); + kapp->tdeinitExec("kaddprinterwizard"); break; case KDEPRINT_SETTINGS_ID: - kapp->kdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig")); + kapp->tdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig")); break; case CONFIG_SERVER_ID: - kapp->kdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); + kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig")); break; case PRINT_MANAGER_ID: KRun::runCommand("kcmshell kde-printers.desktop"); @@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID) KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror"); break; case KPRINTER_ID: - kapp->kdeinitExec("kprinter"); + kapp->tdeinitExec("kprinter"); break; default: { // start kjobviewer TQStringList args; args << "--show" << "-d" << text(ID).remove('&'); - kapp->kdeinitExec("kjobviewer", args); + kapp->tdeinitExec("kjobviewer", args); } break; } diff --git a/kicker/menuext/kdeprint/print_mnu.h b/kicker/menuext/kdeprint/print_mnu.h index da795c039..47c9e609e 100644 --- a/kicker/menuext/kdeprint/print_mnu.h +++ b/kicker/menuext/kdeprint/print_mnu.h @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _print_mnu_h_ #include -#include +#include class PrintMenu : public KPanelMenu, public KPReloadObject { diff --git a/kicker/menuext/kdeprint/printmenu.desktop b/kicker/menuext/kdeprint/printmenu.desktop index 2bc90f1b8..447d62c8f 100644 --- a/kicker/menuext/kdeprint/printmenu.desktop +++ b/kicker/menuext/kdeprint/printmenu.desktop @@ -141,4 +141,4 @@ Comment[zh_CN]=打印系统菜单 Comment[zh_TW]=用於列印系統的選單 Icon=fileprint -X-KDE-Library=kickermenu_kdeprint +X-KDE-Library=kickermenu_tdeprint diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index 4010bace7..cb340caf9 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -39,10 +39,10 @@ K_EXPORT_KICKER_MENUEXT(konqueror, KonquerorProfilesMenu) KonquerorProfilesMenu::KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/) : KPanelMenu("", parent, name) { - static bool kdeprintIconsInitialized = false; - if ( !kdeprintIconsInitialized ) { - KGlobal::iconLoader()->addAppDir("kdeprint"); - kdeprintIconsInitialized = true; + static bool tdeprintIconsInitialized = false; + if ( !tdeprintIconsInitialized ) { + KGlobal::iconLoader()->addAppDir("tdeprint"); + tdeprintIconsInitialized = true; } } @@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id) { TQStringList args; args<<"--profile"<kdeinitExec("konqueror", args); + kapp->tdeinitExec("konqueror", args); } void KonquerorProfilesMenu::reload() diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index be060b75c..e9f1cede1 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id) args << "-r"; args << screenList[id - sessionList.count()]; } - KApplication::kdeinitExec("konsole", args); + KApplication::tdeinitExec("konsole", args); return; } @@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id) // this is a session, not a bookmark, so execute that instead TQStringList args; args << "--profile" << m_profiles[id]; - kapp->kdeinitExec("konsole", args); + kapp->tdeinitExec("konsole", args); } KURL KonsoleMenu::baseURL() const @@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title) { args << "-T" << title; args << "--workdir" << url.path(); - KApplication::kdeinitExec("konsole", args); + KApplication::tdeinitExec("konsole", args); return; } else if ((!url.protocol().isEmpty()) && (url.hasHost())) @@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title) args << "-l" << url.user().latin1(); } args << host.latin1(); - KApplication::kdeinitExec("konsole", args); + KApplication::tdeinitExec("konsole", args); return; } /* diff --git a/kicker/menuext/prefmenu/CMakeLists.txt b/kicker/menuext/prefmenu/CMakeLists.txt index 24b947d54..448e03d74 100644 --- a/kicker/menuext/prefmenu/CMakeLists.txt +++ b/kicker/menuext/prefmenu/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES prefmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) tde_add_kpart( kickermenu_prefmenu AUTOMOC SOURCES prefmenu.cpp - LINK kickermain-shared kdeui-shared + LINK kickermain-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/menuext/remote/CMakeLists.txt b/kicker/menuext/remote/CMakeLists.txt index eae12847b..247b5f01d 100644 --- a/kicker/menuext/remote/CMakeLists.txt +++ b/kicker/menuext/remote/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES remotemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext tde_add_kpart( kickermenu_remotemenu AUTOMOC SOURCES remotemenu.cpp remotemenu.skel - LINK kickermain-shared kdeui-shared + LINK kickermain-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/proxy/CMakeLists.txt b/kicker/proxy/CMakeLists.txt index 68c99312d..a637d141e 100644 --- a/kicker/proxy/CMakeLists.txt +++ b/kicker/proxy/CMakeLists.txt @@ -25,17 +25,17 @@ link_directories( install( FILES DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext ) -##### appletproxy (kdeinit) ##################### +##### appletproxy (tdeinit) ##################### -tde_add_kdeinit_executable( appletproxy AUTOMOC +tde_add_tdeinit_executable( appletproxy AUTOMOC SOURCES appletproxy.cpp LINK kickermain-shared ) -##### extensionproxy (kdeinit) ################## +##### extensionproxy (tdeinit) ################## -tde_add_kdeinit_executable( extensionproxy AUTOMOC +tde_add_tdeinit_executable( extensionproxy AUTOMOC SOURCES extensionproxy.cpp LINK kickermain-shared ) diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am index 56e4269bb..698a663c1 100644 --- a/kicker/proxy/Makefile.am +++ b/kicker/proxy/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../libkicker $(all_includes) bin_PROGRAMS = noinst_PROGRAMS = extensiondebugger lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = appletproxy.la extensionproxy.la +tdeinit_LTLIBRARIES = appletproxy.la extensionproxy.la METASOURCES = AUTO @@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version extensiondebugger_SOURCES = extensiondebugger.cpp extensiondebugger_LDADD = ../libkicker/libkickermain.la -extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot diff --git a/kicker/taskmanager/CMakeLists.txt b/kicker/taskmanager/CMakeLists.txt index a1599f917..852b6d52c 100644 --- a/kicker/taskmanager/CMakeLists.txt +++ b/kicker/taskmanager/CMakeLists.txt @@ -53,6 +53,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kdecore-shared kickermain-shared ${XFIXES_LIBRARIES} ${XRENDER_LIBRARIES} ${XCOMPOSITE_LIBRARIES} + LINK tdecore-shared kickermain-shared ${XFIXES_LIBRARIES} ${XRENDER_LIBRARIES} ${XCOMPOSITE_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto index 5275a26eb..d4873e021 100644 --- a/kioslave/DEBUG.howto +++ b/kioslave/DEBUG.howto @@ -4,8 +4,8 @@ How does an io-slave get started? ================================= Your application request 'klauncher' via DCOP for a slave. If 'klauncher' does -not have an idle slave ready, it will ask kdeinit to start a new one. -kdeinit forks and dlopens the library that contains the io-slave. +not have an idle slave ready, it will ask tdeinit to start a new one. +tdeinit forks and dlopens the library that contains the io-slave. Then it calls kdemain() or, if that is not present, main() in the library. @@ -18,22 +18,22 @@ that slaves for a certain protocol are started in debug mode. E.g. to start all 'http' slaves in debug mode, you type: - KDE_SLAVE_DEBUG_WAIT=http kdeinit + KDE_SLAVE_DEBUG_WAIT=http tdeinit -This will restart 'kdeinit' and 'klauncher'. +This will restart 'tdeinit' and 'klauncher'. When your application now requests a http slave, the slave will be started -by kdeinit, but before it calls kdemain() (cq. main()) it will suspend the +by tdeinit, but before it calls kdemain() (cq. main()) it will suspend the slave by sending it a SIGSTOP signal. -In the terminal from which you started kdeinit you will get the following +In the terminal from which you started tdeinit you will get the following message: -kdeinit: Suspending process -kdeinit: 'gdb kdeinit 16779' to debug -kdeinit: 'kill -SIGCONT 16779' to continue +tdeinit: Suspending process +tdeinit: 'gdb tdeinit 16779' to debug +tdeinit: 'kill -SIGCONT 16779' to continue -You can now debug your slave by typing (or pasting) 'gdb kdeinit 16779' in +You can now debug your slave by typing (or pasting) 'gdb tdeinit 16779' in a terminal. If you don't want to debug a slave you can let it continue by sending it a SIGCONT by typing 'kill -SIGCONT 16779'. @@ -51,9 +51,9 @@ Debugging io-slaves with valgrind KLauncher can be told to run certain io-slaves through valgrind. The following command can be used to let klauncher run all https io-slaves via valgrind: - KDE_SLAVE_VALGRIND=https kdeinit + KDE_SLAVE_VALGRIND=https tdeinit -The valgrind output will appear as the stderr output of the kdeinit process. +The valgrind output will appear as the stderr output of the tdeinit process. The $VALGRIND_OPTS environment variable can be used to pass options to valgrind. If you want to use a different skin: @@ -83,7 +83,7 @@ kioslaverc: [SMB] DebugLevel=100 -This will print additional debug info to the stderr of your kdeinit process, +This will print additional debug info to the stderr of your tdeinit process, which typically ends up in ~/.X.err or ~/.xsession-errors Happy debugging. diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am index 67f346f84..ff410f516 100644 --- a/kioslave/about/Makefile.am +++ b/kioslave/about/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/about INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/cgi/kcmcgi/Makefile.am b/kioslave/cgi/kcmcgi/Makefile.am index abfef594b..32f4be3ea 100644 --- a/kioslave/cgi/kcmcgi/Makefile.am +++ b/kioslave/cgi/kcmcgi/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_cgi.la kcm_cgi_la_SOURCES = kcmcgi.cpp kcm_cgi_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_cgi_la_LIBADD = -lkdeui $(LIB_KIO) +kcm_cgi_la_LIBADD = -ltdeui $(LIB_KIO) INCLUDES= $(all_includes) diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am index 981556099..ce6413fa8 100644 --- a/kioslave/finger/Makefile.am +++ b/kioslave/finger/Makefile.am @@ -2,7 +2,7 @@ ## Edit from Makefile.am of kdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/fish/Makefile.am b/kioslave/fish/Makefile.am index 6e3ac84ed..6446e8182 100644 --- a/kioslave/fish/Makefile.am +++ b/kioslave/fish/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = kio_fish.la INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kio_fish_la_SOURCES = fish.cpp kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) diff --git a/kioslave/home/kdedmodule/CMakeLists.txt b/kioslave/home/kdedmodule/CMakeLists.txt index 0d86f52f7..64d343f84 100644 --- a/kioslave/home/kdedmodule/CMakeLists.txt +++ b/kioslave/home/kdedmodule/CMakeLists.txt @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/mac/Makefile.am b/kioslave/mac/Makefile.am index e50d1c56b..8cf6b1fa7 100644 --- a/kioslave/mac/Makefile.am +++ b/kioslave/mac/Makefile.am @@ -1,7 +1,7 @@ ## Makfile.am for kio_mac INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am index a0a8f20c0..3c5c6c78d 100644 --- a/kioslave/man/Makefile.am +++ b/kioslave/man/Makefile.am @@ -1,14 +1,14 @@ ## Makefile.am of kdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor EXTRA_PROGRAMS = kio_man_test man2html ####### just for testing (j.habenicht@europemail.com, 15.02.2001) kio_man_test_SOURCES = kio_man_test.cpp -kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ####### Files @@ -39,7 +39,7 @@ messages: man2html_SOURCES = dummy.cpp man2html_LDADD = man2html_simple.o $(LIB_QT) -man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor dummy.cpp: echo > $@ diff --git a/kioslave/media/mediamanager/CMakeLists.txt b/kioslave/media/mediamanager/CMakeLists.txt index 58854b630..411091365 100644 --- a/kioslave/media/mediamanager/CMakeLists.txt +++ b/kioslave/media/mediamanager/CMakeLists.txt @@ -47,7 +47,7 @@ if( WITH_HAL ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} + LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) else( ) @@ -59,7 +59,7 @@ else( ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static kdeinit_kded-shared + LINK mediacommon-static tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) endif( ) diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index f4250f1ba..58e2992e0 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -1079,37 +1079,37 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio return true; } -TQString startKdeSudoProcess(const TQString& kdesudoPath, const TQString& command, +TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command, const TQString& dialogCaption, const TQString& dialogComment) { - KProcess kdesudoProcess; + KProcess tdesudoProcess; - kdesudoProcess << kdesudoPath + tdesudoProcess << tdesudoPath << "-d" << "--noignorebutton" << "--caption" << dialogCaption << "--comment" << dialogComment << "-c" << command; - // @todo handle kdesudo output - kdesudoProcess.start(KProcess::Block); + // @todo handle tdesudo output + tdesudoProcess.start(KProcess::Block); return TQString(); } -TQString startKdeSuProcess(const TQString& kdesuPath, const TQString& command, +TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command, const TQString& dialogCaption) { - KProcess kdesuProcess; + KProcess tdesuProcess; - kdesuProcess << kdesuPath + tdesuProcess << tdesuPath << "-d" << "--noignorebutton" << "--caption" << dialogCaption << "-c" << command; - // @todo handle kdesu output - kdesuProcess.start(KProcess::Block); + // @todo handle tdesu output + tdesuProcess.start(KProcess::Block); return TQString(); } @@ -1118,15 +1118,15 @@ TQString startPrivilegedProcess(const TQString& command, const TQString& dialogC { TQString error; - TQString kdesudoPath = KStandardDirs::findExe("kdesudo"); + TQString tdesudoPath = KStandardDirs::findExe("tdesudo"); - if (!kdesudoPath.isEmpty()) - error = startKdeSudoProcess(kdesudoPath, command, dialogCaption, dialogComment); + if (!tdesudoPath.isEmpty()) + error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment); else { - TQString kdesuPath = KStandardDirs::findExe("kdesu"); + TQString tdesuPath = KStandardDirs::findExe("tdesu"); - if (!kdesuPath.isEmpty()) - error = startKdeSuProcess(kdesuPath, command, dialogCaption); + if (!tdesuPath.isEmpty()) + error = startKdeSuProcess(tdesuPath, command, dialogCaption); } return error; diff --git a/kioslave/media/medianotifier/CMakeLists.txt b/kioslave/media/medianotifier/CMakeLists.txt index 7d67c736a..44d6cb308 100644 --- a/kioslave/media/medianotifier/CMakeLists.txt +++ b/kioslave/media/medianotifier/CMakeLists.txt @@ -38,6 +38,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static kdeinit_kded-shared + LINK mediacommon-static tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am index 4030305c9..99bba4df9 100644 --- a/kioslave/media/mounthelper/Makefile.am +++ b/kioslave/media/mounthelper/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries) kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp -kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am index ab03da8e5..dfa24a928 100644 --- a/kioslave/nfs/Makefile.am +++ b/kioslave/nfs/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index 7c3a67e9d..96e51f1d3 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -71,7 +71,7 @@ using namespace KIO; using namespace std; -//this is taken from kdelibs/kdecore/fakes.cpp +//this is taken from kdelibs/tdecore/fakes.cpp //#if !defined(HAVE_GETDOMAINNAME) int x_getdomainname(char *name, size_t len) diff --git a/kioslave/remote/kdedmodule/CMakeLists.txt b/kioslave/remote/kdedmodule/CMakeLists.txt index 52e84e9ad..2db56916c 100644 --- a/kioslave/remote/kdedmodule/CMakeLists.txt +++ b/kioslave/remote/kdedmodule/CMakeLists.txt @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/sftp/CHANGELOG b/kioslave/sftp/CHANGELOG index b41c17019..2b5f18de3 100644 --- a/kioslave/sftp/CHANGELOG +++ b/kioslave/sftp/CHANGELOG @@ -10,7 +10,7 @@ - Write our own askpass program using kde - set env SSH_ASKPASS_PROGRAM before launching -how to do this? KProcess doesn't give us access to env variables. - - Our askpass program can probably talk to the kdesu daemon to implement caching. + - Our askpass program can probably talk to the tdesu daemon to implement caching. - chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties dialog is right though. Nevermind - ftp ioslave does this too! Maybe a bug with konqueror. diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am index bbb661b73..659621d91 100644 --- a/kioslave/sftp/Makefile.am +++ b/kioslave/sftp/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/sftp INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO ####### Files diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp index 2c8f995a5..2316c8c2d 100644 --- a/kioslave/sftp/kio_sftp.cpp +++ b/kioslave/sftp/kio_sftp.cpp @@ -18,7 +18,7 @@ /* DEBUGGING We are pretty much left with kdDebug messages for debugging. We can't use a gdb -as described in the ioslave DEBUG.howto because kdeinit has to run in a terminal. +as described in the ioslave DEBUG.howto because tdeinit has to run in a terminal. Ssh will detect this terminal and ask for a password there, but will just get garbage. So we can't connect. */ diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp index ca99b36bb..5fcf734c9 100644 --- a/kioslave/sftp/process.cpp +++ b/kioslave/sftp/process.cpp @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * This file contains code from TEShell.C of the KDE konsole. @@ -51,8 +51,8 @@ #include #include "process.h" -#include -#include +#include +#include MyPtyProcess::MyPtyProcess() diff --git a/kioslave/sftp/process.h b/kioslave/sftp/process.h index b0f20f77b..215c51ea7 100644 --- a/kioslave/sftp/process.h +++ b/kioslave/sftp/process.h @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdesu. + * This file is part of the KDE project, module tdesu. * Copyright (C) 1999,2000 Geert Jansen * * This is free software; you can use this library under the GNU Library diff --git a/kioslave/system/kdedmodule/CMakeLists.txt b/kioslave/system/kdedmodule/CMakeLists.txt index 720c5dd00..6df004620 100644 --- a/kioslave/system/kdedmodule/CMakeLists.txt +++ b/kioslave/system/kdedmodule/CMakeLists.txt @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am index 8705ef26c..acb37faca 100644 --- a/kioslave/tar/Makefile.am +++ b/kioslave/tar/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_tar.la diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt index 4fbdae0a9..eb50589ab 100644 --- a/kioslave/thumbnail/CMakeLists.txt +++ b/kioslave/thumbnail/CMakeLists.txt @@ -96,7 +96,7 @@ set( target djvuthumbnail ) tde_add_kpart( ${target} AUTOMOC SOURCES djvucreator.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -109,7 +109,7 @@ if( WITH_XCURSOR ) tde_add_kpart( ${target} AUTOMOC SOURCES cursorcreator.cpp - LINK kdecore-shared ${XCURSOR_LIBRARIES} + LINK tdecore-shared ${XCURSOR_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -126,7 +126,7 @@ if( WITH_OPENEXR ) tde_add_kpart( ${target} AUTOMOC SOURCES exrcreator.cpp - LINK kdecore-shared ${OPENEXR_LIBRARIES} + LINK tdecore-shared ${OPENEXR_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am index f13473ac3..8024b2ba3 100644 --- a/kioslave/thumbnail/Makefile.am +++ b/kioslave/thumbnail/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/thumbnail INCLUDES = $(all_includes) $(EXR_FLAGS) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO if have_xcursor diff --git a/kioslave/trash/Makefile.am b/kioslave/trash/Makefile.am index cb5403728..1ab793ce0 100644 --- a/kioslave/trash/Makefile.am +++ b/kioslave/trash/Makefile.am @@ -12,7 +12,7 @@ kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined bin_PROGRAMS = ktrash ktrash_SOURCES = ktrash.cpp ktrash_LDADD = $(LIB_KIO) -ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_services_DATA = trash.protocol diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt index 56cf3de07..ef157beac 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -36,7 +36,7 @@ install( PROGRAMS klipper-1-2.pl klipper-trinity1.sh DESTINATION ${KCONF_UPDATE_ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) -tde_add_kdeinit_executable( klipper AUTOMOC +tde_add_tdeinit_executable( klipper AUTOMOC SOURCES dummy.cpp LINK ${TQT_LIBRARIES} EMBED klipper_common-static diff --git a/klipper/Makefile.am b/klipper/Makefile.am index a82c4bf70..ea41d18fc 100644 --- a/klipper/Makefile.am +++ b/klipper/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = noinst_LTLIBRARIES = libklipper_common.la -kdeinit_LTLIBRARIES = klipper.la +tdeinit_LTLIBRARIES = klipper.la kde_module_LTLIBRARIES = klipper_panelapplet.la CLEANFILES = dummy.cpp diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt index 77fe1b227..0cf7ec2df 100644 --- a/kmenuedit/CMakeLists.txt +++ b/kmenuedit/CMakeLists.txt @@ -32,17 +32,17 @@ install( FILES kmenueditui.rc DESTINATION ${DATA_INSTALL_DIR}/kmenuedit ) install( FILES kcontroleditui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontroledit ) -##### kmenuedit (kdeinit) ####################### +##### kmenuedit (tdeinit) ####################### -tde_add_kdeinit_executable( kmenuedit AUTOMOC +tde_add_tdeinit_executable( kmenuedit AUTOMOC SOURCES main.cpp LINK ${TQT_LIBRARIES} kmenueditcommon-static ) -##### kcontroledit (kdeinit) #################### +##### kcontroledit (tdeinit) #################### -tde_add_kdeinit_executable( kcontroledit AUTOMOC +tde_add_tdeinit_executable( kcontroledit AUTOMOC SOURCES kcontrol_main.cpp LINK ${TQT_LIBRARIES} kmenueditcommon-static ) diff --git a/kmenuedit/Makefile.am b/kmenuedit/Makefile.am index 7e4b2c66c..e97a54515 100644 --- a/kmenuedit/Makefile.am +++ b/kmenuedit/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kmenuedit.la kcontroledit.la +tdeinit_LTLIBRARIES = kmenuedit.la kcontroledit.la noinst_LTLIBRARIES = libkmenueditcommon.la diff --git a/knetattach/Makefile.am b/knetattach/Makefile.am index 5ba6aa592..cd794f425 100644 --- a/knetattach/Makefile.am +++ b/knetattach/Makefile.am @@ -2,7 +2,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = knetattach knetattach_SOURCES = knetattach.ui main.cpp -knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor knetattach_LDADD = $(LIB_KIO) METASOURCES = AUTO xdg_apps_DATA = knetattach.desktop diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt index b0e77858e..e257145ec 100644 --- a/konqueror/CMakeLists.txt +++ b/konqueror/CMakeLists.txt @@ -92,7 +92,7 @@ tde_add_library( ${target} STATIC_PIC ) -##### konqueror (kdeinit) ####################### +##### konqueror (tdeinit) ####################### set( target konqueror ) @@ -106,7 +106,7 @@ set( ${target}_SRCS delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK konqueror_intern-static konq-shared kutils-shared ) diff --git a/konqueror/DESIGN b/konqueror/DESIGN index fb2628aaa..459ade9c8 100644 --- a/konqueror/DESIGN +++ b/konqueror/DESIGN @@ -39,7 +39,7 @@ dirtree/* : KonqDirTree, the directory tree Libs used by konqueror ====================== -kdecore, kdeui, kfile, khtml, kparts - usual stuff :) +tdecore, tdeui, kfile, khtml, kparts - usual stuff :) libkio - I/O stuff, mimetypes, services libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am index 6dff1eb43..502622344 100644 --- a/konqueror/Makefile.am +++ b/konqueror/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . client iconview listview keditbookmarks shellcmdplugin about pics si bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = konqueror.la +tdeinit_LTLIBRARIES = konqueror.la noinst_LTLIBRARIES = libkonqueror_intern.la konqdatadir = $(kde_datadir)/konqueror diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 188971bd9..03dfad93b 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -110,9 +110,9 @@ TQString KonqAboutPageFactory::launch() TQString home_folder = TQDir::homeDirPath(); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.tqarg( "" ); @@ -195,9 +195,9 @@ TQString KonqAboutPageFactory::intro() TQString gohome_icon_path = iconloader->iconPath("gohome", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.tqarg( "" ); @@ -250,9 +250,9 @@ TQString KonqAboutPageFactory::specs() if ( res.isEmpty() ) return res; - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.tqarg( "" ); @@ -347,9 +347,9 @@ TQString KonqAboutPageFactory::tips() iconloader->iconPath("view_left_right", KIcon::Small ); TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", KIcon::Small ):iconloader->iconPath("1rightarrow", KIcon::Small ); - res = res.tqarg( locate( "data", "kdeui/about/kde_infopage.css" ) ); + res = res.tqarg( locate( "data", "tdeui/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "kdeui/about/kde_infopage_rtl.css" ) ); + res = res.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.tqarg( "" ); @@ -503,7 +503,7 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con TQStringList args = TQStringList::split( TQChar( ' ' ), url.mid( 6 ) ); TQString executable = args[ 0 ]; args.remove( args.begin() ); - KApplication::kdeinitExec( executable, args ); + KApplication::tdeinitExec( executable, args ); return; } diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt index e711e1f82..558a5d7f9 100644 --- a/konqueror/client/CMakeLists.txt +++ b/konqueror/client/CMakeLists.txt @@ -27,7 +27,7 @@ install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) -##### kfmclient (kdeinit) ####################### +##### kfmclient (tdeinit) ####################### set( target kfmclient ) @@ -37,7 +37,7 @@ set( ${target}_SRCS ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ) diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am index 97a5b66e4..bef42b01c 100644 --- a/konqueror/client/Makefile.am +++ b/konqueror/client/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII bin_PROGRAMS= lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kfmclient.la +tdeinit_LTLIBRARIES = kfmclient.la INCLUDES= -I.. $(all_includes) kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version diff --git a/konqueror/keditbookmarks/CMakeLists.txt b/konqueror/keditbookmarks/CMakeLists.txt index 37882a447..e5954898b 100644 --- a/konqueror/keditbookmarks/CMakeLists.txt +++ b/konqueror/keditbookmarks/CMakeLists.txt @@ -42,7 +42,7 @@ tde_add_executable( ${target} ) -##### keditbookmarks (kdeinit) ################## +##### keditbookmarks (tdeinit) ################## set( target keditbookmarks ) @@ -56,7 +56,7 @@ set( ${target}_SRCS AUTOMOC set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK konq-shared ) diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am index bc7c785ae..e9dd03ba1 100644 --- a/konqueror/keditbookmarks/Makefile.am +++ b/konqueror/keditbookmarks/Makefile.am @@ -4,10 +4,10 @@ METASOURCES = AUTO bin_PROGRAMS = kbookmarkmerger lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = keditbookmarks.la +tdeinit_LTLIBRARIES = keditbookmarks.la kbookmarkmerger_SOURCES = kbookmarkmerger.cpp -kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kbookmarkmerger_LDADD = $(LIB_KIO) dcop_DCOPIDLNG = true diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 8febd505b..e08074206 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -448,7 +448,7 @@ void KonqCombo::selectWord(TQKeyEvent *e) int pos_old = pos; int count = 0; - // TODO: make these a parameter when in kdelibs/kdeui... + // TODO: make these a parameter when in kdelibs/tdeui... TQValueList chars; chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':'); bool allow_space_break = true; diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 6390c2652..ea02b6f6a 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -5945,7 +5945,7 @@ static int current_memory_usage( int* limit ) // Check malloc() usage - very imprecise, but better than nothing. int usage_sum = 0; #if defined(KDE_MALLINFO_STDLIB) || defined(KDE_MALLINFO_MALLOC) - // ugly hack for kdecore/malloc + // ugly hack for tdecore/malloc extern int kde_malloc_is_used; free( calloc( 4, 4 )); // trigger setting kde_malloc_is_used if( kde_malloc_is_used ) diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt index 5cd4c4411..d8e33ef40 100644 --- a/konqueror/preloader/CMakeLists.txt +++ b/konqueror/preloader/CMakeLists.txt @@ -40,6 +40,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqueror_intern-static kio-shared kdeinit_kded-shared + LINK konqueror_intern-static kio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index 020d7dc6b..014ee769b 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -109,7 +109,7 @@ void KonqyPreloader::updateCount() { if( !check_always_preloaded_timer.isActive()) { - if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ), + if( kapp->tdeinitExec( TQString::tqfromLatin1( "konqueror" ), TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) { kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 121dac7ad..7af5ed2bf 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent) diff --git a/konqueror/sidebar/trees/history_module/Makefile.am b/konqueror/sidebar/trees/history_module/Makefile.am index 5f033d662..554804648 100644 --- a/konqueror/sidebar/trees/history_module/Makefile.am +++ b/konqueror/sidebar/trees/history_module/Makefile.am @@ -11,6 +11,6 @@ konq_sidebartree_history_la_LIBADD = ../../libkonqsidebarplugin.la ../libkonq_s kcm_history_la_SOURCES = kcmhistory.cpp history_dlg.ui history_settings.cpp history_settings.skel kcm_history_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_history_la_LIBADD = -lkdeui $(top_builddir)/libkonq/libkonq.la +kcm_history_la_LIBADD = -ltdeui $(top_builddir)/libkonq/libkonq.la xdg_apps_DATA = kcmhistory.desktop diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt index 9308ff64d..222583500 100644 --- a/konsole/konsole/CMakeLists.txt +++ b/konsole/konsole/CMakeLists.txt @@ -54,12 +54,12 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### konsole (kdeinit) ######################### +##### konsole (tdeinit) ######################### set( target konsole ) @@ -72,7 +72,7 @@ set( ${target}_SRCS zmodem_dialog.cpp printsettings.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeprint-shared kio-shared ${XRENDER_LIBRARIES} dl + LINK tdeprint-shared kio-shared ${XRENDER_LIBRARIES} dl ) diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am index 30d476eb9..f91956e30 100644 --- a/konsole/konsole/Makefile.am +++ b/konsole/konsole/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I. $(all_includes) bin_PROGRAMS = noinst_PROGRAMS = fontembedder lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = konsole.la +tdeinit_LTLIBRARIES = konsole.la kde_module_LTLIBRARIES = libkonsolepart.la kded_kwrited.la libkonsolepart_la_SOURCES = TEPty.cpp BlockArray.cpp konsole_part.cpp \ @@ -36,7 +36,7 @@ kded_kwrited_la_SOURCES = kwrited.cpp TEPty.cpp kwrited.skel kded_kwrited_la_LIBADD = $(LIB_KDECORE) kded_kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version -# konsole kdeinit module +# konsole tdeinit module konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp \ @@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLI # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp # kcmkonsole_LDADD = $(LIB_KDEUI) -# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \ TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \ diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 2af5da9ea..e6fc97b0e 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -2073,7 +2073,7 @@ void Konsole::slotConfigure() { TQStringList args; args << "kcmkonsole"; - KApplication::kdeinitExec( "kcmshell", args ); + KApplication::tdeinitExec( "kcmshell", args ); } void Konsole::reparseConfiguration() diff --git a/konsole/konsole/printsettings.cpp b/konsole/konsole/printsettings.cpp index f4924b9e8..8daa6c40e 100644 --- a/konsole/konsole/printsettings.cpp +++ b/konsole/konsole/printsettings.cpp @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * (c) 2003 Waldo Bastian * * This library is free software; you can redistribute it and/or diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h index 85eb89e95..1e5a0c23d 100644 --- a/konsole/konsole/printsettings.h +++ b/konsole/konsole/printsettings.h @@ -1,6 +1,6 @@ /* * This file is part of the KDE libraries - * Copyright (c) 2002 Michael Goffioul + * Copyright (c) 2002 Michael Goffioul * Copyright (c) 2003 Waldo Bastian * * This library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #ifndef PRINTSETTINGS_H #define PRINTSETTINGS_H -#include +#include class TQCheckBox; diff --git a/kpager/CMakeLists.txt b/kpager/CMakeLists.txt index 8265c4ded..abe022683 100644 --- a/kpager/CMakeLists.txt +++ b/kpager/CMakeLists.txt @@ -35,6 +35,6 @@ tde_add_executable( kpager AUTOMOC SOURCES desktop.cpp kpager.cpp config.cpp windowdrag.cpp kpagerIface.skel main.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kpager/Makefile.am b/kpager/Makefile.am index 6b2421163..650ccdc25 100644 --- a/kpager/Makefile.am +++ b/kpager/Makefile.am @@ -6,7 +6,7 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \ kpagerIface.skel main.cpp kpager_METASOURCES = AUTO -kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpager_LDADD = $(LIB_KDEUI) diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am index 9ea28111c..dda3e7776 100644 --- a/kpersonalizer/Makefile.am +++ b/kpersonalizer/Makefile.am @@ -38,7 +38,7 @@ METASOURCES = AUTO KDE_ICON= AUTO # the library search path. -kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDEs XML GUI builing diff --git a/kreadconfig/CMakeLists.txt b/kreadconfig/CMakeLists.txt index 126c2c93f..a8b2a668b 100644 --- a/kreadconfig/CMakeLists.txt +++ b/kreadconfig/CMakeLists.txt @@ -23,7 +23,7 @@ link_directories( tde_add_executable( kreadconfig SOURCES kreadconfig.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -32,6 +32,6 @@ tde_add_executable( kreadconfig tde_add_executable( kwriteconfig SOURCES kwriteconfig.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am index efa6393d5..6e35673f4 100644 --- a/kreadconfig/Makefile.am +++ b/kreadconfig/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor LDADD = $(LIB_KDECORE) bin_PROGRAMS = kreadconfig kwriteconfig diff --git a/krootbacking/CMakeLists.txt b/krootbacking/CMakeLists.txt index ee7096b94..50248bacb 100644 --- a/krootbacking/CMakeLists.txt +++ b/krootbacking/CMakeLists.txt @@ -25,6 +25,6 @@ link_directories( tde_add_executable( krootbacking AUTOMOC SOURCES main.cpp krootbacking.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kscreensaver/CMakeLists.txt b/kscreensaver/CMakeLists.txt index f1e88cfb5..7aee6728d 100644 --- a/kscreensaver/CMakeLists.txt +++ b/kscreensaver/CMakeLists.txt @@ -30,7 +30,7 @@ install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${APPS_INSTALL_D tde_add_executable( krandom.kss AUTOMOC SOURCES random.cpp - LINK kdeui-shared ${GL_LIBRARY} + LINK tdeui-shared ${GL_LIBRARY} DESTINATION ${BIN_INSTALL_DIR} ) @@ -39,6 +39,6 @@ tde_add_executable( krandom.kss AUTOMOC tde_add_executable( kblankscrn.kss AUTOMOC SOURCES blankscrn.cpp - LINK kscreensaver-shared kdeui-shared + LINK kscreensaver-shared tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kscreensaver/Makefile.am b/kscreensaver/Makefile.am index 343557c12..9a36060c5 100644 --- a/kscreensaver/Makefile.am +++ b/kscreensaver/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST INCLUDES = $(GLINC) $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = krandom.kss kblankscrn.kss diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index fa8677c03..0a0a4f5ca 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -36,12 +36,12 @@ install( FILES ksmserver.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES move_session_config.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -##### ksmserver (kdeinit) ####################### +##### ksmserver (tdeinit) ####################### -tde_add_kdeinit_executable( ksmserver AUTOMOC +tde_add_tdeinit_executable( ksmserver AUTOMOC SOURCES main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface.skel server.skel timed.ui - LINK dmctl-static kdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} + LINK dmctl-static tdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} ) diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index a06a82f93..68eb5f2a8 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -21,7 +21,7 @@ INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = ksmserver.la +tdeinit_LTLIBRARIES = ksmserver.la noinst_HEADERS = global.h server.h ksmserver_la_METASOURCES = AUTO @@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/kconf_update EXTRA_PROGRAMS = testsh testsh_SOURCES = test.cpp timed.ui -testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) messages: diff --git a/ksmserver/README b/ksmserver/README index 1c74111ae..759e57c9d 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -53,7 +53,7 @@ should be in startup.cpp and going down in that source file should follow the startup order (but note that this is just a documentation which may get outdated, so in case of doubts the source wins ;) ). -The startkde scripts already launches kdeinit, which in turns launches +The startkde scripts already launches tdeinit, which in turns launches KDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded kded modules, i.e. those that have X-KDE-Kded-autoload=true in .desktop files. The exact way autoloading works is controlled by X-KDE-Kded-phase=, @@ -69,7 +69,7 @@ modules. There are three kcminit phases, 0, 1 and 2, controlled by X-KDE-Init-Phase= in the .desktop file, which defaults to 1. Phase 0 kcminit modules should be only those that really need to be run early in the startup process (and those should probably actually use kstartupconfig in startkde -to be done even before kdeinit and daemons). After executing phase 0 +to be done even before tdeinit and daemons). After executing phase 0 modules kcminit returns and waits. When ksmserver is launched, the first thing it does is launching diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 191a5ff63..ac4ef0e28 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -109,7 +109,7 @@ void KSMServer::startApplication( TQStringList command, const TQString& clientMa command.prepend( "--" ); command.prepend( userId ); command.prepend( "-u" ); - command.prepend( "kdesu" ); + command.prepend( "tdesu" ); } } if ( !clientMachine.isEmpty() && clientMachine != "localhost" ) { @@ -650,7 +650,7 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) fprintf(f, "%s\n%i\n", session_manager, getpid()); fclose(f); setenv( "SESSION_MANAGER", session_manager, true ); - // Pass env. var to kdeinit. + // Pass env. var to tdeinit. DCOPRef( launcher ).send( "setLaunchEnv", "SESSION_MANAGER", (const char*) session_manager ); } diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am index bf82ef67f..f61b18761 100644 --- a/ksplashml/Makefile.am +++ b/ksplashml/Makefile.am @@ -6,7 +6,7 @@ METASOURCES=AUTO bin_PROGRAMS = ksplash ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp -ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksplash_LDADD = $(LIB_KDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO) noinst_HEADERS = ksplashiface.h wndmain.h diff --git a/ksplashml/themeengine/CMakeLists.txt b/ksplashml/themeengine/CMakeLists.txt index ad8d5821b..f5437b9bb 100644 --- a/ksplashml/themeengine/CMakeLists.txt +++ b/ksplashml/themeengine/CMakeLists.txt @@ -38,6 +38,6 @@ install( FILES ksplashplugins.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) tde_add_library( ksplashthemes SHARED AUTOMOC SOURCES themeengine.cpp objkstheme.cpp VERSION 0.0.0 - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am index f8f111bdd..d343d3023 100644 --- a/ksplashml/themeengine/default/Makefile.am +++ b/ksplashml/themeengine/default/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) noinst_LTLIBRARIES = libthemedefault.la libthemedefault_la_SOURCES = themelegacy.cpp -libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am index 1d05c8776..96e58e3a2 100644 --- a/ksplashml/themeengine/simple/Makefile.am +++ b/ksplashml/themeengine/simple/Makefile.am @@ -3,5 +3,5 @@ INCLUDES = $(all_includes) bin_PROGRAMS = ksplashsimple ksplashsimple_SOURCES = main.cpp -ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT) diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am index 37120f10f..d9d09c0d5 100644 --- a/ksplashml/themeengine/standard/Makefile.am +++ b/ksplashml/themeengine/standard/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes) noinst_LTLIBRARIES = libthemestandard.la libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp -libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor libthemestandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashstandard.la diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am index f8f111bdd..d343d3023 100644 --- a/ksplashml/themeengine/unified/Makefile.am +++ b/ksplashml/themeengine/unified/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) noinst_LTLIBRARIES = libthemedefault.la libthemedefault_la_SOURCES = themelegacy.cpp -libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la diff --git a/kstart/CMakeLists.txt b/kstart/CMakeLists.txt index bdb525f01..8430a421b 100644 --- a/kstart/CMakeLists.txt +++ b/kstart/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_executable( kstart AUTOMOC SOURCES kstart.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kstart/Makefile.am b/kstart/Makefile.am index b74a5fd1b..e5fdebf43 100644 --- a/kstart/Makefile.am +++ b/kstart/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kstart kstart_SOURCES = kstart.cpp -kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kstart_LDADD = $(LIB_KDECORE) METASOURCES = kstart.moc diff --git a/ksysguard/Makefile.in.temp b/ksysguard/Makefile.in.temp index b8e021dc2..ffe57c12e 100644 --- a/ksysguard/Makefile.in.temp +++ b/ksysguard/Makefile.in.temp @@ -39,7 +39,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs APPSDIR = $(kde_appsdir)/Utilities INCLUDES = $(all_includes) TARGET = khexdit -LIBS = -lkfm -lkdeui -lkdecore -lqt -lX11 -lXext $(LIBSOCKET) +LIBS = -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext $(LIBSOCKET) LDFLAGS += $(all_libraries) # rules to make .o files diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am index 10c6c6dd0..0ccf4c055 100644 --- a/ksysguard/gui/Makefile.am +++ b/ksysguard/gui/Makefile.am @@ -32,7 +32,7 @@ ksysguard_LDADD = \ ksgrd/libksgrd.la \ SensorDisplayLib/libsensordisplays.la \ $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD) -ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpm_SOURCES = kpm.c diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index c1a60b65e..e0198bbfc 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -180,9 +180,9 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) aliases.insert("kcookiejar", new TQString("kdeapp")); aliases.insert("kde", new TQString("kdeapp")); aliases.insert("kded", new TQString("kdeapp")); - aliases.insert("kdeinit", new TQString("kdeapp")); + aliases.insert("tdeinit", new TQString("kdeapp")); aliases.insert("kdesktop", new TQString("kdeapp")); - aliases.insert("kdesud", new TQString("kdeapp")); + aliases.insert("tdesud", new TQString("kdeapp")); aliases.insert("kdm", new TQString("kdeapp")); aliases.insert("khotkeys", new TQString("kdeapp")); aliases.insert("kio_file", new TQString("kdeapp")); diff --git a/ksysguard/gui/ksgrd/CMakeLists.txt b/ksysguard/gui/ksgrd/CMakeLists.txt index 5009bfcca..b1ec7c5f8 100644 --- a/ksysguard/gui/ksgrd/CMakeLists.txt +++ b/ksysguard/gui/ksgrd/CMakeLists.txt @@ -38,6 +38,6 @@ tde_add_library( ksgrd SHARED AUTOMOC SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc StyleSettings.cc TimerSettings.cc VERSION 1.2.0 - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c index 523d87d26..3ef86684a 100644 --- a/ksysguard/ksysguardd/Irix/ProcessList.c +++ b/ksysguard/ksysguardd/Irix/ProcessList.c @@ -44,7 +44,7 @@ #include "ProcessList.h" #define BUFSIZE 1024 -#define KDEINITLEN strlen("kdeinit: ") +#define KDEINITLEN strlen("tdeinit: ") typedef struct { int alive; /* for "garbage collection" */ diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index b267c7005..1eba1f6cc 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -40,7 +40,7 @@ #define BUFSIZE 1024 #define TAGSIZE 32 -#define KDEINITLEN strlen( "kdeinit: " ) +#define KDEINITLEN strlen( "tdeinit: " ) static CONTAINER ProcessList = 0; @@ -287,9 +287,9 @@ static int updateProcess( int pid ) if ( fclose( fd ) ) return -1; - /* Ugly hack to "fix" program name for kdeinit launched programs. */ - if ( strcmp( ps->name, "kdeinit" ) == 0 && - strncmp( ps->cmdline, "kdeinit: ", KDEINITLEN ) == 0 && + /* Ugly hack to "fix" program name for tdeinit launched programs. */ + if ( strcmp( ps->name, "tdeinit" ) == 0 && + strncmp( ps->cmdline, "tdeinit: ", KDEINITLEN ) == 0 && strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) { size_t len; char* end = strchr( ps->cmdline + KDEINITLEN, ' ' ); diff --git a/ksysguard/ksysguardd/Makefile.am b/ksysguard/ksysguardd/Makefile.am index 485700780..0e6da33ad 100644 --- a/ksysguard/ksysguardd/Makefile.am +++ b/ksysguard/ksysguardd/Makefile.am @@ -32,4 +32,4 @@ bin_PROGRAMS = ksysguardd ksysguardd_SOURCES = Command.c conf.c ksysguardd.c PWUIDCache.c ksysguardd_LDFLAGS = $(all_libraries) -ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO) +ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a -ltdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO) diff --git a/ksystraycmd/CMakeLists.txt b/ksystraycmd/CMakeLists.txt index bebeb4f45..02a271f0d 100644 --- a/ksystraycmd/CMakeLists.txt +++ b/ksystraycmd/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_executable( ksystraycmd AUTOMOC SOURCES ksystraycmd.cpp main.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am index 7a2a1eaf3..a42d2fe1b 100644 --- a/ksystraycmd/Makefile.am +++ b/ksystraycmd/Makefile.am @@ -10,7 +10,7 @@ METASOURCES = ksystraycmd.moc noinst_HEADERS = ksystraycmd.h ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp -ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot diff --git a/ktip/CMakeLists.txt b/ktip/CMakeLists.txt index 4b7d1b2c6..0825f0e5f 100644 --- a/ktip/CMakeLists.txt +++ b/ktip/CMakeLists.txt @@ -35,6 +35,6 @@ install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/kdewizard ) tde_add_executable( ktip AUTOMOC SOURCES ktipwindow.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ktip/Makefile.am b/ktip/Makefile.am index 6d9bd83f9..e9157fd51 100644 --- a/ktip/Makefile.am +++ b/ktip/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = pics bin_PROGRAMS = ktip ktip_SOURCES = ktipwindow.cpp ktip_LDADD = $(LIB_KDEUI) -ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO KDE_ICON = AUTO diff --git a/ktip/tips b/ktip/tips index 893061ad7..6b2254de8 100644 --- a/ktip/tips +++ b/ktip/tips @@ -348,14 +348,14 @@ the remaining buttons.

Need comprehensive info about KDEPrinting?

-

Type help:/kdeprint/ into a Konqueror address field +

Type help:/tdeprint/ into a Konqueror address field and get the KDEPrint Handbook displayed.

This, plus more material (like a FAQ, various Tutorials, a "TipsNTricks" section and the - kdeprint mailing list) + tdeprint mailing list) are available at printing.kde.org...

@@ -534,7 +534,7 @@ and "dragging" it with the mouse.


Then use 'kprinter' as "print command". Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader, StarOffice, OpenOffice.org, any GNOME application and many more...

-

See printing.kde.org +

See printing.kde.org for more detailed hints...

@@ -630,7 +630,7 @@ You may specify print files and/or name a printer from the command line: 
 kprinter -d infotec \
    /home/kurt/paragliding.jpg \
-   ../kdeprint-handbook.pdf \
+   ../tdeprint-handbook.pdf \
    /opt/trinity/flyer.ps
This prints 3 different files (from different folders) to printer "infotec". diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt index 758b03582..418ed1e88 100644 --- a/kwin/CMakeLists.txt +++ b/kwin/CMakeLists.txt @@ -45,7 +45,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -##### kwin (kdeinit) ############################ +##### kwin (tdeinit) ############################ set( target kwin ) @@ -58,9 +58,9 @@ set( ${target}_SRCS geometry.cpp rules.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecorations-shared kdeui-shared Xext + LINK tdecorations-shared tdeui-shared Xext ) ##### install import cmake modules ############### diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE index c004b64dd..0940d2b32 100644 --- a/kwin/COMPLIANCE +++ b/kwin/COMPLIANCE @@ -12,7 +12,7 @@ compliance with the spec. Some parts also involve the pager and clients which this document will cater for as well where applicable. If you modify the level of NetWM compliance (via modification of kwin/*, -kdecore/netwm.* or kdecore/kwin.* etc.), or notice any new hints that +tdecore/netwm.* or tdecore/kwin.* etc.), or notice any new hints that were added after version 1.2, please modify this document appropriately. Properties are ordered in the table in the order they are found in the specification. To list any important notes regarding a property, just @@ -161,7 +161,7 @@ version 2.0 / 1.2.6. Should be checked. + 1. (rest of the section) -+ 2.8. kmanagerselection.* in kdecore ++ 2.8. kmanagerselection.* in tdecore + 2. (rest of the section) Not a KWin thing. * - patch sent to TT to make TQClipboard sufficiently compliant diff --git a/kwin/HACKING b/kwin/HACKING index 1665aea56..f92c0e3fc 100644 --- a/kwin/HACKING +++ b/kwin/HACKING @@ -110,7 +110,7 @@ The rest of the files contain additional helper classes: - utils.* - various small utility functions/classes KWin also uses code from kdelibs, specifically files netwm.cpp, netwm.h, netwm_def.h and netwm_p.h -from kdelibs/kdecore. These files implement support for the EWMH window manager specification, +from kdelibs/tdecore. These files implement support for the EWMH window manager specification, originally called NETWM (hence the filenames). diff --git a/kwin/Makefile.am b/kwin/Makefile.am index 4ac46d385..cedb7e423 100644 --- a/kwin/Makefile.am +++ b/kwin/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kwin.la +tdeinit_LTLIBRARIES = kwin.la kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \ diff --git a/kwin/README b/kwin/README index 30e3e9a15..52a26e079 100644 --- a/kwin/README +++ b/kwin/README @@ -116,7 +116,7 @@ was meant for the previously active window. The basic principle of focus stealing prevention is that the window with most recent user activity wins. Any window of an application will become active when being shown only if this application was the most recently used one. -KWin itself, and some of the related kdecore classes should take care +KWin itself, and some of the related tdecore classes should take care of the common cases, so usually there's no need for any special handling in applications. Qt/KDE applications, that is. Applications using other toolkits should in most cases work fine too. If they don't support diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING index 9a5fb9f6b..f6233beb9 100644 --- a/kwin/clients/PORTING +++ b/kwin/clients/PORTING @@ -4,7 +4,7 @@ Also, the API is documented in the .h header files. Makefile.am: - Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES). - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module . -- Add -lkdecorations to LIBADD. +- Add -ltdecorations to LIBADD. - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ). .desktop file: diff --git a/kwin/clients/b2/CMakeLists.txt b/kwin/clients/b2/CMakeLists.txt index 0031343d7..2395ecc84 100644 --- a/kwin/clients/b2/CMakeLists.txt +++ b/kwin/clients/b2/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_b2 AUTOMOC SOURCES b2client.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/b2/config/CMakeLists.txt b/kwin/clients/b2/config/CMakeLists.txt index c260bc6d0..f319ac8f6 100644 --- a/kwin/clients/b2/config/CMakeLists.txt +++ b/kwin/clients/b2/config/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_kpart( kwin_b2_config AUTOMOC SOURCES config.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/default/CMakeLists.txt b/kwin/clients/default/CMakeLists.txt index 1f539106c..5ad3d2def 100644 --- a/kwin/clients/default/CMakeLists.txt +++ b/kwin/clients/default/CMakeLists.txt @@ -27,6 +27,6 @@ link_directories( tde_add_kpart( kwin3_default AUTOMOC SOURCES kdedefault.cpp - LINK kdecorations-shared kdecore-shared + LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/default/config/CMakeLists.txt b/kwin/clients/default/config/CMakeLists.txt index 35492058f..4f6c76835 100644 --- a/kwin/clients/default/config/CMakeLists.txt +++ b/kwin/clients/default/config/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_kpart( kwin_default_config AUTOMOC SOURCES config.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/keramik/CMakeLists.txt b/kwin/clients/keramik/CMakeLists.txt index 851f44a9a..e4da85e84 100644 --- a/kwin/clients/keramik/CMakeLists.txt +++ b/kwin/clients/keramik/CMakeLists.txt @@ -35,7 +35,7 @@ set_source_files_properties( keramik.cpp tde_add_kpart( kwin3_keramik AUTOMOC SOURCES keramik.cpp - LINK kdecorations-shared kdeui-shared + LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am index 38f6f51da..8a04fe9e6 100644 --- a/kwin/clients/keramik/Makefile.am +++ b/kwin/clients/keramik/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = tiles.h embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_QT) -embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_module_LTLIBRARIES = kwin3_keramik.la diff --git a/kwin/clients/keramik/config/CMakeLists.txt b/kwin/clients/keramik/config/CMakeLists.txt index 3d5fb9e03..febfa0d44 100644 --- a/kwin/clients/keramik/config/CMakeLists.txt +++ b/kwin/clients/keramik/config/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_kpart( kwin_keramik_config AUTOMOC SOURCES config.cpp keramikconfig.ui - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/kwmtheme/Makefile.am b/kwin/clients/kwmtheme/Makefile.am index f6c611180..a3a91080a 100644 --- a/kwin/clients/kwmtheme/Makefile.am +++ b/kwin/clients/kwmtheme/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin3_kwmtheme.la kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_kwmtheme_la_LIBADD = -lkdecorations +kwin3_kwmtheme_la_LIBADD = -ltdecorations METASOURCES = AUTO noinst_HEADERS = kwmthemeclient.h diff --git a/kwin/clients/kwmtheme/cli_installer/Makefile.am b/kwin/clients/kwmtheme/cli_installer/Makefile.am index 89b661780..80033222d 100644 --- a/kwin/clients/kwmtheme/cli_installer/Makefile.am +++ b/kwin/clients/kwmtheme/cli_installer/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kwmtheme kwmtheme_SOURCES = main.cpp # the library search path. -kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kwin/clients/laptop/CMakeLists.txt b/kwin/clients/laptop/CMakeLists.txt index b6e16e800..e4ae404c5 100644 --- a/kwin/clients/laptop/CMakeLists.txt +++ b/kwin/clients/laptop/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_laptop AUTOMOC SOURCES laptopclient.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/modernsystem/CMakeLists.txt b/kwin/clients/modernsystem/CMakeLists.txt index 8fbfec858..723ddffe1 100644 --- a/kwin/clients/modernsystem/CMakeLists.txt +++ b/kwin/clients/modernsystem/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_modernsys SOURCES modernsys.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/modernsystem/config/CMakeLists.txt b/kwin/clients/modernsystem/config/CMakeLists.txt index 7e644f0c9..e2468db33 100644 --- a/kwin/clients/modernsystem/config/CMakeLists.txt +++ b/kwin/clients/modernsystem/config/CMakeLists.txt @@ -24,7 +24,7 @@ link_directories( tde_add_kpart( kwin_modernsys_config AUTOMOC SOURCES config.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/plastik/CMakeLists.txt b/kwin/clients/plastik/CMakeLists.txt index da88e2ffa..cc9aaa347 100644 --- a/kwin/clients/plastik/CMakeLists.txt +++ b/kwin/clients/plastik/CMakeLists.txt @@ -34,6 +34,6 @@ install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_plastik AUTOMOC SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp - LINK kdecorations-shared kdeui-shared + LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/plastik/config/CMakeLists.txt b/kwin/clients/plastik/config/CMakeLists.txt index c5b34f368..4e3c2ac2b 100644 --- a/kwin/clients/plastik/config/CMakeLists.txt +++ b/kwin/clients/plastik/config/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kwin_plastik_config AUTOMOC SOURCES config.cpp configdialog.ui - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/quartz/CMakeLists.txt b/kwin/clients/quartz/CMakeLists.txt index a4463067a..160a3cd52 100644 --- a/kwin/clients/quartz/CMakeLists.txt +++ b/kwin/clients/quartz/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_quartz AUTOMOC SOURCES quartz.cpp - LINK kdecorations-shared kdeui-shared + LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/quartz/config/CMakeLists.txt b/kwin/clients/quartz/config/CMakeLists.txt index 3b3ed6564..3142505c7 100644 --- a/kwin/clients/quartz/config/CMakeLists.txt +++ b/kwin/clients/quartz/config/CMakeLists.txt @@ -24,6 +24,6 @@ link_directories( tde_add_kpart( kwin_quartz_config AUTOMOC SOURCES config.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/redmond/CMakeLists.txt b/kwin/clients/redmond/CMakeLists.txt index 8a3bc7814..5be11e2f9 100644 --- a/kwin/clients/redmond/CMakeLists.txt +++ b/kwin/clients/redmond/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_redmond AUTOMOC SOURCES redmond.cpp - LINK kdecorations-shared kdecore-shared + LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/clients/web/CMakeLists.txt b/kwin/clients/web/CMakeLists.txt index 9bb7de57f..6a6d1088d 100644 --- a/kwin/clients/web/CMakeLists.txt +++ b/kwin/clients/web/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_web AUTOMOC SOURCES Web.cpp WebButton.cpp - LINK kdecorations-shared kdeui-shared + LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/data/CMakeLists.txt b/kwin/data/CMakeLists.txt index ac9d78e1c..832a71cfd 100644 --- a/kwin/data/CMakeLists.txt +++ b/kwin/data/CMakeLists.txt @@ -44,7 +44,7 @@ install( FILES tde_add_executable( kwin_update_window_settings SOURCES update_window_settings.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin ) @@ -53,6 +53,6 @@ tde_add_executable( kwin_update_window_settings tde_add_executable( kwin_update_default_rules SOURCES update_default_rules.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin ) diff --git a/kwin/kcmkwin/kwindecoration/CMakeLists.txt b/kwin/kcmkwin/kwindecoration/CMakeLists.txt index 21cfa02c8..1d88ce5a9 100644 --- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( kcm_kwindecoration AUTOMOC SOURCES kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp - LINK kdecorations-shared kdeui-shared Xext + LINK tdecorations-shared tdeui-shared Xext DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/kwinoptions/CMakeLists.txt b/kwin/kcmkwin/kwinoptions/CMakeLists.txt index 21a8648ea..b3caf6ec0 100644 --- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt @@ -35,6 +35,6 @@ install( FILES tde_add_kpart( kcm_kwinoptions AUTOMOC SOURCES windows.cpp mouse.cpp main.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt index 93acbe2e8..d505cf709 100644 --- a/kwin/kcmkwin/kwinrules/CMakeLists.txt +++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt @@ -35,9 +35,9 @@ tde_add_kpart( kcm_kwinrules AUTOMOC DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kwin_rules_dialog (kdeinit) ############### +##### kwin_rules_dialog (tdeinit) ############### -tde_add_kdeinit_executable( kwin_rules_dialog +tde_add_tdeinit_executable( kwin_rules_dialog SOURCES main.cpp LINK ${TQT_LIBRARIES} kwinrules-static ) @@ -53,4 +53,4 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared ) + LINK tdeui-shared ) diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am index 18aef9ccd..b4769c6bd 100644 --- a/kwin/kcmkwin/kwinrules/Makefile.am +++ b/kwin/kcmkwin/kwinrules/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kwin/lib bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kwin_rules_dialog.la +tdeinit_LTLIBRARIES = kwin_rules_dialog.la kde_module_LTLIBRARIES = kcm_kwinrules.la noinst_LTLIBRARIES = libkwinrules.la diff --git a/kwin/killer/CMakeLists.txt b/kwin/killer/CMakeLists.txt index 71c349c7c..4fd991d40 100644 --- a/kwin/killer/CMakeLists.txt +++ b/kwin/killer/CMakeLists.txt @@ -23,6 +23,6 @@ link_directories( tde_add_executable( kwin_killer_helper SOURCES killer.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am index e31c88be6..620543fa0 100644 --- a/kwin/killer/Makefile.am +++ b/kwin/killer/Makefile.am @@ -4,6 +4,6 @@ bin_PROGRAMS = kwin_killer_helper kwin_killer_helper_SOURCES = killer.cpp kwin_killer_helper_LDADD = $(LIB_KDEUI) -kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kwin/lib/CMakeLists.txt b/kwin/lib/CMakeLists.txt index b97e3d455..26f0809af 100644 --- a/kwin/lib/CMakeLists.txt +++ b/kwin/lib/CMakeLists.txt @@ -21,9 +21,9 @@ link_directories( ) -##### kdecorations (shared) ##################### +##### tdecorations (shared) ##################### -set( target kdecorations ) +set( target tdecorations ) set( ${target}_SRCS kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp @@ -33,7 +33,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kwin/rules.cpp b/kwin/rules.cpp index 2d6ddded7..41489e3cd 100644 --- a/kwin/rules.cpp +++ b/kwin/rules.cpp @@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app ) args << "--wid" << TQString::number( c->window()); if( whole_app ) args << "--whole-app"; - KApplication::kdeinitExec( "kwin_rules_dialog", args ); + KApplication::tdeinitExec( "kwin_rules_dialog", args ); } void Workspace::loadWindowRules() diff --git a/kwin/tools/Makefile.am b/kwin/tools/Makefile.am index 444cde9dc..8d223282a 100644 --- a/kwin/tools/Makefile.am +++ b/kwin/tools/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = decobenchmark INCLUDES = $(all_includes) test_gravity_SOURCES = test_gravity.cpp -test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_gravity_LDADD = $(LIB_X11) METASOURCES = AUTO diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 66b8780ec..06b8bdc8a 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -1219,7 +1219,7 @@ TQStringList Workspace::configModules(bool controlCenter) void Workspace::configureWM() { - KApplication::kdeinitExec( "kcmshell", configModules(false) ); + KApplication::tdeinitExec( "kcmshell", configModules(false) ); } /*! diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt index ee1d141ff..703591ad3 100644 --- a/kxkb/CMakeLists.txt +++ b/kxkb/CMakeLists.txt @@ -44,12 +44,12 @@ tde_add_kpart( kcm_keyboard AUTOMOC ) -##### kxkb (kdeinit) ############################ +##### kxkb (tdeinit) ############################ -tde_add_kdeinit_executable( kxkb AUTOMOC +tde_add_tdeinit_executable( kxkb AUTOMOC SOURCES extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp kxkb.skel - LINK kdeui-shared xkbfile + LINK tdeui-shared xkbfile ) diff --git a/kxkb/Makefile.am b/kxkb/Makefile.am index 8398e3946..60208b065 100644 --- a/kxkb/Makefile.am +++ b/kxkb/Makefile.am @@ -7,7 +7,7 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kxkb.la +tdeinit_LTLIBRARIES = kxkb.la kde_module_LTLIBRARIES = kcm_keyboard.la kcm_keyboard_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \ diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 0874986c3..09b3ad204 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -324,7 +324,7 @@ void LayoutConfig::save() m_kxkbConfig.save(); - kapp->kdeinitExec("kxkb"); + kapp->tdeinitExec("kxkb"); emit KCModule::changed( false ); } diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am index b93f3395a..e34e62e08 100644 --- a/libkonq/Makefile.am +++ b/libkonq/Makefile.am @@ -67,6 +67,6 @@ noinst_HEADERS = konq_sound.h messages: $(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot -DOXYGEN_REFERENCES = dcop kdecore kio/bookmarks +DOXYGEN_REFERENCES = dcop tdecore kio/bookmarks include ../admin/Doxyfile.am diff --git a/libkonq/favicons/CMakeLists.txt b/libkonq/favicons/CMakeLists.txt index 627f99ec2..61afd464b 100644 --- a/libkonq/favicons/CMakeLists.txt +++ b/libkonq/favicons/CMakeLists.txt @@ -32,6 +32,6 @@ install( PROGRAMS move_favicons.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) tde_add_kpart( kded_favicons AUTOMOC SOURCES favicons.cpp favicons.skel - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt index 5e16114f3..09731c2a9 100644 --- a/nsplugins/CMakeLists.txt +++ b/nsplugins/CMakeLists.txt @@ -45,7 +45,7 @@ tde_add_kpart( libnsplugin AUTOMOC tde_add_kpart( kcm_nsplugins AUTOMOC SOURCES kcm_nsplugins.cpp - LINK pluginpaths-static kdecore-shared + LINK pluginpaths-static tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp index dbb5cb1af..f218d3c2f 100644 --- a/nsplugins/kcm_nsplugins.cpp +++ b/nsplugins/kcm_nsplugins.cpp @@ -116,7 +116,7 @@ extern "C" if ( scan || firstTime ) { - KApplication::kdeinitExec("nspluginscan"); + KApplication::tdeinitExec("nspluginscan"); } if (firstTime) { diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am index b83893e51..06bd7e8f6 100644 --- a/nsplugins/test/Makefile.am +++ b/nsplugins/test/Makefile.am @@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h check_PROGRAMS = testnsplugin testnsplugin_SOURCES = testnsplugin.cpp -testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testnsplugin_LDADD = $(LIB_KDEUI) ../libnsplugin.la $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h diff --git a/startkde b/startkde index 1124d7a4d..3be23272a 100644 --- a/startkde +++ b/startkde @@ -50,14 +50,14 @@ fi # Boot sequence: # -# kdeinit is used to fork off processes which improves memory usage +# tdeinit is used to fork off processes which improves memory usage # and startup time. # -# * kdeinit starts the dcopserver and klauncher first. +# * tdeinit starts the dcopserver and klauncher first. # * Then kded is started. kded is responsible for keeping the sycoca # database up to date. When an up to date database is present it goes # into the background and the startup continues. -# * Then kdeinit starts kcminit. kcminit performs initialisation of +# * Then tdeinit starts kcminit. kcminit performs initialisation of # certain devices according to the user's settings # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -483,7 +483,7 @@ if test "$kpersonalizerrc_general_firstlogin" = "true"; then if [ ! -x $KDEDIR/bin/kpersonalizer ]; then echo "[startkde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2 else - # start only dcopserver, don't start whole kdeinit (takes too long) + # start only dcopserver, don't start whole tdeinit (takes too long) echo "[startkde] Running kpersonalizer..." 1>&2 dcopserver kwin --lock & @@ -523,7 +523,7 @@ fi # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The TDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched -# directly from the KDE session but e.g. using "ssh -X", kdesu. $TDE_FULL_SESSION +# directly from the KDE session but e.g. using "ssh -X", tdesu. $TDE_FULL_SESSION # however guarantees that the application is launched in the same environment # like the KDE session and that e.g. KDE utilities/libraries are available. # TDE_FULL_SESSION property is also only available since KDE 3.5.5. @@ -546,15 +546,15 @@ KDE_SESSION_UID=$UID export KDE_SESSION_UID echo "[startkde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2 -# We set LD_BIND_NOW to increase the efficiency of kdeinit. -# kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true start_kdeinit_wrapper --new-startup +kcminit_startup +# We set LD_BIND_NOW to increase the efficiency of tdeinit. +# tdeinit unsets this variable before loading applications. +LD_BIND_NOW=true start_tdeinit_wrapper --new-startup +kcminit_startup if test $? -ne 0; then # Startup error - echo '[startkde] Could not start kdeinit. Check your installation.' 1>&2 - xmessage -geometry 500x100 "Could not start kdeinit. Check your installation." + echo '[startkde] Could not start tdeinit. Check your installation.' 1>&2 + xmessage -geometry 500x100 "Could not start tdeinit. Check your installation." fi -echo "[startkde] kdeinit started successfully." 1>&2 +echo "[startkde] tdeinit started successfully." 1>&2 # If the session should be locked from the start (locked autologin), # lock now and do the rest of the KDE startup underneath the locker. @@ -591,12 +591,12 @@ done echo '[startkde] Shutting down Trinity...' 1>&2 # Clean up -kdeinit_shutdown +tdeinit_shutdown dcopserver_shutdown --wait artsshell -q terminate # KDE4 support -if [ -f /usr/bin/kdeinit4_shutdown ]; then - kde4 kdeinit4_shutdown 2>/dev/null +if [ -f /usr/bin/tdeinit4_shutdown ]; then + kde4 tdeinit4_shutdown 2>/dev/null fi echo '[startkde] Running Trinity shutdown scripts...' 1>&2 diff --git a/tqt3integration/libqtkde/CMakeLists.txt b/tqt3integration/libqtkde/CMakeLists.txt index a4220ac26..44952e35f 100644 --- a/tqt3integration/libqtkde/CMakeLists.txt +++ b/tqt3integration/libqtkde/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( tde_add_library( qtkde SHARED AUTOMOC SOURCES qtkde.cpp VERSION 0.0.0 - LINK kdeui-shared + LINK tdeui-shared DEPENDENCIES generate_tqt3_bindings DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/" ) \ No newline at end of file diff --git a/tqt3integration/module/CMakeLists.txt b/tqt3integration/module/CMakeLists.txt index 282c4a6a3..dd7a62ebe 100644 --- a/tqt3integration/module/CMakeLists.txt +++ b/tqt3integration/module/CMakeLists.txt @@ -36,7 +36,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeinit_kded-shared + LINK tdeinit_kded-shared DEPENDENCIES generate_tqt3_bindings DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt index 8386a95f7..da78e6a99 100644 --- a/tqt3integration/utils/CMakeLists.txt +++ b/tqt3integration/utils/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_executable( gen AUTOMOC SOURCES gen.cpp - LINK kdecore-shared + LINK tdecore-shared ) ADD_CUSTOM_COMMAND(