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

pull/16/head
Timothy Pearson 12 years ago
parent b7658a0d5e
commit dfe289850f

@ -932,11 +932,11 @@ add_subdirectory( tdecore )
if( WITH_ELFICON ) if( WITH_ELFICON )
add_subdirectory( tdelfeditor ) add_subdirectory( tdelfeditor )
endif( WITH_ELFICON ) endif( WITH_ELFICON )
add_subdirectory( kunittest ) add_subdirectory( tdeunittest )
add_subdirectory( tdeui ) add_subdirectory( tdeui )
add_subdirectory( tdesu ) add_subdirectory( tdesu )
add_subdirectory( kjs ) add_subdirectory( kjs )
add_subdirectory( kwallet ) add_subdirectory( tdewallet )
add_subdirectory( kio ) add_subdirectory( kio )
add_subdirectory( kded ) add_subdirectory( kded )
@ -945,34 +945,34 @@ add_subdirectory( kded )
add_subdirectory( kdoctools ) add_subdirectory( kdoctools )
add_subdirectory( doc ) add_subdirectory( doc )
add_subdirectory( kparts ) add_subdirectory( tdeparts )
add_subdirectory( kutils ) add_subdirectory( tdeutils )
add_subdirectory( kspell2 ) add_subdirectory( tdespell2 )
add_subdirectory( kmdi ) add_subdirectory( tdemdi )
add_subdirectory( kinit ) add_subdirectory( kinit )
add_subdirectory( tdeprint ) add_subdirectory( tdeprint )
add_subdirectory( kab ) add_subdirectory( kab )
add_subdirectory( kresources ) add_subdirectory( tderesources )
add_subdirectory( kabc ) add_subdirectory( kabc )
add_subdirectory( arts ) add_subdirectory( arts )
add_subdirectory( interfaces ) add_subdirectory( interfaces )
add_subdirectory( kate ) add_subdirectory( kate )
add_subdirectory( kcert ) add_subdirectory( tdecert )
if( XRANDR_FOUND ) if( XRANDR_FOUND )
add_subdirectory( krandr ) add_subdirectory( tderandr )
endif( XRANDR_FOUND ) endif( XRANDR_FOUND )
add_subdirectory( khtml ) add_subdirectory( tdehtml )
add_subdirectory( kcmshell ) add_subdirectory( kcmshell )
add_subdirectory( kconf_update ) add_subdirectory( kconf_update )
add_subdirectory( kdewidgets ) add_subdirectory( kdewidgets )
add_subdirectory( kimgio ) add_subdirectory( kimgio )
add_subdirectory( kioslave ) add_subdirectory( kioslave )
add_subdirectory( kstyles ) add_subdirectory( kstyles )
add_subdirectory( libkmid ) add_subdirectory( libtdemid )
add_subdirectory( libkscreensaver ) add_subdirectory( libtdescreensaver )
add_subdirectory( networkstatus ) add_subdirectory( networkstatus )
add_subdirectory( knewstuff ) add_subdirectory( knewstuff )
add_subdirectory( krsync ) add_subdirectory( tdersync )
add_subdirectory( licenses ) add_subdirectory( licenses )
add_subdirectory( dnssd ) add_subdirectory( dnssd )
add_subdirectory( pics ) add_subdirectory( pics )

@ -28,7 +28,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<LI><A HREF="#KHelpMenu">KHelpMenu</A></LI> <LI><A HREF="#KHelpMenu">KHelpMenu</A></LI>
<LI><A HREF="#KToolBar">KToolBar</A></LI> <LI><A HREF="#KToolBar">KToolBar</A></LI>
<LI><A HREF="#launching">Starting other programs</A></LI> <LI><A HREF="#launching">Starting other programs</A></LI>
<LI><A HREF="#khtmlw">khtmlw</A></LI> <LI><A HREF="#tdehtmlw">tdehtmlw</A></LI>
<LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI> <LI><A HREF="#KIntegerLine">KIntegerLine, KIntLineEdit</A></LI>
<LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI> <LI><A HREF="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</A></LI>
<LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI> <LI><A HREF="#TDEConfigBase">TDEConfigBase, TDEConfig, KSimpleConfig</A></LI>
@ -347,9 +347,9 @@ This makes KRun the recommended way to run another program in KDE 2.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<H3><A NAME="khtmlw">khtmlw</A></H3> <H3><A NAME="tdehtmlw">tdehtmlw</A></H3>
khtmlw has been replaced with khtml.<BR> tdehtmlw has been replaced with tdehtml.<BR>
<UL> <UL>
<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar <LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
managing for free. managing for free.
@ -361,7 +361,7 @@ khtmlw has been replaced with khtml.<BR>
w-&gt;openURL(myURL); w-&gt;openURL(myURL);
</PRE> </PRE>
<LI>khtml uses QString's instead of char *'s now. This means, that most <LI>tdehtml uses QString's instead of char *'s now. This means, that most
of the api has changed. In all functions:<P> of the api has changed. In all functions:<P>
<PRE> <PRE>
const char * -&gt; QString const char * -&gt; QString
@ -406,7 +406,7 @@ khtmlw has been replaced with khtml.<BR>
</TR> </TR>
</TABLE><P> </TABLE><P>
<LI>Don't forget to change the link-flags! (-lkhtml -lkjava instead of -lkhtmlw) <LI>Don't forget to change the link-flags! (-ltdehtml -lkjava instead of -ltdehtmlw)
</UL> </UL>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

@ -20,9 +20,9 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
<LI><A HREF="#tdecore">Changes in tdecore</A></LI> <LI><A HREF="#tdecore">Changes in tdecore</A></LI>
<LI><A HREF="#tdeui">Changes in tdeui</A></LI> <LI><A HREF="#tdeui">Changes in tdeui</A></LI>
<LI><A HREF="#kio">Changes in kio</A></LI> <LI><A HREF="#kio">Changes in kio</A></LI>
<LI><A HREF="#kparts">Changes in kparts</A></LI> <LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
<LI><A HREF="#kspell">Changes in kspell</A></LI> <LI><A HREF="#tdespell">Changes in tdespell</A></LI>
<LI><A HREF="#khtmlpart">API-cleanup in KHTML</A></LI> <LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
<LI><A HREF="#kfile">Changes in kfile</A></LI> <LI><A HREF="#kfile">Changes in kfile</A></LI>
<LI><A HREF="#kcontrol">TDE Control Center</A></LI> <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
<LI><A HREF="#kicker">Panel Applets and Extensions</A></LI> <LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
@ -416,7 +416,7 @@ TQString&) is not a slot anymore.
<H4>KOpenWithHandler / KFileOpenWithHandler</H4> <H4>KOpenWithHandler / KFileOpenWithHandler</H4>
Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore. Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore.
The merging of libkio, libksycoca, libkfile and libkssl into a single libkio has The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has
allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly. allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
<H4>KMimeType, KService</H4> <H4>KMimeType, KService</H4>
@ -440,7 +440,7 @@ The createFilterDevice method is deprecated. Use deviceForFile instead.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<H3><A NAME="kparts">Changes in kparts</A></H3> <H3><A NAME="tdeparts">Changes in tdeparts</A></H3>
<H4>KParts::Factory</H4> <H4>KParts::Factory</H4>
The createPart method is no more virtual and the createPartObject method The createPart method is no more virtual and the createPartObject method
@ -468,7 +468,7 @@ setURLArgs does the job.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<H3><A NAME="kspell">Changes in kspell</A></H3> <H3><A NAME="tdespell">Changes in tdespell</A></H3>
<H4>KSpell</H4> <H4>KSpell</H4>
The API has been cleaned up to be in line with the rest of tdelibs, in particular: The API has been cleaned up to be in line with the rest of tdelibs, in particular:
@ -495,7 +495,7 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<H3><A NAME="khtmlpart">API-cleanups in KHTML</A></H3> <H3><A NAME="tdehtmlpart">API-cleanups in KHTML</A></H3>
There were a few relatively minor API-adjustements in KHTMLPart. In particular: There were a few relatively minor API-adjustements in KHTMLPart. In particular:
<ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool) <ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)

@ -14,8 +14,8 @@
* - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a> * - <a target="_top" href="tdeui/html/index.html"><b>tdeui</b></a>
* (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeui/html/classes.html">classes</a>)\n
* <i>Trinity User interface classes such as widgets.</i> * <i>Trinity User interface classes such as widgets.</i>
* - <a target="_top" href="khtml/html/index.html"><b>khtml</b></a> * - <a target="_top" href="tdehtml/html/index.html"><b>tdehtml</b></a>
* (<a target="_top" href="khtml/html/classes.html">classes</a>)\n * (<a target="_top" href="tdehtml/html/classes.html">classes</a>)\n
* <i>The Trinity HTML component.</i> * <i>The Trinity HTML component.</i>
* - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a> * - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a>
* (<a target="_top" href="kjs/html/classes.html">classes</a>)\n * (<a target="_top" href="kjs/html/classes.html">classes</a>)\n
@ -24,8 +24,8 @@
* (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n * (<a target="_top" href="kio/kio/html/classes.html">classes</a>)\n
* <i>Low level access to network files. Also provides access to facilities * <i>Low level access to network files. Also provides access to facilities
* such as KDirWatcher which monitors directories for changes.</i> * such as KDirWatcher which monitors directories for changes.</i>
* - <a target="_top" href="kparts/html/index.html"><b>kparts</b></a> * - <a target="_top" href="tdeparts/html/index.html"><b>tdeparts</b></a>
* (<a target="_top" href="kparts/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeparts/html/classes.html">classes</a>)\n
* <i>Support for re-usable, embeddable, extendable applications.</i> * <i>Support for re-usable, embeddable, extendable applications.</i>
* - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a> * - <a target="_top" href="dcop/html/index.html"><b>dcop</b></a>
* (<a target="_top" href="dcop/html/classes.html">classes</a>)\n * (<a target="_top" href="dcop/html/classes.html">classes</a>)\n
@ -33,17 +33,17 @@
* - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a> * - <a target="_top" href="tdefx/html/index.html"><b>tdefx</b></a>
* (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n * (<a target="_top" href="tdefx/html/classes.html">classes</a>)\n
* <i>A library with pixmap effects.</i> * <i>A library with pixmap effects.</i>
* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a> * - <a target="_top" href="tdemdi/html/index.html"><b>tdemdi</b></a>
* (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n * (<a target="_top" href="tdemdi/html/classes.html">classes</a>)\n
* <i>MultiDocument Interface library.</i> * <i>MultiDocument Interface library.</i>
* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a> * - <a target="_top" href="libtdemid/html/index.html"><b>libtdemid</b></a>
* (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n * (<a target="_top" href="libtdemid/html/classes.html">classes</a>)\n
* <i>Midi library.</i> * <i>Midi library.</i>
* - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a> * - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
* (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
* <i>High level printer control functionality.</i> * <i>High level printer control functionality.</i>
* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a> * - <a target="_top" href="tderandr/html/index.html"><b>tderandr</b></a>
* (<a target="_top" href="krandr/html/classes.html">classes</a>)\n * (<a target="_top" href="tderandr/html/classes.html">classes</a>)\n
* <i>High level Xorg configuration via XRandr.</i> * <i>High level Xorg configuration via XRandr.</i>
* - <a target="_top" href="interfaces/html/index.html"><b>interfaces</b></a> * - <a target="_top" href="interfaces/html/index.html"><b>interfaces</b></a>
* (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n * (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
@ -52,11 +52,11 @@
* - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a> * - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
* (<a target="_top" href="kabc/html/classes.html">classes</a>)\n * (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
* <i>Access to the Trinity address book.</i> * <i>Access to the Trinity address book.</i>
* - <a target="_top" href="kresources/html/index.html"><b>kresources</b></a> * - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
* (<a target="_top" href="kresources/html/classes.html">classes</a>)\n * (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n
* <i>The Trinity resources system.</i> * <i>The Trinity resources system.</i>
* - <a target="_top" href="kutils/html/index.html"><b>kutils</b></a> * - <a target="_top" href="tdeutils/html/index.html"><b>tdeutils</b></a>
* (<a target="_top" href="kutils/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeutils/html/classes.html">classes</a>)\n
* <i>High-level utils, like search/replace support.</i> * <i>High-level utils, like search/replace support.</i>
* - <a target="_top" href="arts/html/index.html"><b>arts</b></a> * - <a target="_top" href="arts/html/index.html"><b>arts</b></a>
* (<a target="_top" href="arts/html/classes.html">classes</a>)\n * (<a target="_top" href="arts/html/classes.html">classes</a>)\n
@ -67,8 +67,8 @@
* - <a target="_top" href="dnssd/html/index.html"><b>dnssd</b></a> * - <a target="_top" href="dnssd/html/index.html"><b>dnssd</b></a>
* (<a target="_top" href="dnssd/html/classes.html">classes</a>)\n * (<a target="_top" href="dnssd/html/classes.html">classes</a>)\n
* <i>Network sevices publishing and discovery.</i> * <i>Network sevices publishing and discovery.</i>
* - <a target="_top" href="kunittest/html/index.html"><b>kunittest</b></a> * - <a target="_top" href="tdeunittest/html/index.html"><b>tdeunittest</b></a>
* (<a target="_top" href="kunittest/html/classes.html">classes</a>)\n * (<a target="_top" href="tdeunittest/html/classes.html">classes</a>)\n
* <i>Unit testing framework in Trinity.</i> * <i>Unit testing framework in Trinity.</i>
* *

@ -18,17 +18,17 @@
# Boston, MA 02110-1301, USA. # Boston, MA 02110-1301, USA.
COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
COMPILE_BEFORE_doc = kdoctools COMPILE_BEFORE_doc = kdoctools
COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
COMPILE_AFTER_tdeprint = kate khtml COMPILE_AFTER_tdeprint = kate tdehtml
COMPILE_BEFORE_khtml = kutils COMPILE_BEFORE_tdehtml = tdeutils
COMPILE_BEFORE_kabc = kab kresources COMPILE_BEFORE_kabc = kab tderesources
COMPILE_BEFORE_kate = interfaces kutils COMPILE_BEFORE_kate = interfaces tdeutils
COMPILE_BEFORE_kmdi = kutils COMPILE_BEFORE_tdemdi = tdeutils
COMPILE_BEFORE_kspell2 = kutils COMPILE_BEFORE_tdespell2 = tdeutils
COMPILE_BEFORE_kcmshell = kutils COMPILE_BEFORE_kcmshell = tdeutils
COMPILE_BEFORE_kdewidgets = kabc khtml COMPILE_BEFORE_kdewidgets = kabc tdehtml
COMPILE_BEFORE_interfaces = arts kabc COMPILE_BEFORE_interfaces = arts kabc
$(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4 $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
@ -54,7 +54,7 @@ messages:
find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
echo ./tdecore/tde-config.cpp.in >> files ;\ echo ./tdecore/tde-config.cpp.in >> files ;\
$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
: > kde.pot ;\ : > kde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
$(XGETTEXT) common_texts.cpp -o kde.pot $(XGETTEXT) common_texts.cpp -o kde.pot

@ -27,7 +27,7 @@ Here is an alphabetical list:
communicate with KDE applications. It's also the base for KParts. communicate with KDE applications. It's also the base for KParts.
* interfaces * interfaces
kparts interface for text editors, mediaplayer and scripting. tdeparts interface for text editors, mediaplayer and scripting.
* kab * kab
OBSOLETE, see kabc: Used to be the address book library, but now only OBSOLETE, see kabc: Used to be the address book library, but now only
@ -39,7 +39,7 @@ Here is an alphabetical list:
* kate * kate
KPart for 'kate', the KDE advanced text editor. KPart for 'kate', the KDE advanced text editor.
* kcert * tdecert
Personal certification manager. Personal certification manager.
* kconf_update * kconf_update
@ -73,7 +73,7 @@ Here is an alphabetical list:
Contains mostly stuff convert XML docbook files via XSLT into Contains mostly stuff convert XML docbook files via XSLT into
human readable stuff. human readable stuff.
* khtml * tdehtml
The next generation HTML rendering widget designed for Konqueror. This The next generation HTML rendering widget designed for Konqueror. This
supports HTML 4, CSS, and a variety of other web related standards. supports HTML 4, CSS, and a variety of other web related standards.
@ -86,7 +86,7 @@ Here is an alphabetical list:
* kio * kio
Classes that fetch and decode URLs are contained here. This library also Classes that fetch and decode URLs are contained here. This library also
contains "ksycoca", the system configure cache containing services, contains "tdesycoca", the system configure cache containing services,
applications, servicetypes and mimetypes. applications, servicetypes and mimetypes.
* kioslave * kioslave
@ -95,21 +95,21 @@ Here is an alphabetical list:
* kjs * kjs
Implementation of ECMAScript (aka JavaScript). Implementation of ECMAScript (aka JavaScript).
* kparts * tdeparts
KDE component model. KDE component model.
* kstyles * kstyles
The theme engine lies within. It handles nearly anything relating to The theme engine lies within. It handles nearly anything relating to
customizing the appearance of widgets. customizing the appearance of widgets.
* kwallet * tdewallet
Client and backend to store values in encrypted files. Client and backend to store values in encrypted files.
* libkmid * libtdemid
MIDI file handling and midi mapper (manages output of midi files to MIDI file handling and midi mapper (manages output of midi files to
various devices). various devices).
* libkscreensaver * libtdescreensaver
Library for making KDE screensavers. Library for making KDE screensavers.
* libltdl * libltdl

@ -152,7 +152,7 @@ that we would like to make for the next binary incompatible release.
- merge KProcIO into TDEProcess; add setBuffered() for separate channels. - merge KProcIO into TDEProcess; add setBuffered() for separate channels.
- use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted. - use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted.
- To discuss: Migrate the about dialog to use qhtml or khtml rather then the current - To discuss: Migrate the about dialog to use qhtml or tdehtml rather then the current
setup of all of the widgets and sub widgets. Might be a lot simpler, require a lot setup of all of the widgets and sub widgets. Might be a lot simpler, require a lot
less code and be much more flexible for additions/enhancments. Sidenote: currently less code and be much more flexible for additions/enhancments. Sidenote: currently
the about information seems to be duplicated. the about information seems to be duplicated.
@ -180,7 +180,7 @@ that we would like to make for the next binary incompatible release.
- KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog - KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
- Make libkwalletclient part of libkio and get rid of libkwalletclient. - Make libtdewalletclient part of libkio and get rid of libtdewalletclient.
- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*, - Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization

@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
check_PROGRAMS = knotifytest check_PROGRAMS = knotifytest
knotifytest_SOURCES = knotifytest.cpp knotifytest_SOURCES = knotifytest.cpp
knotifytest_LDADD = $(LIB_TDECORE) knotifytest_LDADD = $(LIB_TDECORE)
knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = knotify.h noinst_HEADERS = knotify.h

@ -255,12 +255,12 @@ AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la') AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la') AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la') AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la') AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la') AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la') AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/kunittest/libkunittest.la') AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
case $host in case $host in
*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;; *cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
*) lib_kded='' ;; *) lib_kded='' ;;

@ -50,15 +50,15 @@ dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
dcopserver_shutdown_SOURCES = dcopserver_shutdown.c dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdcop_SOURCES = testdcop.cpp testdcop_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la testdcop_LDADD = libDCOP.la
dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)

@ -258,12 +258,12 @@ int main(int argc, char **argv)
foundApp.data(), foundObj.data()); foundApp.data(), foundObj.data());
// Find an object called "object1" in any application. // Find an object called "object1" in any application.
boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj); boolResult = client->findObject( "", "tdesycoca", "", data, foundApp, foundObj);
tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
foundApp.data(), foundObj.data()); foundApp.data(), foundObj.data());
// Find ourselves in any application. // Find ourselves in any application.
boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj); boolResult = client->findObject( "testdcop", "tdesycoca", "", data, foundApp, foundObj);
tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false", tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
foundApp.data(), foundObj.data()); foundApp.data(), foundObj.data());

@ -31,9 +31,9 @@ install( FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd ) DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd )
##### kdnssd #################################### ##### tdednssd ####################################
set( target kdnssd ) set( target tdednssd )
set( ${target}_SRCS set( ${target}_SRCS
remoteservice.cpp responder.cpp servicebase.cpp remoteservice.cpp responder.cpp servicebase.cpp

@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO
lib_LTLIBRARIES = libkdnssd.la lib_LTLIBRARIES = libtdednssd.la
libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \ libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp
dnssdincludedir = $(includedir)/dnssd dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \ dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h publicservice.h servicebase.h servicebrowser.h settings.h
libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
#kde_kcfg_DATA = kcm_kdnssd.kcfg #kde_kcfg_DATA = kcm_tdednssd.kcfg
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -1,7 +1,7 @@
Checklist to ensure that zeroconf will work: Checklist to ensure that zeroconf will work:
1) Install Avahi, at least version 0.3 1) Install Avahi, at least version 0.3
2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs 2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs
3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
line starting with 'host:'. It should be something like: line starting with 'host:'. It should be something like:
host: files mdns dns host: files mdns dns

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kdnssdrc" /> <kcfgfile name="tdednssdrc" />
<group name="browsing" > <group name="browsing" >
<entry key="DomainList" type="StringList" > <entry key="DomainList" type="StringList" >
<label>Additional domains for browsing</label> <label>Additional domains for browsing</label>

@ -1,5 +1,5 @@
ClassName=Configuration ClassName=Configuration
File=kcm_kdnssd.kcfg File=kcm_tdednssd.kcfg
GlobalEnums=false GlobalEnums=false
Inherits=TDEConfigSkeleton Inherits=TDEConfigSkeleton
ItemAccessors=false ItemAccessors=false

@ -10,4 +10,4 @@
################################################# #################################################
add_subdirectory( common ) add_subdirectory( common )
add_subdirectory( kspell ) add_subdirectory( tdespell )

@ -1,3 +1,3 @@
SUBDIRS = common kspell tdelibs SUBDIRS = common tdespell tdelibs

@ -204,7 +204,7 @@ installations</para>
<refsect1> <refsect1>
<title>See Also</title> <title>See Also</title>
<para>ksycoca(3), kblah(4), knogga(6)</para> <para>tdesycoca(3), kblah(4), knogga(6)</para>
</refsect1> </refsect1>

@ -9,5 +9,5 @@
# #
################################################# #################################################
tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell ) tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION tdespell )
add_dependencies( kspell-en-handbook meinproc ) add_dependencies( tdespell-en-handbook meinproc )

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "&kspell;"> <!ENTITY kappname "&tdespell;">
<!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY % English "INCLUDE" > <!-- change language only here -->
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
]> ]>
@ -8,7 +8,7 @@
<book lang="&language;"> <book lang="&language;">
<bookinfo> <bookinfo>
<title>The &kspell; Handbook</title> <title>The &tdespell; Handbook</title>
<authorgroup> <authorgroup>
<author>&David.Sweet; &David.Sweet.mail;</author> <author>&David.Sweet; &David.Sweet.mail;</author>
@ -20,14 +20,14 @@
<date>2003-02-24</date> <date>2003-02-24</date>
<releaseinfo>1.00.00</releaseinfo> <releaseinfo>1.00.00</releaseinfo>
<abstract> <abstract>
<para>&kspell; is the spelling checker used by &tde; applications such <para>&tdespell; is the spelling checker used by &tde; applications such
as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to <application>International ISpell</application> and <application>ASpell</application>.</para> as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to <application>International ISpell</application> and <application>ASpell</application>.</para>
</abstract> </abstract>
<keywordset> <keywordset>
<keyword>spell</keyword> <keyword>spell</keyword>
<keyword>spelling</keyword> <keyword>spelling</keyword>
<keyword>kspell</keyword> <keyword>tdespell</keyword>
<keyword>ispell</keyword> <keyword>ispell</keyword>
<keyword>aspell</keyword> <keyword>aspell</keyword>
<keyword>check</keyword> <keyword>check</keyword>
@ -52,7 +52,7 @@ url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
<para><anchor id="spelldlg"/> <para><anchor id="spelldlg"/>
The top line in the dialog displays a possibly misspelled word which was found in your The top line in the dialog displays a possibly misspelled word which was found in your
document. &kspell; attempts to find an appropriate replacement word. One or document. &tdespell; attempts to find an appropriate replacement word. One or
several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>. several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>.
To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word
from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the
@ -130,7 +130,7 @@ your dictionary's distribution for more information.</para>
<title>Spell-checking client</title> <title>Spell-checking client</title>
<para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking <para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking
backend for &kspell;. <application>Ispell</application> is more widely available and may backend for &tdespell;. <application>Ispell</application> is more widely available and may
have better international support, but <application>Aspell</application> is gaining have better international support, but <application>Aspell</application> is gaining
popularity as it claims to give better suggestions for word replacements.</para> popularity as it claims to give better suggestions for word replacements.</para>
</sect1> </sect1>
@ -146,8 +146,8 @@ read the International <application>ISpell</application> man page.</para>
<chapter id="contact-information"> <chapter id="contact-information">
<title>Contact Information</title> <title>Contact Information</title>
<para>For more information about &kspell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&kspell; <para>For more information about &tdespell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&tdespell;
Home Page</ulink>. In particular, you will find information about programming the &kspell; C++ class.</para> Home Page</ulink>. In particular, you will find information about programming the &tdespell; C++ class.</para>
<para>You may email the author/maintainer with questions and/or comments at <para>You may email the author/maintainer with questions and/or comments at
&David.Sweet.mail;.</para> &David.Sweet.mail;.</para>

@ -9,12 +9,12 @@
# #
################################################# #################################################
add_subdirectory( ktexteditor ) add_subdirectory( tdetexteditor )
add_subdirectory( kscript ) add_subdirectory( tdescript )
add_subdirectory( kregexpeditor ) add_subdirectory( kregexpeditor )
add_subdirectory( kmediaplayer ) add_subdirectory( tdemediaplayer )
add_subdirectory( kio ) add_subdirectory( kio )
add_subdirectory( terminal ) add_subdirectory( terminal )
add_subdirectory( khexedit ) add_subdirectory( khexedit )
add_subdirectory( kimproxy ) add_subdirectory( tdeimproxy )
add_subdirectory( kspeech ) add_subdirectory( kspeech )

@ -1,5 +1,5 @@
SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer kio terminal khexedit tdeimproxy kspeech
DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop DOXYGEN_REFERENCES = tdecore tdefx tdeui tdeparts dcop
DOXYGEN_SET_RECURSIVE = YES DOXYGEN_SET_RECURSIVE = YES
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -1,5 +1,5 @@
INCLUDES= -I$(top_srcdir)/kparts $(all_includes) INCLUDES= -I$(top_srcdir)/tdeparts $(all_includes)
# the service type # the service type
servicetypedir = $(kde_servicetypesdir) servicetypedir = $(kde_servicetypesdir)

@ -19,7 +19,7 @@
#define BYTESEDITINTERFACE_H #define BYTESEDITINTERFACE_H
// kde specific // kde specific
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <tqwidget.h> #include <tqwidget.h>

@ -1,26 +0,0 @@
SUBDIRS = icons
INCLUDES = $(all_includes)
noinst_HEADERS = kimproxyiface.h
METASOURCES = AUTO
AM_CPPFLAGS = $(all_includes)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kimproxy.pot
kimproxyincludedir = $(includedir)
kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
lib_LTLIBRARIES = libkimproxy.la
libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
include $(top_srcdir)/admin/Doxyfile.am
DOXYGEN_REFERENCES = kabc dcop

@ -1,18 +0,0 @@
if include_ARTS
kfileaudiopreview_subdir = kfileaudiopreview
endif
SUBDIRS = . $(kfileaudiopreview_subdir)
INCLUDES = -I$(srcdir)/.. $(all_includes)
lib_LTLIBRARIES = libkmediaplayer.la
libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libkmediaplayer_la_METASOURCES = AUTO
kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
kmediaplayerincludedir = $(includedir)/kmediaplayer
kde_servicetypes_DATA = kmediaplayerengine.desktop kmediaplayer.desktop

@ -1,21 +0,0 @@
SUBDIRS = . sample
INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
#lib_LTLIBRARIES = libkscriptloader.la libkscript.la
lib_LTLIBRARIES = libkscript.la
#libkscriptloader_la_SOURCES = scriptloader.cpp
#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
#libkscriptloader_la_LIBADD = $(LIB_KPARTS)
libkscript_la_SOURCES = scriptmanager.cpp
libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
kscriptincludedir = $(includedir)
METASOURCES = AUTO
servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = scriptinterface.desktop

@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h
# Define DCOP/Text-to-Speech Service Type. # Define DCOP/Text-to-Speech Service Type.
kde_servicetypes_DATA = dcoptexttospeech.desktop kde_servicetypes_DATA = dcoptexttospeech.desktop
DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
include ../../admin/Doxyfile.am include ../../admin/Doxyfile.am

@ -186,7 +186,7 @@
* *
* There are two methods of making DCOP calls from your application to %KTTSD. * There are two methods of making DCOP calls from your application to %KTTSD.
* *
* - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/khtmlkttsd.cpp * - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/tdehtmlkttsd.cpp
* for an example. This method is recommended if you want to make a few simple calls to KTTSD. * for an example. This method is recommended if you want to make a few simple calls to KTTSD.
* - Use kspeech_stub as described below. This method generates the marshalling code for you * - Use kspeech_stub as described below. This method generates the marshalling code for you
* and is recommended for a more complex speech-enabled applications. kcmkttsmgr in the * and is recommended for a more complex speech-enabled applications. kcmkttsmgr in the

