TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 1a9478c6e1
commit dc6b76cac4
304 changed files with 512 additions and 512 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -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 )

2
Makefile.am.in
Unescape View File

@ -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

2
README
Unescape View File

@ -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.

10
README.pam
Unescape View File

@ -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

4
applnk/compat/konqhtml.desktop
Unescape View File

@ -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

2
applnk/tde-system-screensavers.directory
Unescape View File

@ -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

2
config.h.cmake
Unescape View File

@ -88,7 +88,7 @@
// kcontrol/energy
#cmakedefine HAVE_DPMS 1
// kdesktop, kcontrol/screensaver, kscreensaver
// kdesktop, kcontrol/screensaver, tdescreensaver
#cmakedefine HAVE_GLXCHOOSEVISUAL 1
// kcontrol/crypto

2
configure.in.in
Unescape View File

@ -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

2
doc/faq/webbrowse.docbook
Unescape View File

@ -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>

6
doc/glossary/index.docbook
Unescape View File

@ -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>

2
doc/glossary/tdeprintingglossary.docbook
Unescape View File

@ -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>

2
doc/kcontrol/filemanager/index.docbook
Unescape View File

@ -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">

2
doc/kcontrol/kcmcss/index.docbook
Unescape View File

@ -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>

2
doc/kcontrol/khtml/Makefile.am
Unescape View File

@ -1,2 +0,0 @@
KDE_LANG = en
KDE_DOCS = kcontrol/khtml

4
doc/kcontrol/spellchecking/index.docbook
Unescape View File

@ -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>

2
doc/kcontrol/khtml/CMakeLists.txt → doc/kcontrol/tdehtml/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
#
#################################################
tde_create_handbook( DESTINATION kcontrol/khtml )
tde_create_handbook( DESTINATION kcontrol/tdehtml )

2
doc/kcontrol/tdehtml/Makefile.am
Unescape View File

@ -0,0 +1,2 @@
KDE_LANG = en
KDE_DOCS = kcontrol/tdehtml

2
doc/kcontrol/khtml/index.docbook → doc/kcontrol/tdehtml/index.docbook
Unescape View File

@ -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

0
doc/kcontrol/khtml/nsplugin.docbook → doc/kcontrol/tdehtml/nsplugin.docbook
Unescape View File

2
doc/konqueror/config.docbook
Unescape View File

@ -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 &lt;&konqueror;&gt;, Main
Toolbar &lt;khtmlpart&gt; and Extra Toolbar &lt;khtmlsettingsplugin&gt;. The
Toolbar &lt;tdehtmlpart&gt; and Extra Toolbar &lt;tdehtmlsettingsplugin&gt;. 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>

4
doc/userguide/groupware-kontact.docbook
Unescape View File

@ -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

12
doc/userguide/tde-for-admins.docbook
Unescape View File

@ -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

2
doc/userguide/tde-office.docbook
Unescape View File

@ -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>

2
drkonqi/Makefile.am
Unescape View File

@ -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)

4
kappfinder/Makefile.am
Unescape View File

@ -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

2
kate/AUTHORS
Unescape View File

@ -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)

10
kate/ChangeLog
Unescape View File

@ -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>

2
kate/app/CMakeLists.txt
Unescape View File

@ -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}
)

2
kate/app/kateconfigdialog.h
Unescape View File

@ -27,7 +27,7 @@
#include "../interfaces/pluginconfiginterfaceextension.h"
#include <kate/document.h>
#include <ktexteditor/configinterfaceextension.h>
#include <tdetexteditor/configinterfaceextension.h>
#include <kdialogbase.h>

2
kate/app/kateconsole.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <kde_terminal_interface.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kurl.h>
#include <klibloader.h>

4
kate/app/katedocmanager.cpp
Unescape View File

@ -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>

4
kate/app/katemainwindow.cpp
Unescape View File

@ -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");

2
kate/app/katemainwindow.h
Unescape View File

@ -27,7 +27,7 @@
#include <kate/view.h>
#include <kate/document.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kaction.h>

4
kate/app/katemdi.h
Unescape View File

