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 )
add_subdirectory( tdelfeditor )
endif( WITH_ELFICON )
add_subdirectory( kunittest )
add_subdirectory( tdeunittest )
add_subdirectory( tdeui )
add_subdirectory( tdesu )
add_subdirectory( kjs )
add_subdirectory( kwallet )
add_subdirectory( tdewallet )
add_subdirectory( kio )
add_subdirectory( kded )
@ -945,34 +945,34 @@ add_subdirectory( kded )
add_subdirectory( kdoctools )
add_subdirectory( doc )
add_subdirectory( kparts )
add_subdirectory( kutils )
add_subdirectory( kspell2 )
add_subdirectory( kmdi )
add_subdirectory( tdeparts )
add_subdirectory( tdeutils )
add_subdirectory( tdespell2 )
add_subdirectory( tdemdi )
add_subdirectory( kinit )
add_subdirectory( tdeprint )
add_subdirectory( kab )
add_subdirectory( kresources )
add_subdirectory( tderesources )
add_subdirectory( kabc )
add_subdirectory( arts )
add_subdirectory( interfaces )
add_subdirectory( kate )
add_subdirectory( kcert )
add_subdirectory( tdecert )
if( XRANDR_FOUND )
add_subdirectory( krandr )
add_subdirectory( tderandr )
endif( XRANDR_FOUND )
add_subdirectory( khtml )
add_subdirectory( tdehtml )
add_subdirectory( kcmshell )
add_subdirectory( kconf_update )
add_subdirectory( kdewidgets )
add_subdirectory( kimgio )
add_subdirectory( kioslave )
add_subdirectory( kstyles )
add_subdirectory( libkmid )
add_subdirectory( libkscreensaver )
add_subdirectory( libtdemid )
add_subdirectory( libtdescreensaver )
add_subdirectory( networkstatus )
add_subdirectory( knewstuff )
add_subdirectory( krsync )
add_subdirectory( tdersync )
add_subdirectory( licenses )
add_subdirectory( dnssd )
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="#KToolBar">KToolBar</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="#KDNDIcon">KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h</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>
<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>
<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
managing for free.
@ -361,7 +361,7 @@ khtmlw has been replaced with khtml.<BR>
w-&gt;openURL(myURL);
</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>
<PRE>
const char * -&gt; QString
@ -406,7 +406,7 @@ khtmlw has been replaced with khtml.<BR>
</TR>
</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>
<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="#tdeui">Changes in tdeui</A></LI>
<LI><A HREF="#kio">Changes in kio</A></LI>
<LI><A HREF="#kparts">Changes in kparts</A></LI>
<LI><A HREF="#kspell">Changes in kspell</A></LI>
<LI><A HREF="#khtmlpart">API-cleanup in KHTML</A></LI>
<LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
<LI><A HREF="#tdespell">Changes in tdespell</A></LI>
<LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
<LI><A HREF="#kfile">Changes in kfile</A></LI>
<LI><A HREF="#kcontrol">TDE Control Center</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>
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.
<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>
<H3><A NAME="kparts">Changes in kparts</A></H3>
<H3><A NAME="tdeparts">Changes in tdeparts</A></H3>
<H4>KParts::Factory</H4>
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>
<H3><A NAME="kspell">Changes in kspell</A></H3>
<H3><A NAME="tdespell">Changes in tdespell</A></H3>
<H4>KSpell</H4>
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>
<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:
<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/classes.html">classes</a>)\n
* <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="khtml/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdehtml/html/index.html"><b>tdehtml</b></a>
* (<a target="_top" href="tdehtml/html/classes.html">classes</a>)\n
* <i>The Trinity HTML component.</i>
* - <a target="_top" href="kjs/html/index.html"><b>kjs</b></a>
* (<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
* <i>Low level access to network files. Also provides access to facilities
* 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="kparts/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdeparts/html/index.html"><b>tdeparts</b></a>
* (<a target="_top" href="tdeparts/html/classes.html">classes</a>)\n
* <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/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/classes.html">classes</a>)\n
* <i>A library with pixmap effects.</i>
* - <a target="_top" href="kmdi/html/index.html"><b>kmdi</b></a>
* (<a target="_top" href="kmdi/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdemdi/html/index.html"><b>tdemdi</b></a>
* (<a target="_top" href="tdemdi/html/classes.html">classes</a>)\n
* <i>MultiDocument Interface library.</i>
* - <a target="_top" href="libkmid/html/index.html"><b>libkmid</b></a>
* (<a target="_top" href="libkmid/html/classes.html">classes</a>)\n
* - <a target="_top" href="libtdemid/html/index.html"><b>libtdemid</b></a>
* (<a target="_top" href="libtdemid/html/classes.html">classes</a>)\n
* <i>Midi library.</i>
* - <a target="_top" href="tdeprint/html/index.html"><b>tdeprint</b></a>
* (<a target="_top" href="tdeprint/html/classes.html">classes</a>)\n
* <i>High level printer control functionality.</i>
* - <a target="_top" href="krandr/html/index.html"><b>krandr</b></a>
* (<a target="_top" href="krandr/html/classes.html">classes</a>)\n
* - <a target="_top" href="tderandr/html/index.html"><b>tderandr</b></a>
* (<a target="_top" href="tderandr/html/classes.html">classes</a>)\n
* <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/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/classes.html">classes</a>)\n
* <i>Access to the Trinity address book.</i>
* - <a target="_top" href="kresources/html/index.html"><b>kresources</b></a>
* (<a target="_top" href="kresources/html/classes.html">classes</a>)\n
* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
* (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n
* <i>The Trinity resources system.</i>
* - <a target="_top" href="kutils/html/index.html"><b>kutils</b></a>
* (<a target="_top" href="kutils/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdeutils/html/index.html"><b>tdeutils</b></a>
* (<a target="_top" href="tdeutils/html/classes.html">classes</a>)\n
* <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/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/classes.html">classes</a>)\n
* <i>Network sevices publishing and discovery.</i>
* - <a target="_top" href="kunittest/html/index.html"><b>kunittest</b></a>
* (<a target="_top" href="kunittest/html/classes.html">classes</a>)\n
* - <a target="_top" href="tdeunittest/html/index.html"><b>tdeunittest</b></a>
* (<a target="_top" href="tdeunittest/html/classes.html">classes</a>)\n
* <i>Unit testing framework in Trinity.</i>
*

@ -18,17 +18,17 @@
# 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_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
COMPILE_AFTER_tdeprint = kate khtml
COMPILE_BEFORE_khtml = kutils
COMPILE_BEFORE_kabc = kab kresources
COMPILE_BEFORE_kate = interfaces kutils
COMPILE_BEFORE_kmdi = kutils
COMPILE_BEFORE_kspell2 = kutils
COMPILE_BEFORE_kcmshell = kutils
COMPILE_BEFORE_kdewidgets = kabc khtml
COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
COMPILE_AFTER_tdeprint = kate tdehtml
COMPILE_BEFORE_tdehtml = tdeutils
COMPILE_BEFORE_kabc = kab tderesources
COMPILE_BEFORE_kate = interfaces tdeutils
COMPILE_BEFORE_tdemdi = tdeutils
COMPILE_BEFORE_tdespell2 = tdeutils
COMPILE_BEFORE_kcmshell = tdeutils
COMPILE_BEFORE_kdewidgets = kabc tdehtml
COMPILE_BEFORE_interfaces = arts kabc
$(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 "*.h" -print >> 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 ;\
$(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

@ -27,7 +27,7 @@ Here is an alphabetical list:
communicate with KDE applications. It's also the base for KParts.
* interfaces
kparts interface for text editors, mediaplayer and scripting.
tdeparts interface for text editors, mediaplayer and scripting.
* kab
OBSOLETE, see kabc: Used to be the address book library, but now only
@ -39,7 +39,7 @@ Here is an alphabetical list:
* kate
KPart for 'kate', the KDE advanced text editor.
* kcert
* tdecert
Personal certification manager.
* kconf_update
@ -73,7 +73,7 @@ Here is an alphabetical list:
Contains mostly stuff convert XML docbook files via XSLT into
human readable stuff.
* khtml
* tdehtml
The next generation HTML rendering widget designed for Konqueror. This
supports HTML 4, CSS, and a variety of other web related standards.
@ -86,7 +86,7 @@ Here is an alphabetical list:
* kio
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.
* kioslave
@ -95,21 +95,21 @@ Here is an alphabetical list:
* kjs
Implementation of ECMAScript (aka JavaScript).
* kparts
* tdeparts
KDE component model.
* kstyles
The theme engine lies within. It handles nearly anything relating to
customizing the appearance of widgets.
* kwallet
* tdewallet
Client and backend to store values in encrypted files.
* libkmid
* libtdemid
MIDI file handling and midi mapper (manages output of midi files to
various devices).
* libkscreensaver
* libtdescreensaver
Library for making KDE screensavers.
* 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.
- 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
less code and be much more flexible for additions/enhancments. Sidenote: currently
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
- 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 SlaveInterface::authorizationKey and SlaveInterface::delAuthorization

@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO
check_PROGRAMS = knotifytest
knotifytest_SOURCES = knotifytest.cpp
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

@ -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_KFILE, '$(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_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_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
*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
*) lib_kded='' ;;

@ -50,15 +50,15 @@ dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
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_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_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_LDADD = KDE-ICE/libkICE.la $(LIBSM)

@ -258,12 +258,12 @@ int main(int argc, char **argv)
foundApp.data(), foundObj.data());
// 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",
foundApp.data(), foundObj.data());
// 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",
foundApp.data(), foundObj.data());

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

@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h
# let automoc handle all of the meta source files (moc)
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
dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h
libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
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

@ -1,7 +1,7 @@
Checklist to ensure that zeroconf will work:
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
line starting with 'host:'. It should be something like:
host: files mdns dns

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

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

@ -10,4 +10,4 @@
#################################################
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>
<title>See Also</title>
<para>ksycoca(3), kblah(4), knogga(6)</para>
<para>tdesycoca(3), kblah(4), knogga(6)</para>
</refsect1>

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

@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!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 % addindex "IGNORE">
]>
@ -8,7 +8,7 @@
<book lang="&language;">
<bookinfo>
<title>The &kspell; Handbook</title>
<title>The &tdespell; Handbook</title>
<authorgroup>
<author>&David.Sweet; &David.Sweet.mail;</author>
@ -20,14 +20,14 @@
<date>2003-02-24</date>
<releaseinfo>1.00.00</releaseinfo>
<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>
</abstract>
<keywordset>
<keyword>spell</keyword>
<keyword>spelling</keyword>
<keyword>kspell</keyword>
<keyword>tdespell</keyword>
<keyword>ispell</keyword>
<keyword>aspell</keyword>
<keyword>check</keyword>
@ -52,7 +52,7 @@ url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
<para><anchor id="spelldlg"/>
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>.
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
@ -130,7 +130,7 @@ your dictionary's distribution for more information.</para>
<title>Spell-checking client</title>
<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
popularity as it claims to give better suggestions for word replacements.</para>
</sect1>
@ -146,8 +146,8 @@ read the International <application>ISpell</application> man page.</para>
<chapter id="contact-information">
<title>Contact Information</title>
<para>For more information about &kspell;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/KSpell">&kspell;
Home Page</ulink>. In particular, you will find information about programming the &kspell; C++ class.</para>
<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 &tdespell; C++ class.</para>
<para>You may email the author/maintainer with questions and/or comments at
&David.Sweet.mail;.</para>

@ -9,12 +9,12 @@
#
#################################################
add_subdirectory( ktexteditor )
add_subdirectory( kscript )
add_subdirectory( tdetexteditor )
add_subdirectory( tdescript )
add_subdirectory( kregexpeditor )
add_subdirectory( kmediaplayer )
add_subdirectory( tdemediaplayer )
add_subdirectory( kio )
add_subdirectory( terminal )
add_subdirectory( khexedit )
add_subdirectory( kimproxy )
add_subdirectory( tdeimproxy )
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
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
servicetypedir = $(kde_servicetypesdir)

@ -19,7 +19,7 @@
#define BYTESEDITINTERFACE_H
// kde specific
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.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.
kde_servicetypes_DATA = dcoptexttospeech.desktop
DOXYGEN_REFERENCES = tdecore dcop kio tdeui kparts
DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
include ../../admin/Doxyfile.am

@ -186,7 +186,7 @@
*
* 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.
* - 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

@ -29,17 +29,17 @@ link_directories(
##### headers ###################################
install( FILES
kimproxy.h kimproxyiface.h
tdeimproxy.h tdeimproxyiface.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
##### kimproxy ##################################
##### tdeimproxy ##################################
set( target kimproxy )
set( target tdeimproxy )
set( ${target}_SRCS
kimproxy.cpp kimproxyiface.skel
${CMAKE_SOURCE_DIR}/interfaces/kimproxy/interface/kimiface.stub
tdeimproxy.cpp tdeimproxyiface.skel
${CMAKE_SOURCE_DIR}/interfaces/tdeimproxy/interface/kimiface.stub
)
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
@ -35,7 +35,7 @@
#include "kimiface_stub.h"
#include "kimproxy.h"
#include "tdeimproxy.h"
static KStaticDeleter<KIMProxy> _staticDeleter;
@ -650,4 +650,4 @@ TQString KIMProxy::preferredApp()
return preferredApp;
}
#include "kimproxy.moc"
#include "tdeimproxy.moc"

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

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

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

@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfileaudiopreview.la
kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
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

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

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

@ -24,9 +24,9 @@
#ifndef KMEDIAPLAYERPLAYER_H
#define KMEDIAPLAYERPLAYER_H
#include <kparts/part.h>
#include <kmediaplayer/playerdcopobject.h>
#include <kmediaplayer/view.h>
#include <tdeparts/part.h>
#include <tdemediaplayer/playerdcopobject.h>
#include <tdemediaplayer/view.h>
/** 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
// in this Software without prior written authorization from the author(s).
#include <kmediaplayer/view.h>
#include <tdemediaplayer/view.h>
struct KMediaPlayer::View::Data
{

@ -40,9 +40,9 @@ install( FILES
install( FILES scriptinterface.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
##### kscript ###################################
##### tdescript ###################################
set( target kscript )
set( target tdescript )
set( ${target}_SRCS
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}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/interfaces/kscript
${CMAKE_SOURCE_DIR}/interfaces/tdescript
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
)
@ -38,6 +38,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kscript-shared
LINK tdescript-shared
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
libshellscript_la_SOURCES = shellscript.cpp
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

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

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

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

@ -46,28 +46,28 @@ install( FILES
selectioninterfaceext.h selectionextdcopinterface.h
texthintinterface.h editinterfaceext.h variableinterface.h
templateinterface.h
DESTINATION ${INCLUDE_INSTALL_DIR}/ktexteditor )
DESTINATION ${INCLUDE_INSTALL_DIR}/tdetexteditor )
##### other data ################################
install( FILES
ktexteditor.desktop ktexteditoreditor.desktop
ktexteditorplugin.desktop
tdetexteditor.desktop tdetexteditoreditor.desktop
tdetexteditorplugin.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES
kcm_ktexteditor.desktop
kcm_tdetexteditor.desktop
DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser )
##### ktexteditor ###############################
##### tdetexteditor ###############################
set( target ktexteditor )
set( target tdetexteditor )
set( ${target}_SRCS
ktexteditor.cpp
tdetexteditor.cpp
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp
@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
LINK tdeui-shared kabc-shared kparts-shared
LINK tdeui-shared kabc-shared tdeparts-shared
DEPENDENCIES dcopidl dcopidl2cpp
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)
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 \
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \
@ -22,10 +22,10 @@ libktexteditor_la_SOURCES = ktexteditor.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
libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
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 \
clipboardinterface.h popupmenuinterface.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 \
editinterfaceext.h variableinterface.h templateinterface.h
ktexteditorincludedir = $(includedir)/ktexteditor
tdetexteditorincludedir = $(includedir)/tdetexteditor
METASOURCES = AUTO
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_ktexteditordir = $(kde_datadir)/kcm_componentchooser
kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
templateinterface.lo: $(top_builddir)/kabc/addressee.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -59,7 +59,7 @@ install( FILES
##### other data ################################
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 )
@ -102,7 +102,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
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
DESTINATION ${LIB_INSTALL_DIR}
)

@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
lib_LTLIBRARIES = libkabc.la
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) \
$(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_SOURCES = \
@ -52,7 +52,7 @@ METASOURCES = AUTO
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_SOURCES = kab2kabc.cpp
@ -60,7 +60,7 @@ autostart_DATA = kab2kabc.desktop
autostartdir = $(datadir)/autostart
manager_DATA = kabc_manager.desktop
managerdir = $(kde_servicesdir)/kresources
managerdir = $(kde_servicesdir)/tderesources
DOXYGEN_REFERENCES = tdecore tdeui

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

@ -39,7 +39,7 @@ install( FILES
##### 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) ########################

@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h
lib_LTLIBRARIES = libkabc_dir.la
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_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
kde_module_LTLIBRARIES = kabc_dir.la
@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcedir.h
servicedir = $(kde_servicesdir)/kresources/kabc
servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = dir.desktop
resourcedirplugin.lo: ../../addressee.h

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

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

@ -39,7 +39,7 @@ install( FILES
##### 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) #######################

@ -6,7 +6,7 @@ noinst_HEADERS = resourcefileconfig.h
lib_LTLIBRARIES = libkabc_file.la
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_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
@ -24,5 +24,5 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcefile.h
servicedir = $(kde_servicesdir)/kresources/kabc
servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = file.desktop

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

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

@ -6,7 +6,7 @@ noinst_HEADERS = resourceldapkioconfig.h
lib_LTLIBRARIES = libkabc_ldapkio.la
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_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
kde_module_LTLIBRARIES = kabc_ldapkio.la
@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourceldapkio.h
servicedir = $(kde_servicesdir)/kresources/kabc
servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = ldapkio.desktop
resourceldapkioplugin.lo: ../../addressee.h

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

@ -39,7 +39,7 @@ install( FILES
##### 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) ########################

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

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

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

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

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

@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries)
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
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
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
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
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
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
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
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
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
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_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_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
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

@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
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_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_SOURCES = testread.cpp

@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
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_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_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_SOURCES = testwrite.cpp

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

@ -33,7 +33,7 @@
* some folding fixes (hopefully)
* memleak fix
* 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>
* Fixes for folding, cleanup, move folding tree into the buffer,

@ -31,6 +31,6 @@ Christoph Cullmann \<cullmann@kde.org\>
@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
// 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
$(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

@ -17,7 +17,7 @@
- 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 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:
- Added CSS 3 property "border-radius".
@ -196,7 +196,7 @@
<item> -o-text-overflow </item>
<!-- konq specific -->
<item> -khtml-background-size </item>
<item> -tdehtml-background-size </item>
<item> konq_bgpos_x </item>
<item> konq_bgpos_y </item>

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

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

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

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

@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc
lib_LTLIBRARIES = libkatepartinterfaces.la
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
kateinclude_HEADERS = document.h view.h
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_
#define _KATE_DOCUMENT_INCLUDE_
#include <ktexteditor/document.h>
#include <ktexteditor/view.h>
#include <ktexteditor/editinterface.h>
#include <ktexteditor/undointerface.h>
#include <ktexteditor/cursorinterface.h>
#include <ktexteditor/documentinfo.h>
#include <ktexteditor/selectioninterface.h>
#include <ktexteditor/selectioninterfaceext.h>
#include <ktexteditor/blockselectioninterface.h>
#include <ktexteditor/searchinterface.h>
#include <ktexteditor/highlightinginterface.h>
#include <ktexteditor/configinterface.h>
#include <ktexteditor/configinterfaceextension.h>
#include <ktexteditor/markinterface.h>
#include <ktexteditor/markinterfaceextension.h>
#include <ktexteditor/wordwrapinterface.h>
#include <ktexteditor/printinterface.h>
#include <ktexteditor/variableinterface.h>
#include <tdetexteditor/document.h>
#include <tdetexteditor/view.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/undointerface.h>
#include <tdetexteditor/cursorinterface.h>
#include <tdetexteditor/documentinfo.h>
#include <tdetexteditor/selectioninterface.h>
#include <tdetexteditor/selectioninterfaceext.h>
#include <tdetexteditor/blockselectioninterface.h>
#include <tdetexteditor/searchinterface.h>
#include <tdetexteditor/highlightinginterface.h>
#include <tdetexteditor/configinterface.h>
#include <tdetexteditor/configinterfaceextension.h>
#include <tdetexteditor/markinterface.h>
#include <tdetexteditor/markinterfaceextension.h>
#include <tdetexteditor/wordwrapinterface.h>
#include <tdetexteditor/printinterface.h>
#include <tdetexteditor/variableinterface.h>
#include <kaction.h>

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

@ -25,7 +25,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kjs
${CMAKE_SOURCE_DIR}/kutils
${CMAKE_SOURCE_DIR}/tdeutils
${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/interfaces
${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}
SOURCES dummy.cpp
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}
)

@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.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)
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

@ -118,7 +118,7 @@ class KateFileLoader
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))
{
// utf16LE, we need to put the decoder in LE mode

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

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

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

@ -40,14 +40,14 @@
#include "katefiletype.h"
#include "kateschema.h"
#include "katetemplatehandler.h"
#include <ktexteditor/plugin.h>
#include <tdetexteditor/plugin.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <kio/kfileitem.h>
#include <kparts/event.h>
#include <tdeparts/event.h>
#include <klocale.h>
#include <kglobal.h>
@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
// my dcop object
setObjId ("KateDocument#"+documentDCOPSuffix());
// ktexteditor interfaces
// tdetexteditor interfaces
setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix());
setConfigInterfaceDCOPSuffix (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 ())
return false;

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

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

@ -20,7 +20,7 @@
#define __KATE_FACTORY_H__
#include "katejscript.h"
#include <kparts/factory.h>
#include <tdeparts/factory.h>
#include <ktrader.h>
#include <kinstance.h>
@ -148,7 +148,7 @@ class KateFactory
/**
* 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; };

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

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

@ -28,7 +28,7 @@
#include <kaction.h>
#include <kstdaction.h>
#include <kspell.h>
#include <tdespell.h>
#include <ksconfig.h>
#include <kdebug.h>
#include <kmessagebox.h>
@ -36,18 +36,18 @@
KateSpell::KateSpell( KateView* view )
: TQObject( view )
, m_view (view)
, m_kspell (0)
, m_tdespell (0)
{
}
KateSpell::~KateSpell()
{
// kspell stuff
if( m_kspell )
// tdespell stuff
if( m_tdespell )
{
m_kspell->setAutoDelete(true);
m_kspell->cleanUp(); // need a way to wait for this to complete
delete m_kspell;
m_tdespell->setAutoDelete(true);
m_tdespell->cleanUp(); // need a way to wait for this to complete
delete m_tdespell;
}
}
@ -122,27 +122,27 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
else
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 );
connect( m_kspell, TQT_SIGNAL(death()),
connect( m_tdespell, TQT_SIGNAL(death()),
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)) );
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)) );
connect( m_kspell, TQT_SIGNAL(done(const TQString&)),
connect( m_tdespell, TQT_SIGNAL(done(const TQString&)),
this, TQT_SLOT(spellResult(const TQString&)) );
}
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 )
@ -193,12 +193,12 @@ void KateSpell::corrected( const TQString& originalword, const TQString& newword
void KateSpell::spellResult( const TQString& )
{
m_view->clearSelection();
m_kspell->cleanUp();
m_tdespell->cleanUp();
}
void KateSpell::spellCleanDone()
{
KSpell::spellStatus status = m_kspell->status();
KSpell::spellStatus status = m_tdespell->status();
if( status == KSpell::Error ) {
KMessageBox::sorry( 0,
@ -210,8 +210,8 @@ void KateSpell::spellCleanDone()
i18n("The spelling program seems to have crashed."));
}
delete m_kspell;
m_kspell = 0;
delete m_tdespell;
m_tdespell = 0;
kdDebug (13020) << "SPELLING END" << endl;
}

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

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

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

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

@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO
# 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
ktexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
ktexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
tdetexteditor_autobookmarker_la_SOURCES = autobookmarker.cpp
tdetexteditor_autobookmarker_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la
tdetexteditor_autobookmarker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kde_services_DATA = ktexteditor_autobookmarker.desktop
kde_services_DATA = tdetexteditor_autobookmarker.desktop
confdir=$(kde_confdir)
conf_DATA = ktexteditor_autobookmarkerrc
conf_DATA = tdetexteditor_autobookmarkerrc
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
#include "autobookmarker.h"
#include <ktexteditor/markinterfaceextension.h>
#include <ktexteditor/editinterface.h>
#include <ktexteditor/documentinfo.h>
#include <ktexteditor/document.h>
#include <tdetexteditor/markinterfaceextension.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/documentinfo.h>
#include <tdetexteditor/document.h>
#include <kaction.h>
#include <kapplication.h>
@ -57,7 +57,7 @@
//END includes
//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,
const char* name,
@ -199,7 +199,7 @@ void ABGlobal::readConfig()
m_ents = new ABEntityList;
else
m_ents->clear();
TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
uint n( 0 );
while ( config->hasGroup( TQString("autobookmark%1").arg( n ) ) )
@ -225,7 +225,7 @@ void ABGlobal::readConfig()
void ABGlobal::writeConfig()
{
TDEConfig *config = new TDEConfig("ktexteditor_autobookmarkerrc");
TDEConfig *config = new TDEConfig("tdetexteditor_autobookmarkerrc");
// clean the config object
TQStringList l = config->groupList();

@ -23,8 +23,8 @@
#ifndef _AUTOBOOKMARKER_H_
#define _AUTOBOOKMARKER_H_
#include <ktexteditor/plugin.h>
#include <ktexteditor/configinterfaceextension.h>
#include <tdetexteditor/plugin.h>
#include <tdetexteditor/configinterfaceextension.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[zh_CN]=文档装入时根据匹配模式自动设置书签
Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。
X-TDE-Library=ktexteditor_autobookmarker
X-TDE-Library=tdetexteditor_autobookmarker
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8

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

@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO
# 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
ktexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
ktexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
tdetexteditor_insertfile_la_SOURCES = insertfileplugin.cpp
tdetexteditor_insertfile_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
tdetexteditor_insertfile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
insertfiledatadir = $(kde_datadir)/ktexteditor_insertfile
insertfiledata_DATA = ktexteditor_insertfileui.rc
insertfiledatadir = $(kde_datadir)/tdetexteditor_insertfile
insertfiledata_DATA = tdetexteditor_insertfileui.rc
kde_services_DATA = ktexteditor_insertfile.desktop
kde_services_DATA = tdetexteditor_insertfile.desktop
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.moc"
#include <ktexteditor/document.h>
#include <ktexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h>
#include <tdetexteditor/document.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/editinterface.h>
#include <assert.h>
#include <kio/job.h>
@ -37,7 +37,7 @@
#include <tqfile.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
@ -77,7 +77,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
setInstance( KGenericFactory<InsertFilePlugin>::instance() );
_job = 0;
(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()

@ -22,8 +22,8 @@
#ifndef _INSERT_FILE_PLUGIN_H_
#define _INSERT_FILE_PLUGIN_H_
#include <ktexteditor/plugin.h>
#include <ktexteditor/view.h>
#include <tdetexteditor/plugin.h>
#include <tdetexteditor/view.h>
#include <kxmlguiclient.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_HK]=在游標處插入任意的檔案
Comment[zh_TW]=在游標處插入任意的可讀檔案
X-TDE-Library=ktexteditor_insertfile
X-TDE-Library=tdetexteditor_insertfile
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8

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

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

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

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

@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO
# 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
ktexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
ktexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
tdetexteditor_isearch_la_SOURCES = ISearchPlugin.cpp
tdetexteditor_isearch_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
tdetexteditor_isearch_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
isearchdatadir = $(kde_datadir)/ktexteditor_isearch
isearchdata_DATA = ktexteditor_isearchui.rc
isearchdatadir = $(kde_datadir)/tdetexteditor_isearch
isearchdata_DATA = tdetexteditor_isearchui.rc
kde_services_DATA = ktexteditor_isearch.desktop
kde_services_DATA = tdetexteditor_isearch.desktop
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[zh_CN]=也称为“即输即搜”
Comment[zh_TW]=也稱做「即時搜尋」
X-TDE-Library=ktexteditor_isearch
X-TDE-Library=tdetexteditor_isearch
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8

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

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

@ -2,18 +2,18 @@ INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdefx $(all_includes)
METASOURCES = AUTO
# 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
ktexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
ktexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
tdetexteditor_kdatatool_la_SOURCES = kate_kdatatool.cpp
tdetexteditor_kdatatool_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
tdetexteditor_kdatatool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kdatatooldatadir = $(kde_datadir)/ktexteditor_kdatatool
kdatatooldata_DATA = ktexteditor_kdatatoolui.rc
kdatatooldatadir = $(kde_datadir)/tdetexteditor_kdatatool
kdatatooldata_DATA = tdetexteditor_kdatatoolui.rc
kde_services_DATA = ktexteditor_kdatatool.desktop
kde_services_DATA = tdetexteditor_kdatatool.desktop
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 <kgenericfactory.h>
#include <kaction.h>
#include <ktexteditor/view.h>
#include <tdetexteditor/view.h>
#include <kdebug.h>
#include <kdatatool.h>
#include <ktexteditor/document.h>
#include <ktexteditor/selectioninterface.h>
#include <tdetexteditor/document.h>
#include <tdetexteditor/selectioninterface.h>
#include <kpopupmenu.h>
#include <ktexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/editinterface.h>
#include <kmessagebox.h>
//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 {
@ -77,7 +77,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
setXMLFile("ktexteditor_kdatatoolui.rc");
setXMLFile("tdetexteditor_kdatatoolui.rc");
m_view = view;
}

@ -21,7 +21,7 @@
#ifndef _KATE_KDATATOOL_
#define _KATE_KDATATOOL_
#include <ktexteditor/plugin.h>
#include <tdetexteditor/plugin.h>
#include <tqstringlist.h>
#include <kxmlguiclient.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_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話)
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
Type=Service
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 ################################
install( FILES ktexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES docwordcompletionui.rc DESTINATION ${DATA_INSTALL_DIR}/ktexteditor_docwordcompletion )
install( FILES tdetexteditor_docwordcompletion.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
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
docwordcompletion.cpp
@ -39,6 +39,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK ktexteditor-shared
LINK tdetexteditor-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/interfaces $(all_includes)
METASOURCES = AUTO
# 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
ktexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
ktexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
tdetexteditor_docwordcompletion_la_SOURCES = docwordcompletion.cpp
tdetexteditor_docwordcompletion_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
tdetexteditor_docwordcompletion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
docwordcompletiondatadir = $(kde_datadir)/ktexteditor_docwordcompletion
docwordcompletiondatadir = $(kde_datadir)/tdetexteditor_docwordcompletion
docwordcompletiondata_DATA = docwordcompletionui.rc
kde_services_DATA = ktexteditor_docwordcompletion.desktop
kde_services_DATA = tdetexteditor_docwordcompletion.desktop
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
#include "docwordcompletion.h"
#include <ktexteditor/document.h>
#include <ktexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h>
#include <ktexteditor/variableinterface.h>
#include <tdetexteditor/document.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/variableinterface.h>
#include <kapplication.h>
#include <kconfig.h>
@ -40,7 +40,7 @@
#include <klocale.h>
#include <kaction.h>
#include <knotifyclient.h>
#include <kparts/part.h>
#include <tdeparts/part.h>
#include <kiconloader.h>
#include <tqregexp.h>
@ -57,7 +57,7 @@
//END
//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,
const char* name,
const TQStringList& /*args*/ )

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

@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
<kpartplugin name="ktexteditor_docwordcompletion" library="ktexteditor_docwordcompletion" version="4">
<kpartplugin name="tdetexteditor_docwordcompletion" library="tdetexteditor_docwordcompletion" version="4">
<MenuBar>
<Menu name="tools"><Text>&amp;Tools</Text>
<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[zh_CN]=在文档中基于方向或弹出补全单词
Comment[zh_TW]=在編輯文件時的單字補完功能
X-TDE-Library=ktexteditor_docwordcompletion
X-TDE-Library=tdetexteditor_docwordcompletion
ServiceTypes=KTextEditor/Plugin
Type=Service
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}/kio
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kutils
${CMAKE_SOURCE_DIR}/tdeutils
)
link_directories(
@ -36,6 +36,6 @@ set( ${target}_SRCS
tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK kutils-shared
LINK tdeutils-shared
DEPENDENCIES dcopidl
)

@ -18,7 +18,7 @@
# 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
lib_LTLIBRARIES =
@ -26,7 +26,7 @@ bin_PROGRAMS =
tdeinit_LTLIBRARIES = kcmshell.la
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
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
level of the hierarchy)
* 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
* 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()).
Format of the sycoca database file

