diff options
304 files changed, 512 insertions, 512 deletions
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 @@ -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=<service> and/or individually by using --with-<prog>-pam=<service>, where <prog> 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.</para> <listitem><para>Click on the <guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click Action</guilabel> is set to <guilabel>Show file in embedded -viewer</guilabel>, and that <guilabel>KHTML (khtml)</guilabel> is at the top +viewer</guilabel>, and that <guilabel>KHTML (tdehtml)</guilabel> is at the top of <guilabel>Services Preference Order</guilabel>.</para></listitem> </orderedlist> </para> 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</glossseealso> <glossseealso otherterm="gloss-kde">&tde;</glossseealso> </glossdef> </glossentry> - <glossentry id="gloss-kparts"> + <glossentry id="gloss-tdeparts"> <glossterm>KParts</glossterm> <glossdef><para>KParts is an embedding technology which allows &tde; applications to embed other &tde; applications. For example, the text @@ -41,7 +41,7 @@ Slave</glossseealso> <glossseealso otherterm="gloss-konqueror">&konqueror;</glossseealso> </glossdef> </glossentry> - <glossentry id="gloss-ksycoca"> + <glossentry id="gloss-tdesycoca"> <glossterm><acronym>KSycoca</acronym></glossterm> <glossdef><para><acronym>KSycoca</acronym> (&tde; <emphasis>Sy</emphasis>stem <emphasis>Co</emphasis>nfiguration <emphasis>Ca</emphasis>che) is a @@ -88,7 +88,7 @@ program and regenerates the or all modules in &kcontrol; are missing.</para> <glossseealso -otherterm="gloss-ksycoca"><acronym>KSycoca</acronym></glossseealso> +otherterm="gloss-tdesycoca"><acronym>KSycoca</acronym></glossseealso> <glossseealso otherterm="gloss-kcontrol">&kcontrol;</glossseealso> </glossdef> </glossentry> 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.</para> <glossseealso otherterm="gloss-ioslave">IO Slave</glossseealso> - <glossseealso otherterm="gloss-kparts">KParts</glossseealso> + <glossseealso otherterm="gloss-tdeparts">KParts</glossseealso> </glossdef> </glossentry> 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.</para> <note><para>&konqueror;'s web browser functionality has its <ulink -url="help:/kcontrol/khtml/index.html">own configuration +url="help:/kcontrol/tdehtml/index.html">own configuration modules</ulink>.</para></note> <sect2 id="fileman-use"> 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.</para> <para>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;.</para> 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 @@ <title>Spell Checker</title> <para>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 <command>ispell</command> or <command>aspell</command>.</para> <variablelist> @@ -57,7 +57,7 @@ error.</para></listitem> <term><guilabel>Dictionary:</guilabel></term> <listitem> <para>Choose from the available dictionaries, which one to use for -&kspell;.</para> +&tdespell;.</para> </listitem> </varlistentry> diff --git a/doc/kcontrol/khtml/CMakeLists.txt b/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 index 386df55fd..b8df24598 100644 --- a/doc/kcontrol/khtml/index.docbook +++ b/doc/kcontrol/tdehtml/index.docbook @@ -305,7 +305,7 @@ creates one.</para> </sect2> -<sect2 id="khtml-adblock"> +<sect2 id="tdehtml-adblock"> <title>AdBlocK</title> <para>&konqueror; AdBlocK can be configured to replace or remove diff --git a/doc/kcontrol/khtml/nsplugin.docbook b/doc/kcontrol/tdehtml/nsplugin.docbook index 958a8f1a1..958a8f1a1 100644 --- a/doc/kcontrol/khtml/nsplugin.docbook +++ b/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</para> Toolbars...</guimenuitem></menuchoice> option, which brings up the <guilabel>Configure Toolbars</guilabel> 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.</para> 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</systemitem> user (already previously done!)</para></step> <step><para>Create/configure an <acronym>IMAP</acronym> account in &kmail; -for login as that user</para></step> <step><para>Use kresources to make +for login as that user</para></step> <step><para>Use tderesources to make &kontact; components work with data taken from <acronym>IMAP</acronym> source</para></step> @@ -336,7 +336,7 @@ slow data updates.</para> <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the data source for it's various components. From the &kmenu;, choose <guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell -kresources</command></userinput>. In the combo box select +tderesources</command></userinput>. In the combo box select <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton> button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and press <guibutton>Use as Standard</guibutton> 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:</para> <varlistentry> <term><command>kded</command></term> <listitem><para>Generic service daemon.</para> -<para>Triggers <link linkend="ksycoca">Sycoca</link> database updates when +<para>Triggers <link linkend="tdesycoca">Sycoca</link> database updates when needed</para> </listitem> </varlistentry> @@ -1819,14 +1819,14 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename> (user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para> </sect2> -<sect2 id="ksycoca"> +<sect2 id="tdesycoca"> <title><application>KSycoca</application></title> <para><application>KSycoca</application> caches menu structure and information about all available applications. You can rebuild the database with <userinput><command>kbuildsycoca</command></userinput>. The database which is built lives in <filename -class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>. +class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>. It is automatically updated by <application>KDED</application>, checked during &tde; login, and <application>KDED</application> watches for changes while logged in.</para> @@ -1839,7 +1839,7 @@ CheckSycoca=false </programlisting> </para> -<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para> +<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_tdesycoca</command></userinput>.</para> </sect2> @@ -2031,7 +2031,7 @@ shell_access=false</screen> <para>Since this affects the &tde; menu and the available applications, we must force an update of the sycoca database:</para> -<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen> +<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_tdesycoca</filename></userinput></screen> <para>Now re-login to &tde; and check the following points:</para> @@ -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. <!-- comment out for final commit before freeze <chapter id="tde-office-embedding"> <title>Component Embedding</title> -<sect1 id="tde-office-kparts"> +<sect1 id="tde-office-tdeparts"> <title>KParts and &koffice;</title> <para>To be written</para> </sect1> diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am index a07f140d0..cd56bce26 100644 --- a/drkonqi/Makefile.am +++ b/drkonqi/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE bin_PROGRAMS = drkonqi crashtest # Libraries: -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_TDEUI) $(LIB_KIO) # toplevel.cpp must be last in row due to X-headers being included. (--enable-final) diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am index 819754681..fb79b8f5d 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_TDEUI) $(LIB_KIO) -kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_PROGRAMS = kappfinder_install kappfinder_install_SOURCES = main_install.cpp common.cpp kappfinder_install_LDADD = $(LIB_TDEUI) -kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor INCLUDES = $(all_includes) METASOURCES = AUTO diff --git a/kate/AUTHORS b/kate/AUTHORS index e8e6716c2..c2e6cb35e 100644 --- a/kate/AUTHORS +++ b/kate/AUTHORS @@ -27,7 +27,7 @@ Kate/KWrite Team: (original author of kwrite in kde 1.x until kde 2.1) - Glen Parker <glenebob@nwlink.com> - (undo history, kspell-integration) + (undo history, tdespell-integration) - Michael Koch <koch@kde.org> (port to KParts) diff --git a/kate/ChangeLog b/kate/ChangeLog index e97ab3515..f971110c8 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -1,18 +1,18 @@ 2004-04-22 Christoph Cullmann <cullmann@kde.org> - * kate switched over to katemdi, even smaller replacement for kmdi2 :) + * kate switched over to katemdi, even smaller replacement for tdemdi2 :) 2004-10-06 Christoph Cullmann <cullmann@kde.org> - * kate switched over to kmdi2, a slim version of old kmdi + * kate switched over to tdemdi2, a slim version of old tdemdi which allows only IDEA mode, but should be much less buggy - beside this, we now allow tabbing thx to the new kmdi stuff + beside this, we now allow tabbing thx to the new tdemdi stuff and therefor should now be really feature complete at least mdi wise, having the features to allow multiple main windows, tabbing, splitters, widget stacks for the views, now only missing thingy - would be to allow non kate view's to be embeded, like a khtml widget for + would be to allow non kate view's to be embeded, like a tdehtml widget for documentation browsing or something like that 2003-08-28 Christoph Cullmann <cullmann@kde.org> - * jowenn switch kate over to use kmdi, seems to work well + * jowenn switch kate over to use tdemdi, seems to work well for the first port, but still needs some fixes ;) 2002-07-19 Christoph Cullmann <cullmann@kde.org> diff --git a/kate/app/CMakeLists.txt b/kate/app/CMakeLists.txt index 8c2d1515f..7adea8ea3 100644 --- a/kate/app/CMakeLists.txt +++ b/kate/app/CMakeLists.txt @@ -46,7 +46,7 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 0.0.0 EMBED kateinterfacesprivate-static - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kate/app/kateconfigdialog.h b/kate/app/kateconfigdialog.h index b80be2354..8704753ab 100644 --- a/kate/app/kateconfigdialog.h +++ b/kate/app/kateconfigdialog.h @@ -27,7 +27,7 @@ #include "../interfaces/pluginconfiginterfaceextension.h" #include <kate/document.h> -#include <ktexteditor/configinterfaceextension.h> +#include <tdetexteditor/configinterfaceextension.h> #include <kdialogbase.h> diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 6ff64dc93..26627181a 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -31,7 +31,7 @@ #include <kde_terminal_interface.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kurl.h> #include <klibloader.h> diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index 8e895e019..9b9a223d0 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -28,9 +28,9 @@ #include <kate/view.h> -#include <ktexteditor/encodinginterface.h> +#include <tdetexteditor/encodinginterface.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <klocale.h> #include <kdebug.h> diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index e0967695e..953a5f313 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -73,7 +73,7 @@ #include <kurldrag.h> #include <kdesktopfile.h> #include <khelpmenu.h> -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <ktip.h> #include <kmenubar.h> #include <kstringhandler.h> @@ -209,7 +209,7 @@ void KateMainWindow::setupMainWindow () m_viewManager = new KateViewManager (this); - KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("kmultiple"), i18n("Documents")); + KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("tdemultiple"), i18n("Documents")); filelist = new KateFileList (this, m_viewManager, ft, "filelist"); filelist->readConfig(KateApp::self()->config(), "Filelist"); diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h index f6b20dfa5..ac31671db 100644 --- a/kate/app/katemainwindow.h +++ b/kate/app/katemainwindow.h @@ -27,7 +27,7 @@ #include <kate/view.h> #include <kate/document.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kaction.h> diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index e4649e7f4..148d57ea9 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -21,9 +21,9 @@ #ifndef __KATE_MDI_H__ #define __KATE_MDI_H__ -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> -#include <kmultitabbar.h> +#include <tdemultitabbar.h> #include <kxmlguiclient.h> #include <kaction.h> diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index 8d1c49753..2f0fe3aa5 100644 --- a/kate/app/katesavemodifieddialog.cpp +++ b/kate/app/katesavemodifieddialog.cpp @@ -32,7 +32,7 @@ #include <kmessagebox.h> #include <kdebug.h> #include <kencodingfiledialog.h> -#include <ktexteditor/encodinginterface.h> +#include <tdetexteditor/encodinginterface.h> class AbstractKateSaveModifiedDialogCheckListItem:public TQCheckListItem { public: diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 296c083b2..0e7e15cb5 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -45,7 +45,7 @@ #include <kglobalsettings.h> #include <kstdaccel.h> -#include <ktexteditor/encodinginterface.h> +#include <tdetexteditor/encodinginterface.h> #include <tqobjectlist.h> #include <tqstringlist.h> diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index d68c42724..059178746 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -46,7 +46,7 @@ #include <kglobalsettings.h> #include <kstringhandler.h> -#include <ktexteditor/encodinginterface.h> +#include <tdetexteditor/encodinginterface.h> #include <tqlayout.h> #include <tqobjectlist.h> @@ -120,7 +120,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc ) view->actionCollection()->remove (view->actionCollection()->action( "set_confdlg" )); // popup menu - view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("ktexteditor_popup", mainWindow())) ); + view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) ); connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg())); connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg())); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 114cfb6a4..6fca303bb 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -24,13 +24,13 @@ #include <kate/document.h> #include <kate/view.h> -#include <ktexteditor/configinterface.h> -#include <ktexteditor/sessionconfiginterface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/printinterface.h> -#include <ktexteditor/encodinginterface.h> -#include <ktexteditor/editorchooser.h> -#include <ktexteditor/popupmenuinterface.h> +#include <tdetexteditor/configinterface.h> +#include <tdetexteditor/sessionconfiginterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/printinterface.h> +#include <tdetexteditor/encodinginterface.h> +#include <tdetexteditor/editorchooser.h> +#include <tdetexteditor/popupmenuinterface.h> #include <kio/netaccess.h> @@ -54,7 +54,7 @@ #include <kmessagebox.h> #include <kkeydialog.h> #include <kedittoolbar.h> -#include <kparts/event.h> +#include <tdeparts/event.h> #include <kmenubar.h> #include <tqdropsite.h> @@ -108,7 +108,7 @@ KWrite::KWrite (KTextEditor::Document *doc) // install a working kate part popup dialog thingy if (static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))) - static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("tdetexteditor_popup", this)) ); // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h index 0d0ee79f0..52e34c568 100644 --- a/kate/app/kwritemain.h +++ b/kate/app/kwritemain.h @@ -21,10 +21,10 @@ #ifndef __KWRITE_MAIN_H__ #define __KWRITE_MAIN_H__ -#include <ktexteditor/view.h> -#include <ktexteditor/document.h> +#include <tdetexteditor/view.h> +#include <tdetexteditor/document.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kdialogbase.h> diff --git a/kate/data/kateui.rc b/kate/data/kateui.rc index 6e784e92e..5368c26c4 100644 --- a/kate/data/kateui.rc +++ b/kate/data/kateui.rc @@ -135,7 +135,7 @@ <DefineGroup name="zoom_operations" /> </ToolBar> -<Menu name="ktexteditor_popup" noMerge="1"> +<Menu name="tdetexteditor_popup" noMerge="1"> <DefineGroup name="popup_operations" /> </Menu> diff --git a/kate/data/kwriteui.rc b/kate/data/kwriteui.rc index 7272cb4fa..9a41f43d1 100644 --- a/kate/data/kwriteui.rc +++ b/kate/data/kwriteui.rc @@ -88,7 +88,7 @@ <DefineGroup name="zoom_operations" /> </ToolBar> -<Menu name="ktexteditor_popup" noMerge="1"> +<Menu name="tdetexteditor_popup" noMerge="1"> <DefineGroup name="popup_operations" /> </Menu> diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am index a832c7515..96bef52db 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor 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/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index b57d4bac0..d68724549 100644 --- a/kate/interfaces/plugin.cpp +++ b/kate/interfaces/plugin.cpp @@ -21,7 +21,7 @@ #include "plugin.h" #include "plugin.moc" -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> namespace Kate { diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h index 42803db7c..00932c5ff 100644 --- a/kate/interfaces/plugin.h +++ b/kate/interfaces/plugin.h @@ -56,7 +56,7 @@ KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application /* * view plugin class - * this plugin will be bound to a ktexteditor::view + * this plugin will be bound to a tdetexteditor::view */ class KDE_EXPORT PluginViewInterface { diff --git a/kcheckpass/README b/kcheckpass/README index cb517b3d2..181c4c531 100644 --- a/kcheckpass/README +++ b/kcheckpass/README @@ -45,7 +45,7 @@ Olaf Kirch <okir@caldera.de> General Framework and PAM support Christian Esken <esken@kde.org> Shadow and /etc/passwd support Oswald Buddenhagen <ossi@kde.org> Binary conversation interface, etc. -Some parts were taken from kscreensaver's passwd.cpp +Some parts were taken from tdescreensaver's passwd.cpp Currently this software is maintained by Oswald Buddenhagen <ossi@kde.org>. Please send new authentication modules (checkpass_*.c) to me. diff --git a/kcheckpass/kcheckpass.c b/kcheckpass/kcheckpass.c index 75e972760..9b6b7abd7 100644 --- a/kcheckpass/kcheckpass.c +++ b/kcheckpass/kcheckpass.c @@ -41,7 +41,7 @@ * Roberto Teixeira <maragato@kde.org> other user (-U) support * Oswald Buddenhagen <ossi@kde.org> Binary server mode * - * Other parts were taken from kscreensaver's passwd.cpp. + * Other parts were taken from tdescreensaver's passwd.cpp. * *****************************************************************/ diff --git a/kcheckpass/kcheckpass.h b/kcheckpass/kcheckpass.h index 5aaebf2da..e1351375a 100644 --- a/kcheckpass/kcheckpass.h +++ b/kcheckpass/kcheckpass.h @@ -31,7 +31,7 @@ * Christian Esken <esken@kde.org> Shadow and /etc/passwd support * Oswald Buddenhagen <ossi@kde.org> Binary server mode * - * Other parts were taken from kscreensaver's passwd.cpp + * Other parts were taken from tdescreensaver's passwd.cpp *****************************************************************/ #ifndef KCHECKPASS_H_ diff --git a/kcminit/CMakeLists.txt b/kcminit/CMakeLists.txt index d379930ab..6f8450ed0 100644 --- a/kcminit/CMakeLists.txt +++ b/kcminit/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( tde_add_tdeinit_executable( kcminit AUTOMOC SOURCES main.cpp main.skel - LINK kutils-shared + LINK tdeutils-shared ) @@ -33,5 +33,5 @@ tde_add_tdeinit_executable( kcminit AUTOMOC tde_add_tdeinit_executable( kcminit_startup AUTOMOC SOURCES main.cpp main.skel - LINK kutils-shared + LINK tdeutils-shared ) diff --git a/kcontrol/arts/CMakeLists.txt b/kcontrol/arts/CMakeLists.txt index 616b62070..aaf41edaa 100644 --- a/kcontrol/arts/CMakeLists.txt +++ b/kcontrol/arts/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_arts AUTOMOC SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp - LINK kio-shared kmid-shared + LINK kio-shared tdemid-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/arts/Makefile.am b/kcontrol/arts/Makefile.am index f4b68cfa1..3959f3109 100644 --- a/kcontrol/arts/Makefile.am +++ b/kcontrol/arts/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -lkmid +kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes) diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 86086cbd9..11002cb7f 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -48,7 +48,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kurlrequester.h> -#include <libkmid/deviceman.h> +#include <libtdemid/deviceman.h> #include "arts.h" @@ -158,7 +158,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) general = new generalTab(tab); hardware = new hardwareTab(tab); //mixer = TDECModuleLoader::loadModule("kmixcfg", tab); - //midi = new KMidConfig(tab, "kmidconfig"); + //midi = new KMidConfig(tab, "tdemidconfig"); general->layout()->setMargin( KDialog::marginHint() ); hardware->layout()->setMargin( KDialog::marginHint() ); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 164616c14..3aed1a6fd 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -311,7 +311,7 @@ wp_load: goto wp_out; } - // _Don't_ use KMimeType, as it relies on ksycoca which we really + // _Don't_ use KMimeType, as it relies on tdesycoca which we really // don't want in krootimage (tdm context). //if ( KMimeType::findByPath( file )->is( "image/svg+xml" ) ) { if (file.endsWith(".svg") || file.endsWith(".svgz")) { @@ -399,7 +399,7 @@ wp_load: } // HACK: Use KFileMetaInfo only when we're attached to DCOP. - // KFileMetaInfo needs ksycoca and so on, but this code is + // KFileMetaInfo needs tdesycoca and so on, but this code is // used also in krootimage (which in turn is used by tdm). if( kapp->dcopClient()->isAttached()) { KFileMetaInfo metaInfo(file); diff --git a/kcontrol/componentchooser/componentservices/Makefile.am b/kcontrol/componentchooser/componentservices/Makefile.am index eea682ff8..3ba55cc0c 100644 --- a/kcontrol/componentchooser/componentservices/Makefile.am +++ b/kcontrol/componentchooser/componentservices/Makefile.am @@ -1,3 +1,3 @@ -kcm_ktexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop -kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser +kcm_tdetexteditor_DATA = kcm_kemail.desktop kcm_terminal.desktop kcm_browser.desktop +kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser diff --git a/kcontrol/display/CMakeLists.txt b/kcontrol/display/CMakeLists.txt index cef021e03..84bcb2dfe 100644 --- a/kcontrol/display/CMakeLists.txt +++ b/kcontrol/display/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES display.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_display AUTOMOC SOURCES display.cpp - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/display/display.desktop b/kcontrol/display/display.desktop index 6c8d1c08b..a8d0bd5dc 100644 --- a/kcontrol/display/display.desktop +++ b/kcontrol/display/display.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=kscreensaver +Icon=tdescreensaver Type=Application Exec=kcmshell display DocPath=kcontrol/kcmdisplay/index.html diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt index 9f5192b9e..774743329 100644 --- a/kcontrol/displayconfig/CMakeLists.txt +++ b/kcontrol/displayconfig/CMakeLists.txt @@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO tde_add_kpart( kcm_displayconfig AUTOMOC SOURCES monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel - LINK kio-shared krandr-shared kutils-shared + LINK kio-shared tderandr-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/displayconfig/Makefile.am b/kcontrol/displayconfig/Makefile.am index 55fabd507..a2c2607e4 100644 --- a/kcontrol/displayconfig/Makefile.am +++ b/kcontrol/displayconfig/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_displayconfig.la kcm_displayconfig_la_SOURCES = displayconfig.cpp displayconfigbase.ui displayconfig.skel -kcm_displayconfig_la_LDFLAGS = $(all_libraries) -lkrandr -module -avoid-version -no-undefined +kcm_displayconfig_la_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined kcm_displayconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index af3e971ee..3591bd93d 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -34,7 +34,7 @@ #include <dcopobject.h> -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #include <tdehardwaredevices.h> #include "monitorworkspace.h" diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt index bb9050274..e0036ba24 100644 --- a/kcontrol/dnssd/CMakeLists.txt +++ b/kcontrol/dnssd/CMakeLists.txt @@ -22,15 +22,15 @@ link_directories( ##### other data ################################ -install( FILES kcm_kdnssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kcm_kdnssd (module) ####################### +##### kcm_tdednssd (module) ####################### set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" ) -tde_add_kpart( kcm_kdnssd AUTOMOC +tde_add_kpart( kcm_tdednssd AUTOMOC SOURCES configdialog.ui kcmdnssd.cpp - LINK kdnssd-shared tdeui-shared + LINK tdednssd-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am index ef6292a94..da4ffdb5d 100644 --- a/kcontrol/dnssd/Makefile.am +++ b/kcontrol/dnssd/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = kcm_kdnssd.la -kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) -kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h +kde_module_LTLIBRARIES = kcm_tdednssd.la +kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) +kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h -xdg_apps_DATA = kcm_kdnssd.desktop -kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI) +xdg_apps_DATA = kcm_tdednssd.desktop +kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI) messages: rc.cpp $(EXTRACTRC) *.ui *.rc >> rc.cpp - $(XGETTEXT) $(kcm_kdnssd_la_SOURCES) rc.cpp -o $(podir)/kcmkdnssd.pot + $(XGETTEXT) $(kcm_tdednssd_la_SOURCES) rc.cpp -o $(podir)/kcmtdednssd.pot diff --git a/kcontrol/dnssd/kcm_kdnssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop index e62c4ce01..ffa16d753 100644 --- a/kcontrol/dnssd/kcm_kdnssd.desktop +++ b/kcontrol/dnssd/kcm_tdednssd.desktop @@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá Comment[wa]=Apontiaedjes do discovraedje do siervice Comment[zh_CN]=配置探索服务 Comment[zh_TW]=設定服務偵測 -Exec=kcmshell kcm_kdnssd +Exec=kcmshell kcm_tdednssd GenericName= GenericName[ko]=일반 Icon=network_local @@ -146,7 +146,7 @@ Terminal=false Type=Application X-DCOP-ServiceType= X-TDE-HasReadOnlyMode=false -X-TDE-Library=kdnssd +X-TDE-Library=tdednssd X-TDE-ModuleType=Library X-TDE-ParentApp=kcontrol #root parts unused with Avahi diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 37940be95..6ef87a6c0 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -34,7 +34,7 @@ #include <klocale.h> #include <kglobal.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kprocess.h> #include <klineedit.h> #include <kpassdlg.h> @@ -51,12 +51,12 @@ #define MDNSD_PID "/var/run/mdnsd.pid" typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd")) +K_EXPORT_COMPONENT_FACTORY( kcm_tdednssd, KCMDnssdFactory("kcmtdednssd")) KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) : ConfigDialog(parent, name), m_wdchanged(false) { - setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"), + setAboutData(new TDEAboutData(I18N_NOOP("kcm_tdednssd"), I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL, I18N_NOOP("(C) 2004,2005 Jakub Stachowski"))); setQuickHelp(i18n("Setup services browsing with ZeroConf")); @@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file - domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); + domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" )); domain->setGroup("publishing"); load(); connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am index 21752d05c..31a1d60a2 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor messages: $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index a678e0eb2..abb973580 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -235,7 +235,7 @@ void FileTypeDetails::updateAskSave() // - images (reasoning: no need to save, most of the time, because fast to see) // e.g. postscript is different, because takes longer to read, so // it's more likely that the user might want to save it. - // - multipart/* ("server push", see kmultipart) + // - multipart/* ("server push", see tdemultipart) // - other strange 'internal' mimetypes like print/manager... if ( mime->is( "text/html" ) || mime->is( "text/xml" ) || diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 07b023532..d641a18b0 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -22,7 +22,7 @@ #include "filetypedetails.h" #include "filegroupdetails.h" #include "filetypesview.h" -#include <ksycoca.h> +#include <tdesycoca.h> FileTypesView::FileTypesView(TQWidget *p, const char *name) : TDECModule(p, name) @@ -418,7 +418,7 @@ void FileTypesView::slotDatabaseChanged() { if ( KSycoca::self()->isChanged( "mime" ) ) { - // ksycoca has new KMimeTypes objects for us, make sure to update + // tdesycoca has new KMimeTypes objects for us, make sure to update // our 'copies' to be in sync with it. Not important for OK, but // important for Apply (how to differentiate those 2?). // See BR 35071. diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 2750e8aab..d568a43fd 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -26,7 +26,7 @@ #include <kaboutdata.h> #include <kdebug.h> #include <kcmdlineargs.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <kstandarddirs.h> #ifdef Q_WS_X11 diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h index 671604961..baaff242e 100644 --- a/kcontrol/filetypes/typeslistitem.h +++ b/kcontrol/filetypes/typeslistitem.h @@ -89,7 +89,7 @@ public: bool isDirty() const; void sync(); void setup(); - void refresh(); // update m_mimetype from ksycoca when Apply is pressed + void refresh(); // update m_mimetype from tdesycoca when Apply is pressed static bool defaultEmbeddingSetting( const TQString& major ); static void reset(); diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt index 74f4c6c5c..de5a8905a 100644 --- a/kcontrol/iccconfig/CMakeLists.txt +++ b/kcontrol/iccconfig/CMakeLists.txt @@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI tde_add_kpart( kcm_iccconfig AUTOMOC SOURCES iccconfig.cpp iccconfigbase.ui iccconfig.skel - LINK kio-shared krandr-shared + LINK kio-shared tderandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/iccconfig/Makefile.am b/kcontrol/iccconfig/Makefile.am index 9d8aec569..098e5aae1 100644 --- a/kcontrol/iccconfig/Makefile.am +++ b/kcontrol/iccconfig/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_iccconfig.la 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_LDFLAGS = $(all_libraries) -ltderandr -module -avoid-version -no-undefined kcm_iccconfig_la_LIBADD = -ltdeui $(LIB_KIO) $(LIB_XRANDR) diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index 74fe1b49d..1f8408e8f 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -27,7 +27,7 @@ #include <dcopobject.h> -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #include "iccconfigbase.h" diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt index 401d1d25c..b5eeb1ddd 100644 --- a/kcontrol/kcontrol/CMakeLists.txt +++ b/kcontrol/kcontrol/CMakeLists.txt @@ -44,7 +44,7 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK khtml-shared + LINK tdehtml-shared ) tde_install_symlink( kcontrol ${BIN_INSTALL_DIR}/kinfocenter ) diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 12db9e615..54db1588c 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -30,7 +30,7 @@ #include <kpixmapeffect.h> #include <kcursor.h> #include <kglobalsettings.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kapplication.h> #include <kiconloader.h> diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index 14cb8ee58..c3d64c7b0 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -39,7 +39,7 @@ #include <kconfig.h> #include <kio/job.h> #ifdef HAVE_XFT -#include <kparts/part.h> +#include <tdeparts/part.h> #endif class KDirOperator; diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 03158eff7..0d05799d9 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -475,7 +475,7 @@ TQDragObject *CKFileFontView::dragObject() urls.append( (*it)->url() ); if(urls.count()> 1) - pixmap = DesktopIcon("kmultiple", KIcon::SizeSmall); + pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall); if(pixmap.isNull()) pixmap = currentFileItem()->pixmap(KIcon::SizeSmall); diff --git a/kcontrol/kfontinst/viewpart/CMakeLists.txt b/kcontrol/kfontinst/viewpart/CMakeLists.txt index 630d1aff4..7fb621fec 100644 --- a/kcontrol/kfontinst/viewpart/CMakeLists.txt +++ b/kcontrol/kfontinst/viewpart/CMakeLists.txt @@ -33,7 +33,7 @@ install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/k tde_add_kpart( libkfontviewpart AUTOMOC SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp - LINK kfontinstprint-static kfontinst-shared kparts-shared + LINK kfontinstprint-static kfontinst-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -42,7 +42,7 @@ tde_add_kpart( libkfontviewpart AUTOMOC tde_add_executable( kfontview AUTOMOC SOURCES FontViewerApp.cpp - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h index 21de2e074..1e4500c5a 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.h +++ b/kcontrol/kfontinst/viewpart/FontViewPart.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2002, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include <kparts/part.h> +#include <tdeparts/part.h> class TQPushButton; class TQFrame; diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.h b/kcontrol/kfontinst/viewpart/FontViewerApp.h index 0364e0bbd..150c8ccab 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.h +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.h @@ -30,8 +30,8 @@ //////////////////////////////////////////////////////////////////////////////// #include <kapplication.h> -#include <kparts/part.h> -#include <kparts/mainwindow.h> +#include <tdeparts/part.h> +#include <tdeparts/mainwindow.h> namespace KFI { diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am index 011f057ec..dc6bbd115 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor bin_PROGRAMS = kfontview xdg_apps_DATA = kfontview.desktop diff --git a/kcontrol/kicker/CMakeLists.txt b/kcontrol/kicker/CMakeLists.txt index e0746d5b4..648df7c2a 100644 --- a/kcontrol/kicker/CMakeLists.txt +++ b/kcontrol/kicker/CMakeLists.txt @@ -77,6 +77,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK bgnd-static kickermain-shared kutils-shared + LINK bgnd-static kickermain-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/kio/CMakeLists.txt index 79be7a766..aa0d185e3 100644 --- a/kcontrol/kio/CMakeLists.txt +++ b/kcontrol/kio/CMakeLists.txt @@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui - LINK kio-shared kutils-shared + LINK kio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index bc9c63cc5..f8e97e573 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -31,7 +31,7 @@ #include <kcombobox.h> #include <kconfig.h> #include <knotifydialog.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstandarddirs.h> #include <kurlcompletion.h> #include <kurlrequester.h> diff --git a/kcontrol/konq/CMakeLists.txt b/kcontrol/konq/CMakeLists.txt index b77e3bf93..d7b12811f 100644 --- a/kcontrol/konq/CMakeLists.txt +++ b/kcontrol/konq/CMakeLists.txt @@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC behaviour.cpp desktop.cpp desktopbehavior_impl.cpp previews.cpp browser.cpp main.cpp rootopts.cpp fontopts.cpp desktopbehavior.ui - LINK kio-shared kutils-shared + LINK kio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/konqhtml/CMakeLists.txt b/kcontrol/konqhtml/CMakeLists.txt index 77f295aae..097ba8221 100644 --- a/kcontrol/konqhtml/CMakeLists.txt +++ b/kcontrol/konqhtml/CMakeLists.txt @@ -24,8 +24,8 @@ link_directories( ##### other data ################################ install( FILES - khtml_behavior.desktop khtml_java_js.desktop - khtml_fonts.desktop khtml_filter.desktop + tdehtml_behavior.desktop tdehtml_java_js.desktop + tdehtml_fonts.desktop tdehtml_filter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( @@ -36,7 +36,7 @@ install( install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Settings/WebBrowsing - RENAME khtml_appearance.desktop ) + RENAME tdehtml_appearance.desktop ) ##### kcm_konqhtml (module) ##################### @@ -48,6 +48,6 @@ tde_add_kpart( kcm_konqhtml AUTOMOC jspolicies.cpp nsconfigwidget.ui policies.cpp domainlistview.cpp advancedTabOptions.ui filteropts.cpp - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/konqhtml/Makefile.am b/kcontrol/konqhtml/Makefile.am index a16c324e4..151e22aff 100644 --- a/kcontrol/konqhtml/Makefile.am +++ b/kcontrol/konqhtml/Makefile.am @@ -13,9 +13,9 @@ 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 -ltdeui +kcm_konqhtml_la_LIBADD = -ltdehtml -ltdeui -xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop +xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot @@ -23,4 +23,4 @@ messages: rc.cpp install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/tdehtml_appearance.desktop diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 78619d818..163bdd4f4 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -14,7 +14,7 @@ #include <kdialog.h> #include <kfontcombo.h> #include <kglobal.h> -#include <khtmldefaults.h> +#include <tdehtmldefaults.h> #include <klocale.h> #include <knuminput.h> @@ -320,15 +320,15 @@ void KAppearanceOptions::load() void KAppearanceOptions::load( bool useDefaults ) { - TDEConfig khtmlrc("khtmlrc", true, false); + TDEConfig tdehtmlrc("tdehtmlrc", true, false); m_pConfig->setReadDefaults( useDefaults ); - khtmlrc.setReadDefaults( useDefaults ); + tdehtmlrc.setReadDefaults( useDefaults ); -#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x) -#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y)) -#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y)) -#define READ_LIST(x) m_pConfig->readListEntry(x, khtmlrc.readListEntry(x)) +#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x) +#define READ_NUM(x,y) m_pConfig->readNumEntry(x, tdehtmlrc.readNumEntry(x, y)) +#define READ_ENTRY(x,y) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x, y)) +#define READ_LIST(x) m_pConfig->readListEntry(x, tdehtmlrc.readListEntry(x)) SET_GROUP(m_groupname); fSize = READ_NUM( "MediumFontSize", 12 ); @@ -348,7 +348,7 @@ void KAppearanceOptions::load( bool useDefaults ) if (m_pConfig->hasKey("Fonts")) fonts = m_pConfig->readListEntry( "Fonts" ); else - fonts = khtmlrc.readListEntry( "Fonts" ); + fonts = tdehtmlrc.readListEntry( "Fonts" ); while (fonts.count() < 7) fonts.append(TQString::null); diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 153692082..ada8f31a6 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -230,13 +230,13 @@ void KMiscHTMLOptions::load() void KMiscHTMLOptions::load( bool useDefaults ) { - TDEConfig khtmlrc("khtmlrc", true, false); - khtmlrc.setReadDefaults( useDefaults ); + TDEConfig tdehtmlrc("tdehtmlrc", true, false); + tdehtmlrc.setReadDefaults( useDefaults ); m_pConfig->setReadDefaults( useDefaults ); -#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x) -#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y)) -#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x)) +#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x) +#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, tdehtmlrc.readBoolEntry(x, y)) +#define READ_ENTRY(x) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x)) // *** load *** diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 68b20fd2f..617f79f6f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <klineedit.h> #include <klocale.h> -#include <khtml_settings.h> +#include <tdehtml_settings.h> #include <knuminput.h> #include <tqlayout.h> diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index 7f3e400fa..3f434e682 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -25,7 +25,7 @@ #include <tqgroupbox.h> #include <tqstring.h> -#include <khtml_settings.h> +#include <tdehtml_settings.h> #include "policies.h" diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 35a958b46..45559809b 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -43,33 +43,33 @@ extern "C" { - KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KMiscHTMLOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KAppearanceOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KJSParts(c, parent, "kcmkonqhtml"); } - KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KPluginOptions(c, "Java/JavaScript Settings", parent, name); } - KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name ) + KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name ) { - TDEConfig *c = new TDEConfig( "khtmlrc", false, false ); + TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false ); return new KCMFilter(c, "Filter Settings", parent, name); } } diff --git a/kcontrol/konqhtml/khtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop index a4cb670ba..01488fad4 100644 --- a/kcontrol/konqhtml/khtml_behavior.desktop +++ b/kcontrol/konqhtml/tdehtml_behavior.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/khtml/index.html#kbrowse-html +DocPath=kcontrol/tdehtml/index.html#kbrowse-html Icon=konqueror -Exec=kcmshell khtml_behavior +Exec=kcmshell tdehtml_behavior X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_behavior +X-TDE-FactoryName=tdehtml_behavior Name=Web Behavior Name[af]=Web Gedrag diff --git a/kcontrol/konqhtml/khtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop index ac56dcc15..e23404714 100644 --- a/kcontrol/konqhtml/khtml_filter.desktop +++ b/kcontrol/konqhtml/tdehtml_filter.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/khtml/index.html#khtml-adblock +DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock Icon=filter -Exec=kcmshell khtml_filter +Exec=kcmshell tdehtml_filter X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_filter +X-TDE-FactoryName=tdehtml_filter Name=AdBlocK Filters Name[af]=Advertensie blok filters diff --git a/kcontrol/konqhtml/khtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop index 468899be9..341508848 100644 --- a/kcontrol/konqhtml/khtml_fonts.desktop +++ b/kcontrol/konqhtml/tdehtml_fonts.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/khtml/index.html#kbrowse-appearance +DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance Icon=fonts -Exec=kcmshell khtml_fonts +Exec=kcmshell tdehtml_fonts X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_fonts +X-TDE-FactoryName=tdehtml_fonts Name=Fonts Name[af]=Skriftipes diff --git a/kcontrol/konqhtml/khtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop index 3a29299d6..e0477c0e6 100644 --- a/kcontrol/konqhtml/khtml_java_js.desktop +++ b/kcontrol/konqhtml/tdehtml_java_js.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/khtml/index.html#kbrowse-java +DocPath=kcontrol/tdehtml/index.html#kbrowse-java Icon=konqueror -Exec=kcmshell khtml_java_js +Exec=kcmshell tdehtml_java_js X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_java_js +X-TDE-FactoryName=tdehtml_java_js Name=Java & JavaScript Name[af]=Java & Javaskrip diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index f4b7835bb..4a4817041 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -398,7 +398,7 @@ void kthememanager::queryLNFModules() dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) ); dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) ); dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) ); - dlg->btnSaver->setIconSet( il->loadIconSet( "kscreensaver", KIcon::Desktop, 32 ) ); + dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) ); } void kthememanager::updatePreview( const TQString & pixFile ) diff --git a/kcontrol/pics/cr128-app-kscreensaver.png b/kcontrol/pics/cr128-app-tdescreensaver.png Binary files differindex e8f036fe3..e8f036fe3 100644 --- a/kcontrol/pics/cr128-app-kscreensaver.png +++ b/kcontrol/pics/cr128-app-tdescreensaver.png diff --git a/kcontrol/pics/cr16-app-kscreensaver.png b/kcontrol/pics/cr16-app-tdescreensaver.png Binary files differindex 200fe3dcc..200fe3dcc 100644 --- a/kcontrol/pics/cr16-app-kscreensaver.png +++ b/kcontrol/pics/cr16-app-tdescreensaver.png diff --git a/kcontrol/pics/cr22-app-kscreensaver.png b/kcontrol/pics/cr22-app-tdescreensaver.png Binary files differindex 7448fe237..7448fe237 100644 --- a/kcontrol/pics/cr22-app-kscreensaver.png +++ b/kcontrol/pics/cr22-app-tdescreensaver.png diff --git a/kcontrol/pics/cr32-app-kscreensaver.png b/kcontrol/pics/cr32-app-tdescreensaver.png Binary files differindex f527126bc..f527126bc 100644 --- a/kcontrol/pics/cr32-app-kscreensaver.png +++ b/kcontrol/pics/cr32-app-tdescreensaver.png diff --git a/kcontrol/pics/cr48-app-kscreensaver.png b/kcontrol/pics/cr48-app-tdescreensaver.png Binary files differindex 749f42253..749f42253 100644 --- a/kcontrol/pics/cr48-app-kscreensaver.png +++ b/kcontrol/pics/cr48-app-tdescreensaver.png diff --git a/kcontrol/pics/cr64-app-kscreensaver.png b/kcontrol/pics/cr64-app-tdescreensaver.png Binary files differindex 69c8214fb..69c8214fb 100644 --- a/kcontrol/pics/cr64-app-kscreensaver.png +++ b/kcontrol/pics/cr64-app-tdescreensaver.png diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 3367bbaa1..e4433ff8f 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -103,7 +103,7 @@ bool KPrivacyManager::clearSavedClipboardContents() bool KPrivacyManager::clearFormCompletion() const { - TQFile completionFile(locateLocal("data", "khtml/formcompletions")); + TQFile completionFile(locateLocal("data", "tdehtml/formcompletions")); return completionFile.remove(); } diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 3e816f2fb..d1f31af8c 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -22,26 +22,26 @@ link_directories( ##### other data ################################ -install( FILES krandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tderandrtray.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES randr.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) -install( FILES krandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +install( FILES tderandrtray-autostart.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) ##### kcm_randr (module) ######################## tde_add_kpart( kcm_randr AUTOMOC - SOURCES krandrmodule.cpp - LINK tdeui-shared krandr-shared + SOURCES tderandrmodule.cpp + LINK tdeui-shared tderandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### krandrtray (executable) ################### +##### tderandrtray (executable) ################### -tde_add_executable( krandrtray AUTOMOC +tde_add_executable( tderandrtray AUTOMOC SOURCES - main.cpp krandrtray.cpp krandrapp.cpp - krandrpassivepopup.cpp configdialog.cpp - LINK kutils-shared krandr-shared + main.cpp tderandrtray.cpp tderandrapp.cpp + tderandrpassivepopup.cpp configdialog.cpp + LINK tdeutils-shared tderandr-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am index fb55f8da7..d1f137140 100644 --- a/kcontrol/randr/Makefile.am +++ b/kcontrol/randr/Makefile.am @@ -5,32 +5,32 @@ kde_module_LTLIBRARIES = kcm_randr.la METASOURCES = AUTO -kcm_randr_la_SOURCES = krandrmodule.cpp +kcm_randr_la_SOURCES = tderandrmodule.cpp kcm_randr_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined kcm_randr_la_LIBADD = $(LIB_TDEUI) $(LIB_XRANDR) -noinst_HEADERS = krandrmodule.h krandrtray.h krandrapp.h \ - krandrpassivepopup.h configdialog.h +noinst_HEADERS = tderandrmodule.h tderandrtray.h tderandrapp.h \ + tderandrpassivepopup.h configdialog.h -xdg_apps_DATA = krandrtray.desktop +xdg_apps_DATA = tderandrtray.desktop -krandr_data_DATA = randr.desktop -krandr_datadir = $(kde_appsdir)/.hidden +tderandr_data_DATA = randr.desktop +tderandr_datadir = $(kde_appsdir)/.hidden # Autostart autostartdir = $(prefix)/share/autostart -autostart_DATA = krandrtray-autostart.desktop +autostart_DATA = tderandrtray-autostart.desktop #install-data-local: uninstall.desktop # $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/Desktop # $(INSTALL_DATA) $(srcdir)/uninstall.desktop -# $(DESTDIR)$(kde_appsdir)/Settings/Desktop/krandrmodule.desktop +# $(DESTDIR)$(kde_appsdir)/Settings/Desktop/tderandrmodule.desktop -bin_PROGRAMS = krandrtray +bin_PROGRAMS = tderandrtray -krandrtray_SOURCES = main.cpp krandrtray.cpp krandrapp.cpp krandrpassivepopup.cpp configdialog.cpp -krandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkrandr -krandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR) +tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp +tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr +tderandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR) messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/krandr.pot + $(XGETTEXT) *.cpp -o $(podir)/tderandr.pot diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 708587527..f2344f1c0 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -31,7 +31,7 @@ #include <kpopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "configdialog.h" @@ -42,7 +42,7 @@ ConfigDialog::ConfigDialog(TDEGlobalAccel *accel, Ok, 0L, "config dialog" ) { if ( isApplet ) - setHelp( TQString::null, "krandrtray" ); + setHelp( TQString::null, "tderandrtray" ); TQFrame *w = 0L; // the parent for the widgets diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index 1e8edc83e..d606940fc 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -24,9 +24,9 @@ #include <kaboutdata.h> #include <kglobal.h> -#include "krandrapp.h" +#include "tderandrapp.h" -static const char krandrtrayVersion[] = "0.5"; +static const char tderandrtrayVersion[] = "0.5"; static const KCmdLineOptions options[] = { { "login", I18N_NOOP("Application is being auto-started at TDE session start"), 0L }, @@ -35,12 +35,12 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, ""); + TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), tderandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, ""); aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Developer and maintainer"), "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "rodda@kde.org"); aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "l.lunak@suse.cz"); - aboutData.setProductName("krandr/krandrtray"); - TDEGlobal::locale()->setMainCatalogue("krandr"); + aboutData.setProductName("tderandr/tderandrtray"); + TDEGlobal::locale()->setMainCatalogue("tderandr"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/tderandrapp.cpp index f5cfbbde1..e2a4b46f2 100644 --- a/kcontrol/randr/krandrapp.cpp +++ b/kcontrol/randr/tderandrapp.cpp @@ -18,10 +18,10 @@ #include <kdebug.h> -#include "krandrapp.h" -#include "krandrapp.moc" +#include "tderandrapp.h" +#include "tderandrapp.moc" -#include "krandrtray.h" +#include "tderandrtray.h" #include <X11/Xlib.h> diff --git a/kcontrol/randr/krandrapp.h b/kcontrol/randr/tderandrapp.h index 766b0056c..766b0056c 100644 --- a/kcontrol/randr/krandrapp.h +++ b/kcontrol/randr/tderandrapp.h diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index d71057748..b7df41602 100644 --- a/kcontrol/randr/krandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -26,7 +26,7 @@ #endif #define WIN KKey::QtWIN - keys->insert( "Program:krandrtray", i18n("Display Control") ); + keys->insert( "Program:tderandrtray", i18n("Display Control") ); DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() ); diff --git a/kcontrol/randr/krandrinithack.cpp b/kcontrol/randr/tderandrinithack.cpp index e69de29bb..e69de29bb 100644 --- a/kcontrol/randr/krandrinithack.cpp +++ b/kcontrol/randr/tderandrinithack.cpp diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index 3eaf46f8b..9da8a569b 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -36,15 +36,15 @@ #include <kglobal.h> #include <klocale.h> -#include "krandrmodule.h" -#include "krandrmodule.moc" +#include "tderandrmodule.h" +#include "tderandrmodule.moc" #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> // DLL Interface for kcontrol typedef KGenericFactory<KRandRModule, TQWidget > KSSFactory; -K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("krandr") ) +K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") ) extern "C" { diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/tderandrmodule.h index 53d428fe1..188b4ea1d 100644 --- a/kcontrol/randr/krandrmodule.h +++ b/kcontrol/randr/tderandrmodule.h @@ -19,7 +19,7 @@ #ifndef KRANDRMODULE_H #define KRANDRMODULE_H -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> class TQButtonGroup; class KComboBox; diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index 12d9f8a3f..16e3d75ba 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "krandrpassivepopup.h" +#include "tderandrpassivepopup.h" #include <kapplication.h> @@ -115,4 +115,4 @@ void KRandrPassivePopup::slotPositionSelf() positionSelf(); } -#include "krandrpassivepopup.moc" +#include "tderandrpassivepopup.moc" diff --git a/kcontrol/randr/krandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h index 3b1d4b4f6..3b1d4b4f6 100644 --- a/kcontrol/randr/krandrpassivepopup.h +++ b/kcontrol/randr/tderandrpassivepopup.h diff --git a/kcontrol/randr/krandrtray-autostart.desktop b/kcontrol/randr/tderandrtray-autostart.desktop index 0273a80cc..1c3f20403 100644 --- a/kcontrol/randr/krandrtray-autostart.desktop +++ b/kcontrol/randr/tderandrtray-autostart.desktop @@ -134,11 +134,11 @@ Comment[vi]=Đổi cỡ và quay màn hình X. Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X. Comment[zh_CN]=更改 X 屏幕的大小和旋转。 Comment[zh_TW]=調整大小及旋轉 X 螢幕。 -Exec=krandrtray +Exec=tderandrtray Icon=randr X-TDE-autostart-after=panel X-TDE-StartupNotify=false X-TDE-UniqueApplet=true -X-TDE-autostart-condition=krandrtrayrc:General:Autostart:true +X-TDE-autostart-condition=tderandrtrayrc:General:Autostart:true Categories=System;Applet; diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index f30e3102a..42151d87e 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -39,9 +39,9 @@ #include "configdialog.h" -#include "krandrtray.h" -#include "krandrpassivepopup.h" -#include "krandrtray.moc" +#include "tderandrtray.h" +#include "tderandrpassivepopup.h" +#include "tderandrtray.moc" #define OUTPUT_CONNECTED (1 << 0) #define OUTPUT_UNKNOWN (1 << 1) @@ -63,7 +63,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) //printf("Reading configuration...\n\r"); globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); TDEGlobalAccel* keys = globalKeys; -#include "krandrbindings.cpp" +#include "tderandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc globalKeys->readSettings(); globalKeys->setEnabled(true); @@ -95,12 +95,12 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) } /*! - * \b TQT_SLOT which called if krandrtray is exited by the user. In this case the user + * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the * result is written to the KDE configfile. */ void KRandRSystemTray::_quit (){ - r_config = new KSimpleConfig("krandrtrayrc"); + r_config = new KSimpleConfig("tderandrtrayrc"); TQString tmp1 = i18n ("Start KRandRTray automatically when you log in?"); int tmp2 = KMessageBox::questionYesNo ( 0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); diff --git a/kcontrol/randr/krandrtray.desktop b/kcontrol/randr/tderandrtray.desktop index a61f8c28c..5479287b4 100644 --- a/kcontrol/randr/krandrtray.desktop +++ b/kcontrol/randr/tderandrtray.desktop @@ -134,7 +134,7 @@ Comment[vi]=Đổi cỡ và quay màn hình X. Comment[wa]=Candjî l' grandeu eyet tourner les waitroûles X. Comment[zh_CN]=更改 X 屏幕的大小和旋转。 Comment[zh_TW]=調整大小及旋轉 X 螢幕。 -Exec=krandrtray +Exec=tderandrtray Icon=randr Type=Application OnlyShowIn=TDE; diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/tderandrtray.h index 8a910f373..320f0cb1c 100644 --- a/kcontrol/randr/krandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -24,7 +24,7 @@ #include <ksystemtray.h> #include <kglobalaccel.h> -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #include <tdehardwaredevices.h> class KHelpMenu; diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop index f111fb676..566a8c506 100644 --- a/kcontrol/screensaver/screensaver.desktop +++ b/kcontrol/screensaver/screensaver.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=kcmshell screensaver -Icon=kscreensaver +Icon=tdescreensaver Type=Application DocPath=kcontrol/screensaver/index.html diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 4efb38e90..ba3c0eb66 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -506,7 +506,7 @@ void KScreenSaver::findSavers() TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); if ( !categoryItem ) { categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() ); - categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) ); + categoryItem->setPixmap ( 0, SmallIcon ( "tdescreensaver" ) ); } item = new TQListViewItem ( categoryItem, s->name(), s->name() ); categoryCount++; @@ -712,7 +712,7 @@ void KScreenSaver::slotSetup() (*mSetupProc) << word; word = "-icon"; (*mSetupProc) << word; - word = "kscreensaver"; + word = "tdescreensaver"; (*mSetupProc) << word; } diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 68aa0cac8..26a2d1535 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kdialog.h> #include <kgenericfactory.h> -#include <kspell.h> +#include <tdespell.h> #include "spellchecking.h" diff --git a/kdepasswd/Makefile.am b/kdepasswd/Makefile.am index 1459a26b6..3a5c6e626 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdepasswd_LDADD = $(LIB_KIO) METASOURCES = AUTO diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index b2e462853..b9751944b 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -69,7 +69,7 @@ tde_add_executable( kcheckrunning tde_add_executable( kxdglauncher SOURCES kxdglauncher.cpp - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -92,7 +92,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kdesktopsettings-static bgnd-static dmctl-static - konq-shared kutils-shared + konq-shared tdeutils-shared ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl ${XSS_LIBRARIES} ) diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake index da78021ff..87e2213ce 100644 --- a/kdesktop/ConfigureChecks.cmake +++ b/kdesktop/ConfigureChecks.cmake @@ -9,7 +9,7 @@ # ################################################# -# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "kscreensaver"? +# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "tdescreensaver"? if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) ) set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" ) diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 6c5c97eaf..073a69a5a 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -51,7 +51,7 @@ #include <klocale.h> #include <kio/netaccess.h> #include <kprocess.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <ktempfile.h> #include <kmessagebox.h> #include <kglobalaccel.h> diff --git a/kdesktop/kwebdesktop/CMakeLists.txt b/kdesktop/kwebdesktop/CMakeLists.txt index 3df328c0c..741b8df34 100644 --- a/kdesktop/kwebdesktop/CMakeLists.txt +++ b/kdesktop/kwebdesktop/CMakeLists.txt @@ -37,6 +37,6 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am index 45634b174..2d0d21bdb 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 58fd0b7b8..ff60d0fd6 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -33,7 +33,7 @@ #include <tqscrollview.h> #include "kwebdesktop.h" #include <kmimetype.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "kwebdesktopsettings.h" #include "kwebdesktop.moc" @@ -129,7 +129,7 @@ int main( int argc, char **argv ) TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold. delete webDesktop; delete run; - //khtml::Cache::clear(); + //tdehtml::Cache::clear(); return ret; } diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h index 089a25673..2641378cf 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.h +++ b/kdesktop/kwebdesktop/kwebdesktop.h @@ -21,8 +21,8 @@ #include <tqobject.h> #include <tqcstring.h> -#include <kparts/browserextension.h> -#include <khtml_part.h> +#include <tdeparts/browserextension.h> +#include <tdehtml_part.h> namespace TDEIO { class Job; } diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am index 158541a6f..5b6ccfd21 100644 --- a/kdesktop/lock/Makefile.am +++ b/kdesktop/lock/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kdesktop/lock INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes) -kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB) ####### Files diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am index e9a784006..6340ce37d 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/kfind/CMakeLists.txt b/kfind/CMakeLists.txt index 91ed980f5..4162c1319 100644 --- a/kfind/CMakeLists.txt +++ b/kfind/CMakeLists.txt @@ -57,5 +57,5 @@ tde_add_executable( kfind AUTOMOC tde_add_library( kfind_common STATIC_PIC AUTOMOC SOURCES kftabdlg.cpp kfind.cpp kquery.cpp kdatecombo.cpp - LINK kparts-shared + LINK tdeparts-shared ) diff --git a/kfind/Makefile.am b/kfind/Makefile.am index dacae8ba3..fed64f027 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 482400d50..3f71bdfbd 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -21,7 +21,7 @@ #include "kfindpart.h" #include "kquery.h" -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kdebug.h> #include <klocale.h> diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index b2a8156c5..fe343879a 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -20,8 +20,8 @@ #ifndef kfindpart__h #define kfindpart__h -#include <kparts/browserextension.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/part.h> #include <kfileitem.h> #include <kdebug.h> #include <tqptrlist.h> diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index f5ec0a55b..6145e18c1 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -24,7 +24,7 @@ #include <kmessagebox.h> #include <kfiledialog.h> #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kstandarddirs.h> #include "kquery.h" diff --git a/khelpcenter/CMakeLists.txt b/khelpcenter/CMakeLists.txt index 795eb39dd..279ecd389 100644 --- a/khelpcenter/CMakeLists.txt +++ b/khelpcenter/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_tdeinit_executable( khelpcenter AUTOMOC kcmhelpcenter.cpp htmlsearchconfig.cpp kcmhelpcenter.skel fontdialog.cpp plugintraverser.cpp scrollkeepertreebuilder.cpp prefs.kcfgc searchhandler.cpp - LINK khtml-shared + LINK tdehtml-shared ) diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am index 272a4d4e8..dcf2c973d 100644 --- a/khelpcenter/Makefile.am +++ b/khelpcenter/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO bin_PROGRAMS = khc_indexbuilder lib_LTLIBRARIES = -khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor khc_indexbuilder_LDADD = $(LIB_TDECORE) khc_indexbuilder_SOURCES = khc_indexbuilder.cpp @@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \ EXTRA_PROGRAMS = testmetainfo -testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \ docentrytraverser.lo htmlsearch.lo testmetainfo_SOURCES = testmetainfo.cpp diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index 7699ddd49..e20ec598e 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kconfig.h> #include <kfontcombo.h> -#include <khtmldefaults.h> +#include <tdehtmldefaults.h> #include <klocale.h> #include <knuminput.h> diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am index f0459d339..132be449b 100644 --- a/khelpcenter/htmlsearch/Makefile.am +++ b/khelpcenter/htmlsearch/Makefile.am @@ -21,14 +21,14 @@ noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h xdg_apps_DATA = htmlsearch.desktop -bin_PROGRAMS = khtmlindex +bin_PROGRAMS = tdehtmlindex wrapperdir = $(kde_datadir)/khelpcenter/ wrapper_SCRIPTS = meinproc_wrapper -khtmlindex_SOURCES = index.cpp -khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -khtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI) +tdehtmlindex_SOURCES = index.cpp +tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI) xpm_DATA = unchecked.xpm checked.xpm xpmdir = $(kde_datadir)/khelpcenter/pics diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index 82bf23689..3cc356d52 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -15,7 +15,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - TDEAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"), + TDEAboutData aboutData( "tdehtmlindex", I18N_NOOP("KHtmlIndex"), "", I18N_NOOP("TDE Index generator for help files.")); diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 588be7142..0fdfde831 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -336,7 +336,7 @@ void KHTMLSearchConfig::generateIndex() { save(); - TQString exe = kapp->dirs()->findExe("khtmlindex"); + TQString exe = kapp->dirs()->findExe("tdehtmlindex"); if (exe.isEmpty()) return; diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 56aec0179..7dc1fbcf3 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -35,8 +35,8 @@ #include <krun.h> #include <kaboutdata.h> #include <kdebug.h> -#include <khtmlview.h> -#include <khtml_settings.h> +#include <tdehtmlview.h> +#include <tdehtml_settings.h> #include <kaction.h> #include <kstatusbar.h> #include <kstdaccel.h> diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h index 7e2d8b0b7..92b6b10cd 100644 --- a/khelpcenter/mainwindow.h +++ b/khelpcenter/mainwindow.h @@ -6,7 +6,7 @@ #include <kmainwindow.h> #include <kio/job.h> #include <kurl.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <dcopclient.h> #include <dcopobject.h> diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 5e29114bc..bfe430eaf 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -9,8 +9,8 @@ #include <kactioncollection.h> #include <kapplication.h> #include <kdebug.h> -#include <khtml_settings.h> -#include <khtmlview.h> +#include <tdehtml_settings.h> +#include <tdehtmlview.h> #include <klocale.h> #include <kpopupmenu.h> #include <kstandarddirs.h> diff --git a/khelpcenter/view.h b/khelpcenter/view.h index 3af2a15b8..7d7c1001b 100644 --- a/khelpcenter/view.h +++ b/khelpcenter/view.h @@ -1,7 +1,7 @@ #ifndef __view_h__ #define __view_h__ -#include <khtml_part.h> +#include <tdehtml_part.h> #include "glossary.h" #include "navigator.h" diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt index dab1a8c95..bf5111658 100644 --- a/kicker/applets/launcher/CMakeLists.txt +++ b/kicker/applets/launcher/CMakeLists.txt @@ -44,7 +44,7 @@ tde_add_kpart( launcher_panelapplet AUTOMOC -Wl,--start-group kicker_core-static kicker_buttons-static kicker_ui-static -Wl,--end-group - kickermain-shared kutils-shared kabc-shared + kickermain-shared tdeutils-shared kabc-shared DEPENDENCIES libkicker-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 0eebec315..5b1ff44ca 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <kdesktopfile.h> #include <kglobalsettings.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kservicegroup.h> diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index 314f71ff1..e186aad17 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kasbar_LDADD = libkasbar.la \ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index fe5acd1bb..1bbb7d99a 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -20,8 +20,8 @@ #include <kmessagebox.h> #include <kglobal.h> #include <klocale.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> #include <tqlayout.h> #include <konq_historymgr.h> #include <krun.h> diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 4d0d1646b..5a117b1ee 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -19,7 +19,7 @@ #include <kpanelextension.h> #include <kurl.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> class TQHBoxLayout; class TQVBox; diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt index 5ec37ac53..313187cee 100644 --- a/kicker/kicker/CMakeLists.txt +++ b/kicker/kicker/CMakeLists.txt @@ -54,5 +54,5 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy 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 + LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared tdeutils-shared ) diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 0ec70bc93..30c31401d 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kconfig.h> #include <kdebug.h> #include <kglobal.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kpanelapplet.h> #include <kurldrag.h> diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index 02c4718d4..a544d0f74 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kservicegroup.h> #include <kstandarddirs.h> diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 431b62e6c..3d33a825a 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -62,7 +62,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <twin.h> #include <kdebug.h> #include <kmimetype.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include "client_mnu.h" #include "container_base.h" diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index eba68ed1c..6f2c4eacb 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -75,7 +75,7 @@ #include <dcopref.h> #include <konq_popupmenu.h> #include <konqbookmarkmanager.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "client_mnu.h" #include "container_base.h" diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 6432cf032..1e77a1731 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kprocess.h> #include <krun.h> #include <kservicegroup.h> -#include <ksycoca.h> -#include <ksycocaentry.h> +#include <tdesycoca.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kurldrag.h> #include <kio/job.h> diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 44e35a6c2..dbc8f496c 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <set> #include <tqvaluevector.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> #include <kservice.h> #include <kpanelmenu.h> #include <kservicegroup.h> diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index fd7bf1952..fdcbacf8f 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klibloader.h> #include <kstandarddirs.h> #include <kpanelmenu.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> MenuInfo::MenuInfo(const TQString& desktopFile) { diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 827b0e40c..03e53682b 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kservice.h> #include <kservicegroup.h> #include <kstandarddirs.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <kurl.h> #include <kurldrag.h> diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h index d673fceef..10befe6b2 100644 --- a/kicker/menuext/prefmenu/prefmenu.h +++ b/kicker/menuext/prefmenu/prefmenu.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqmap.h> #include <kpanelmenu.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> typedef TQMap<int, KSycocaEntry::Ptr> EntryMap; typedef TQPtrList<TQPopupMenu> PopupMenuList; diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 19ff376f4..100045339 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -49,7 +49,7 @@ using namespace std; #include <kservicegroup.h> #include <kstandarddirs.h> #include <kstdaction.h> -#include <ksycocaentry.h> +#include <tdesycocaentry.h> #include "menuinfo.h" #include "service_mnu.h" diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am index 4a7cf1e4c..4dacc51f8 100644 --- a/kicker/proxy/Makefile.am +++ b/kicker/proxy/Makefile.am @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am index 900596fa3..df887e150 100644 --- a/kioslave/about/Makefile.am +++ b/kioslave/about/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/about 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 ####### Files diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am index 2baac8d65..55066bf74 100644 --- a/kioslave/finger/Makefile.am +++ b/kioslave/finger/Makefile.am @@ -2,7 +2,7 @@ ## Edit from Makefile.am of tdebase/kioslave/man 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 ####### Files diff --git a/kioslave/fish/Makefile.am b/kioslave/fish/Makefile.am index 8a7028f5d..bf7169bcf 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_fish_la_SOURCES = fish.cpp kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) diff --git a/kioslave/mac/Makefile.am b/kioslave/mac/Makefile.am index d294975b0..37c94589e 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ####### Files diff --git a/kioslave/man/CMakeLists.txt b/kioslave/man/CMakeLists.txt index 6532f0cbf..09434d131 100644 --- a/kioslave/man/CMakeLists.txt +++ b/kioslave/man/CMakeLists.txt @@ -55,6 +55,6 @@ set( target libkmanpart ) tde_add_kpart( ${target} AUTOMOC SOURCES kmanpart.cpp - LINK khtml-shared kparts-shared + LINK tdehtml-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am index 1904c24a6..80d9ffa96 100644 --- a/kioslave/man/Makefile.am +++ b/kioslave/man/Makefile.am @@ -1,14 +1,14 @@ ## Makefile.am of tdebase/kioslave/man 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 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ####### Files @@ -22,7 +22,7 @@ noinst_HEADERS = kio_man.h ### TODO Why is man2htmk.h distributed? libkmanpart_la_SOURCES = kmanpart.cpp -libkmanpart_la_LIBADD = -lkhtml $(LIB_KPARTS) +libkmanpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) kdelnk_DATA = man.protocol kmanpart.desktop @@ -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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor dummy.cpp: echo > $@ diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index dd290cf75..971a48550 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -21,10 +21,10 @@ #ifndef KMANPART_H #define KMANPART_H -#include <kparts/factory.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> -#include <khtml_part.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdehtml_part.h> #include <kio/job.h> #include <kio/jobclasses.h> diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am index d3fb942bb..934559d40 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am index 5dc730d7d..6dcb5ed3e 100644 --- a/kioslave/nfs/Makefile.am +++ b/kioslave/nfs/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/man 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 ####### Files diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am index c59c1c210..abbb91323 100644 --- a/kioslave/sftp/Makefile.am +++ b/kioslave/sftp/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/sftp 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 METASOURCES = AUTO ####### Files diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am index d1f3cdf05..d77b2abf9 100644 --- a/kioslave/tar/Makefile.am +++ b/kioslave/tar/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/tar 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 METASOURCES = AUTO kde_module_LTLIBRARIES = kio_tar.la diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt index eb50589ab..9000b3494 100644 --- a/kioslave/thumbnail/CMakeLists.txt +++ b/kioslave/thumbnail/CMakeLists.txt @@ -85,7 +85,7 @@ set( target htmlthumbnail ) tde_add_kpart( ${target} AUTOMOC SOURCES htmlcreator.cpp - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am index 5a63c88bb..ecd2e492b 100644 --- a/kioslave/thumbnail/Makefile.am +++ b/kioslave/thumbnail/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/kioslave/thumbnail INCLUDES = $(all_includes) $(EXR_FLAGS) -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 METASOURCES = AUTO if have_xcursor diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp index 43aec5f39..a928e4253 100644 --- a/kioslave/thumbnail/htmlcreator.cpp +++ b/kioslave/thumbnail/htmlcreator.cpp @@ -23,7 +23,7 @@ #include <tqimage.h> #include <tqpainter.h> #include <kapplication.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include "htmlcreator.h" diff --git a/kioslave/trash/Makefile.am b/kioslave/trash/Makefile.am index a3f24ed92..94b7ab519 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kde_services_DATA = trash.protocol diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 2fcc23352..99f30841d 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -31,7 +31,7 @@ #include <kpopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "configdialog.h" diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp index 18fd72536..0d54ce44c 100644 --- a/klipper/historyurlitem.cpp +++ b/klipper/historyurlitem.cpp @@ -19,7 +19,7 @@ */ #include "historyurlitem.h" -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kurldrag.h> HistoryURLItem::HistoryURLItem( const KURL::List &_urls, TQMap<TQString, TQString> _metaData, bool _cut ) diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 41740499c..e0f2234c9 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -46,7 +46,7 @@ #include <kapplication.h> #include <kservice.h> #include <kservicegroup.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kurldrag.h> #include "treeview.h" diff --git a/knetattach/Makefile.am b/knetattach/Makefile.am index 07d356e06..f6eecd6da 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor knetattach_LDADD = $(LIB_KIO) METASOURCES = AUTO xdg_apps_DATA = knetattach.desktop diff --git a/knetattach/TODO b/knetattach/TODO index f4651b767..3eef23e14 100644 --- a/knetattach/TODO +++ b/knetattach/TODO @@ -1,4 +1,4 @@ - add a browser for SMB? - plugin / desktop file interface for adding more protocols -- integrate kdnssd? +- integrate tdednssd? diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt index e257145ec..83d75d646 100644 --- a/konqueror/CMakeLists.txt +++ b/konqueror/CMakeLists.txt @@ -108,7 +108,7 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqueror_intern-static konq-shared kutils-shared + LINK konqueror_intern-static konq-shared tdeutils-shared ) diff --git a/konqueror/DESIGN b/konqueror/DESIGN index 459ade9c8..45ff6e47f 100644 --- a/konqueror/DESIGN +++ b/konqueror/DESIGN @@ -39,7 +39,7 @@ dirtree/* : KonqDirTree, the directory tree Libs used by konqueror ====================== -tdecore, tdeui, kfile, khtml, kparts - usual stuff :) +tdecore, tdeui, kfile, tdehtml, tdeparts - usual stuff :) libkio - I/O stuff, mimetypes, services libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget @@ -83,7 +83,7 @@ when the loading is completed, and right before loading another URL). Reason: among other things, many views store the x and y offset of their scrollview in there. It calls restoreState() when restoring a particular item out of the history list. -From the khtml side: +From the tdehtml side: * Site with no frames: no problem, it just obeys to saveState/restoreState. @@ -91,9 +91,9 @@ From the khtml side: KHTMLPart saves the whole structure (all frames, and their URL) in the history buffer (saveState/restoreState). Every time a frame changes its URL, we want a new item in the history. -But when this happens, since it's internal to khtml, konqueror wouldn't know +But when this happens, since it's internal to tdehtml, konqueror wouldn't know about it. That's why there is the openURLNotify() signal in browser extension (see there for extensive docu about it). -When khtml emits it, KonqView creates a new history entry and fills it +When tdehtml emits it, KonqView creates a new history entry and fills it (calling saveState). diff --git a/konqueror/DESIGN_config b/konqueror/DESIGN_config index ee6abf206..bcd07f7dc 100644 --- a/konqueror/DESIGN_config +++ b/konqueror/DESIGN_config @@ -27,7 +27,7 @@ builtin (to view READMEs) but c++, h, java, ... to my editor. And one that doesn't like embedded viewers (like Martin ;)) can set defaults to 'no' without having to change all mimetypes (text, c, c++, ...) -but still use libkhtml for HTML pages, by setting 'use builtin' in the +but still use libtdehtml for HTML pages, by setting 'use builtin' in the mimetype text/html - this is the way to keep the exact (though inconsistent) behaviour of 1.1-kfm. diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am index 3d723a6bb..aa9e0d7ae 100644 --- a/konqueror/Makefile.am +++ b/konqueror/Makefile.am @@ -60,7 +60,7 @@ konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) #check_PROGRAMS = konqueror_static # #konqueror_static_SOURCES = dummy.cc -#konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la +#konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libtdehtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static messages: rc.cpp diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt index 55e8f4462..5eb9cc0f6 100644 --- a/konqueror/about/CMakeLists.txt +++ b/konqueror/about/CMakeLists.txt @@ -39,6 +39,6 @@ set( target konq_aboutpage ) tde_add_kpart( ${target} AUTOMOC SOURCES konq_aboutpage.cc - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index c87b5dbfd..fed36a1e2 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -281,12 +281,12 @@ TQString KonqAboutPageFactory::specs() .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") ) .arg( i18n("built-in") ) .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) - .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) - .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! + .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) + .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support").arg("http://java.sun.com") ) .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)") .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") ) - .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? + .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ? .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)") .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") .arg("http://www.real.com").arg("http://www.real.com") diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index 96229c42c..d9513d5d3 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -1,8 +1,8 @@ #ifndef __konq_aboutpage_h__ #define __konq_aboutpage_h__ -#include <kparts/factory.h> -#include <khtml_part.h> +#include <tdeparts/factory.h> +#include <tdehtml_part.h> class KHTMLPart; class TDEInstance; diff --git a/konqueror/client/kfmclient_3_2_update.sh b/konqueror/client/kfmclient_3_2_update.sh index 6c3adbd15..6933a99fe 100644 --- a/konqueror/client/kfmclient_3_2_update.sh +++ b/konqueror/client/kfmclient_3_2_update.sh @@ -5,7 +5,7 @@ while read ln; do continue fi if test "$ln" = "StartNewKonqueror=Local only"; then - echo "SafeParts=khtml.desktop" + echo "SafeParts=tdehtml.desktop" elif test "$ln" = "StartNewKonqueror=Web only"; then echo "SafeParts=SAFE" elif test "$ln" = "StartNewKonqueror=Always" \ diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 78f6472c6..b5848dd8c 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -36,7 +36,7 @@ #include <konq_settings.h> #include <kpropertiesdialog.h> #include <kstdaction.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <ktrader.h> #include <klocale.h> #include <kivdirectoryoverlay.h> diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 107c83ca3..425f54d1d 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -19,7 +19,7 @@ #ifndef __konq_iconview_h__ #define __konq_iconview_h__ -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <konq_iconviewwidget.h> #include <konq_operations.h> #include <konq_dirpart.h> diff --git a/konqueror/keditbookmarks/DESIGN b/konqueror/keditbookmarks/DESIGN index 9ef300f81..723a279d7 100644 --- a/konqueror/keditbookmarks/DESIGN +++ b/konqueror/keditbookmarks/DESIGN @@ -11,7 +11,7 @@ various other thingies: exporters : forwarders to kio/bookmarks code, and html export code dcop : dcop handling, internal interface bookmarkiterator : is a baseclass for iterating actions, of sorts... - updater : favicon updating base stuff - kio/khtml crap + updater : favicon updating base stuff - kio/tdehtml crap testlink : link testing stuff 3 different selection styles: diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am index 4da0053a6..681e1ab14 100644 --- a/konqueror/keditbookmarks/Makefile.am +++ b/konqueror/keditbookmarks/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = tdeinit_LTLIBRARIES = keditbookmarks.la kbookmarkmerger_SOURCES = kbookmarkmerger.cpp -kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kbookmarkmerger_LDADD = $(LIB_KIO) dcop_DCOPIDLNG = true diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 75f96ed18..4bcd50735 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -55,8 +55,8 @@ #include <ktempfile.h> #include <kstandarddirs.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> #include <kicondialog.h> #include <kiconloader.h> diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h index 97894d741..3be46d35f 100644 --- a/konqueror/keditbookmarks/favicons.h +++ b/konqueror/keditbookmarks/favicons.h @@ -24,8 +24,8 @@ #include <kbookmark.h> #include <konq_faviconmgr.h> -#include <kparts/part.h> -#include <kparts/browserinterface.h> +#include <tdeparts/part.h> +#include <tdeparts/browserinterface.h> #include "bookmarkiterator.h" diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index ee2b6d3b6..4060b08a8 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -32,9 +32,9 @@ #include <kio/job.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/browserextension.h> FavIconUpdater::FavIconUpdater(TQObject *parent, const char *name) : KonqFavIconMgr(parent, name) { @@ -123,7 +123,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); } -// khtml callback +// tdehtml callback void FavIconUpdater::setIconURL(const KURL &iconURL) { setIconForURL(m_bk.url(), iconURL); } diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index 454b51672..44a19af40 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -24,8 +24,8 @@ #include <kbookmark.h> #include <konq_faviconmgr.h> -#include <kparts/part.h> -#include <kparts/browserinterface.h> +#include <tdeparts/part.h> +#include <tdeparts/browserinterface.h> class FavIconWebGrabber : public QObject { diff --git a/konqueror/konq_browseriface.h b/konqueror/konq_browseriface.h index e21d0a9ec..1564a73e2 100644 --- a/konqueror/konq_browseriface.h +++ b/konqueror/konq_browseriface.h @@ -1,7 +1,7 @@ #ifndef __konq_browseriface_h__ #define __konq_browseriface_h__ -#include <kparts/browserinterface.h> +#include <tdeparts/browserinterface.h> class KonqView; diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index c252cd0dc..b07135366 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -651,7 +651,7 @@ void KonqCombo::setPageSecurity( int pageSecurity ) bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) { - // Taken from khtml/misc/helper.cc + // Taken from tdehtml/misc/helper.cc #define HUE_DISTANCE 40 #define CONTRAST_DISTANCE 10 diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index ef53fd684..120f36e4e 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -20,8 +20,8 @@ #include <kconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kparts/componentfactory.h> -#include <kparts/plugin.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/plugin.h> #include <kplugininfo.h> #include <kpluginselector.h> #include <ksettings/dispatcher.h> @@ -60,7 +60,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai d->activePart = activePart; // There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins) - // have their config in the same TDEConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. + // have their config in the same TDEConfig[Group]. So we can't show konqueror extensions and tdehtml extensions in the same tab. d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config()); if ( activePart ) { TDEInstance* instance = activePart->instance(); diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index a61ae8068..4f7fdf842 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -19,7 +19,7 @@ */ -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include "konq_factory.h" #include "version.h" diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index 4307defb9..d856dbfa6 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -28,7 +28,7 @@ #include <klibloader.h> #include <ktrader.h> -#include <kparts/part.h> +#include <tdeparts/part.h> class BrowserView; class KonqMainWindow; diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index f6451155b..09ea92c87 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -88,7 +88,7 @@ #include <kstdaccel.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <ktempfile.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> @@ -3875,13 +3875,13 @@ void KonqMainWindow::initActions() m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << "kde-filepreviews.desktop" << "tde-filetypes.desktop" << - "tde-khtml_behavior.desktop" << "tde-khtml_java_js.desktop" << - "tde-khtml_filter.desktop" << - "tde-khtml_fonts.desktop" << "tde-ebrowsing.desktop" << + "tde-tdehtml_behavior.desktop" << "tde-tdehtml_java_js.desktop" << + "tde-tdehtml_filter.desktop" << + "tde-tdehtml_fonts.desktop" << "tde-ebrowsing.desktop" << "tde-kcmhistory.desktop" << "tde-cookies.desktop" << "tde-cache.desktop" << "tde-proxy.desktop" << "tde-kcmcss.desktop" << "tde-crypto.desktop" << "tde-useragent.desktop" << - "tde-khtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop"; + "tde-tdehtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop"; if (!kapp->authorizeControlModules(configModules()).isEmpty()) diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index fe016b18c..bb850195b 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -30,7 +30,7 @@ #include <kfileitem.h> #include "konq_openurlrequest.h" -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kbookmarkmanager.h> #include <kcompletion.h> #include <kurlcompletion.h> diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h index bab4ca853..ada1712c5 100644 --- a/konqueror/konq_misc.h +++ b/konqueror/konq_misc.h @@ -24,7 +24,7 @@ // konq_main.cc #include <krun.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> class KonqMainWindow; class KonqView; diff --git a/konqueror/konq_openurlrequest.h b/konqueror/konq_openurlrequest.h index dffc0025d..3e0f65e2d 100644 --- a/konqueror/konq_openurlrequest.h +++ b/konqueror/konq_openurlrequest.h @@ -3,7 +3,7 @@ #include <tqstringlist.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> struct KonqOpenURLRequest { diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h index 0fb97a1cf..a5539b993 100644 --- a/konqueror/konq_run.h +++ b/konqueror/konq_run.h @@ -20,7 +20,7 @@ #ifndef __kfm_run_h__ #define __kfm_run_h__ -#include <kparts/browserrun.h> +#include <tdeparts/browserrun.h> #include <tqguardedptr.h> #include <kservice.h> #include "konq_openurlrequest.h" diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index ffa12321c..c19438668 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -29,8 +29,8 @@ #include "konq_viewmgr.h" #include "konq_tabs.h" #include "konq_browseriface.h" -#include <kparts/statusbarextension.h> -#include <kparts/browserextension.h> +#include <tdeparts/statusbarextension.h> +#include <tdeparts/browserextension.h> #include <konq_historymgr.h> #include <konq_pixmapprovider.h> diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 0323bd504..766cfb799 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -29,7 +29,7 @@ #include <ktrader.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include "konq_openurlrequest.h" class TQString; diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index c4a82225f..0b0b9f640 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>khtmldefaults.h</include> + <include>tdehtmldefaults.h</include> <kcfgfile name="konquerorrc" /> @@ -283,18 +283,18 @@ <whatsthis></whatsthis> <!-- Can't find writeEntry --> </entry> -<!-- KDELIBS/khtml_part.cpp --> +<!-- KDELIBS/tdehtml_part.cpp --> <entry key="AutomaticDetectionLanguage" type="Int"> <!--KHTML--> <label></label> <whatsthis></whatsthis> </entry> -<!-- KDELIBS/khtml_settings.cpp --> +<!-- KDELIBS/tdehtml_settings.cpp --> <entry key="EnforceDefaultCharset" type="Bool"> <!--KHTML--> <label></label> <whatsthis></whatsthis> <!-- Can't find writeEntry --> </entry> -<!-- kcmcss.cpp KDELIBS/khtml_settings.cpp --> +<!-- kcmcss.cpp KDELIBS/tdehtml_settings.cpp --> <entry key="UserStyleSheetEnabled" type="Bool"> <!--KHTML--> <label></label> <whatsthis></whatsthis> 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 index e832bd27a..80b756a8b 100644 --- a/konqueror/kttsplugin/khtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include <khtml_part.h> // this plugin applies to a khtml part +#include <tdehtml_part.h> // this plugin applies to a tdehtml part #include <dom/html_document.h> #include <dom/html_element.h> #include <dom/dom_string.h> #include <kdebug.h> -#include "khtmlkttsd.h" +#include "tdehtmlkttsd.h" #include <kaction.h> #include <kgenericfactory.h> #include <kiconloader.h> @@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut() } } -K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("khtmlkttsd") ) +K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("tdehtmlkttsd") ) -#include "khtmlkttsd.moc" +#include "tdehtmlkttsd.moc" diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/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 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 <kparts/plugin.h> +#include <tdeparts/plugin.h> class KURL; class TDEInstance; diff --git a/konqueror/kttsplugin/khtmlkttsd.rc b/konqueror/kttsplugin/tdehtmlkttsd.rc index 388aec9e7..a06a29742 100644 --- a/konqueror/kttsplugin/khtmlkttsd.rc +++ b/konqueror/kttsplugin/tdehtmlkttsd.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="khtmlkttsdplugin" library="libkhtmlkttsdplugin" version="2" > +<kpartgui name="tdehtmlkttsdplugin" library="libtdehtmlkttsdplugin" version="2" > <MenuBar> <Menu name="tools"> <Text>&Tools</Text> 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 <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <kglobalsettings.h> #include <konq_operations.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <konq_dirpart.h> #include <kmimetyperesolver.h> 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 <kurl.h> #include <kfileitem.h> #include <klistview.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <konq_propsview.h> #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 <kprotocolinfo.h> #include <kio/slaveconfig.h> #include <konq_dirpart.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #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 <tqstringlist.h> #include <kurl.h> #include <klibloader.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> 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 <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <klibloader.h> 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 <kparts/part.h> -#include <kparts/factory.h> -#include <kparts/event.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/event.h> +#include <tdeparts/browserextension.h> #include <tqguardedptr.h> #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 <tqobject.h> #include <kurl.h> #include <tqstring.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> #include <kio/job.h> #include <tqguardedptr.h> #include <kfileitem.h> 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 <kdockwidget.h> #include <kurl.h> #include <ktoolbar.h> -#include <kparts/part.h> -#include <kmultitabbar.h> +#include <tdeparts/part.h> +#include <tdemultitabbar.h> #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 <konqsidebarplugin.h> #include <tqlabel.h> #include <tqlayout.h> -#include <kparts/part.h> -#include <kparts/factory.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/browserextension.h> #include <kdialogbase.h> #include <tqcombobox.h> #include <tqstringlist.h> 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 <kglobal.h> #include <klocale.h> #include <konq_pixmapprovider.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <kstandarddirs.h> 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 <assert.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kiconloader.h> #include <klocale.h> #include <konqsidebarplugin.h> 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 <kprocctrl.h> #include <ktabwidget.h> #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kcharsets.h> #include <kcolordialog.h> #include <kio/netaccess.h> 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 <kparts/browserextension.h> -#include <kparts/factory.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> #include <kdialogbase.h> 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 <kdebug.h> #include <knotifyclient.h> -#include <libkrsync/krsync.h> +#include <libtdersync/tdersync.h> #ifdef WITH_UPOWER #include <tqdbusdata.h> 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 @@ -1076,7 +1076,7 @@ password.</p> <p>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 <a -href="help:/kwallet" title="kwallet">the handbook</a>.</p> +href="help:/tdewallet" title="tdewallet">the handbook</a>.</p> </html> </tip> 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 <klocale.h> #include <kmessagebox.h> #include <konq_drag.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <kurldrag.h> #include <kuserprofile.h> #include <kurifilter.h> 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 <tqstring.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> #include <kfileitem.h> #include <kdatastream.h> #include <kio/global.h> 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 <kparts/event.h> +#include <tdeparts/event.h> #include <tqptrlist.h> #include <libkonq_export.h> 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 <kcompletion.h> #include <kurl.h> -#include <kparts/historyprovider.h> +#include <tdeparts/historyprovider.h> #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 <kstandarddirs.h> #include <kxmlguifactory.h> #include <kxmlguibuilder.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <assert.h> @@ -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 <kmimetype.h> // for KDEDesktopMimeType #include <libkonq_export.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #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 <kfiledialog.h> #include <kio/netaccess.h> #include <klocale.h> -#include <kparts/browserinterface.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserinterface.h> +#include <tdeparts/browserextension.h> #include <tqlabel.h> @@ -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<PluginBrowserExtension*>(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 <kparts/browserextension.h> -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> #include <klibloader.h> #include <tqwidget.h> #include <tqguardedptr.h> diff --git a/nsplugins/khtml_plugins.desktop b/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 <tqintdict.h> #include <tqguardedptr.h> -#include <kparts/browserextension.h> // for URLArgs +#include <tdeparts/browserextension.h> // for URLArgs #include <kio/job.h> 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 <signal.h> #ifdef WITH_XRANDR -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #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 <kiconloader.h> #include <kaboutdata.h> #include <kdebug.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <tqwidget.h> typedef KParts::GenericFactory<PrintPart> 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 <kparts/part.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> 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 index aae5d16b8..aae5d16b8 100644 --- a/kscreensaver.pamd +++ b/tdescreensaver.pamd diff --git a/kscreensaver/AUTHORS b/tdescreensaver/AUTHORS index fda66bb39..fda66bb39 100644 --- a/kscreensaver/AUTHORS +++ b/tdescreensaver/AUTHORS diff --git a/kscreensaver/CMakeLists.txt b/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 index 0711aef0a..7bfaa2596 100644 --- a/kscreensaver/ChangeLog +++ b/tdescreensaver/ChangeLog @@ -1,5 +1,5 @@ 2001-03-10 Martin R. Jones <mjones@kde.org> - * added libkscreensaver and ported KDE savers to it. + * added libtdescreensaver and ported KDE savers to it. * big cleanup. 2000-01-10 Alexander Neundorf <alexander.neundorf@rz.tu-ilmenau.de> @@ -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 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 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 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 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 <mweilguni@kde.org> -// 2001/03/04 Converted to use libkscreensaver by Martin R. Jones +// 2001/03/04 Converted to use libtdescreensaver by Martin R. Jones #include <stdlib.h> #include <tqlabel.h> @@ -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 index ce9e129b4..ba6da0226 100644 --- a/kscreensaver/blankscrn.h +++ b/tdescreensaver/blankscrn.h @@ -10,7 +10,7 @@ #include <tqcolor.h> #include <kdialogbase.h> -#include <kscreensaver.h> +#include <tdescreensaver.h> class KColorButton; diff --git a/kscreensaver/random.cpp b/tdescreensaver/random.cpp index f7421ae7d..cc8b7d279 100644 --- a/kscreensaver/random.cpp +++ b/tdescreensaver/random.cpp @@ -32,7 +32,7 @@ #include <kdialogbase.h> #include <kconfig.h> -#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 index e34556662..e34556662 100644 --- a/kscreensaver/random.h +++ b/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 <klocale.h> #include <kdebug.h> #ifdef WITH_XRANDR -#include <libkrandr/libkrandr.h> +#include <libtderandr/libtderandr.h> #endif #include <tqtimer.h> 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 |