@ -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>

2
kate/app/katesavemodifieddialog.cpp
Unescape View File

@ -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:

2
kate/app/kateviewmanager.cpp
Unescape View File

@ -45,7 +45,7 @@
#include <kglobalsettings.h>
#include <kstdaccel.h>
#include <ktexteditor/encodinginterface.h>
#include <tdetexteditor/encodinginterface.h>
#include <tqobjectlist.h>
#include <tqstringlist.h>

4
kate/app/kateviewspacecontainer.cpp
Unescape View File

@ -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()));

18
kate/app/kwritemain.cpp
Unescape View File

@ -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())

6
kate/app/kwritemain.h
Unescape View File

@ -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>

2
kate/data/kateui.rc
Unescape View File

@ -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>

2
kate/data/kwriteui.rc
Unescape View File

@ -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>

2
kate/interfaces/Makefile.am
Unescape View File

@ -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

2
kate/interfaces/plugin.cpp
Unescape View File

@ -21,7 +21,7 @@
#include "plugin.h"
#include "plugin.moc"
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
namespace Kate
{

2
kate/interfaces/plugin.h
Unescape View File

@ -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
{

2
kcheckpass/README
Unescape View File

@ -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.

2
kcheckpass/kcheckpass.c
Unescape View File

@ -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.
*
*****************************************************************/

2
kcheckpass/kcheckpass.h
Unescape View File

@ -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_

4
kcminit/CMakeLists.txt
Unescape View File

@ -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
)

2
kcontrol/arts/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/arts/Makefile.am
Unescape View File

@ -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)

4
kcontrol/arts/arts.cpp
Unescape View File

@ -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() );

4
kcontrol/background/bgrender.cpp
Unescape View File

@ -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);

4
kcontrol/componentchooser/componentservices/Makefile.am
Unescape View File

@ -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

2
kcontrol/display/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/display/display.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=kscreensaver
Icon=tdescreensaver
Type=Application
Exec=kcmshell display
DocPath=kcontrol/kcmdisplay/index.html

2
kcontrol/displayconfig/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/displayconfig/Makefile.am
Unescape View File

@ -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)

2
kcontrol/displayconfig/displayconfig.h
Unescape View File

@ -34,7 +34,7 @@
#include <dcopobject.h>
#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
#include <tdehardwaredevices.h>
#include "monitorworkspace.h"

8
kcontrol/dnssd/CMakeLists.txt
Unescape View File

@ -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}
)

12
kcontrol/dnssd/Makefile.am
Unescape View File

@ -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

4
kcontrol/dnssd/kcm_kdnssd.desktop → kcontrol/dnssd/kcm_tdednssd.desktop
Unescape View File

@ -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

8
kcontrol/dnssd/kcmdnssd.cpp
Unescape View File

@ -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()));

2
kcontrol/filetypes/Makefile.am
Unescape View File

@ -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

2
kcontrol/filetypes/filetypedetails.cpp
Unescape View File

@ -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" ) ||

4
kcontrol/filetypes/filetypesview.cpp
Unescape View File

@ -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.

2
kcontrol/filetypes/keditfiletype.cpp
Unescape View File

@ -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

2
kcontrol/filetypes/typeslistitem.h
Unescape View File

@ -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();

2
kcontrol/iccconfig/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/iccconfig/Makefile.am
Unescape View File

@ -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)

2
kcontrol/iccconfig/iccconfig.h
Unescape View File

@ -27,7 +27,7 @@
#include <dcopobject.h>
#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
#include "iccconfigbase.h"

2
kcontrol/kcontrol/CMakeLists.txt
Unescape View File

@ -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 )

2
kcontrol/kcontrol/aboutwidget.cpp
Unescape View File

@ -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>

2
kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
Unescape View File

@ -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;

2
kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
Unescape View File

@ -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);

4
kcontrol/kfontinst/viewpart/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/kfontinst/viewpart/FontViewPart.h
Unescape View File