@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
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_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_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_SOURCES = kde-menu.cpp

@ -6,10 +6,10 @@ Some of these tasks are built in, others are started on demand.
Built in tasks
==============
*) Checking for newly installed software and updating ksycoca when new
software is detected. Updating of ksycoca is done by the program kbuildsycoca
*) Checking for newly installed software and updating tdesycoca when new
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
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
*.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).
CheckSycoca: This option can be used to disable checking for new software.
ksycoca will still be built when kded starts up and when applications
explicitly request a rebuild of the ksycoca database. The user can
also manually rebuild ksycoca by running the kbuildsycoca program.
tdesycoca will still be built when kded starts up and when applications
explicitly request a rebuild of the tdesycoca database. The user can
also manually rebuild tdesycoca by running the kbuildsycoca program.
The default value of this option is "true". Checking can be disabled by
setting this option to "false".

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -104,11 +104,11 @@ Kded::Kded(bool checkUpdates, bool new_startup)
{
_self = this;
TQCString cPath;
TQCString ksycoca_env = getenv("TDESYCOCA");
if (ksycoca_env.isEmpty())
cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca");
TQCString tdesycoca_env = getenv("TDESYCOCA");
if (tdesycoca_env.isEmpty())
cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca");
else
cPath = ksycoca_env;
cPath = tdesycoca_env;
m_pTimer = new TQTimer(this);
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,
TQCString &replyType, TQByteArray &replyData)
{
if (obj == "ksycoca") return false; // Ignore this one.
if (obj == "tdesycoca") return false; // Ignore this one.
if (m_dontLoad[obj])
return false;
@ -484,7 +484,7 @@ void Kded::recreate(bool initial)
recreateDone();
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()));
m_needDelayedCheck = true;
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
// unconditionnally (David)
TQByteArray data;
client->send( "*", "ksycoca", "notifyDatabaseChanged()", data );
client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data );
client->send( "ksplash", "", "upAndRunning(TQString)", TQString("kded"));
#ifdef Q_WS_X11
XEvent e;

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

