diff --git a/CMakeLists.txt b/CMakeLists.txt index 473c37c6e..4ef4a9e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,7 +171,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} ) option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} ) option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} ) option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} ) -option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} ) +option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} ) option( BUILD_KSTART "Build kstart" ${BUILD_ALL} ) option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} ) option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} ) @@ -248,7 +248,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder ) tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass ) tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter ) tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys ) -tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver ) +tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver ) tde_conditional_add_subdirectory( BUILD_KSTART kstart ) tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd ) tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins ) diff --git a/Makefile.am.in b/Makefile.am.in index 15164399a..b6b018f2d 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1 bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update -EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv +EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv dist-hook: cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin diff --git a/README b/README index f6557fffb..8e5b89c7e 100644 --- a/README +++ b/README @@ -106,7 +106,7 @@ libraries. Here is an overview of the directories: * krichtexteditor A embeddable rich text editor and a wrapper application for it. -* kscreensaver +* tdescreensaver The KDE screensaver environment and some basic screensavers. More of them are in the tdeartwork package. diff --git a/README.pam b/README.pam index c7db9908a..38831e0cf 100644 --- a/README.pam +++ b/README.pam @@ -1,6 +1,6 @@ KDE can be configured to support the PAM ("Pluggable Authentication Modules") system for password checking by the display manager tdm and -by the screen saver kscreensaver (for unlocking the display). +by the screen saver tdescreensaver (for unlocking the display). PAM is a flexible application-transparent configurable user-authentication system found on FreeBSD, Solaris, and Linux (and maybe other unixes). @@ -27,26 +27,26 @@ By default, PAM is automatically used, if it is found. Use If PAM is found, KDE usually uses the PAM service "kde". You may override it for all KDE programs by using --with-pam= and/or individually by using --with--pam=, where is -one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver). +one of tdm, kcp and kss (for tdm, kcheckpass and tdescreensaver). "make install" will attempt to create suitable service definitions; either by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The services are just copies of the "login" service. You may want to edit these definitions to meet your needs. There are also two example service definitions in this directory - -kde.pamd and kscreensaver.pamd - but don't just copy them! +kde.pamd and tdescreensaver.pamd - but don't just copy them! If the services are misconfigured, you will NOT be able to login via TDM and/or unlock a locked screen! If there is ever any doubt about which PAM service a program was compiled with, it can be determined by examining the PAM-generated -entries in the system log associated with tdm logins or kscreensaver +entries in the system log associated with tdm logins or tdescreensaver authentication failures. PAM configuration files have four types of entries for each service: -type used by tdm used by kscreensaver +type used by tdm used by tdescreensaver ---- ----------- -------------------- auth x x account x diff --git a/applnk/compat/konqhtml.desktop b/applnk/compat/konqhtml.desktop index affe9e6a1..9556740b2 100644 --- a/applnk/compat/konqhtml.desktop +++ b/applnk/compat/konqhtml.desktop @@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器 Name[zh_TW]=Konqueror 網頁瀏覽器 Type=Application Icon=fonts -Exec=kcmshell khtml_fonts +Exec=kcmshell tdehtml_fonts X-TDE-ModuleType=Library X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_fonts +X-TDE-FactoryName=tdehtml_fonts diff --git a/applnk/tde-system-screensavers.directory b/applnk/tde-system-screensavers.directory index f4c47d881..b6e23a727 100644 --- a/applnk/tde-system-screensavers.directory +++ b/applnk/tde-system-screensavers.directory @@ -82,7 +82,7 @@ Name[xh]=Abagcini Bekhusi Name[zh_CN]=屏幕保护程序 Name[zh_TW]=螢幕保護程式 Name[zu]=Abagcini Besikrini -Icon=kscreensaver +Icon=tdescreensaver X-TDE-BaseGroup=screensavers Comment=Screen saver demos diff --git a/config.h.cmake b/config.h.cmake index b5433283c..f45626f48 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -88,7 +88,7 @@ // kcontrol/energy #cmakedefine HAVE_DPMS 1 -// kdesktop, kcontrol/screensaver, kscreensaver +// kdesktop, kcontrol/screensaver, tdescreensaver #cmakedefine HAVE_GLXCHOOSEVISUAL 1 // kcontrol/crypto diff --git a/configure.in.in b/configure.in.in index bdad1ca08..f15f4ad4b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,7 +7,7 @@ KDE_PASSWDLIBS DEF_PAM_SERVICE(tdm, tdm, TDM) DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS) -DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER) +DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER) dnl Checks for header files. AC_HEADER_DIRENT diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook index d1ee69240..bfa9b59cd 100644 --- a/doc/faq/webbrowse.docbook +++ b/doc/faq/webbrowse.docbook @@ -206,7 +206,7 @@ text->html in the tree view. Click on the Embedding tab. Make sure that Left Click Action is set to Show file in embedded -viewer, and that KHTML (khtml) is at the top +viewer, and that KHTML (tdehtml) is at the top of Services Preference Order. diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook index 7032e511d..f8b7d46c2 100644 --- a/doc/glossary/index.docbook +++ b/doc/glossary/index.docbook @@ -33,7 +33,7 @@ Slave &tde; - + KParts KParts is an embedding technology which allows &tde; applications to embed other &tde; applications. For example, the text @@ -41,7 +41,7 @@ Slave &konqueror; - + KSycoca KSycoca (&tde; System Configuration Cache) is a @@ -88,7 +88,7 @@ program and regenerates the or all modules in &kcontrol; are missing. KSycoca +otherterm="gloss-tdesycoca">KSycoca &kcontrol; diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook index ac33e1943..2cc77e57f 100644 --- a/doc/glossary/tdeprintingglossary.docbook +++ b/doc/glossary/tdeprintingglossary.docbook @@ -1134,7 +1134,7 @@ now. address gives administrative access to TDEPrint. Konqueror uses &tde;'s famous "KParts" technology to achieve that. IO Slave - KParts + KParts diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook index a9aa9ab5a..26cc11ac5 100644 --- a/doc/kcontrol/filemanager/index.docbook +++ b/doc/kcontrol/filemanager/index.docbook @@ -29,7 +29,7 @@ &konqueror;'s file manager functionality. &konqueror;'s web browser functionality has its own configuration +url="help:/kcontrol/tdehtml/index.html">own configuration modules. diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook index 113c2fe19..8560fa8a7 100644 --- a/doc/kcontrol/kcmcss/index.docbook +++ b/doc/kcontrol/kcmcss/index.docbook @@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced vision. Your choices here affect every &tde; application that renders HTML -with &tde;'s own renderer, which is called khtml. These include +with &tde;'s own renderer, which is called tdehtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;. diff --git a/doc/kcontrol/khtml/Makefile.am b/doc/kcontrol/khtml/Makefile.am deleted file mode 100644 index c54c99e96..000000000 --- a/doc/kcontrol/khtml/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -KDE_LANG = en -KDE_DOCS = kcontrol/khtml diff --git a/doc/kcontrol/spellchecking/index.docbook b/doc/kcontrol/spellchecking/index.docbook index 813aba96a..2893d750b 100644 --- a/doc/kcontrol/spellchecking/index.docbook +++ b/doc/kcontrol/spellchecking/index.docbook @@ -30,7 +30,7 @@ Spell Checker The configuration options available here are used by all &tde; -applications that use &kspell;, which is a front end to +applications that use &tdespell;, which is a front end to ispell or aspell. @@ -57,7 +57,7 @@ error. Dictionary: Choose from the available dictionaries, which one to use for -&kspell;. +&tdespell;. diff --git a/doc/kcontrol/khtml/CMakeLists.txt b/doc/kcontrol/tdehtml/CMakeLists.txt similarity index 83% rename from doc/kcontrol/khtml/CMakeLists.txt rename to doc/kcontrol/tdehtml/CMakeLists.txt index dda61f78d..b7e6bb6b7 100644 --- a/doc/kcontrol/khtml/CMakeLists.txt +++ b/doc/kcontrol/tdehtml/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kcontrol/khtml ) +tde_create_handbook( DESTINATION kcontrol/tdehtml ) diff --git a/doc/kcontrol/tdehtml/Makefile.am b/doc/kcontrol/tdehtml/Makefile.am new file mode 100644 index 000000000..07d632f49 --- /dev/null +++ b/doc/kcontrol/tdehtml/Makefile.am @@ -0,0 +1,2 @@ +KDE_LANG = en +KDE_DOCS = kcontrol/tdehtml diff --git a/doc/kcontrol/khtml/index.docbook b/doc/kcontrol/tdehtml/index.docbook similarity index 99% rename from doc/kcontrol/khtml/index.docbook rename to doc/kcontrol/tdehtml/index.docbook index 386df55fd..b8df24598 100644 --- a/doc/kcontrol/khtml/index.docbook +++ b/doc/kcontrol/tdehtml/index.docbook @@ -305,7 +305,7 @@ creates one. - + AdBlocK &konqueror; AdBlocK can be configured to replace or remove diff --git a/doc/kcontrol/khtml/nsplugin.docbook b/doc/kcontrol/tdehtml/nsplugin.docbook similarity index 100% rename from doc/kcontrol/khtml/nsplugin.docbook rename to doc/kcontrol/tdehtml/nsplugin.docbook diff --git a/doc/konqueror/config.docbook b/doc/konqueror/config.docbook index a8958166d..90a1a5212 100644 --- a/doc/konqueror/config.docbook +++ b/doc/konqueror/config.docbook @@ -48,7 +48,7 @@ position and icon size Toolbars... option, which brings up the Configure Toolbars dialog box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar <&konqueror;>, Main -Toolbar <khtmlpart> and Extra Toolbar <khtmlsettingsplugin>. The +Toolbar <tdehtmlpart> and Extra Toolbar <tdehtmlsettingsplugin>. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed. diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook index 445a26da5..8a1b81c00 100644 --- a/doc/userguide/groupware-kontact.docbook +++ b/doc/userguide/groupware-kontact.docbook @@ -242,7 +242,7 @@ class="username">groupware user (already previously done!) Create/configure an IMAP account in &kmail; -for login as that user Use kresources to make +for login as that user Use tderesources to make &kontact; components work with data taken from IMAP source @@ -336,7 +336,7 @@ slow data updates. Now we have to tell &kontact; to use IMAP as the data source for it's various components. From the &kmenu;, choose Run command, run kcmshell -kresources. In the combo box select +tderesources. In the combo box select Contacts, then press the Add... button, and choose Addressbook on IMAP Server via KMail. Then select that new line and press Use as Standard button. Do the same for diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 6a49a129a..872191714 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -858,7 +858,7 @@ also unique per X-server display. The processes are: kded Generic service daemon. -Triggers Sycoca database updates when +Triggers Sycoca database updates when needed @@ -1819,14 +1819,14 @@ class="directory">$HOME/.trinity/share/applnk (user specific). This is observed unless the .desktop file has a Categories= line. In that case the categories determine the location in the menu. - + <application>KSycoca</application> KSycoca caches menu structure and information about all available applications. You can rebuild the database with kbuildsycoca. The database which is built lives in /var/tmp/tdecache-${USER}/ksycoca. +class="directory">/var/tmp/tdecache-${USER}/tdesycoca. It is automatically updated by KDED, checked during &tde; login, and KDED watches for changes while logged in. @@ -1839,7 +1839,7 @@ CheckSycoca=false -To force regeneration, run touch $TDEDIR/share/services/update_ksycoca. +To force regeneration, run touch $TDEDIR/share/services/update_tdesycoca. @@ -2031,7 +2031,7 @@ shell_access=false Since this affects the &tde; menu and the available applications, we must force an update of the sycoca database: -touch $TDEDIR/share/services/update_ksycoca +touch $TDEDIR/share/services/update_tdesycoca Now re-login to &tde; and check the following points: @@ -2488,7 +2488,7 @@ KDebug MainApplication-Interface konsole (default) konsole-mainwindow#1 -ksycoca +tdesycoca session-1 session-2 session-3 diff --git a/doc/userguide/tde-office.docbook b/doc/userguide/tde-office.docbook index 73e4cc313..28e089b3d 100644 --- a/doc/userguide/tde-office.docbook +++ b/doc/userguide/tde-office.docbook @@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format. - + - + - + diff --git a/konqueror/kttsplugin/CMakeLists.txt b/konqueror/kttsplugin/CMakeLists.txt index 80180aa8e..fc3f409fe 100644 --- a/konqueror/kttsplugin/CMakeLists.txt +++ b/konqueror/kttsplugin/CMakeLists.txt @@ -24,16 +24,16 @@ link_directories( ##### other data ################################ install( FILES - khtmlkttsd.rc khtmlkttsd.desktop - DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins ) + tdehtmlkttsd.rc tdehtmlkttsd.desktop + DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins ) -##### libkhtmlkttsdplugin (module) ############## +##### libtdehtmlkttsdplugin (module) ############## -set( target libkhtmlkttsdplugin ) +set( target libtdehtmlkttsdplugin ) tde_add_kpart( ${target} AUTOMOC - SOURCES khtmlkttsd.cpp - LINK khtml-shared + SOURCES tdehtmlkttsd.cpp + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/kttsplugin/Makefile.am b/konqueror/kttsplugin/Makefile.am index 580a18dcd..d82a56fc2 100644 --- a/konqueror/kttsplugin/Makefile.am +++ b/konqueror/kttsplugin/Makefile.am @@ -2,15 +2,15 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = libkhtmlkttsdplugin.la +kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la -libkhtmlkttsdplugin_la_SOURCES = khtmlkttsd.cpp -libkhtmlkttsdplugin_la_LIBADD = $(LIB_KHTML) -libkhtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp +libtdehtmlkttsdplugin_la_LIBADD = $(LIB_KHTML) +libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -pluginsdir = $(kde_datadir)/khtml/kpartplugins -plugins_DATA = khtmlkttsd.rc khtmlkttsd.desktop +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins +plugins_DATA = tdehtmlkttsd.rc tdehtmlkttsd.desktop messages: rc.cpp $(EXTRACTRC) *.rc > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/khtmlkttsd.pot + $(XGETTEXT) *.cpp -o $(podir)/tdehtmlkttsd.pot diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp similarity index 95% rename from konqueror/kttsplugin/khtmlkttsd.cpp rename to konqueror/kttsplugin/tdehtmlkttsd.cpp index e832bd27a..80b756a8b 100644 --- a/konqueror/kttsplugin/khtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include // this plugin applies to a khtml part +#include // this plugin applies to a tdehtml part #include #include #include #include -#include "khtmlkttsd.h" +#include "tdehtmlkttsd.h" #include #include #include @@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut() } } -K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory("khtmlkttsd") ) +K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory("tdehtmlkttsd") ) -#include "khtmlkttsd.moc" +#include "tdehtmlkttsd.moc" diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/konqueror/kttsplugin/tdehtmlkttsd.desktop similarity index 97% rename from konqueror/kttsplugin/khtmlkttsd.desktop rename to konqueror/kttsplugin/tdehtmlkttsd.desktop index 5e8519eb3..35db3445c 100644 --- a/konqueror/kttsplugin/khtmlkttsd.desktop +++ b/konqueror/kttsplugin/tdehtmlkttsd.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -X-TDE-Library=libkhtmlkttsdplugin +X-TDE-Library=libtdehtmlkttsdplugin X-TDE-PluginInfo-Author=Olaf Schmidt X-TDE-PluginInfo-Email=ojschmidt@kde.org -X-TDE-PluginInfo-Name=khtmlkttsdplugin +X-TDE-PluginInfo-Name=tdehtmlkttsdplugin X-TDE-PluginInfo-Version=3.4 X-TDE-PluginInfo-Website= X-TDE-PluginInfo-Category=Tools diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h similarity index 97% rename from konqueror/kttsplugin/khtmlkttsd.h rename to konqueror/kttsplugin/tdehtmlkttsd.h index cfe1e7d38..f42c9b03e 100644 --- a/konqueror/kttsplugin/khtmlkttsd.h +++ b/konqueror/kttsplugin/tdehtmlkttsd.h @@ -17,7 +17,7 @@ #ifndef KHTMLKTTSD_H #define KHTMLKTTSD_H -#include +#include class KURL; class TDEInstance; diff --git a/konqueror/kttsplugin/khtmlkttsd.rc b/konqueror/kttsplugin/tdehtmlkttsd.rc similarity index 74% rename from konqueror/kttsplugin/khtmlkttsd.rc rename to konqueror/kttsplugin/tdehtmlkttsd.rc index 388aec9e7..a06a29742 100644 --- a/konqueror/kttsplugin/khtmlkttsd.rc +++ b/konqueror/kttsplugin/tdehtmlkttsd.rc @@ -1,5 +1,5 @@ - + &Tools diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 40f8b2269..127ecc3b2 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -20,10 +20,10 @@ #ifndef __konq_listview_h__ #define __konq_listview_h__ -#include +#include #include #include -#include +#include #include #include diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 1dd7a25ad..bd26db191 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -840,7 +840,7 @@ void KonqBaseListViewWidget::startDrag() { int iconSize = m_pBrowserView->m_pProps->iconSize(); iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small - pixmap2 = DesktopIcon( "kmultiple", iconSize ); + pixmap2 = DesktopIcon( "tdemultiple", iconSize ); if ( pixmap2.isNull() ) kdWarning(1202) << "Could not find multiple pixmap" << endl; } diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 5dd6aca11..9bdc60e3d 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include "konq_listviewitems.h" diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop index afb7d36e8..6c30b886f 100644 --- a/konqueror/profile_kde_devel.desktop +++ b/konqueror/profile_kde_devel.desktop @@ -76,35 +76,35 @@ Tabs0_activeChildIndex=0 ViewT0_LinkedView=false ViewT0_LockedLocation=false ViewT0_PassiveMode=false -ViewT0_ServiceName=khtml +ViewT0_ServiceName=tdehtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false -ViewT1_ServiceName=khtml +ViewT1_ServiceName=tdehtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/index-2.html ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -ViewT2_ServiceName=khtml +ViewT2_ServiceName=tdehtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false ViewT2_URL=http://bugs.trinitydesktop.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false -ViewT3_ServiceName=khtml +ViewT3_ServiceName=tdehtml ViewT3_ServiceType=text/html ViewT3_ToggleView=false ViewT3_URL=man:/gcc ViewT4_LinkedView=false ViewT4_LockedLocation=false ViewT4_PassiveMode=false -ViewT4_ServiceName=khtml +ViewT4_ServiceName=tdehtml ViewT4_ServiceType=text/html ViewT4_ToggleView=false ViewT4_URL=info:/dir diff --git a/konqueror/profile_tabbedbrowsing.desktop b/konqueror/profile_tabbedbrowsing.desktop index 38cc09e3c..c910cbac1 100644 --- a/konqueror/profile_tabbedbrowsing.desktop +++ b/konqueror/profile_tabbedbrowsing.desktop @@ -77,28 +77,28 @@ Tabs0_activeChildIndex=0 ViewT0_LinkedView=false ViewT0_LockedLocation=false ViewT0_PassiveMode=false -ViewT0_ServiceName=khtml +ViewT0_ServiceName=tdehtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false ViewT0_URL=http://www.kde.org/ ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false -ViewT1_ServiceName=khtml +ViewT1_ServiceName=tdehtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false ViewT1_URL=http://dot.kde.org/ ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -ViewT2_ServiceName=khtml +ViewT2_ServiceName=tdehtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false ViewT2_URL=http://themes.kde.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false -ViewT3_ServiceName=khtml +ViewT3_ServiceName=tdehtml ViewT3_ServiceType=text/html ViewT3_ToggleView=false ViewT3_URL=http://www.kde-apps.org/ diff --git a/konqueror/quickprint/TODO b/konqueror/quickprint/TODO index d858e8db6..5001bfaf7 100644 --- a/konqueror/quickprint/TODO +++ b/konqueror/quickprint/TODO @@ -5,7 +5,7 @@ - set the position of the picture on the site and something like that - printing html (homepges) - print the html code like for the textprinting - - print the html file like it was parsed with khtml + - print the html file like it was parsed with tdehtml - printing TeX documents with a action on the TeX source - I don't know at the moment options for that - ... diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 9ae297285..838f2aad7 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "kremoteencodingplugin.h" diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index d663baf6c..9b80888a5 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class KActionMenu; class TDEConfig; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h index f942c82bf..16874adc0 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.h +++ b/konqueror/shellcmdplugin/kshellcmdplugin.h @@ -19,7 +19,7 @@ #ifndef kshellcmdplugin_h #define kshellcmdplugin_h -#include +#include #include class KShellCmdPlugin : public KParts::Plugin diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt index ba9f677ce..fa9c3cbd5 100644 --- a/konqueror/sidebar/CMakeLists.txt +++ b/konqueror/sidebar/CMakeLists.txt @@ -51,7 +51,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -66,6 +66,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqsidebarplugin-shared konq-shared kio-shared kutils-shared + LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 660fda9df..dfdd2e2e0 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -17,10 +17,10 @@ #ifndef KONQSIDEBARPART_H #define KONQSIDEBARPART_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include "sidebar_widget.h" #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index b9225edfa..0433261c7 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index da5b0888b..c5ee75a8a 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include "konqsidebarplugin.h" #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index b70230b9e..5a198eeca 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -3,9 +3,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/konqueror/sidebar/web_module/CMakeLists.txt b/konqueror/sidebar/web_module/CMakeLists.txt index a925474b4..a15866ebd 100644 --- a/konqueror/sidebar/web_module/CMakeLists.txt +++ b/konqueror/sidebar/web_module/CMakeLists.txt @@ -35,6 +35,6 @@ set( target konqsidebar_web ) tde_add_kpart( ${target} AUTOMOC SOURCES web_module.cpp - LINK konqsidebarplugin-shared konq-shared khtml-shared + LINK konqsidebarplugin-shared konq-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index a337c65c6..1386ee0a7 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 4e0c3d6d7..b7538bff3 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -20,7 +20,7 @@ #define web_module_h #include -#include +#include #include #include #include diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt index 222583500..4992cdc43 100644 --- a/konsole/konsole/CMakeLists.txt +++ b/konsole/konsole/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am index 6139fdfe4..4f9a03d55 100644 --- a/konsole/konsole/Makefile.am +++ b/konsole/konsole/Makefile.am @@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTESTLI # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp # kcmkonsole_LDADD = $(LIB_TDEUI) -# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor 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 b9940e697..0e6265321 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -135,7 +135,7 @@ Time to start a requirement list. #include #include #include -#include +#include #include #include #include diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 981c4d6c9..fc76b565b 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -21,8 +21,8 @@ #ifndef KONSOLE_PART_H #define KONSOLE_PART_H -#include -#include +#include +#include #include diff --git a/kpager/Makefile.am b/kpager/Makefile.am index 5cfbf0910..672dec243 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kpager_LDADD = $(LIB_TDEUI) diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am index 76b1a4ff8..66b957804 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # 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/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index e3efd2f85..818fd02e3 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -165,7 +165,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan stream << comboLang->current(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - // ksycoca needs to be rebuilt + // tdesycoca needs to be rebuilt TDEProcess proc; proc << TQString::fromLatin1("kbuildsycoca"); proc.start(TDEProcess::DontCare); diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am index aaffa73af..79670d29a 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor LDADD = $(LIB_TDECORE) bin_PROGRAMS = kreadconfig kwriteconfig diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index bd46dadcd..6f09a8f33 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -49,5 +49,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC 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 tdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES} + LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES} ) diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index 66a51e762..502ffb8e9 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) messages: diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 08d934069..2d9ce713a 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -81,7 +81,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #ifdef WITH_UPOWER #include diff --git a/ksplashml/CMakeLists.txt b/ksplashml/CMakeLists.txt index 2ab57be05..6cfe72836 100644 --- a/ksplashml/CMakeLists.txt +++ b/ksplashml/CMakeLists.txt @@ -36,6 +36,6 @@ install( FILES ksplash.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_executable( ksplash AUTOMOC SOURCES wndmain.cpp ksplashiface.skel main.cpp - LINK themedefault-static kparts-shared + LINK themedefault-static tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am index 30639589b..f7f7b70ab 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ksplash_LDADD = $(LIB_TDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO) noinst_HEADERS = ksplashiface.h wndmain.h diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am index b6f14e29b..2e78de52a 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am index 029e31944..200b96b83 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT) diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am index 9d275066b..6db469162 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libthemestandard_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashstandard.la diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am index b6f14e29b..2e78de52a 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la diff --git a/kstart/Makefile.am b/kstart/Makefile.am index 718687b50..d9e493a9d 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kstart_LDADD = $(LIB_TDECORE) METASOURCES = kstart.moc diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt index e6d7357bf..7313b6b5d 100644 --- a/ksysguard/gui/CMakeLists.txt +++ b/ksysguard/gui/CMakeLists.txt @@ -51,7 +51,7 @@ tde_add_executable( ksysguard AUTOMOC SOURCES SensorBrowser.cc WorkSheet.cc WorkSheetSettings.cc Workspace.cc ksysguard.cc ksysguard.skel - LINK sensordisplays-static ksgrd-shared kdnssd-shared + LINK sensordisplays-static ksgrd-shared tdednssd-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am index 4479b1c38..3d849af15 100644 --- a/ksysguard/gui/Makefile.am +++ b/ksysguard/gui/Makefile.am @@ -32,7 +32,7 @@ ksysguard_LDADD = \ ksgrd/libksgrd.la \ SensorDisplayLib/libsensordisplays.la \ $(LIB_TDEUI) $(LIB_KIO) $(LIB_KDNSSD) -ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kpm_SOURCES = kpm.c diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am index 21f340bf7..f8f98402e 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor messages: $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot diff --git a/ktip/Makefile.am b/ktip/Makefile.am index d1ae5d172..1e6f48144 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_TDEUI) -ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO KDE_ICON = AUTO diff --git a/ktip/tips b/ktip/tips index b93468221..2d54819a4 100644 --- a/ktip/tips +++ b/ktip/tips @@ -1076,7 +1076,7 @@ password.