@ -29,17 +29,17 @@ link_directories(
##### headers ################################### ##### headers ###################################
install( FILES install( FILES
kimproxy.h kimproxyiface.h tdeimproxy.h tdeimproxyiface.h
DESTINATION ${INCLUDE_INSTALL_DIR} ) DESTINATION ${INCLUDE_INSTALL_DIR} )
##### kimproxy ################################## ##### tdeimproxy ##################################
set( target kimproxy ) set( target tdeimproxy )
set( ${target}_SRCS set( ${target}_SRCS
kimproxy.cpp kimproxyiface.skel tdeimproxy.cpp tdeimproxyiface.skel
${CMAKE_SOURCE_DIR}/interfaces/kimproxy/interface/kimiface.stub ${CMAKE_SOURCE_DIR}/interfaces/tdeimproxy/interface/kimiface.stub
) )
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC

@ -0,0 +1,26 @@
SUBDIRS = icons
INCLUDES = $(all_includes)
noinst_HEADERS = tdeimproxyiface.h
METASOURCES = AUTO
AM_CPPFLAGS = $(all_includes)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeimproxy.pot
tdeimproxyincludedir = $(includedir)
tdeimproxyinclude_HEADERS = tdeimproxy.h tdeimproxyiface.h
lib_LTLIBRARIES = libtdeimproxy.la
libtdeimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
libtdeimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
libtdeimproxy_la_SOURCES = tdeimproxy.cpp kimiface.stub tdeimproxyiface.skel
kimiface_DIR = $(top_srcdir)/interfaces/tdeimproxy/interface
include $(top_srcdir)/admin/Doxyfile.am
DOXYGEN_REFERENCES = kabc dcop

@ -1,5 +1,5 @@
/* /*
kimproxy.cpp tdeimproxy.cpp
IM service library for KDE IM service library for KDE
@ -35,7 +35,7 @@
#include "kimiface_stub.h" #include "kimiface_stub.h"
#include "kimproxy.h" #include "tdeimproxy.h"
static KStaticDeleter<KIMProxy> _staticDeleter; static KStaticDeleter<KIMProxy> _staticDeleter;
@ -650,4 +650,4 @@ TQString KIMProxy::preferredApp()
return preferredApp; return preferredApp;
} }
#include "kimproxy.moc" #include "tdeimproxy.moc"

@ -1,5 +1,5 @@
/* /*
kimproxy.h tdeimproxy.h
IM service library for KDE IM service library for KDE
@ -35,7 +35,7 @@
#define IM_CLIENT_PREFERENCES_SECTION "InstantMessenger" #define IM_CLIENT_PREFERENCES_SECTION "InstantMessenger"
#define IM_CLIENT_PREFERENCES_ENTRY "imClient" #define IM_CLIENT_PREFERENCES_ENTRY "imClient"
#include "kimproxyiface.h" #include "tdeimproxyiface.h"
class DCOPClient; class DCOPClient;
class KIMIface_stub; class KIMIface_stub;

@ -1,5 +1,5 @@
/* /*
kimproxyiface.cpp tdeimproxyiface.cpp
IM service library for KDE IM service library for KDE

@ -33,19 +33,19 @@ link_directories(
install( FILES install( FILES
player.h playerdcopobject.h view.h player.h playerdcopobject.h view.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kmediaplayer ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdemediaplayer )
##### other data ################################ ##### other data ################################
install( FILES install( FILES
kmediaplayerengine.desktop kmediaplayer.desktop tdemediaplayerengine.desktop tdemediaplayer.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} ) DESTINATION ${SERVICETYPES_INSTALL_DIR} )
##### kmediaplayer ############################## ##### tdemediaplayer ##############################
set( target kmediaplayer ) set( target tdemediaplayer )
set( ${target}_SRCS set( ${target}_SRCS
player.cpp view.cpp playerdcopobject.skel player.cpp view.cpp playerdcopobject.skel
@ -54,7 +54,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.0 VERSION 0.0.0
LINK kparts-shared LINK tdeparts-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
DEPENDENCIES dcopidl DEPENDENCIES dcopidl
) )

@ -0,0 +1,18 @@
if include_ARTS
kfileaudiopreview_subdir = kfileaudiopreview
endif
SUBDIRS = . $(kfileaudiopreview_subdir)
INCLUDES = -I$(srcdir)/.. $(all_includes)
lib_LTLIBRARIES = libtdemediaplayer.la
libtdemediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
libtdemediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libtdemediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdemediaplayer_la_METASOURCES = AUTO
tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
tdemediaplayerincludedir = $(includedir)/tdemediaplayer
kde_servicetypes_DATA = tdemediaplayerengine.desktop tdemediaplayer.desktop

@ -41,6 +41,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kmediaplayer-shared artskde-shared LINK tdemediaplayer-shared artskde-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfileaudiopreview.la
kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
noinst_HEADERS = kfileaudiopreview.h noinst_HEADERS = kfileaudiopreview.h

@ -9,9 +9,9 @@
#include <kconfig.h> #include <kconfig.h>
#include <klibloader.h> #include <klibloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmediaplayer/player.h> #include <tdemediaplayer/player.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kplayobjectfactory.h> #include <kplayobjectfactory.h>

@ -21,7 +21,7 @@
// used in advertising or otherwise to promote the sale, use or other dealings // used in advertising or otherwise to promote the sale, use or other dealings
// in this Software without prior written authorization from the author(s). // in this Software without prior written authorization from the author(s).
#include <kmediaplayer/player.h> #include <tdemediaplayer/player.h>
KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void) KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void)
: DCOPObject("KMediaPlayer") : DCOPObject("KMediaPlayer")

@ -24,9 +24,9 @@
#ifndef KMEDIAPLAYERPLAYER_H #ifndef KMEDIAPLAYERPLAYER_H
#define KMEDIAPLAYERPLAYER_H #define KMEDIAPLAYERPLAYER_H
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kmediaplayer/playerdcopobject.h> #include <tdemediaplayer/playerdcopobject.h>
#include <kmediaplayer/view.h> #include <tdemediaplayer/view.h>
/** KMediaPlayer contains an interface to reusable media player components. /** KMediaPlayer contains an interface to reusable media player components.
*/ */

@ -21,7 +21,7 @@
// used in advertising or otherwise to promote the sale, use or other dealings // used in advertising or otherwise to promote the sale, use or other dealings
// in this Software without prior written authorization from the author(s). // in this Software without prior written authorization from the author(s).
#include <kmediaplayer/view.h> #include <tdemediaplayer/view.h>
struct KMediaPlayer::View::Data struct KMediaPlayer::View::Data
{ {

@ -40,9 +40,9 @@ install( FILES
install( FILES scriptinterface.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) install( FILES scriptinterface.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
##### kscript ################################### ##### tdescript ###################################
set( target kscript ) set( target tdescript )
set( ${target}_SRCS set( ${target}_SRCS
scriptmanager.cpp scriptmanager.cpp

@ -0,0 +1,21 @@
SUBDIRS = . sample
INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
#lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
lib_LTLIBRARIES = libtdescript.la
#libtdescriptloader_la_SOURCES = scriptloader.cpp
#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#libtdescriptloader_la_LIBADD = $(LIB_KPARTS)
libtdescript_la_SOURCES = scriptmanager.cpp
libtdescript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
libtdescript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
tdescriptincludedir = $(includedir)
METASOURCES = AUTO
servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = scriptinterface.desktop

@ -13,7 +13,7 @@ include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/interfaces/kscript ${CMAKE_SOURCE_DIR}/interfaces/tdescript
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore
) )
@ -38,6 +38,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kscript-shared LINK tdescript-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,10 +1,10 @@
INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/kscript $(all_includes) INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
kde_module_LTLIBRARIES = libshellscript.la kde_module_LTLIBRARIES = libshellscript.la
libshellscript_la_SOURCES = shellscript.cpp libshellscript_la_SOURCES = shellscript.cpp
libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la libshellscript_la_LIBADD = ../libtdescript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
METASOURCES = AUTO METASOURCES = AUTO

@ -19,8 +19,8 @@
#include "scriptloader.h" #include "scriptloader.h"
#include <kapplication.h> #include <kapplication.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <kconfig.h>

@ -21,7 +21,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kmainwindow.h> #include <kmainwindow.h>
#include <kaction.h> #include <kaction.h>
#include <kscript/scriptinterface.h> #include <tdescript/scriptinterface.h>
/** /**
* Script loader * Script loader

@ -1,6 +1,6 @@
#include "scriptmanager.h" #include "scriptmanager.h"
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -46,28 +46,28 @@ install( FILES
selectioninterfaceext.h selectionextdcopinterface.h selectioninterfaceext.h selectionextdcopinterface.h
texthintinterface.h editinterfaceext.h variableinterface.h texthintinterface.h editinterfaceext.h variableinterface.h
templateinterface.h templateinterface.h
DESTINATION ${INCLUDE_INSTALL_DIR}/ktexteditor ) DESTINATION ${INCLUDE_INSTALL_DIR}/tdetexteditor )
##### other data ################################ ##### other data ################################
install( FILES install( FILES
ktexteditor.desktop ktexteditoreditor.desktop tdetexteditor.desktop tdetexteditoreditor.desktop
ktexteditorplugin.desktop tdetexteditorplugin.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} ) DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES install( FILES
kcm_ktexteditor.desktop kcm_tdetexteditor.desktop
DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser ) DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser )
##### ktexteditor ############################### ##### tdetexteditor ###############################
set( target ktexteditor ) set( target tdetexteditor )
set( ${target}_SRCS set( ${target}_SRCS
ktexteditor.cpp tdetexteditor.cpp
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp
@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.0 VERSION 0.0.0
LINK tdeui-shared kabc-shared kparts-shared LINK tdeui-shared kabc-shared tdeparts-shared
DEPENDENCIES dcopidl dcopidl2cpp DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -1,8 +1,8 @@
INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes) INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
lib_LTLIBRARIES = libktexteditor.la lib_LTLIBRARIES = libtdetexteditor.la
libktexteditor_la_SOURCES = ktexteditor.cpp \ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \ editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \ codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \ configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \
@ -22,10 +22,10 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI) libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \ tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
selectioninterface.h cursorinterface.h \ selectioninterface.h cursorinterface.h \
clipboardinterface.h popupmenuinterface.h \ clipboardinterface.h popupmenuinterface.h \
viewcursorinterface.h searchinterface.h highlightinginterface.h \ viewcursorinterface.h searchinterface.h highlightinginterface.h \
@ -36,15 +36,15 @@ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h
documentinfo.h selectioninterfaceext.h selectionextdcopinterface.h texthintinterface.h \ documentinfo.h selectioninterfaceext.h selectionextdcopinterface.h texthintinterface.h \
editinterfaceext.h variableinterface.h templateinterface.h editinterfaceext.h variableinterface.h templateinterface.h
ktexteditorincludedir = $(includedir)/ktexteditor tdetexteditorincludedir = $(includedir)/tdetexteditor
METASOURCES = AUTO METASOURCES = AUTO
servicetypedir = $(kde_servicetypesdir) servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = ktexteditor.desktop ktexteditoreditor.desktop ktexteditorplugin.desktop servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetexteditorplugin.desktop
kcm_ktexteditor_DATA = kcm_ktexteditor.desktop kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
templateinterface.lo: $(top_builddir)/kabc/addressee.h templateinterface.lo: $(top_builddir)/kabc/addressee.h

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_blockselectioninterface_h__ #ifndef __tdetexteditor_blockselectioninterface_h__
#define __ktexteditor_blockselectioninterface_h__ #define __tdetexteditor_blockselectioninterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_clipboardinterface_h__ #ifndef __tdetexteditor_clipboardinterface_h__
#define __ktexteditor_clipboardinterface_h__ #define __tdetexteditor_clipboardinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_codecompletioninterface_h__ #ifndef __tdetexteditor_codecompletioninterface_h__
#define __ktexteditor_codecompletioninterface_h__ #define __tdetexteditor_codecompletioninterface_h__
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_configinterface_h__ #ifndef __tdetexteditor_configinterface_h__
#define __ktexteditor_configinterface_h__ #define __tdetexteditor_configinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_configinterfaceextension_h__ #ifndef __tdetexteditor_configinterfaceextension_h__
#define __ktexteditor_configinterfaceextension_h__ #define __tdetexteditor_configinterfaceextension_h__
#include <tqwidget.h> #include <tqwidget.h>
#include <tqpixmap.h> #include <tqpixmap.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_cursorinterface_h__ #ifndef __tdetexteditor_cursorinterface_h__
#define __ktexteditor_cursorinterface_h__ #define __tdetexteditor_cursorinterface_h__
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqstring.h> #include <tqstring.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_document_h__ #ifndef __tdetexteditor_document_h__
#define __ktexteditor_document_h__ #define __tdetexteditor_document_h__
#include "editor.h" #include "editor.h"

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_documentinfointerface_h__ #ifndef __tdetexteditor_documentinfointerface_h__
#define __ktexteditor_documentinfointerface_h__ #define __tdetexteditor_documentinfointerface_h__
class TQString; class TQString;
class TQCString; class TQCString;

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_dynwordwrapinterface_h__ #ifndef __tdetexteditor_dynwordwrapinterface_h__
#define __ktexteditor_dynwordwrapinterface_h__ #define __tdetexteditor_dynwordwrapinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_editinterface_h__ #ifndef __tdetexteditor_editinterface_h__
#define __ktexteditor_editinterface_h__ #define __tdetexteditor_editinterface_h__
#include <tqstring.h> #include <tqstring.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_editinterfaceext_h__ #ifndef __tdetexteditor_editinterfaceext_h__
#define __ktexteditor_editinterfaceext_h__ #define __tdetexteditor_editinterfaceext_h__
#include <tqstring.h> #include <tqstring.h>

@ -16,10 +16,10 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_editor_h__ #ifndef __tdetexteditor_editor_h__
#define __ktexteditor_editor_h__ #define __tdetexteditor_editor_h__
#include <kparts/part.h> #include <tdeparts/part.h>
/** /**
* KTextEditor is KDE's standard text editing KPart interface. * KTextEditor is KDE's standard text editing KPart interface.

@ -1,8 +1,8 @@
#ifndef _EDITOR_CHOOSER_H_ #ifndef _EDITOR_CHOOSER_H_
#define _EDITOR_CHOOSER_H_ #define _EDITOR_CHOOSER_H_
#include <ktexteditor/editor.h> #include <tdetexteditor/editor.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <tqwidget.h> #include <tqwidget.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_encodinginterface_h__ #ifndef __tdetexteditor_encodinginterface_h__
#define __ktexteditor_encodinginterface_h__ #define __tdetexteditor_encodinginterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_highlightinginterface_h__ #ifndef __tdetexteditor_highlightinginterface_h__
#define __ktexteditor_highlightinginterface_h__ #define __tdetexteditor_highlightinginterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_markinterface_h__ #ifndef __tdetexteditor_markinterface_h__
#define __ktexteditor_markinterface_h__ #define __tdetexteditor_markinterface_h__
#include <tqptrlist.h> #include <tqptrlist.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_markinterface_extension_h__ #ifndef __tdetexteditor_markinterface_extension_h__
#define __ktexteditor_markinterface_extension_h__ #define __tdetexteditor_markinterface_extension_h__
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqpixmap.h> #include <tqpixmap.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_plugin_h__ #ifndef __tdetexteditor_plugin_h__
#define __ktexteditor_plugin_h__ #define __tdetexteditor_plugin_h__
#include <tqobject.h> #include <tqobject.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_popupmenuinterface_h__ #ifndef __tdetexteditor_popupmenuinterface_h__
#define __ktexteditor_popupmenuinterface_h__ #define __tdetexteditor_popupmenuinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_printinterface_h__ #ifndef __tdetexteditor_printinterface_h__
#define __ktexteditor_printinterface_h__ #define __tdetexteditor_printinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_searchinterface_h__ #ifndef __tdetexteditor_searchinterface_h__
#define __ktexteditor_searchinterface_h__ #define __tdetexteditor_searchinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_selectioninterface_h__ #ifndef __tdetexteditor_selectioninterface_h__
#define __ktexteditor_selectioninterface_h__ #define __tdetexteditor_selectioninterface_h__
#include <tqstring.h> #include <tqstring.h>

@ -19,8 +19,8 @@
$Id$ $Id$
*/ */
#ifndef __ktexteditor_selectioninterface_ext_h__ #ifndef __tdetexteditor_selectioninterface_ext_h__
#define __ktexteditor_selectioninterface_ext_h__ #define __tdetexteditor_selectioninterface_ext_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_sessionconfiginterface_h__ #ifndef __tdetexteditor_sessionconfiginterface_h__
#define __ktexteditor_sessionconfiginterface_h__ #define __tdetexteditor_sessionconfiginterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -25,8 +25,8 @@
#include "editor.h" #include "editor.h"
#include <kaction.h> #include <kaction.h>
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include "document.moc" #include "document.moc"
#include "view.moc" #include "view.moc"

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_templateinterface_h__ #ifndef __tdetexteditor_templateinterface_h__
#define __ktexteditor_templateinterface_h__ #define __tdetexteditor_templateinterface_h__
#include <tqstring.h> #include <tqstring.h>
#include <tqmap.h> #include <tqmap.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_texthintinterface_h__ #ifndef __tdetexteditor_texthintinterface_h__
#define __ktexteditor_texthintinterface_h__ #define __tdetexteditor_texthintinterface_h__
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_undointerface_h__ #ifndef __tdetexteditor_undointerface_h__
#define __ktexteditor_undointerface_h__ #define __tdetexteditor_undointerface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_view_h__ #ifndef __tdetexteditor_view_h__
#define __ktexteditor_view_h__ #define __tdetexteditor_view_h__
#include <tqwidget.h> #include <tqwidget.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_viewcursorinterface_h__ #ifndef __tdetexteditor_viewcursorinterface_h__
#define __ktexteditor_viewcursorinterface_h__ #define __tdetexteditor_viewcursorinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_viewstatusmsginterface_h__ #ifndef __tdetexteditor_viewstatusmsginterface_h__
#define __ktexteditor_viewstatusmsginterface_h__ #define __tdetexteditor_viewstatusmsginterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ktexteditor_wordwrapinterface_h__ #ifndef __tdetexteditor_wordwrapinterface_h__
#define __ktexteditor_wordwrapinterface_h__ #define __tdetexteditor_wordwrapinterface_h__
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -1,2 +1,2 @@
ktexteditorinclude_HEADERS = kde_terminal_interface.h tdetexteditorinclude_HEADERS = kde_terminal_interface.h
ktexteditorincludedir = $(includedir) tdetexteditorincludedir = $(includedir)

@ -1,5 +1,5 @@
#include <kde_terminal_interface.h> #include <kde_terminal_interface.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <ktrader.h> #include <ktrader.h>
#include <klibloader.h> #include <klibloader.h>
#include <kmainwindow.h> #include <kmainwindow.h>

@ -59,7 +59,7 @@ install( FILES
##### other data ################################ ##### other data ################################
install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources ) install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc ) install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
@ -102,7 +102,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.2.0 VERSION 1.2.0
LINK vcards-static vcard-shared kio-shared kresources-shared LINK vcards-static vcard-shared kio-shared tderesources-shared
DEPENDENCIES addressee.h dcopidl DEPENDENCIES addressee.h dcopidl
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
lib_LTLIBRARIES = libkabc.la lib_LTLIBRARIES = libkabc.la
libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \ libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
$(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libkabc_la_COMPILE_FIRST = addressee.h libkabc_la_COMPILE_FIRST = addressee.h
libkabc_la_SOURCES = \ libkabc_la_SOURCES = \
@ -52,7 +52,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kab2kabc bin_PROGRAMS = kab2kabc
kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kab2kabc_LDADD = libkabc.la ../kab/libkab.la kab2kabc_LDADD = libkabc.la ../kab/libkab.la
kab2kabc_SOURCES = kab2kabc.cpp kab2kabc_SOURCES = kab2kabc.cpp
@ -60,7 +60,7 @@ autostart_DATA = kab2kabc.desktop
autostartdir = $(datadir)/autostart autostartdir = $(datadir)/autostart
manager_DATA = kabc_manager.desktop manager_DATA = kabc_manager.desktop
managerdir = $(kde_servicesdir)/kresources managerdir = $(kde_servicesdir)/tderesources
DOXYGEN_REFERENCES = tdecore tdeui DOXYGEN_REFERENCES = tdecore tdeui

@ -24,7 +24,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kresources/manager.h> #include <tderesources/manager.h>
#include "addressee.h" #include "addressee.h"
#include "field.h" #include "field.h"

@ -39,7 +39,7 @@ install( FILES
##### other data ################################ ##### other data ################################
install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_dir (library) ######################## ##### kabc_dir (library) ########################

@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h
lib_LTLIBRARIES = libkabc_dir.la lib_LTLIBRARIES = libkabc_dir.la
libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
kde_module_LTLIBRARIES = kabc_dir.la kde_module_LTLIBRARIES = kabc_dir.la
@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcedir.h kabcinclude_HEADERS = resourcedir.h
servicedir = $(kde_servicesdir)/kresources/kabc servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = dir.desktop service_DATA = dir.desktop
resourcedirplugin.lo: ../../addressee.h resourcedirplugin.lo: ../../addressee.h

@ -24,7 +24,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kresources/configwidget.h> #include <tderesources/configwidget.h>
namespace KABC { namespace KABC {

@ -15,5 +15,5 @@ METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot $(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot
servicedir = $(kde_servicesdir)/kresources/kabc servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = evolution.desktop service_DATA = evolution.desktop

@ -39,7 +39,7 @@ install( FILES
##### other data ################################ ##### other data ################################
install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_file (library) ####################### ##### kabc_file (library) #######################

@ -6,7 +6,7 @@ noinst_HEADERS = resourcefileconfig.h
lib_LTLIBRARIES = libkabc_file.la lib_LTLIBRARIES = libkabc_file.la
libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI) libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
@ -24,5 +24,5 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcefile.h kabcinclude_HEADERS = resourcefile.h
servicedir = $(kde_servicesdir)/kresources/kabc servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = file.desktop service_DATA = file.desktop

@ -24,7 +24,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kresources/configwidget.h> #include <tderesources/configwidget.h>
namespace KABC { namespace KABC {

@ -39,7 +39,7 @@ install( FILES
##### other data ################################ ##### other data ################################
install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_ldapkio ############################## ##### kabc_ldapkio ##############################

@ -6,7 +6,7 @@ noinst_HEADERS = resourceldapkioconfig.h
lib_LTLIBRARIES = libkabc_ldapkio.la lib_LTLIBRARIES = libkabc_ldapkio.la
libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE) libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
kde_module_LTLIBRARIES = kabc_ldapkio.la kde_module_LTLIBRARIES = kabc_ldapkio.la
@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourceldapkio.h kabcinclude_HEADERS = resourceldapkio.h
servicedir = $(kde_servicesdir)/kresources/kabc servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = ldapkio.desktop service_DATA = ldapkio.desktop
resourceldapkioplugin.lo: ../../addressee.h resourceldapkioplugin.lo: ../../addressee.h

@ -27,7 +27,7 @@
#include <tqdict.h> #include <tqdict.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kresources/configwidget.h> #include <tderesources/configwidget.h>
#include <kabc/ldif.h> #include <kabc/ldif.h>
#include <kabc/ldapconfigwidget.h> #include <kabc/ldapconfigwidget.h>

@ -39,7 +39,7 @@ install( FILES
##### other data ################################ ##### other data ################################
install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_net (library) ######################## ##### kabc_net (library) ########################

@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcenet.h kabcinclude_HEADERS = resourcenet.h
servicedir = $(kde_servicesdir)/kresources/kabc servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = net.desktop service_DATA = net.desktop
resourcenetplugin.lo: ../../addressee.h resourcenetplugin.lo: ../../addressee.h

@ -24,7 +24,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kresources/configwidget.h> #include <tderesources/configwidget.h>
namespace KABC { namespace KABC {

@ -15,6 +15,6 @@ METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot $(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot
linkdir = $(kde_datadir)/kresources/contact linkdir = $(kde_datadir)/tderesources/contact
link_DATA = sql.desktop link_DATA = sql.desktop
EXTRA_DIST = $(link_DATA) EXTRA_DIST = $(link_DATA)

@ -21,7 +21,7 @@
#ifndef KABC_RESOURCE_H #ifndef KABC_RESOURCE_H
#define KABC_RESOURCE_H #define KABC_RESOURCE_H
#include <kresources/resource.h> #include <tderesources/resource.h>
#include "addressbook.h" #include "addressbook.h"
#include "plugin.h" #include "plugin.h"

@ -24,7 +24,7 @@
#include <kcrash.h> #include <kcrash.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kresources/manager.h> #include <tderesources/manager.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>

@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries) testlock_LDFLAGS = $(all_libraries)
testlock_SOURCES = testlock.cpp testlock_SOURCES = testlock.cpp
testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testldapclient_SOURCES = testldapclient.cpp testldapclient_SOURCES = testldapclient.cpp
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \ EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testkabc_SOURCES = testkabc.cpp testkabc_SOURCES = testkabc.cpp
testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddressee_SOURCES = testaddressee.cpp testaddressee_SOURCES = testaddressee.cpp
testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddresseelist_SOURCES = testaddresseelist.cpp testaddresseelist_SOURCES = testaddresseelist.cpp
testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddressfmt_SOURCES = testaddressfmt.cpp testaddressfmt_SOURCES = testaddressfmt.cpp
testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testkabcdlg_SOURCES = testkabcdlg.cpp testkabcdlg_SOURCES = testkabcdlg.cpp
testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdistlist_SOURCES = testdistlist.cpp testdistlist_SOURCES = testdistlist.cpp
testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddresslineedit_SOURCES = testaddresslineedit.cpp testaddresslineedit_SOURCES = testaddresslineedit.cpp
bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigread_SOURCES = bigread.cpp bigread_SOURCES = bigread.cpp
bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigwrite_SOURCES = bigwrite.cpp bigwrite_SOURCES = bigwrite.cpp
testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdb_SOURCES = testdb.cpp testdb_SOURCES = testdb.cpp
kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcargl_SOURCES = kabcargl.cpp kabcargl_SOURCES = kabcargl.cpp

@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
check_PROGRAMS = testwrite testread check_PROGRAMS = testwrite testread
testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testwrite_LDADD = libvcard.la testwrite_LDADD = libvcard.la
testwrite_SOURCES = testwrite.cpp testwrite_SOURCES = testwrite.cpp
testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testread_LDADD = libvcard.la testread_LDADD = libvcard.la
testread_SOURCES = testread.cpp testread_SOURCES = testread.cpp

@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2 check_PROGRAMS = testread testwrite testread2
testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread_SOURCES = testread.cpp testread_SOURCES = testread.cpp
testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread2_SOURCES = testread2.cpp testutils.cpp testread2_SOURCES = testread2.cpp testutils.cpp
testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testwrite_SOURCES = testwrite.cpp testwrite_SOURCES = testwrite.cpp

@ -33,7 +33,7 @@
(original author of kwrite in kde 1.x until kde 2.1) (original author of kwrite in kde 1.x until kde 2.1)
- Glen Parker <glenebob@nwlink.com> - Glen Parker <glenebob@nwlink.com>
(undo history, kspell-integration) (undo history, tdespell-integration)
- Michael Koch <koch@kde.org> - Michael Koch <koch@kde.org>
(port to KParts) (port to KParts)

@ -33,7 +33,7 @@
* some folding fixes (hopefully) * some folding fixes (hopefully)
* memleak fix * memleak fix
* undo stuff changed a bit, 0 means unlimited like before, show * undo stuff changed a bit, 0 means unlimited like before, show
that now in the dialog and add a comment to ktexteditor that now in the dialog and add a comment to tdetexteditor
2002-08-26 Christoph Cullmann <cullmann@kde.org> 2002-08-26 Christoph Cullmann <cullmann@kde.org>
* Fixes for folding, cleanup, move folding tree into the buffer, * Fixes for folding, cleanup, move folding tree into the buffer,

@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
@lgpl @lgpl
*/ */
// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs // DOXYGEN_REFERENCES = tdecore kio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs
// DOXYGEN_SET_PROJECT_NAME = Kate // DOXYGEN_SET_PROJECT_NAME = Kate
// vim:ts=4:sw=4:expandtab:filetype=doxygen // vim:ts=4:sw=4:expandtab:filetype=doxygen

@ -6,6 +6,6 @@ messages:
$(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp $(EXTRACTATTR) --attr=language,name,Language --attr="language,section,Language Section" data/*.xml >> rc.cpp
$(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot $(XGETTEXT) `find . -name "*.cpp"` part/*.h -o $(podir)/katepart.pot
DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -17,7 +17,7 @@
- Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset". - Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset".
- Added CSS 3 color values: "rgba", "hsl" and "hsla". - Added CSS 3 color values: "rgba", "hsl" and "hsla".
- Added Gecko CSS properties: "-moz-border-*-colors". - Added Gecko CSS properties: "-moz-border-*-colors".
- Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-". - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-tdehtml-".
- Version 2.01, by Mathieu Bonnet: - Version 2.01, by Mathieu Bonnet:
- Added CSS 3 property "border-radius". - Added CSS 3 property "border-radius".
@ -196,7 +196,7 @@
<item> -o-text-overflow </item> <item> -o-text-overflow </item>
<!-- konq specific --> <!-- konq specific -->
<item> -khtml-background-size </item> <item> -tdehtml-background-size </item>
<item> konq_bgpos_x </item> <item> konq_bgpos_x </item>
<item> konq_bgpos_y </item> <item> konq_bgpos_y </item>

@ -77,7 +77,7 @@
</Menu> </Menu>
</MenuBar> </MenuBar>
<Menu name="ktexteditor_popup" noMerge="1"> <Menu name="tdetexteditor_popup" noMerge="1">
<Action name="edit_undo" group="popup_operations" /> <Action name="edit_undo" group="popup_operations" />
<Action name="edit_redo" group="popup_operations" /> <Action name="edit_redo" group="popup_operations" />
<Separator group="popup_operations" /> <Separator group="popup_operations" />

@ -92,7 +92,7 @@
</Menu> </Menu>
</MenuBar> </MenuBar>
<Menu name="ktexteditor_popup" noMerge="0"> <Menu name="tdetexteditor_popup" noMerge="0">
<Action name="edit_undo" group="popup_operations" /> <Action name="edit_undo" group="popup_operations" />
<Action name="edit_redo" group="popup_operations" /> <Action name="edit_redo" group="popup_operations" />
<Separator group="popup_operations" /> <Separator group="popup_operations" />

@ -189,7 +189,7 @@
<item> -o-text-overflow </item> <item> -o-text-overflow </item>
<!-- konq specific --> <!-- konq specific -->
<item> -khtml-background-size </item> <item> -tdehtml-background-size </item>
<item> konq_bgpos_x </item> <item> konq_bgpos_x </item>
<item> konq_bgpos_y </item> <item> konq_bgpos_y </item>

@ -42,6 +42,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 0.0.0 VERSION 0.0.0
LINK ktexteditor-shared LINK tdetexteditor-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc
lib_LTLIBRARIES = libkatepartinterfaces.la lib_LTLIBRARIES = libkatepartinterfaces.la
libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE) libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
kateinclude_HEADERS = document.h view.h kateinclude_HEADERS = document.h view.h
kateincludedir = $(includedir)/kate kateincludedir = $(includedir)/kate
INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes) INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeparts -I$(top_srcdir) $(all_includes)

@ -19,24 +19,24 @@
#ifndef _KATE_DOCUMENT_INCLUDE_ #ifndef _KATE_DOCUMENT_INCLUDE_
#define _KATE_DOCUMENT_INCLUDE_ #define _KATE_DOCUMENT_INCLUDE_
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/undointerface.h> #include <tdetexteditor/undointerface.h>
#include <ktexteditor/cursorinterface.h> #include <tdetexteditor/cursorinterface.h>
#include <ktexteditor/documentinfo.h> #include <tdetexteditor/documentinfo.h>
#include <ktexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterface.h>
#include <ktexteditor/selectioninterfaceext.h> #include <tdetexteditor/selectioninterfaceext.h>
#include <ktexteditor/blockselectioninterface.h> #include <tdetexteditor/blockselectioninterface.h>
#include <ktexteditor/searchinterface.h> #include <tdetexteditor/searchinterface.h>
#include <ktexteditor/highlightinginterface.h> #include <tdetexteditor/highlightinginterface.h>
#include <ktexteditor/configinterface.h> #include <tdetexteditor/configinterface.h>
#include <ktexteditor/configinterfaceextension.h> #include <tdetexteditor/configinterfaceextension.h>
#include <ktexteditor/markinterface.h> #include <tdetexteditor/markinterface.h>
#include <ktexteditor/markinterfaceextension.h> #include <tdetexteditor/markinterfaceextension.h>
#include <ktexteditor/wordwrapinterface.h> #include <tdetexteditor/wordwrapinterface.h>
#include <ktexteditor/printinterface.h> #include <tdetexteditor/printinterface.h>
#include <ktexteditor/variableinterface.h> #include <tdetexteditor/variableinterface.h>
#include <kaction.h> #include <kaction.h>

@ -19,14 +19,14 @@
#ifndef _KATE_VIEW_INCLUDE_ #ifndef _KATE_VIEW_INCLUDE_
#define _KATE_VIEW_INCLUDE_ #define _KATE_VIEW_INCLUDE_
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <ktexteditor/clipboardinterface.h> #include <tdetexteditor/clipboardinterface.h>
#include <ktexteditor/popupmenuinterface.h> #include <tdetexteditor/popupmenuinterface.h>
#include <ktexteditor/markinterface.h> #include <tdetexteditor/markinterface.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
#include <ktexteditor/codecompletioninterface.h> #include <tdetexteditor/codecompletioninterface.h>
#include <ktexteditor/dynwordwrapinterface.h> #include <tdetexteditor/dynwordwrapinterface.h>
class TDEConfig; class TDEConfig;

@ -25,7 +25,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kjs ${CMAKE_SOURCE_DIR}/kjs
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/tdeutils
${CMAKE_SOURCE_DIR}/tdeprint ${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_kpart( ${target} tde_add_kpart( ${target}
SOURCES dummy.cpp SOURCES dummy.cpp
EMBED kate-static EMBED kate-static
LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared LINK kjs-shared tdeprint-shared katepartinterfaces-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \
libkatepart_la_SOURCES = dummy.cpp libkatepart_la_SOURCES = dummy.cpp
libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes) INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO

@ -118,7 +118,7 @@ class KateFileLoader
if (c > 0) if (c > 0)
{ {
// fix utf16 LE, stolen from khtml ;) // fix utf16 LE, stolen from tdehtml ;)
if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00)) if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00))
{ {
// utf16LE, we need to put the decoder in LE mode // utf16LE, we need to put the decoder in LE mode

@ -28,7 +28,7 @@
#ifndef __KateCodeCompletion_H__ #ifndef __KateCodeCompletion_H__
#define __KateCodeCompletion_H__ #define __KateCodeCompletion_H__
#include <ktexteditor/codecompletioninterface.h> #include <tdetexteditor/codecompletioninterface.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqstringlist.h> #include <tqstringlist.h>

@ -19,7 +19,7 @@
#ifndef __KATE_CONFIG_H__ #ifndef __KATE_CONFIG_H__
#define __KATE_CONFIG_H__ #define __KATE_CONFIG_H__
#include <ktexteditor/markinterface.h> #include <tdetexteditor/markinterface.h>
#include <tqbitarray.h> #include <tqbitarray.h>
#include <tqcolor.h> #include <tqcolor.h>

@ -35,8 +35,8 @@
#include "kateview.h" #include "kateview.h"
#include <ktexteditor/configinterfaceextension.h> #include <tdetexteditor/configinterfaceextension.h>
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <kio/job.h> #include <kio/job.h>
#include <kio/jobclasses.h> #include <kio/jobclasses.h>
@ -64,7 +64,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmimetypechooser.h> #include <kmimetypechooser.h>
#include <knuminput.h> #include <knuminput.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kprocio.h> #include <kprocio.h>

@ -40,14 +40,14 @@
#include "katefiletype.h" #include "katefiletype.h"
#include "kateschema.h" #include "kateschema.h"
#include "katetemplatehandler.h" #include "katetemplatehandler.h"
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <kio/job.h> #include <kio/job.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <kio/kfileitem.h> #include <kio/kfileitem.h>
#include <kparts/event.h> #include <tdeparts/event.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
// my dcop object // my dcop object
setObjId ("KateDocument#"+documentDCOPSuffix()); setObjId ("KateDocument#"+documentDCOPSuffix());
// ktexteditor interfaces // tdetexteditor interfaces
setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix()); setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix());
setConfigInterfaceDCOPSuffix (documentDCOPSuffix()); setConfigInterfaceDCOPSuffix (documentDCOPSuffix());
setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix()); setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix());
@ -2761,7 +2761,7 @@ bool KateDocument::closeURL()
} }
// //
// first call the normal kparts implementation // first call the normal tdeparts implementation
// //
if (!KParts::ReadWritePart::closeURL ()) if (!KParts::ReadWritePart::closeURL ())
return false; return false;

@ -29,11 +29,11 @@
#include "../interfaces/document.h" #include "../interfaces/document.h"
#include <ktexteditor/configinterfaceextension.h> #include <tdetexteditor/configinterfaceextension.h>
#include <ktexteditor/encodinginterface.h> #include <tdetexteditor/encodinginterface.h>
#include <ktexteditor/sessionconfiginterface.h> #include <tdetexteditor/sessionconfiginterface.h>
#include <ktexteditor/editinterfaceext.h> #include <tdetexteditor/editinterfaceext.h>
#include <ktexteditor/templateinterface.h> #include <tdetexteditor/templateinterface.h>
#include <dcopobject.h> #include <dcopobject.h>
@ -955,7 +955,7 @@ class KateDocument : public Kate::Document,
/** /**
* Variable Reader * Variable Reader
* TODO add register functionality/ktexteditor interface * TODO add register functionality/tdetexteditor interface
*/ */
private: private:
/** /**

@ -23,7 +23,7 @@
#include "../interfaces/document.h" #include "../interfaces/document.h"
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>

@ -20,7 +20,7 @@
#define __KATE_FACTORY_H__ #define __KATE_FACTORY_H__
#include "katejscript.h" #include "katejscript.h"
#include <kparts/factory.h> #include <tdeparts/factory.h>
#include <ktrader.h> #include <ktrader.h>
#include <kinstance.h> #include <kinstance.h>
@ -148,7 +148,7 @@ class KateFactory
/** /**
* on start detected plugins * on start detected plugins
* @return list of all at launch detected ktexteditor::plugins * @return list of all at launch detected tdetexteditor::plugins
*/ */
inline const KTrader::OfferList &plugins () { return m_plugins; }; inline const KTrader::OfferList &plugins () { return m_plugins; };

@ -52,7 +52,7 @@
namespace KJS { namespace KJS {
// taken from khtml // taken from tdehtml
// therefor thx to: // therefor thx to:
// Copyright (C) 1999-2003 Harri Porten (porten@kde.org) // Copyright (C) 1999-2003 Harri Porten (porten@kde.org)
// Copyright (C) 2001-2003 David Faure (faure@kde.org) // Copyright (C) 2001-2003 David Faure (faure@kde.org)

@ -40,7 +40,7 @@
#include <kcolordialog.h> #include <kcolordialog.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <ktexteditor/markinterface.h> #include <tdetexteditor/markinterface.h>
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

@ -28,7 +28,7 @@
#include <kaction.h> #include <kaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kspell.h> #include <tdespell.h>
#include <ksconfig.h> #include <ksconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -36,18 +36,18 @@
KateSpell::KateSpell( KateView* view ) KateSpell::KateSpell( KateView* view )
: TQObject( view ) : TQObject( view )
, m_view (view) , m_view (view)
, m_kspell (0) , m_tdespell (0)
{ {
} }
KateSpell::~KateSpell() KateSpell::~KateSpell()
{ {
// kspell stuff // tdespell stuff
if( m_kspell ) if( m_tdespell )
{ {
m_kspell->setAutoDelete(true); m_tdespell->setAutoDelete(true);
m_kspell->cleanUp(); // need a way to wait for this to complete m_tdespell->cleanUp(); // need a way to wait for this to complete
delete m_kspell; delete m_tdespell;
} }
} }
@ -122,27 +122,27 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
else else
kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl; kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
m_kspell = new KSpell( m_view, i18n("Spellcheck"), m_tdespell = new KSpell( m_view, i18n("Spellcheck"),
this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type ); this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type );
connect( m_kspell, TQT_SIGNAL(death()), connect( m_tdespell, TQT_SIGNAL(death()),
this, TQT_SLOT(spellCleanDone()) ); this, TQT_SLOT(spellCleanDone()) );
connect( m_kspell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)), connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) ); this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
connect( m_kspell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)), connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) ); this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
connect( m_kspell, TQT_SIGNAL(done(const TQString&)), connect( m_tdespell, TQT_SIGNAL(done(const TQString&)),
this, TQT_SLOT(spellResult(const TQString&)) ); this, TQT_SLOT(spellResult(const TQString&)) );
} }
void KateSpell::ready(KSpell *) void KateSpell::ready(KSpell *)
{ {
m_kspell->setProgressResolution( 1 ); m_tdespell->setProgressResolution( 1 );
m_kspell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) ); m_tdespell->check( m_view->doc()->text( m_spellStart.line(), m_spellStart.col(), m_spellEnd.line(), m_spellEnd.col() ) );
kdDebug (13020) << "SPELLING READY STATUS: " << m_kspell->status () << endl; kdDebug (13020) << "SPELLING READY STATUS: " << m_tdespell->status () << endl;
} }
void KateSpell::locatePosition( uint pos, uint& line, uint& col ) void KateSpell::locatePosition( uint pos, uint& line, uint& col )
@ -193,12 +193,12 @@ void KateSpell::corrected( const TQString& originalword, const TQString& newword
void KateSpell::spellResult( const TQString& ) void KateSpell::spellResult( const TQString& )
{ {
m_view->clearSelection(); m_view->clearSelection();
m_kspell->cleanUp(); m_tdespell->cleanUp();
} }
void KateSpell::spellCleanDone() void KateSpell::spellCleanDone()
{ {
KSpell::spellStatus status = m_kspell->status(); KSpell::spellStatus status = m_tdespell->status();
if( status == KSpell::Error ) { if( status == KSpell::Error ) {
KMessageBox::sorry( 0, KMessageBox::sorry( 0,
@ -210,8 +210,8 @@ void KateSpell::spellCleanDone()
i18n("The spelling program seems to have crashed.")); i18n("The spelling program seems to have crashed."));
} }
delete m_kspell; delete m_tdespell;
m_kspell = 0; m_tdespell = 0;
kdDebug (13020) << "SPELLING END" << endl; kdDebug (13020) << "SPELLING END" << endl;
} }

@ -71,7 +71,7 @@ class KateSpell : public TQObject
KateView *m_view; KateView *m_view;
KAction *m_spellcheckSelection; KAction *m_spellcheckSelection;
KSpell *m_kspell; KSpell *m_tdespell;
// define the part of the text to check // define the part of the text to check
KateTextCursor m_spellStart, m_spellEnd; KateTextCursor m_spellStart, m_spellEnd;

@ -46,9 +46,9 @@
#include "kateautoindent.h" #include "kateautoindent.h"
#include "katespell.h" #include "katespell.h"
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <kparts/event.h> #include <tdeparts/event.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
@ -67,7 +67,7 @@
#include <kaccel.h> #include <kaccel.h>
#include <klibloader.h> #include <klibloader.h>
#include <kencodingfiledialog.h> #include <kencodingfiledialog.h>
#include <kmultipledrag.h> #include <tdemultipledrag.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <ksavefile.h> #include <ksavefile.h>

@ -28,9 +28,9 @@
#include "../interfaces/view.h" #include "../interfaces/view.h"
#include <ktexteditor/sessionconfiginterface.h> #include <tdetexteditor/sessionconfiginterface.h>
#include <ktexteditor/viewstatusmsginterface.h> #include <tdetexteditor/viewstatusmsginterface.h>
#include <ktexteditor/texthintinterface.h> #include <tdetexteditor/texthintinterface.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>

@ -66,7 +66,7 @@
#include "katedocument.h" #include "katedocument.h"
#include "kateview.h" #include "kateview.h"
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include "katejscript.h" #include "katejscript.h"
#include "katedocumenthelpers.h" #include "katedocumenthelpers.h"
#include "kateconfig.h" #include "kateconfig.h"

@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = ktexteditor_autobookmarker.la kde_module_LTLIBRARIES = tdetexteditor_autobookmarker.la
ktexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp tdetexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp
ktexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la tdetexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la
ktexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) tdetexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = ktexteditor_autobookmarker.desktop kde_services_DATA = tdetexteditor_autobookmarker.desktop
confdir=$(kde_confdir) confdir=$(kde_confdir)
conf_DATA = ktexteditor_autobookmarkerrc conf_DATA = tdetexteditor_autobookmarkerrc
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_autobookmarker.pot $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_autobookmarker.pot

@ -23,10 +23,10 @@
//BEGIN includes //BEGIN includes
#include "autobookmarker.h" #include "autobookmarker.h"
#include <ktexteditor/markinterfaceextension.h> #include <tdetexteditor/markinterfaceextension.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/documentinfo.h> #include <tdetexteditor/documentinfo.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <kaction.h> #include <kaction.h>
#include <kapplication.h> #include <kapplication.h>
@ -57,7 +57,7 @@
//END includes //END includes
//BEGIN AutoBookmarker //BEGIN AutoBookmarker
K_EXPORT_COMPONENT_FACTORY( ktexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "ktexteditor_autobookmarker" ) ) K_EXPORT_COMPONENT_FACTORY( tdetexteditor_autobookmarker, KGenericFactory<AutoBookmarker>( "tdetexteditor_autobookmarker" ) )
AutoBookmarker::AutoBookmarker( TQObject *parent, AutoBookmarker::AutoBookmarker( TQObject *parent,
const char* name, const char* name,
@ -199,7 +199,7 @@ void ABGlobal::readConfig()
m_ents = new ABEntityList; m_ents = new ABEntityList;
else else
m_ents->clear(); m_ents->clear();
TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc"); TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
uint n( 0 ); uint n( 0 );
while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) ) while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@ -225,7 +225,7 @@ void ABGlobal::readConfig()
void ABGlobal::writeConfig() void ABGlobal::writeConfig()
{ {
TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc"); TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
// clean the config object // clean the config object
TQStringList l = config->groupList(); TQStringList l = config->groupList();

@ -23,8 +23,8 @@
#ifndef _AUTOBOOKMARKER_H_ #ifndef _AUTOBOOKMARKER_H_
#define _AUTOBOOKMARKER_H_ #define _AUTOBOOKMARKER_H_
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <ktexteditor/configinterfaceextension.h> #include <tdetexteditor/configinterfaceextension.h>
#include <kdialogbase.h> #include <kdialogbase.h>

@ -128,7 +128,7 @@ Comment[uk]=Встановлює закладки на рядках, що від
Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu. Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu.
Comment[zh_CN]=文档装入时根据匹配模式自动设置书签 Comment[zh_CN]=文档装入时根据匹配模式自动设置书签
Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。 Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。
X-TDE-Library=ktexteditor_autobookmarker X-TDE-Library=tdetexteditor_autobookmarker
ServiceTypes=KTextEditor/Plugin ServiceTypes=KTextEditor/Plugin
Type=Service Type=Service
InitialPreference=8 InitialPreference=8

@ -29,13 +29,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES ktexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdetexteditor_insertfile.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES ktexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_insertfile ) install( FILES tdetexteditor_insertfileui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_insertfile )
##### ktexteditor_insertfile #################### ##### tdetexteditor_insertfile ####################
set( target ktexteditor_insertfile ) set( target tdetexteditor_insertfile )
set( ${target}_SRCS set( ${target}_SRCS
insertfileplugin.cpp insertfileplugin.cpp
@ -43,6 +43,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK ktexteditor-shared LINK tdetexteditor-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = ktexteditor_insertfile.la kde_module_LTLIBRARIES = tdetexteditor_insertfile.la
ktexteditor_insertfile_la_SOURCES = insertfileplugin.cpp tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
insertfiledata_DATA = ktexteditor_insertfileui.rc insertfiledata_DATA = tdetexteditor_insertfileui.rc
kde_services_DATA = ktexteditor_insertfile.desktop kde_services_DATA = tdetexteditor_insertfile.desktop
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_insertfile.pot $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_insertfile.pot

@ -19,9 +19,9 @@
#include "insertfileplugin.h" #include "insertfileplugin.h"
#include "insertfileplugin.moc" #include "insertfileplugin.moc"
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <assert.h> #include <assert.h>
#include <kio/job.h> #include <kio/job.h>
@ -37,7 +37,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqtextstream.h> #include <tqtextstream.h>
K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) ) K_EXPORT_COMPONENT_FACTORY( tdetexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "tdetexteditor_insertfile" ) )
//BEGIN InsertFilePlugin //BEGIN InsertFilePlugin
@ -77,7 +77,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
setInstance( KGenericFactory<InsertFilePlugin>::instance() ); setInstance( KGenericFactory<InsertFilePlugin>::instance() );
_job = 0; _job = 0;
(void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); (void) new KAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
setXMLFile( "ktexteditor_insertfileui.rc" ); setXMLFile( "tdetexteditor_insertfileui.rc" );
} }
void InsertFilePluginView::slotInsertFile() void InsertFilePluginView::slotInsertFile()

@ -22,8 +22,8 @@
#ifndef _INSERT_FILE_PLUGIN_H_ #ifndef _INSERT_FILE_PLUGIN_H_
#define _INSERT_FILE_PLUGIN_H_ #define _INSERT_FILE_PLUGIN_H_
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <tqobject.h> #include <tqobject.h>

@ -149,7 +149,7 @@ Comment[vi]=Chèn bất kỳ tập tin có khả năng đọc tại vị trí c
Comment[zh_CN]=在光标位置插入任何可读文件 Comment[zh_CN]=在光标位置插入任何可读文件
Comment[zh_HK]=在游標處插入任意的檔案 Comment[zh_HK]=在游標處插入任意的檔案
Comment[zh_TW]=在游標處插入任意的可讀檔案 Comment[zh_TW]=在游標處插入任意的可讀檔案
X-TDE-Library=ktexteditor_insertfile X-TDE-Library=tdetexteditor_insertfile
ServiceTypes=KTextEditor/Plugin ServiceTypes=KTextEditor/Plugin
Type=Service Type=Service
InitialPreference=8 InitialPreference=8

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartplugin name="ktexteditor_insertfile" library="ktexteditor_insertfile" version="2"> <kpartplugin name="tdetexteditor_insertfile" library="tdetexteditor_insertfile" version="2">
<MenuBar> <MenuBar>
<Menu name="tools"><Text>&amp;Tools</Text> <Menu name="tools"><Text>&amp;Tools</Text>
<separator group="tools_operations" /> <separator group="tools_operations" />

@ -27,13 +27,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES ktexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdetexteditor_isearch.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES ktexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_isearch ) install( FILES tdetexteditor_isearchui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_isearch )
##### ktexteditor_isearch ####################### ##### tdetexteditor_isearch #######################
set( target ktexteditor_isearch ) set( target tdetexteditor_isearch )
set( ${target}_SRCS set( ${target}_SRCS
ISearchPlugin.cpp ISearchPlugin.cpp
@ -41,6 +41,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK ktexteditor-shared LINK tdetexteditor-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -30,7 +30,7 @@
#include "ISearchPlugin.h" #include "ISearchPlugin.h"
#include "ISearchPlugin.moc" #include "ISearchPlugin.moc"
K_EXPORT_COMPONENT_FACTORY( ktexteditor_isearch, KGenericFactory<ISearchPlugin>( "ktexteditor_isearch" ) ) K_EXPORT_COMPONENT_FACTORY( tdetexteditor_isearch, KGenericFactory<ISearchPlugin>( "tdetexteditor_isearch" ) )
ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
: TQObject ( view ), KXMLGUIClient (view) : TQObject ( view ), KXMLGUIClient (view)
@ -139,7 +139,7 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
// action->setChecked( m_autoWrap ); // action->setChecked( m_autoWrap );
// optionMenu->insert( action ); // optionMenu->insert( action );
setXMLFile( "ktexteditor_isearchui.rc" ); setXMLFile( "tdetexteditor_isearchui.rc" );
} }
ISearchPluginView::~ISearchPluginView() ISearchPluginView::~ISearchPluginView()

@ -19,12 +19,12 @@
#ifndef _ISearchPlugin_H_ #ifndef _ISearchPlugin_H_
#define _ISearchPlugin_H_ #define _ISearchPlugin_H_
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/searchinterface.h> #include <tdetexteditor/searchinterface.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
#include <ktexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterface.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <tqobject.h> #include <tqobject.h>

@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = ktexteditor_isearch.la kde_module_LTLIBRARIES = tdetexteditor_isearch.la
ktexteditor_isearch_la_SOURCES = ISearchPlugin.cpp tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
isearchdatadir = $(kde_datadir)/ktexteditor_isearch isearchdatadir = $(kde_datadir)/tdetexteditor_isearch
isearchdata_DATA = ktexteditor_isearchui.rc isearchdata_DATA = tdetexteditor_isearchui.rc
kde_services_DATA = ktexteditor_isearch.desktop kde_services_DATA = tdetexteditor_isearch.desktop
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_isearch.pot $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_isearch.pot

@ -146,7 +146,7 @@ Comment[uk]=Також відомий як "Пошук за вводом"
Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ». Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
Comment[zh_CN]=也称为“即输即搜” Comment[zh_CN]=也称为“即输即搜”
Comment[zh_TW]=也稱做「即時搜尋」 Comment[zh_TW]=也稱做「即時搜尋」
X-TDE-Library=ktexteditor_isearch X-TDE-Library=tdetexteditor_isearch
ServiceTypes=KTextEditor/Plugin ServiceTypes=KTextEditor/Plugin
Type=Service Type=Service
InitialPreference=8 InitialPreference=8

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartplugin name="ktexteditor_isearch" library="ktexteditor_isearch" version="4"> <kpartplugin name="tdetexteditor_isearch" library="tdetexteditor_isearch" version="4">
<MenuBar> <MenuBar>
<Menu name="edit"><text>&amp;Edit</text> <Menu name="edit"><text>&amp;Edit</text>
<Action name="edit_isearch" group="edit_find_merge"/> <Action name="edit_isearch" group="edit_find_merge"/>

@ -29,13 +29,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES ktexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdetexteditor_kdatatool.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES ktexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_kdatatool ) install( FILES tdetexteditor_kdatatoolui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kdatatool )
##### ktexteditor_kdatatool ##################### ##### tdetexteditor_kdatatool #####################
set( target ktexteditor_kdatatool ) set( target tdetexteditor_kdatatool )
set( ${target}_SRCS set( ${target}_SRCS
kate_kdatatool.cpp kate_kdatatool.cpp
@ -43,6 +43,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK ktexteditor-shared LINK tdetexteditor-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,18 +2,18 @@ INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = ktexteditor_kdatatool.la kde_module_LTLIBRARIES = tdetexteditor_kdatatool.la
ktexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI) tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool
kdatatooldata_DATA = ktexteditor_kdatatoolui.rc kdatatooldata_DATA = tdetexteditor_kdatatoolui.rc
kde_services_DATA = ktexteditor_kdatatool.desktop kde_services_DATA = tdetexteditor_kdatatool.desktop
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_kdatatool.pot $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_kdatatool.pot

@ -21,19 +21,19 @@
#include "kate_kdatatool.moc" #include "kate_kdatatool.moc"
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kaction.h> #include <kaction.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <kdebug.h> #include <kdebug.h>
#include <kdatatool.h> #include <kdatatool.h>
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterface.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <kmessagebox.h> #include <kmessagebox.h>
//END includes //END includes
K_EXPORT_COMPONENT_FACTORY( ktexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "ktexteditor_kdatatool" ) ) K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "tdetexteditor_kdatatool" ) )
namespace KTextEditor { namespace KTextEditor {
@ -77,7 +77,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
setXMLFile("ktexteditor_kdatatoolui.rc"); setXMLFile("tdetexteditor_kdatatoolui.rc");
m_view = view; m_view = view;
} }