@ -25,7 +25,7 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
bin_PROGRAMS = makekdewidgets
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
kde_widget_LTLIBRARIES = kdewidgets.la

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

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

@ -205,19 +205,19 @@ ktnef
<!ENTITY ksysguard-narzednik '<application>Ksysguardem</application>'>
<!ENTITY ksysguard-miejscownik '<application>Ksysguardzie</application>'>
<!ENTITY kwallet-mianownik '<application>Portfel &tde;</application>'>
<!ENTITY kwallet-dopelniacz '<application>Portfela &tde;</application>'>
<!ENTITY kwallet-celownik '<application>Portfelowi &tde;</application>'>
<!ENTITY kwallet-biernik '<application>Portfel &tde;</application>'>
<!ENTITY kwallet-narzednik '<application>Portfelem &tde;</application>'>
<!ENTITY kwallet-miejscownik '<application>Portfelu &tde;</application>'>
<!ENTITY kwalletmanager-mianownik '<application>Menedżer portfeli &tde;</application>'>
<!ENTITY kwalletmanager-dopelniacz '<application>Menedżera portfeli &tde;</application>'>
<!ENTITY kwalletmanager-celownik '<application>Menedżerowi portfeli &tde;</application>'>
<!ENTITY kwalletmanager-biernik '<application>Menedżera portfeli &tde;</application>'>
<!ENTITY kwalletmanager-narzednik '<application>Menedżerem portfeli &tde;</application>'>
<!ENTITY kwalletmanager-miejscownik '<application>Menedżerze portfeli &tde;</application>'>
<!ENTITY tdewallet-mianownik '<application>Portfel &tde;</application>'>
<!ENTITY tdewallet-dopelniacz '<application>Portfela &tde;</application>'>
<!ENTITY tdewallet-celownik '<application>Portfelowi &tde;</application>'>
<!ENTITY tdewallet-biernik '<application>Portfel &tde;</application>'>
<!ENTITY tdewallet-narzednik '<application>Portfelem &tde;</application>'>
<!ENTITY tdewallet-miejscownik '<application>Portfelu &tde;</application>'>
<!ENTITY tdewalletmanager-mianownik '<application>Menedżer portfeli &tde;</application>'>
<!ENTITY tdewalletmanager-dopelniacz '<application>Menedżera portfeli &tde;</application>'>
<!ENTITY tdewalletmanager-celownik '<application>Menedżerowi portfeli &tde;</application>'>
<!ENTITY tdewalletmanager-biernik '<application>Menedżera portfeli &tde;</application>'>
<!ENTITY tdewalletmanager-narzednik '<application>Menedżerem portfeli &tde;</application>'>
<!ENTITY tdewalletmanager-miejscownik '<application>Menedżerze portfeli &tde;</application>'>
<!ENTITY noatun-mianownik '<application>Noatun</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}
SOURCES ${${target}_SRCS}
LINK ltdlc-static kparts-shared
LINK ltdlc-static tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)