KWallet can be accessed from kcontrol, TDE's Control Center; from there, simply go to Security & Privacy->TDE Wallet. For more information on KWallet and on how to use it, check the handbook.

+href="help:/tdewallet" title="tdewallet">the handbook.

diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt index 4ced51f33..b1b9b4a47 100644 --- a/libkonq/CMakeLists.txt +++ b/libkonq/CMakeLists.txt @@ -60,7 +60,7 @@ tde_add_library( konq SHARED AUTOMOC konq_pixmapprovider.cc kivdirectoryoverlay.cc konq_faviconmgr.cc konq_faviconmgr.skel konq_filetip.cc VERSION 4.2.0 - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index 2b32129c2..cfc2a05e2 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/libkonq/kivdirectoryoverlay.cc @@ -97,7 +97,7 @@ void KIVDirectoryOverlay::slotCompleted() } if ( best * 2 < total ) { - m_bestIcon = "kmultiple"; + m_bestIcon = "tdemultiple"; } if (!m_bestIcon.isNull()) { diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 86f945742..59fc097b8 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h index 9c5d0735e..ffe176224 100644 --- a/libkonq/konq_dirpart.h +++ b/libkonq/konq_dirpart.h @@ -21,8 +21,8 @@ #define __konqdirpart_h #include -#include -#include +#include +#include #include #include #include diff --git a/libkonq/konq_events.h b/libkonq/konq_events.h index c047d904e..dab0f3fa1 100644 --- a/libkonq/konq_events.h +++ b/libkonq/konq_events.h @@ -1,7 +1,7 @@ #ifndef __konq_events_h__ #define __konq_events_h__ -#include +#include #include #include diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h index 9545c5674..bd22331fd 100644 --- a/libkonq/konq_historymgr.h +++ b/libkonq/konq_historymgr.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include "konq_historycomm.h" @@ -327,7 +327,7 @@ protected: private slots: /** * Called by the updateTimer to emit the KParts::HistoryProvider::updated() - * signal so that khtml can repaint the updated links. + * signal so that tdehtml can repaint the updated links. */ void slotEmitUpdated(); diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h index 2625055d8..1a4884db7 100644 --- a/libkonq/konq_iconviewwidget.h +++ b/libkonq/konq_iconviewwidget.h @@ -260,7 +260,7 @@ public slots: signals: /** - * For cut/copy/paste/move/delete (see kparts/browserextension.h) + * For cut/copy/paste/move/delete (see tdeparts/browserextension.h) */ void enableAction( const char * name, bool enabled ); diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 8d2503c30..294e43337 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include @@ -56,11 +56,11 @@ iconview trash:/ sidebar directory tree sidebar Devices / Hard Disc - khtml background - khtml link - khtml image (www.kde.org RMB on K logo) - khtmlimage (same as above, then choose View image, then RMB) - selected text in khtml + tdehtml background + tdehtml link + tdehtml image (www.kde.org RMB on K logo) + tdehtmlimage (same as above, then choose View image, then RMB) + selected text in tdehtml embedded katepart kdesktop folder trash link on desktop diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index 744d67c4d..aaa7f6f07 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -33,7 +33,7 @@ #include // for KDEDesktopMimeType #include -#include +#include #include "konq_xmlguiclient.h" diff --git a/migratekde3 b/migratekde3 index be8fa49df..4b7d48e30 100755 --- a/migratekde3 +++ b/migratekde3 @@ -253,10 +253,10 @@ if [ -n "$KDE3_PROFILE" ] && [ -d "$KDE3_PROFILE" ]; then if [ "$TMP_DIR" != "" ]; then rm -fr $TMP_DIR 2>/dev/null fi - # Remove the ksycoca files from the cache directory. The KDE3 and Trinity + # Remove the tdesycoca files from the cache directory. The KDE3 and Trinity # cache directories will be linked to the same location, but deleting the - # ksycoca files is non-destructive. - rm -f $HOME/.trinity/cache-`uname -n`/ksycoca* 2>/dev/null + # tdesycoca files is non-destructive. + rm -f $HOME/.trinity/cache-`uname -n`/tdesycoca* 2>/dev/null # Fix config files. # Exclude KMail mail files --- we don't want to touch those files. diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt index 09731c2a9..9ed66c7bb 100644 --- a/nsplugins/CMakeLists.txt +++ b/nsplugins/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ -install( FILES khtml_plugins.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdehtml_plugins.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES nspluginpart.rc DESTINATION ${DATA_INSTALL_DIR}/plugin ) @@ -36,7 +36,7 @@ tde_add_kpart( libnsplugin AUTOMOC viewer/NSPluginClassIface.stub NSPluginCallbackIface.skel plugin_part.cpp nspluginloader.cpp - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/nsplugins/Makefile.am b/nsplugins/Makefile.am index 7a01b759a..d23881b6f 100644 --- a/nsplugins/Makefile.am +++ b/nsplugins/Makefile.am @@ -11,7 +11,7 @@ libnsplugin_la_SOURCES = plugin_part.cpp nspluginloader.cpp \ NSPluginCallbackIface.skel libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined -libnsplugin_la_LIBADD = -lkparts +libnsplugin_la_LIBADD = -ltdeparts bin_PROGRAMS = nspluginscan nspluginscan_SOURCES = pluginscan.cpp @@ -25,7 +25,7 @@ kcm_nsplugins_la_LIBADD = $(LIB_TDECORE) libpluginpaths.la noinst_LTLIBRARIES = libpluginpaths.la libpluginpaths_la_SOURCES = plugin_paths.cpp -xdg_apps_DATA = khtml_plugins.desktop +xdg_apps_DATA = tdehtml_plugins.desktop partrcdir = $(kde_datadir)/plugin partrc_DATA = nspluginpart.rc diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 55fd769cf..115490552 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -378,7 +378,7 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) int cnt = 0; while (!kapp->dcopClient()->isApplicationRegistered(_dcopid)) { - //kapp->processEvents(); // would lead to recursive calls in khtml + //kapp->processEvents(); // would lead to recursive calls in tdehtml #ifdef HAVE_USLEEP usleep( 50*1000 ); #else diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 714a4c269..104619f29 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include @@ -210,7 +210,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject kdDebug(1432) << "PluginPart::PluginPart" << endl; // we have to keep the class name of KParts::PluginBrowserExtension - // to let khtml find it + // to let tdehtml find it _extension = static_cast(new KParts::BrowserExtension(this)); _liveconnect = new PluginLiveConnectExtension(this); @@ -277,7 +277,7 @@ bool PluginPart::openURL(const KURL &url) kdDebug(1432) << "name=" << name << " value=" << value << endl; if (!name.isEmpty()) { - // hack to pass view mode from khtml + // hack to pass view mode from tdehtml if ( name=="__KHTML__PLUGINEMBED" ) { embed = true; kdDebug(1432) << "__KHTML__PLUGINEMBED found" << endl; diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h index e29d91ee7..f3fa68984 100644 --- a/nsplugins/plugin_part.h +++ b/nsplugins/plugin_part.h @@ -24,9 +24,9 @@ #ifndef __plugin_part_h__ #define __plugin_part_h__ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/nsplugins/khtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop similarity index 99% rename from nsplugins/khtml_plugins.desktop rename to nsplugins/tdehtml_plugins.desktop index 9a2e0813a..b38c16160 100644 --- a/nsplugins/khtml_plugins.desktop +++ b/nsplugins/tdehtml_plugins.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/khtml/index.html#kbrowse-plugins +DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins Icon=konqueror -Exec=kcmshell khtml_plugins +Exec=kcmshell tdehtml_plugins X-TDE-ModuleType=Library X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_plugins +X-TDE-FactoryName=tdehtml_plugins X-TDE-Init-Library=nsplugins X-TDE-Init=nsplugin X-TDE-ParentApp=kcontrol diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am index 1fc99ceba..24985baa1 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt index 23452e84f..cfd95de6c 100644 --- a/nsplugins/viewer/CMakeLists.txt +++ b/nsplugins/viewer/CMakeLists.txt @@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC ../NSPluginCallbackIface.stub NSPluginClassIface.skel nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp - LINK kparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl + LINK tdeparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h index d06ffada3..6eb5d6be3 100644 --- a/nsplugins/viewer/nsplugin.h +++ b/nsplugins/viewer/nsplugin.h @@ -41,7 +41,7 @@ #include #include -#include // for URLArgs +#include // for URLArgs #include diff --git a/r14-xdg-update b/r14-xdg-update index 0af275409..b9098f1ca 100644 --- a/r14-xdg-update +++ b/r14-xdg-update @@ -292,8 +292,8 @@ fi # Remember that this script may be run more than once. The new directory # might already exist. if [ -n "$CACHE_DIR" ] && [ -d "$CACHE_DIR" ]; then - # Flush the old ksycoca cache files. This is safe at any time. - rm -f ${CACHE_DIR}/ksycoca* 2>/dev/null + # Flush the old tdesycoca cache files. This is safe at any time. + rm -f ${CACHE_DIR}/tdesycoca* 2>/dev/null # Old cache directory: /var/tmp/kde*cache-$USER # New cache directory: /var/tmp/tdecache-$USER # Rename/move the directory name but only when the new name does not exist. diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt index 3fd7d934e..fe94e1218 100644 --- a/tdeinit/CMakeLists.txt +++ b/tdeinit/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_executable( tdeinit_phase1 ##### tdeinit_displayconfig (executable) ####################### if( WITH_XRANDR ) - set( TDEINIT_DISPLAYCONFIG_OPTIONAL_LINK "krandr-shared" ) + set( TDEINIT_DISPLAYCONFIG_OPTIONAL_LINK "tderandr-shared" ) endif ( ) tde_add_executable( tdeinit_displayconfig diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index eb1a3ffc1..565e02e85 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -35,7 +35,7 @@ #include #ifdef WITH_XRANDR -#include +#include #endif static const char description[] = I18N_NOOP("TDE Initialization Display Configuration"); diff --git a/tdeprint/tdeprint_part/CMakeLists.txt b/tdeprint/tdeprint_part/CMakeLists.txt index 586d134c6..c0f04a9fe 100644 --- a/tdeprint/tdeprint_part/CMakeLists.txt +++ b/tdeprint/tdeprint_part/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( libtdeprint_part AUTOMOC SOURCES printpart.cpp - LINK tdeprint_management-shared kparts-shared + LINK tdeprint_management-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 0ac1adcd2..c725aa872 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include typedef KParts::GenericFactory PrintPartFactory; diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h index 98881d0f9..40e8041ea 100644 --- a/tdeprint/tdeprint_part/printpart.h +++ b/tdeprint/tdeprint_part/printpart.h @@ -20,8 +20,8 @@ #ifndef PRINTPART_H #define PRINTPART_H -#include -#include +#include +#include class PrintPartExtension; class KMMainView; diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am index 643a805b0..5c0b21659 100644 --- a/tdeprint/tdeprintfax/Makefile.am +++ b/tdeprint/tdeprintfax/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= $(all_includes) 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 -tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -lkabc tdeprintfax_METASOURCES = AUTO diff --git a/kscreensaver.pamd b/tdescreensaver.pamd similarity index 100% rename from kscreensaver.pamd rename to tdescreensaver.pamd diff --git a/kscreensaver/AUTHORS b/tdescreensaver/AUTHORS similarity index 100% rename from kscreensaver/AUTHORS rename to tdescreensaver/AUTHORS diff --git a/kscreensaver/CMakeLists.txt b/tdescreensaver/CMakeLists.txt similarity index 95% rename from kscreensaver/CMakeLists.txt rename to tdescreensaver/CMakeLists.txt index 7aee6728d..289ec1661 100644 --- a/kscreensaver/CMakeLists.txt +++ b/tdescreensaver/CMakeLists.txt @@ -39,6 +39,6 @@ tde_add_executable( krandom.kss AUTOMOC tde_add_executable( kblankscrn.kss AUTOMOC SOURCES blankscrn.cpp - LINK kscreensaver-shared tdeui-shared + LINK tdescreensaver-shared tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kscreensaver/ChangeLog b/tdescreensaver/ChangeLog similarity index 96% rename from kscreensaver/ChangeLog rename to tdescreensaver/ChangeLog index 0711aef0a..7bfaa2596 100644 --- a/kscreensaver/ChangeLog +++ b/tdescreensaver/ChangeLog @@ -1,5 +1,5 @@ 2001-03-10 Martin R. Jones - * added libkscreensaver and ported KDE savers to it. + * added libtdescreensaver and ported KDE savers to it. * big cleanup. 2000-01-10 Alexander Neundorf @@ -86,7 +86,7 @@ fixes to password stuff Version 0.2 -kscreensaver.h/cpp external control files +tdescreensaver.h/cpp external control files SIGUSR1 causes the screen saver to lock immediately hopefully StaysOnTop and windows opening after ss invoked will not display over saver window anymore diff --git a/kscreensaver/KBlankscreen.desktop b/tdescreensaver/KBlankscreen.desktop similarity index 99% rename from kscreensaver/KBlankscreen.desktop rename to tdescreensaver/KBlankscreen.desktop index 778da2ce0..a69ca3779 100644 --- a/kscreensaver/KBlankscreen.desktop +++ b/tdescreensaver/KBlankscreen.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=kblankscrn.kss -Icon=kscreensaver +Icon=tdescreensaver Type=Application Actions=Setup;InWindow;Root; OnlyShowIn=TDE; @@ -170,7 +170,7 @@ Name[xh]=Iyacwangciswa... Name[zh_CN]=设置... Name[zh_TW]=設定... Name[zu]=Iyalungiselela... -Icon=kscreensaver +Icon=tdescreensaver [Desktop Action InWindow] Exec=kblankscrn.kss -window-id %w diff --git a/kscreensaver/KRandom.desktop b/tdescreensaver/KRandom.desktop similarity index 99% rename from kscreensaver/KRandom.desktop rename to tdescreensaver/KRandom.desktop index 072901172..9ab77efd2 100644 --- a/kscreensaver/KRandom.desktop +++ b/tdescreensaver/KRandom.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=krandom.kss -Icon=kscreensaver +Icon=tdescreensaver Type=Application Actions=Setup;InWindow;Root; OnlyShowIn=TDE; @@ -168,7 +168,7 @@ Name[xh]=Iyacwangciswa... Name[zh_CN]=设置... Name[zh_TW]=設定... Name[zu]=Iyalungiselela... -Icon=kscreensaver +Icon=tdescreensaver [Desktop Action InWindow] Exec=krandom.kss -window-id %w diff --git a/kscreensaver/Makefile.am b/tdescreensaver/Makefile.am similarity index 70% rename from kscreensaver/Makefile.am rename to tdescreensaver/Makefile.am index ff00a42b1..f46573d5f 100644 --- a/kscreensaver/Makefile.am +++ b/tdescreensaver/Makefile.am @@ -1,10 +1,10 @@ -# Makefile.am for kscreensaver. +# Makefile.am for tdescreensaver. # AM_CPPFLAGS = -UQT_NO_ASCII_CAST INCLUDES = $(GLINC) $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor bin_PROGRAMS = krandom.kss kblankscrn.kss @@ -12,12 +12,12 @@ krandom_kss_SOURCES = random.cpp krandom_kss_LDADD = $(LIB_TDEUI) $(GLLIB) -lm kblankscrn_kss_SOURCES = blankscrn.cpp -kblankscrn_kss_LDADD = $(LIB_TDEUI) -lkscreensaver -lm +kblankscrn_kss_LDADD = $(LIB_TDEUI) -ltdescreensaver -lm METASOURCES = AUTO messages: - $(XGETTEXT) *.cpp *.h -o $(podir)/kscreensaver.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/tdescreensaver.pot ########## Meta objects ########## diff --git a/kscreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp similarity index 96% rename from kscreensaver/blankscrn.cpp rename to tdescreensaver/blankscrn.cpp index 3691e98af..e2c6ed889 100644 --- a/kscreensaver/blankscrn.cpp +++ b/tdescreensaver/blankscrn.cpp @@ -5,7 +5,7 @@ // Copyright (c) Martin R. Jones 1996 // // 1998/04/19 Layout management added by Mario Weilguni -// 2001/03/04 Converted to use libkscreensaver by Martin R. Jones +// 2001/03/04 Converted to use libtdescreensaver by Martin R. Jones #include #include @@ -20,7 +20,7 @@ #include "blankscrn.h" #include "blankscrn.moc" -// libkscreensaver interface +// libtdescreensaver interface extern "C" { KDE_EXPORT const char *kss_applicationName = "kblankscrn.kss"; diff --git a/kscreensaver/blankscrn.h b/tdescreensaver/blankscrn.h similarity index 96% rename from kscreensaver/blankscrn.h rename to tdescreensaver/blankscrn.h index ce9e129b4..ba6da0226 100644 --- a/kscreensaver/blankscrn.h +++ b/tdescreensaver/blankscrn.h @@ -10,7 +10,7 @@ #include #include -#include +#include class KColorButton; diff --git a/kscreensaver/random.cpp b/tdescreensaver/random.cpp similarity index 98% rename from kscreensaver/random.cpp rename to tdescreensaver/random.cpp index f7421ae7d..cc8b7d279 100644 --- a/kscreensaver/random.cpp +++ b/tdescreensaver/random.cpp @@ -32,7 +32,7 @@ #include #include -#include "kscreensaver_vroot.h" +#include "tdescreensaver_vroot.h" #include "random.h" #define MAX_ARGS 20 @@ -100,7 +100,7 @@ bool hasDirectRendering () { int main(int argc, char *argv[]) { - KLocale::setMainCatalogue("kscreensaver"); + KLocale::setMainCatalogue("tdescreensaver"); TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("Random screen saver"), description, version); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kscreensaver/random.h b/tdescreensaver/random.h similarity index 100% rename from kscreensaver/random.h rename to tdescreensaver/random.h diff --git a/tdesu/tdesu/Makefile.am b/tdesu/tdesu/Makefile.am index 411e6661b..2afc27b70 100644 --- a/tdesu/tdesu/Makefile.am +++ b/tdesu/tdesu/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= $(all_includes) ## tdesu bin_PROGRAMS = tdesu tdesu_SOURCES = tdesu.cpp sudlg.cpp -tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdesu_LDADD = $(LIB_KIO) -ltdesu tdesu_METASOURCES = AUTO noinst_HEADERS = sudlg.h diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 209b985b4..0159b828d 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -303,8 +303,8 @@ static int startApp() if (!new_dcop) { - TQCString ksycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca")); - env << ksycoca; + TQCString tdesycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "tdesycoca")); + env << tdesycoca; options += "xf"; // X-only, dcop forwarding enabled. } diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt index 4a069a3ae..bf2449fd6 100644 --- a/tdm/kfrontend/CMakeLists.txt +++ b/tdm/kfrontend/CMakeLists.txt @@ -58,7 +58,7 @@ tde_add_executable( tdm_config ##### tdm_greet (executable) #################### if( WITH_XRANDR ) - set( TDMGREET_OPTIONAL_LINK "krandr-shared" ) + set( TDMGREET_OPTIONAL_LINK "tderandr-shared" ) endif ( ) tde_add_executable( tdm_greet AUTOMOC diff --git a/tdm/kfrontend/Makefile.am b/tdm/kfrontend/Makefile.am index 7c58dc67f..c659ca62f 100644 --- a/tdm/kfrontend/Makefile.am +++ b/tdm/kfrontend/Makefile.am @@ -24,11 +24,11 @@ tdm_greet_SOURCES = \ tdmadmindialog.cpp \ kgreeter.cpp \ kgapp.cpp -tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) krootimage_SOURCES = krootimage.cpp -krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) METASOURCES = AUTO diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index d6fc4fc43..60a32c735 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #ifdef WITH_XRANDR -#include +#include #endif #include diff --git a/tqt3integration/README b/tqt3integration/README index 989d59d5c..0e81a7ed6 100644 --- a/tqt3integration/README +++ b/tqt3integration/README @@ -17,7 +17,7 @@ the .h file additionally should go to include/private . v kded nesmi byt nic, co znovu vstupuje do event loop - udelat na to test - - spravit kwallet + - spravit tdewallet blokovat uzivatelsky vstup, jako to dela kapp pro dcop diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am index 4c7c6e10c..a1525f1e2 100644 --- a/twin/clients/keramik/Makefile.am +++ b/twin/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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kde_module_LTLIBRARIES = twin3_keramik.la diff --git a/twin/clients/kwmtheme/cli_installer/Makefile.am b/twin/clients/kwmtheme/cli_installer/Makefile.am index 1541c1742..d311639e8 100644 --- a/twin/clients/kwmtheme/cli_installer/Makefile.am +++ b/twin/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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/twin/killer/Makefile.am b/twin/killer/Makefile.am index cd396bde7..74e8858aa 100644 --- a/twin/killer/Makefile.am +++ b/twin/killer/Makefile.am @@ -4,6 +4,6 @@ bin_PROGRAMS = twin_killer_helper twin_killer_helper_SOURCES = killer.cpp twin_killer_helper_LDADD = $(LIB_TDEUI) -twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/twin/tools/Makefile.am b/twin/tools/Makefile.am index 7bc1284a5..555b576c5 100644 --- a/twin/tools/Makefile.am +++ b/twin/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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test_gravity_LDADD = $(LIB_X11) METASOURCES = AUTO