@ -29,7 +29,7 @@
// (C) Craig Drummond, 2002, 2003, 2004
////////////////////////////////////////////////////////////////////////////////
#include <kparts/part.h>
#include <tdeparts/part.h>
class TQPushButton;
class TQFrame;

4
kcontrol/kfontinst/viewpart/FontViewerApp.h
Unescape View File

@ -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
{

2
kcontrol/kfontinst/viewpart/Makefile.am
Unescape View File

@ -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

2
kcontrol/kicker/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/kio/CMakeLists.txt
Unescape View File

@ -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}
)

2
kcontrol/knotify/knotify.cpp
Unescape View File

@ -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>

2
kcontrol/konq/CMakeLists.txt
Unescape View File

@ -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}
)

8
kcontrol/konqhtml/CMakeLists.txt
Unescape View File

@ -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}
)

6
kcontrol/konqhtml/Makefile.am
Unescape View File

@ -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

16
kcontrol/konqhtml/appearance.cpp
Unescape View File

@ -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);

10
kcontrol/konqhtml/htmlopts.cpp
Unescape View File

@ -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 ***

2
kcontrol/konqhtml/javaopts.cpp
Unescape View File

@ -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>

2
kcontrol/konqhtml/jspolicies.h
Unescape View File

@ -25,7 +25,7 @@
#include <tqgroupbox.h>
#include <tqstring.h>
#include <khtml_settings.h>
#include <tdehtml_settings.h>
#include "policies.h"

12
kcontrol/konqhtml/main.cpp
Unescape View File

@ -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);
}
}

6
kcontrol/konqhtml/khtml_behavior.desktop → kcontrol/konqhtml/tdehtml_behavior.desktop
Unescape View File

@ -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

6
kcontrol/konqhtml/khtml_filter.desktop → kcontrol/konqhtml/tdehtml_filter.desktop
Unescape View File

@ -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

6
kcontrol/konqhtml/khtml_fonts.desktop → kcontrol/konqhtml/tdehtml_fonts.desktop
Unescape View File

@ -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

6
kcontrol/konqhtml/khtml_java_js.desktop → kcontrol/konqhtml/tdehtml_java_js.desktop
Unescape View File

@ -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

2
kcontrol/kthememanager/kthememanager.cpp
Unescape View File

@ -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 )

0
kcontrol/pics/cr128-app-kscreensaver.png → kcontrol/pics/cr128-app-tdescreensaver.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

0
kcontrol/pics/cr16-app-kscreensaver.png → kcontrol/pics/cr16-app-tdescreensaver.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 707 B

After

Width:  |  Height:  |  Size: 707 B

0
kcontrol/pics/cr22-app-kscreensaver.png → kcontrol/pics/cr22-app-tdescreensaver.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
kcontrol/pics/cr32-app-kscreensaver.png → kcontrol/pics/cr32-app-tdescreensaver.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
kcontrol/pics/cr48-app-kscreensaver.png → kcontrol/pics/cr48-app-tdescreensaver.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
kcontrol/pics/cr64-app-kscreensaver.png → kcontrol/pics/cr64-app-tdescreensaver.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

2
kcontrol/privacy/kprivacymanager.cpp
Unescape View File

@ -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();
}

18
kcontrol/randr/CMakeLists.txt
Unescape View File

@ -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}
)

26
kcontrol/randr/Makefile.am
Unescape View File

@ -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

4
kcontrol/randr/configdialog.cpp
Unescape View File

@ -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

10
kcontrol/randr/main.cpp
Unescape View File

@ -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);

6
kcontrol/randr/krandrapp.cpp → kcontrol/randr/tderandrapp.cpp
Unescape View File

@ -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>

0
kcontrol/randr/krandrapp.h → kcontrol/randr/tderandrapp.h
Unescape View File

2
kcontrol/randr/krandrbindings.cpp → kcontrol/randr/tderandrbindings.cpp
Unescape View File

@ -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() );

0
kcontrol/randr/krandrinithack.cpp → kcontrol/randr/tderandrinithack.cpp
Unescape View File

6
kcontrol/randr/krandrmodule.cpp → kcontrol/randr/tderandrmodule.cpp
Unescape View File