@ -166,9 +166,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
}
#endif
/* These are to link libkparts even if 'smart' linker is used */
#include <kparts/plugin.h>
extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); }
/* These are to link libtdeparts even if 'smart' linker is used */
#include <tdeparts/plugin.h>
extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
/* These are to link libkio even if 'smart' linker is used */
#include <kio/authinfo.h>
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
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
VERSION 4.2.0
EMBED kssl-static kiocore-static ksycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
LINK ltdlc-static tdeui-shared tdesu-shared kwalletclient-shared ${LIBR_LIBRARIES}
EMBED kssl-static kiocore-static tdesycoca-static kbookmarks-static kfile-static ${ELFICON_STATIC_LIB}
LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES}
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) \
$(KDE_MT_LDFLAGS)
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 \
../kwallet/client/libkwalletclient.la \
../tdewallet/client/libtdewalletclient.la \
$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
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
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>
* worked on the dir and file completion, should do both now,

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

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

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

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

@ -117,7 +117,7 @@ extern "C" {
#include <ksqueezedtextlabel.h>
#include <klibloader.h>
#include <ktrader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kmetaprops.h>
#include <kpreviewprops.h>
#include <kprocess.h>
@ -818,7 +818,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
if ( (*it)->mode() != mode )
mode = (mode_t)0;
if ( KMimeType::iconForURL(url, mode) != iconStr )
iconStr = "kmultiple";
iconStr = "tdemultiple";
if ( url.directory() != directory )
directory = TQString::null;
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 (( 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 );
}
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
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)
noinst_LTLIBRARIES = libkiocore.la libksycoca.la
noinst_LTLIBRARIES = libkiocore.la libtdesycoca.la
# convenience lib - no LDFLAGS or LIBADD !
libksycoca_la_SOURCES = \
libtdesycoca_la_SOURCES = \
kdirwatch.cpp \
kfileshare.cpp ksambashare.cpp knfsshare.cpp \
ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
@ -43,7 +43,7 @@ libksycoca_la_SOURCES = \
kfilemetainfo.cpp kdcopservicestarter.cpp \
dataslave.cpp dataprotocol.cpp
#if USE_POSIX_ACL
libksycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp
#endif
include_HEADERS = \

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

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

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

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