@ -21,7 +21,7 @@
#ifndef _KATE_KDATATOOL_ #ifndef _KATE_KDATATOOL_
#define _KATE_KDATATOOL_ #define _KATE_KDATATOOL_
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>

@ -1,8 +0,0 @@
<!DOCTYPE kpartgui>
<kpartplugin name="ktexteditor_kdatatoolui" library="ktexteditor_kdatatool" version="2">
<Menu name="ktexteditor_popup" noMerge="1">
<Action name="popup_dataTool" group="popup_operations"/>
</Menu>
</kpartplugin>

@ -162,7 +162,7 @@ Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的
Comment[zh_HK]=如果有安裝的話,啟用像同義字字典和拼字檢查等的文字工具 Comment[zh_HK]=如果有安裝的話,啟用像同義字字典和拼字檢查等的文字工具
Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話) Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話)
Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe) Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
X-TDE-Library=ktexteditor_kdatatool X-TDE-Library=tdetexteditor_kdatatool
ServiceTypes=KTextEditor/Plugin ServiceTypes=KTextEditor/Plugin
Type=Service Type=Service
InitialPreference=8 InitialPreference=8

@ -0,0 +1,8 @@
<!DOCTYPE kpartgui>
<kpartplugin name="tdetexteditor_kdatatoolui" library="tdetexteditor_kdatatool" version="2">
<Menu name="tdetexteditor_popup" noMerge="1">
<Action name="popup_dataTool" group="popup_operations"/>
</Menu>
</kpartplugin>

@ -25,13 +25,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES ktexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_docwordcompletion ) install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_docwordcompletion )
##### ktexteditor_docwordcompletion ############# ##### tdetexteditor_docwordcompletion #############
set( target ktexteditor_docwordcompletion ) set( target tdetexteditor_docwordcompletion )
set( ${target}_SRCS set( ${target}_SRCS
docwordcompletion.cpp docwordcompletion.cpp
@ -39,6 +39,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK ktexteditor-shared LINK tdetexteditor-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = ktexteditor_docwordcompletion.la kde_module_LTLIBRARIES = tdetexteditor_docwordcompletion.la
ktexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion
docwordcompletiondata_DATA = docwordcompletionui.rc docwordcompletiondata_DATA = docwordcompletionui.rc
kde_services_DATA = ktexteditor_docwordcompletion.desktop kde_services_DATA = tdetexteditor_docwordcompletion.desktop
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/ktexteditor_docwordcompletion.pot $(XGETTEXT) *.cpp *.h -o $(podir)/tdetexteditor_docwordcompletion.pot

@ -28,10 +28,10 @@
//BEGIN includes //BEGIN includes
#include "docwordcompletion.h" #include "docwordcompletion.h"
#include <ktexteditor/document.h> #include <tdetexteditor/document.h>
#include <ktexteditor/viewcursorinterface.h> #include <tdetexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <ktexteditor/variableinterface.h> #include <tdetexteditor/variableinterface.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <kconfig.h>
@ -40,7 +40,7 @@
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <kaction.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tqregexp.h> #include <tqregexp.h>
@ -57,7 +57,7 @@
//END //END
//BEGIN DocWordCompletionPlugin //BEGIN DocWordCompletionPlugin
K_EXPORT_COMPONENT_FACTORY( ktexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "ktexteditor_docwordcompletion" ) ) K_EXPORT_COMPONENT_FACTORY( tdetexteditor_docwordcompletion, KGenericFactory<DocWordCompletionPlugin>( "tdetexteditor_docwordcompletion" ) )
DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent, DocWordCompletionPlugin::DocWordCompletionPlugin( TQObject *parent,
const char* name, const char* name,
const TQStringList& /*args*/ ) const TQStringList& /*args*/ )

@ -29,10 +29,10 @@
#ifndef _DocWordCompletionPlugin_h_ #ifndef _DocWordCompletionPlugin_h_
#define _DocWordCompletionPlugin_h_ #define _DocWordCompletionPlugin_h_
#include <ktexteditor/plugin.h> #include <tdetexteditor/plugin.h>
#include <ktexteditor/view.h> #include <tdetexteditor/view.h>
#include <ktexteditor/codecompletioninterface.h> #include <tdetexteditor/codecompletioninterface.h>
#include <ktexteditor/configinterfaceextension.h> #include <tdetexteditor/configinterfaceextension.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
#include <tqevent.h> #include <tqevent.h>

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartplugin name="ktexteditor_docwordcompletion" library="ktexteditor_docwordcompletion" version="4"> <kpartplugin name="tdetexteditor_docwordcompletion" library="tdetexteditor_docwordcompletion" version="4">
<MenuBar> <MenuBar>
<Menu name="tools"><Text>&amp;Tools</Text> <Menu name="tools"><Text>&amp;Tools</Text>
<separator group="tools_operations" /> <separator group="tools_operations" />

@ -132,7 +132,7 @@ Comment[uk]=Завершення слів у документі. Пряме аб
Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên. Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên.
Comment[zh_CN]=在文档中基于方向或弹出补全单词 Comment[zh_CN]=在文档中基于方向或弹出补全单词
Comment[zh_TW]=在編輯文件時的單字補完功能 Comment[zh_TW]=在編輯文件時的單字補完功能
X-TDE-Library=ktexteditor_docwordcompletion X-TDE-Library=tdetexteditor_docwordcompletion
ServiceTypes=KTextEditor/Plugin ServiceTypes=KTextEditor/Plugin
Type=Service Type=Service
InitialPreference=8 InitialPreference=8

@ -1,18 +0,0 @@
INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = libkcertpart.la
libkcertpart_la_SOURCES = kcertpart.cc
libkcertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
libkcertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
libkcertpart_la_DEPENDENCIES = $(LIB_KPARTS)
libkcertpart_la_METASOURCES = AUTO
servicedir = $(kde_servicesdir)
service_DATA = kcertpart.desktop
rcdir = $(kde_datadir)/kcertpart
rc_DATA = kcertpart.rc

@ -18,7 +18,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/tdeutils
) )
link_directories( link_directories(
@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_tdeinit_executable( ${target} AUTOMOC tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kutils-shared LINK tdeutils-shared
DEPENDENCIES dcopidl DEPENDENCIES dcopidl
) )

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
AM_CPPFLAGS = -I$(top_srcdir)/kutils $(all_includes) AM_CPPFLAGS = -I$(top_srcdir)/tdeutils $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
lib_LTLIBRARIES = lib_LTLIBRARIES =
@ -26,7 +26,7 @@ bin_PROGRAMS =
tdeinit_LTLIBRARIES = kcmshell.la tdeinit_LTLIBRARIES = kcmshell.la
kcmshell_la_SOURCES = main.cpp main.skel kcmshell_la_SOURCES = main.cpp main.skel
kcmshell_la_LIBADD = ../kutils/libkutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE) kcmshell_la_LIBADD = ../tdeutils/libtdeutils.la $(LIB_QT) $(LIB_TDEUI) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_KFILE)
kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
noinst_HEADERS = main.h noinst_HEADERS = main.h

@ -12,9 +12,9 @@ kbuildsycoca recreates the sycoca file by:
* parsing all .desktop files, replacing global ones by local ones (at any * parsing all .desktop files, replacing global ones by local ones (at any
level of the hierarchy) level of the hierarchy)
* creating all objects in memory * creating all objects in memory
* saving everything in the sycoca file (see below for ksycoca internals) * saving everything in the sycoca file (see below for tdesycoca internals)
* clearing all memory * clearing all memory
* notifying the applications that use ksycoca by a DCOP call to the ksycoca * notifying the applications that use tdesycoca by a DCOP call to the tdesycoca
object (KSycoca::notifyDatabaseChanged()). object (KSycoca::notifyDatabaseChanged()).
Format of the sycoca database file Format of the sycoca database file

@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist
kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdontchangethehostname_LDADD = $(LIB_TDECORE) kdontchangethehostname_LDADD = $(LIB_TDECORE)
kdontchangethehostname_SOURCES = khostname.cpp kdontchangethehostname_SOURCES = khostname.cpp
kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmimelist_LDADD = ../kio/libkio.la kmimelist_LDADD = ../kio/libkio.la
kmimelist_SOURCES = kmimelist.cpp kmimelist_SOURCES = kmimelist.cpp
kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kde_menu_LDADD = $(LIB_KIO) kde_menu_LDADD = $(LIB_KIO)
kde_menu_SOURCES = kde-menu.cpp kde_menu_SOURCES = kde-menu.cpp

@ -6,10 +6,10 @@ Some of these tasks are built in, others are started on demand.
Built in tasks Built in tasks
============== ==============
*) Checking for newly installed software and updating ksycoca when new *) Checking for newly installed software and updating tdesycoca when new
software is detected. Updating of ksycoca is done by the program kbuildsycoca software is detected. Updating of tdesycoca is done by the program kbuildsycoca
which gets started by kded. When kded is first started it always runs which gets started by kded. When kded is first started it always runs
kbuildsycoca to ensure that ksycoca is up to date. kbuildsycoca to ensure that tdesycoca is up to date.
*) Checking for newly installed update files. Applications can install *) Checking for newly installed update files. Applications can install
*.upd update files. These *.upd files are used to update configuration files *.upd update files. These *.upd files are used to update configuration files
@ -40,9 +40,9 @@ the hostname is checked for changes. The time is specified in milliseconds
and has a default of 5000 (5 seconds). and has a default of 5000 (5 seconds).
CheckSycoca: This option can be used to disable checking for new software. CheckSycoca: This option can be used to disable checking for new software.
ksycoca will still be built when kded starts up and when applications tdesycoca will still be built when kded starts up and when applications
explicitly request a rebuild of the ksycoca database. The user can explicitly request a rebuild of the tdesycoca database. The user can
also manually rebuild ksycoca by running the kbuildsycoca program. also manually rebuild tdesycoca by running the kbuildsycoca program.
The default value of this option is "true". Checking can be disabled by The default value of this option is "true". Checking can be disabled by
setting this option to "false". setting this option to "false".

@ -16,8 +16,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kresourcelist.h" #include "kresourcelist.h"
#include <kglobal.h> #include <kglobal.h>

@ -23,7 +23,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
/** /**
* Service group factory for building ksycoca * Service group factory for building tdesycoca
* @internal * @internal
*/ */
class KBuildImageIOFactory : public KImageIOFactory class KBuildImageIOFactory : public KImageIOFactory

@ -17,8 +17,8 @@
**/ **/
#include "kbuildprotocolinfofactory.h" #include "kbuildprotocolinfofactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kresourcelist.h" #include "kresourcelist.h"
#include <kglobal.h> #include <kglobal.h>

@ -24,7 +24,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
/** /**
* Protocol Info factory for building ksycoca * Protocol Info factory for building tdesycoca
* @internal * @internal
*/ */
class KBuildProtocolInfoFactory : public KProtocolInfoFactory class KBuildProtocolInfoFactory : public KProtocolInfoFactory

@ -18,8 +18,8 @@
**/ **/
#include "kbuildservicefactory.h" #include "kbuildservicefactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kresourcelist.h" #include "kresourcelist.h"
#include "kmimetype.h" #include "kmimetype.h"

@ -29,7 +29,7 @@
#include <kbuildservicegroupfactory.h> #include <kbuildservicegroupfactory.h>
/** /**
* Service factory for building ksycoca * Service factory for building tdesycoca
* @internal * @internal
*/ */
class KBuildServiceFactory : public KServiceFactory class KBuildServiceFactory : public KServiceFactory

@ -17,8 +17,8 @@
**/ **/
#include "kbuildservicegroupfactory.h" #include "kbuildservicegroupfactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kresourcelist.h" #include "kresourcelist.h"
#include <kglobal.h> #include <kglobal.h>

@ -24,7 +24,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
/** /**
* Service group factory for building ksycoca * Service group factory for building tdesycoca
* @internal * @internal
*/ */
class KBuildServiceGroupFactory : public KServiceGroupFactory class KBuildServiceGroupFactory : public KServiceGroupFactory

@ -17,8 +17,8 @@
**/ **/
#include "kbuildservicetypefactory.h" #include "kbuildservicetypefactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kresourcelist.h" #include "kresourcelist.h"
#include <kglobal.h> #include <kglobal.h>

@ -24,7 +24,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
/** /**
* Service-type factory for building ksycoca * Service-type factory for building tdesycoca
* @internal * @internal
*/ */
class KBuildServiceTypeFactory : public KServiceTypeFactory class KBuildServiceTypeFactory : public KServiceTypeFactory

@ -104,15 +104,15 @@ static TQString sycocaPath()
if (bGlobalDatabase) if (bGlobalDatabase)
{ {
path = TDEGlobal::dirs()->saveLocation("services")+"ksycoca"; path = TDEGlobal::dirs()->saveLocation("services")+"tdesycoca";
} }
else else
{ {
TQCString ksycoca_env = getenv("TDESYCOCA"); TQCString tdesycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty()) if (tdesycoca_env.isEmpty())
path = TDEGlobal::dirs()->saveLocation("cache")+"ksycoca"; path = TDEGlobal::dirs()->saveLocation("cache")+"tdesycoca";
else else
path = TQFile::decodeName(ksycoca_env); path = TQFile::decodeName(tdesycoca_env);
} }
return path; return path;
@ -120,9 +120,9 @@ static TQString sycocaPath()
static TQString oldSycocaPath() static TQString oldSycocaPath()
{ {
TQCString ksycoca_env = getenv("TDESYCOCA"); TQCString tdesycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty()) if (tdesycoca_env.isEmpty())
return TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca"; return TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca";
return TQString::null; return TQString::null;
} }
@ -487,7 +487,7 @@ bool KBuildSycoca::recreate()
m_str = database->dataStream(); m_str = database->dataStream();
kdDebug(7021) << "Recreating ksycoca file (" << path << ", version " << KSycoca::version() << ")" << endl; kdDebug(7021) << "Recreating tdesycoca file (" << path << ", version " << KSycoca::version() << ")" << endl;
// It is very important to build the servicetype one first // It is very important to build the servicetype one first
// Both are registered in KSycoca, no need to keep the pointers // Both are registered in KSycoca, no need to keep the pointers
@ -527,9 +527,9 @@ bool KBuildSycoca::recreate()
{ {
// update the timestamp file // update the timestamp file
TQString stamppath = path + "stamp"; TQString stamppath = path + "stamp";
TQFile ksycocastamp(stamppath); TQFile tdesycocastamp(stamppath);
ksycocastamp.open( IO_WriteOnly ); tdesycocastamp.open( IO_WriteOnly );
TQDataStream str( &ksycocastamp ); TQDataStream str( &tdesycocastamp );
str << newTimestamp; str << newTimestamp;
str << existingResourceDirs(); str << existingResourceDirs();
if (g_vfolder) if (g_vfolder)
@ -566,7 +566,7 @@ void KBuildSycoca::save()
(*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes(); (*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes();
(*m_str) << newTimestamp; (*m_str) << newTimestamp;
(*m_str) << TDEGlobal::locale()->language(); (*m_str) << TDEGlobal::locale()->language();
(*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true);
(*m_str) << (*g_allResourceDirs); (*m_str) << (*g_allResourceDirs);
// Write factory data.... // Write factory data....
@ -636,10 +636,10 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime
return true; return true;
} }
// check times of last modification of all files on which ksycoca depens, // check times of last modification of all files on which tdesycoca depens,
// and also their directories // and also their directories
// if all of them all older than the timestamp in file ksycocastamp, this // if all of them all older than the timestamp in file tdesycocastamp, this
// means that there's no need to rebuild ksycoca // means that there's no need to rebuild tdesycoca
bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs ) bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs )
{ {
kdDebug( 7021 ) << "checking file timestamps" << endl; kdDebug( 7021 ) << "checking file timestamps" << endl;
@ -663,7 +663,7 @@ TQStringList KBuildSycoca::existingResourceDirs()
return *dirs; return *dirs;
dirs = new TQStringList; dirs = new TQStringList;
g_allResourceDirs = new TQStringList; g_allResourceDirs = new TQStringList;
// these are all resources cached by ksycoca // these are all resources cached by tdesycoca
TQStringList resources; TQStringList resources;
resources += KBuildServiceTypeFactory::resourceTypes(); resources += KBuildServiceTypeFactory::resourceTypes();
resources += KBuildServiceGroupFactory::resourceTypes(); resources += KBuildServiceGroupFactory::resourceTypes();
@ -805,12 +805,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{ {
KSycoca::self()->disableAutoRebuild(); // Prevent deadlock KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
TQString current_language = TDEGlobal::locale()->language(); TQString current_language = TDEGlobal::locale()->language();
TQString ksycoca_language = KSycoca::self()->language(); TQString tdesycoca_language = KSycoca::self()->language();
TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true);
TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature(); TQ_UINT32 tdesycoca_update_sig = KSycoca::self()->updateSignature();
if ((current_update_sig != ksycoca_update_sig) || if ((current_update_sig != tdesycoca_update_sig) ||
(current_language != ksycoca_language) || (current_language != tdesycoca_language) ||
(KSycoca::self()->timeStamp() == 0)) (KSycoca::self()->timeStamp() == 0))
{ {
incremental = false; incremental = false;
@ -829,10 +829,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TQString path = sycocaPath()+"stamp"; TQString path = sycocaPath()+"stamp";
TQCString qPath = TQFile::encodeName(path); TQCString qPath = TQFile::encodeName(path);
cSycocaPath = qPath.data(); // Delete timestamps on crash cSycocaPath = qPath.data(); // Delete timestamps on crash
TQFile ksycocastamp(path); TQFile tdesycocastamp(path);
if( ksycocastamp.open( IO_ReadOnly )) if( tdesycocastamp.open( IO_ReadOnly ))
{ {
TQDataStream str( &ksycocastamp ); TQDataStream str( &tdesycocastamp );
if (!str.atEnd()) if (!str.atEnd())
str >> filestamp; str >> filestamp;
if (!str.atEnd()) if (!str.atEnd())
@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
g_ctimeDict = 0; g_ctimeDict = 0;
if (incremental) if (incremental)
{ {
tqWarning("[kbuildsycoca] Reusing existing ksycoca."); tqWarning("[kbuildsycoca] Reusing existing tdesycoca.");
KSycoca *oldSycoca = KSycoca::self(); KSycoca *oldSycoca = KSycoca::self();
KSycocaFactoryList *factories = new KSycocaFactoryList; KSycocaFactoryList *factories = new KSycocaFactoryList;
g_allEntries = new KSycocaEntryListList; g_allEntries = new KSycocaEntryListList;
@ -940,11 +940,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
if (args->isSet("signal")) if (args->isSet("signal"))
{ {
// Notify ALL applications that have a ksycoca object, using a broadcast // Notify ALL applications that have a tdesycoca object, using a broadcast
TQByteArray data; TQByteArray data;
TQDataStream stream(data, IO_WriteOnly); TQDataStream stream(data, IO_WriteOnly);
stream << *g_changeList; stream << *g_changeList;
dcopClient->send( "*", "ksycoca", "notifyDatabaseChanged(TQStringList)", data ); dcopClient->send( "*", "tdesycoca", "notifyDatabaseChanged(TQStringList)", data );
} }
#ifdef KBUILDSYCOCA_GUI #ifdef KBUILDSYCOCA_GUI

@ -25,9 +25,9 @@
#include <tqdict.h> #include <tqdict.h>
#include <kservice.h> #include <kservice.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <ksycocatype.h> #include <tdesycocatype.h>
#include <ksycocaentry.h> #include <tdesycocaentry.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include "vfolder_menu.h" #include "vfolder_menu.h"
@ -80,7 +80,7 @@ protected:
bool build(); bool build();
/** /**
* Save the ksycoca file * Save the tdesycoca file
*/ */
void save(); void save();

@ -17,8 +17,8 @@
**/ **/
#include "kctimefactory.h" #include "kctimefactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include <assert.h> #include <assert.h>

@ -19,11 +19,11 @@
#ifndef __k_ctime_factory_h__ #ifndef __k_ctime_factory_h__
#define __k_ctime_factory_h__ #define __k_ctime_factory_h__
#include <ksycocafactory.h> #include <tdesycocafactory.h>
#include <tqdict.h> #include <tqdict.h>
/** /**
* Service group factory for building ksycoca * Service group factory for building tdesycoca
* @internal * @internal
*/ */
class KCTimeInfo : public KSycocaFactory class KCTimeInfo : public KSycocaFactory

@ -104,11 +104,11 @@ Kded::Kded(bool checkUpdates, bool new_startup)
{ {
_self = this; _self = this;
TQCString cPath; TQCString cPath;
TQCString ksycoca_env = getenv("TDESYCOCA"); TQCString tdesycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty()) if (tdesycoca_env.isEmpty())
cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca"); cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca");
else else
cPath = ksycoca_env; cPath = tdesycoca_env;
m_pTimer = new TQTimer(this); m_pTimer = new TQTimer(this);
connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate())); connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate()));
@ -139,7 +139,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
const TQByteArray &data, const TQByteArray &data,
TQCString &replyType, TQByteArray &replyData) TQCString &replyType, TQByteArray &replyData)
{ {
if (obj == "ksycoca") return false; // Ignore this one. if (obj == "tdesycoca") return false; // Ignore this one.
if (m_dontLoad[obj]) if (m_dontLoad[obj])
return false; return false;
@ -484,7 +484,7 @@ void Kded::recreate(bool initial)
recreateDone(); recreateDone();
if(delayedCheck) if(delayedCheck)
{ {
// do a proper ksycoca check after a delay // do a proper tdesycoca check after a delay
TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck())); TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck()));
m_needDelayedCheck = true; m_needDelayedCheck = true;
delayedCheck = false; delayedCheck = false;
@ -961,7 +961,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
// anyway, because it was too early, so let's send this signal // anyway, because it was too early, so let's send this signal
// unconditionnally (David) // unconditionnally (David)
TQByteArray data; TQByteArray data;
client->send( "*", "ksycoca", "notifyDatabaseChanged()", data ); client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data );
client->send( "ksplash", "", "upAndRunning(TQString)", TQString("kded")); client->send( "ksplash", "", "upAndRunning(TQString)", TQString("kded"));
#ifdef Q_WS_X11 #ifdef Q_WS_X11
XEvent e; XEvent e;

@ -29,8 +29,8 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <dcopobject.h> #include <dcopobject.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <ksycocatype.h> #include <tdesycocatype.h>
#include <kdedmodule.h> #include <kdedmodule.h>
#include <klibloader.h> #include <klibloader.h>

@ -25,7 +25,7 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
bin_PROGRAMS = makekdewidgets bin_PROGRAMS = makekdewidgets
makekdewidgets_SOURCES = makekdewidgets.cpp makekdewidgets_SOURCES = makekdewidgets.cpp
makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la makekdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la
kde_widget_LTLIBRARIES = kdewidgets.la kde_widget_LTLIBRARIES = kdewidgets.la

@ -248,8 +248,8 @@
<!ENTITY kmathtool "<application>KMathTool</application>"> <!ENTITY kmathtool "<application>KMathTool</application>">
<!ENTITY kmenuedit "<application>KMenuEdit</application>"> <!ENTITY kmenuedit "<application>KMenuEdit</application>">
<!ENTITY kmessedwords "<application>KMessedWords</application>"> <!ENTITY kmessedwords "<application>KMessedWords</application>">
<!ENTITY kmid "<application>KMid</application>"> <!ENTITY tdemid "<application>KMid</application>">
<!ENTITY kmidi "<application>KMidi</application>"> <!ENTITY tdemidi "<application>KMidi</application>">
<!ENTITY kmines "<application>KMines</application>"> <!ENTITY kmines "<application>KMines</application>">
<!ENTITY kmix "<application>KMix</application>"> <!ENTITY kmix "<application>KMix</application>">
<!ENTITY kmoon "<application>KMoon</application>"> <!ENTITY kmoon "<application>KMoon</application>">
@ -299,7 +299,7 @@
<!ENTITY kruler "<application>TDE Screen Ruler</application>"> <!ENTITY kruler "<application>TDE Screen Ruler</application>">
<!ENTITY ksame "<application>KSame</application>"> <!ENTITY ksame "<application>KSame</application>">
<!ENTITY kscd "<application>KsCD</application>"> <!ENTITY kscd "<application>KsCD</application>">
<!ENTITY kscreensaver "<application>KScreensaver</application>"> <!ENTITY tdescreensaver "<application>KScreensaver</application>">
<!ENTITY ksgmltools "<application>ksgmltools</application>"> <!ENTITY ksgmltools "<application>ksgmltools</application>">
<!ENTITY kshisen "<application>KShisen</application>"> <!ENTITY kshisen "<application>KShisen</application>">
<!ENTITY ksim "<application>KSim</application>"> <!ENTITY ksim "<application>KSim</application>">
@ -311,7 +311,7 @@
<!ENTITY ksnapshot "<application>KSnapshot</application>"> <!ENTITY ksnapshot "<application>KSnapshot</application>">
<!ENTITY ksokoban "<application>KSokoban</application>"> <!ENTITY ksokoban "<application>KSokoban</application>">
<!ENTITY kspaceduel "<application>KSpaceDuel</application>"> <!ENTITY kspaceduel "<application>KSpaceDuel</application>">
<!ENTITY kspell "<application>KSpell</application>"> <!ENTITY tdespell "<application>KSpell</application>">
<!ENTITY ksplash "<application>KSplash</application>"> <!ENTITY ksplash "<application>KSplash</application>">
<!ENTITY kspread "<application>KSpread</application>"> <!ENTITY kspread "<application>KSpread</application>">
<!ENTITY kstars "<application>KStars</application>"> <!ENTITY kstars "<application>KStars</application>">
@ -421,5 +421,5 @@
<!ENTITY kontour "<application>Kontour</application>"> <!ENTITY kontour "<application>Kontour</application>">
<!ENTITY kpanel "<application>KPanel</application>"> <!ENTITY kpanel "<application>KPanel</application>">
<!ENTITY kscore "<application>KScore</application>"> <!ENTITY kscore "<application>KScore</application>">
<!ENTITY tkmidi "<application>tkmidi</application>"> <!ENTITY ttdemidi "<application>ttdemidi</application>">
<!ENTITY quanta "<application>Quanta</application>"> <!ENTITY quanta "<application>Quanta</application>">

@ -233,8 +233,8 @@
<!ENTITY kmathtool "<application>KMathTool</application>"> <!ENTITY kmathtool "<application>KMathTool</application>">
<!ENTITY kmenuedit "<application>kmenuedit</application>"> <!ENTITY kmenuedit "<application>kmenuedit</application>">
<!ENTITY kmessedwords "<application>KMessedWords</application>"> <!ENTITY kmessedwords "<application>KMessedWords</application>">
<!ENTITY kmid "<application>KMid</application>"> <!ENTITY tdemid "<application>KMid</application>">
<!ENTITY kmidi "<application>KMidi</application>"> <!ENTITY tdemidi "<application>KMidi</application>">
<!ENTITY kmines "<application>KMines</application>"> <!ENTITY kmines "<application>KMines</application>">
<!ENTITY kmix "<application>KMix</application>"> <!ENTITY kmix "<application>KMix</application>">
<!ENTITY kmplot "<application>KmPlot</application>"> <!ENTITY kmplot "<application>KmPlot</application>">
@ -279,7 +279,7 @@
<!ENTITY ksame "<application>KSame</application>"> <!ENTITY ksame "<application>KSame</application>">
<!ENTITY kscd "<application>KsCD</application>"> <!ENTITY kscd "<application>KsCD</application>">
<!ENTITY kscore "<application>KScore</application>"> <!ENTITY kscore "<application>KScore</application>">
<!ENTITY kscreensaver "<application>KScreensaver</application>"> <!ENTITY tdescreensaver "<application>KScreensaver</application>">
<!ENTITY ksgmltools "<application>ksgmltools</application>"> <!ENTITY ksgmltools "<application>ksgmltools</application>">
<!ENTITY kshisen "<application>KShisen</application>"> <!ENTITY kshisen "<application>KShisen</application>">
<!ENTITY ksim "<application>KSim</application>"> <!ENTITY ksim "<application>KSim</application>">
@ -290,7 +290,7 @@
<!ENTITY ksnapshot "<application>KSnapshot</application>"> <!ENTITY ksnapshot "<application>KSnapshot</application>">
<!ENTITY ksokoban "<application>KSokoban</application>"> <!ENTITY ksokoban "<application>KSokoban</application>">
<!ENTITY kspaceduel "<application>KSpaceDuel</application>"> <!ENTITY kspaceduel "<application>KSpaceDuel</application>">
<!ENTITY kspell "<application>KSpell</application>"> <!ENTITY tdespell "<application>KSpell</application>">
<!ENTITY kspread "<application>KSpread</application>"> <!ENTITY kspread "<application>KSpread</application>">
<!ENTITY kstars "<application>KStars</application>"> <!ENTITY kstars "<application>KStars</application>">
<!ENTITY kstart "<application>kstart</application>"> <!ENTITY kstart "<application>kstart</application>">
@ -357,7 +357,7 @@
<!ENTITY Solaris "<trademark>Solaris</trademark>"> <!ENTITY Solaris "<trademark>Solaris</trademark>">
<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> <!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'>
<!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'>
<!ENTITY tkmidi "<application>tkmidi</application>"> <!ENTITY ttdemidi "<application>ttdemidi</application>">
<!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'>
<!ENTITY UNIX '<trademark class="registered">UNIX</trademark>'> <!ENTITY UNIX '<trademark class="registered">UNIX</trademark>'>
<!ENTITY URL "<acronym>URL</acronym>"> <!ENTITY URL "<acronym>URL</acronym>">

@ -205,19 +205,19 @@ ktnef
<!ENTITY ksysguard-narzednik '<application>Ksysguardem</application>'> <!ENTITY ksysguard-narzednik '<application>Ksysguardem</application>'>
<!ENTITY ksysguard-miejscownik '<application>Ksysguardzie</application>'> <!ENTITY ksysguard-miejscownik '<application>Ksysguardzie</application>'>
<!ENTITY kwallet-mianownik '<application>Portfel &tde;</application>'> <!ENTITY tdewallet-mianownik '<application>Portfel &tde;</application>'>
<!ENTITY kwallet-dopelniacz '<application>Portfela &tde;</application>'> <!ENTITY tdewallet-dopelniacz '<application>Portfela &tde;</application>'>
<!ENTITY kwallet-celownik '<application>Portfelowi &tde;</application>'> <!ENTITY tdewallet-celownik '<application>Portfelowi &tde;</application>'>
<!ENTITY kwallet-biernik '<application>Portfel &tde;</application>'> <!ENTITY tdewallet-biernik '<application>Portfel &tde;</application>'>
<!ENTITY kwallet-narzednik '<application>Portfelem &tde;</application>'> <!ENTITY tdewallet-narzednik '<application>Portfelem &tde;</application>'>
<!ENTITY kwallet-miejscownik '<application>Portfelu &tde;</application>'> <!ENTITY tdewallet-miejscownik '<application>Portfelu &tde;</application>'>
<!ENTITY kwalletmanager-mianownik '<application>Menedżer portfeli &tde;</application>'> <!ENTITY tdewalletmanager-mianownik '<application>Menedżer portfeli &tde;</application>'>
<!ENTITY kwalletmanager-dopelniacz '<application>Menedżera portfeli &tde;</application>'> <!ENTITY tdewalletmanager-dopelniacz '<application>Menedżera portfeli &tde;</application>'>
<!ENTITY kwalletmanager-celownik '<application>Menedżerowi portfeli &tde;</application>'> <!ENTITY tdewalletmanager-celownik '<application>Menedżerowi portfeli &tde;</application>'>
<!ENTITY kwalletmanager-biernik '<application>Menedżera portfeli &tde;</application>'> <!ENTITY tdewalletmanager-biernik '<application>Menedżera portfeli &tde;</application>'>
<!ENTITY kwalletmanager-narzednik '<application>Menedżerem portfeli &tde;</application>'> <!ENTITY tdewalletmanager-narzednik '<application>Menedżerem portfeli &tde;</application>'>
<!ENTITY kwalletmanager-miejscownik '<application>Menedżerze portfeli &tde;</application>'> <!ENTITY tdewalletmanager-miejscownik '<application>Menedżerze portfeli &tde;</application>'>
<!ENTITY noatun-mianownik '<application>Noatun</application>'> <!ENTITY noatun-mianownik '<application>Noatun</application>'>
<!ENTITY noatun-dopelniacz '<application>Noatuna</application>'> <!ENTITY noatun-dopelniacz '<application>Noatuna</application>'>

@ -1,133 +0,0 @@
# This file is part of the KDE libraries
# Copyright (C) 1997 Martin Jones (mjones@kde.org)
# (C) 1997 Torben Weis (weis@kde.org)
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
# You should have received a copy of the GNU Library General Public License
# along with this library; see the file COPYING.LIB. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
if DOJAVA
JAVA_SUBDIR=java
LIBKJAVA=
endif
SUBDIRS = misc dom css xml html rendering pics $(JAVA_SUBDIR) ecma . kmultipart
CLEANFILES = dummy.cpp
lib_LTLIBRARIES = libkhtml.la
kde_module_LTLIBRARIES = libkhtmlpart.la khtmlimagepart.la
libkhtml_la_SOURCES = kjserrordlg.ui khtmlview.cpp khtml_part.cpp khtml_run.cpp\
khtml_factory.cpp khtml_settings.cc khtml_events.cpp \
khtml_ext.cpp khtml_pagecache.cpp khtml_iface.skel \
khtml_iface.cc khtml_printsettings.cpp htmlpageinfo.ui \
khtmlimage.cpp
libkhtml_la_METASOURCES = AUTO
include_HEADERS = khtmlview.h khtml_part.h khtml_events.h khtml_settings.h khtmldefaults.h
noinst_HEADERS = design.h testkhtml.h test_regression.h khtml_ext.h \
khtml_pagecache.h khtmlimage.h khtmlpart_p.h khtml_printsettings.h \
kjserrordlg.ui.h
if include_VERSION_SCRIPT
VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
endif
libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
$(LIB_KPARTS) \
$(LIBTHAI) \
$(top_builddir)/tdeprint/libtdeprint.la \
$(top_builddir)/kutils/libkutils.la \
$(top_builddir)/kwallet/client/libkwalletclient.la $(top_builddir)/kjs/libkjs.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la $(LIBJPEG) $(LIB_X11)
# init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
dummy.cpp: $(srcdir)/Makefile.am
echo '#include <tdelibs_export.h>' > $@
echo 'extern "C" KDE_EXPORT void* init_libkhtml();' >> $@
echo 'extern "C" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); } ' >> $@
libkhtmlpart_la_SOURCES = dummy.cpp
libkhtmlpart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
libkhtmlpart_la_LIBADD = libkhtml.la $(LIB_QT)
# init_khtmlimagefactory is in libkhtml.so; init_khtmlimagepart needs to be in the part
imgdummy.cpp: $(srcdir)/Makefile.am
echo '#include <tdelibs_export.h>' > $@
echo 'extern "C" KDE_EXPORT void* init_khtmlimagefactory();' >> $@
echo 'extern "C" KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); } ' >> $@
khtmlimagepart_la_SOURCES = imgdummy.cpp
khtmlimagepart_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
khtmlimagepart_la_LIBADD = libkhtml.la $(LIB_QT)
INCLUDES = -I$(top_srcdir)/kjs -I$(top_builddir)/kjs -I$(top_srcdir)/kimgio \
-I$(srcdir)/java -I$(top_srcdir)/dcop -I$(srcdir)/misc \
-I$(srcdir)/dom -I$(srcdir)/xml -I$(srcdir)/html -I$(srcdir)/css \
-I$(top_srcdir)/libltdl \
-I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl \
-I$(top_srcdir)/tdeprint \
-I$(top_srcdir)/interfaces \
-I$(top_srcdir)/interfaces/kregexpeditor \
-I$(top_srcdir)/kwallet/client \
-I$(top_srcdir)/kutils \
-I$(top_srcdir) $(all_includes)
servicedir = $(kde_servicesdir)
service_DATA = khtml.desktop khtmlimage.desktop
rcdir = $(kde_datadir)/khtml
rc_DATA = khtml.rc khtml_browser.rc khtml_popupmenu.rc
SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
## generate lib documentation
srcdoc:
$(mkinstalldirs) $(SRCDOC_DEST)
kdoc -H -d $(SRCDOC_DEST) tdecore \
$(include_HEADERS) -lqt
EXTRA_DIST = CHANGES DESIGN README.HTMLWidget README.tags
parser:
cd $(srcdir) && \
perl scripts/makeattrs && \
bash scripts/maketags && \
bash scripts/makeprop
## test program
check_PROGRAMS = testkhtml
EXTRA_PROGRAMS = testkhtml_static testregression
testkhtml_SOURCES = testkhtml.cpp domtreeview.cpp
testkhtml_LDADD = libkhtml.la
testkhtml_static_SOURCES = testkhtml.cpp domtreeview.cpp
testkhtml_static_LDADD = libkhtml.la
testkhtml_static_LDFLAGS = -static
testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
testregression_LDADD = libkhtml.la
DOXYGEN_REFERENCES = tdecore tdeui kio tdefx kparts
DOXYGEN_EXCLUDE = test*.* css ecma html java kmultipart misc pics rendering test xml
include ../admin/Doxyfile.am
.PHONY: parser

@ -1,17 +0,0 @@
INCLUDES = -I$(top_srcdir)/khtml -I$(top_srcdir)/kio/httpfilter -I$(top_srcdir)/kutils $(all_includes)
# These are not really libraries, but modules dynamically opened.
# So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/trinity
kde_module_LTLIBRARIES = libkmultipart.la
libkmultipart_la_SOURCES = kmultipart.cpp
libkmultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) $(LIBZ)
libkmultipart_la_DEPENDENCIES = $(LIB_KPARTS)
libkmultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
# Automatically generate moc files
METASOURCES = AUTO
# Install the .desktop file into the kde_services directory
kde_services_DATA = kmultipart.desktop

@ -39,7 +39,7 @@ set( ${target}_SRCS
tde_add_executable( ${target} tde_add_executable( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK ltdlc-static kparts-shared LINK ltdlc-static tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

@ -166,9 +166,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
} }
#endif #endif
/* These are to link libkparts even if 'smart' linker is used */ /* These are to link libtdeparts even if 'smart' linker is used */
#include <kparts/plugin.h> #include <tdeparts/plugin.h>
extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); } extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
/* These are to link libkio even if 'smart' linker is used */ /* These are to link libkio even if 'smart' linker is used */
#include <kio/authinfo.h> #include <kio/authinfo.h>
extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }

@ -65,7 +65,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_library( ${target} SHARED tde_add_library( ${target} SHARED
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
VERSION 4.2.0 VERSION 4.2.0
EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB} EMBED kssl-static kiocore-static tdesycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
LINK ltdlc-static tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES} LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -29,9 +29,9 @@ libkio_la_SOURCES = dummy.cpp
libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \ libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
$(KDE_MT_LDFLAGS) $(KDE_MT_LDFLAGS)
libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
kio/libksycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \ kio/libtdesycoca.la bookmarks/libkbookmarks.la kfile/libkfile.la \
../tdeui/libtdeui.la ../tdesu/libtdesu.la \ ../tdeui/libtdeui.la ../tdesu/libtdesu.la \
../kwallet/client/libkwalletclient.la \ ../tdewallet/client/libtdewalletclient.la \
$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
kde_mime_DATA = magic kde_mime_DATA = magic

@ -622,7 +622,7 @@ Mon Mar 16 11:36:07 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
a mkdir method to kdir in near future a mkdir method to kdir in near future
Mon Mar 16 20:04:00 1998 Martin Jones <mjones@kde.org> Mon Mar 16 20:04:00 1998 Martin Jones <mjones@kde.org>
* Added booktoken.* to remove dependancy on khtmlw and jscript * Added booktoken.* to remove dependancy on tdehtmlw and jscript
Thu Mar 12 09:32:06 1998 Daniel Grana <grana@ie.iwi.unibe.ch> Thu Mar 12 09:32:06 1998 Daniel Grana <grana@ie.iwi.unibe.ch>
* worked on the dir and file completion, should do both now, * worked on the dir and file completion, should do both now,

@ -543,7 +543,7 @@ TQDragObject *KFileDetailView::dragObject()
} }
TQPixmap pixmap; TQPixmap pixmap;
if( urls.count() > 1 ) if( urls.count() > 1 )
pixmap = DesktopIcon( "kmultiple", KIcon::SizeSmall ); pixmap = DesktopIcon( "tdemultiple", KIcon::SizeSmall );
if( pixmap.isNull() ) if( pixmap.isNull() )
pixmap = currentFileItem()->pixmap( KIcon::SizeSmall ); pixmap = currentFileItem()->pixmap( KIcon::SizeSmall );

@ -817,7 +817,7 @@ TQDragObject *KFileIconView::dragObject()
} }
TQPixmap pixmap; TQPixmap pixmap;
if( urls.count() > 1 ) if( urls.count() > 1 )
pixmap = DesktopIcon( "kmultiple", iconSize() ); pixmap = DesktopIcon( "tdemultiple", iconSize() );
if( pixmap.isNull() ) if( pixmap.isNull() )
pixmap = currentFileItem()->pixmap( iconSize() ); pixmap = currentFileItem()->pixmap( iconSize() );

@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
TQPoint hotspot; TQPoint hotspot;
TQPixmap pixmap; TQPixmap pixmap;
if( urls.count() > 1 ){ if( urls.count() > 1 ){
pixmap = DesktopIcon( "kmultiple", 16 ); pixmap = DesktopIcon( "tdemultiple", 16 );
} }
if( pixmap.isNull() ) if( pixmap.isNull() )
pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 ); pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );

@ -54,7 +54,7 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <kservicegroup.h> #include <kservicegroup.h>
#include <klistview.h> #include <klistview.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
#include "kopenwith.h" #include "kopenwith.h"

@ -117,7 +117,7 @@ extern "C" {
#include <ksqueezedtextlabel.h> #include <ksqueezedtextlabel.h>
#include <klibloader.h> #include <klibloader.h>
#include <ktrader.h> #include <ktrader.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kmetaprops.h> #include <kmetaprops.h>
#include <kpreviewprops.h> #include <kpreviewprops.h>
#include <kprocess.h> #include <kprocess.h>
@ -818,7 +818,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
if ( (*it)->mode() != mode ) if ( (*it)->mode() != mode )
mode = (mode_t)0; mode = (mode_t)0;
if ( KMimeType::iconForURL(url, mode) != iconStr ) if ( KMimeType::iconForURL(url, mode) != iconStr )
iconStr = "kmultiple"; iconStr = "tdemultiple";
if ( url.directory() != directory ) if ( url.directory() != directory )
directory = TQString::null; directory = TQString::null;
if ( url.protocol() != protocol ) if ( url.protocol() != protocol )

@ -389,7 +389,7 @@ bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev )
if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) ) if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) )
{ {
if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut )) if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut ))
// Forward focusin/focusout events to the urlrequester; needed by file form element in khtml // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml
TQApplication::sendEvent( this, ev ); TQApplication::sendEvent( this, ev );
} }
return TQWidget::eventFilter( obj, ev ); return TQWidget::eventFilter( obj, ev );

@ -90,9 +90,9 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC
) )
##### ksycoca ################################### ##### tdesycoca ###################################
set( target ksycoca ) set( target tdesycoca )
set( ${target}_SRCS set( ${target}_SRCS
kdirwatch.cpp kfileshare.cpp ksambashare.cpp kdirwatch.cpp kfileshare.cpp ksambashare.cpp

@ -20,11 +20,11 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES) INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES)
noinst_LTLIBRARIES = libkiocore.la libksycoca.la noinst_LTLIBRARIES = libkiocore.la libtdesycoca.la
# convenience lib - no LDFLAGS or LIBADD ! # convenience lib - no LDFLAGS or LIBADD !
libksycoca_la_SOURCES = \ libtdesycoca_la_SOURCES = \
kdirwatch.cpp \ kdirwatch.cpp \
kfileshare.cpp ksambashare.cpp knfsshare.cpp \ kfileshare.cpp ksambashare.cpp knfsshare.cpp \
ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \ ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
@ -43,7 +43,7 @@ libksycoca_la_SOURCES = \
kfilemetainfo.cpp kdcopservicestarter.cpp \ kfilemetainfo.cpp kdcopservicestarter.cpp \
dataslave.cpp dataprotocol.cpp dataslave.cpp dataprotocol.cpp
#if USE_POSIX_ACL #if USE_POSIX_ACL
libksycoca_la_SOURCES += kacl.cpp posixacladdons.cpp libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
#endif #endif
include_HEADERS = \ include_HEADERS = \

@ -26,7 +26,7 @@
#include <kinstance.h> #include <kinstance.h>
#include <ktrader.h> #include <ktrader.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqfile.h> #include <tqfile.h>

@ -27,7 +27,7 @@
#include <ktrader.h> #include <ktrader.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <kuserprofile.h> #include <kuserprofile.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmimetype.h> #include <kmimetype.h>

@ -24,8 +24,8 @@
#include <klibloader.h> #include <klibloader.h>
#include <kglobal.h> #include <kglobal.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <ksycocaentry.h> #include <tdesycocaentry.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>

@ -8,7 +8,7 @@
#ifndef SSK_KIMGIOFACTORY_H #ifndef SSK_KIMGIOFACTORY_H
#define SSK_KIMGIOFACTORY_H #define SSK_KIMGIOFACTORY_H
#include "ksycocafactory.h" #include "tdesycocafactory.h"
#include "kimageio.h" #include "kimageio.h"
class KImageIOFormat; class KImageIOFormat;

@ -56,7 +56,7 @@
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <kde_file.h> #include <kde_file.h>
template class KSharedPtr<KMimeType>; template class KSharedPtr<KMimeType>;
@ -144,7 +144,7 @@ KMimeType::Ptr KMimeType::mimeType( const TQString& _name )
if ( !mime || !mime->isType( KST_KMimeType ) ) if ( !mime || !mime->isType( KST_KMimeType ) )
{ {
// When building ksycoca, findServiceTypeByName doesn't create an object // When building tdesycoca, findServiceTypeByName doesn't create an object
// but returns one from a dict. // but returns one from a dict.
if ( !KSycoca::self()->isBuilding() ) if ( !KSycoca::self()->isBuilding() )
delete mime; delete mime;
@ -426,7 +426,7 @@ void KMimeType::save( TQDataStream& _str )
{ {
KServiceType::save( _str ); KServiceType::save( _str );
// Warning adding/removing fields here involves a binary incompatible change - update version // Warning adding/removing fields here involves a binary incompatible change - update version
// number in ksycoca.h // number in tdesycoca.h
_str << m_lstPatterns; _str << m_lstPatterns;
} }

@ -29,7 +29,7 @@
#include <kicontheme.h> #include <kicontheme.h>
#include <kurl.h> #include <kurl.h>
#include <ksycocatype.h> #include <tdesycocatype.h>
#include <kservicetype.h> #include <kservicetype.h>
class KSimpleConfig; class KSimpleConfig;

@ -25,7 +25,7 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <kprocess.h> #include <kprocess.h>
#include <krun.h> #include <krun.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <tqlayout.h>

@ -24,8 +24,8 @@
#include <tqdatastream.h> #include <tqdatastream.h>
#include <kurl.h> #include <kurl.h>
#include <ksycocaentry.h> #include <tdesycocaentry.h>
#include <ksycocatype.h> #include <tdesycocatype.h>
/** /**
* Information about I/O (Internet, etc.) protocols supported by KDE. * Information about I/O (Internet, etc.) protocols supported by KDE.

@ -51,7 +51,7 @@
#include "kservicetypefactory.h" #include "kservicetypefactory.h"
#include "kservicetype.h" #include "kservicetype.h"
#include "kuserprofile.h" #include "kuserprofile.h"
#include "ksycoca.h" #include "tdesycoca.h"
class KService::KServicePrivate class KService::KServicePrivate
{ {
@ -336,7 +336,7 @@ void KService::load( TQDataStream& s )
// WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
// !! This data structure should remain binary compatible at all times !! // !! This data structure should remain binary compatible at all times !!
// You may add new fields at the end. Make sure to update the version // You may add new fields at the end. Make sure to update the version
// number in ksycoca.h // number in tdesycoca.h
s >> m_strType >> m_strName >> m_strExec >> m_strIcon s >> m_strType >> m_strName >> m_strExec >> m_strIcon
>> term >> m_strTerminalOptions >> term >> m_strTerminalOptions
>> m_strPath >> m_strComment >> m_lstServiceTypes >> def >> m_mapProps >> m_strPath >> m_strComment >> m_lstServiceTypes >> def >> m_mapProps
@ -369,7 +369,7 @@ void KService::save( TQDataStream& s )
// WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x!
// !! This data structure should remain binary compatible at all times !! // !! This data structure should remain binary compatible at all times !!
// You may add new fields at the end. Make sure to update the version // You may add new fields at the end. Make sure to update the version
// number in ksycoca.h // number in tdesycoca.h
s << m_strType << m_strName << m_strExec << m_strIcon s << m_strType << m_strName << m_strExec << m_strIcon
<< term << m_strTerminalOptions << term << m_strTerminalOptions
<< m_strPath << m_strComment << m_lstServiceTypes << def << m_mapProps << m_strPath << m_strComment << m_lstServiceTypes << def << m_mapProps
@ -879,7 +879,7 @@ void KService::virtual_hook( int id, void* data )
void KService::rebuildKSycoca(TQWidget *parent) void KService::rebuildKSycoca(TQWidget *parent)
{ {
KServiceProgressDialog dlg(parent, "ksycoca_progress", KServiceProgressDialog dlg(parent, "tdesycoca_progress",
i18n("Updating System Configuration"), i18n("Updating System Configuration"),
i18n("Updating system configuration.")); i18n("Updating system configuration."));

@ -25,7 +25,7 @@
#include <tqvariant.h> #include <tqvariant.h>
#include <kicontheme.h> #include <kicontheme.h>
#include "ksycocaentry.h" #include "tdesycocaentry.h"
class TQDataStream; class TQDataStream;
class KDesktopFile; class KDesktopFile;

@ -17,9 +17,9 @@
**/ **/
#include "kservicefactory.h" #include "kservicefactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kservice.h" #include "kservice.h"
#include <tqstring.h> #include <tqstring.h>

@ -23,7 +23,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include "kservice.h" #include "kservice.h"
#include "ksycocafactory.h" #include "tdesycocafactory.h"
#include <assert.h> #include <assert.h>
class KSycoca; class KSycoca;

@ -29,7 +29,7 @@
#include "kservicegroupfactory.h" #include "kservicegroupfactory.h"
#include "kservicegroup.h" #include "kservicegroup.h"
#include "kservice.h" #include "kservice.h"
#include "ksycoca.h" #include "tdesycoca.h"
class KServiceGroup::Private class KServiceGroup::Private
{ {

@ -28,8 +28,8 @@
#include <kdesktopfile.h> #include <kdesktopfile.h>
#include <ksortablevaluelist.h> #include <ksortablevaluelist.h>
#include "ksycocaentry.h" #include "tdesycocaentry.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "kservice.h" #include "kservice.h"
class KBuildServiceGroupFactory; class KBuildServiceGroupFactory;
@ -144,7 +144,7 @@ public:
/** /**
* Returns true if the NoDisplay flag was set, i.e. if this * Returns true if the NoDisplay flag was set, i.e. if this
* group should be hidden from menus, while still being in ksycoca. * group should be hidden from menus, while still being in tdesycoca.
* @return true to hide this service group, false to display it * @return true to hide this service group, false to display it
* @since 3.1 * @since 3.1
*/ */

@ -17,9 +17,9 @@
**/ **/
#include "kservicegroupfactory.h" #include "kservicegroupfactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kservice.h" #include "kservice.h"
#include <tqstring.h> #include <tqstring.h>

@ -22,7 +22,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include "kservicegroup.h" #include "kservicegroup.h"
#include "ksycocafactory.h" #include "tdesycocafactory.h"
#include <assert.h> #include <assert.h>
class KSycoca; class KSycoca;

@ -18,7 +18,7 @@
**/ **/
#include "kservice.h" #include "kservice.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "kservicetype.h" #include "kservicetype.h"
#include "kservicetypefactory.h" #include "kservicetypefactory.h"
#include "kservicefactory.h" #include "kservicefactory.h"
@ -138,7 +138,7 @@ KServiceType::save( TQDataStream& _str )
KSycocaEntry::save( _str ); KSycocaEntry::save( _str );
// !! This data structure should remain binary compatible at all times !! // !! This data structure should remain binary compatible at all times !!
// You may add new fields at the end. Make sure to update the version // You may add new fields at the end. Make sure to update the version
// number in ksycoca.h // number in tdesycoca.h
_str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs
<< (TQ_INT8)m_bValid; << (TQ_INT8)m_bValid;
} }

@ -21,7 +21,7 @@
#ifndef __kservicetype_h__ #ifndef __kservicetype_h__
#define __kservicetype_h__ #define __kservicetype_h__
#include "ksycocaentry.h" #include "tdesycocaentry.h"
#include "kservice.h" #include "kservice.h"
#include <tqstring.h> #include <tqstring.h>

@ -17,9 +17,9 @@
**/ **/
#include "kservicetypefactory.h" #include "kservicetypefactory.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "kservicetype.h" #include "kservicetype.h"
#include "kmimetype.h" #include "kmimetype.h"
#include "kuserprofile.h" #include "kuserprofile.h"

@ -25,7 +25,7 @@
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqvaluevector.h> #include <tqvaluevector.h>
#include "ksycocafactory.h" #include "tdesycocafactory.h"
#include "kmimetype.h" #include "kmimetype.h"
class KSycoca; class KSycoca;

@ -36,7 +36,7 @@
* A few examples will make this a lot more clear. * A few examples will make this a lot more clear.
* *
* Say you have an application that will display HTML. In this * Say you have an application that will display HTML. In this
* example, you don't want to link to khtml... and furthermore, you * example, you don't want to link to tdehtml... and furthermore, you
* really don't care if the HTML browser is ours or not, as long as * really don't care if the HTML browser is ours or not, as long as
* it works. The way that you formulate your query as well as the way * it works. The way that you formulate your query as well as the way
* that you execute the browser depends on whether or not you want the * that you execute the browser depends on whether or not you want the

@ -26,7 +26,7 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <klibloader.h> #include <klibloader.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#ifdef HAVE_ELFICON #ifdef HAVE_ELFICON
#include <tqimage.h> #include <tqimage.h>

@ -98,7 +98,7 @@ void KServiceTypeProfile::initStatic()
//static //static
void KServiceTypeProfile::clear() void KServiceTypeProfile::clear()
{ {
// HACK ksycoca may open the dummy db, in such case the first call to ksycoca // HACK tdesycoca may open the dummy db, in such case the first call to tdesycoca
// in initStatic() leads to closing the dummy db and clear() being called // in initStatic() leads to closing the dummy db and clear() being called
// in the middle of it, making s_lstProfiles be NULL // in the middle of it, making s_lstProfiles be NULL
if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 ) if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 )

@ -25,7 +25,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kfilemetainfo.h> #include <kfilemetainfo.h>
#include <kio/kservice.h> #include <kio/kservice.h>
#include <kparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <tqtimer.h> #include <tqtimer.h>

@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
bin_PROGRAMS = kioexec bin_PROGRAMS = kioexec
kioexec_SOURCES = main.cpp kioexec_SOURCES = main.cpp
kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kioexec_LDADD = $(LIB_KIO) kioexec_LDADD = $(LIB_KIO)
noinst_HEADERS = main.h noinst_HEADERS = main.h

@ -18,7 +18,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/tdewallet/client
${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio
) )

@ -1,7 +1,7 @@
# $Id$ # $Id$
# Makefile.am of tdebase/kioslave/http # Makefile.am of tdebase/kioslave/http
INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes) INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
####### Files ####### Files
@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel
kded_kpasswdserver_la_METASOURCES = AUTO kded_kpasswdserver_la_METASOURCES = AUTO
kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
include $(top_srcdir)/admin/Doxyfile.am include $(top_srcdir)/admin/Doxyfile.am

@ -34,7 +34,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kio/passdlg.h> #include <kio/passdlg.h>
#include <kwallet.h> #include <tdewallet.h>
#include "config.h" #include "config.h"
#ifdef Q_WS_X11 #ifdef Q_WS_X11
@ -361,7 +361,7 @@ KPasswdServer::processRequest()
if ( ( username.isEmpty() || password.isEmpty() ) if ( ( username.isEmpty() || password.isEmpty() )
&& !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) ) && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) )
{ {
// no login+pass provided, check if kwallet has one // no login+pass provided, check if tdewallet has one
if ( openWallet( request->windowId ) ) if ( openWallet( request->windowId ) )
hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins ); hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins );
} }

@ -21,7 +21,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdecore/network ${CMAKE_SOURCE_DIR}/tdecore/network
${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/tdewallet/client
) )

@ -3,7 +3,7 @@
# somewhere else. Another option for the future (needs testing) would be to # somewhere else. Another option for the future (needs testing) would be to
# change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h> # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
# instead of #include <openssl/foo.h> # instead of #include <openssl/foo.h>
INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES) INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdewallet/client $(all_includes) $(SSL_INCLUDES)
noinst_LTLIBRARIES = libkssl.la noinst_LTLIBRARIES = libkssl.la
KSSLVERSION= 3.0.0 KSSLVERSION= 3.0.0

@ -31,7 +31,7 @@
#include <kprogress.h> #include <kprogress.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kwallet.h> #include <tdewallet.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>

@ -14,8 +14,8 @@ add_subdirectory( kpac )
add_subdirectory( tdesasl ) add_subdirectory( tdesasl )
add_subdirectory( kssld ) add_subdirectory( kssld )
add_subdirectory( kfile ) add_subdirectory( kfile )
add_subdirectory( kwalletd ) add_subdirectory( tdewalletd )
add_subdirectory( kntlm ) add_subdirectory( tdentlm )
add_definitions( add_definitions(
-D_LARGEFILE64_SOURCE -D_LARGEFILE64_SOURCE

@ -20,7 +20,7 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES) INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES)
SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile tdewalletd tdentlm
lib_LTLIBRARIES = lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kio_uiserver.la tdeinit_LTLIBRARIES = kio_uiserver.la
@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
kmailservice_SOURCES = kmailservice.cpp kmailservice_SOURCES = kmailservice.cpp
kmailservice_LDADD = $(LIB_TDECORE) kmailservice_LDADD = $(LIB_TDECORE)
kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ktelnetservice_SOURCES = ktelnetservice.cpp ktelnetservice_SOURCES = ktelnetservice.cpp
ktelnetservice_LDADD = $(LIB_TDEUI) ktelnetservice_LDADD = $(LIB_TDEUI)
ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \ protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol

@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes)
bin_PROGRAMS = kfile bin_PROGRAMS = kfile
kfile_SOURCES = fileprops.cpp kfile_SOURCES = fileprops.cpp
kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kfile_LDADD = $(LIB_KIO) kfile_LDADD = $(LIB_KIO)

@ -1,12 +0,0 @@
INCLUDES=$(all_includes)
lib_LTLIBRARIES = libkntlm.la
METASOURCES = AUTO
kntlmincludedir = $(includedir)/kio
kntlminclude_HEADERS = kntlm.h
libkntlm_la_SOURCES = kntlm.cpp des.cpp
libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)

@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail
INCLUDES= -I$(srcdir)/.. $(all_includes) INCLUDES= -I$(srcdir)/.. $(all_includes)
ksendbugmail_SOURCES = main.cpp smtp.cpp ksendbugmail_SOURCES = main.cpp smtp.cpp
ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ksendbugmail_LDADD = ../../libkio.la ksendbugmail_LDADD = ../../libkio.la
METASOURCES = AUTO METASOURCES = AUTO