@ -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"
{

2
kcontrol/randr/krandrmodule.h → kcontrol/randr/tderandrmodule.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef KRANDRMODULE_H
#define KRANDRMODULE_H
#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
class TQButtonGroup;
class KComboBox;

4
kcontrol/randr/krandrpassivepopup.cpp → kcontrol/randr/tderandrpassivepopup.cpp
Unescape View File

@ -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"

0
kcontrol/randr/krandrpassivepopup.h → kcontrol/randr/tderandrpassivepopup.h
Unescape View File

4
kcontrol/randr/krandrtray-autostart.desktop → kcontrol/randr/tderandrtray-autostart.desktop
Unescape View File

@ -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;

12
kcontrol/randr/krandrtray.cpp → kcontrol/randr/tderandrtray.cpp
Unescape View File

@ -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"));

2
kcontrol/randr/krandrtray.desktop → kcontrol/randr/tderandrtray.desktop
Unescape View File

@ -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;

2
kcontrol/randr/krandrtray.h → kcontrol/randr/tderandrtray.h
Unescape View File

@ -24,7 +24,7 @@
#include <ksystemtray.h>
#include <kglobalaccel.h>
#include <libkrandr/libkrandr.h>
#include <libtderandr/libtderandr.h>
#include <tdehardwaredevices.h>
class KHelpMenu;

2
kcontrol/screensaver/screensaver.desktop
Unescape View File

@ -1,6 +1,6 @@
[Desktop Entry]
Exec=kcmshell screensaver
Icon=kscreensaver
Icon=tdescreensaver
Type=Application
DocPath=kcontrol/screensaver/index.html

4
kcontrol/screensaver/scrnsave.cpp
Unescape View File

@ -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;
}

2
kcontrol/spellchecking/spellchecking.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kdialog.h>
#include <kgenericfactory.h>
#include <kspell.h>
#include <tdespell.h>
#include "spellchecking.h"

2
kdepasswd/Makefile.am
Unescape View File

@ -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

4
kdesktop/CMakeLists.txt
Unescape View File

@ -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}
)

2
kdesktop/ConfigureChecks.cmake
Unescape View File

@ -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 "" )

2
kdesktop/desktop.cc
Unescape View File

@ -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>

2
kdesktop/kwebdesktop/CMakeLists.txt
Unescape View File

@ -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}
)

2
kdesktop/kwebdesktop/Makefile.am
Unescape View File

@ -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

4
kdesktop/kwebdesktop/kwebdesktop.cpp
Unescape View File

@ -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;
}

4
kdesktop/kwebdesktop/kwebdesktop.h
Unescape View File

@ -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; }

2
kdesktop/lock/Makefile.am
Unescape View File

@ -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

2
kdialog/Makefile.am
Unescape View File

@ -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

2
kfind/CMakeLists.txt
Unescape View File

@ -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
)

2
kfind/Makefile.am
Unescape View File

@ -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

2
kfind/kfindpart.cpp
Unescape View File

@ -21,7 +21,7 @@
#include "kfindpart.h"
#include "kquery.h"
#include <kparts/genericfactory.h>
#include <tdeparts/genericfactory.h>
#include <kdebug.h>
#include <klocale.h>

4
kfind/kfindpart.h
Unescape View File

@ -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>

2
kfind/kftabdlg.cpp
Unescape View File

@ -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"

2
khelpcenter/CMakeLists.txt
Unescape View File

@ -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
)

4
khelpcenter/Makefile.am
Unescape View File

@ -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

2
khelpcenter/fontdialog.cpp
Unescape View File

@ -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>

8
khelpcenter/htmlsearch/Makefile.am
Unescape View File

@ -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

2
khelpcenter/htmlsearch/index.cpp
Unescape View File

@ -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."));

2
khelpcenter/htmlsearch/kcmhtmlsearch.cpp
Unescape View File