@ -56,7 +56,7 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <ksycoca.h>
#include <tdesycoca.h>
#include <kde_file.h>
template class KSharedPtr<KMimeType>;
@ -144,7 +144,7 @@ KMimeType::Ptr KMimeType::mimeType( const TQString& _name )
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.
if ( !KSycoca::self()->isBuilding() )
delete mime;
@ -426,7 +426,7 @@ void KMimeType::save( TQDataStream& _str )
{
KServiceType::save( _str );
// Warning adding/removing fields here involves a binary incompatible change - update version
// number in ksycoca.h
// number in tdesycoca.h
_str << m_lstPatterns;
}

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

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

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

@ -51,7 +51,7 @@
#include "kservicetypefactory.h"
#include "kservicetype.h"
#include "kuserprofile.h"
#include "ksycoca.h"
#include "tdesycoca.h"
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!
// !! This data structure should remain binary compatible at all times !!
// 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
>> term >> m_strTerminalOptions
>> 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!
// !! This data structure should remain binary compatible at all times !!
// 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
<< term << m_strTerminalOptions
<< 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)
{
KServiceProgressDialog dlg(parent, "ksycoca_progress",
KServiceProgressDialog dlg(parent, "tdesycoca_progress",
i18n("Updating System Configuration"),
i18n("Updating system configuration."));

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

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

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

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

@ -28,8 +28,8 @@
#include <kdesktopfile.h>
#include <ksortablevaluelist.h>
#include "ksycocaentry.h"
#include "ksycocatype.h"
#include "tdesycocaentry.h"
#include "tdesycocatype.h"
#include "kservice.h"
class KBuildServiceGroupFactory;
@ -144,7 +144,7 @@ public:
/**
* 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
* @since 3.1
*/

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

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

@ -18,7 +18,7 @@
**/
#include "kservice.h"
#include "ksycoca.h"
#include "tdesycoca.h"
#include "kservicetype.h"
#include "kservicetypefactory.h"
#include "kservicefactory.h"
@ -138,7 +138,7 @@ KServiceType::save( TQDataStream& _str )
KSycocaEntry::save( _str );
// !! This data structure should remain binary compatible at all times !!
// 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
<< (TQ_INT8)m_bValid;
}

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

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

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

@ -36,7 +36,7 @@
* A few examples will make this a lot more clear.
*
* 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
* 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

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

@ -98,7 +98,7 @@ void KServiceTypeProfile::initStatic()
//static
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 the middle of it, making s_lstProfiles be NULL
if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 )

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