@ -24,15 +24,15 @@ link_directories(
##### headers ################################### ##### headers ###################################
install(FILES kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
##### kntlm ################################### ##### tdentlm ###################################
set( target kntlm ) set( target tdentlm )
set( ${target}_SRCS set( ${target}_SRCS
kntlm.cpp des.cpp tdentlm.cpp des.cpp
) )
tde_add_library( ${target} SHARED tde_add_library( ${target} SHARED

@ -0,0 +1,12 @@
INCLUDES=$(all_includes)
lib_LTLIBRARIES = libtdentlm.la
METASOURCES = AUTO
tdentlmincludedir = $(includedir)/kio
tdentlminclude_HEADERS = tdentlm.h
libtdentlm_la_SOURCES = tdentlm.cpp des.cpp
libtdentlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)

@ -30,7 +30,7 @@
#include <kdebug.h> #include <kdebug.h>
#include "des.h" #include "des.h"
#include "kntlm.h" #include "tdentlm.h"
TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ) TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
{ {

@ -17,8 +17,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/tdewallet/client
${CMAKE_SOURCE_DIR}/kwallet/backend ${CMAKE_SOURCE_DIR}/tdewallet/backend
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )
@ -29,21 +29,21 @@ link_directories(
##### other data ################################ ##### other data ################################
install(FILES kwalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install(FILES tdewalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
#### kded_kwalletd ############################## #### kded_tdewalletd ##############################
set( target kded_kwalletd ) set( target kded_tdewalletd )
set( ${target}_SRCS set( ${target}_SRCS
kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui
kbetterthankdialogbase.ui kbetterthankdialogbase.ui
) )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK tdeinit_kded-shared kwalletbackend-shared LINK tdeinit_kded-shared tdewalletbackend-shared
DEPENDENCIES dcopidl DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -16,20 +16,20 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA. # Boston, MA 02110-1301, USA.
INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top_builddir)/kwallet/backend -I$(top_srcdir)/kwallet/client -I$(top_builddir)/kwallet/client $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(top_builddir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client -I$(top_builddir)/tdewallet/client $(all_includes)
kde_module_LTLIBRARIES = kded_kwalletd.la kde_module_LTLIBRARIES = kded_tdewalletd.la
kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI) kded_tdewalletd_la_LIBADD = $(LIB_KIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = kwalletd.h ktimeout.h kwalletwizard.ui.h noinst_HEADERS = tdewalletd.h ktimeout.h tdewalletwizard.ui.h
services_DATA = kwalletd.desktop services_DATA = tdewalletd.desktop
servicesdir = $(kde_servicesdir)/kded servicesdir = $(kde_servicesdir)/kded
kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h tdewalletwizard.lo: tdewalletwizard.ui tdewalletwizard.ui.h
kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h

@ -21,8 +21,8 @@
*/ */
#include "kbetterthankdialogbase.h" #include "kbetterthankdialogbase.h"
#include "kwalletwizard.h" #include "tdewalletwizard.h"
#include "kwalletd.h" #include "tdewalletd.h"
#include "ktimeout.h" #include "ktimeout.h"
#include <dcopclient.h> #include <dcopclient.h>
@ -37,7 +37,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwalletentry.h> #include <tdewalletentry.h>
#include <twin.h> #include <twin.h>
#include <tqdir.h> #include <tqdir.h>
@ -51,7 +51,7 @@
#include <assert.h> #include <assert.h>
extern "C" { extern "C" {
KDE_EXPORT KDEDModule *create_kwalletd(const TQCString &name) { KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
return new KWalletD(name); return new KWalletD(name);
} }
} }
@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name)
_idleTime = 0; _idleTime = 0;
connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
reconfigure(); reconfigure();
TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
connect(TDEApplication::dcopClient(), connect(TDEApplication::dcopClient(),
TQT_SIGNAL(applicationRemoved(const TQCString&)), TQT_SIGNAL(applicationRemoved(const TQCString&)),
this, this,
TQT_SLOT(slotAppUnregistered(const TQCString&))); TQT_SLOT(slotAppUnregistered(const TQCString&)));
_dw = new KDirWatch(this, "KWallet Directory Watcher"); _dw = new KDirWatch(this, "KWallet Directory Watcher");
_dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
_dw->startScan(true); _dw->startScan(true);
connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
} }
@ -272,15 +272,15 @@ int KWalletD::open(const TQString& wallet, uint wId) {
} }
// Sets up a dialog that will be shown by kwallet. // Sets up a dialog that will be shown by tdewallet.
void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) { void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) {
if( wId != 0 ) if( wId != 0 )
KWin::setMainWindow( dialog, wId ); // correct, set dialog parent KWin::setMainWindow( dialog, wId ); // correct, set dialog parent
else { else {
if( appid.isEmpty()) if( appid.isEmpty())
kdWarning() << "Using kwallet without parent window!" << endl; kdWarning() << "Using tdewallet without parent window!" << endl;
else else
kdWarning() << "Application '" << appid << "' using kwallet without parent window!" << endl; kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl;
// allow dialog activation even if it interrupts, better than trying hacks // allow dialog activation even if it interrupts, better than trying hacks
// with keeping the dialog on top or on all desktops // with keeping the dialog on top or on all desktops
kapp->updateUserTimestamp(); kapp->updateUserTimestamp();
@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
setupDialog( wiz, wId, appid, modal ); setupDialog( wiz, wId, appid, modal );
int rc = wiz->exec(); int rc = wiz->exec();
if (rc == TQDialog::Accepted) { if (rc == TQDialog::Accepted) {
TDEConfig cfg("kwalletrc"); TDEConfig cfg("tdewalletrc");
cfg.setGroup("Wallet"); cfg.setGroup("Wallet");
cfg.writeEntry("First Use", false); cfg.writeEntry("First Use", false);
cfg.writeEntry("Enabled", wiz->_useWallet->isChecked()); cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
return -1; return -1;
} }
} else if (_firstUse) { } else if (_firstUse) {
TDEConfig cfg("kwalletrc"); TDEConfig cfg("tdewalletrc");
_firstUse = false; _firstUse = false;
cfg.setGroup("Wallet"); cfg.setGroup("Wallet");
cfg.writeEntry("First Use", false); cfg.writeEntry("First Use", false);
@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
} }
emitDCOPSignal("walletOpened(TQString)", data); emitDCOPSignal("walletOpened(TQString)", data);
if (_wallets.count() == 1 && _launchManager) { if (_wallets.count() == 1 && _launchManager) {
TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); TDEApplication::startServiceByDesktopName("tdewalletmanager-tdewalletd");
} }
} else { } else {
if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
if (response == 0 || response == 1) { if (response == 0 || response == 1) {
if (response == 1) { if (response == 1) {
TDEConfig cfg("kwalletrc"); TDEConfig cfg("tdewalletrc");
cfg.setGroup("Auto Allow"); cfg.setGroup("Auto Allow");
TQStringList apps = cfg.readListEntry(wallet); TQStringList apps = cfg.readListEntry(wallet);
if (!apps.contains(thisApp)) { if (!apps.contains(thisApp)) {
@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
} }
} }
} else if (response == 3) { } else if (response == 3) {
TDEConfig cfg("kwalletrc"); TDEConfig cfg("tdewalletrc");
cfg.setGroup("Auto Deny"); cfg.setGroup("Auto Deny");
TQStringList apps = cfg.readListEntry(wallet); TQStringList apps = cfg.readListEntry(wallet);
if (!apps.contains(thisApp)) { if (!apps.contains(thisApp)) {
@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
int KWalletD::deleteWallet(const TQString& wallet) { int KWalletD::deleteWallet(const TQString& wallet) {
TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl";
if (TQFile::exists(path)) { if (TQFile::exists(path)) {
close(wallet, true); close(wallet, true);
@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) {
TQStringList KWalletD::wallets() const { TQStringList KWalletD::wallets() const {
TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); TQString path = TDEGlobal::dirs()->saveLocation("tdewallet");
TQDir dir(path, "*.kwl"); TQDir dir(path, "*.kwl");
TQStringList rc; TQStringList rc;
@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
void KWalletD::reconfigure() { void KWalletD::reconfigure() {
TDEConfig cfg("kwalletrc"); TDEConfig cfg("tdewalletrc");
cfg.setGroup("Wallet"); cfg.setGroup("Wallet");
_firstUse = cfg.readBoolEntry("First Use", true); _firstUse = cfg.readBoolEntry("First Use", true);
_enabled = cfg.readBoolEntry("Enabled", true); _enabled = cfg.readBoolEntry("Enabled", true);
@ -1511,4 +1511,4 @@ TQString KWalletD::localWallet() {
} }
#include "kwalletd.moc" #include "tdewalletd.moc"

@ -2,8 +2,8 @@
Type=Service Type=Service
ServiceTypes=KDEDModule ServiceTypes=KDEDModule
X-TDE-ModuleType=Library X-TDE-ModuleType=Library
X-TDE-Library=kwalletd X-TDE-Library=tdewalletd
X-TDE-FactoryName=kwalletd X-TDE-FactoryName=tdewalletd
X-TDE-Kded-autoload=false X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true X-TDE-Kded-load-on-demand=true
Name=KWallet Daemon Module Name=KWallet Daemon Module

@ -28,7 +28,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>
#include "kwalletbackend.h" #include "tdewalletbackend.h"
#include <time.h> #include <time.h>
#include <stdlib.h> #include <stdlib.h>

@ -532,7 +532,7 @@
<includes> <includes>
<include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in declaration">tqcheckbox.h</include>
<include location="global" impldecl="in implementation">klocale.h</include> <include location="global" impldecl="in implementation">klocale.h</include>
<include location="local" impldecl="in implementation">kwalletwizard.ui.h</include> <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
</includes> </includes>
<Q_SLOTS> <Q_SLOTS>
<slot access="private">passwordPageUpdate()</slot> <slot access="private">passwordPageUpdate()</slot>

@ -18,15 +18,15 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes) INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
LDADD = $(LIB_KIO) LDADD = $(LIB_KIO)
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
check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\ check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
kioslavetest kdirwatchtest kshredtest speed kurifiltertest \ kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
kdefaultprogresstest kmimemagictest \ kdefaultprogresstest kmimemagictest \
kfiltertest kiopassdlgtest kscantest kdirlistertest \ kfiltertest kiopassdlgtest kscantest kdirlistertest \
previewtest kionetrctest kdcopcheck metatest \ previewtest kionetrctest kdcopcheck metatest \
kmimefromext kpropsdlgtest kmfitest dataprotocoltest \ kmimefromext kpropsdlgtest kmfitest dataprotocoltest \
kprotocolinfotest ksycocaupdatetest netaccesstest jobtest \ kprotocolinfotest tdesycocaupdatetest netaccesstest jobtest \
kurlcompletiontest kmimetypetest kacltest kurlcompletiontest kmimetypetest kacltest
# Unfortunately some tests depend on the network settings, it seems # Unfortunately some tests depend on the network settings, it seems
@ -48,7 +48,7 @@ kdefaultprogresstest_SOURCES = kdefaultprogresstest.cpp
kionetrctest_SOURCES = kionetrctest.cpp kionetrctest_SOURCES = kionetrctest.cpp
kiopassdlgtest_SOURCES = kiopassdlgtest.cpp kiopassdlgtest_SOURCES = kiopassdlgtest.cpp
kurifiltertest_SOURCES = kurifiltertest.cpp kurifiltertest_SOURCES = kurifiltertest.cpp
ksycocatest_SOURCES = ksycocatest.cpp tdesycocatest_SOURCES = tdesycocatest.cpp
kdcopcheck_SOURCES = kdcopcheck.cpp kdcopcheck_SOURCES = kdcopcheck.cpp
getalltest_SOURCES = getalltest.cpp getalltest_SOURCES = getalltest.cpp
kruntest_SOURCES = kruntest.cpp kruntest_SOURCES = kruntest.cpp
@ -67,7 +67,7 @@ kpropsdlgtest_SOURCES = kpropsdlgtest.cpp
kmfitest_SOURCES = kmfitest.cpp kmfitest_SOURCES = kmfitest.cpp
dataprotocoltest_SOURCES = dataprotocoltest.cpp dataprotocoltest_SOURCES = dataprotocoltest.cpp
kprotocolinfotest_SOURCES = kprotocolinfotest.cpp kprotocolinfotest_SOURCES = kprotocolinfotest.cpp
ksycocaupdatetest_SOURCES = ksycocaupdatetest.cpp tdesycocaupdatetest_SOURCES = tdesycocaupdatetest.cpp
netaccesstest_SOURCES = netaccesstest.cpp netaccesstest_SOURCES = netaccesstest.cpp
jobtest_SOURCES = jobtest.cpp jobtest_SOURCES = jobtest.cpp
kurlcompletiontest_SOURCES = kurlcompletiontest.cpp kurlcompletiontest_SOURCES = kurlcompletiontest.cpp
@ -75,10 +75,10 @@ kmimetypetest_SOURCES = kmimetypetest.cpp
kacltest_SOURCES = kacltest.cpp kacltest_SOURCES = kacltest.cpp
check_LTLIBRARIES = kunittest_kdirwatch.la check_LTLIBRARIES = tdeunittest_kdirwatch.la
kunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
kunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO) tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
kunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
# kfile meta stuff. Comment this in, if you want a small # kfile meta stuff. Comment this in, if you want a small
# metadata plugin test and "make install". # metadata plugin test and "make install".

@ -106,7 +106,7 @@ void KDirWatchTest::rename_file(const TQString& from, const TQString& to)
::rename(TQFile::encodeName(from), TQFile::encodeName(to)); ::rename(TQFile::encodeName(from), TQFile::encodeName(to));
} }
KUNITTEST_MODULE ( kunittest_kdirwatch, "KDirWatchTest" ) KUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest) KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
#define SLEEP() TQApplication::processEvents(); #define SLEEP() TQApplication::processEvents();

@ -19,8 +19,8 @@
#include "kdirwatch.h" #include "kdirwatch.h"
#include "kapplication.h" #include "kapplication.h"
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
#include <kunittest/module.h> #include <tdeunittest/module.h>
class KDirWatchTest : public KUnitTest::Tester class KDirWatchTest : public KUnitTest::Tester
{ {

@ -154,7 +154,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
// Ensure that user configuration doesn't change the results of those tests // Ensure that user configuration doesn't change the results of those tests
// TDEHOME needs to be writable though, for a ksycoca database // TDEHOME needs to be writable though, for a tdesycoca database
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true ); setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

@ -1,5 +1,5 @@
INCLUDES = -I$(top_srcdir)/kio $(all_includes) INCLUDES = -I$(top_srcdir)/kio $(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 METASOURCES = AUTO
kde_module_LTLIBRARIES = kgzipfilter.la kde_module_LTLIBRARIES = kgzipfilter.la

@ -64,6 +64,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK httpfilter-static kntlm-shared kio-shared LINK httpfilter-static tdentlm-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kio_http.la
kio_http_la_SOURCES = http.cc kio_http_la_SOURCES = http.cc
kio_http_la_METASOURCES = AUTO kio_http_la_METASOURCES = AUTO
kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/tdentlm/libtdentlm.la
kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS) kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp

@ -20,7 +20,7 @@ features such as locking.
This might involve an external program to parse the labels, and something to This might involve an external program to parse the labels, and something to
configure access accordingly. There is only some basic things that need to be configure access accordingly. There is only some basic things that need to be
added to kio_http to support this. The majority of the work has to be done at the added to kio_http to support this. The majority of the work has to be done at the
application level. A khtml plugin in tdeaddons to do this might be a nice idea. application level. A tdehtml plugin in tdeaddons to do this might be a nice idea.
- P3P support: - P3P support:
This can also be implemented as a plugin to konqueror and does This can also be implemented as a plugin to konqueror and does

@ -88,7 +88,7 @@
#endif /* HAVE_LIBGSSAPI */ #endif /* HAVE_LIBGSSAPI */
#include <misc/kntlm/kntlm.h> #include <misc/tdentlm/tdentlm.h>
using namespace TDEIO; using namespace TDEIO;
@ -3982,7 +3982,7 @@ void HTTPProtocol::httpClose( bool keepAlive )
// Only allow persistent connections for GET requests. // Only allow persistent connections for GET requests.
// NOTE: we might even want to narrow this down to non-form // NOTE: we might even want to narrow this down to non-form
// based submit requests which will require a meta-data from // based submit requests which will require a meta-data from
// khtml. // tdehtml.
if (keepAlive && (!m_bUseProxy || if (keepAlive && (!m_bUseProxy ||
m_bPersistentProxyConnection || m_bIsTunneled)) m_bPersistentProxyConnection || m_bIsTunneled))
{ {

@ -29,7 +29,7 @@ link_directories(
install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/khtml ) install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
##### kcookiejar ################################ ##### kcookiejar ################################

@ -27,5 +27,5 @@ update_DATA = kcookiescfg.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/kconf_update
cookie_DATA = domain_info cookie_DATA = domain_info
cookiedir = $(kde_datadir)/khtml cookiedir = $(kde_datadir)/tdehtml

@ -257,7 +257,7 @@ KCookieJar::KCookieJar()
m_configChanged = false; m_configChanged = false;
m_cookiesChanged = false; m_cookiesChanged = false;
TDEConfig cfg("khtml/domain_info", true, false, "data"); TDEConfig cfg("tdehtml/domain_info", true, false, "data");
TQStringList countries = cfg.readListEntry("twoLevelTLD"); TQStringList countries = cfg.readListEntry("twoLevelTLD");
for(TQStringList::ConstIterator it = countries.begin(); for(TQStringList::ConstIterator it = countries.begin();
it != countries.end(); ++it) it != countries.end(); ++it)

@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
kcookiejartest_SOURCES = kcookiejartest.cpp kcookiejartest_SOURCES = kcookiejartest.cpp
kcookiejartest_LDADD = $(LIB_KIO) kcookiejartest_LDADD = $(LIB_KIO)
kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
check-local: kcookiejartest check-local: kcookiejartest
./kcookiejartest $(srcdir)/cookie.test ./kcookiejartest $(srcdir)/cookie.test

@ -2,7 +2,7 @@
## Makefile.am of tdebase/kioslave/metainfo ## Makefile.am of tdebase/kioslave/metainfo
INCLUDES = $(all_includes) 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 METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_metainfo.la kde_module_LTLIBRARIES = kio_metainfo.la

@ -1,20 +0,0 @@
SUBDIRS = kmdi . test
INCLUDES = -I$(top_srcdir)/kmdi/res -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
lib_LTLIBRARIES = libkmdi.la
libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
libkmdi_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
kmditoolviewaccessor.cpp kmdiguiclient.cpp kmdidocumentviewtabwidget.cpp \
kmdifocuslist.cpp
include_HEADERS = kmdichildarea.h kmdichildfrm.h kmdichildfrmcaption.h kmdidefines.h \
kmdiiterator.h kmdilistiterator.h kmdimainfrm.h kmdinulliterator.h \
kmditaskbar.h kmdichildview.h kmditoolviewaccessor.h
METASOURCES = AUTO
include ../admin/Doxyfile.am

@ -1,14 +0,0 @@
INCLUDES = -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
lib_LTLIBRARIES = libkmdi2.la
libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
libkmdi2_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
kmdiincludedir = $(includedir)/kmdi
kmdiinclude_HEADERS = global.h mainwindow.h toolviewaccessor.h tabwidget.h
METASOURCES = AUTO
include ../../admin/Doxyfile.am

@ -12,17 +12,17 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
bin_PROGRAMS = khotnewstuff bin_PROGRAMS = khotnewstuff
khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
khotnewstuff_LDADD = libknewstuff.la khotnewstuff_LDADD = libknewstuff.la
khotnewstuff_SOURCES = khotnewstuff.cpp khotnewstuff_SOURCES = khotnewstuff.cpp
EXTRA_PROGRAMS = testnewstuff ghns EXTRA_PROGRAMS = testnewstuff ghns
testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testnewstuff_LDADD = libknewstuff.la testnewstuff_LDADD = libknewstuff.la
testnewstuff_SOURCES = testnewstuff.cpp testnewstuff_SOURCES = testnewstuff.cpp
ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
ghns_LDADD = libknewstuff.la ghns_LDADD = libknewstuff.la
ghns_SOURCES = ghns.cpp ghns_SOURCES = ghns.cpp

@ -1,19 +0,0 @@
INCLUDES = -I$(srcdir)/.. $(all_includes)
# For the future: examine if condensing the tons of *_LDFLAGS variables
# into $(all_libraries) isn't better
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
libkrandrincludedir = $(includedir)/libkrandr
libkrandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libkrandr.h
lib_LTLIBRARIES = libkrandr.la
libkrandr_la_SOURCES = randr.cpp lowlevel_randr.c ktimerdialog.cpp libkrandr.cc
METASOURCES = AUTO
libkrandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined
libkrandr_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) $(LIB_XRANDR)
DOXYGEN_REFERENCES = tdecore
include ../admin/Doxyfile.am

@ -1,49 +0,0 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
lib_LTLIBRARIES = libkresources.la
libkresources_la_SOURCES = resource.cpp \
factory.cpp \
manageriface.skel \
manageriface.stub \
managerimpl.cpp \
configwidget.cpp \
configdialog.cpp \
selectdialog.cpp \
configpage.cpp
libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
libkresources_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
kresincludedir = $(includedir)/kresources
kresinclude_HEADERS = resource.h \
configwidget.h \
factory.h \
manageriface.h \
managerimpl.h \
manager.h \
selectdialog.h \
configdialog.h \
configpage.h
kde_module_LTLIBRARIES = kcm_kresources.la
kcm_kresources_la_SOURCES = kcmkresources.cpp
kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
check_PROGRAMS = testresources
testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testresources_LDADD = libkresources.la
testresources_SOURCES = testresources.cpp
xdg_apps_DATA = kresources.desktop
servicetypedir = $(kde_servicetypesdir)
servicetype_DATA = kresources_plugin.desktop kresources_manager.desktop
include ../admin/Doxyfile.am

@ -1,24 +0,0 @@
SUBDIRS = . ui tests plugins
METASOURCES = AUTO
noinst_LTLIBRARIES = libkspell2base.la
AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kutils $(all_includes)
kspell2baseincludedir = $(includedir)/kspell2
kspell2baseinclude_HEADERS = settings.h filter.h \
dictionary.h broker.h \
backgroundchecker.h defaultdictionary.h
libkspell2base_la_SOURCES = settings.cpp broker.cpp \
client.cpp filter.cpp backgroundchecker.cpp \
backgroundthread.cpp backgroundengine.cpp \
defaultdictionary.cpp
libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
servicetype_DATA = kspellclient.desktop
servicetypedir = $(kde_servicetypesdir)
include $(top_srcdir)/admin/Doxyfile.am

@ -1,17 +0,0 @@
METASOURCES = AUTO
AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
# For the future: examine if condensing the tons of *_LDFLAGS variables
# into $(all_libraries) isn't better
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
kde_module_LTLIBRARIES = kspell_aspell.la
kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_TDECORE)
service_DATA = kspell_aspell.desktop
servicedir = $(kde_servicesdir)

@ -1,17 +0,0 @@
METASOURCES = AUTO
AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
# For the future: examine if condensing the tons of *_LDFLAGS variables
# into $(all_libraries) isn't better
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
kde_module_LTLIBRARIES = kspell_hspell.la
kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_TDECORE)
service_DATA = kspell_hspell.desktop
servicedir = $(kde_servicesdir)

@ -1,24 +0,0 @@
METASOURCES = AUTO
AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes)
# For the future: examine if condensing the tons of *_LDFLAGS variables
# into $(all_libraries) isn't better
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
kde_module_LTLIBRARIES = kspell_ispell.la
kspell_ispell_la_SOURCES = kspell_ispellclient.cpp kspell_ispelldict.cpp \
correct.cpp \
good.cpp \
hash.cpp \
lookup.cpp \
makedent.cpp \
tgood.cpp \
ispell_checker.cpp
kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
kspell_ispell_la_LIBADD = ../../ui/libkspell2.la $(LIB_QT) $(LIB_TDECORE)
service_DATA = kspell_ispell.desktop
servicedir = $(kde_servicesdir)

@ -1,24 +0,0 @@
AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/kspell2 -I$(top_srcdir)/kspell2/ui $(all_includes)
METASOURCES = AUTO
check_PROGRAMS = test test_filter backgroundtest \
test_dialog test_highlighter test_configdialog
test_SOURCES = test.cpp
test_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
test_filter_SOURCES = test_filter.cpp
test_filter_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
backgroundtest_SOURCES = backgroundtest.cpp
backgroundtest_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
test_dialog_SOURCES = test_dialog.cpp
test_dialog_LDADD = ../ui/libkspell2.la $(LIB_TDECORE)
test_highlighter_SOURCES = test_highlighter.cpp
test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
test_configdialog_SOURCES = test_configdialog.cpp
test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_TDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la

@ -1,21 +0,0 @@
METASOURCES = AUTO
lib_LTLIBRARIES = libkspell2.la
# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
noinst_LTLIBRARIES = libkspell2_noinst.la
KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
INCLUDES = -I$(top_srcdir)/kspell2 $(all_includes)
kspell2includedir = $(includedir)/kspell2
kspell2include_HEADERS = dialog.h highlighter.h configdialog.h \
configwidget.h
libkspell2_noinst_la_SOURCES = kspell2ui.ui configwidget.cpp \
highlighter.cpp configui.ui configdialog.cpp
dialog.lo: kspell2ui.h
libkspell2_la_SOURCES = dialog.cpp
libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KFILE)

@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h
kde_style_LTLIBRARIES = asteroid.la kde_style_LTLIBRARIES = asteroid.la
asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
asteroid_la_LIBADD = -ltdefx -lkutils asteroid_la_LIBADD = -ltdefx -ltdeutils
asteroid_la_SOURCES = asteroid.cpp asteroid_la_SOURCES = asteroid.cpp
themercdir = $(kde_datadir)/kstyle/themes themercdir = $(kde_datadir)/kstyle/themes

@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
genembed_SOURCES = genembed.cpp genembed_SOURCES = genembed.cpp
genembed_LDADD = ../../tdefx/libtdefx.la genembed_LDADD = ../../tdefx/libtdefx.la
genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\ pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\
pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\ pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\

@ -240,9 +240,9 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...? if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
khtmlWidgets[widget] = true; tdehtmlWidgets[widget] = true;
connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*))); connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*)));
} }
// use tqqt_cast where possible to check if the widget inheits one of the classes. might improve // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve
@ -283,8 +283,8 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...? if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
khtmlWidgets.remove(widget); tdehtmlWidgets.remove(widget);
} }
// use tqqt_cast to check if the widget inheits one of the classes. // use tqqt_cast to check if the widget inheits one of the classes.
@ -314,9 +314,9 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
KStyle::unPolish(ceData, elementFlags, ptr); KStyle::unPolish(ceData, elementFlags, ptr);
} }
void PlastikStyle::khtmlWidgetDestroyed(TQObject* obj) void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj)
{ {
khtmlWidgets.remove(TQT_TQWIDGET(obj)); tdehtmlWidgets.remove(TQT_TQWIDGET(obj));
} }
void PlastikStyle::progressBarDestroyed(TQObject* obj) void PlastikStyle::progressBarDestroyed(TQObject* obj)
@ -719,7 +719,7 @@ void PlastikStyle::renderButton(TQPainter *p,
bool mouseOver, bool mouseOver,
bool horizontal, bool horizontal,
bool enabled, bool enabled,
bool khtmlMode) const bool tdehtmlMode) const
{ {
// small fix for the kicker buttons... // small fix for the kicker buttons...
if(kickerMode) enabled = true; if(kickerMode) enabled = true;
@ -728,7 +728,7 @@ void PlastikStyle::renderButton(TQPainter *p,
uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom; uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
if(!enabled) contourFlags|=Is_Disabled; if(!enabled) contourFlags|=Is_Disabled;
if(khtmlMode) contourFlags|=Draw_AlphaBlend; if(tdehtmlMode) contourFlags|=Draw_AlphaBlend;
uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom; uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
if(horizontal) surfaceFlags|=Is_Horizontal; if(horizontal) surfaceFlags|=Is_Horizontal;
@ -1526,8 +1526,8 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
case PE_ButtonTool: case PE_ButtonTool:
case PE_ButtonDropDown: case PE_ButtonDropDown:
case PE_ButtonCommand: { case PE_ButtonCommand: {
bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget()); bool tdehtmlMode = opt.isDefault() ? false : tdehtmlWidgets.contains(opt.widget());
renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode ); renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlMode );
break; break;
} }
@ -1884,12 +1884,12 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
// HACK!! // HACK!!
// //
// In order to draw nice edges in khtml, we need to paint alpha-blended. // In order to draw nice edges in tdehtml, we need to paint alpha-blended.
// On the other hand, we can't paint alpha-blended in normal widgets. // On the other hand, we can't paint alpha-blended in normal widgets.
// //
// In this place there is no reliable way to detect if we are in khtml; the // In this place there is no reliable way to detect if we are in tdehtml; the
// only thing we know is that khtml buffers its widgets into a pixmap. So // only thing we know is that tdehtml buffers its widgets into a pixmap. So
// when the paint device is a TQPixmap, chances are high that we are in khtml. // when the paint device is a TQPixmap, chances are high that we are in tdehtml.
// It's possible that this breaks other things, so let's see how it works... // It's possible that this breaks other things, so let's see how it works...
if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) { if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) {
contourFlags += Draw_AlphaBlend; contourFlags += Draw_AlphaBlend;
@ -2816,7 +2816,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
:cg.background(); :cg.background();
uint contourFlags = 0; uint contourFlags = 0;
if( khtmlWidgets.contains(cb) ) if( tdehtmlWidgets.contains(cb) )
contourFlags |= Draw_AlphaBlend; contourFlags |= Draw_AlphaBlend;
if (_inputFocusHighlight && hasFocus && editable && enabled) if (_inputFocusHighlight && hasFocus && editable && enabled)

@ -233,7 +233,7 @@ protected:
bool mouseOver = false, bool mouseOver = false,
bool horizontal = true, bool horizontal = true,
bool enabled = true, bool enabled = true,
bool khtmlMode = false) const; bool tdehtmlMode = false) const;
void renderPanel(TQPainter *p, void renderPanel(TQPainter *p,
const TQRect &r, const TQRect &r,
@ -269,7 +269,7 @@ protected:
virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
protected slots: protected slots:
void khtmlWidgetDestroyed(TQObject* w); void tdehtmlWidgetDestroyed(TQObject* w);
//Animation slots. //Animation slots.
void updateProgressPos(); void updateProgressPos();
@ -300,8 +300,8 @@ private:
TQColor _focusHighlightColor; TQColor _focusHighlightColor;
TQColor _checkMarkColor; TQColor _checkMarkColor;
// track khtml widgets. // track tdehtml widgets.
TQMap<const TQWidget*,bool> khtmlWidgets; TQMap<const TQWidget*,bool> tdehtmlWidgets;
//Animation support. //Animation support.
TQMap<TQWidget*, int> progAnimWidgets; TQMap<TQWidget*, int> progAnimWidgets;

@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme
kinstalltheme_SOURCES = main.cpp kinstalltheme_SOURCES = main.cpp
# the library search path. # the library search path.
kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kinstalltheme_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, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

@ -1,27 +0,0 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
lib_LTLIBRARIES = libkunittest.la
libkunittest_la_SOURCES = runner.cpp tester.cpp
libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
libkunittest_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
libkunittestinclude_HEADERS = runner.h tester.h module.h
libkunittestincludedir = $(includedir)/kunittest
bin_PROGRAMS = kunittestmodrunner
kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kunittestmodrunner_LDADD = libkunittest.la $(LIB_TDECORE)
kunittestmodrunner_SOURCES = modrunner.cpp
# The check_ target makes sure we don't install the modules,
# $(KDE_CHECK_PLUGIN) assures a shared library is created.
check_LTLIBRARIES = kunittest_samplemodule.la
kunittest_samplemodule_la_SOURCES = samplemodule.cpp
kunittest_samplemodule_la_LIBADD = libkunittest.la
kunittest_samplemodule_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local:
./kunittestmodrunner
include ../admin/Doxyfile.am

@ -1,25 +0,0 @@
INCLUDES = -I$(srcdir)/../client $(all_includes)
lib_LTLIBRARIES = libkwalletbackend.la
libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
libkwalletbackend_la_LIBADD = $(LIB_QT) ../../tdecore/libtdecore.la
libkwalletbackend_la_SOURCES = blockcipher.cc \
blowfish.cc \
cbc.cc \
sha1.cc \
kwalletentry.cc \
kwalletbackend.cc
libkwalletbackend_la_METASOURCES = AUTO
noinst_HEADERS = blowfishtables.h \
cbc.h \
sha1.h \
blockcipher.h \
kwalletentry.h \
kwalletbackend.h \
blowfish.h

@ -1,14 +0,0 @@
INCLUDES= -I$(srcdir) $(all_includes)
lib_LTLIBRARIES = libkwalletclient.la
libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
libkwalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
libkwalletclient_la_SOURCES = kwallet.skel \
kwallet.cc
libkwalletclient_la_METASOURCES = AUTO
include_HEADERS = kwallet.h kwallettypes.h

@ -1,20 +0,0 @@
AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
METASOURCES = AUTO
check_PROGRAMS = kwalletasync kwalletsync kwalletboth
kwalletasync_SOURCES = kwalletasync.cpp kwallettest.cpp
kwalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
kwalletasync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
$(LIB_TDECORE) $(LIB_QT)
kwalletsync_SOURCES = kwalletsync.cpp
kwalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
kwalletsync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
$(LIB_TDECORE) $(LIB_QT)
kwalletboth_SOURCES = kwalletboth.cpp kwallettest.cpp
kwalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
kwalletboth_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
$(LIB_TDECORE) $(LIB_QT)
INCLUDES = -I$(top_srcdir)/kwallet/client

@ -1,5 +0,0 @@
Tests for opening the wallet synchronously and asynchronously
kwalletsync - open synchronously
kwalletasync - open asynchronously
kwalletboth - start opening asynchronously, then, during the async call, open synchronously

@ -1,2 +0,0 @@
#include "kwallettest.h"
#include "kwallettest.moc"

@ -1,18 +0,0 @@
lib_LTLIBRARIES = libkscreensaver.la
libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
libkscreensaver_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
if undefined_symbols_allowed
libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
else
libkscreensaver_la_LDFLAGS = $(all_libraries) -static
endif
include_HEADERS = kscreensaver.h kscreensaver_vroot.h
INCLUDES = $(all_includes)
METASOURCES = AUTO
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/libkscreensaver.pot
include $(top_srcdir)/admin/Doxyfile.am

@ -28,19 +28,19 @@ install( FILES
midiout.h player.h track.h midimapper.h midfile.h midiout.h player.h track.h midimapper.h midfile.h
dattypes.h midistat.h deviceman.h synthout.h dattypes.h midistat.h deviceman.h synthout.h
fmout.h gusout.h alsaout.h voiceman.h notearray.h fmout.h gusout.h alsaout.h voiceman.h notearray.h
mt32togm.h midispec.h libkmid.h mt32togm.h midispec.h libtdemid.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkmid ) DESTINATION ${INCLUDE_INSTALL_DIR}/libtdemid )
##### kmid ###################################### ##### tdemid ######################################
set( target kmid ) set( target tdemid )
set( ${target}_SRCS set( ${target}_SRCS
midiout.cc player.cc track.cc midimapper.cc midiout.cc player.cc track.cc midimapper.cc
midfile.cc dattypes.cc midistat.cc deviceman.cc midfile.cc dattypes.cc midistat.cc deviceman.cc
synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
mt32togm.cc notearray.cc libkmid.cc mt32togm.cc notearray.cc libtdemid.cc
) )
tde_add_library( ${target} SHARED tde_add_library( ${target} SHARED

@ -5,20 +5,20 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
# into $(all_libraries) isn't better # into $(all_libraries) isn't better
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
libkmidincludedir = $(includedir)/libkmid libtdemidincludedir = $(includedir)/libtdemid
libkmidinclude_HEADERS = midiout.h player.h track.h midimapper.h \ libtdemidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
midfile.h dattypes.h midistat.h deviceman.h synthout.h \ midfile.h dattypes.h midistat.h deviceman.h synthout.h \
fmout.h gusout.h alsaout.h voiceman.h notearray.h mt32togm.h \ fmout.h gusout.h alsaout.h voiceman.h notearray.h mt32togm.h \
midispec.h libkmid.h midispec.h libtdemid.h
lib_LTLIBRARIES = libkmid.la lib_LTLIBRARIES = libtdemid.la
libkmid_la_SOURCES = midiout.cc player.cc track.cc midimapper.cc \ libtdemid_la_SOURCES = midiout.cc player.cc track.cc midimapper.cc \
midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \ midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \
fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \ fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
libkmid.cc libtdemid.cc
libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95 -no-undefined
libkmid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT) libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_QT)
DOXYGEN_REFERENCES = tdecore DOXYGEN_REFERENCES = tdecore
include ../admin/Doxyfile.am include ../admin/Doxyfile.am

@ -3,7 +3,7 @@
alsaout.cc - class AlsaOut which represents an alsa client/port pair alsaout.cc - class AlsaOut which represents an alsa client/port pair
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 2000 Antonio Larrosa Jimenez Copyright (C) 2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* alsaout.cc - class AlsaOut which represents an alsa client/port pair /* alsaout.cc - class AlsaOut which represents an alsa client/port pair
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -24,7 +24,7 @@
#ifndef _ALSAOUT_H #ifndef _ALSAOUT_H
#define _ALSAOUT_H #define _ALSAOUT_H
#include <libkmid/midiout.h> #include <libtdemid/midiout.h>
struct snd_seq_event; struct snd_seq_event;
typedef struct snd_seq_event snd_seq_event_t; typedef struct snd_seq_event snd_seq_event_t;

@ -1,7 +1,7 @@
/* awe_sup.h - A wrapper on awe_voice.h /* awe_sup.h - A wrapper on awe_voice.h
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
dnl libkmid's specific checks dnl libtdemid's specific checks
#AC_MSG_CHECKING(if libkmid would compile) #AC_MSG_CHECKING(if libtdemid would compile)
#AC_CACHE_VAL(kde_libkmid_compiles, #AC_CACHE_VAL(kde_libtdemid_compiles,
#[ #[
#AC_TRY_COMPILE([ #AC_TRY_COMPILE([
##ifndef __FreeBSD__ ##ifndef __FreeBSD__
@ -17,7 +17,7 @@ dnl libkmid's specific checks
#]) #])
#AC_MSG_RESULT($kde_libmid_compiles) #AC_MSG_RESULT($kde_libmid_compiles)
#if test $kde_libmid_compiles = no; then #if test $kde_libmid_compiles = no; then
# DO_NOT_COMPILE="$DO_NOT_COMPILE libkmid" # DO_NOT_COMPILE="$DO_NOT_COMPILE libtdemid"
#fi #fi
#AC_MSG_CHECKING([for OSS support]) #AC_MSG_CHECKING([for OSS support])

@ -3,7 +3,7 @@
dattypes.cc - Some always useful definitions and functions dattypes.cc - Some always useful definitions and functions
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* dattypes.h - Some useful definitions and functions /* dattypes.h - Some useful definitions and functions
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either

@ -3,7 +3,7 @@
deviceman.cc - The device manager, that hides the use of midiOut deviceman.cc - The device manager, that hides the use of midiOut
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* deviceman.h - The device manager, that hides the use of midiOut /* deviceman.h - The device manager, that hides the use of midiOut
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
@ -23,7 +23,7 @@
#ifndef DEVICEMAN_H #ifndef DEVICEMAN_H
#define DEVICEMAN_H #define DEVICEMAN_H
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
class MidiOut; class MidiOut;

@ -4,7 +4,7 @@
for fm synths for fm synths
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -2,7 +2,7 @@
for FM synths for FM synths
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
@ -24,8 +24,8 @@
#ifndef _FMOUT_H #ifndef _FMOUT_H
#define _FMOUT_H #define _FMOUT_H
#include <libkmid/midiout.h> #include <libtdemid/midiout.h>
#include <libkmid/voiceman.h> #include <libtdemid/voiceman.h>
/** /**
* FM device output class . FMOut is used to send MIDI events to * FM device output class . FMOut is used to send MIDI events to

@ -4,7 +4,7 @@
Ultrasound cards through a /dev/sequencer device Ultrasound cards through a /dev/sequencer device
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -2,7 +2,7 @@
Ultrasound cards through a /dev/sequencer device Ultrasound cards through a /dev/sequencer device
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -25,8 +25,8 @@
#ifndef _GUSOUT_H #ifndef _GUSOUT_H
#define _GUSOUT_H #define _GUSOUT_H
#include <libkmid/midiout.h> #include <libtdemid/midiout.h>
#include <libkmid/voiceman.h> #include <libtdemid/voiceman.h>
/** /**
* Gravis Ultrasound synthesizer output class . This class is used to send midi * Gravis Ultrasound synthesizer output class . This class is used to send midi

@ -1,7 +1,7 @@
/* gusvoices.h - struct with Gravis Ultrasound patches' names /* gusvoices.h - struct with Gravis Ultrasound patches' names
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,10 +1,10 @@
/************************************************************************** /**************************************************************************
libkmid.cc - class KMidSimpleAPI that makes it easy to use libkmid libtdemid.cc - class KMidSimpleAPI that makes it easy to use libtdemid
and a C wrapper. and a C wrapper.
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 2000 Antonio Larrosa Jimenez Copyright (C) 2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -25,7 +25,7 @@
***************************************************************************/ ***************************************************************************/
#include "libkmid.h" #include "libtdemid.h"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>

@ -1,8 +1,8 @@
/* libkmid.h - class KMidSimpleAPI that makes it easy to use libkmid /* libtdemid.h - class KMidSimpleAPI that makes it easy to use libtdemid
and a C wrapper. and a C wrapper.
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 2000 Antonio Larrosa Jimenez Copyright (C) 2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -30,7 +30,7 @@
#include <tdelibs_export.h> #include <tdelibs_export.h>
/** /**
* Simple API covering most of the uses of libkmid. * Simple API covering most of the uses of libtdemid.
* *
* You can use the members of this class in pure C applications, just by using * You can use the members of this class in pure C applications, just by using
* the same name as the corresponding function member. * the same name as the corresponding function member.
@ -47,9 +47,9 @@
* @li kMidStop(); * @li kMidStop();
* @li kMidDestruct(); * @li kMidDestruct();
* *
* to stop the music and release the memory allocated by libkmid. * to stop the music and release the memory allocated by libtdemid.
* *
* @short A very simple API around the rest of libkmid. * @short A very simple API around the rest of libtdemid.
* @version 0.9.5 17/01/2000 * @version 0.9.5 17/01/2000
* @author Antonio Larrosa Jimenez <larrosa@kde.org> * @author Antonio Larrosa Jimenez <larrosa@kde.org>
*/ */
@ -62,7 +62,7 @@ class KMID_EXPORT KMidSimpleAPI
public: public:
/** /**
* Initializes libkmid. Creates the DeviceManager object, and initializes * Initializes libtdemid. Creates the DeviceManager object, and initializes
* some variables that will be used later. * some variables that will be used later.
* *
* @return 0 if OK, and a positive number when there's any error (for * @return 0 if OK, and a positive number when there's any error (for
@ -102,7 +102,7 @@ class KMID_EXPORT KMidSimpleAPI
static int kMidStop(void); static int kMidStop(void);
/** /**
* Releases the memory allocated by libkmid. To continue playing, you must * Releases the memory allocated by libtdemid. To continue playing, you must
* first make a(nother) call to kMidInit(). * first make a(nother) call to kMidInit().
*/ */
static void kMidDestruct(void); static void kMidDestruct(void);
@ -123,7 +123,7 @@ class KMID_EXPORT KMidSimpleAPI
static int kMidDevices(void); static int kMidDevices(void);
/** /**
* Returns the name of the i-th device . In case libkmid wasn't yet * Returns the name of the i-th device . In case libtdemid wasn't yet
* initialized ( see kMidInit() ), the return value is NULL, and in * initialized ( see kMidInit() ), the return value is NULL, and in
* case the parameter has a value out of the valid range * case the parameter has a value out of the valid range
* ( see kMidDevices() ) it returns an empty string. * ( see kMidDevices() ) it returns an empty string.
@ -134,7 +134,7 @@ class KMID_EXPORT KMidSimpleAPI
static const char *kMidName(int i); static const char *kMidName(int i);
/** /**
* Returns the type of the i-th device . In case libkmid wasn't yet * Returns the type of the i-th device . In case libtdemid wasn't yet
* initialized ( see kMidInit() ), the return value is NULL, and in * initialized ( see kMidInit() ), the return value is NULL, and in
* case the parameter has a value out of the valid range * case the parameter has a value out of the valid range
* ( see kMidDevices() ) it returns an empty string. * ( see kMidDevices() ) it returns an empty string.
@ -164,12 +164,12 @@ class KMID_EXPORT KMidSimpleAPI
static void kMidSetMidiMapper(const char *mapfilename); static void kMidSetMidiMapper(const char *mapfilename);
/** /**
* Returns the version number of libkmid, i.e. "0.9.5" or "1.0 Beta" * Returns the version number of libtdemid, i.e. "0.9.5" or "1.0 Beta"
*/ */
static const char *kMidVersion(void); static const char *kMidVersion(void);
/** /**
* Returns the copyright notice that applications using libkmid should print * Returns the copyright notice that applications using libtdemid should print
* to the user in an about box or somewhere visible. * to the user in an about box or somewhere visible.
* I.e. * I.e.
* *

@ -3,7 +3,7 @@
midfile.cc - function which reads a midi file,and creates the track classes midfile.cc - function which reads a midi file,and creates the track classes
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* midfile.h - function which reads a midi file,and creates the track classes /* midfile.h - function which reads a midi file,and creates the track classes
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -24,8 +24,8 @@
#ifndef _MIDFILE_H #ifndef _MIDFILE_H
#define _MIDFILE_H #define _MIDFILE_H
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
#include <libkmid/track.h> #include <libtdemid/track.h>
#include <stdio.h> #include <stdio.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>

@ -3,7 +3,7 @@
midimapper.cc - The midi mapper object midimapper.cc - The midi mapper object
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* midimapper.h - The midi mapper object /* midimapper.h - The midi mapper object
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -25,7 +25,7 @@
#define _MIDIMAPPER_H #define _MIDIMAPPER_H
#include <stdio.h> #include <stdio.h>
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
#define KM_NAME_SIZE 30 #define KM_NAME_SIZE 30
@ -40,7 +40,7 @@
* as if the synthesizer was GM compatible. * as if the synthesizer was GM compatible.
* *
* Please see the KMid documentation * Please see the KMid documentation
* ( http://www.arrakis.es/~rlarrosa/kmid.html ) for information on the * ( http://www.arrakis.es/~rlarrosa/tdemid.html ) for information on the
* format of a MIDI mapper definition file, and how they work. * format of a MIDI mapper definition file, and how they work.
* *
* I created this class because I had one of those non-GM keyboards, * I created this class because I had one of those non-GM keyboards,

@ -3,7 +3,7 @@
midiout.cc - class midiOut which handles external midi devices midiout.cc - class midiOut which handles external midi devices
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* midiout.h - class midiOut which handles the /dev/sequencer device /* midiout.h - class midiOut which handles the /dev/sequencer device
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -24,9 +24,9 @@
#ifndef _MIDIOUT_H #ifndef _MIDIOUT_H
#define _MIDIOUT_H #define _MIDIOUT_H
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
#include <libkmid/deviceman.h> #include <libtdemid/deviceman.h>
#include <libkmid/midimapper.h> #include <libtdemid/midimapper.h>
#include <stdio.h> #include <stdio.h>
/** /**

@ -1,7 +1,7 @@
/* midispec.h - Some definitions to make the code more readable /* midispec.h - Some definitions to make the code more readable
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -3,7 +3,7 @@
midistat.cc - class MidiStatus, change it internally and then send it. midistat.cc - class MidiStatus, change it internally and then send it.
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* midistat.h - class midiStat, change it internally and then send it. /* midistat.h - class midiStat, change it internally and then send it.
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -24,7 +24,7 @@
#ifndef _MIDISTAT_H #ifndef _MIDISTAT_H
#define _MIDISTAT_H #define _MIDISTAT_H
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
/** /**
* Stores the status of a MIDI device . That is, current patch in each channel, * Stores the status of a MIDI device . That is, current patch in each channel,

@ -1,7 +1,7 @@
/* mt32togm.h - the translation map from MT32 patches to GM patches /* mt32togm.h - the translation map from MT32 patches to GM patches
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -3,7 +3,7 @@
notearray.cc - NoteArray class, which holds an array of notes notearray.cc - NoteArray class, which holds an array of notes
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* notearray.h - NoteArray class, which holds an array of notes /* notearray.h - NoteArray class, which holds an array of notes
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez Copyright (C) 1998,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -24,7 +24,7 @@
#ifndef NOTEARRAY_H #ifndef NOTEARRAY_H
#define NOTEARRAY_H #define NOTEARRAY_H
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
/** /**

@ -3,7 +3,7 @@
player.cc - class MidiPlayer. Plays a set of tracks player.cc - class MidiPlayer. Plays a set of tracks
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* player.h - class MidiPlayer. Plays a set of tracks /* player.h - class MidiPlayer. Plays a set of tracks
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -24,11 +24,11 @@
#ifndef _PLAYER_H #ifndef _PLAYER_H
#define _PLAYER_H #define _PLAYER_H
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
#include <libkmid/midfile.h> #include <libtdemid/midfile.h>
#include <libkmid/deviceman.h> #include <libtdemid/deviceman.h>
#include <libkmid/track.h> #include <libtdemid/track.h>
#include <libkmid/notearray.h> #include <libtdemid/notearray.h>
#include <kdemacros.h> #include <kdemacros.h>
/** /**
@ -249,7 +249,7 @@ struct PlayerController
* *
* Alternatively, if everything you want is to play a midi file in a game or * Alternatively, if everything you want is to play a midi file in a game or
* any other application that doesn't need to fine tune the midi playing, just * any other application that doesn't need to fine tune the midi playing, just
* use the kmidplay() function. * use the tdemidplay() function.
* *
* @see KMidSimpleAPI * @see KMidSimpleAPI
* *

@ -1,7 +1,7 @@
/* sndcard.h - include the OSS' soundcard.h file /* sndcard.h - include the OSS' soundcard.h file
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -5,7 +5,7 @@
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98 Antonio Larrosa Jimenez and P.J.Leonard Copyright (C) 1997,98 Antonio Larrosa Jimenez and P.J.Leonard
1999,2000 Antonio Larrosa Jimenez 1999,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -3,7 +3,7 @@
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98 Antonio Larrosa Jimenez and P.J.Leonard Copyright (C) 1997,98 Antonio Larrosa Jimenez and P.J.Leonard
1999,2000 Antonio Larrosa Jimenez 1999,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
@ -25,7 +25,7 @@
#ifndef _SYNTHOUT_H #ifndef _SYNTHOUT_H
#define _SYNTHOUT_H #define _SYNTHOUT_H
#include <libkmid/midiout.h> #include <libtdemid/midiout.h>
/** /**
* Synth (AWE) device output class . SynthOut is used to send MIDI events to * Synth (AWE) device output class . SynthOut is used to send MIDI events to

@ -4,11 +4,11 @@ INCLUDES = -I$(srcdir)/.. $(all_includes)
noinst_PROGRAMS = ctest apitest notesoff noinst_PROGRAMS = ctest apitest notesoff
ctest_SOURCES = ctest.c ctest_SOURCES = ctest.c
ctest_LDADD = ../libkmid.la ctest_LDADD = ../libtdemid.la
apitest_SOURCES = apitest.cc apitest_SOURCES = apitest.cc
apitest_LDADD = ../libkmid.la apitest_LDADD = ../libtdemid.la
notesoff_SOURCES = notesoff.cc notesoff_SOURCES = notesoff.cc
notesoff_LDADD = ../libkmid.la notesoff_LDADD = ../libtdemid.la

@ -1,11 +1,11 @@
#include <libkmid/libkmid.h> #include <libtdemid/libtdemid.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
int main (int , char **) int main (int , char **)
{ {
printf("Libkmid test2 . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n"); printf("Libtdemid test2 . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
printf("Using libkmid from a simple C++ application\n"); printf("Using libtdemid from a simple C++ application\n");
KMidSimpleAPI::kMidInit(); KMidSimpleAPI::kMidInit();
KMidSimpleAPI::kMidLoad("Kathzy.mid"); KMidSimpleAPI::kMidLoad("Kathzy.mid");

@ -1,4 +1,4 @@
#include <libkmid/libkmid.h> #include <libtdemid/libtdemid.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
@ -7,12 +7,12 @@ int main (int argc, char **argv)
int i; int i;
char c; char c;
printf("Test1 %s. Using libkmid from a simple C application\n",kMidVersion()); printf("Test1 %s. Using libtdemid from a simple C application\n",kMidVersion());
printf("%s\n",kMidCopyright()); printf("%s\n",kMidCopyright());
if (kMidInit()!=0) if (kMidInit()!=0)
{ {
printf("Error initializing libkmid\n"); printf("Error initializing libtdemid\n");
return 0; return 0;
} }

@ -1,12 +1,12 @@
#include <libkmid/libkmid.h> #include <libtdemid/libtdemid.h>
#include <libkmid/deviceman.h> #include <libtdemid/deviceman.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
int main (int , char **) int main (int , char **)
{ {
printf("Libkmid Notes Off . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n"); printf("Libtdemid Notes Off . (C) 2000 Antonio Larrosa Jimenez . Malaga (Spain)\n");
printf("Using libkmid from a simple C++ application\n"); printf("Using libtdemid from a simple C++ application\n");
KMidSimpleAPI::kMidInit(); KMidSimpleAPI::kMidInit();

@ -3,7 +3,7 @@
track.cc - class track, which has a midi file track and its events track.cc - class track, which has a midi file track and its events
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* track.h - class track, which has a midi file track and its events /* track.h - class track, which has a midi file track and its events
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -25,7 +25,7 @@
#define _TRACK_H #define _TRACK_H
#include <stdio.h> #include <stdio.h>
#include <libkmid/dattypes.h> #include <libtdemid/dattypes.h>
/** /**
* An structure that represents a MIDI event. * An structure that represents a MIDI event.

@ -3,7 +3,7 @@
voiceman.cc - The VoiceManager class handles a set of voices for synths voiceman.cc - The VoiceManager class handles a set of voices for synths
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -1,7 +1,7 @@
/* voiceman.h - The VoiceManager class handles a set of voices for synths /* voiceman.h - The VoiceManager class handles a set of voices for synths
This file is part of LibKMid 0.9.5 This file is part of LibKMid 0.9.5
Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez Copyright (C) 1997,98,99,2000 Antonio Larrosa Jimenez
LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libkmid.html LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public

@ -27,16 +27,16 @@ link_directories(
##### headers ################################### ##### headers ###################################
install( FILES install( FILES
kscreensaver.h kscreensaver_vroot.h tdescreensaver.h tdescreensaver_vroot.h
DESTINATION ${INCLUDE_INSTALL_DIR} ) DESTINATION ${INCLUDE_INSTALL_DIR} )
##### kscreensaver ############################## ##### tdescreensaver ##############################
set( target kscreensaver ) set( target tdescreensaver )
set( ${target}_SRCS set( ${target}_SRCS
main.cpp kscreensaver.cpp main.cpp tdescreensaver.cpp
) )
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC

@ -0,0 +1,18 @@
lib_LTLIBRARIES = libtdescreensaver.la
libtdescreensaver_la_SOURCES = main.cpp tdescreensaver.cpp
libtdescreensaver_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_X11)
if undefined_symbols_allowed
libtdescreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
else
libtdescreensaver_la_LDFLAGS = $(all_libraries) -static
endif
include_HEADERS = tdescreensaver.h tdescreensaver_vroot.h
INCLUDES = $(all_includes)
METASOURCES = AUTO
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/libtdescreensaver.pot
include $(top_srcdir)/admin/Doxyfile.am

@ -31,8 +31,8 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcrash.h> #include <kcrash.h>
#include "kscreensaver.h" #include "tdescreensaver.h"
#include "kscreensaver_vroot.h" #include "tdescreensaver_vroot.h"
extern "C" extern "C"
{ {
@ -93,7 +93,7 @@ typedef WId Window;
KDE_EXPORT int main(int argc, char *argv[]) KDE_EXPORT int main(int argc, char *argv[])
{ {
KLocale::setMainCatalogue("libkscreensaver"); KLocale::setMainCatalogue("libtdescreensaver");
TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version); TDECmdLineArgs::init(argc, argv, kss_applicationName, kss_description, kss_version);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
@ -102,7 +102,7 @@ KDE_EXPORT int main(int argc, char *argv[])
KCrash::setCrashHandler( crashHandler ); KCrash::setCrashHandler( crashHandler );
TDEGlobal::locale()->insertCatalogue("klock"); TDEGlobal::locale()->insertCatalogue("klock");
TDEGlobal::locale()->insertCatalogue("kscreensaver"); TDEGlobal::locale()->insertCatalogue("tdescreensaver");
DemoWindow *demoWidget = 0; DemoWindow *demoWidget = 0;
Window saveWin = 0; Window saveWin = 0;

@ -21,7 +21,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <kapplication.h> #include <kapplication.h>
#include "kscreensaver.h" #include "tdescreensaver.h"
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#else #else
@ -228,4 +228,4 @@ void KBlankEffect::blankBlocks()
} }
} }
#include "kscreensaver.moc" #include "tdescreensaver.moc"

@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG)
ksvgtopng_SOURCES = ksvgtopng.cpp ksvgtopng_SOURCES = ksvgtopng.cpp
ksvgtopng_LDADD = $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la ksvgtopng_LDADD = $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
install-data-local: install-data-local:
-rm -f $(DESTDIR)$(kde_icondir)/default.tde -rm -f $(DESTDIR)$(kde_icondir)/default.tde

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 494 B

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 664 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

@ -31,20 +31,20 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kcertpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdecertpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES kcertpart.rc DESTINATION ${DATA_INSTALL_DIR}/kcertpart ) install( FILES tdecertpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdecertpart )
##### libkcertpart ############################## ##### libtdecertpart ##############################
set( target libkcertpart ) set( target libtdecertpart )
set( ${target}_SRCS set( ${target}_SRCS
kcertpart.cc tdecertpart.cc
) )
tde_add_kpart( ${target} AUTOMOC tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK kio-shared kparts-shared LINK kio-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -0,0 +1,18 @@
INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = libtdecertpart.la
libtdecertpart_la_SOURCES = tdecertpart.cc
libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
libtdecertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KFILE) $(LIB_TDECORE)
libtdecertpart_la_DEPENDENCIES = $(LIB_KPARTS)
libtdecertpart_la_METASOURCES = AUTO
servicedir = $(kde_servicesdir)
service_DATA = tdecertpart.desktop
rcdir = $(kde_datadir)/tdecertpart
rc_DATA = tdecertpart.rc

@ -19,8 +19,8 @@
*/ */
#include "kcertpart.h" #include "tdecertpart.h"
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <tqframe.h> #include <tqframe.h>
@ -45,11 +45,11 @@
#include <tqmultilineedit.h> #include <tqmultilineedit.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/browserinterface.h> #include <tdeparts/browserinterface.h>
#include <kio/kservicetypefactory.h> #include <kio/kservicetypefactory.h>
K_EXPORT_COMPONENT_FACTORY( libkcertpart, KParts::GenericFactory<KCertPart> ) K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
KX509Item::KX509Item(KListViewItem *parent, KSSLCertificate *x) : KX509Item::KX509Item(KListViewItem *parent, KSSLCertificate *x) :
@ -879,5 +879,5 @@ TDEAboutData *KCertPart::createAboutData()
return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0"); return new TDEAboutData("KCertPart", I18N_NOOP("TDE Certificate Part"), "1.0");
} }
#include "kcertpart.moc" #include "tdecertpart.moc"