@ -336,7 +336,7 @@ void KHTMLSearchConfig::generateIndex()
{
save();
TQString exe = kapp->dirs()->findExe("khtmlindex");
TQString exe = kapp->dirs()->findExe("tdehtmlindex");
if (exe.isEmpty())
return;

4
khelpcenter/mainwindow.cpp
Unescape View File

@ -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>

2
khelpcenter/mainwindow.h
Unescape View File

@ -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>

4
khelpcenter/view.cpp
Unescape View File

@ -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>

2
khelpcenter/view.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef __view_h__
#define __view_h__
#include <khtml_part.h>
#include <tdehtml_part.h>
#include "glossary.h"
#include "navigator.h"

2
kicker/applets/launcher/CMakeLists.txt
Unescape View File

@ -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}
)

2
kicker/applets/launcher/quickaddappsmenu.cpp
Unescape View File

@ -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>

2
kicker/extensions/kasbar/Makefile.am
Unescape View File

@ -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)

4
kicker/extensions/sidebar/sidebarextension.cpp
Unescape View File

@ -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>

2
kicker/extensions/sidebar/sidebarextension.h
Unescape View File

@ -19,7 +19,7 @@
#include <kpanelextension.h>
#include <kurl.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
class TQHBoxLayout;
class TQVBox;

2
kicker/kicker/CMakeLists.txt
Unescape View File

@ -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
)

2
kicker/kicker/core/container_button.cpp
Unescape View File

@ -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>

2
kicker/kicker/ui/addbutton_mnu.cpp
Unescape View File

@ -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>

2
kicker/kicker/ui/itemview.cpp
Unescape View File

@ -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"

2
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -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"

4
kicker/kicker/ui/service_mnu.cpp
Unescape View File

@ -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>

2
kicker/kicker/ui/service_mnu.h
Unescape View File

@ -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>

2
kicker/libkicker/menuinfo.cpp
Unescape View File

@ -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)
{

2
kicker/menuext/prefmenu/prefmenu.cpp
Unescape View File

@ -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>

2
kicker/menuext/prefmenu/prefmenu.h
Unescape View File

@ -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;

2
kicker/menuext/tom/tom.cc
Unescape View File

@ -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"

2
kicker/proxy/Makefile.am
Unescape View File

@ -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

2
kioslave/about/Makefile.am
Unescape View File

@ -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

2
kioslave/finger/Makefile.am
Unescape View File

@ -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

2
kioslave/fish/Makefile.am
Unescape View File

@ -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)

2
kioslave/mac/Makefile.am
Unescape View File

@ -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

2
kioslave/man/CMakeLists.txt
Unescape View File

@ -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}
)

8
kioslave/man/Makefile.am
Unescape View File

@ -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 > $@

8
kioslave/man/kmanpart.h
Unescape View File

@ -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>

2
kioslave/media/mounthelper/Makefile.am
Unescape View File

@ -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

2
kioslave/nfs/Makefile.am
Unescape View File

@ -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

2
kioslave/sftp/Makefile.am
Unescape View File

@ -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

2
kioslave/tar/Makefile.am
Unescape View File

@ -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

2
kioslave/thumbnail/CMakeLists.txt
Unescape View File

@ -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}
)

2
kioslave/thumbnail/Makefile.am
Unescape View File

@ -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

2
kioslave/thumbnail/htmlcreator.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <tqimage.h>
#include <tqpainter.h>
#include <kapplication.h>
#include <khtml_part.h>
#include <tdehtml_part.h>
#include "htmlcreator.h"

2
kioslave/trash/Makefile.am
Unescape View File

@ -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

2
klipper/configdialog.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <kpopupmenu.h>
#include <twinmodule.h>
#include <kregexpeditorinterface.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "configdialog.h"

2
klipper/historyurlitem.cpp
Unescape View File

@ -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 )

2
kmenuedit/treeview.cpp
Unescape View File

@ -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"

2
knetattach/Makefile.am
Unescape View File

@ -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

2
knetattach/TODO
Unescape View File

@ -1,4 +1,4 @@
- add a browser for SMB?
- plugin / desktop file interface for adding more protocols
- integrate kdnssd?
- integrate tdednssd?