@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes)
bin_PROGRAMS = kioexec
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)
noinst_HEADERS = main.h

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

@ -1,7 +1,7 @@
# $Id$
# Makefile.am of tdebase/kioslave/http
INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes)
####### Files
@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel
kded_kpasswdserver_la_METASOURCES = AUTO
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

@ -34,7 +34,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
#include <kio/passdlg.h>
#include <kwallet.h>
#include <tdewallet.h>
#include "config.h"
#ifdef Q_WS_X11
@ -361,7 +361,7 @@ KPasswdServer::processRequest()
if ( ( username.isEmpty() || password.isEmpty() )
&& !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 ) )
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/network
${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
# change SSL_INCLUDES to .../include/openssl and make the source use #include <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
KSSLVERSION= 3.0.0

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

@ -14,8 +14,8 @@ add_subdirectory( kpac )
add_subdirectory( tdesasl )
add_subdirectory( kssld )
add_subdirectory( kfile )
add_subdirectory( kwalletd )
add_subdirectory( kntlm )
add_subdirectory( tdewalletd )
add_subdirectory( tdentlm )
add_definitions(
-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)
SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm
SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile tdewalletd tdentlm
lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kio_uiserver.la
@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop
kmailservice_SOURCES = kmailservice.cpp
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_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 \
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
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)