@ -95,5 +95,5 @@ Name[ta]=கேசான்றிதழ்பகுதி
Name[te]=కెసెర్ట్ పార్ట్ Name[te]=కెసెర్ట్ పార్ట్
Name[ven]=Tshipida tsha cert ya K Name[ven]=Tshipida tsha cert ya K
ServiceTypes=KParts/ReadWritePart ServiceTypes=KParts/ReadWritePart
X-TDE-Library=libkcertpart X-TDE-Library=libtdecertpart
InitialPreference=15 InitialPreference=15

@ -24,7 +24,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <kparts/part.h> #include <tdeparts/part.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <klistview.h> #include <klistview.h>

@ -85,9 +85,9 @@ install( FILES
kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h kdcoppropertyproxy.h netwm.h kaccelmanager.h netwm_def.h
kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h ksycoca.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h
klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
kmanagerselection.h kmountpoint.h kuser.h klockfile.h kmanagerselection.h kmountpoint.h kuser.h klockfile.h
@ -138,9 +138,9 @@ set( ${target}_SRCS
kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
fakes.c vsnprintf.c ksycoca.cpp ksycocadict.cpp ksycoca.skel fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
ksycocafactory.cpp kxmessages.cpp kstartupinfo.cpp tdesycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
kcatalogue.cpp kasyncio.cpp kmultipledrag.cpp kstaticdeleter.cpp kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp

@ -58,7 +58,7 @@ can copy this pixmap:
// p contains now 30x30 pixels of test.png. // p contains now 30x30 pixels of test.png.
The only hard part is then to publish the icons in a way that applications The only hard part is then to publish the icons in a way that applications
know what to copy. I'm thinking about a ksycoca-sort-of index that know what to copy. I'm thinking about a tdesycoca-sort-of index that
applications can map and can use to do fast lookups with. This has no major applications can map and can use to do fast lookups with. This has no major
problems except for the race-condition that might exist when an icon is problems except for the race-condition that might exist when an icon is
removed. In that case you will remove it from the index first and then later removed. In that case you will remove it from the index first and then later
@ -79,7 +79,7 @@ sure that the index will no longer be used.
I think the best way to distribute the index information is through the file I think the best way to distribute the index information is through the file
system but the update mechanism for this file should probably more complex system but the update mechanism for this file should probably more complex
than the one used in ksycoca. Since ksycoca updates only happen once in a than the one used in tdesycoca. Since tdesycoca updates only happen once in a
while, we can afford it to write out a whole new file. For icons this will while, we can afford it to write out a whole new file. For icons this will
probably be more difficult since updates will be part of normal operation, if probably be more difficult since updates will be part of normal operation, if
the index file is rather large (no idea about that.. how much icons are in the index file is rather large (no idea about that.. how much icons are in
@ -182,6 +182,6 @@ KDE 2.2: We deliver.
<pmax> oh I see <pmax> oh I see
<Zogje> to answer you rfirst question: "won't the ipc be a bottleneck?" no, because you don't use ipc in the critical part (the icon loading) <Zogje> to answer you rfirst question: "won't the ipc be a bottleneck?" no, because you don't use ipc in the critical part (the icon loading)
<pmax> yup I understand how it works now I think <pmax> yup I understand how it works now I think
<Zogje> instead you access an index from disk which is quite fast (as fast as ksycoca) <Zogje> instead you access an index from disk which is quite fast (as fast as tdesycoca)
<pmax> I think this will definitely speed things up on my machine since I have a relatively fast box with slow disks <pmax> I think this will definitely speed things up on my machine since I have a relatively fast box with slow disks
<Zogje> that's why I want to use the file-system instaed of X-properties <Zogje> that's why I want to use the file-system instaed of X-properties

@ -44,7 +44,7 @@ klibloader.cpp
klocale.cpp Hans Petter Bieker <bieker@kde.org> klocale.cpp Hans Petter Bieker <bieker@kde.org>
kmdcodec.cpp kmdcodec.cpp
kmimesourcefactory.cpp kmimesourcefactory.cpp
kmultipledrag.cpp David Faure <faure@kde.org> tdemultipledrag.cpp David Faure <faure@kde.org>
knotifyclient.cpp knotifyclient.cpp
kpalette.cpp Waldo Bastian <bastian@kde.org> kpalette.cpp Waldo Bastian <bastian@kde.org>
kpixmapprovider.cpp Carsten Pfeiffer <pfeiffer@kde.org> kpixmapprovider.cpp Carsten Pfeiffer <pfeiffer@kde.org>
@ -64,9 +64,9 @@ kstartupinfo.cpp Lubos Lunak <l.lunak@kde.org>
kstaticdeleter.cpp Stephan Kulow <coolo@kde.org> kstaticdeleter.cpp Stephan Kulow <coolo@kde.org>
kstdaccel.cpp Ellis Whitehead <ellis@kde.org> kstdaccel.cpp Ellis Whitehead <ellis@kde.org>
kstringhandler.cpp kstringhandler.cpp
ksycoca.cpp Waldo Bastian <bastian@kde.org> tdesycoca.cpp Waldo Bastian <bastian@kde.org>
ksycocadict.cpp Waldo Bastian <bastian@kde.org> tdesycocadict.cpp Waldo Bastian <bastian@kde.org>
ksycocafactory.cpp Waldo Bastian <bastian@kde.org> tdesycocafactory.cpp Waldo Bastian <bastian@kde.org>
ktempfile.cpp Waldo Bastian <bastian@kde.org> ktempfile.cpp Waldo Bastian <bastian@kde.org>
kuniqueapplication.cpp Waldo Bastian <bastian@kde.org> kuniqueapplication.cpp Waldo Bastian <bastian@kde.org>
kurl.cpp Waldo Bastian <bastian@kde.org> kurl.cpp Waldo Bastian <bastian@kde.org>

@ -53,8 +53,8 @@ include_HEADERS = kconfig.h kconfigskeleton.h \
netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \ netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \ kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \ kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
ksycoca.h ksycocaentry.h ksycocatype.h kxmessages.h kstartupinfo.h \ tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h \
klargefile.h kmultipledrag.h kgenericfactory.h kgenericfactory.tcc \ klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \ ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \ kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
kmanagerselection.h kmountpoint.h kuser.h klockfile.h \ kmanagerselection.h kmountpoint.h kuser.h klockfile.h \
@ -84,7 +84,7 @@ libtdefakes_pic.a: libtdefakes.la
noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
kcompletion_private.h netwm_p.h \ kcompletion_private.h netwm_p.h \
kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \ kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \
kregpriv.h kshortcutmenu.h ksycocadict.h ksycocafactory.h netsupp.h \ kregpriv.h kshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \
kcheckaccelerators.h kcalendarsystemgregorian.h \ kcheckaccelerators.h kcalendarsystemgregorian.h \
kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \ kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \
kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h kprotocolinfofactory.h kqiodevicegzip_p.h kiconloader_p.h
@ -108,9 +108,9 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \ ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \
kpixmapprovider.cpp kurldrag.cpp \ kpixmapprovider.cpp kurldrag.cpp \
kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \ kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
ksycoca.cpp ksycocadict.cpp ksycocafactory.cpp ksycoca.skel \ tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \ kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
kmultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \ tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \ kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \ tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
kcalendarsystem.cpp kcalendarsystemgregorian.cpp \ kcalendarsystem.cpp kcalendarsystemgregorian.cpp \
@ -188,7 +188,7 @@ install-exec-hook:
DISTCLEANFILES = tde-config.cpp DISTCLEANFILES = tde-config.cpp
DOXYGEN_REFERENCES = dcop tdeui kparts kio DOXYGEN_REFERENCES = dcop tdeui tdeparts kio
DOXYGEN_EXCLUDE = malloc kde_file.h DOXYGEN_EXCLUDE = malloc kde_file.h
DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES

@ -492,11 +492,11 @@ of these actions then the application will not appear in the TDE menu and will n
be used by KDE for opening files. be used by KDE for opening files.
IMPORTANT NOTE: IMPORTANT NOTE:
Changing restrictions may influence the data that is cached in the ksycoca Changing restrictions may influence the data that is cached in the tdesycoca
database. Since changes to .../share/config/kdeglobals do not trigger an database. Since changes to .../share/config/kdeglobals do not trigger an
automatic ksycoca update you need to force an update manually. automatic tdesycoca update you need to force an update manually.
To force an update of the ksycoca database touch the file To force an update of the tdesycoca database touch the file
.../share/services/update_ksycoca. This will force a user's sycoca database .../share/services/update_tdesycoca. This will force a user's sycoca database
to be rebuild the next time the user logs in. to be rebuild the next time the user logs in.
KDE3 URL Restrictions KDE3 URL Restrictions

@ -47,7 +47,7 @@
#include "kaccelmanager_private.h" #include "kaccelmanager_private.h"
#include "../tdeui/kstdaction_p.h" #include "../tdeui/kstdaction_p.h"
#include "../kutils/kmultitabbar.h" #include "../tdeutils/tdemultitabbar.h"
/********************************************************************* /*********************************************************************

@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = kconfig_compiler bin_PROGRAMS = kconfig_compiler
kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kconfig_compiler_LDADD = $(LIB_TDECORE) kconfig_compiler_LDADD = $(LIB_TDECORE)
kconfig_compiler_SOURCES = kconfig_compiler.cpp kconfig_compiler_SOURCES = kconfig_compiler.cpp

@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example # autoexample check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = autoexample EXTRA_PROGRAMS = autoexample
example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
example_LDADD = $(LIB_TDECORE) example_LDADD = $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp example_SOURCES = example.cpp exampleprefs_base.cpp
autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI) autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \ autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp autoexample.cpp

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/kunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\" AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
@ -14,52 +14,52 @@ CLEANFILES = test1.cpp test1.h \
test_dpointer.cpp test_dpointer.h \ test_dpointer.cpp test_dpointer.h \
md5sums md5sums
test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test1_LDADD = $(LIB_TDECORE) test1_LDADD = $(LIB_TDECORE)
test1_SOURCES = test1main.cpp test1.cpp test1_SOURCES = test1main.cpp test1.cpp
test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test2_LDADD = $(LIB_TDECORE) test2_LDADD = $(LIB_TDECORE)
test2_SOURCES = test2main.cpp test2.cpp test2_SOURCES = test2main.cpp test2.cpp
test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test3_LDADD = $(LIB_TDECORE) test3_LDADD = $(LIB_TDECORE)
test3_SOURCES = test3main.cpp test3.cpp test3_SOURCES = test3main.cpp test3.cpp
test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test4_LDADD = $(LIB_TDECORE) test4_LDADD = $(LIB_TDECORE)
test4_SOURCES = test4main.cpp test4.cpp test4_SOURCES = test4main.cpp test4.cpp
test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test5_LDADD = $(LIB_TDECORE) test5_LDADD = $(LIB_TDECORE)
test5_SOURCES = test5main.cpp test5.cpp test5_SOURCES = test5main.cpp test5.cpp
test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test6_LDADD = $(LIB_TDECORE) test6_LDADD = $(LIB_TDECORE)
test6_SOURCES = test6main.cpp test6.cpp test6_SOURCES = test6main.cpp test6.cpp
test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test7_LDADD = $(LIB_TDECORE) test7_LDADD = $(LIB_TDECORE)
test7_SOURCES = test7main.cpp test7.cpp test7_SOURCES = test7main.cpp test7.cpp
test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test8_LDADD = $(LIB_TDECORE) test8_LDADD = $(LIB_TDECORE)
test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test9_LDADD = $(LIB_TDECORE) test9_LDADD = $(LIB_TDECORE)
test9_SOURCES = test9main.cpp test9.cpp test9_SOURCES = test9main.cpp test9.cpp
test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
test_dpointer_LDADD = $(LIB_TDECORE) test_dpointer_LDADD = $(LIB_TDECORE)
test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
check_LTLIBRARIES = kunittest_kconfigcompiler_test.la check_LTLIBRARIES = tdeunittest_kconfigcompiler_test.la
kunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp tdeunittest_kconfigcompiler_test_la_SOURCES = kconfigcompiler_test.cpp
kunittest_kconfigcompiler_test_la_LIBADD = \ tdeunittest_kconfigcompiler_test_la_LIBADD = \
$(top_builddir)/kunittest/libkunittest.la $(top_builddir)/tdeunittest/libtdeunittest.la
kunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \ tdeunittest_kconfigcompiler_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) \
$(all_libraries) $(all_libraries)

@ -16,12 +16,12 @@
#include <tqfile.h> #include <tqfile.h>
#include <tqstring.h> #include <tqstring.h>
#include <kdebug.h> #include <kdebug.h>
#include <kunittest/module.h> #include <tdeunittest/module.h>
#include "kconfigcompiler_test.h" #include "kconfigcompiler_test.h"
using namespace KUnitTest; using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kconfigcompiler_test, "TDEConfigXT") KUNITTEST_MODULE( tdeunittest_kconfigcompiler_test, "TDEConfigXT")
KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test ) KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
typedef const char * CompilerTestSet[]; typedef const char * CompilerTestSet[];

@ -16,7 +16,7 @@
#ifndef KCONFIGCOMPILER_TEST_H #ifndef KCONFIGCOMPILER_TEST_H
#define KCONFIGCOMPILER_TEST_H #define KCONFIGCOMPILER_TEST_H
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
class TQString; class TQString;

@ -47,27 +47,27 @@
399 kimgio 399 kimgio
400 artskde 400 artskde
500 tdeprint 500 tdeprint
700 kutils (KSettings::Dialog) 700 tdeutils (KSettings::Dialog)
701 kutils (KSettings::Dispatcher) 701 tdeutils (KSettings::Dispatcher)
702 kutils (KPluginSelector) 702 tdeutils (KPluginSelector)
703 kutils (KPluginInfo) 703 tdeutils (KPluginInfo)
704 kutils (KSettings::ComponentsDialog) 704 tdeutils (KSettings::ComponentsDialog)
710 kutils (KCMultiDialog) 710 tdeutils (KCMultiDialog)
711 kutils (TDECModuleProxy) 711 tdeutils (TDECModuleProxy)
712 kutils (TDECModuleInfo) 712 tdeutils (TDECModuleInfo)
713 kutils (TDECModuleContainer) 713 tdeutils (TDECModuleContainer)
750 kspell (tdelibs) 750 tdespell (tdelibs)
760 kmdi 760 tdemdi
780 kcmshell (tdelibs) 780 kcmshell (tdelibs)
790 kimproxy (tdelibs) 790 tdeimproxy (tdelibs)
800 kabapi (tdelibs) 800 kabapi (tdelibs)
900 tdesu (tdelibs) 900 tdesu (tdelibs)
912 ksmartcard (tdelibs) 912 ksmartcard (tdelibs)
1000 kparts 1000 tdeparts
1001 kparts (mainwindow) 1001 tdeparts (mainwindow)
1002 kparts (factory) 1002 tdeparts (factory)
# tdebase # tdebase
1201 konqtree 1201 konqtree
@ -116,7 +116,7 @@
2003 ksim 2003 ksim
2100 kgpg 2100 kgpg
2200 kdf 2200 kdf
2300 kwallet 2300 tdewallet
# 2500-2999 Reserved for private use # 2500-2999 Reserved for private use
@ -182,7 +182,7 @@
5600 kontact (core) 5600 kontact (core)
5601 kontact (interfaces) 5601 kontact (interfaces)
5602 kontact (plugins) 5602 kontact (plugins)
5650 kresources 5650 tderesources
5700 kabc 5700 kabc
5710 kabc/vcard 5710 kabc/vcard
5720 kaddressbook 5720 kaddressbook
@ -197,28 +197,28 @@
5960 kandy 5960 kandy
5970 karm 5970 karm
# libkhtml # libtdehtml
6000 khtml 6000 tdehtml
6005 khtml (encoding) 6005 tdehtml (encoding)
6010 khtml (dom) 6010 tdehtml (dom)
6020 khtml (xml) 6020 tdehtml (xml)
6030 khtml (html) 6030 tdehtml (html)
6031 khtml (frames & objects) 6031 tdehtml (frames & objects)
6035 khtml (parser) 6035 tdehtml (parser)
6036 khtml (tokenizer) 6036 tdehtml (tokenizer)
6040 khtml (render) 6040 tdehtml (render)
6041 khtml (bidi) 6041 tdehtml (bidi)
6045 khtml (rendering tree) 6045 tdehtml (rendering tree)
6050 khtml (part) 6050 tdehtml (part)
6060 khtml (cache) 6060 tdehtml (cache)
6061 khtml (cache-expiredates) 6061 tdehtml (cache-expiredates)
6070 khtml (jscript) 6070 tdehtml (jscript)
6080 khtml (css) 6080 tdehtml (css)
6090 khtml (memory) 6090 tdehtml (memory)
6100 kjas 6100 kjas
6200 khtml (caret) 6200 tdehtml (caret)
6201 khtml (caret table) 6201 tdehtml (caret table)
6210 khtml (editor) 6210 tdehtml (editor)
# libkio # libkio
7000 kio 7000 kio
@ -556,7 +556,7 @@
66666 noatun 66666 noatun
67000 kscd 67000 kscd
67100 kmix 67100 kmix
67200 kmid 67200 tdemid
# tdebindings # tdebindings
70001 dcoppython 70001 dcoppython

@ -53,7 +53,7 @@
kentities.gperf: input file to generate a hash table for entities kentities.gperf: input file to generate a hash table for entities
kentities.c: DO NOT EDIT! generated by the command kentities.c: DO NOT EDIT! generated by the command
"gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c" "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c"
from kentities.gperf from kentities.gperf
$Id$ $Id$

@ -22,7 +22,7 @@
kentities.gperf: input file to generate a hash table for entities kentities.gperf: input file to generate a hash table for entities
kentities.c: DO NOT EDIT! generated by the command kentities.c: DO NOT EDIT! generated by the command
"gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 khtmlentities.gperf > entities.c" "gperf -a -L "ANSI-C" -C -G -c -o -t -k '*' -Nkde_findEntity -D -s 2 tdehtmlentities.gperf > entities.c"
from kentities.gperf from kentities.gperf
$Id$ $Id$

@ -150,7 +150,7 @@ void
KProtocolInfo::load( TQDataStream& _str) KProtocolInfo::load( TQDataStream& _str)
{ {
// You may add new fields at the end. Make sure to update the version // You may add new fields at the end. Make sure to update the version
// number in ksycoca.h // number in tdesycoca.h
TQ_INT32 i_inputType, i_outputType; TQ_INT32 i_inputType, i_outputType;
TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
i_supportsListing, i_supportsReading, i_supportsListing, i_supportsReading,
@ -205,7 +205,7 @@ KProtocolInfo::save( TQDataStream& _str)
KSycocaEntry::save( _str ); KSycocaEntry::save( _str );
// You may add new fields at the end. Make sure to update the version // You may add new fields at the end. Make sure to update the version
// number in ksycoca.h // number in tdesycoca.h
TQ_INT32 i_inputType, i_outputType; TQ_INT32 i_inputType, i_outputType;
TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, TQ_INT8 i_isSourceProtocol, i_isHelperProtocol,
i_supportsListing, i_supportsReading, i_supportsListing, i_supportsReading,

@ -21,8 +21,8 @@
#include <kglobal.h> #include <kglobal.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <ksycoca.h> #include <tdesycoca.h>
#include <ksycocadict.h> #include <tdesycocadict.h>
#include "kprotocolinfofactory.h" #include "kprotocolinfofactory.h"

@ -26,7 +26,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include <kurl.h> #include <kurl.h>
#include <ksycocafactory.h> #include <tdesycocafactory.h>
class KProtocolInfoPrivate; class KProtocolInfoPrivate;

@ -350,8 +350,8 @@ public:
* *
* Example: * Example:
* \code * \code
* perlSplit(' ', "kparts reaches the parts other parts can't", 3) * perlSplit(' ', "tdeparts reaches the parts other parts can't", 3)
* TQStringList contains: "kparts", "reaches", "the parts other parts can't" * TQStringList contains: "tdeparts", "reaches", "the parts other parts can't"
* \endcode * \endcode
* *
* @param sep is the character to use to delimit s. * @param sep is the character to use to delimit s.

@ -24,7 +24,7 @@ install( FILES
kresolver.h kreverseresolver.h tdesocketaddress.h kresolver.h kreverseresolver.h tdesocketaddress.h
tdesocketbase.h tdesocketdevice.h kclientsocketbase.h tdesocketbase.h tdesocketdevice.h kclientsocketbase.h
kstreamsocket.h kserversocket.h kdatagramsocket.h kstreamsocket.h kserversocket.h kdatagramsocket.h
kmulticastsocketdevice.h kmulticastsocket.h tdemulticastsocketdevice.h tdemulticastsocket.h
knetworkinterface.h khttpproxysocketdevice.h knetworkinterface.h khttpproxysocketdevice.h
ksockssocketdevice.h kbufferedsocket.h kiobuffer.h ksockssocketdevice.h kbufferedsocket.h kiobuffer.h
DESTINATION ${INCLUDE_INSTALL_DIR} ) DESTINATION ${INCLUDE_INSTALL_DIR} )

@ -38,8 +38,8 @@ include_HEADERS = kresolver.h \
kstreamsocket.h \ kstreamsocket.h \
kserversocket.h \ kserversocket.h \
kdatagramsocket.h \ kdatagramsocket.h \
kmulticastsocketdevice.h \ tdemulticastsocketdevice.h \
kmulticastsocket.h \ tdemulticastsocket.h \
knetworkinterface.h \ knetworkinterface.h \
khttpproxysocketdevice.h \ khttpproxysocketdevice.h \
ksockssocketdevice.h \ ksockssocketdevice.h \

@ -26,13 +26,13 @@
#define KMULTICASTSOCKET_H #define KMULTICASTSOCKET_H
#include "kdatagramsocket.h" #include "kdatagramsocket.h"
#include "kmulticastsocketdevice.h" #include "tdemulticastsocketdevice.h"
namespace KNetwork { namespace KNetwork {
class KMulticastSocketPrivate; class KMulticastSocketPrivate;
/** /**
* @class KMulticastSocket kmulticastsocket.h kmulticastsocket.h * @class KMulticastSocket tdemulticastsocket.h tdemulticastsocket.h
* @brief A multicast-capable datagram socket class * @brief A multicast-capable datagram socket class
* *
* This class derives from @ref KDatagramSocket adding methods to it to * This class derives from @ref KDatagramSocket adding methods to it to

@ -34,7 +34,7 @@ namespace KNetwork {
class KMulticastSocketImplPrivate; class KMulticastSocketImplPrivate;
/** /**
* @class KMulticastSocketImpl kmulticastsocketdevice.h kmulticastsocketdevice.h * @class KMulticastSocketImpl tdemulticastsocketdevice.h tdemulticastsocketdevice.h
* @brief The low-level backend for multicasting sockets. * @brief The low-level backend for multicasting sockets.
* *
* This class is an interface providing methods for handling multicast * This class is an interface providing methods for handling multicast

@ -4458,7 +4458,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
} }
// FIXME // FIXME
// Much of the code in libkrandr should be integrated into/interfaced with this library // Much of the code in libtderandr should be integrated into/interfaced with this library
} }
if (device->type() == TDEGenericDeviceType::RootSystem) { if (device->type() == TDEGenericDeviceType::RootSystem) {
@ -5587,7 +5587,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
ret = DesktopIcon("kcmpci", size); ret = DesktopIcon("kcmpci", size);
} }
else if (query == TDEGenericDeviceType::Backlight) { else if (query == TDEGenericDeviceType::Backlight) {
ret = DesktopIcon("kscreensaver", size); // FIXME ret = DesktopIcon("tdescreensaver", size); // FIXME
} }
else if (query == TDEGenericDeviceType::Battery) { else if (query == TDEGenericDeviceType::Battery) {
ret = DesktopIcon("energy", size); ret = DesktopIcon("energy", size);

@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "kmultipledrag.h" #include "tdemultipledrag.h"
#include "kdebug.h" #include "kdebug.h"
#ifndef QT_NO_DRAGANDDROP #ifndef QT_NO_DRAGANDDROP
@ -77,6 +77,6 @@ const char* KMultipleDrag::format( int i ) const
void KMultipleDrag::virtual_hook( int, void* ) void KMultipleDrag::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ } { /*BASE::virtual_hook( id, data );*/ }
#include "kmultipledrag.moc" #include "tdemultipledrag.moc"
#endif #endif

@ -18,9 +18,9 @@
#include "config.h" #include "config.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "ksycocafactory.h" #include "tdesycocafactory.h"
#include <tqdatastream.h> #include <tqdatastream.h>
#include <tqfile.h> #include <tqfile.h>
@ -87,7 +87,7 @@ int KSycoca::version()
// Read-only constructor // Read-only constructor
KSycoca::KSycoca() KSycoca::KSycoca()
: DCOPObject("ksycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false), : DCOPObject("tdesycoca"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
m_sycoca_size(0), m_sycoca_mmap(0), m_timeStamp(0) m_sycoca_size(0), m_sycoca_mmap(0), m_timeStamp(0)
{ {
d = new KSycocaPrivate; d = new KSycocaPrivate;
@ -112,21 +112,21 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
m_str = 0; m_str = 0;
m_barray = 0; m_barray = 0;
TQString path; TQString path;
TQCString ksycoca_env = getenv("TDESYCOCA"); TQCString tdesycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty()) if (tdesycoca_env.isEmpty())
path = TDEGlobal::dirs()->saveLocation("cache") + "ksycoca"; path = TDEGlobal::dirs()->saveLocation("cache") + "tdesycoca";
else else
path = TQFile::decodeName(ksycoca_env); path = TQFile::decodeName(tdesycoca_env);
kdDebug(7011) << "Trying to open ksycoca from " << path << endl; kdDebug(7011) << "Trying to open tdesycoca from " << path << endl;
TQFile *database = new TQFile(path); TQFile *database = new TQFile(path);
bool bOpen = database->open( IO_ReadOnly ); bool bOpen = database->open( IO_ReadOnly );
if (!bOpen) if (!bOpen)
{ {
path = locate("services", "ksycoca"); path = locate("services", "tdesycoca");
if (!path.isEmpty()) if (!path.isEmpty())
{ {
kdDebug(7011) << "Trying to open global ksycoca from " << path << endl; kdDebug(7011) << "Trying to open global tdesycoca from " << path << endl;
delete database; delete database;
database = new TQFile(path); database = new TQFile(path);
bOpen = database->open( IO_ReadOnly ); bOpen = database->open( IO_ReadOnly );
@ -166,7 +166,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
} }
else else
{ {
kdDebug(7011) << "Could not open ksycoca" << endl; kdDebug(7011) << "Could not open tdesycoca" << endl;
// No database file // No database file
delete database; delete database;
@ -197,7 +197,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
// Read-write constructor - only for KBuildSycoca // Read-write constructor - only for KBuildSycoca
KSycoca::KSycoca( bool /* dummy */ ) KSycoca::KSycoca( bool /* dummy */ )
: DCOPObject("ksycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false), : DCOPObject("tdesycoca_building"), m_lstFactories(0), m_str(0), m_barray(0), bNoDatabase(false),
m_sycoca_size(0), m_sycoca_mmap(0) m_sycoca_size(0), m_sycoca_mmap(0)
{ {
d = new KSycocaPrivate; d = new KSycocaPrivate;
@ -206,14 +206,14 @@ KSycoca::KSycoca( bool /* dummy */ )
_self = this; _self = this;
} }
static void delete_ksycoca_self() { static void delete_tdesycoca_self() {
delete KSycoca::_self; delete KSycoca::_self;
} }
KSycoca * KSycoca::self() KSycoca * KSycoca::self()
{ {
if (!_self) { if (!_self) {
tqAddPostRoutine(delete_ksycoca_self); tqAddPostRoutine(delete_tdesycoca_self);
_self = new KSycoca(); _self = new KSycoca();
} }
return _self; return _self;
@ -525,4 +525,4 @@ void KSycoca::virtual_hook( int id, void* data )
void KSycocaEntry::virtual_hook( int, void* ) void KSycocaEntry::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ } { /*BASE::virtual_hook( id, data );*/ }
#include "ksycoca.moc" #include "tdesycoca.moc"

@ -16,13 +16,13 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#ifndef __ksycoca_h__ #ifndef __tdesycoca_h__
#define __ksycoca_h__ #define __tdesycoca_h__
#include <dcopobject.h> #include <dcopobject.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include "ksycocatype.h" #include "tdesycocatype.h"
#include <tdelibs_export.h> #include <tdelibs_export.h>
class TQDataStream; class TQDataStream;
@ -99,7 +99,7 @@ public:
* @internal - returns update signature of database * @internal - returns update signature of database
* *
* Signature that keeps track of changes to * Signature that keeps track of changes to
* $TDEDIR/share/services/update_ksycoca * $TDEDIR/share/services/update_tdesycoca
* *
* Touching this file causes the database to be recreated * Touching this file causes the database to be recreated
* from scratch. * from scratch.

@ -16,9 +16,9 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#include "ksycocadict.h" #include "tdesycocadict.h"
#include "ksycocaentry.h" #include "tdesycocaentry.h"
#include "ksycoca.h" #include "tdesycoca.h"
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>

@ -16,8 +16,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#ifndef __ksycocadict_h__ #ifndef __tdesycocadict_h__
#define __ksycocadict_h__ #define __tdesycocadict_h__
#include <tqstring.h> #include <tqstring.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>

@ -16,10 +16,10 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#ifndef __ksycocaentry_h__ #ifndef __tdesycocaentry_h__
#define __ksycocaentry_h__ #define __tdesycocaentry_h__
#include "ksycocatype.h" #include "tdesycocatype.h"
#include <tqstringlist.h> #include <tqstringlist.h>
#include <ksharedptr.h> #include <ksharedptr.h>
@ -32,7 +32,7 @@ class TQDataStream;
* the common functionality for servicetypes and services. * the common functionality for servicetypes and services.
* *
* @internal * @internal
* @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/ksycoca.html * @see http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdesycoca.html
*/ */
class TDECORE_EXPORT KSycocaEntry : public KShared class TDECORE_EXPORT KSycocaEntry : public KShared
{ {

@ -16,11 +16,11 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#include "ksycoca.h" #include "tdesycoca.h"
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "ksycocafactory.h" #include "tdesycocafactory.h"
#include "ksycocaentry.h" #include "tdesycocaentry.h"
#include "ksycocadict.h" #include "tdesycocadict.h"
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqdict.h> #include <tqdict.h>
#include <kdebug.h> #include <kdebug.h>

@ -16,11 +16,11 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#ifndef __ksycocafactory_h__ #ifndef __tdesycocafactory_h__
#define __ksycocafactory_h__ #define __tdesycocafactory_h__
#include "ksycocatype.h" #include "tdesycocatype.h"
#include "ksycocaentry.h" #include "tdesycocaentry.h"
#include <tqdict.h> #include <tqdict.h>
#include <tqptrlist.h> #include <tqptrlist.h>

@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __ksycocatype_h__ #ifndef __tdesycocatype_h__
#define __ksycocatype_h__ #define __tdesycocatype_h__
/** /**
* \relates KSycocaEntry * \relates KSycocaEntry

@ -79,8 +79,8 @@ kstdacceltest_SOURCES = kstdacceltest.cpp
kglobaltest_SOURCES = kglobaltest.cpp kglobaltest_SOURCES = kglobaltest.cpp
ktimezonestest_SOURCES = ktimezonestest.cpp ktimezonestest_SOURCES = ktimezonestest.cpp
check_LTLIBRARIES = kunittest_kconfig.la check_LTLIBRARIES = tdeunittest_kconfig.la
kunittest_kconfig_la_SOURCES = kconfigtest.cpp tdeunittest_kconfig_la_SOURCES = kconfigtest.cpp
kunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST) tdeunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST)
kunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) tdeunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)

@ -27,8 +27,8 @@ debug("sending configure to object KonquerorIface in konqueror");
debug("ko"); debug("ko");
/// BROADCAST /// BROADCAST
debug("sending databaseChanged to object ksycoca in all apps"); debug("sending databaseChanged to object tdesycoca in all apps");
if (kapp->dcopClient()->send( "*", "ksycoca", "databaseChanged()", data )) if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data ))
debug("ok"); debug("ok");
else else
debug("ko"); debug("ko");

@ -23,7 +23,7 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <ksycoca.h> #include <tdesycoca.h>
int int
main(int argc, char *argv[]) main(int argc, char *argv[])

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include <kunittest/tester.h> #include <tdeunittest/tester.h>
#include <kunittest/module.h> #include <tdeunittest/module.h>
#include <kconfig.h> #include <kconfig.h>
@ -31,7 +31,7 @@ private:
void revertEntries(); void revertEntries();
}; };
KUNITTEST_MODULE( kunittest_kconfig, "TDEConfigTest" ) KUNITTEST_MODULE( tdeunittest_kconfig, "TDEConfigTest" )
KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest ) KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
// test data // test data

@ -20,7 +20,7 @@ add_subdirectory( rendering )
add_subdirectory( pics ) add_subdirectory( pics )
add_subdirectory( java ) add_subdirectory( java )
add_subdirectory( ecma ) add_subdirectory( ecma )
add_subdirectory( kmultipart ) add_subdirectory( tdemultipart )
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
@ -39,8 +39,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile ${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/kio/kssl
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/tdeutils
${CMAKE_SOURCE_DIR}/kwallet/client ${CMAKE_SOURCE_DIR}/tdewallet/client
${CMAKE_SOURCE_DIR}/tdeprint ${CMAKE_SOURCE_DIR}/tdeprint
) )
@ -52,32 +52,32 @@ link_directories(
##### headers ################################### ##### headers ###################################
install( FILES install( FILES
khtmlview.h khtml_part.h khtml_events.h tdehtmlview.h tdehtml_part.h tdehtml_events.h
khtml_settings.h khtmldefaults.h tdehtml_settings.h tdehtmldefaults.h
DESTINATION ${INCLUDE_INSTALL_DIR} ) DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################ ##### other data ################################
install( FILES khtml.desktop khtmlimage.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES tdehtml.desktop tdehtmlimage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES khtml.rc khtml_browser.rc khtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/khtml ) install( FILES tdehtml.rc tdehtml_browser.rc tdehtml_popupmenu.rc DESTINATION ${DATA_INSTALL_DIR}/tdehtml )
##### khtml ##################################### ##### tdehtml #####################################
set( target khtml ) set( target tdehtml )
set( ${target}_SRCS set( ${target}_SRCS
khtmlview.cpp khtml_part.cpp khtml_run.cpp tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp
khtml_factory.cpp khtml_settings.cc khtml_events.cpp tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp
khtml_ext.cpp khtml_pagecache.cpp khtml_iface.cc tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cc
khtml_printsettings.cpp khtmlimage.cpp kjserrordlg.ui tdehtml_printsettings.cpp tdehtmlimage.cpp kjserrordlg.ui
htmlpageinfo.ui khtml_iface.skel htmlpageinfo.ui tdehtml_iface.skel
) )
### FIXME what is this? ### FIXME what is this?
### if include_VERSION_SCRIPT ### if include_VERSION_SCRIPT
### VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map ### VSCRIPT = -Wl,--version-script=$(srcdir)/libtdehtml.map
### endif ### endif
### FIXME what about java? ### FIXME what about java?
@ -86,17 +86,17 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 4.2.0 VERSION 4.2.0
LINK ${VSCRIPT} kjava-static kjs_html-static khtmldom-static khtmlcss-static LINK ${VSCRIPT} kjava-static kjs_html-static tdehtmldom-static tdehtmlcss-static
khtmlhtml-static khtmlxml-static khtmlrender-static khtmlmisc-static tdehtmlhtml-static tdehtmlxml-static tdehtmlrender-static tdehtmlmisc-static
kutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES} tdeutils-shared tdeprint-shared kjs-shared ${JPEG_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
DEPENDENCIES dcopidl DEPENDENCIES dcopidl
) )
##### libkhtmlpart ############################## ##### libtdehtmlpart ##############################
set( target libkhtmlpart ) set( target libtdehtmlpart )
set( ${target}_SRCS set( ${target}_SRCS
dummy.cpp dummy.cpp
@ -104,20 +104,20 @@ set( ${target}_SRCS
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
"#include <tdelibs_export.h> "#include <tdelibs_export.h>
extern \"C\" KDE_EXPORT void* init_libkhtml(); extern \"C\" KDE_EXPORT void* init_libtdehtml();
extern \"C\" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); } extern \"C\" KDE_EXPORT void* init_libtdehtmlpart() { return init_libtdehtml(); }
" ) " )
tde_add_kpart( ${target} tde_add_kpart( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK khtml-shared LINK tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )
##### khtmlimagepart ############################ ##### tdehtmlimagepart ############################
set( target khtmlimagepart ) set( target tdehtmlimagepart )
set( ${target}_SRCS set( ${target}_SRCS
imgdummy.cpp imgdummy.cpp
@ -126,12 +126,12 @@ set( ${target}_SRCS
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp
" "
#include <tdelibs_export.h> #include <tdelibs_export.h>
extern \"C\" KDE_EXPORT void* init_khtmlimagefactory(); extern \"C\" KDE_EXPORT void* init_tdehtmlimagefactory();
extern \"C\" KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); } extern \"C\" KDE_EXPORT void* init_tdehtmlimagepart() { return init_tdehtmlimagefactory(); }
" ) " )
tde_add_kpart( ${target} tde_add_kpart( ${target}
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
LINK khtml-shared LINK tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -33,7 +33,7 @@
* ecma/kjs_window.cpp (executeOpenWindow): fixed location href * ecma/kjs_window.cpp (executeOpenWindow): fixed location href
and pathname for about:blank windows and pathname for about:blank windows
* khtml_part.cpp (findFrameParent): made frame name lookup locale * tdehtml_part.cpp (findFrameParent): made frame name lookup locale
independant. Was mostly problematic with non-ascii names. independant. Was mostly problematic with non-ascii names.
* html/html_formimpl.cpp (gatherWalletData): prevent crash occuring * html/html_formimpl.cpp (gatherWalletData): prevent crash occuring
@ -48,7 +48,7 @@
* rendering/render_object.h: New functions scrollsOverflowX() and scrollsOverflowY * rendering/render_object.h: New functions scrollsOverflowX() and scrollsOverflowY
* rendering/render_layer.h: Remove depricated function moveScrollbarsAside() * rendering/render_layer.h: Remove depricated function moveScrollbarsAside()
* rendering/render_layer.cpp: More fine grained creation of scrollbars * rendering/render_layer.cpp: More fine grained creation of scrollbars
* khtmlview.cpp: More fine grained creation of scrollbars * tdehtmlview.cpp: More fine grained creation of scrollbars
* rendering/render_block.cpp: Use new functions * rendering/render_block.cpp: Use new functions
* rendering/render_box.cpp: Use new functions * rendering/render_box.cpp: Use new functions
* rendering/bidi.cpp: Use new functions * rendering/bidi.cpp: Use new functions
@ -83,7 +83,7 @@
* html/html_baseimpl.{h,cpp} (HTMLIFrameElementImpl::parseAttribute): parse frameborder attribute. Defaults to true as per specification. * html/html_baseimpl.{h,cpp} (HTMLIFrameElementImpl::parseAttribute): parse frameborder attribute. Defaults to true as per specification.
(HTMLIFrameElementImpl::updateFrame/attach): apply/remove frameborder style at attachment time. (HTMLIFrameElementImpl::updateFrame/attach): apply/remove frameborder style at attachment time.
* khtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must * tdehtmlview.cpp (drawContents): fix counter-mask problem. Widget geometry is not accurate before painting, so we must
use the RenderObject's. use the RenderObject's.
* rendering/render_frames.h (paddingTop/paddingBottom/paddingLeft/paddingRight): reimplement. Frames have no padding. * rendering/render_frames.h (paddingTop/paddingBottom/paddingLeft/paddingRight): reimplement. Frames have no padding.
(RenderPartObject::canHaveBorder): reimplement. True. (RenderPartObject::canHaveBorder): reimplement. True.
@ -219,7 +219,7 @@
Improve the CSS :lang() selector to match clarified specification Improve the CSS :lang() selector to match clarified specification
* khtml_part.cpp: parse HTTP content-language * tdehtml_part.cpp: parse HTTP content-language
* xml/dom_docimpl.cpp: parse HTTP-EQUIV content-language * xml/dom_docimpl.cpp: parse HTTP-EQUIV content-language
* css/cssstyleselector.cpp: match :lang() against parents and ultimately the document * css/cssstyleselector.cpp: match :lang() against parents and ultimately the document
@ -227,7 +227,7 @@
Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise. Scope: relayout/repaint/widget masks fixes. Refine stacking context exploration. Optimise.
* khtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated) * tdehtmlview.cpp (drawContents): use widget geometry rather than the RenderWidget's rect (fixes widget borders not being updated)
Check if widget is in the dirty rect before doing any work. Check if widget is in the dirty rect before doing any work.
* rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to * rendering/render_block.cpp (layoutBlockChildren): I meant !child->isPositioned() here, not isPositioned(). No need to
@ -245,7 +245,7 @@
* rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets. * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
(detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
Only allow !khtml widgets to register in the view (only those need masking). Only allow !tdehtml widgets to register in the view (only those need masking).
2006-03-05 Charles Samuels <charles@kde.org> 2006-03-05 Charles Samuels <charles@kde.org>
* link not accessable with negative text-indent (#96275) * link not accessable with negative text-indent (#96275)
@ -259,7 +259,7 @@
get iframes, objects and some other overlaid widgets to obey their stacking context (#31121) get iframes, objects and some other overlaid widgets to obey their stacking context (#31121)
* khtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets, * tdehtmlview.cpp: mask widgets more precisely (i.e. allow layers to paint over overlaid widgets,
when they ought to). when they ought to).
* rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning; * rendering/render_canvas.{cpp,h}: update widget masks after pos child layout/positioning;
@ -314,7 +314,7 @@
2005-12-09 Germain Garand <germain@ebooksfrance.org> 2005-12-09 Germain Garand <germain@ebooksfrance.org>
implement quirky HTML alignment ; introduce special float values implement quirky HTML alignment ; introduce special float values
-khtml-left/-khtml-right to this effect. -tdehtml-left/-tdehtml-right to this effect.
* css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also. * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
* css/cssstyleselector.cpp: ditto. * css/cssstyleselector.cpp: ditto.
@ -377,7 +377,7 @@
2005-10-14 Lubos Lunak <l.lunak@kde.org> 2005-10-14 Lubos Lunak <l.lunak@kde.org>
* khtmlview.cpp: show accesskeys for all frames * tdehtmlview.cpp: show accesskeys for all frames
2005-10-13 Allan Sandfeld Jensen <kde@carewolf.com> 2005-10-13 Allan Sandfeld Jensen <kde@carewolf.com>
@ -441,7 +441,7 @@
Implementation of real page-breaking algorithm respecting the CSS 2.1 specification. Implementation of real page-breaking algorithm respecting the CSS 2.1 specification.
* khtmlview.cpp: * tdehtmlview.cpp:
Do layout for page-breaks before printing. Do layout for page-breaks before printing.
Use screen resolution as default instead of 72DPI. Use screen resolution as default instead of 72DPI.
* css/html4.css: Add the print media default styles * css/html4.css: Add the print media default styles
@ -490,7 +490,7 @@
* rendering/render_line.{h,cpp}: ditto * rendering/render_line.{h,cpp}: ditto
* rendering/render_object.{h,cpp}: ditto * rendering/render_object.{h,cpp}: ditto
* rendering/render_form.cpp: * rendering/render_form.cpp:
* khtml/rendering/render_table.cpp: * tdehtml/rendering/render_table.cpp:
2005-08-02 Allan Sandfeld Jensen <kde@carewolf.com> 2005-08-02 Allan Sandfeld Jensen <kde@carewolf.com>
@ -499,7 +499,7 @@
2005-07-26 Andreas Kling <kling@impul.se> 2005-07-26 Andreas Kling <kling@impul.se>
* html/htmlparser.cpp: Block <input type="image"> elements if SRC attribute is ad-filtered. * html/htmlparser.cpp: Block <input type="image"> elements if SRC attribute is ad-filtered.
* khtml_part.cpp: Include <input type="image"> elements in AdBlocK filter runs. * tdehtml_part.cpp: Include <input type="image"> elements in AdBlocK filter runs.
2005-07-25 Dawit Alemayehu <adawit@kde.org> 2005-07-25 Dawit Alemayehu <adawit@kde.org>
* ecma/xmlhttprequest.cpp: Use the charset provided by the remote host through the HTTP headers. * ecma/xmlhttprequest.cpp: Use the charset provided by the remote host through the HTTP headers.
@ -509,8 +509,8 @@
Make new ad filters have instant effect (either hide affected elements Make new ad filters have instant effect (either hide affected elements
replace them with the "blocked" pixmap.) replace them with the "blocked" pixmap.)
* khtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration() * tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
* khtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters. * tdehtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
* misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor. * misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor.
2005-07-19 Allan Sandfeld Jensen <kde@carewolf.com> 2005-07-19 Allan Sandfeld Jensen <kde@carewolf.com>
@ -526,9 +526,9 @@
"Block IFrame..." context menu option "Block IFrame..." context menu option
* khtml_ext.{cpp,h}: Added "blockiframe" to context popup menu * tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
* khtml_popupmenu.rc: Same * tdehtml_popupmenu.rc: Same
* khtml_part.h: added KHTMLPopupGUIClient to friend classes * tdehtml_part.h: added KHTMLPopupGUIClient to friend classes
2005-07-08 Germain Garand <germain@ebooksfrance.org> 2005-07-08 Germain Garand <germain@ebooksfrance.org>
@ -580,7 +580,7 @@
* html/html_tableimpl.cpp (appendChild): Improve fix for bug #105586 to avoid * html/html_tableimpl.cpp (appendChild): Improve fix for bug #105586 to avoid
side effects with tfoot. side effects with tfoot.
* khtml_run.cpp (foundMimeType): Mark child object (e.g. <embed>) as completed * tdehtml_run.cpp (foundMimeType): Mark child object (e.g. <embed>) as completed
after saving, running in external viewer, or cancelling, so that e.g. scheduled redirects after saving, running in external viewer, or cancelling, so that e.g. scheduled redirects
can happen. Patch by Andreas Kling <kling@impul.se>. can happen. Patch by Andreas Kling <kling@impul.se>.
@ -633,7 +633,7 @@
* ecma/domparser.{h,cpp}: Implementation * ecma/domparser.{h,cpp}: Implementation
* ecma/kjs_window.{h,cpp}: Exposing DOMParser * ecma/kjs_window.{h,cpp}: Exposing DOMParser
* misc/shared.h: khtml::SharedPtr<> * misc/shared.h: tdehtml::SharedPtr<>
2005-06-08 Allan Sandfeld Jensen <kde@carewolf.com> 2005-06-08 Allan Sandfeld Jensen <kde@carewolf.com>
@ -662,7 +662,7 @@
Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft). Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).
Also add three more numeric: (Lao, Thai and Tibetan) Also add three more numeric: (Lao, Thai and Tibetan)
* css/cssvalues.in: Add new CSS3 values with -khtml- * css/cssvalues.in: Add new CSS3 values with -tdehtml-
* rendering/render_style.h: Add new enums * rendering/render_style.h: Add new enums
* rendering/enumerate.cpp: Implement the ideographic algorithm. * rendering/enumerate.cpp: Implement the ideographic algorithm.
@ -708,7 +708,7 @@
from innerHTML() and innerText() from innerHTML() and innerText()
2005-05-14 Ivor Hewitt <ivor@ivor.org> 2005-05-14 Ivor Hewitt <ivor@ivor.org>
* khtml_settings.cc: Support full wildcard expressions in AdblocK * tdehtml_settings.cc: Support full wildcard expressions in AdblocK
2005-05-12 Luciano Montanaro <mikelima@cirulla.net> 2005-05-12 Luciano Montanaro <mikelima@cirulla.net>
* html/html_formimpl.cpp: Make a return keypress activate form * html/html_formimpl.cpp: Make a return keypress activate form
@ -718,7 +718,7 @@
2005-05-12 David Faure <faure@kde.org> 2005-05-12 David Faure <faure@kde.org>
* khtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if * tdehtmlview.cpp (dispatchKeyEvent): Don't send DOM keypress if
the DOM keydown that precedes it was blocked by javascript, as in IE. the DOM keydown that precedes it was blocked by javascript, as in IE.
* rendering/render_replaced.cpp (handleEvent): send Qt::KeyPress to the * rendering/render_replaced.cpp (handleEvent): send Qt::KeyPress to the
@ -749,9 +749,9 @@
fix #15848: First implementation of AdBlocK. fix #15848: First implementation of AdBlocK.
* khtml_ext.{cpp,h}: Add Blockimage to context popup menu * tdehtml_ext.{cpp,h}: Add Blockimage to context popup menu
* khtml_popupmenu.rc: ditto * tdehtml_popupmenu.rc: ditto
* khtml_settings.{cc,h}: Add adFilter settings and helper functions * tdehtml_settings.{cc,h}: Add adFilter settings and helper functions
* html/htmlparser.cpp: Strip blocked IMG tags * html/htmlparser.cpp: Strip blocked IMG tags
* misc/loader.{cpp,h}: Return replacement blocked images and refuse to load blocked scripts. * misc/loader.{cpp,h}: Return replacement blocked images and refuse to load blocked scripts.
* misc/blocked_icon.{cpp,png}: Image for above * misc/blocked_icon.{cpp,png}: Image for above
@ -805,15 +805,15 @@
2005-04-15 Lubos Lunak <l.lunak@kde.org> 2005-04-15 Lubos Lunak <l.lunak@kde.org>
* khtmlview.{h,cpp}: Assign unused accesskeys automatically to elements * tdehtmlview.{h,cpp}: Assign unused accesskeys automatically to elements
without accesskeys. without accesskeys.
2005-04-06 Lubos Lunak <l.lunak@kde.org> 2005-04-06 Lubos Lunak <l.lunak@kde.org>
* khtmlview.{h,cpp}: Use KActions for type ahead find. * tdehtmlview.{h,cpp}: Use KActions for type ahead find.
* khtml_part.{h,cpp}: ditto. * tdehtml_part.{h,cpp}: ditto.
* khtml_part.{h,cpp}: Add Find Previous action. * tdehtml_part.{h,cpp}: Add Find Previous action.
* khtml_part.cpp (findTextNext): Fix changing direction while searching text. * tdehtml_part.cpp (findTextNext): Fix changing direction while searching text.
2005-04-05 Lubos Lunak <l.lunak@kde.org> 2005-04-05 Lubos Lunak <l.lunak@kde.org>
@ -821,7 +821,7 @@
2005-04-04 Lubos Lunak <l.lunak@kde.org> 2005-04-04 Lubos Lunak <l.lunak@kde.org>
* khtmlview.cpp: Don't use keyboard grab for type-ahead find. * tdehtmlview.cpp: Don't use keyboard grab for type-ahead find.
2005-04-03 Allan Sandfeld Jensen <kde@carewolf.com> 2005-04-03 Allan Sandfeld Jensen <kde@carewolf.com>
@ -1031,7 +1031,7 @@
2005-02-16 Leo Savernik <l.savernik@aon.at> 2005-02-16 Leo Savernik <l.savernik@aon.at>
* khtmlview.cpp (dispatchMouseEvent): Walk upwards the parent chain * tdehtmlview.cpp (dispatchMouseEvent): Walk upwards the parent chain
from the target node and set the focus to the nearest focusable from the target node and set the focus to the nearest focusable
ancestor (merged from WebCore). ancestor (merged from WebCore).
@ -1045,7 +1045,7 @@
* html/htmltokenizer.{h,cpp} (setAutoClose/timerEvent/...): add timer driven auto-close mode for * html/htmltokenizer.{h,cpp} (setAutoClose/timerEvent/...): add timer driven auto-close mode for
e.g cross-frame scripts. e.g cross-frame scripts.
* khtml_part.{h,cpp} (resetFromScript): reset the part to a sane state before reopening * tdehtml_part.{h,cpp} (resetFromScript): reset the part to a sane state before reopening
a closed document. a closed document.
* xml/dom_docimpl.cpp (write): ditto. * xml/dom_docimpl.cpp (write): ditto.
@ -1108,7 +1108,7 @@
2005-02-12 David Faure <faure@kde.org> 2005-02-12 David Faure <faure@kde.org>
* khtml_part.cpp (slotRedirect): No reload should happen when redirecting * tdehtml_part.cpp (slotRedirect): No reload should happen when redirecting
to sameurl#anchor via Javascript or META refresh. This happened due to the to sameurl#anchor via Javascript or META refresh. This happened due to the
setRedirectedRequest(true), which wasn't necessary for the webmin tree.cgi setRedirectedRequest(true), which wasn't necessary for the webmin tree.cgi
fix - setRedirectedRequest is called by KonqRun for that one. fix - setRedirectedRequest is called by KonqRun for that one.
@ -1129,7 +1129,7 @@
2005-02-08 David Faure <faure@kde.org> 2005-02-08 David Faure <faure@kde.org>
* khtml_part.cpp (executeScript): Handle immediate redirects, scheduled * tdehtml_part.cpp (executeScript): Handle immediate redirects, scheduled
by JS with e.g. location='foo', as soon as the current script finishes. by JS with e.g. location='foo', as soon as the current script finishes.
2005-02-07 Leo Savernik <l.savernik@aon.at> 2005-02-07 Leo Savernik <l.savernik@aon.at>
@ -1200,7 +1200,7 @@
2005-01-25 Germain Garand <germain@ebooksfrance.org> 2005-01-25 Germain Garand <germain@ebooksfrance.org>
* khtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view). * tdehtmlview.cpp (viewportWheelEvent): discard wheel events occuring before the first relayout (avoids blanking the view).
Also support Horizontal wheel events (needs qt-copy/patch #61). Also support Horizontal wheel events (needs qt-copy/patch #61).
2005-01-25 Germain Garand <germain@ebooksfrance.org> 2005-01-25 Germain Garand <germain@ebooksfrance.org>
@ -1232,7 +1232,7 @@
2005-01-06 Allan Sandfeld Jensen <kde@carewolf.com> 2005-01-06 Allan Sandfeld Jensen <kde@carewolf.com>
* khtml_part.cpp: Fix selection by selecting the text in the cleaned string rather * tdehtml_part.cpp: Fix selection by selecting the text in the cleaned string rather
than in the DOM. than in the DOM.
* xml/dom_textimpl.{h,cpp}: Add renderString() to return the possibly transformed string. * xml/dom_textimpl.{h,cpp}: Add renderString() to return the possibly transformed string.
@ -1262,7 +1262,7 @@
memory allocation fixes memory allocation fixes
* khtml_factory.cpp: cleanup the global Arena freelist after the last khtml part gets unloaded * tdehtml_factory.cpp: cleanup the global Arena freelist after the last tdehtml part gets unloaded
* misc/arena.{cpp,h} (InitArenaPool): change arenasize from 4096 to kMax(8192, 2*pagesize). * misc/arena.{cpp,h} (InitArenaPool): change arenasize from 4096 to kMax(8192, 2*pagesize).
(ArenaAllocate): when a single pool grows over a 256*initial size threshold, switch to fractional allocation (ArenaAllocate): when a single pool grows over a 256*initial size threshold, switch to fractional allocation
@ -1307,7 +1307,7 @@
Pragmatic incremental repaints: be accurate on layered objects, conservative on Pragmatic incremental repaints: be accurate on layered objects, conservative on
objects in normal flow. Fix performance issues on repeated relayouts (#53114) objects in normal flow. Fix performance issues on repeated relayouts (#53114)
* khtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's. * tdehtmlview.{cpp,h}: add needsFullRepaint flag, mostly similar to WebCore's.
(layout): don't repaint the canvas systematically anymore. (layout): don't repaint the canvas systematically anymore.
* rendering/bidi.cpp (layoutInlineChildren): schedule a repaint on * rendering/bidi.cpp (layoutInlineChildren): schedule a repaint on
@ -1344,12 +1344,12 @@
slots to avoid undeterministic calling order and redundant slots to avoid undeterministic calling order and redundant
connections(#94783, 3.3.2 regression of #57360). connections(#94783, 3.3.2 regression of #57360).
* khtml_part.cpp (restoreURL/openURL/slotData/restoreState): ditto. * tdehtml_part.cpp (restoreURL/openURL/slotData/restoreState): ditto.
(checkCompleted): don't setContentsPos here (checkCompleted): don't setContentsPos here
* khtml_part.h: remove private gotoAnchor slot * tdehtml_part.h: remove private gotoAnchor slot
* khtmlpart_p.h: add boolean to record whether we need to restore a * tdehtmlpart_p.h: add boolean to record whether we need to restore a
stored scroll offset or honour an anchor stored scroll offset or honour an anchor
2004-12-09 Allan Sandfeld Jensen <kde@carewolf.com> 2004-12-09 Allan Sandfeld Jensen <kde@carewolf.com>
@ -1364,7 +1364,7 @@
Merge encoding detection from WebCore Merge encoding detection from WebCore
* misc/decoder.{h,cpp}: Detect XML-encoding, comments in headers and other merges * misc/decoder.{h,cpp}: Detect XML-encoding, comments in headers and other merges
* khtml_part.cpp: Frames inherits parents encoding as their default * tdehtml_part.cpp: Frames inherits parents encoding as their default
2004-12-08 Allan Sandfeld Jensen <kde@carewolf.com> 2004-12-08 Allan Sandfeld Jensen <kde@carewolf.com>
@ -1372,7 +1372,7 @@
* css/cssstyleselector.cpp: Uncomment :target handling * css/cssstyleselector.cpp: Uncomment :target handling
* xml/dom_docimpl.{h,cpp}: Add (set)cssTarget. * xml/dom_docimpl.{h,cpp}: Add (set)cssTarget.
* khtml_part.cpp: Call setCssTarget on anchors * tdehtml_part.cpp: Call setCssTarget on anchors
2004-12-07 Allan Sandfeld Jensen <kde@carewolf.com> 2004-12-07 Allan Sandfeld Jensen <kde@carewolf.com>
@ -1393,8 +1393,8 @@
* rendering/render_list.cpp: New algorithms for hiragana, katakana, * rendering/render_list.cpp: New algorithms for hiragana, katakana,
armenian, georgian and decimal-leading-zero. armenian, georgian and decimal-leading-zero.
Also fix greek and latin list-styles for larger values. Also fix greek and latin list-styles for larger values.
* css/cssvalues.cpp: Parse box, -khtml-diamond, -khtml-arabic-indic, * css/cssvalues.cpp: Parse box, -tdehtml-diamond, -tdehtml-arabic-indic,
-khtml-persian, -khtml-urdu and -khtml-upper-greek -tdehtml-persian, -tdehtml-urdu and -tdehtml-upper-greek
* rendering/render_style.h: Expand list-style enum * rendering/render_style.h: Expand list-style enum
2004-11-30 Germain Garand <germain@ebooksfrance.org> 2004-11-30 Germain Garand <germain@ebooksfrance.org>
@ -1451,10 +1451,10 @@
Implement CSS border on form-widgets Implement CSS border on form-widgets
* css/cssvalues.in: Add -khtml-native * css/cssvalues.in: Add -tdehtml-native
* css/cssparser.cpp: Accept -khtml-native as a border-type * css/cssparser.cpp: Accept -tdehtml-native as a border-type
* css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style * css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style
* css/html4.css: Make -khtml-native default border-style for form-widgets * css/html4.css: Make -tdehtml-native default border-style for form-widgets
* render/render_style.h: Add BNATIVE * render/render_style.h: Add BNATIVE
* render/render_object.cpp: Treat BNATIVE like BNONE * render/render_object.cpp: Treat BNATIVE like BNONE
* render/render_replaced.cpp: Remove native, and paint CSS border when allowed * render/render_replaced.cpp: Remove native, and paint CSS border when allowed
@ -1463,7 +1463,7 @@
float and flowAroundFloat fixes. float and flowAroundFloat fixes.
* css/html4.css: make fieldset -khtml-around-floats (#92979) * css/html4.css: make fieldset -tdehtml-around-floats (#92979)
* rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats * rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
logic. Merges: add better RTL layouting of fAFs. logic. Merges: add better RTL layouting of fAFs.
@ -1512,7 +1512,7 @@
2004-11-16 Stephan Kulow <coolo@kde.org> 2004-11-16 Stephan Kulow <coolo@kde.org>
* rendering/break_lines.cpp (khtml): adding patch by Otto Pattara to support * rendering/break_lines.cpp (tdehtml): adding patch by Otto Pattara to support
libthai for correct line breaks libthai for correct line breaks
2004-11-15 Allan Sandfeld Jensen <kde@carewolf.com> 2004-11-15 Allan Sandfeld Jensen <kde@carewolf.com>
@ -1555,7 +1555,7 @@
2004-11-05 Germain Garand <germain@ebooksfrance.org> 2004-11-05 Germain Garand <germain@ebooksfrance.org>
* khtml_part.cpp (closeURL/slotData/restoreState): avoid triggering * tdehtml_part.cpp (closeURL/slotData/restoreState): avoid triggering
full repaints of the view before the first layout is done. full repaints of the view before the first layout is done.
2004-11-05 Germain Garand <germain@ebooksfrance.com> 2004-11-05 Germain Garand <germain@ebooksfrance.com>
@ -1571,7 +1571,7 @@
2004-11-03 Germain Garand <germain@ebooksfrance.com> 2004-11-03 Germain Garand <germain@ebooksfrance.com>
* khtmlview.cpp (slotScrollBarMoved): make sure we are layouted before * tdehtmlview.cpp (slotScrollBarMoved): make sure we are layouted before
scrolling if we are still loading (#51473) scrolling if we are still loading (#51473)
2004-11-02 Stephan Kulow <coolo@kde.org> 2004-11-02 Stephan Kulow <coolo@kde.org>
@ -1629,12 +1629,12 @@
2004-10-26 David Faure <faure@kde.org> 2004-10-26 David Faure <faure@kde.org>
* khtml_part.cpp (urlSelected): Only call recursiveFrameRequest if target is * tdehtml_part.cpp (urlSelected): Only call recursiveFrameRequest if target is
different from _self, _top, _blank and _parent. See tests/frames/target/*. different from _self, _top, _blank and _parent. See tests/frames/target/*.
2004-10-25 David Faure <faure@kde.org> 2004-10-25 David Faure <faure@kde.org>
* khtml_part.cpp (processObjectRequest): connect to completed(bool) for <embed> * tdehtml_part.cpp (processObjectRequest): connect to completed(bool) for <embed>
too, to avoid a never-ending-spinning-wheel on the following testcase too, to avoid a never-ending-spinning-wheel on the following testcase
<META HTTP-EQUIV="Refresh" content="10;URL=www.kde.org"><EMBED> <META HTTP-EQUIV="Refresh" content="10;URL=www.kde.org"><EMBED>
@ -1648,7 +1648,7 @@
* rendering/render_image.cpp: Pass through the CachedObject so we can * rendering/render_image.cpp: Pass through the CachedObject so we can
use the suggested filename possibly provided by the HTTP headers. use the suggested filename possibly provided by the HTTP headers.
* khtml_ext.cpp: Make use of the suggested filename for images. * tdehtml_ext.cpp: Make use of the suggested filename for images.
2004-10-24 David Faure <faure@kde.org> 2004-10-24 David Faure <faure@kde.org>
@ -1731,7 +1731,7 @@
* html/html_formimpl.cpp (defaultEventHandler): propagate events to * html/html_formimpl.cpp (defaultEventHandler): propagate events to
QScrollView QScrollView
* khtmlview.{cpp,h}: QScrollview needs fast repaints. Fix * tdehtmlview.{cpp,h}: QScrollview needs fast repaints. Fix
background color of QFrames. background color of QFrames.
* rendering/render_form.cpp (createListBox/TextAreaWidget): * rendering/render_form.cpp (createListBox/TextAreaWidget):
@ -1806,7 +1806,7 @@
Break on page-break-before and -after. Break on page-break-before and -after.
* rendering/render_canvas.{h,cpp}: * rendering/render_canvas.{h,cpp}:
Merge bestTruncatedAt from WebCore. Merge bestTruncatedAt from WebCore.
* khtmlview.cpp (print): * tdehtmlview.cpp (print):
Use bestTruncatedAt for detect truncated pages. Use bestTruncatedAt for detect truncated pages.
2004-10-07 David Faure <faure@kde.org> 2004-10-07 David Faure <faure@kde.org>
@ -1831,7 +1831,7 @@
2004-10-04 David Faure <faure@kde.org> 2004-10-04 David Faure <faure@kde.org>
* khtml_part.cpp (processObjectRequest): * tdehtml_part.cpp (processObjectRequest):
Fixed showing of iframe hidden with display=none (#84332). Fixed showing of iframe hidden with display=none (#84332).
2004-09-16 Leo Savernik <l.savernik@aon.at> 2004-09-16 Leo Savernik <l.savernik@aon.at>
@ -1855,7 +1855,7 @@
2004-09-11 David Faure <faure@kde.org> 2004-09-11 David Faure <faure@kde.org>
* khtml_part.cpp (defaultEncoding, encoding, createDecoder): * tdehtml_part.cpp (defaultEncoding, encoding, createDecoder):
Make default charset latin1 over HTTP, keep default to locale on other protocols. Make default charset latin1 over HTTP, keep default to locale on other protocols.
2004-09-02 Leo Savernik <l.savernik@aon.at> 2004-09-02 Leo Savernik <l.savernik@aon.at>
@ -1875,7 +1875,7 @@
scope: - more accurate completed() signal. scope: - more accurate completed() signal.
- anchor jumps (#57360) - anchor jumps (#57360)
* khtml_part.cpp (openURL): when restoring a previous scroll * tdehtml_part.cpp (openURL): when restoring a previous scroll
position on reload, avoid jumping to anchors. position on reload, avoid jumping to anchors.
(gotoAnchor): keep jumping at least while we are parsing. (gotoAnchor): keep jumping at least while we are parsing.
(gotoAnchor): "top" and "" anchors mean top of document. (gotoAnchor): "top" and "" anchors mean top of document.
@ -1883,7 +1883,7 @@
(checkCompleted): entrust the view to emit completed on our behalf (checkCompleted): entrust the view to emit completed on our behalf
after any pending layout/repaint is done. after any pending layout/repaint is done.
* khtmlview.{cpp,h}: ditto * tdehtmlview.{cpp,h}: ditto
* xml/dom_nodeimpl.cpp (getUpperLeftCorner/getLowerRightCorner): * xml/dom_nodeimpl.cpp (getUpperLeftCorner/getLowerRightCorner):
use inlineYPos for text objects (#57360 c.#17). use inlineYPos for text objects (#57360 c.#17).
@ -1951,7 +1951,7 @@
2004-08-04 Germain Garand <germain@ebooksfrance.org> 2004-08-04 Germain Garand <germain@ebooksfrance.org>
* khtmlview.cpp (resizeEvent): take care, in case we are shrinking, * tdehtmlview.cpp (resizeEvent): take care, in case we are shrinking,
not to pass past the content limits yet. Next layout will calculate not to pass past the content limits yet. Next layout will calculate
if we positively need scrollbars or not (#84798). if we positively need scrollbars or not (#84798).
@ -1959,7 +1959,7 @@
instead, account for a scrollbar hysteresis level when sizing the content (#61730). instead, account for a scrollbar hysteresis level when sizing the content (#61730).
2004-07-30 Jean-Baptiste Mardelle <bj@altern.org> 2004-07-30 Jean-Baptiste Mardelle <bj@altern.org>
* khtmlview.{cpp,h} (displayAccessKeys): When accesskeys are activated, * tdehtmlview.{cpp,h} (displayAccessKeys): When accesskeys are activated,
small tooltips appear showing existing accesskeys on the page. small tooltips appear showing existing accesskeys on the page.
2004-07-28 Stephan Kulow <coolo@kde.org> 2004-07-28 Stephan Kulow <coolo@kde.org>
@ -1969,10 +1969,10 @@
2004-07-28 Leo Savernik <l.savernik@aon.at> 2004-07-28 Leo Savernik <l.savernik@aon.at>
* khtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements * tdehtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements
of image maps. of image maps.
(dispatchMouseEvent): Added parameter innerNonSharedNode. (dispatchMouseEvent): Added parameter innerNonSharedNode.
* khtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse. * tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
* xml/dom_docimpl.cpp (prepareMouseEvent): Initialize * xml/dom_docimpl.cpp (prepareMouseEvent): Initialize
innerNonSharedNode in DOM mouse event. innerNonSharedNode in DOM mouse event.
* xml/dom_nodeimpl.h: Added innerNonSharedNode to * xml/dom_nodeimpl.h: Added innerNonSharedNode to
@ -1986,12 +1986,12 @@
They have to be ignored (css1/test11.htm) They have to be ignored (css1/test11.htm)
2004-07-14 Jean-Baptiste Mardelle <bj@altern.org> 2004-07-14 Jean-Baptiste Mardelle <bj@altern.org>
* khtmlview.{cpp,h}: Accesskeys now activated when pressing & releasing * tdehtmlview.{cpp,h}: Accesskeys now activated when pressing & releasing
the crtl key (#83053). the crtl key (#83053).
2004-07-12 Jean-Baptiste Mardelle <bj@altern.org> 2004-07-12 Jean-Baptiste Mardelle <bj@altern.org>
* html/html_formimpl.{h,cpp}: Make form labels clickable (#59489) * html/html_formimpl.{h,cpp}: Make form labels clickable (#59489)
* khtmlview.cpp (focusNodeWithAccessKey): Make accesskeys work for labels * tdehtmlview.cpp (focusNodeWithAccessKey): Make accesskeys work for labels
2004-07-12 Germain Garand <germain@ebooksfrance.org> 2004-07-12 Germain Garand <germain@ebooksfrance.org>
@ -2007,7 +2007,7 @@
posClipRect in effect (#67665/#72994). posClipRect in effect (#67665/#72994).
2004-06-30 Tobias Anton <anton@stud.fbi.fh-darmstadt.de> 2004-06-30 Tobias Anton <anton@stud.fbi.fh-darmstadt.de>
* khtmlview.{cpp,h}: * tdehtmlview.{cpp,h}:
integrated keyboard tabbing with mouse scrolling. integrated keyboard tabbing with mouse scrolling.
Hitting tab skips at most one page, but respects Hitting tab skips at most one page, but respects
the tabindex ordering of the document. the tabindex ordering of the document.
@ -2092,17 +2092,17 @@
2004-06-13 Leo Savernik <l.savernik@aon.at> 2004-06-13 Leo Savernik <l.savernik@aon.at>
* khtml_part.cpp: (clear) Stopping marquees. * tdehtml_part.cpp: (clear) Stopping marquees.
* css/cssparser.cpp: (parserValue) Parse overflow: marquee. * css/cssparser.cpp: (parserValue) Parse overflow: marquee.
Inserted CSS3 Properties section. Inserted CSS3 Properties section.
Moved -khtml-user-input to CSS3 Properties. Moved -tdehtml-user-input to CSS3 Properties.
Added parsing of -khtml-marquee{,-direction,-increment,-style,-repetition, Added parsing of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
-speed}. -speed}.
* css/cssproperties.{c,h}: Regenerated. * css/cssproperties.{c,h}: Regenerated.
* css/cssproperties.in: Added -khtml-marquee{,-direction,-increment, * css/cssproperties.in: Added -tdehtml-marquee{,-direction,-increment,
-style,-repetition, -speed} keywords. -style,-repetition, -speed} keywords.
* css/cssstyleselector: (applyRule) Handle overflow: marquee. * css/cssstyleselector: (applyRule) Handle overflow: marquee.
Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition, Handle applying of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
-speed}. -speed}.
* css/cssvalues.{c,h}: Regenerated. * css/cssvalues.{c,h}: Regenerated.
* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse, * css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,
@ -2197,7 +2197,7 @@
2004-06-08 Zack Rusin <zack@kde.org> 2004-06-08 Zack Rusin <zack@kde.org>
* html/htmltokenizer.cpp (parseEntity): Fix to make 8-character * html/htmltokenizer.cpp (parseEntity): Fix to make 8-character
hexadecimal entities work in khtml from Darin Adler. Testcase at hexadecimal entities work in tdehtml from Darin Adler. Testcase at
http://www.alanwood.net/unicode/deseret.html http://www.alanwood.net/unicode/deseret.html
2004-06-06 Zack Rusin <zack@kde.org> 2004-06-06 Zack Rusin <zack@kde.org>
@ -2341,24 +2341,24 @@
2004-04-18 Leo Savernik <l.savernik@aon.at> 2004-04-18 Leo Savernik <l.savernik@aon.at>
* khtml_part.cpp: (extendSelectionTo): Fixed deselection of whole * tdehtml_part.cpp: (extendSelectionTo): Fixed deselection of whole
word/line at line boundaries in ExtendByWord/ExtendByLine mode. word/line at line boundaries in ExtendByWord/ExtendByLine mode.
2004-04-18 Leo Savernik <l.savernik@aon.at> 2004-04-18 Leo Savernik <l.savernik@aon.at>
* khtml_part.cpp: Merged firstRunAt, lastRunAt from WebCore. * tdehtml_part.cpp: Merged firstRunAt, lastRunAt from WebCore.
(khtmlMouse{Press,DoubleClick,Move,Release}Event): Support extending selection (tdehtmlMouse{Press,DoubleClick,Move,Release}Event): Support extending selection
by word and by line as mandated by the KDE style guide. by word and by line as mandated by the KDE style guide.
(khtmlMousePressDoubleClickEvent): Fixed automatic scrolling when mouse (tdehtmlMousePressDoubleClickEvent): Fixed automatic scrolling when mouse
moves off the view while selecting. moves off the view while selecting.
(extendSelection): Make it support extending by line by merging (extendSelection): Make it support extending by line by merging
WebCore's startAndEndLineNodesIncludingNode into it. WebCore's startAndEndLineNodesIncludingNode into it.
Fixed issue with double word selection when between two words. Fixed issue with double word selection when between two words.
* khtmlpart_p.h: added m_initialNode, m_initialOffset and * tdehtmlpart_p.h: added m_initialNode, m_initialOffset and
m_extendMode. m_extendMode.
* khtmlview.cpp (extendSelection): Initialize all relevant fields for selection. * tdehtmlview.cpp (extendSelection): Initialize all relevant fields for selection.
* rendering/render_text.h: Merged inlineTextBoxes function, needed by * rendering/render_text.h: Merged inlineTextBoxes function, needed by
firstRunAt, lastRunAt. firstRunAt, lastRunAt.
@ -2366,11 +2366,11 @@
2004-04-15 Leo Savernik <l.savernik@aon.at> 2004-04-15 Leo Savernik <l.savernik@aon.at>
* khtml_caret{.cpp,_p.h}: Vast changes. * tdehtml_caret{.cpp,_p.h}: Vast changes.
Added classes CaretBox, CaretBoxLine, CaretBoxIterator, Added classes CaretBox, CaretBoxLine, CaretBoxIterator,
EditableCaretBoxIterator. Changed every other class. EditableCaretBoxIterator. Changed every other class.
* khtmlview.[cpp,h}: (class KHTMLView) Adapt to khtml_caret* changes. * tdehtmlview.[cpp,h}: (class KHTMLView) Adapt to tdehtml_caret* changes.
(KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it. (KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
* rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos) * rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos)
@ -2408,22 +2408,22 @@
2004-03-23 Dirk Mueller <mueller@kde.org> 2004-03-23 Dirk Mueller <mueller@kde.org>
* khtml_part.cpp (checkLinkSecurity): Be stricter. * tdehtml_part.cpp (checkLinkSecurity): Be stricter.
* rendering/render_frames.cpp (updateWidget): readd the recursion protection. * rendering/render_frames.cpp (updateWidget): readd the recursion protection.
2004-03-21 Arend van Beelen jr. <arend@auton.nl> 2004-03-21 Arend van Beelen jr. <arend@auton.nl>
* khtml_part.cpp/.h: if text in a link is highlighted, the link now receives * tdehtml_part.cpp/.h: if text in a link is highlighted, the link now receives
focus. focus.
* khtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard * tdehtmlview.cpp: made type-ahead find more aggressive by grabbing the keyboard
when active, this way it temporarily overrules single-letter shortcuts as seen when active, this way it temporarily overrules single-letter shortcuts as seen
in KMail. Note it immediately releases the keyboard when it looses focus. in KMail. Note it immediately releases the keyboard when it looses focus.
2004-03-20 Arend van Beelen jr. <arend@auton.nl> 2004-03-20 Arend van Beelen jr. <arend@auton.nl>
* khtml_part.cpp/.h: finished new searching API. * tdehtml_part.cpp/.h: finished new searching API.
* khtmlview.cpp/.h: implemented type-ahead find (#51259). * tdehtmlview.cpp/.h: implemented type-ahead find (#51259).
2004-03-21 Dirk Mueller <mueller@kde.org> 2004-03-21 Dirk Mueller <mueller@kde.org>
@ -2439,7 +2439,7 @@
2004-03-18 Lubos Lunak <l.lunak@kde.org> 2004-03-18 Lubos Lunak <l.lunak@kde.org>
* khtmlview.cpp, xml/dom_docimpl.cpp: accesskey attribute support * tdehtmlview.cpp, xml/dom_docimpl.cpp: accesskey attribute support
2004-03-03 Dirk Mueller <mueller@kde.org> 2004-03-03 Dirk Mueller <mueller@kde.org>
@ -2500,7 +2500,7 @@
repaint handling over here, since TableSections don't inherit RenderBox, repaint handling over here, since TableSections don't inherit RenderBox,
but still have a background. but still have a background.
* khtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements * tdehtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
get font-size: small instead. get font-size: small instead.
2004-02-24 Dirk Mueller <mueller@kde.org> 2004-02-24 Dirk Mueller <mueller@kde.org>
@ -2523,10 +2523,10 @@
2004-02-22 Frerich Raabe <raabe@kde.org> 2004-02-22 Frerich Raabe <raabe@kde.org>
* khtml_part.cpp/.h (openURL): In case the call is a reload, do a stat * tdehtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
on the user-defined stylesheet and reload it in case it changed in on the user-defined stylesheet and reload it in case it changed in
the meanwhile (#39962). the meanwhile (#39962).
* khtmlpart_p.h (class KHTMLPartPrivate): Added * tdehtmlpart_p.h (class KHTMLPartPrivate): Added
m_userStyleSheetLastModified variable which keeps track of the m_userStyleSheetLastModified variable which keeps track of the
mtime of the user-defined sheet. mtime of the user-defined sheet.
@ -2550,7 +2550,7 @@
whether the given URL references the user-defined stylesheet. If so, whether the given URL references the user-defined stylesheet. If so,
use DOCLOADER_SECCHECK(false) to disable the check for invalid use DOCLOADER_SECCHECK(false) to disable the check for invalid
redirections (it's not useful for the user-defined URL). redirections (it's not useful for the user-defined URL).
* khtml_part.cpp (PartStyleSheetLoader ctor): pass true to * tdehtml_part.cpp (PartStyleSheetLoader ctor): pass true to
DocLoader::requestStyleSheet to indicate that the user-stylesheet is DocLoader::requestStyleSheet to indicate that the user-stylesheet is
loaded. Fixes seemingly ignored user-defined stylesheet. (#69697) loaded. Fixes seemingly ignored user-defined stylesheet. (#69697)
@ -2721,7 +2721,7 @@
image are fully loaded. do a repaint when the new image finished loading, so image are fully loaded. do a repaint when the new image finished loading, so
that it actually updates. avoid reloading images on news.google.com on hover. that it actually updates. avoid reloading images on news.google.com on hover.
* khtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints. * tdehtmlview.cpp (scheduleRepaint): make scheduling not starvating repaints.
Fix repainting logic to optimize for reduced X server load and minimum CPU Fix repainting logic to optimize for reduced X server load and minimum CPU
usage in traversing the render tree (#72575). usage in traversing the render tree (#72575).
@ -2769,7 +2769,7 @@
2004-01-22 Lubos Lunak <l.lunak@kde.org> 2004-01-22 Lubos Lunak <l.lunak@kde.org>
* khtmlview.cpp: make Ctrl only temporary suspend Shift+Down scrolling * tdehtmlview.cpp: make Ctrl only temporary suspend Shift+Down scrolling
2004-01-22 David Faure <faure@kde.org> 2004-01-22 David Faure <faure@kde.org>
@ -2787,7 +2787,7 @@
2004-01-21 Leo Savernik <l.savernik@aon.at> 2004-01-21 Leo Savernik <l.savernik@aon.at>
* khtml_part.cpp (checkCompleted): do not explicitly set focus to * tdehtml_part.cpp (checkCompleted): do not explicitly set focus to
the document if m_focusNodeNumber is not set (fixes dict.leo.org) the document if m_focusNodeNumber is not set (fixes dict.leo.org)
2004-01-21 Stephan Kulow <coolo@kde.org> 2004-01-21 Stephan Kulow <coolo@kde.org>
@ -2825,7 +2825,7 @@
2004-01-18 Dirk Mueller <mueller@kde.org> 2004-01-18 Dirk Mueller <mueller@kde.org>
* khtmlpart_p.h (class KHTMLPartPrivate): experimental: * tdehtmlpart_p.h (class KHTMLPartPrivate): experimental:
copy encoding information from parent frame. helps on copy encoding information from parent frame. helps on
http://www.pfl.ru/ when manually setting the correct encoding. http://www.pfl.ru/ when manually setting the correct encoding.
@ -2954,12 +2954,12 @@
* css/cssstyleselector.cpp (reparseConfiguration): implement. * css/cssstyleselector.cpp (reparseConfiguration): implement.
* khtml_part.cpp (reparseConfiguration): call CSSStyleSelector::reparseConfiguration * tdehtml_part.cpp (reparseConfiguration): call CSSStyleSelector::reparseConfiguration
instead of ::clear(). much less crashy. (#68141) instead of ::clear(). much less crashy. (#68141)
2003-12-27 Simon Perreault <nomis80@nomis80.org> 2003-12-27 Simon Perreault <nomis80@nomis80.org>
* khtml_part.cpp: Remove unused zoom actions. Assign CTRL + Key_Plus to * tdehtml_part.cpp: Remove unused zoom actions. Assign CTRL + Key_Plus to
zooming in and CTRL + Key_Minus to zooming out. zooming in and CTRL + Key_Minus to zooming out.
2003-12-27 Luis Pedro Coelho <luis@luispedro.org> 2003-12-27 Luis Pedro Coelho <luis@luispedro.org>
@ -2979,7 +2979,7 @@
2003-12-10 Germain Garand <germain@ebooksfrance.org> 2003-12-10 Germain Garand <germain@ebooksfrance.org>
* rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __khtml * rendering/render_replaced.cpp (updateFromElement): don't use setEraseColor for __tdehtml
widgets as it changes the background mode and induces flicker (#69130) widgets as it changes the background mode and induces flicker (#69130)
(copyWidget): retrieve background color from the widget's palette. (copyWidget): retrieve background color from the widget's palette.
@ -2993,7 +2993,7 @@
2003-12-08 Zack Rusin <zack@kde.org> 2003-12-08 Zack Rusin <zack@kde.org>
* khtmlview.*, html/html_formimpl.cpp (submit): Fixing 67179 - * tdehtmlview.*, html/html_formimpl.cpp (submit): Fixing 67179 -
Possibility to avoid saving form data for certain sites. Possibility to avoid saving form data for certain sites.
2003-12-05 David Faure <faure@kde.org> 2003-12-05 David Faure <faure@kde.org>
@ -3006,7 +3006,7 @@
* dom/dom_node.cpp (dispatchEvent): Return !defaultPrevented as mandated by * dom/dom_node.cpp (dispatchEvent): Return !defaultPrevented as mandated by
the DOM, now that NodeImpl doesn't do it anymore. the DOM, now that NodeImpl doesn't do it anymore.
* rendering/render_replaced.cpp (eventFilter): Adapted to new logic * rendering/render_replaced.cpp (eventFilter): Adapted to new logic
* khtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic * tdehtmlview.cpp (dispatchKeyEventHelper): Adapted to new logic
2003-12-05 Stephan Kulow <coolo@kde.org> 2003-12-05 Stephan Kulow <coolo@kde.org>
@ -3014,7 +3014,7 @@
2003-12-05 Lubos Lunak <l.lunak@kde.org> 2003-12-05 Lubos Lunak <l.lunak@kde.org>
* khtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp : * tdehtmlview.cpp, xml/dom2_eventsimpl.*, xml/dom_nodeimpl.*, rendering/render_replaced.cpp :
fix mapping between Qt and DOM key events fix mapping between Qt and DOM key events
2003-12-05 Germain Garand <germain@ebooksfrance.org> 2003-12-05 Germain Garand <germain@ebooksfrance.org>
@ -3077,7 +3077,7 @@
2003-11-26 Lubos Lunak <l.lunak@kde.org> 2003-11-26 Lubos Lunak <l.lunak@kde.org>
* khtmlview.cpp, xml/dom2_eventsimpl.cpp : generate correctly keydown,keypress and keyup events * tdehtmlview.cpp, xml/dom2_eventsimpl.cpp : generate correctly keydown,keypress and keyup events
2003-11-26 Dirk Mueller <mueller@kde.org> 2003-11-26 Dirk Mueller <mueller@kde.org>
@ -3108,7 +3108,7 @@
2003-11-25 Germain Garand <germain@ebooksfrance.org> 2003-11-25 Germain Garand <germain@ebooksfrance.org>
* khtml_part.cpp (checkCompleted): prepend "Automatic Detection" entry to * tdehtml_part.cpp (checkCompleted): prepend "Automatic Detection" entry to
"Use Stylesheet" menu. "Use Stylesheet" menu.
(slotUseStylesheet): set m_sheetUsed to null string if autodetect is on. (slotUseStylesheet): set m_sheetUsed to null string if autodetect is on.
Fixes #54335. Fixes #54335.
@ -3142,7 +3142,7 @@
* html/htmlparser.cpp (getElement, processCloseTag): Allow only one * html/htmlparser.cpp (getElement, processCloseTag): Allow only one
non-empty <title> tag, discard any following <title> tag. This matches non-empty <title> tag, discard any following <title> tag. This matches
both IE and Mozilla. Testcases khtmltests/regression/tests/ecma/title* both IE and Mozilla. Testcases tdehtmltests/regression/tests/ecma/title*
* html/html_headimpl.cpp (childrenChanged): Set title immediately, like * html/html_headimpl.cpp (childrenChanged): Set title immediately, like
other browsers do. other browsers do.
@ -3201,7 +3201,7 @@
2003-11-17 David Faure <faure@kde.org> 2003-11-17 David Faure <faure@kde.org>
* khtml_part.cpp (processObjectRequest): * tdehtml_part.cpp (processObjectRequest):
Stop the spinning wheel on <frame src="">. Stop the spinning wheel on <frame src="">.
Testcase: webcore's fast/frames/empty-frame-src.html Testcase: webcore's fast/frames/empty-frame-src.html
@ -3249,7 +3249,7 @@
2003-11-10 David Faure <faure@kde.org> 2003-11-10 David Faure <faure@kde.org>
* khtml_part.cpp: Ask the user "open or save?" before embedding a * tdehtml_part.cpp: Ask the user "open or save?" before embedding a
non-usual mimetype into a frame (e.g. ZIP files or PS files). non-usual mimetype into a frame (e.g. ZIP files or PS files).
(html and images are the 'usual' exceptions) (html and images are the 'usual' exceptions)
Includes a dontshowagain checkbox, so this shouldn't be too annoying. Includes a dontshowagain checkbox, so this shouldn't be too annoying.
@ -3287,7 +3287,7 @@
2003-11-04 Leo Savernik <l.savernik@aon.at> 2003-11-04 Leo Savernik <l.savernik@aon.at>
* khtml_part.{cpp,h} (selection): Added new overloaded function to * tdehtml_part.{cpp,h} (selection): Added new overloaded function to
return selection boundaries. return selection boundaries.
2003-11-04 Dirk Mueller <mueller@kde.org> 2003-11-04 Dirk Mueller <mueller@kde.org>
@ -3332,7 +3332,7 @@
* rendering/render_form.cpp (setStyle): check for direction (#57626) * rendering/render_form.cpp (setStyle): check for direction (#57626)
on RenderLineEdit and RenderTextArea. on RenderLineEdit and RenderTextArea.
* khtmlview.cpp (viewportWheelEvent): toggle Font zooming orientation (#61862). * tdehtmlview.cpp (viewportWheelEvent): toggle Font zooming orientation (#61862).
* rendering/render_box.cpp (paintBackgroundExtended): implement. needed * rendering/render_box.cpp (paintBackgroundExtended): implement. needed
for inline elements background drawing somewhen. for inline elements background drawing somewhen.
@ -3382,7 +3382,7 @@
2003-10-29 Leo Savernik <l.savernik@aon.at> 2003-10-29 Leo Savernik <l.savernik@aon.at>
* khtml_part.cpp (khtmlMousePressEvent): Fixed occasional selection * tdehtml_part.cpp (tdehtmlMousePressEvent): Fixed occasional selection
of image on which a drag had been initiated. of image on which a drag had been initiated.
2003-10-29 David Faure <faure@kde.org> 2003-10-29 David Faure <faure@kde.org>
@ -3392,7 +3392,7 @@
2003-10-28 David Faure <faure@kde.org> 2003-10-28 David Faure <faure@kde.org>
* khtmlview.cpp (viewportMouseDoubleClickEvent): Set bool in MouseEventImpl * tdehtmlview.cpp (viewportMouseDoubleClickEvent): Set bool in MouseEventImpl
when handling a double click. The DOM API only has "number of clicks at the when handling a double click. The DOM API only has "number of clicks at the
same place" notion, but not whether they happened quick or over a long time. same place" notion, but not whether they happened quick or over a long time.
Added support for small mouse movement when double-clicking, like in mousePressEvent. Added support for small mouse movement when double-clicking, like in mousePressEvent.
@ -3406,7 +3406,7 @@
2003-10-28 Stephan Kulow <coolo@kde.org> 2003-10-28 Stephan Kulow <coolo@kde.org>
* khtml_part.cpp (reparseConfiguration): clear the style selector * tdehtml_part.cpp (reparseConfiguration): clear the style selector
2003-10-28 Leo Savernik <l.savernik@aon.at> 2003-10-28 Leo Savernik <l.savernik@aon.at>
@ -3428,7 +3428,7 @@
2003-10-27 David Faure <faure@kde.org> 2003-10-27 David Faure <faure@kde.org>
* khtmlview.cpp (dispatchKeyEvent): Generate keypress, keydown and keyup * tdehtmlview.cpp (dispatchKeyEvent): Generate keypress, keydown and keyup
events for the document if no node has the focus. Factorized code in events for the document if no node has the focus. Factorized code in
a new method, dispatchKeyEvent. Cleaned up old unused variables d->lastKeyNode a new method, dispatchKeyEvent. Cleaned up old unused variables d->lastKeyNode
and d->lastKeyPress. #42918 and #43072, google keys. and d->lastKeyPress. #42918 and #43072, google keys.
@ -3733,7 +3733,7 @@
2003-10-19 Dirk Mueller <mueller@kde.org> 2003-10-19 Dirk Mueller <mueller@kde.org>
* html/htmltokenizer.cpp (parseEntity): when entity is terminated and result * html/htmltokenizer.cpp (parseEntity): when entity is terminated and result
is not-ascii, require ending ';'. khtmltests/html/parser/obscure_entity_tokenizing.html is not-ascii, require ending ';'. tdehtmltests/html/parser/obscure_entity_tokenizing.html
2003-10-18 Dirk Mueller <mueller@kde.org> 2003-10-18 Dirk Mueller <mueller@kde.org>
@ -3804,7 +3804,7 @@
2003-10-07 Germain Garand <germain@ebooksfrance.org> 2003-10-07 Germain Garand <germain@ebooksfrance.org>
* khtmlview.cpp (viewportMouseReleaseEvent/viewportMouseMoveEvent): forward * tdehtmlview.cpp (viewportMouseReleaseEvent/viewportMouseMoveEvent): forward
meaningful peripheral mouse events to focused widget to restore correct meaningful peripheral mouse events to focused widget to restore correct
mouse handling in proxied widgets. #65216 (selection part) mouse handling in proxied widgets. #65216 (selection part)
@ -3826,16 +3826,16 @@
2003-10-06 Dirk Mueller <mueller@kde.org> 2003-10-06 Dirk Mueller <mueller@kde.org>
* khtml_part.cpp (jScript): remove broken #ifdef'ery. * tdehtml_part.cpp (jScript): remove broken #ifdef'ery.
(popupMenu): add a QGuardedPtr to detect the case when we're destructed (popupMenu): add a QGuardedPtr to detect the case when we're destructed
before the popup menu is closed. avoid accessing any "this" then. before the popup menu is closed. avoid accessing any "this" then.
#43389 #43389
* khtmlview.cpp (viewportMousePressEvent): reorder afaik unrelated code * tdehtmlview.cpp (viewportMousePressEvent): reorder afaik unrelated code
to make the one call entering a local event loop the last, so that we can to make the one call entering a local event loop the last, so that we can
cleanly exit when it the view is already deleted. cleanly exit when it the view is already deleted.
* khtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent * tdehtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
2003-10-05 Dirk Mueller <mueller@kde.org> 2003-10-05 Dirk Mueller <mueller@kde.org>
@ -3859,7 +3859,7 @@
2003-10-04 Dirk Mueller <mueller@kde.org> 2003-10-04 Dirk Mueller <mueller@kde.org>
* khtml_settings.cc (init): change default for JS debugger to off. * tdehtml_settings.cc (init): change default for JS debugger to off.
* html/html_elementimpl.cpp (createContextualFragment): Fix memory * html/html_elementimpl.cpp (createContextualFragment): Fix memory
leaks. Adjust code style. Adjust return to avoid dangling return leaks. leaks. Adjust code style. Adjust return to avoid dangling return leaks.

@ -1,23 +1,23 @@
<html> <html>
<head> <head>
<title>Internal design of khtml</title> <title>Internal design of tdehtml</title>
<style> <style>
dt { font-weight: bold; } dt { font-weight: bold; }
</style> </style>
<body bgcolor=white> <body bgcolor=white>
<h1>Internal design of khtml</h1> <h1>Internal design of tdehtml</h1>
<p> <p>
This document tries to give a short overview about the internal design of the khtml This document tries to give a short overview about the internal design of the tdehtml
library. I've written this, because the lib has gotten quite big, and it is hard at first to find your library. I've written this, because the lib has gotten quite big, and it is hard at first to find your
way in the source code. This doesn't mean that you'll understand khtml after reading this way in the source code. This doesn't mean that you'll understand tdehtml after reading this
document, but it'll hopefully make it easier for you to read the source code. document, but it'll hopefully make it easier for you to read the source code.
</p> </p>
<p> <p>
The library is build up out of several different parts. Basically, when you use the lib, you The library is build up out of several different parts. Basically, when you use the lib, you
create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to
know if you want to use khtml for another application. If you want to start hacking khtml, know if you want to use tdehtml for another application. If you want to start hacking tdehtml,
here's a sketch of the objects that will get constructed, when eg. running testkhtml with here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
a url argument. a url argument.
</p> </p>
<p> <p>
@ -52,14 +52,14 @@ compatible to IE.
</blockquote> </blockquote>
<p> <p>
<a href="khtml_part.h">KHTMLPart</a> creates one instance of a <a href="tdehtml_part.h">KHTMLPart</a> creates one instance of a
<a href="khtmlview.h">KHTMLView</a> (derived from TQScrollView), <a href="tdehtmlview.h">KHTMLView</a> (derived from TQScrollView),
the widget showing the whole thing. At the same time a DOM tree the widget showing the whole thing. At the same time a DOM tree
is built up from the HTML or XML found in the specified file. is built up from the HTML or XML found in the specified file.
<p> <p>
Let me describe this with an example. Let me describe this with an example.
<p> <p>
khtml makes use of the document object model (DOM) for storing the document tdehtml makes use of the document object model (DOM) for storing the document
in a tree like structure. Imagine some html like in a tree like structure. Imagine some html like
<pre> <pre>
&lt;html&gt; &lt;html&gt;
@ -91,14 +91,14 @@ more or less in parallel.
<p> <p>
The first thing that happens when you start parsing a new document is that a The first thing that happens when you start parsing a new document is that a
DocumentImpl* (for XML documents) or an HTMLDocumentImpl* object will get DocumentImpl* (for XML documents) or an HTMLDocumentImpl* object will get
created by the Part (in khtml_part.cpp::begin()). A Tokenizer* created by the Part (in tdehtml_part.cpp::begin()). A Tokenizer*
object is created as soon as DocumentImpl::open() is called by the part, also object is created as soon as DocumentImpl::open() is called by the part, also
in begin() (can be either an XMLTokenizer or an HTMLTokenizer). in begin() (can be either an XMLTokenizer or an HTMLTokenizer).
<p> <p>
The XMLTokenizer uses the QXML classes in Qt to parse the document, and it's SAX interface The XMLTokenizer uses the QXML classes in Qt to parse the document, and it's SAX interface
to parse the stuff into khtmls DOM. to parse the stuff into tdehtmls DOM.
<p> <p>
For HTML, the tokenizer is located in khtmltokenizer.cpp. The tokenizer uses the contents For HTML, the tokenizer is located in tdehtmltokenizer.cpp. The tokenizer uses the contents
of a HTML-file as input and breaks this contents up in a linked list of of a HTML-file as input and breaks this contents up in a linked list of
tokens. The tokenizer recognizes HTML-entities and HTML-tags. Text between tokens. The tokenizer recognizes HTML-entities and HTML-tags. Text between
begin- and end-tags is handled distinctly for several tags. The distinctions begin- and end-tags is handled distinctly for several tags. The distinctions
@ -116,7 +116,7 @@ and constructs the tree of Nodes representing the document according
to the Document Object Model. to the Document Object Model.
<p> <p>
<h2>The DOM in khtml</h2> <h2>The DOM in tdehtml</h2>
<p> <p>
Parsing the document given above gives the following DOM tree: Parsing the document given above gives the following DOM tree:
@ -159,7 +159,7 @@ case the root element gets deleted (as long as there's no interface class
holding a pointer to the Implementation). holding a pointer to the Implementation).
<p> <p>
The interface classes (the ones without the Impl) are defined in the <code>dom/</code> The interface classes (the ones without the Impl) are defined in the <code>dom/</code>
subdirectory, and are not used by khtml itself at all. The only place they are used are in the subdirectory, and are not used by tdehtml itself at all. The only place they are used are in the
javascript bindings, which uses them to access the DOM tree. The big advantage of having this javascript bindings, which uses them to access the DOM tree. The big advantage of having this
separation between interface classes and imlementation classes, is that we can have several separation between interface classes and imlementation classes, is that we can have several
interface objects pointing to the same implementation. This implements the requirement of interface objects pointing to the same implementation. This implements the requirement of
@ -174,7 +174,7 @@ not be seen from the outside for various reasons (make implementation of shared
or to reduce memory consumption). or to reduce memory consumption).
<p> <p>
In C++, you can access the whole DOM tree from outside KHTML by using the interface classes. In C++, you can access the whole DOM tree from outside KHTML by using the interface classes.
For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/khtml/index.html">introduction to khtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>. For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdehtml/index.html">introduction to tdehtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.
One thing that has been omitted in the discussion above is the style sheet defined inside the One thing that has been omitted in the discussion above is the style sheet defined inside the
<code>&lt;style&gt;</code> element (as an example of a style sheet) and the image element <code>&lt;style&gt;</code> element (as an example of a style sheet) and the image element
@ -274,7 +274,7 @@ text". For an explanation why this is done, see the CSS specs.
<h2>Directory structure</h2> <h2>Directory structure</h2>
A short explanation of the subdirectories in khtml. A short explanation of the subdirectories in tdehtml.
<dl> <dl>
<dt><a href="css/">css:</a> <dt><a href="css/">css:</a>
<dd>Contains all the stuff relevant to the CSS part of DOM Level2 (implementation classes only), <dd>Contains all the stuff relevant to the CSS part of DOM Level2 (implementation classes only),
@ -283,14 +283,14 @@ RenderStyle object out of Nodes and the CSS style sheets.
<dt><a href="dom/">dom: </a> <dt><a href="dom/">dom: </a>
<dd>Contains the external DOM API (the DOM interface classes) for all of the DOM <dd>Contains the external DOM API (the DOM interface classes) for all of the DOM
<dt><a href="ecma/">ecma:</a> <dt><a href="ecma/">ecma:</a>
<dd>The javascript bindings to the DOM and khtml. <dd>The javascript bindings to the DOM and tdehtml.
<dt><a href="html/">html:</a> <dt><a href="html/">html:</a>
<dd>The html subpart of the DOM (implementation only), the HTML tokenizer and parser and a class <dd>The html subpart of the DOM (implementation only), the HTML tokenizer and parser and a class
that defines the DTD to use for HTML (used mainly in the parser). that defines the DTD to use for HTML (used mainly in the parser).
<dt><a href="java/">java:</a> <dt><a href="java/">java:</a>
<dd>Java related stuff. <dd>Java related stuff.
<dt><a href="misc/">misc:</a> <dt><a href="misc/">misc:</a>
<dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the <dd>Some misc stuff needed in tdehtml. Contains the image loader, some misc definitions and the
decoder class that converts the incoming stream to unicode. decoder class that converts the incoming stream to unicode.
<dt><a href="rendering">rendering:</a> <dt><a href="rendering">rendering:</a>
<dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains
@ -307,39 +307,39 @@ is part of dom/* checks for this flag and throws the exception.
<h2>Final words...</h2> <h2>Final words...</h2>
<p> <p>
All the above is to give you a quick introduction into the way khtml brings an HTML/XML file to the screen. All the above is to give you a quick introduction into the way tdehtml brings an HTML/XML file to the screen.
It is by no way complete or even 100% correct. I left out many problems, I will perhaps add either on request It is by no way complete or even 100% correct. I left out many problems, I will perhaps add either on request
or when I find some time to do so. Let me name some of the missing things: or when I find some time to do so. Let me name some of the missing things:
<ul> <ul>
<li>The decoder to convert the incoming stream to Unicode <li>The decoder to convert the incoming stream to Unicode
<li>interaction with konqueror/applications <li>interaction with konqueror/applications
<li>javascript <li>javascript
<li>dynamic reflow and how to use the DOM to manipulate khtmls visual output <li>dynamic reflow and how to use the DOM to manipulate tdehtmls visual output
<li>mouse/event handling <li>mouse/event handling
<li>real interactions when parsing incrementally <li>real interactions when parsing incrementally
<li>java <li>java
</ul> </ul>
Still I hope that this short introduction will make it easier for you to get a first hold of khtml and the way it works. Still I hope that this short introduction will make it easier for you to get a first hold of tdehtml and the way it works.
<p> <p>
Now before I finish let me add a small <b>warning</b> and <b>advice</b> to all of you who plan hacking khtml themselves: Now before I finish let me add a small <b>warning</b> and <b>advice</b> to all of you who plan hacking tdehtml themselves:
<p> <p>
khtml is by now a quite big library and it takes some time to understand how it works. Don't let yourself get frustrated tdehtml is by now a quite big library and it takes some time to understand how it works. Don't let yourself get frustrated
if you don't immediately understand how it works. On the other hand, it is by now one of the libraries that if you don't immediately understand how it works. On the other hand, it is by now one of the libraries that
get used a lot, that probably has the biggest number of remaining bugs (even though it's sometimes hard to get used a lot, that probably has the biggest number of remaining bugs (even though it's sometimes hard to
know if some behavior is really a bug). know if some behavior is really a bug).
<blockquote> <blockquote>
Some parts of it's code are however <b>extremely touchy</b> (especially the layouting algorithms), Some parts of it's code are however <b>extremely touchy</b> (especially the layouting algorithms),
and making changes there (that might fix a bug on one web page) might introduce severe bugs. and making changes there (that might fix a bug on one web page) might introduce severe bugs.
All the people developing khtml have already spend huge amounts of time searching for such bugs, All the people developing tdehtml have already spend huge amounts of time searching for such bugs,
that only showed up on some web pages, and thus were found only a week after the change that that only showed up on some web pages, and thus were found only a week after the change that
introduced the bug was made. This can be very frustrating for us, and we'd appreciate if people introduced the bug was made. This can be very frustrating for us, and we'd appreciate if people
that are not completely familiar with khtml post changes touching these critical regions to kfm-devel that are not completely familiar with tdehtml post changes touching these critical regions to kfm-devel
for review before applying them. for review before applying them.
</blockquote> </blockquote>
<div style="margin-top: 2em; font-size: large;"> <div style="margin-top: 2em; font-size: large;">
And now have fun hacking khtml. And now have fun hacking tdehtml.
<div style="margin-left: 10em; margin-bottom: 1em;">Lars</div> <div style="margin-left: 10em; margin-bottom: 1em;">Lars</div>
</div> </div>
</body> </body>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save