2
konqueror/CMakeLists.txt
Unescape View File

@ -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
)

8
konqueror/DESIGN
Unescape View File

@ -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).

2
konqueror/DESIGN_config
Unescape View File

@ -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.

2
konqueror/Makefile.am
Unescape View File

@ -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

2
konqueror/about/CMakeLists.txt
Unescape View File

@ -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}
)

6
konqueror/about/konq_aboutpage.cc
Unescape View File

@ -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>&reg;</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>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</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")

4
konqueror/about/konq_aboutpage.h
Unescape View File

@ -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;

2
konqueror/client/kfmclient_3_2_update.sh
Unescape View File

@ -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" \

2
konqueror/iconview/konq_iconview.cc
Unescape View File

@ -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>

2
konqueror/iconview/konq_iconview.h
Unescape View File

@ -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>

2
konqueror/keditbookmarks/DESIGN
Unescape View File

@ -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:

2
konqueror/keditbookmarks/Makefile.am
Unescape View File

@ -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

4
konqueror/keditbookmarks/actionsimpl.cpp
Unescape View File

@ -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>

4
konqueror/keditbookmarks/favicons.h
Unescape View File

@ -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"

8
konqueror/keditbookmarks/updater.cpp
Unescape View File

@ -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);
}

4
konqueror/keditbookmarks/updater.h
Unescape View File

@ -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
{

2
konqueror/konq_browseriface.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef __konq_browseriface_h__
#define __konq_browseriface_h__
#include <kparts/browserinterface.h>
#include <tdeparts/browserinterface.h>
class KonqView;

2
konqueror/konq_combo.cc
Unescape View File

@ -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

6
konqueror/konq_extensionmanager.cc
Unescape View File

@ -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();

2
konqueror/konq_factory.cc
Unescape View File

@ -19,7 +19,7 @@
*/
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include "konq_factory.h"
#include "version.h"

2
konqueror/konq_factory.h
Unescape View File

@ -28,7 +28,7 @@
#include <klibloader.h>
#include <ktrader.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
class BrowserView;
class KonqMainWindow;

10
konqueror/konq_mainwindow.cc
Unescape View File

@ -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())

2
konqueror/konq_mainwindow.h
Unescape View File

@ -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>

2
konqueror/konq_misc.h
Unescape View File

@ -24,7 +24,7 @@
// konq_main.cc
#include <krun.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
class KonqMainWindow;
class KonqView;

2
konqueror/konq_openurlrequest.h
Unescape View File

@ -3,7 +3,7 @@
#include <tqstringlist.h>
#include <kparts/browserextension.h>
#include <tdeparts/browserextension.h>
struct KonqOpenURLRequest {

2
konqueror/konq_run.h
Unescape View File

@ -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"

4
konqueror/konq_view.cc
Unescape View File

@ -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>

2
konqueror/konq_viewmgr.h
Unescape View File

@ -29,7 +29,7 @@
#include <ktrader.h>
#include <kparts/partmanager.h>
#include <tdeparts/partmanager.h>
#include "konq_openurlrequest.h"
class TQString;

8
konqueror/konqueror.kcfg
Unescape View File

@ -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>

12
konqueror/kttsplugin/CMakeLists.txt
Unescape View File

@ -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}
)

14
konqueror/kttsplugin/Makefile.am
Unescape View File

@ -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

8
konqueror/kttsplugin/khtmlkttsd.cpp → konqueror/kttsplugin/tdehtmlkttsd.cpp
Unescape View File

@ -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"

4
konqueror/kttsplugin/khtmlkttsd.desktop → konqueror/kttsplugin/tdehtmlkttsd.desktop
Unescape View File

@ -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

2
konqueror/kttsplugin/khtmlkttsd.h → konqueror/kttsplugin/tdehtmlkttsd.h
Unescape View File

@ -17,7 +17,7 @@
#ifndef KHTMLKTTSD_H
#define KHTMLKTTSD_H
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
class KURL;
class TDEInstance;

2
konqueror/kttsplugin/khtmlkttsd.rc → konqueror/kttsplugin/tdehtmlkttsd.rc
Unescape View File