@ -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)
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
METASOURCES = AUTO

@ -24,15 +24,15 @@ link_directories(
##### 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
kntlm.cpp des.cpp
tdentlm.cpp des.cpp
)
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 "des.h"
#include "kntlm.h"
#include "tdentlm.h"
TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
{

@ -17,8 +17,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kwallet/client
${CMAKE_SOURCE_DIR}/kwallet/backend
${CMAKE_SOURCE_DIR}/tdewallet/client
${CMAKE_SOURCE_DIR}/tdewallet/backend
${CMAKE_SOURCE_DIR}/kio/kio
)
@ -29,21 +29,21 @@ link_directories(
##### 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
kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui
tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui
kbetterthankdialogbase.ui
)
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK tdeinit_kded-shared kwalletbackend-shared
LINK tdeinit_kded-shared tdewalletbackend-shared
DEPENDENCIES dcopidl
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -16,20 +16,20 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# 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_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_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui
kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
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_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
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
kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h
tdewalletwizard.lo: tdewalletwizard.ui tdewalletwizard.ui.h
kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h

@ -21,8 +21,8 @@
*/
#include "kbetterthankdialogbase.h"
#include "kwalletwizard.h"
#include "kwalletd.h"
#include "tdewalletwizard.h"
#include "tdewalletd.h"
#include "ktimeout.h"
#include <dcopclient.h>
@ -37,7 +37,7 @@
#include <kmessagebox.h>
#include <kpassdlg.h>
#include <kstandarddirs.h>
#include <kwalletentry.h>
#include <tdewalletentry.h>
#include <twin.h>
#include <tqdir.h>
@ -51,7 +51,7 @@
#include <assert.h>
extern "C" {
KDE_EXPORT KDEDModule *create_kwalletd(const TQCString &name) {
KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
return new KWalletD(name);
}
}
@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name)
_idleTime = 0;
connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
reconfigure();
TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
connect(TDEApplication::dcopClient(),
TQT_SIGNAL(applicationRemoved(const TQCString&)),
this,
TQT_SLOT(slotAppUnregistered(const TQCString&)));
_dw = new KDirWatch(this, "KWallet Directory Watcher");
_dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet"));
_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
_dw->startScan(true);
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 ) {
if( wId != 0 )
KWin::setMainWindow( dialog, wId ); // correct, set dialog parent
else {
if( appid.isEmpty())
kdWarning() << "Using kwallet without parent window!" << endl;
kdWarning() << "Using tdewallet without parent window!" << endl;
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
// with keeping the dialog on top or on all desktops
kapp->updateUserTimestamp();
@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
setupDialog( wiz, wId, appid, modal );
int rc = wiz->exec();
if (rc == TQDialog::Accepted) {
TDEConfig cfg("kwalletrc");
TDEConfig cfg("tdewalletrc");
cfg.setGroup("Wallet");
cfg.writeEntry("First Use", false);
cfg.writeEntry("Enabled", wiz->_useWallet->isChecked());
@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet,
return -1;
}
} else if (_firstUse) {
TDEConfig cfg("kwalletrc");
TDEConfig cfg("tdewalletrc");
_firstUse = false;
cfg.setGroup("Wallet");
cfg.writeEntry("First Use", false);
@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
}
emitDCOPSignal("walletOpened(TQString)", data);
if (_wallets.count() == 1 && _launchManager) {
TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
TDEApplication::startServiceByDesktopName("tdewalletmanager-tdewalletd");
}
} else {
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 == 1) {
TDEConfig cfg("kwalletrc");
TDEConfig cfg("tdewalletrc");
cfg.setGroup("Auto Allow");
TQStringList apps = cfg.readListEntry(wallet);
if (!apps.contains(thisApp)) {
@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
}
}
} else if (response == 3) {
TDEConfig cfg("kwalletrc");
TDEConfig cfg("tdewalletrc");
cfg.setGroup("Auto Deny");
TQStringList apps = cfg.readListEntry(wallet);
if (!apps.contains(thisApp)) {
@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
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)) {
close(wallet, true);
@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) {
TQStringList KWalletD::wallets() const {
TQString path = TDEGlobal::dirs()->saveLocation("kwallet");
TQString path = TDEGlobal::dirs()->saveLocation("tdewallet");
TQDir dir(path, "*.kwl");
TQStringList rc;
@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() {
void KWalletD::reconfigure() {
TDEConfig cfg("kwalletrc");
TDEConfig cfg("tdewalletrc");
cfg.setGroup("Wallet");
_firstUse = cfg.readBoolEntry("First Use", 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
ServiceTypes=KDEDModule
X-TDE-ModuleType=Library
X-TDE-Library=kwalletd
X-TDE-FactoryName=kwalletd
X-TDE-Library=tdewalletd
X-TDE-FactoryName=tdewalletd
X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true
Name=KWallet Daemon Module

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

@ -532,7 +532,7 @@
<includes>
<include location="global" impldecl="in declaration">tqcheckbox.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>
<Q_SLOTS>
<slot access="private">passwordPageUpdate()</slot>

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

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

@ -154,7 +154,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv)
{
// 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( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup

@ -1,5 +1,5 @@
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
kde_module_LTLIBRARIES = kgzipfilter.la

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

@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kio_http.la
kio_http_la_SOURCES = http.cc
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_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
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
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:
This can also be implemented as a plugin to konqueror and does

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

@ -29,7 +29,7 @@ link_directories(
install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
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 ################################

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

@ -257,7 +257,7 @@ KCookieJar::KCookieJar()
m_configChanged = 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");
for(TQStringList::ConstIterator it = countries.begin();
it != countries.end(); ++it)

@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest
kcookiejartest_SOURCES = kcookiejartest.cpp
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
./kcookiejartest $(srcdir)/cookie.test

@ -2,7 +2,7 @@
## Makefile.am of tdebase/kioslave/metainfo
INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_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
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_SOURCES = khotnewstuff.cpp
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_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_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
asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
asteroid_la_LIBADD = -ltdefx -lkutils
asteroid_la_LIBADD = -ltdefx -ltdeutils
asteroid_la_SOURCES = asteroid.cpp
themercdir = $(kde_datadir)/kstyle/themes

@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed
genembed_SOURCES = genembed.cpp
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\
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)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...?
khtmlWidgets[widget] = true;
connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*)));
if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
tdehtmlWidgets[widget] = true;
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
@ -283,8 +283,8 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...?
khtmlWidgets.remove(widget);
if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
tdehtmlWidgets.remove(widget);
}
// 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);
}
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)
@ -719,7 +719,7 @@ void PlastikStyle::renderButton(TQPainter *p,
bool mouseOver,
bool horizontal,
bool enabled,
bool khtmlMode) const
bool tdehtmlMode) const
{
// small fix for the kicker buttons...
if(kickerMode) enabled = true;
@ -728,7 +728,7 @@ void PlastikStyle::renderButton(TQPainter *p,
uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom;
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;
if(horizontal) surfaceFlags|=Is_Horizontal;
@ -1526,8 +1526,8 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
case PE_ButtonTool:
case PE_ButtonDropDown:
case PE_ButtonCommand: {
bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget());
renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode );
bool tdehtmlMode = opt.isDefault() ? false : tdehtmlWidgets.contains(opt.widget());
renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlMode );
break;
}
@ -1884,12 +1884,12 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
// 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.
//
// In this place there is no reliable way to detect if we are in khtml; the
// only thing we know is that khtml buffers its widgets into a pixmap. So
// when the paint device is a TQPixmap, chances are high that we are in khtml.
// In this place there is no reliable way to detect if we are in tdehtml; the
// 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 tdehtml.
// It's possible that this breaks other things, so let's see how it works...
if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) {
contourFlags += Draw_AlphaBlend;
@ -2816,7 +2816,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
:cg.background();
uint contourFlags = 0;
if( khtmlWidgets.contains(cb) )
if( tdehtmlWidgets.contains(cb) )
contourFlags |= Draw_AlphaBlend;
if (_inputFocusHighlight && hasFocus && editable && enabled)

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

@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme
kinstalltheme_SOURCES = main.cpp
# 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,
# 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
dattypes.h midistat.h deviceman.h synthout.h
fmout.h gusout.h alsaout.h voiceman.h notearray.h
mt32togm.h midispec.h libkmid.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libkmid )
mt32togm.h midispec.h libtdemid.h
DESTINATION ${INCLUDE_INSTALL_DIR}/libtdemid )
##### kmid ######################################
##### tdemid ######################################
set( target kmid )
set( target tdemid )
set( ${target}_SRCS
midiout.cc player.cc track.cc midimapper.cc
midfile.cc dattypes.cc midistat.cc deviceman.cc
synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
mt32togm.cc notearray.cc libkmid.cc
mt32togm.cc notearray