@ -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>&amp;Tools</Text>

4
konqueror/listview/konq_listview.h
Unescape View File

@ -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>

2
konqueror/listview/konq_listviewwidget.cc
Unescape View File

@ -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;
}

2
konqueror/listview/konq_listviewwidget.h
Unescape View File

@ -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"

10
konqueror/profile_kde_devel.desktop
Unescape View File

@ -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

8
konqueror/profile_tabbedbrowsing.desktop
Unescape View File

@ -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/

2
konqueror/quickprint/TODO
Unescape View File

@ -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
- ...

2
konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
Unescape View File

@ -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"

2
konqueror/remoteencodingplugin/kremoteencodingplugin.h
Unescape View File

@ -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;

2
konqueror/shellcmdplugin/kshellcmdplugin.h
Unescape View File

@ -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

4
konqueror/sidebar/CMakeLists.txt
Unescape View File

@ -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}
)

8
konqueror/sidebar/konqsidebar.h
Unescape View File

@ -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"

4
konqueror/sidebar/konqsidebarplugin.h
Unescape View File

@ -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>

4
konqueror/sidebar/sidebar_widget.h
Unescape View File

@ -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"

6
konqueror/sidebar/trees/konqsidebar_tree.h
Unescape View File

@ -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>

2
konqueror/sidebar/web_module/CMakeLists.txt
Unescape View File

@ -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}
)

2
konqueror/sidebar/web_module/web_module.cpp
Unescape View File

@ -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>

2
konqueror/sidebar/web_module/web_module.h
Unescape View File

@ -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>

2
konsole/konsole/CMakeLists.txt
Unescape View File

@ -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}
)

2
konsole/konsole/Makefile.am
Unescape View File

@ -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 \

2
konsole/konsole/konsole.cpp
Unescape View File

@ -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>

4
konsole/konsole/konsole_part.h
Unescape View File

@ -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>

2
kpager/Makefile.am
Unescape View File

@ -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)

2
kpersonalizer/Makefile.am
Unescape View File

@ -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
# KDE´s XML GUI builing

2
kpersonalizer/kcountrypage.cpp
Unescape View File

@ -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);

2
kreadconfig/Makefile.am
Unescape View File

@ -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

2
ksmserver/CMakeLists.txt
Unescape View File

@ -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}
)

2
ksmserver/Makefile.am
Unescape View File

@ -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:

2
ksmserver/shutdown.cpp
Unescape View File

@ -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>

2
ksplashml/CMakeLists.txt
Unescape View File

@ -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}
)

2
ksplashml/Makefile.am
Unescape View File

@ -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

2
ksplashml/themeengine/default/Makefile.am
Unescape View File

@ -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

2
ksplashml/themeengine/simple/Makefile.am
Unescape View File

@ -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)

2
ksplashml/themeengine/standard/Makefile.am
Unescape View File

@ -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

2
ksplashml/themeengine/unified/Makefile.am
Unescape View File

@ -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

2
kstart/Makefile.am
Unescape View File

@ -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

2
ksysguard/gui/CMakeLists.txt
Unescape View File

@ -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}
)

2
ksysguard/gui/Makefile.am
Unescape View File

@ -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

2
ksystraycmd/Makefile.am
Unescape View File

@ -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

2
ktip/Makefile.am
Unescape View File

@ -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

2
ktip/tips
Unescape View File

@ -1076,7 +1076,7 @@ password.</p>
<p>KWallet can be accessed from kcontrol, TDE's Control Center; from
there, simply go to Security &amp; 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>

2
libkonq/CMakeLists.txt
Unescape View File

@ -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}
)

2
libkonq/kivdirectoryoverlay.cc
Unescape View File

@ -97,7 +97,7 @@ void KIVDirectoryOverlay::slotCompleted()
}
if ( best * 2 < total ) {
m_bestIcon = "kmultiple";
m_bestIcon = "tdemultiple";
}
if (!m_bestIcon.isNull()) {

2
libkonq/konq_dirpart.cc
Unescape View File

@ -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>

4
libkonq/konq_dirpart.h
Unescape View File

@ -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>

2
libkonq/konq_events.h
Unescape View File

@ -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>

4
libkonq/konq_historymgr.h
Unescape View File

@ -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();

2
libkonq/konq_iconviewwidget.h
Unescape View File

@ -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 );

12
libkonq/konq_popupmenu.cc
Unescape View File

@ -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

2
libkonq/konq_popupmenu.h
Unescape View File

@ -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"

6
migratekde3
Unescape View File

@ -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.

4
nsplugins/CMakeLists.txt
Unescape View File

@ -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}
)

4
nsplugins/Makefile.am
Unescape View File

@ -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

2
nsplugins/nspluginloader.cpp
Unescape View File

@ -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

8
nsplugins/plugin_part.cpp
Unescape View File

@ -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;

6
nsplugins/plugin_part.h
Unescape View File

@ -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>

6
nsplugins/khtml_plugins.desktop → nsplugins/tdehtml_plugins.desktop
Unescape View File

@ -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

2
nsplugins/test/Makefile.am
Unescape View File

@ -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

2
nsplugins/viewer/CMakeLists.txt
Unescape View File

@ -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}
)

2
nsplugins/viewer/nsplugin.h
Unescape View File

@ -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>

4
r14-xdg-update
Unescape View File

@ -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.

2
tdeinit/CMakeLists.txt
Unescape View File

@ -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

2
tdeinit/displayconfig.cpp
Unescape View File

@ -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");

2
tdeprint/tdeprint_part/CMakeLists.txt
Unescape View File

@ -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}
)

2
tdeprint/tdeprint_part/printpart.cpp
Unescape View File

@ -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;

4
tdeprint/tdeprint_part/printpart.h
Unescape View File

@ -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;

2
tdeprint/tdeprintfax/Makefile.am
Unescape View File

@ -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

0
kscreensaver.pamd → tdescreensaver.pamd
Unescape View File

0
kscreensaver/AUTHORS → tdescreensaver/AUTHORS
Unescape View File

2
kscreensaver/CMakeLists.txt → tdescreensaver/CMakeLists.txt
Unescape View File

@ -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}
)

4
kscreensaver/ChangeLog → tdescreensaver/ChangeLog
Unescape View File

@ -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

4
kscreensaver/KBlankscreen.desktop → tdescreensaver/KBlankscreen.desktop
Unescape View File

@ -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

4
kscreensaver/KRandom.desktop → tdescreensaver/KRandom.desktop
Unescape View File

@ -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

8
kscreensaver/Makefile.am → tdescreensaver/Makefile.am
Unescape View File

@ -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 ##########

4
kscreensaver/blankscrn.cpp → tdescreensaver/blankscrn.cpp
Unescape View File

@ -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";

2
kscreensaver/blankscrn.h → tdescreensaver/blankscrn.h
Unescape View File

@ -10,7 +10,7 @@
#include <tqcolor.h>
#include <kdialogbase.h>
#include <kscreensaver.h>
#include <tdescreensaver.h>
class KColorButton;

4
kscreensaver/random.cpp → tdescreensaver/random.cpp
Unescape View File

@ -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);

0
kscreensaver/random.h → tdescreensaver/random.h
Unescape View File

2
tdesu/tdesu/Makefile.am
Unescape View File

@ -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

4
tdesu/tdesu/tdesu.cpp
Unescape View File

@ -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.
}

2
tdm/kfrontend/CMakeLists.txt
Unescape View File

@ -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

4
tdm/kfrontend/Makefile.am
Unescape View File

@ -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

2
tdm/kfrontend/kgapp.cpp
Unescape View File

@ -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>

2
tqt3integration/README
Unescape View File

@ -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

2
twin/clients/keramik/Makefile.am
Unescape View File

@ -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

2
twin/clients/kwmtheme/cli_installer/Makefile.am
Unescape View File

@ -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.

2
twin/killer/Makefile.am
Unescape View File

@ -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

2
twin/tools/Makefile.am
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save