diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 322efffb2..68ea6cb61 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -70,7 +70,7 @@ or this page online.
The first step to get your KDE application to compile under KDE 2.0,
is to detect KDE 2.0 and Qt 2.x at configure time. The easiest way to
get a working autoconf/automake framework, is to either use
- KDevelop or
+ KDevelop or
kapptemplate
(available in CVS under the module "tdesdk"), to generate a new
application template. Replace the generated source files by yours
@@ -910,7 +910,7 @@ Stefan Westerfeld stefan@space.twc.de
KImageIO has moved from 'kimgio.h' to 'kimageio.h'. LIB_KIMGIO does no longer
-exists, you need to link against LIB_KSYCOCA instead.
+exists, you need to link against LIB_TDESYCOCA instead.
kimgioRegister() has been replaced by KImageIO::registerFormats().
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 74f71978a..5168d25c1 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -19,7 +19,7 @@ or this page online.
Changes in kab
Changes in tdecore
Changes in tdeui
-Changes in kio
+Changes in tdeio
Changes in tdeparts
Changes in tdespell
API-cleanup in TDEHTML
@@ -33,7 +33,7 @@ or this page online.
The first step to get your KDE application to compile under KDE 3.0,
is to detect KDE 3.0 and Qt 3.x at configure time. The easiest way to
get a working autoconf/automake framework, is to either use
- KDevelop or
+ KDevelop or
kapptemplate
(available in CVS under the module "tdesdk"), to generate a new
application template. Replace the generated source files by yours
@@ -214,7 +214,7 @@ The preferred means of defining a shortcut, however, is to use TDEAction.
TDEIconLoader, TDEIconTheme
Methods now use TDEIcon::Group and TDEIcon::Context instead of int as types for group and context arguments.
The change should affect only code using hardcoded numeric values instead of using the proper enum constants.
-This applies to classes TDEIconLoader, TDEIconTheme and (in kio and tdefile) KMimeType, KService, TDEIconDialog, TDEIconButton,
+This applies to classes TDEIconLoader, TDEIconTheme and (in tdeio and tdefile) KMimeType, KService, TDEIconDialog, TDEIconButton,
KURLBar and KURLBarItem.
Return to the Table of Contents
@@ -345,7 +345,7 @@ TQString&) is not a slot anymore.
Return to the Table of Contents
-
+
KPropertiesDialog
@@ -361,7 +361,7 @@ TQString&) is not a slot anymore.
- KTarGz is now KTar (#define for source compatibility)
- A base class KArchive has been written, to support other archive formats in the future
- KTarEntry is now KArchiveEntry, KTarDirectory is now KArchiveDirectory, and KTarFile is now KArchiveFile.
- - The classes ProgressBase, StatusbarProgress and DefaultProgress have been moved to the KIO namespace.
+ - The classes ProgressBase, StatusbarProgress and DefaultProgress have been moved to the TDEIO namespace.
- The signal KDirLister::started(const TQString &url) has changed to KDirLister::started(const KURL &url).
-
- KServiceTypeProfile::preferredService( const TQString & serviceType, bool needApp ) has been removed, use
KServiceTypeProfile::preferredService( ..., "Application") if needApp was true, or
@@ -531,7 +531,7 @@ parts are rarely used outside of tdefile.
The changes are:
KFileItem
-The KFileViewItem class is completely replaced with KFileItem from kio. All its functionality has
+The KFileViewItem class is completely replaced with KFileItem from tdeio. All its functionality has
been merged with its former base class KFileItem. Additionally, some of its methods have been
modified:
@@ -543,7 +543,7 @@ modified:
KFileReader
-This class has been merged with KDirLister from kio.
+This class has been merged with KDirLister from tdeio.
KDirOperator
diff --git a/Mainpage.dox b/Mainpage.dox
index 702510fc5..77bdc19b1 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -20,7 +20,7 @@
* - kjs
* (classes)\n
* Javascript (aka. ECMAScript and JScript) support.
- * - kio
+ * - tdeio
* (classes)\n
* Low level access to network files. Also provides access to facilities
* such as KDirWatcher which monitors directories for changes.
@@ -49,7 +49,7 @@
* (classes)\n
* Defines interfaces for common components so that new implementations
* can be dropped in.
- * - kabc
+ * - tdeabc
* (classes)\n
* Access to the Trinity address book.
* - tderesources
diff --git a/Makefile.am.in b/Makefile.am.in
index 30da00c6e..10a07b429 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -18,18 +18,18 @@
# Boston, MA 02110-1301, USA.
-COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
+COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet tdeio kded kded_post
COMPILE_BEFORE_doc = kdoctools
COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint tdeinit kate interfaces tdecert tdehtml tderandr
COMPILE_AFTER_tdeprint = kate tdehtml
COMPILE_BEFORE_tdehtml = tdeutils
-COMPILE_BEFORE_kabc = kab tderesources
+COMPILE_BEFORE_tdeabc = kab tderesources
COMPILE_BEFORE_kate = interfaces tdeutils
COMPILE_BEFORE_tdemdi = tdeutils
COMPILE_BEFORE_tdespell2 = tdeutils
COMPILE_BEFORE_tdecmshell = tdeutils
-COMPILE_BEFORE_kdewidgets = kabc tdehtml
-COMPILE_BEFORE_interfaces = arts kabc
+COMPILE_BEFORE_kdewidgets = tdeabc tdehtml
+COMPILE_BEFORE_interfaces = arts tdeabc
$(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
diff --git a/README b/README
index 6ef755ce6..01674c3ba 100644
--- a/README
+++ b/README
@@ -30,10 +30,10 @@ Here is an alphabetical list:
tdeparts interface for text editors, mediaplayer and scripting.
* kab
- OBSOLETE, see kabc: Used to be the address book library, but now only
- used to convert kab-Addressbooks into kabc format.
+ OBSOLETE, see tdeabc: Used to be the address book library, but now only
+ used to convert kab-Addressbooks into tdeabc format.
-* kabc
+* tdeabc
The address book library.
* kate
@@ -84,7 +84,7 @@ Here is an alphabetical list:
* tdeinit
Process launcher, used for fast KDE startup
-* kio
+* tdeio
Classes that fetch and decode URLs are contained here. This library also
contains "tdesycoca", the system configure cache containing services,
applications, servicetypes and mimetypes.
diff --git a/TODO b/TODO
index 94b6e27e1..2fcb51b44 100644
--- a/TODO
+++ b/TODO
@@ -50,11 +50,11 @@ that we would like to make for the next binary incompatible release.
Konqueror and KMail tend to stall occasionally too, but that's harder to refactor
because the bulk of the work there is X11-related.
-- Make it possible to use SSL-ed sockets outside KIO. KSSL isn't very suitable for
+- Make it possible to use SSL-ed sockets outside TDEIO. KSSL isn't very suitable for
reuse, and the certificate dialogs are not even available in public API at all,
leading e.g. to Kopete IRC duplicating a lot of stuff and all KDE Jabber clients
based on libpsi (PSI, Light Hawk and Kopete) using homebrewn solutions. [How
- does this have to do with changing KIO? It's just a request to have that
+ does this have to do with changing TDEIO? It's just a request to have that
code in a different form....]
- Manually, properly clean up the includes in all of the headers. Remove
@@ -174,7 +174,7 @@ that we would like to make for the next binary incompatible release.
too many problems in the past. Not worth the trouble.
- Split KProtocolInfo into KProtocolInfoBase in tdecore (with almost everything)
- and KProtocolInfo in kio (with the methods taking a KURL, which need KProtocolManager)
+ and KProtocolInfo in tdeio (with the methods taking a KURL, which need KProtocolManager)
- Rename KDirNotify_stub and update API (no need for '*' arguments anymore)
@@ -223,7 +223,7 @@ an alternative help->contents action)
- Move KRichTextLabel into tdeui if still required with Qt 4.
-- Add the concept of a session to KIO, in particular for TDEHTML so that it can
+- Add the concept of a session to TDEIO, in particular for TDEHTML so that it can
have all of its jobs associated in some way (a unique key of sorts). Will
make SSL much easier to implement and allow removal of many hacks, mostly
involving metadata.
diff --git a/arts/Makefile.am b/arts/Makefile.am
index f15b8b7be..9cb845698 100644
--- a/arts/Makefile.am
+++ b/arts/Makefile.am
@@ -4,6 +4,6 @@ else
SUBDIRS = knotify
endif
-DOXYGEN_REFERENCES = kio tdecore tdeui
+DOXYGEN_REFERENCES = tdeio tdecore tdeui
include ../admin/Doxyfile.am
diff --git a/arts/kde/Makefile.am b/arts/kde/Makefile.am
index 74d397374..0bcd464f9 100644
--- a/arts/kde/Makefile.am
+++ b/arts/kde/Makefile.am
@@ -8,7 +8,7 @@ libartskde_la_SOURCES = artskde.cc kioinputstream_impl.cpp kplayobject.cc \
kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
kvideowidget.cpp kplayobjectcreator.cc \
kaudiomanagerplay.cpp
-libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
+libartskde_la_LIBADD = $(LIB_TDEIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_QT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
libartskde_la_METASOURCES = AUTO
libartskde_la_COMPILE_FIRST = artskde.h
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index 1b6be9860..d2d76f25c 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -64,7 +64,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& url, bool createBU
KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQString &mimetype, bool createBUS)
{
- // WHY DOES BROKEN KIO_MEDIA GIVE WRONG URLS?
+ // WHY DOES BROKEN TDEIO_MEDIA GIVE WRONG URLS?
// I hate it
// I hate it
// It sucks
@@ -135,7 +135,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& url, bool
KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, const TQString &mimetype, bool createBUS)
{
- // WHY DOES BROKEN KIO_MEDIA GIVE WRONG URLS?
+ // WHY DOES BROKEN TDEIO_MEDIA GIVE WRONG URLS?
// I hate it
// I hate it
// It sucks
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index 970b75055..6d44285a6 100644
--- a/arts/knotify/Makefile.am
+++ b/arts/knotify/Makefile.am
@@ -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) -ltdetexteditor
+knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
noinst_HEADERS = knotify.h
diff --git a/configure.in.in b/configure.in.in
index 5b7192ffa..92bf3c22d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -249,18 +249,18 @@ AC_SUBST(LIBRESOLV)
AC_SUBST(LIBICE)
AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
-AC_SUBST(LIB_TDEABC, '$(top_builddir)/tdeabc/libkabc.la')
+AC_SUBST(LIB_TDEABC, '$(top_builddir)/tdeabc/libtdeabc.la')
AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
-AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_TDEIO, '$(top_builddir)/tdeio/libtdeio.la')
AC_SUBST(LIB_TDEFILE, '$(top_builddir)/tdeio/libtdeio.la')
-AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
+AC_SUBST(LIB_TDESYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
-AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
+AC_SUBST(LIB_TDEPARTS, '$(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)/tdeunittest/libtdeunittest.la')
+AC_SUBST(LIB_TDEUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
case $host in
*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
*) lib_kded='' ;;
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index 57ce71786..34cd9870d 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -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) -ltdetexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)
diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h
index 199163cb1..24cf53078 100644
--- a/dnssd/domainbrowser.h
+++ b/dnssd/domainbrowser.h
@@ -38,7 +38,7 @@ class DomainBrowserPrivate;
@short Class used to provide current list of domains for browsing.
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT DomainBrowser : public TQObject
+class TDEDNSSD_EXPORT DomainBrowser : public TQObject
{
Q_OBJECT
public:
diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h
index 946225778..30fbe8466 100644
--- a/dnssd/publicservice.h
+++ b/dnssd/publicservice.h
@@ -58,7 +58,7 @@ service->publishAsync();
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT PublicService : public TQObject, public ServiceBase
+class TDEDNSSD_EXPORT PublicService : public TQObject, public ServiceBase
{
Q_OBJECT
public:
diff --git a/dnssd/query.h b/dnssd/query.h
index 42dae32e2..037fb9fde 100644
--- a/dnssd/query.h
+++ b/dnssd/query.h
@@ -36,7 +36,7 @@ name, either multicast or unicast DNS will be used.
@short Class that represents service query in one domain.
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT Query : public TQObject
+class TDEDNSSD_EXPORT Query : public TQObject
{
Q_OBJECT
public:
diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h
index 485fd64d2..b5ef4dcd9 100644
--- a/dnssd/remoteservice.h
+++ b/dnssd/remoteservice.h
@@ -39,7 +39,7 @@ service is resolved are name, type.and domain.
@short class representing service announced on remote machine.
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase
+class TDEDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase
{
Q_OBJECT
public:
@@ -101,8 +101,8 @@ private:
const char* txtRecord);
RemoteServicePrivate *d;
- friend KDNSSD_EXPORT TQDataStream & operator<< (TQDataStream & s, const RemoteService & a);
- friend KDNSSD_EXPORT TQDataStream & operator>> (TQDataStream & s, RemoteService & a);
+ friend TDEDNSSD_EXPORT TQDataStream & operator<< (TQDataStream & s, const RemoteService & a);
+ friend TDEDNSSD_EXPORT TQDataStream & operator>> (TQDataStream & s, RemoteService & a);
};
diff --git a/dnssd/servicebase.h b/dnssd/servicebase.h
index b3a6cab9d..89afed99e 100644
--- a/dnssd/servicebase.h
+++ b/dnssd/servicebase.h
@@ -37,7 +37,7 @@ services of given type are present in given domain.
@short Describes any type of service.
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT ServiceBase : public TDEShared
+class TDEDNSSD_EXPORT ServiceBase : public TDEShared
{
public:
typedef TDESharedPtr Ptr;
@@ -107,8 +107,8 @@ protected:
*/
void decode(const TQString& name);
- friend KDNSSD_EXPORT TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a);
- friend KDNSSD_EXPORT TQDataStream & operator>> (TQDataStream & s, ServiceBase & a);
+ friend TDEDNSSD_EXPORT TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a);
+ friend TDEDNSSD_EXPORT TQDataStream & operator>> (TQDataStream & s, ServiceBase & a);
virtual void virtual_hook(int, void*);
private:
diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h
index e09ca16e0..be2b6213b 100644
--- a/dnssd/servicebrowser.h
+++ b/dnssd/servicebrowser.h
@@ -51,7 +51,7 @@ to constructor, domains configured by user will be searched.
@author Jakub Stachowski
@short Browsing for specific type of services or all available service types
*/
-class KDNSSD_EXPORT ServiceBrowser : public TQObject
+class TDEDNSSD_EXPORT ServiceBrowser : public TQObject
{
Q_OBJECT
public:
diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc
index b8454f94b..13dd191ce 100644
--- a/dnssd/settings.kcfgc
+++ b/dnssd/settings.kcfgc
@@ -8,4 +8,4 @@ Mutators=true
NameSpace=DNSSD
SetUserTexts=false
Singleton=true
-Visibility=KDNSSD_EXPORT
+Visibility=TDEDNSSD_EXPORT
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index e5eedaf90..0cb10278c 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer kio terminal khexedit tdeimproxy kspeech
+SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer tdeio terminal khexedit tdeimproxy kspeech
DOXYGEN_REFERENCES = tdecore tdefx tdeui tdeparts dcop
DOXYGEN_SET_RECURSIVE = YES
diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am
index dc183251d..8bd030168 100644
--- a/interfaces/kspeech/Makefile.am
+++ b/interfaces/kspeech/Makefile.am
@@ -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 tdeparts
+DOXYGEN_REFERENCES = tdecore dcop tdeio tdeui tdeparts
include ../../admin/Doxyfile.am
diff --git a/interfaces/tdeimproxy/interface/Makefile.am b/interfaces/tdeimproxy/interface/Makefile.am
index 348130e46..0ebfbcd10 100644
--- a/interfaces/tdeimproxy/interface/Makefile.am
+++ b/interfaces/tdeimproxy/interface/Makefile.am
@@ -10,4 +10,4 @@ kcm_instantmessenger_DATA = kcm_instantmessenger.desktop
kcm_instantmessengerdir = $(kde_datadir)/kcm_componentchooser
include $(top_srcdir)/admin/Doxyfile.am
-DOXYGEN_REFERENCES = kabc
+DOXYGEN_REFERENCES = tdeabc
diff --git a/interfaces/tdeimproxy/library/Makefile.am b/interfaces/tdeimproxy/library/Makefile.am
index 743b76424..bae476b1e 100644
--- a/interfaces/tdeimproxy/library/Makefile.am
+++ b/interfaces/tdeimproxy/library/Makefile.am
@@ -16,11 +16,11 @@ 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_LIBADD = $(LIB_TDEIO) $(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
+DOXYGEN_REFERENCES = tdeabc dcop
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index 84b7d37dd..293d1f723 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -21,8 +21,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIMPROXY_H
-#define KIMPROXY_H
+#ifndef TDEIMPROXY_H
+#define TDEIMPROXY_H
#include
#include
@@ -104,7 +104,7 @@ typedef TQMap PresenceStringMap;
* @since 3.3
* @author Will Stephenson
*/
-class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
+class TDEIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
{
Q_OBJECT
struct Private;
diff --git a/interfaces/tdeimproxy/library/tdeimproxyiface.h b/interfaces/tdeimproxy/library/tdeimproxyiface.h
index a7d416371..9902b5969 100644
--- a/interfaces/tdeimproxy/library/tdeimproxyiface.h
+++ b/interfaces/tdeimproxy/library/tdeimproxyiface.h
@@ -23,8 +23,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KIMPROXYIFACE_H
-#define KIMPROXYIFACE_H
+#ifndef TDEIMPROXYIFACE_H
+#define TDEIMPROXYIFACE_H
#include
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
index 91ed342bd..289668b2c 100644
--- a/interfaces/tdemediaplayer/Makefile.am
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -9,7 +9,7 @@ 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_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdemediaplayer_la_METASOURCES = AUTO
tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
index d73cf545f..cefc9e200 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdefileaudiopreview.la
tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
noinst_HEADERS = tdefileaudiopreview.h
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
index 03c7efc87..97ff6c9b3 100644
--- a/interfaces/tdescript/Makefile.am
+++ b/interfaces/tdescript/Makefile.am
@@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(al
#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)
+#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+#libtdescriptloader_la_LIBADD = $(LIB_TDEPARTS)
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)
+libtdescript_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
tdescriptincludedir = $(includedir)
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index 7588019e2..ac0717321 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -22,8 +22,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
-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_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libtdetexteditor_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
selectioninterface.h cursorinterface.h \
diff --git a/interfaces/tdetexteditor/templateinterface.h b/interfaces/tdetexteditor/templateinterface.h
index 6ffc40e73..966955735 100644
--- a/interfaces/tdetexteditor/templateinterface.h
+++ b/interfaces/tdetexteditor/templateinterface.h
@@ -82,10 +82,10 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt
*
* - index: "i"
* - loginname: The current users's loginname
- * - firstname: The current user's first name retrieved from kabc
- * - lastname: The current user's last name retrieved from kabc
- * - fullname: The current user's first and last name retrieved from kabc
- * - email: The current user's primary email adress retrieved from kabc
+ * - firstname: The current user's first name retrieved from tdeabc
+ * - lastname: The current user's last name retrieved from tdeabc
+ * - fullname: The current user's first and last name retrieved from tdeabc
+ * - email: The current user's primary email adress retrieved from tdeabc
* - date: current date
* - time: current time
* - year: current year
diff --git a/kab/README b/kab/README
index c8f0306ed..a6084ecc9 100644
--- a/kab/README
+++ b/kab/README
@@ -1,6 +1,6 @@
-Note: libkab is now obsolete. Please use libkabc in tdelibs/tdeabc. libkab is
+Note: libkab is now obsolete. Please use libtdeabc in tdelibs/tdeabc. libkab is
no longer installed. It's only needed for the conversion tool converting
-libkab data to libkabc data.
+libkab data to libtdeabc data.
Cornelius Schumacher, February 2002.
diff --git a/kate/ChangeLog b/kate/ChangeLog
index 0da6d5cc2..ac81fc022 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -42,7 +42,7 @@
by using run length encoding for the attributes if they are
dumped into the bytearray
-2002-06-01 Christian Couder
+2002-06-01 Christian Couder
* Move view stuff from katedocument to kateviewinternal.
2002-05-20 Christoph Cullmann
@@ -51,11 +51,11 @@
(mem leak, KateUndo is now only for internal use in KateUndoGroup)
* start of convertion my*** to m_*** and add m_ to any other private stuff
-2002-05-17 Christian Couder
+2002-05-17 Christian Couder
* Move font stuff from katedocument into new katefont.h and
katefont.cpp files, and clean up katedocument font stuff.
-2002-05-14 Christian Couder
+2002-05-14 Christian Couder
* Big clean up in katedocument using new katecursor stuff.
2002-05-12 Bernd Gehrmann
@@ -63,17 +63,17 @@
* If servicetype in the browser extension specifies an encoding,
use that instead of user's local encoding
-2002-05-11 Christian Couder
+2002-05-11 Christian Couder
* implement the KTextEditor::Cursor in the KateCursor class
2002-05-04 Christoph Cullmann
* first KTextEditor::ViewPlugin which works
drop the helloworld plugin, as it is really no good example (bad code, ..)
-2002-05-04 Christian Couder
+2002-05-04 Christian Couder
* fix undo for comment and uncomment
-2002-05-01 Christian Couder
+2002-05-01 Christian Couder
* cleanups related to the uncomment feature in katetextline and katedocument
2002-01-04 Christoph Cullmann
@@ -166,16 +166,16 @@
* myself back again ;)
* now kate is clean (only qt3), no backports ;)
-2001-08-24 christian@tdevelop.org
+2001-08-24 christian@kdevelop.org
* reimplement the commenting of selections on some languages
-2001-08-19 christian@tdevelop.org
+2001-08-19 christian@kdevelop.org
* added back Sather highlighting support
* improved Eiffel language syntax highlighting support
* added Eiffel language comment directive in eiffel.xml
* added Ada language comment directive in ada.xml
-2001-08-15 christian@tdevelop.org
+2001-08-15 christian@kdevelop.org
* committed Eiffel language syntax highlighting support
2001-08-08 rokrau@yahoo.com
diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox
index 0fc1d9490..99ddc9c7a 100644
--- a/kate/Mainpage.dox
+++ b/kate/Mainpage.dox
@@ -31,6 +31,6 @@ Christoph Cullmann \
@lgpl
*/
-// DOXYGEN_REFERENCES = tdecore kio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs
+// DOXYGEN_REFERENCES = tdecore tdeio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs
// DOXYGEN_SET_PROJECT_NAME = Kate
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kate/Makefile.am b/kate/Makefile.am
index e39af3b7f..3c37de122 100644
--- a/kate/Makefile.am
+++ b/kate/Makefile.am
@@ -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 tdeparts
+DOXYGEN_REFERENCES = tdecore dcop tdeio tdeui tdeparts
include ../admin/Doxyfile.am
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index 3a7a8b855..c4e280cc0 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -3,7 +3,7 @@
-
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index d14e58f89..1d9102033 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = document.moc view.moc
lib_LTLIBRARIES = libkatepartinterfaces.la
libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
+libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDECORE)
libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
kateinclude_HEADERS = document.h view.h
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 71b201485..276abf536 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -16,7 +16,7 @@ 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)/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_TDEFILE) $(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_TDEPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 892a1d429..4617ecb66 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -2,7 +2,7 @@
Copyright (C) 2001 Joseph Wenninger
Copyright (C) 2002 John Firebaugh
Copyright (C) 2001 by Victor Röder
- Copyright (C) 2002 by Roberto Raggi
+ Copyright (C) 2002 by Roberto Raggi
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index ce4af0ecf..8279d396e 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -3,7 +3,7 @@
Copyright (C) 2001 Joseph Wenninger
Copyright (C) 2002 John Firebaugh
Copyright (C) 2001 by Victor Röder
- Copyright (C) 2002 by Roberto Raggi
+ Copyright (C) 2002 by Roberto Raggi
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/kate/part/katecursor.cpp b/kate/part/katecursor.cpp
index e951dcd32..dcd7c38bf 100644
--- a/kate/part/katecursor.cpp
+++ b/kate/part/katecursor.cpp
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder
+ Copyright (C) 2002 Christian Couder
Copyright (C) 2001, 2003 Christoph Cullmann
Copyright (C) 2001 Joseph Wenninger
Copyright (C) 1999 Jochen Wilhelmy
diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h
index 749bb0f76..1b1a5322a 100644
--- a/kate/part/katecursor.h
+++ b/kate/part/katecursor.h
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder
+ Copyright (C) 2002 Christian Couder
Copyright (C) 2001, 2003 Christoph Cullmann
Copyright (C) 2001 Joseph Wenninger
Copyright (C) 1999 Jochen Wilhelmy
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index e42bfb0bd..5e2cef175 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -2399,7 +2399,7 @@ bool KateDocument::openFile(TDEIO::Job * job)
if (pos != -1)
setEncoding (serviceType.mid(pos+1));
- // if the encoding is set here - on the command line/from the dialog/from KIO
+ // if the encoding is set here - on the command line/from the dialog/from TDEIO
// we prevent file type and document variables from changing it
bool encodingSticky = m_encodingSticky;
m_encodingSticky = m_config->isSetEncoding();
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index c00953469..9d734b6e7 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder
+ Copyright (C) 2002 Christian Couder
Copyright (C) 2001 Christoph Cullmann
Copyright (C) 2001 Joseph Wenninger
Copyright (C) 1999 Jochen Wilhelmy
diff --git a/kate/part/katefont.h b/kate/part/katefont.h
index ac82338ea..f9e0c1d83 100644
--- a/kate/part/katefont.h
+++ b/kate/part/katefont.h
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder
+ Copyright (C) 2002 Christian Couder
Copyright (C) 2001 Christoph Cullmann
Copyright (C) 2001 Joseph Wenninger
Copyright (C) 1999 Jochen Wilhelmy
diff --git a/kde.pot b/kde.pot
index 65d1fb654..aa84dc873 100644
--- a/kde.pot
+++ b/kde.pot
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2005-06-13 01:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
+"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox
index 798f23f03..52c0d8285 100644
--- a/kded/Mainpage.dox
+++ b/kded/Mainpage.dox
@@ -21,6 +21,6 @@ Waldo Bastian \
*/
-// DOXYGEN_REFERENCES = tdecore tdeui kio
+// DOXYGEN_REFERENCES = tdecore tdeui tdeio
// DOXYGEN_SET_PROJECT_NAME = TrinityD
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kded/Makefile.am b/kded/Makefile.am
index 093b5db0e..e192e0984 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -23,11 +23,11 @@ lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kded.la tdebuildsycoca.la
kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
kded_la_SOURCES = kded.cpp kdedmodule.cpp
tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-tdebuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdebuildsycoca_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \
kbuildservicefactory.cpp \
kbuildservicegroupfactory.cpp \
@@ -38,16 +38,16 @@ tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \
bin_PROGRAMS = kdontchangethehostname tde-menu tdemimelist
-kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kdontchangethehostname_LDADD = $(LIB_TDECORE)
kdontchangethehostname_SOURCES = khostname.cpp
-tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdemimelist_LDADD = ../tdeio/libtdeio.la
tdemimelist_SOURCES = tdemimelist.cpp
-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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kde_menu_LDADD = $(LIB_TDEIO)
kde_menu_SOURCES = tde-menu.cpp
METASOURCES = AUTO
diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am
index 2ae867228..5633b9c1d 100644
--- a/kdewidgets/Makefile.am
+++ b/kdewidgets/Makefile.am
@@ -25,12 +25,12 @@ INCLUDES = -I$(top_srcdir)/tdefile $(all_includes)
bin_PROGRAMS = maketdewidgets
maketdewidgets_SOURCES = maketdewidgets.cpp
-maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
maketdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la
kde_widget_LTLIBRARIES = kdewidgets.la
kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+kdewidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
kdewidgets.cpp: $(srcdir)/kde.widgets maketdewidgets
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index bbbac6f90..b1ee195f2 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -262,6 +262,6 @@ ConstructorArgs=(parent, 210, 16)
[TDEABC::AddressLineEdit]
IncludeFile=tdeabc/addresslineedit.h
-ToolTip=A lineedit with LDAP and kabc completion.
+ToolTip=A lineedit with LDAP and tdeabc completion.
Group=Input (KDE)
ConstructorArgs=(parent, true, name)
diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index c009fd19d..b1202e059 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -11,11 +11,11 @@ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
kde_module_LTLIBRARIES = tdeio_help.la tdeio_ghelp.la
tdeio_help_la_SOURCES = tdeio_help.cpp main.cpp xslt.cpp
-tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_TDEIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
tdeio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
tdeio_ghelp_la_SOURCES = tdeio_help.cpp main_ghelp.cpp xslt.cpp
-tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_TDEIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
tdeio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
noinst_HEADERS = tdeio_help.h
@@ -24,7 +24,7 @@ kdelnk_DATA = help.protocol ghelp.protocol
kdelnkdir = $(kde_servicesdir)
bin_PROGRAMS = meinproc
-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_TDECORE)
+meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_TDEIO) $(LIBBZ2) $(LIB_TDECORE)
meinproc_SOURCES = meinproc.cpp
xslt_pure.o: xslt.cpp
diff --git a/knewstuff/Mainpage.dox b/knewstuff/Mainpage.dox
index d44f61804..6f2d31051 100644
--- a/knewstuff/Mainpage.dox
+++ b/knewstuff/Mainpage.dox
@@ -30,6 +30,6 @@ Jeremy Whiting \
*/
-// DOXYGEN_REFERENCES = tdecore tdeui kio
+// DOXYGEN_REFERENCES = tdecore tdeui tdeio
// DOXYGEN_SET_PROJECT_NAME = KNewStuff
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am
index c15716c8e..b8532a234 100644
--- a/knewstuff/Makefile.am
+++ b/knewstuff/Makefile.am
@@ -5,24 +5,24 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libknewstuff.la
libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
-libknewstuff_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+libknewstuff_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
knewstuffgeneric.cpp knewstuffbutton.cpp knewstuffsecure.cpp security.cpp
bin_PROGRAMS = tdehotnewstuff
-tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdehotnewstuff_LDADD = libknewstuff.la
tdehotnewstuff_SOURCES = tdehotnewstuff.cpp
EXTRA_PROGRAMS = testnewstuff ghns
-testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor
+ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
ghns_LDADD = libknewstuff.la
ghns_SOURCES = ghns.cpp
diff --git a/libtdemid/libtdemid.h b/libtdemid/libtdemid.h
index 7d7c2f239..4ca8db32a 100644
--- a/libtdemid/libtdemid.h
+++ b/libtdemid/libtdemid.h
@@ -22,8 +22,8 @@
Send comments and bug fixes to Antonio Larrosa
***************************************************************************/
-#ifndef _LIBKMID_H
-#define _LIBKMID_H
+#ifndef _LIBTDEMID_H
+#define _LIBTDEMID_H
#ifdef __cplusplus
diff --git a/libtdescreensaver/tdescreensaver.h b/libtdescreensaver/tdescreensaver.h
index de23f8431..0dbb0e5d2 100644
--- a/libtdescreensaver/tdescreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KSCREENSAVER_H
-#define KSCREENSAVER_H
+#ifndef TDESCREENSAVER_H
+#define TDESCREENSAVER_H
#include
diff --git a/networkstatus/Makefile.am b/networkstatus/Makefile.am
index 310356258..d681c2470 100644
--- a/networkstatus/Makefile.am
+++ b/networkstatus/Makefile.am
@@ -18,7 +18,7 @@ libconnectionmanager_la_SOURCES = connectionmanager.cpp networkstatusindicator.c
kded_networkstatus_la_SOURCES = networkstatus.cpp networkstatus.skel \
clientiface.skel serviceiface.skel network.cpp
#kclientiface.skel serviceiface.skel
-kded_networkstatus_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) ./libnetworkstatus.la
+kded_networkstatus_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) ./libnetworkstatus.la
kded_networkstatus_la_LDFLAGS = $(all_libraries) -module -avoid-version
servicesdir = $(kde_servicesdir)/kded
diff --git a/pics/Makefile.am b/pics/Makefile.am
index 580f33eee..0e93da6b7 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG)
ksvgtopng_SOURCES = ksvgtopng.cpp
ksvgtopng_LDADD = $(LIB_TDECORE) $(top_builddir)/tdecore/svgicons/libkdesvgicons.la
-ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
install-data-local:
-rm -f $(DESTDIR)$(kde_icondir)/default.tde
diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO
index 5187f2580..1070ccd4c 100644
--- a/tdeabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -5,13 +5,13 @@ The KDE address book framework tries to provide an easy to use and powerful
mechanism to handle contacts in all KDE applications.
If you want to make use of it, this small introduction to programming
-with libkabc may be helpful.
+with libtdeabc may be helpful.
General Concepts
=================
-In libkabc the storage and management of contacts is devided in 2 layers.
+In libtdeabc the storage and management of contacts is devided in 2 layers.
******************
Management Layer *
@@ -63,7 +63,7 @@ The Storage Layer
The Storage Layer consists of the class TDEABC::Resource and its derived classes.
These classes are used by TDEABC::AddressBook to load and store the contacts to
the single backends.
-At the moment libkabc provides 4 types of resources:
+At the moment libtdeabc provides 4 types of resources:
1) ResourceFile
- stores all contacts in a single file
@@ -76,7 +76,7 @@ At the moment libkabc provides 4 types of resources:
4) ResourceNet
- stores all contacts in a single file, which can be accessable via HTTP,
- FTP, Fish, WebDAV, POP3, IMAP or whatever the KIO frame work supports
+ FTP, Fish, WebDAV, POP3, IMAP or whatever the TDEIO frame work supports
In general the developer does not have to take how to save the single contacts.
He just has to plug one of the above mentioned resources into TDEABC::AddressBook
@@ -85,7 +85,7 @@ and perform a save action.
Examples
=========
Like a picture, C/C++ code is worth a 1000 words I'd like to give you a
-lot of examples now, how to use libkabc for several tasks:
+lot of examples now, how to use libtdeabc for several tasks:
Using TDEABC::StdAddressBook and Iterators
@@ -217,7 +217,7 @@ The following code will create a file resource and save a contact into it:
In line 1 the TDEABC::AddressBook is created. In line 4 you creat the
TDEABC::ResourceFile (which will handle the loading/saving).
The resource takes 2 arguments, the first is the file name and the
-second one the file format. At the moment libkabc supports two file formats:
+second one the file format. At the moment libtdeabc supports two file formats:
1) vCard, as specified in RFC 2426
2) Binary, which increases performance during loading and saving
@@ -262,7 +262,7 @@ From 49 - 50 we insert 2 email addresses with the first one as preferred
(second argument is true).
In 53 and the following 3 lines we add two telephone numbers. For this purpose
-libkabc provides the TDEABC::PhoneNumber class, which takes the phone number in
+libtdeabc provides the TDEABC::PhoneNumber class, which takes the phone number in
string representation as first argument and the type as second. The types can
be combined, so 'TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Fax' would be
the Home Fax.
@@ -312,7 +312,7 @@ please take a look at the official API documentation or the header files.
Distribution Lists
-------------------
-libkabc provides so called distribution lists to group contacts. These lists
+libtdeabc provides so called distribution lists to group contacts. These lists
just store the uid of contacts, so they can be used for every kind of contact
grouping. There are 2 classes which handle the whole distribution list tasks,
TDEABC::DistributionListManager and TDEABC::DistributionList. The first one keeps
diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am
index a1f1d1b74..288e6101d 100644
--- a/tdeabc/Makefile.am
+++ b/tdeabc/Makefile.am
@@ -21,7 +21,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
lib_LTLIBRARIES = libtdeabc.la
libtdeabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
-libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
+libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_TDEIO) \
$(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdeabc_la_COMPILE_FIRST = addressee.h
@@ -52,7 +52,7 @@ METASOURCES = AUTO
bin_PROGRAMS = tdeab2tdeabc
-tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeab2tdeabc_LDADD = libtdeabc.la ../kab/libkab.la
tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
diff --git a/tdeabc/README b/tdeabc/README
index 46d21b9b6..3bb6f8fcd 100644
--- a/tdeabc/README
+++ b/tdeabc/README
@@ -2,7 +2,7 @@ LIBKABC - new address book API for KDE
PURPOSE:
-libkabc provides an API for address book data. This can be used by all KDE
+libtdeabc provides an API for address book data. This can be used by all KDE
application using data of this type, e.g. KAddressBook, KMail, KOrganizer,
KPilot etc. It is meant as replacement for libkab (in tdebase/kab).
@@ -18,7 +18,7 @@ FEATURES:
selection, supports automatic name completion.
- GUI client for viewing, modifying address book data. This is aimed at
developers not end users.
-- Tool for converting data, written with libkab, to libkabc format.
+- Tool for converting data, written with libkab, to libtdeabc format.
- Multiple backends (resources) for storing entries e.g. LDAP
AUTHOR: Cornelius Schumacher
diff --git a/tdeabc/README.AddressFormat b/tdeabc/README.AddressFormat
index 8079e4914..ec8d3ede6 100644
--- a/tdeabc/README.AddressFormat
+++ b/tdeabc/README.AddressFormat
@@ -1,4 +1,4 @@
-Address formats can be a tricky thing. libkabc tries very hard to perfectly fit
+Address formats can be a tricky thing. libtdeabc tries very hard to perfectly fit
the needs of ~95% of users and to be at least sufficient for the other 5%.
The formatting of an address depends on the destination country as well as on
@@ -15,7 +15,7 @@ format in a field "AddressFormat". Note that for most countries one field
however, in some countries (eg. Hungary) business addresses differ in their
structure. In this case you have the possibility of adding another field
"BusinessAddressFormat" which will be preferred for formatting of business
-addresses; if libkabc can't find such a field, it will fall back to
+addresses; if libtdeabc can't find such a field, it will fall back to
"AddressFormat". (Please use BusinessAddressFormat ONLY if you really need to)
The format consists mainly of tags that will be replaced by address fields.
diff --git a/tdeabc/address.cpp b/tdeabc/address.cpp
index e5305f5a0..80dea4e61 100644
--- a/tdeabc/address.cpp
+++ b/tdeabc/address.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/address.h b/tdeabc/address.h
index 796be25a0..7cb676bc6 100644
--- a/tdeabc/address.h
+++ b/tdeabc/address.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp
index 3a8a71f2b..b9d239ef4 100644
--- a/tdeabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h
index 09d18d6bb..5a3d1a45a 100644
--- a/tdeabc/addressbook.h
+++ b/tdeabc/addressbook.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
index 028d178b0..26c87d8b8 100644
--- a/tdeabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/addresseedialog.h b/tdeabc/addresseedialog.h
index 718aa61da..f94b49b71 100644
--- a/tdeabc/addresseedialog.h
+++ b/tdeabc/addresseedialog.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/addresseehelper.cpp b/tdeabc/addresseehelper.cpp
index f752788dd..efbee6c47 100644
--- a/tdeabc/addresseehelper.cpp
+++ b/tdeabc/addresseehelper.cpp
@@ -81,7 +81,7 @@ void AddresseeHelper::initSettings()
mPrefixes.insert( "von" );
mPrefixes.insert( "de" );
- TDEConfig config( "kabcrc", true, false ); // readonly, no kdeglobals
+ TDEConfig config( "tdeabcrc", true, false ); // readonly, no kdeglobals
config.setGroup( "General" );
addToSet( config.readListEntry( "Prefixes" ), mTitles );
diff --git a/tdeabc/addresseelist.cpp b/tdeabc/addresseelist.cpp
index 4787c65aa..5a4aa609b 100644
--- a/tdeabc/addresseelist.cpp
+++ b/tdeabc/addresseelist.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Jost Schenck
2003 Tobias Koenig
diff --git a/tdeabc/addresseelist.h b/tdeabc/addresseelist.h
index bebe0a460..7825a0c2c 100644
--- a/tdeabc/addresseelist.h
+++ b/tdeabc/addresseelist.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Jost Schenck
2003 Tobias Koenig
diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index 8194f8ca3..93a327889 100644
--- a/tdeabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Helge Deller
2002 Lubos Lunak
2001,2003 Carsten Pfeiffer
diff --git a/tdeabc/addresslineedit.h b/tdeabc/addresslineedit.h
index ee10b5bbd..b8f83ceab 100644
--- a/tdeabc/addresslineedit.h
+++ b/tdeabc/addresslineedit.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Helge Deller
2002 Lubos Lunak
@@ -37,7 +37,7 @@ namespace TDEABC {
class LdapSearch;
/**
- * A lineedit with LDAP and kabc completion
+ * A lineedit with LDAP and tdeabc completion
*
* This lineedit is supposed to be used wherever the user types email addresses
* and might want a completion. You can simply use it as a replacement for
diff --git a/tdeabc/agent.cpp b/tdeabc/agent.cpp
index 2b2747697..6c3f140ef 100644
--- a/tdeabc/agent.cpp
+++ b/tdeabc/agent.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/agent.h b/tdeabc/agent.h
index b982456c5..a9598936c 100644
--- a/tdeabc/agent.h
+++ b/tdeabc/agent.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index e811c4d65..7c55fccd6 100644
--- a/tdeabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h
index 0c2bdf0bd..44de7f0d3 100644
--- a/tdeabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
index c440fcb4c..04578e19a 100644
--- a/tdeabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
index d4286a54b..0270c3605 100644
--- a/tdeabc/distributionlistdialog.h
+++ b/tdeabc/distributionlistdialog.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
index 76fd35568..215382f62 100644
--- a/tdeabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
index 6da6495f8..815499fac 100644
--- a/tdeabc/distributionlisteditor.h
+++ b/tdeabc/distributionlisteditor.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/errorhandler.cpp b/tdeabc/errorhandler.cpp
index 3208b84c9..5bf327ac5 100644
--- a/tdeabc/errorhandler.cpp
+++ b/tdeabc/errorhandler.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
Copyright (c) 2003 Cornelius Schumacher
@@ -39,7 +39,7 @@ void ConsoleErrorHandler::error( const TQString &msg )
void GUIErrorHandler::error( const TQString &msg )
{
- KMessageBox::error( 0, msg, i18n( "Error in libkabc" ) );
+ KMessageBox::error( 0, msg, i18n( "Error in libtdeabc" ) );
}
diff --git a/tdeabc/errorhandler.h b/tdeabc/errorhandler.h
index d3d3f253d..9785ff87c 100644
--- a/tdeabc/errorhandler.h
+++ b/tdeabc/errorhandler.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
Copyright (c) 2003 Cornelius Schumacher
@@ -32,7 +32,7 @@ namespace TDEABC {
/**
Abstract class that provides displaying of error messages.
- We need this to make libkabc gui independent on the one side
+ We need this to make libtdeabc gui independent on the one side
and provide user friendly error messages on the other side.
Use @p ConsoleErrorHandler or @p GuiErrorHandler in your
application or provide your own ErrorHandler.
diff --git a/tdeabc/field.h b/tdeabc/field.h
index 08322ecf5..0619dcbf0 100644
--- a/tdeabc/field.h
+++ b/tdeabc/field.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/format.h b/tdeabc/format.h
index 77c2edcc5..4323de174 100644
--- a/tdeabc/format.h
+++ b/tdeabc/format.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/formatfactory.cpp b/tdeabc/formatfactory.cpp
index 4839acc4d..921a960c4 100644
--- a/tdeabc/formatfactory.cpp
+++ b/tdeabc/formatfactory.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/formatfactory.h b/tdeabc/formatfactory.h
index 0994fe109..cf9eb5f88 100644
--- a/tdeabc/formatfactory.h
+++ b/tdeabc/formatfactory.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/formatplugin.h b/tdeabc/formatplugin.h
index c6fb59858..2eb6082b8 100644
--- a/tdeabc/formatplugin.h
+++ b/tdeabc/formatplugin.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
index 15dbec8a8..dcb49330e 100644
--- a/tdeabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/formats/binaryformat.h b/tdeabc/formats/binaryformat.h
index faf6c8e5a..d0ae43c0f 100644
--- a/tdeabc/formats/binaryformat.h
+++ b/tdeabc/formats/binaryformat.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/geo.cpp b/tdeabc/geo.cpp
index 9883595a4..2adf3f033 100644
--- a/tdeabc/geo.cpp
+++ b/tdeabc/geo.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/geo.h b/tdeabc/geo.h
index 55cf18680..f9633af88 100644
--- a/tdeabc/geo.h
+++ b/tdeabc/geo.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/key.cpp b/tdeabc/key.cpp
index d4456f516..5f76d9c79 100644
--- a/tdeabc/key.cpp
+++ b/tdeabc/key.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/key.h b/tdeabc/key.h
index 94d1a28b3..c6483b835 100644
--- a/tdeabc/key.h
+++ b/tdeabc/key.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
index 6e339cb2c..2c2dfbe75 100644
--- a/tdeabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Szombathelyi György
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
index 662534fd6..ed39bb776 100644
--- a/tdeabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Szombathelyi György
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldapurl.cpp b/tdeabc/ldapurl.cpp
index 95363efaf..c20dbd39e 100644
--- a/tdeabc/ldapurl.cpp
+++ b/tdeabc/ldapurl.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Szombathelyi György
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldapurl.h b/tdeabc/ldapurl.h
index f86c8a466..9a189655e 100644
--- a/tdeabc/ldapurl.h
+++ b/tdeabc/ldapurl.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Szombathelyi György
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldif.cpp b/tdeabc/ldif.cpp
index a40f5a818..cbf94c637 100644
--- a/tdeabc/ldif.cpp
+++ b/tdeabc/ldif.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Szombathelyi György
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldif.h b/tdeabc/ldif.h
index 6cbc536e8..9e07e2a5f 100644
--- a/tdeabc/ldif.h
+++ b/tdeabc/ldif.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Szombathelyi Gyorgy
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp
index 8338f5ba0..1527b4893 100644
--- a/tdeabc/ldifconverter.cpp
+++ b/tdeabc/ldifconverter.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Helge Deller
This library is free software; you can redistribute it and/or
@@ -142,7 +142,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
ldif_out( t, "organization", addr.organization() );
ldif_out( t, "organizationname", addr.organization() );
- // Compatibility with older kabc versions.
+ // Compatibility with older tdeabc versions.
if ( !addr.department().isEmpty() )
ldif_out( t, "department", addr.department() );
else
@@ -321,7 +321,7 @@ addComment:
}
if ( a.url().prettyURL() == KURL(value).prettyURL() )
return true;
- // TODO: current version of kabc only supports one URL.
+ // TODO: current version of tdeabc only supports one URL.
// TODO: change this with KDE 4
}
diff --git a/tdeabc/ldifconverter.h b/tdeabc/ldifconverter.h
index 8788136b3..30c8889d6 100644
--- a/tdeabc/ldifconverter.h
+++ b/tdeabc/ldifconverter.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Helge Deller
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/lock.cpp b/tdeabc/lock.cpp
index 782b60afa..2e2ee7894 100644
--- a/tdeabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001,2003 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/lock.h b/tdeabc/lock.h
index 0b4c2ffe0..d4d04532a 100644
--- a/tdeabc/lock.h
+++ b/tdeabc/lock.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001,2003 Cornelius Schumacher
diff --git a/tdeabc/locknull.cpp b/tdeabc/locknull.cpp
index c38bda0ce..09752b825 100644
--- a/tdeabc/locknull.cpp
+++ b/tdeabc/locknull.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Cornelius Schumacher
diff --git a/tdeabc/locknull.h b/tdeabc/locknull.h
index fdc6e9aab..62d177fdd 100644
--- a/tdeabc/locknull.h
+++ b/tdeabc/locknull.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Cornelius Schumacher
diff --git a/tdeabc/phonenumber.cpp b/tdeabc/phonenumber.cpp
index f6022052c..642196f5f 100644
--- a/tdeabc/phonenumber.cpp
+++ b/tdeabc/phonenumber.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/phonenumber.h b/tdeabc/phonenumber.h
index 737f57ff8..641ee6b1f 100644
--- a/tdeabc/phonenumber.h
+++ b/tdeabc/phonenumber.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/picture.cpp b/tdeabc/picture.cpp
index 057be604c..5fee62f6f 100644
--- a/tdeabc/picture.cpp
+++ b/tdeabc/picture.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/picture.h b/tdeabc/picture.h
index ca8f086ed..af1ee4562 100644
--- a/tdeabc/picture.h
+++ b/tdeabc/picture.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugin.cpp b/tdeabc/plugin.cpp
index 9c1453bc5..779f8be61 100644
--- a/tdeabc/plugin.cpp
+++ b/tdeabc/plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugin.h b/tdeabc/plugin.h
index b242e5a8c..8734acd13 100644
--- a/tdeabc/plugin.h
+++ b/tdeabc/plugin.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
index d054bbaf9..95fcfe2c8 100644
--- a/tdeabc/plugins/dir/Makefile.am
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -19,8 +19,8 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeabc_dir.pot
-kabcincludedir = $(includedir)/tdeabc
-kabcinclude_HEADERS = resourcedir.h
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = resourcedir.h
servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = dir.desktop
diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index eaf774066..304f585f0 100644
--- a/tdeabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 - 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
index 035b8a6ae..dc9d1d06a 100644
--- a/tdeabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 - 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp
index 212ef6156..91512cfa6 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.cpp
+++ b/tdeabc/plugins/dir/resourcedirconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
index 98efd76d0..51fac5812 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.h
+++ b/tdeabc/plugins/dir/resourcedirconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp
index 5662a7062..028dce31c 100644
--- a/tdeabc/plugins/dir/resourcedirplugin.cpp
+++ b/tdeabc/plugins/dir/resourcedirplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 - 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/evolution/Makefile.am b/tdeabc/plugins/evolution/Makefile.am
index 67a5a64b8..14c608440 100644
--- a/tdeabc/plugins/evolution/Makefile.am
+++ b/tdeabc/plugins/evolution/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = tdeabc_evo.la
tdeabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
tdeabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdeabc_evo_la_LIBADD = ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la
+tdeabc_evo_la_LIBADD = ../../../tdeabc/libtdeabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la
METASOURCES = AUTO
diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
index 475fcd4dc..beda9a00b 100644
--- a/tdeabc/plugins/file/Makefile.am
+++ b/tdeabc/plugins/file/Makefile.am
@@ -21,8 +21,8 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeabc_file.pot
-kabcincludedir = $(includedir)/tdeabc
-kabcinclude_HEADERS = resourcefile.h
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = resourcefile.h
servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = file.desktop
diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index 4df5db42c..ad4e8c466 100644
--- a/tdeabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001,2003 Cornelius Schumacher
Copyright (c) 2006 Tom Abers
diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
index 76652d179..ffa19a4bf 100644
--- a/tdeabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 516a33a61..2c8e0fce6 100644
--- a/tdeabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
index e7b8ca9ea..3be4cca49 100644
--- a/tdeabc/plugins/file/resourcefileconfig.h
+++ b/tdeabc/plugins/file/resourcefileconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp
index 5a44f76ca..6f7598a40 100644
--- a/tdeabc/plugins/file/resourcefileplugin.cpp
+++ b/tdeabc/plugins/file/resourcefileplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
index 205c412ce..085bf7712 100644
--- a/tdeabc/plugins/ldaptdeio/Makefile.am
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourceldaptdeioconfig.h
lib_LTLIBRARIES = libtdeabc_ldaptdeio.la
libtdeabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
libtdeabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_ldaptdeio_la_LIBADD = $(LIB_TDEABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdeabc_ldaptdeio_la_LIBADD = $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
libtdeabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = tdeabc_ldaptdeio.la
@@ -19,8 +19,8 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeabc_ldaptdeio.pot
-kabcincludedir = $(includedir)/tdeabc
-kabcinclude_HEADERS = resourceldaptdeio.h
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = resourceldaptdeio.h
servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = ldaptdeio.desktop
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index 0e182755a..ed6675392 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
Copyright (c) 2004 Szombathelyi György
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index 051470960..8f0565c3e 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
Copyright (c) 2004 Szombathelyi György
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index 25099414c..429e6b494 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 - 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index 0041946b7..d56b4de31 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 - 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index dcb373b3c..6046e9ae2 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am
index 8fd53f34f..e738d55e7 100644
--- a/tdeabc/plugins/net/Makefile.am
+++ b/tdeabc/plugins/net/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourcenetconfig.h
lib_LTLIBRARIES = libtdeabc_net.la
libtdeabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
libtdeabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_net_la_LIBADD = $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO)
+libtdeabc_net_la_LIBADD = $(top_builddir)/tdeabc/libtdeabc.la $(LIB_TDEIO)
libtdeabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = tdeabc_net.la
@@ -19,8 +19,8 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeabc_net.pot
-kabcincludedir = $(includedir)/tdeabc
-kabcinclude_HEADERS = resourcenet.h
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = resourcenet.h
servicedir = $(kde_servicesdir)/tderesources/tdeabc
service_DATA = net.desktop
diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index 390e84224..cb908cd22 100644
--- a/tdeabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index 18a3b715b..e190c63c8 100644
--- a/tdeabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/net/resourcenetconfig.cpp b/tdeabc/plugins/net/resourcenetconfig.cpp
index ab3cddf3e..98504788b 100644
--- a/tdeabc/plugins/net/resourcenetconfig.cpp
+++ b/tdeabc/plugins/net/resourcenetconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index f2ba37800..513c77de2 100644
--- a/tdeabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
index 8db397152..cd87cc000 100644
--- a/tdeabc/plugins/net/resourcenetplugin.cpp
+++ b/tdeabc/plugins/net/resourcenetplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/sql/Makefile.am b/tdeabc/plugins/sql/Makefile.am
index 43dd193f6..12bce32be 100644
--- a/tdeabc/plugins/sql/Makefile.am
+++ b/tdeabc/plugins/sql/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = tdeabc_sql.la
tdeabc_sql_la_SOURCES = resourcesql.cpp resourcesqlconfig.cpp
tdeabc_sql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdeabc_sql_la_LIBADD = ../../libkabc.la ../../../tdeui/libtdeui.la
+tdeabc_sql_la_LIBADD = ../../libtdeabc.la ../../../tdeui/libtdeui.la
METASOURCES = AUTO
diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
index ed284cdc5..9635dd77b 100644
--- a/tdeabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/sql/resourcesql.h b/tdeabc/plugins/sql/resourcesql.h
index b7c82e6b0..7ce26956c 100644
--- a/tdeabc/plugins/sql/resourcesql.h
+++ b/tdeabc/plugins/sql/resourcesql.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/sql/resourcesqlconfig.cpp b/tdeabc/plugins/sql/resourcesqlconfig.cpp
index 34a678aca..4394066c7 100644
--- a/tdeabc/plugins/sql/resourcesqlconfig.cpp
+++ b/tdeabc/plugins/sql/resourcesqlconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
index f9b2c0a61..e0c08880c 100644
--- a/tdeabc/plugins/sql/resourcesqlconfig.h
+++ b/tdeabc/plugins/sql/resourcesqlconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/resource.cpp b/tdeabc/resource.cpp
index 4128db82c..ffa1a40e3 100644
--- a/tdeabc/resource.cpp
+++ b/tdeabc/resource.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/resource.h b/tdeabc/resource.h
index 620d9ec47..5e9d9cb0d 100644
--- a/tdeabc/resource.h
+++ b/tdeabc/resource.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
index 1b9d1a40d..a12e83611 100644
--- a/tdeabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index 5065a3c82..1d820ece1 100644
--- a/tdeabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/scripts/addressee.src.cpp b/tdeabc/scripts/addressee.src.cpp
index c090f7e4e..3fec361f2 100644
--- a/tdeabc/scripts/addressee.src.cpp
+++ b/tdeabc/scripts/addressee.src.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
Copyright (c) 2003 Carsten Pfeiffer
Copyright (c) 2005 Ingo Kloecker
diff --git a/tdeabc/scripts/addressee.src.h b/tdeabc/scripts/addressee.src.h
index aa449112e..79255f6ee 100644
--- a/tdeabc/scripts/addressee.src.h
+++ b/tdeabc/scripts/addressee.src.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
index a87d00679..b7eb3ea5d 100644
--- a/tdeabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/secrecy.cpp b/tdeabc/secrecy.cpp
index 3fe33f17d..de4392073 100644
--- a/tdeabc/secrecy.cpp
+++ b/tdeabc/secrecy.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/secrecy.h b/tdeabc/secrecy.h
index 596d1b675..b7a87d952 100644
--- a/tdeabc/secrecy.h
+++ b/tdeabc/secrecy.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/sortmode.cpp b/tdeabc/sortmode.cpp
index 1fef420eb..4d1881341 100644
--- a/tdeabc/sortmode.cpp
+++ b/tdeabc/sortmode.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/sortmode.h b/tdeabc/sortmode.h
index 49f3490ba..7cbafbb6f 100644
--- a/tdeabc/sortmode.h
+++ b/tdeabc/sortmode.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2004 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/sound.cpp b/tdeabc/sound.cpp
index fbdadd2d2..470020378 100644
--- a/tdeabc/sound.cpp
+++ b/tdeabc/sound.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/sound.h b/tdeabc/sound.h
index 4602c9ed6..3ee64ac57 100644
--- a/tdeabc/sound.h
+++ b/tdeabc/sound.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index c0789f215..73343d8a9 100644
--- a/tdeabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
@@ -188,7 +188,7 @@ bool StdAddressBook::automaticSave()
// should get const for 4.X
Addressee StdAddressBook::whoAmI()
{
- TDEConfig config( "kabcrc" );
+ TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
return findByUid( config.readEntry( "WhoAmI" ) );
@@ -196,7 +196,7 @@ Addressee StdAddressBook::whoAmI()
void StdAddressBook::setWhoAmI( const Addressee &addr )
{
- TDEConfig config( "kabcrc" );
+ TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
config.writeEntry( "WhoAmI", addr.uid() );
diff --git a/tdeabc/stdaddressbook.h b/tdeabc/stdaddressbook.h
index 86804a91e..290999d66 100644
--- a/tdeabc/stdaddressbook.h
+++ b/tdeabc/stdaddressbook.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/tdeab2tdeabc.cpp b/tdeabc/tdeab2tdeabc.cpp
index 20aef735c..e346d9c7a 100644
--- a/tdeabc/tdeab2tdeabc.cpp
+++ b/tdeabc/tdeab2tdeabc.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
@@ -292,7 +292,7 @@ void importKab( TDEABC::AddressBook *ab, bool override, bool quiet )
}
kdDebug(5700) << "Converting old-style kab addressbook to "
- "new-style kabc addressbook." << endl;
+ "new-style tdeabc addressbook." << endl;
KabAPI kab( 0 );
if ( kab.init() != ::AddressBook::NoError ) {
@@ -463,14 +463,14 @@ int main( int argc, char **argv )
config->writeEntry( "EnableAutostart", false );
}
- TDEABC::AddressBook *kabcBook = StdAddressBook::self();
+ TDEABC::AddressBook *tdeabcBook = StdAddressBook::self();
- importKMailAddressBook( kabcBook );
+ importKMailAddressBook( tdeabcBook );
- importKab( kabcBook, override, quiet );
+ importKab( tdeabcBook, override, quiet );
StdAddressBook::save();
- kdDebug(5700) << "Saved kabc addressbook to '" << kabcBook->identifier() << "'" << endl;
+ kdDebug(5700) << "Saved tdeabc addressbook to '" << tdeabcBook->identifier() << "'" << endl;
}
diff --git a/tdeabc/tdeab2tdeabc.desktop b/tdeabc/tdeab2tdeabc.desktop
index ef7641b23..cfc12913e 100644
--- a/tdeabc/tdeab2tdeabc.desktop
+++ b/tdeabc/tdeab2tdeabc.desktop
@@ -1,15 +1,15 @@
[Desktop Entry]
Name=tdeab2tdeabc
-Name[af]=kab-na-kabc
+Name[af]=kab-na-tdeabc
Name[csb]=Kònwersëjô adresowi knéżczi
-Name[eo]=Konvertilo de "kab" al "kabc"
+Name[eo]=Konvertilo de "kab" al "tdeabc"
Name[fr]=KAB2KABC
Name[fy]=Kab2kabc
Name[hu]=Kab2kabc
Name[it]=Kab2Kabc
Name[nl]=Kab2kabc
Name[pl]=Konwersja książki adresowej
-Name[pt_BR]=Conversão de kab para kabc
+Name[pt_BR]=Conversão de kab para tdeabc
Name[ro]=Kab2kabc
Name[sv]=Kab2kabc
Name[te]=కెఎబి2కెఎబిసి
@@ -17,88 +17,88 @@ Name[zu]=i-tdeab2tdeabc
Exec=tdeab2tdeabc --disable-autostart --quiet
Icon=misc
Type=Application
-Comment=libkab to libkabc conversion tool.
-Comment[af]=libkab na libkabc omskakeling program.
-Comment[ar]=أداة تحويل libkab إلى libkabc.
-Comment[az]=libkab - libkabc dönüşdürmə vasitəsi.
-Comment[be]=Інструмент пераўтварэння libkab у libkabc.
-Comment[bg]=Програма за конвертиране на libkab до libkabc.
+Comment=libkab to libtdeabc conversion tool.
+Comment[af]=libkab na libtdeabc omskakeling program.
+Comment[ar]=أداة تحويل libkab إلى libtdeabc.
+Comment[az]=libkab - libtdeabc dönüşdürmə vasitəsi.
+Comment[be]=Інструмент пераўтварэння libkab у libtdeabc.
+Comment[bg]=Програма за конвертиране на libkab до libtdeabc.
Comment[bn]=libkab থেকে libtdeabc-তে পরিবর্তন করার প্রোগ্রাম।
-Comment[bs]=alat za pretvaranje libkab u libkabc.
-Comment[ca]=Eina de conversió de libkab a libkabc.
-Comment[cs]=Převod dat z libkab do libkabc.
-Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc.
-Comment[cy]=erfyn trosi libkab i libkabc
+Comment[bs]=alat za pretvaranje libkab u libtdeabc.
+Comment[ca]=Eina de conversió de libkab a libtdeabc.
+Comment[cs]=Převod dat z libkab do libtdeabc.
+Comment[csb]=Nôrzãdze do kònwersëji z libkab do libtdeabc.
+Comment[cy]=erfyn trosi libkab i libtdeabc
Comment[da]=libkab-til-libtdeabc-konverteringsværktøj.
-Comment[de]=Konvertierung von libkab in libkabc
-Comment[el]=Εργαλείο μετατροπής από το libkab στο libkabc.
-Comment[eo]=Konvertilo de "libkab" al "libkabc"
-Comment[es]=Conversor libkab a libkabc.
-Comment[et]=libkab -> libkabc teisendamine
+Comment[de]=Konvertierung von libkab in libtdeabc
+Comment[el]=Εργαλείο μετατροπής από το libkab στο libtdeabc.
+Comment[eo]=Konvertilo de "libkab" al "libtdeabc"
+Comment[es]=Conversor libkab a libtdeabc.
+Comment[et]=libkab -> libtdeabc teisendamine
Comment[eu]=libkab-etik libtdeabc-era bihurtzeko tresna.
Comment[fa]=ابزار تبدیل libkab به libcabc.
-Comment[fi]=libkab-libkabc -muunnin
-Comment[fr]=Outil de conversion de libkab vers libkabc.
-Comment[fy]=Konversjeprogramma fan libkab nei libkabc.
-Comment[ga]=Uirlis tiontaithe ó libkab go libkabc.
-Comment[gl]=Ferramenta de conversión de libkab a libkabc.
-Comment[he]=כלי המרה מ־libkab ל־libkabc
-Comment[hi]=libkab से libkabc बदलने वाला औजार
-Comment[hr]=Alat za pretvaranje iz libkab u libkabc
-Comment[hsb]=libkab -> libkabc konwerter
-Comment[hu]=libkab -> libkabc konvertáló.
-Comment[id]=konverter libkab ke libkabc.
-Comment[is]=libkab í libkabc breytingatól.
-Comment[it]=Strumento di conversione da libkab a libkabc.
-Comment[ja]=libkab から libkabc への変換ツール
-Comment[ka]=libkab => libkabc გარდაქმნის ხელსაწყო.
-Comment[kk]=libkab дегеннен libkabc дегенге айналдыру құралы.
-Comment[km]=ឧបករណ៍បម្លែងពី libkab ទៅ libkabc
-Comment[ko]=libkab을 libkabc로 바꿔주는 연장.
-Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
-Comment[lt]=libkab į libkabc konvertavimo įrankis.
-Comment[lv]=libkab uz libkabc kovertēšanas rīks.
-Comment[mk]=алатка за претворање од libkab во libkabc.
+Comment[fi]=libkab-libtdeabc -muunnin
+Comment[fr]=Outil de conversion de libkab vers libtdeabc.
+Comment[fy]=Konversjeprogramma fan libkab nei libtdeabc.
+Comment[ga]=Uirlis tiontaithe ó libkab go libtdeabc.
+Comment[gl]=Ferramenta de conversión de libkab a libtdeabc.
+Comment[he]=כלי המרה מ־libkab ל־libtdeabc
+Comment[hi]=libkab से libtdeabc बदलने वाला औजार
+Comment[hr]=Alat za pretvaranje iz libkab u libtdeabc
+Comment[hsb]=libkab -> libtdeabc konwerter
+Comment[hu]=libkab -> libtdeabc konvertáló.
+Comment[id]=konverter libkab ke libtdeabc.
+Comment[is]=libkab í libtdeabc breytingatól.
+Comment[it]=Strumento di conversione da libkab a libtdeabc.
+Comment[ja]=libkab から libtdeabc への変換ツール
+Comment[ka]=libkab => libtdeabc გარდაქმნის ხელსაწყო.
+Comment[kk]=libkab дегеннен libtdeabc дегенге айналдыру құралы.
+Comment[km]=ឧបករណ៍បម្លែងពី libkab ទៅ libtdeabc
+Comment[ko]=libkab을 libtdeabc로 바꿔주는 연장.
+Comment[lb]=libkab op libtdeabc Konvertéierungs-Hëllefsmëttel.
+Comment[lt]=libkab į libtdeabc konvertavimo įrankis.
+Comment[lv]=libkab uz libtdeabc kovertēšanas rīks.
+Comment[mk]=алатка за претворање од libkab во libtdeabc.
Comment[mn]=libkab-аас libtdeabc-руу хөрвүүлэгч
-Comment[ms]=perkakasan penukaran libkab to libkabc.
-Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
-Comment[nb]=libkab til libkabc konverteringsverktøy.
-Comment[nds]=Warktüüch för't Ümwanneln vun libkab na libkabc.
-Comment[ne]=libkab to libkabc रूपान्तरण उपकरण ।
-Comment[nl]=Conversieprogramma van libkab naar libkabc.
-Comment[nn]=Konverterer libkab til libkabc
-Comment[nso]=Sebereka sa phetosetso ya libkab go libkabc
-Comment[pa]=libkab ਤੋ libkabc ਤਬਦੀਲੀ ਸੰਦ।
-Comment[pl]=Narzędzie do konwersji z libkab do libkabc.
-Comment[pt]=Ferramenta de conversão de libkab para libkabc.
-Comment[pt_BR]=Ferramenta de conversão de libkab para libkabc.
-Comment[ro]=Utilitar de conversie de la "libkab" la "libkabc".
-Comment[ru]=утилита преобразования libkab в libkabc.
-Comment[rw]=Igikoresho cy'ihindura libkab muri libkabc.
-Comment[se]=konverterenreaidu libkab:as libkabc:ai
-Comment[sk]=Prevod dát z libkab do libkabc.
-Comment[sl]=Orodje za pretvorbo iz libkab v libkabc
-Comment[sq]=Vegla për shëndrimin e libkab në libkabc.
-Comment[sr]=Алат за конверзију из libkab-а у libkabc.
-Comment[sr@Latn]=Alat za konverziju iz libkab-a u libkabc.
-Comment[ss]=Lithulusi lekutjintja le-libkab kuya ku-libkabc.
-Comment[sv]=Konverteringsverktyg från libkab till libkabc
-Comment[ta]=libkab இலிருந்து libkabc க்கு மாற்றும் கருவி.
-Comment[te]=libkab నుంచి libkabc కు మార్చు పనిముట్టు
-Comment[tg]=асбоби дигаргунсози libkab ба libkabc
-Comment[th]=เครื่องมือเปลี่ยน libkab เป็น libkabc
-Comment[tr]=libkab' tan libkabc' ye dönüştürme aracı
-Comment[tt]=libkab-›libkabc äyländerü qoralı.
-Comment[uk]=Засіб перетворення libkab до libkabc.
-Comment[uz]=libkab'ni libkabc'ga aylantiradigan vosita.
-Comment[uz@cyrillic]=libkab'ни libkabc'га айлантирадиган восита.
-Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libkabc
-Comment[vi]=Công cụ chuyển đổi libkab sang libkabc.
-Comment[xh]=libkab kwi libkabc isixhobo sokuguqulela.
-Comment[zh_CN]=libkab 到 libkabc 的转换工具。
-Comment[zh_HK]=libkab 至 libkabc 的轉換工具
-Comment[zh_TW]=libkab 至 libkabc 轉換工具
-Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
+Comment[ms]=perkakasan penukaran libkab to libtdeabc.
+Comment[mt]=Għodda għall-konverżjoni libkab għal libtdeabc
+Comment[nb]=libkab til libtdeabc konverteringsverktøy.
+Comment[nds]=Warktüüch för't Ümwanneln vun libkab na libtdeabc.
+Comment[ne]=libkab to libtdeabc रूपान्तरण उपकरण ।
+Comment[nl]=Conversieprogramma van libkab naar libtdeabc.
+Comment[nn]=Konverterer libkab til libtdeabc
+Comment[nso]=Sebereka sa phetosetso ya libkab go libtdeabc
+Comment[pa]=libkab ਤੋ libtdeabc ਤਬਦੀਲੀ ਸੰਦ।
+Comment[pl]=Narzędzie do konwersji z libkab do libtdeabc.
+Comment[pt]=Ferramenta de conversão de libkab para libtdeabc.
+Comment[pt_BR]=Ferramenta de conversão de libkab para libtdeabc.
+Comment[ro]=Utilitar de conversie de la "libkab" la "libtdeabc".
+Comment[ru]=утилита преобразования libkab в libtdeabc.
+Comment[rw]=Igikoresho cy'ihindura libkab muri libtdeabc.
+Comment[se]=konverterenreaidu libkab:as libtdeabc:ai
+Comment[sk]=Prevod dát z libkab do libtdeabc.
+Comment[sl]=Orodje za pretvorbo iz libkab v libtdeabc
+Comment[sq]=Vegla për shëndrimin e libkab në libtdeabc.
+Comment[sr]=Алат за конверзију из libkab-а у libtdeabc.
+Comment[sr@Latn]=Alat za konverziju iz libkab-a u libtdeabc.
+Comment[ss]=Lithulusi lekutjintja le-libkab kuya ku-libtdeabc.
+Comment[sv]=Konverteringsverktyg från libkab till libtdeabc
+Comment[ta]=libkab இலிருந்து libtdeabc க்கு மாற்றும் கருவி.
+Comment[te]=libkab నుంచి libtdeabc కు మార్చు పనిముట్టు
+Comment[tg]=асбоби дигаргунсози libkab ба libtdeabc
+Comment[th]=เครื่องมือเปลี่ยน libkab เป็น libtdeabc
+Comment[tr]=libkab' tan libtdeabc' ye dönüştürme aracı
+Comment[tt]=libkab-›libtdeabc äyländerü qoralı.
+Comment[uk]=Засіб перетворення libkab до libtdeabc.
+Comment[uz]=libkab'ni libtdeabc'ga aylantiradigan vosita.
+Comment[uz@cyrillic]=libkab'ни libtdeabc'га айлантирадиган восита.
+Comment[ven]=Tshishumiswa tsha u shandukisa libkab itshi ya kha libtdeabc
+Comment[vi]=Công cụ chuyển đổi libkab sang libtdeabc.
+Comment[xh]=libkab kwi libtdeabc isixhobo sokuguqulela.
+Comment[zh_CN]=libkab 到 libtdeabc 的转换工具。
+Comment[zh_HK]=libkab 至 libtdeabc 的轉換工具
+Comment[zh_TW]=libkab 至 libtdeabc 轉換工具
+Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libtdeabc
Terminal=false
NoDisplay=true
X-TDE-autostart-condition=tdeab2tdeabcrc:Startup:EnableAutostart:true
diff --git a/tdeabc/tests/Makefile.am b/tdeabc/tests/Makefile.am
index aca0597ad..c881f30bf 100644
--- a/tdeabc/tests/Makefile.am
+++ b/tdeabc/tests/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_builddir)/tdeabc -I$(top_srcdir)/tdeabc -I$(top_srcdir)/kab \
-I$(srcdir)/../vcardparser/ -I$(srcdir)/../vcard/include \
-I$(srcdir)/../vcard/include/generated \
-I$(srcdir)/../vcardparser $(all_includes)
-LDADD = ../libkabc.la
+LDADD = ../libtdeabc.la
METASOURCES = AUTO
@@ -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) -ltdetexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testldapclient_SOURCES = testldapclient.cpp
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
- testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
+ testaddressee testaddresseelist testaddressfmt tdeabcargl testaddresslineedit
-testtdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testtdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testtdeabc_SOURCES = testkabc.cpp
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddressee_SOURCES = testaddressee.cpp
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddresseelist_SOURCES = testaddresseelist.cpp
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddressfmt_SOURCES = testaddressfmt.cpp
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testkabcdlg_SOURCES = testkabcdlg.cpp
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdistlist_SOURCES = testdistlist.cpp
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testaddresslineedit_SOURCES = testaddresslineedit.cpp
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+bigread_LDADD = ../libtdeabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
bigread_SOURCES = bigread.cpp
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+bigwrite_LDADD = ../libtdeabc.la $(top_builddir)/tdeabc/plugins/file/libtdeabc_file.la
bigwrite_SOURCES = bigwrite.cpp
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testdb_SOURCES = testdb.cpp
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabcargl_SOURCES = kabcargl.cpp
+tdeabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeabcargl_SOURCES = tdeabcargl.cpp
diff --git a/tdeabc/tests/bigread.cpp b/tdeabc/tests/bigread.cpp
index a2c9da070..3303f8645 100644
--- a/tdeabc/tests/bigread.cpp
+++ b/tdeabc/tests/bigread.cpp
@@ -24,7 +24,7 @@ int main(int argc,char **argv)
AddressBook ab;
- ResourceFile r( "my.kabc", "vcard2" );
+ ResourceFile r( "my.tdeabc", "vcard2" );
ab.addResource( &r );
#if 0
diff --git a/tdeabc/tests/bigwrite.cpp b/tdeabc/tests/bigwrite.cpp
index ab7fec7cf..61171a906 100644
--- a/tdeabc/tests/bigwrite.cpp
+++ b/tdeabc/tests/bigwrite.cpp
@@ -20,7 +20,7 @@ int main(int argc,char **argv)
TDEApplication app( false, false );
AddressBook ab;
- ResourceFile r( "my.kabc", "vcard" );
+ ResourceFile r( "my.tdeabc", "vcard" );
ab.addResource( &r );
for( int i = 0; i < 5000; ++i ) {
diff --git a/tdeabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
index d3a71890e..add322b75 100644
--- a/tdeabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ using namespace TDEABC;
int main(int argc,char **argv)
{
- TDEAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
+ TDEAboutData aboutData("tdeabcargl","Fix broken pre3.0rc3 format","0.1");
aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
TDECmdLineArgs::init(argc,argv,&aboutData);
diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index 7f3cf634b..f9d880753 100644
--- a/tdeabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Cornelius Schumacher
@@ -165,7 +165,7 @@ static const TDECmdLineOptions options[] =
int main(int argc,char **argv)
{
- TDEAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
+ TDEAboutData aboutData("testlock",I18N_NOOP("Test libtdeabc Lock"),"0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h
index 01d07fc47..62466b89a 100644
--- a/tdeabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Cornelius Schumacher
diff --git a/tdeabc/timezone.cpp b/tdeabc/timezone.cpp
index 7b773db63..04955d0dc 100644
--- a/tdeabc/timezone.cpp
+++ b/tdeabc/timezone.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/timezone.h b/tdeabc/timezone.h
index b53df7728..ad6508f86 100644
--- a/tdeabc/timezone.h
+++ b/tdeabc/timezone.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcard/Makefile.am b/tdeabc/vcard/Makefile.am
index e8a33c3a9..35b31f5ed 100644
--- a/tdeabc/vcard/Makefile.am
+++ b/tdeabc/vcard/Makefile.am
@@ -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) -ltdetexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testread_LDADD = libvcard.la
testread_SOURCES = testread.cpp
diff --git a/tdeabc/vcard21parser.cpp b/tdeabc/vcard21parser.cpp
index 46581b411..bae87fc75 100644
--- a/tdeabc/vcard21parser.cpp
+++ b/tdeabc/vcard21parser.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Mark Westcott
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcard21parser.h b/tdeabc/vcard21parser.h
index a743e65f3..c6c75a3c8 100644
--- a/tdeabc/vcard21parser.h
+++ b/tdeabc/vcard21parser.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Mark Westcott
Copyright (c) 2000 George Staikos
diff --git a/tdeabc/vcardconverter.cpp b/tdeabc/vcardconverter.cpp
index 2dff56aa2..1026fecc0 100644
--- a/tdeabc/vcardconverter.cpp
+++ b/tdeabc/vcardconverter.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardconverter.h b/tdeabc/vcardconverter.h
index 982c704d4..c8944ff1c 100644
--- a/tdeabc/vcardconverter.h
+++ b/tdeabc/vcardconverter.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2002 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardformat.cpp b/tdeabc/vcardformat.cpp
index b8bfaa6b6..c9156699c 100644
--- a/tdeabc/vcardformat.cpp
+++ b/tdeabc/vcardformat.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardformat.h b/tdeabc/vcardformat.h
index b5d6ff133..d7a9c1884 100644
--- a/tdeabc/vcardformat.h
+++ b/tdeabc/vcardformat.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
index e88ab3078..3a0883edc 100644
--- a/tdeabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
@@ -162,7 +162,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
break;
case EntityLabel:
- // not yet supported by kabc
+ // not yet supported by tdeabc
break;
case EntityMailer:
diff --git a/tdeabc/vcardformatimpl.h b/tdeabc/vcardformatimpl.h
index ddcd6fc07..a8ccf7749 100644
--- a/tdeabc/vcardformatimpl.h
+++ b/tdeabc/vcardformatimpl.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardformatplugin.cpp b/tdeabc/vcardformatplugin.cpp
index 83c4a8a7b..2adb7e139 100644
--- a/tdeabc/vcardformatplugin.cpp
+++ b/tdeabc/vcardformatplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardformatplugin.h b/tdeabc/vcardformatplugin.h
index c9cc4f351..e68d2bd9e 100644
--- a/tdeabc/vcardformatplugin.h
+++ b/tdeabc/vcardformatplugin.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2001 Cornelius Schumacher
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardparser/Makefile.am b/tdeabc/vcardparser/Makefile.am
index 20c6ed45d..556344efc 100644
--- a/tdeabc/vcardparser/Makefile.am
+++ b/tdeabc/vcardparser/Makefile.am
@@ -8,16 +8,16 @@ 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) -ltdetexteditor
-testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libtdeabc.la
testread_SOURCES = testread.cpp
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libtdeabc.la
testread2_SOURCES = testread2.cpp testutils.cpp
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libtdeabc.la
testwrite_SOURCES = testwrite.cpp
TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
diff --git a/tdeabc/vcardparser/testread.cpp b/tdeabc/vcardparser/testread.cpp
index 284526abd..0b87e6621 100644
--- a/tdeabc/vcardparser/testread.cpp
+++ b/tdeabc/vcardparser/testread.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/tdeabc/vcardparser/testwrite.cpp b/tdeabc/vcardparser/testwrite.cpp
index c7df6df08..c567c85da 100644
--- a/tdeabc/vcardparser/testwrite.cpp
+++ b/tdeabc/vcardparser/testwrite.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/tdeabc/vcardparser/vcard.cpp b/tdeabc/vcardparser/vcard.cpp
index f6841cbd9..e978767a9 100644
--- a/tdeabc/vcardparser/vcard.cpp
+++ b/tdeabc/vcardparser/vcard.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardparser/vcard.h b/tdeabc/vcardparser/vcard.h
index ad50b8657..9152edca1 100644
--- a/tdeabc/vcardparser/vcard.h
+++ b/tdeabc/vcardparser/vcard.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardparser/vcardline.cpp b/tdeabc/vcardparser/vcardline.cpp
index 22d7f7e52..94051293d 100644
--- a/tdeabc/vcardparser/vcardline.cpp
+++ b/tdeabc/vcardparser/vcardline.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardparser/vcardline.h b/tdeabc/vcardparser/vcardline.h
index 78ce2a411..7fc3ff429 100644
--- a/tdeabc/vcardparser/vcardline.h
+++ b/tdeabc/vcardparser/vcardline.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardparser/vcardparser.cpp b/tdeabc/vcardparser/vcardparser.cpp
index 3cc38f5c8..7ac07ce22 100644
--- a/tdeabc/vcardparser/vcardparser.cpp
+++ b/tdeabc/vcardparser/vcardparser.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardparser/vcardparser.h b/tdeabc/vcardparser/vcardparser.h
index fc17d116b..56e869503 100644
--- a/tdeabc/vcardparser/vcardparser.h
+++ b/tdeabc/vcardparser/vcardparser.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
index 2dd9752ac..366f53a87 100644
--- a/tdeabc/vcardtool.cpp
+++ b/tdeabc/vcardtool.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdeabc/vcardtool.h b/tdeabc/vcardtool.h
index 0d67605d6..50e8d4970 100644
--- a/tdeabc/vcardtool.h
+++ b/tdeabc/vcardtool.h
@@ -1,5 +1,5 @@
/*
- This file is part of libkabc.
+ This file is part of libtdeabc.
Copyright (c) 2003 Tobias Koenig
This library is free software; you can redistribute it and/or
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index 2af31ccd2..e190b83dd 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -5,8 +5,8 @@ kde_module_LTLIBRARIES = libtdecertpart.la
libtdecertpart_la_SOURCES = tdecertpart.cc
libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-libtdecertpart_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
-libtdecertpart_la_DEPENDENCIES = $(LIB_KPARTS)
+libtdecertpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
+libtdecertpart_la_DEPENDENCIES = $(LIB_TDEPARTS)
libtdecertpart_la_METASOURCES = AUTO
diff --git a/tdecert/tdecertpart.h b/tdecert/tdecertpart.h
index 032ff3001..45edb168c 100644
--- a/tdecert/tdecertpart.h
+++ b/tdecert/tdecertpart.h
@@ -17,8 +17,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#ifndef _INCLUDE_KCERTPART_H
-#define _INCLUDE_KCERTPART_H
+#ifndef _INCLUDE_TDECERTPART_H
+#define _INCLUDE_TDECERTPART_H
#ifdef HAVE_CONFIG_H
#include
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index c04ee4c6d..4e3603f4f 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -188,7 +188,7 @@ install-exec-hook:
DISTCLEANFILES = tde-config.cpp
-DOXYGEN_REFERENCES = dcop tdeui tdeparts kio
+DOXYGEN_REFERENCES = dcop tdeui tdeparts tdeio
DOXYGEN_EXCLUDE = malloc kde_file.h
DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 901aa3460..d503dfb6d 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -7,10 +7,10 @@
125 tdecore (TDEAccel)
126 tdecore (KURL)
-127 kio (KProtocolInfo)
+127 tdeio (KProtocolInfo)
128 tdecore (KRegExp)
129 tdecore (TDEAction)
-130 kio (KPasswdServer)
+130 tdeio (KPasswdServer)
131 tdecore (TDEAcceleratorManager)
150 tdecore (KLibLoader)
160 tdecore (KNotifyClient)
@@ -183,7 +183,7 @@
5601 kontact (interfaces)
5602 kontact (plugins)
5650 tderesources
-5700 kabc
+5700 tdeabc
5710 tdeabc/vcard
5720 kaddressbook
5800 libkcal
@@ -221,44 +221,44 @@
6210 tdehtml (editor)
# libtdeio
-7000 kio
-7001 kio (KDirWatch)
-7002 kio (Slave)
-7003 kio (KDirLister)
-7004 kio (KDirListerCache)
-7005 kio (Filter)
-7006 kio (Scheduler)
-7007 kio (TDEIOJob)
-7009 kio (KMimeType)
-7010 kio (KRun)
-7011 kio (KSycoca)
-7012 kio (KService*)
-7013 kio (KPing)
-7014 kio (TDETrader)
-7015 kio (KAutoMount)
-7016 kio (TDELauncher)
-7017 kio (KIOConnection)
-7018 kio (KMimeMagic)
-7019 kio (tdeioslave)
+7000 tdeio
+7001 tdeio (KDirWatch)
+7002 tdeio (Slave)
+7003 tdeio (KDirLister)
+7004 tdeio (KDirListerCache)
+7005 tdeio (Filter)
+7006 tdeio (Scheduler)
+7007 tdeio (TDEIOJob)
+7009 tdeio (KMimeType)
+7010 tdeio (KRun)
+7011 tdeio (KSycoca)
+7012 tdeio (KService*)
+7013 tdeio (KPing)
+7014 tdeio (TDETrader)
+7015 tdeio (KAutoMount)
+7016 tdeio (TDELauncher)
+7017 tdeio (KIOConnection)
+7018 tdeio (KMimeMagic)
+7019 tdeio (tdeioslave)
7020 kded
7021 tdebuildsycoca
7022 kurifilter
7023 kurifilter (plugins)
-7024 kio (UIServer)
+7024 tdeio (UIServer)
7025 kpac
-7026 kio (KShred)
-7027 kio (TCPSlaveBase)
-7028 kio (Observer)
+7026 tdeio (KShred)
+7027 tdeio (TCPSlaveBase)
+7028 tdeio (Observer)
7029 kssl
-7030 kio (KEMailSettings)
+7030 tdeio (KEMailSettings)
7031 KImageIO
-7032 kio (KURLCompletion)
+7032 tdeio (KURLCompletion)
7033 KFileMetaInfo
7034 KFileMetainfo (plugins)
7040 KZip
7041 KTar
7042 KAr
-7043 kio (bookmarks)
+7043 tdeio (bookmarks)
# 71xx are for tdeioslaves
7101 tdeio_file
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index ff96b020a..a824d5a37 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -70,7 +70,7 @@ class TDEInstance;
* - catastrophe
*
*
- * The events can be configured in an application using KNotifyDialog, which is part of KIO.
+ * The events can be configured in an application using KNotifyDialog, which is part of TDEIO.
*
* @author Charles Samuels
*/
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index 835566268..a001b5c06 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -19,7 +19,7 @@
// KSimpleDirWatch is a basic copy of KDirWatch
-// but with the KIO linking requirement removed
+// but with the TDEIO linking requirement removed
#include
#include
diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h
index 4dcae30b7..842a20dcf 100644
--- a/tdecore/ksimpledirwatch.h
+++ b/tdecore/ksimpledirwatch.h
@@ -30,7 +30,7 @@ class KSimpleDirWatchPrivate;
/**
* KSimpleDirWatch is a basic copy of KDirWatch
- * but with the KIO linking requirement removed
+ * but with the TDEIO linking requirement removed
*
* Watch directories and files for changes.
* The watched directories or files don't have to exist yet.
diff --git a/tdecore/ksimpledirwatch_p.h b/tdecore/ksimpledirwatch_p.h
index c295ac957..cf1288064 100644
--- a/tdecore/ksimpledirwatch_p.h
+++ b/tdecore/ksimpledirwatch_p.h
@@ -4,7 +4,7 @@
* because KSimpleDirWatchPrivate has signals and slots
*
* KSimpleDirWatch is a basic copy of KDirWatch
- * but with the KIO linking requirement removed
+ * but with the TDEIO linking requirement removed
*/
#ifndef _KSIMPLEDIRWATCH_P_H
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index 5e64d09b2..a8ab2323a 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -128,7 +128,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMapencodedData( "application/x-kio-metadata" );
+ TQByteArray ba = e->encodedData( "application/x-tdeio-metadata" );
if ( ba.size() )
{
TQString s = ba.data();
@@ -175,7 +175,7 @@ const char * KURLDrag::format( int i ) const
if ( i == 0 )
return "text/uri-list";
else if ( i == 1 )
- return "application/x-kio-metadata";
+ return "application/x-tdeio-metadata";
if ( d && d->m_exportAsText == false )
return 0;
if ( i == 2 )
@@ -230,7 +230,7 @@ TQByteArray KURLDrag::encodedData( const char* mime ) const
a.resize( s.length());
memcpy( a.data(), s.data(), s.length());
}
- else if ( mimetype == "application/x-kio-metadata" )
+ else if ( mimetype == "application/x-tdeio-metadata" )
{
if ( !m_metaData.isEmpty() )
{
diff --git a/tdecore/network/tdeiobuffer.h b/tdecore/network/tdeiobuffer.h
index 88b1db4e7..394af5b7b 100644
--- a/tdecore/network/tdeiobuffer.h
+++ b/tdecore/network/tdeiobuffer.h
@@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef KIOBUFFER_H
-#define KIOBUFFER_H
+#ifndef TDEIOBUFFER_H
+#define TDEIOBUFFER_H
#include
diff --git a/tdecore/network/tdemulticastsocket.h b/tdecore/network/tdemulticastsocket.h
index 15d3a28ea..09eeb01cd 100644
--- a/tdecore/network/tdemulticastsocket.h
+++ b/tdecore/network/tdemulticastsocket.h
@@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef KMULTICASTSOCKET_H
-#define KMULTICASTSOCKET_H
+#ifndef TDEMULTICASTSOCKET_H
+#define TDEMULTICASTSOCKET_H
#include "kdatagramsocket.h"
#include "tdemulticastsocketdevice.h"
diff --git a/tdecore/network/tdemulticastsocketdevice.h b/tdecore/network/tdemulticastsocketdevice.h
index bddb048a8..99511b356 100644
--- a/tdecore/network/tdemulticastsocketdevice.h
+++ b/tdecore/network/tdemulticastsocketdevice.h
@@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef KMULTICASTSOCKETDEVICE_H
-#define KMULTICASTSOCKETDEVICE_H
+#ifndef TDEMULTICASTSOCKETDEVICE_H
+#define TDEMULTICASTSOCKETDEVICE_H
#include "tdesocketdevice.h"
#include "knetworkinterface.h"
diff --git a/tdecore/tdeaboutdata.h b/tdecore/tdeaboutdata.h
index db76287f2..8b1480f84 100644
--- a/tdecore/tdeaboutdata.h
+++ b/tdecore/tdeaboutdata.h
@@ -24,8 +24,8 @@
#include
#include
-#ifndef _KABOUTDATA_H_
-#define _KABOUTDATA_H_
+#ifndef _TDEABOUTDATA_H_
+#define _TDEABOUTDATA_H_
class TDEAboutPersonPrivate;
class TDEAboutDataPrivate;
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 8b61102f4..2d205885c 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KACCEL_H
-#define _KACCEL_H
+#ifndef _TDEACCEL_H
+#define _TDEACCEL_H
#include
#include
@@ -387,4 +387,4 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
friend class TDEAccelPrivate;
};
-#endif // _KACCEL_H
+#endif // _TDEACCEL_H
diff --git a/tdecore/tdeaccelaction.h b/tdecore/tdeaccelaction.h
index e8232cc44..1c719541f 100644
--- a/tdecore/tdeaccelaction.h
+++ b/tdecore/tdeaccelaction.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KACCELACTION_H
-#define _KACCELACTION_H
+#ifndef _TDEACCELACTION_H
+#define _TDEACCELACTION_H
#include
#include
@@ -573,4 +573,4 @@ class TDECORE_EXPORT TDEAccelActions
friend class TDEAccelBase;
};
-#endif // _KACCELACTION_H
+#endif // _TDEACCELACTION_H
diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h
index 377589718..ecd0ce358 100644
--- a/tdecore/tdeaccelbase.h
+++ b/tdecore/tdeaccelbase.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KACCELBASE_H
-#define _KACCELBASE_H
+#ifndef _TDEACCELBASE_H
+#define _TDEACCELBASE_H
#include
#include
@@ -279,4 +279,4 @@ class TDECORE_EXPORT TDEAccelBase
friend class TDEAccelActions;
};
-#endif // _KACCELBASE_H
+#endif // _TDEACCELBASE_H
diff --git a/tdecore/tdeaccelmanager.h b/tdecore/tdeaccelmanager.h
index 03ee627b3..2ed90f5b5 100644
--- a/tdecore/tdeaccelmanager.h
+++ b/tdecore/tdeaccelmanager.h
@@ -18,8 +18,8 @@
*/
-#ifndef __K_ACCELMANAGER_H__
-#define __K_ACCELMANAGER_H__
+#ifndef __TDE_ACCELMANAGER_H__
+#define __TDE_ACCELMANAGER_H__
class TQWidget;
diff --git a/tdecore/tdeaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h
index ed401801e..d9227e8da 100644
--- a/tdecore/tdeaccelmanager_private.h
+++ b/tdecore/tdeaccelmanager_private.h
@@ -18,8 +18,8 @@
*/
-#ifndef __KACCELMANAGER_PRIVATE_H__
-#define __KACCELMANAGER_PRIVATE_H__
+#ifndef __TDEACCELMANAGER_PRIVATE_H__
+#define __TDEACCELMANAGER_PRIVATE_H__
#include
diff --git a/tdecore/tdeaccelprivate.h b/tdecore/tdeaccelprivate.h
index 0d967998d..c91e01f42 100644
--- a/tdecore/tdeaccelprivate.h
+++ b/tdecore/tdeaccelprivate.h
@@ -1,5 +1,5 @@
-#ifndef __KACCELPRIVATE_H
-#define __KACCELPRIVATE_H
+#ifndef __TDEACCELPRIVATE_H
+#define __TDEACCELPRIVATE_H
#include "kkeyserver_x11.h"
#include
@@ -50,4 +50,4 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject
};
-#endif // !__KACCELPRIVATE_H
+#endif // !__TDEACCELPRIVATE_H
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index f2f776a2f..a5dc3fcec 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KAPP_H
-#define _KAPP_H
+#ifndef _TDEAPP_H
+#define _TDEAPP_H
// Version macros. Never put this further down.
#include "tdeversion.h"
diff --git a/tdecore/tdecmdlineargs.h b/tdecore/tdecmdlineargs.h
index 9b7dc0f4f..8705b4d35 100644
--- a/tdecore/tdecmdlineargs.h
+++ b/tdecore/tdecmdlineargs.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KCMDLINEARGS_H_
-#define _KCMDLINEARGS_H_
+#ifndef _TDECMDLINEARGS_H_
+#define _TDECMDLINEARGS_H_
#include "tdelibs_export.h"
#include
diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h
index c2da06446..2ae0549de 100644
--- a/tdecore/tdeconfig.h
+++ b/tdecore/tdeconfig.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KCONFIG_H
-#define _KCONFIG_H
+#ifndef _TDECONFIG_H
+#define _TDECONFIG_H
class TQTimer;
diff --git a/tdecore/tdeconfig_compiler/Makefile.am b/tdecore/tdeconfig_compiler/Makefile.am
index d5141f102..ba622d6f0 100644
--- a/tdecore/tdeconfig_compiler/Makefile.am
+++ b/tdecore/tdeconfig_compiler/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
bin_PROGRAMS = tdeconfig_compiler
-tdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeconfig_compiler_LDADD = $(LIB_TDECORE)
tdeconfig_compiler_SOURCES = tdeconfig_compiler.cpp
diff --git a/tdecore/tdeconfig_compiler/example/Makefile.am b/tdecore/tdeconfig_compiler/example/Makefile.am
index 612788f6b..da7aecc9b 100644
--- a/tdecore/tdeconfig_compiler/example/Makefile.am
+++ b/tdecore/tdeconfig_compiler/example/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example # autoexample
EXTRA_PROGRAMS = autoexample
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
example_LDADD = $(LIB_TDECORE)
example_SOURCES = example.cpp exampleprefs_base.cpp
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
autoexample_LDADD = $(LIB_TDECORE) $(LIB_TDEUI)
autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \
autoexample.cpp
diff --git a/tdecore/tdeconfig_compiler/tests/Makefile.am b/tdecore/tdeconfig_compiler/tests/Makefile.am
index fa88f0b4b..e82db3536 100644
--- a/tdecore/tdeconfig_compiler/tests/Makefile.am
+++ b/tdecore/tdeconfig_compiler/tests/Makefile.am
@@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \
test_dpointer.cpp test_dpointer.h \
md5sums
-test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test1_LDADD = $(LIB_TDECORE)
test1_SOURCES = test1main.cpp test1.cpp
-test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test2_LDADD = $(LIB_TDECORE)
test2_SOURCES = test2main.cpp test2.cpp
-test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test3_LDADD = $(LIB_TDECORE)
test3_SOURCES = test3main.cpp test3.cpp
-test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test4_LDADD = $(LIB_TDECORE)
test4_SOURCES = test4main.cpp test4.cpp
-test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test5_LDADD = $(LIB_TDECORE)
test5_SOURCES = test5main.cpp test5.cpp
-test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test6_LDADD = $(LIB_TDECORE)
test6_SOURCES = test6main.cpp test6.cpp
-test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test7_LDADD = $(LIB_TDECORE)
test7_SOURCES = test7main.cpp test7.cpp
-test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test8_LDADD = $(LIB_TDECORE)
test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp
-test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test9_LDADD = $(LIB_TDECORE)
test9_SOURCES = test9main.cpp test9.cpp
-test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
test_dpointer_LDADD = $(LIB_TDECORE)
test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp
diff --git a/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
index e5bb3dcea..158d008a0 100644
--- a/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
+++ b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.cpp
@@ -21,8 +21,8 @@
using namespace KUnitTest;
-KUNITTEST_MODULE( tdeunittest_tdeconfigcompiler_test, "TDEConfigXT")
-KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
+TDEUNITTEST_MODULE( tdeunittest_tdeconfigcompiler_test, "TDEConfigXT")
+TDEUNITTEST_MODULE_REGISTER_TESTER( TDEConfigCompiler_Test )
typedef const char * CompilerTestSet[];
diff --git a/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
index df3f4cf37..bdebfe283 100644
--- a/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
+++ b/tdecore/tdeconfig_compiler/tests/tdeconfigcompiler_test.h
@@ -13,8 +13,8 @@
*************************************************************************
*/
-#ifndef KCONFIGCOMPILER_TEST_H
-#define KCONFIGCOMPILER_TEST_H
+#ifndef TDECONFIGCOMPILER_TEST_H
+#define TDECONFIGCOMPILER_TEST_H
#include
diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h
index 83c8047bc..c4149a69c 100644
--- a/tdecore/tdeconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KCONFIGBACKEND_H
-#define _KCONFIGBACKEND_H
+#ifndef _TDECONFIGBACKEND_H
+#define _TDECONFIGBACKEND_H
#include "tdeconfigdata.h"
#include
diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h
index a1ddbb4d3..a891409e7 100644
--- a/tdecore/tdeconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KCONFIGBASE_H
-#define _KCONFIGBASE_H
+#ifndef _TDECONFIGBASE_H
+#define _TDECONFIGBASE_H
#include
#include
diff --git a/tdecore/tdeconfigdata.h b/tdecore/tdeconfigdata.h
index f99f72c08..d5b8824d0 100644
--- a/tdecore/tdeconfigdata.h
+++ b/tdecore/tdeconfigdata.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KCONFIGDATA_H
-#define _KCONFIGDATA_H
+#ifndef _TDECONFIGDATA_H
+#define _TDECONFIGDATA_H
#include // generic red-black tree class
#include "tdelibs_export.h"
diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h
index 1b82e9eda..ecb3640ea 100644
--- a/tdecore/tdeconfigdialogmanager.h
+++ b/tdecore/tdeconfigdialogmanager.h
@@ -18,8 +18,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#ifndef KCONFIGDIALOGMANAGER_H
-#define KCONFIGDIALOGMANAGER_H
+#ifndef TDECONFIGDIALOGMANAGER_H
+#define TDECONFIGDIALOGMANAGER_H
#include
#include
@@ -232,5 +232,5 @@ private:
};
-#endif // KCONFIGDIALOGMANAGER_H
+#endif // TDECONFIGDIALOGMANAGER_H
diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index b260db1e8..825c74400 100644
--- a/tdecore/tdeconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _KCONFIGSKELETON_H
-#define _KCONFIGSKELETON_H
+#ifndef _TDECONFIGSKELETON_H
+#define _TDECONFIGSKELETON_H
#include
#include
diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
index a1a8114be..b5fddb834 100644
--- a/tdecore/tdeglobal.h
+++ b/tdecore/tdeglobal.h
@@ -15,8 +15,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef _KGLOBAL_H
-#define _KGLOBAL_H
+#ifndef _TDEGLOBAL_H
+#define _TDEGLOBAL_H
#include "tdelibs_export.h"
#include // KDE4: class TDEInstance is enough here
@@ -247,5 +247,5 @@ int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
* KDE environment.
*/
-#endif // _KGLOBAL_H
+#endif // _TDEGLOBAL_H
diff --git a/tdecore/tdeglobalsettings.h b/tdecore/tdeglobalsettings.h
index 0e11426d2..ec286d2e4 100644
--- a/tdecore/tdeglobalsettings.h
+++ b/tdecore/tdeglobalsettings.h
@@ -15,8 +15,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef _KGLOBALSETTINGS_H
-#define _KGLOBALSETTINGS_H
+#ifndef _TDEGLOBALSETTINGS_H
+#define _TDEGLOBALSETTINGS_H
#include
#include
diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp
index 3f12b4d5a..774bc091a 100644
--- a/tdecore/tdehw/tderootsystemdevice.cpp
+++ b/tdecore/tdehw/tderootsystemdevice.cpp
@@ -382,7 +382,7 @@ bool TDERootSystemDevice::canPowerOff() {
#else // WITH_CONSOLEKIT
// FIXME
// Can we power down this system?
- // This should probably be checked via DCOP and therefore interface with KDM
+ // This should probably be checked via DCOP and therefore interface with TDM
if (config->readBoolEntry( "offerShutdown", true )/* && DM().canShutdown()*/) { // FIXME
maysd = true;
}
@@ -424,7 +424,7 @@ bool TDERootSystemDevice::canReboot() {
#else // WITH_CONSOLEKIT
// FIXME
// Can we power down this system?
- // This should probably be checked via DCOP and therefore interface with KDM
+ // This should probably be checked via DCOP and therefore interface with TDM
if (config->readBoolEntry( "offerShutdown", true )/* && DM().canShutdown()*/) { // FIXME
mayrb = true;
}
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index e59837feb..7d2ab7db2 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KDELIBS_EXPORT_H
-#define _KDELIBS_EXPORT_H
+#ifndef _TDELIBS_EXPORT_H
+#define _TDELIBS_EXPORT_H
/* needed for KDE_EXPORT macros */
#include
@@ -36,10 +36,10 @@
#define TDEUI_EXPORT KDE_EXPORT
#define TDEFX_EXPORT KDE_EXPORT
#define TDEPRINT_EXPORT KDE_EXPORT
-#define KDNSSD_EXPORT KDE_EXPORT
+#define TDEDNSSD_EXPORT KDE_EXPORT
#define TDEIO_EXPORT KDE_EXPORT
#define DCOP_EXPORT KDE_EXPORT
-#define KPARTS_EXPORT KDE_EXPORT
+#define TDEPARTS_EXPORT KDE_EXPORT
#define KTEXTEDITOR_EXPORT KDE_EXPORT
#define KABC_EXPORT KDE_EXPORT
#define TDESU_EXPORT KDE_EXPORT
@@ -48,14 +48,14 @@
#define TDESTYLE_EXPORT KDE_EXPORT
#define TDEHTML_EXPORT KDE_EXPORT
#define KMDI_EXPORT KDE_EXPORT
-#define KUTILS_EXPORT KDE_EXPORT
+#define TDEUTILS_EXPORT KDE_EXPORT
#define KATEPARTINTERFACES_EXPORT KDE_EXPORT
#define KATEPART_EXPORT KDE_EXPORT
#define KMID_EXPORT KDE_EXPORT
#define TDERANDR_EXPORT KDE_EXPORT
-#define KIMPROXY_EXPORT KDE_EXPORT
+#define TDEIMPROXY_EXPORT KDE_EXPORT
#define KDE_ARTS_EXPORT KDE_EXPORT
-#define KUNITTEST_EXPORT KDE_EXPORT
+#define TDEUNITTEST_EXPORT KDE_EXPORT
#define KPATH_SEPARATOR ':'
@@ -65,7 +65,7 @@
#endif
-#endif /*_KDELIBS_EXPORT_H*/
+#endif /*_TDELIBS_EXPORT_H*/
/* workaround for tdecore: stupid moc's grammar doesn't accept two macros
between 'class' keyword and : */
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 4402dd183..f841d7375 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -137,7 +137,7 @@ void TDELocale::initMainCatalogues(const TQString & catalog)
d->catalogNames.append( mainCatalogue ); // application catalog
if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
d->catalogNames.append( SYSTEM_MESSAGES ); // always include tdelibs.mo
- d->catalogNames.append( "kio" ); // always include kio.mo
+ d->catalogNames.append( "tdeio" ); // always include tdeio.mo
d->catalogNames.append( "xdg-user-dirs" );
}
updateCatalogues(); // evaluate this for all languages
@@ -440,7 +440,7 @@ bool TDELocale::setLanguage(const TQStringList & languages)
// 1) some empty strings that we have to eliminate
// 2) duplicate entries like in de:fr:de, where we have to keep the first occurrance of a language in order
// to preserve the order of precenence of the user => iterate backwards
- // 3) languages into which the application is not translated. For those languages we should not even load tdelibs.mo or kio.po.
+ // 3) languages into which the application is not translated. For those languages we should not even load tdelibs.mo or tdeio.po.
// these langugage have to be dropped. Otherwise we get strange side effects, e.g. with Hebrew:
// the right/left switch for languages that write from
// right to left (like Hebrew or Arabic) is set in tdelibs.mo. If you only have tdelibs.mo
diff --git a/tdecore/tdelocale.h b/tdecore/tdelocale.h
index 94cf704f1..4bee48dde 100644
--- a/tdecore/tdelocale.h
+++ b/tdecore/tdelocale.h
@@ -19,8 +19,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef _KLOCALE_H
-#define _KLOCALE_H
+#ifndef _TDELOCALE_H
+#define _TDELOCALE_H
#include
#include
@@ -1188,7 +1188,7 @@ private:
void initFormat(TDEConfig *config);
/**
- * @internal Initializes the catalogs appname, tdelibs and kio for all chosen languages.
+ * @internal Initializes the catalogs appname, tdelibs and tdeio for all chosen languages.
*
* @param config The configuration object used for init
* @param useEnv True if we should use environment variables
diff --git a/tdecore/tdemultipledrag.h b/tdecore/tdemultipledrag.h
index 42baf3530..4b9a05e80 100644
--- a/tdecore/tdemultipledrag.h
+++ b/tdecore/tdemultipledrag.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KMULTIPLEDRAG_H
-#define KMULTIPLEDRAG_H
+#ifndef TDEMULTIPLEDRAG_H
+#define TDEMULTIPLEDRAG_H
#ifndef QT_NO_DRAGANDDROP
@@ -102,4 +102,4 @@ private:
#endif // QT_NO_DRAGANDDROP
-#endif // KMULTIPLEDRAG_H
+#endif // TDEMULTIPLEDRAG_H
diff --git a/tdecore/tdeshortcut.h b/tdecore/tdeshortcut.h
index e98a007b5..09f7fce05 100644
--- a/tdecore/tdeshortcut.h
+++ b/tdecore/tdeshortcut.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __KSHORTCUT_H
-#define __KSHORTCUT_H
+#ifndef __TDESHORTCUT_H
+#define __TDESHORTCUT_H
#include
#include
@@ -848,4 +848,4 @@ class TDECORE_EXPORT TDEShortcut
#endif
};
-#endif // __KSHORTCUT_H
+#endif // __TDESHORTCUT_H
diff --git a/tdecore/tdeshortcutlist.h b/tdecore/tdeshortcutlist.h
index 99e83766b..9c45b6d0e 100644
--- a/tdecore/tdeshortcutlist.h
+++ b/tdecore/tdeshortcutlist.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __KSHORTCUTLIST_H
-#define __KSHORTCUTLIST_H
+#ifndef __TDESHORTCUTLIST_H
+#define __TDESHORTCUTLIST_H
#include // For uint
#include
@@ -292,4 +292,4 @@ class TDECORE_EXPORT ShortcutList : public TDEShortcutList
};
}
-#endif // __KSHORTCUTLIST_H
+#endif // __TDESHORTCUTLIST_H
diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h
index a62757316..ece721942 100644
--- a/tdecore/tdeshortcutmenu.h
+++ b/tdecore/tdeshortcutmenu.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __KSHORTCUTMENU_H
-#define __KSHORTCUTMENU_H
+#ifndef __TDESHORTCUTMENU_H
+#define __TDESHORTCUTMENU_H
#include
#include
@@ -58,4 +58,4 @@ class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu
IndexToKKeySequence m_seqs;
};
-#endif // __KSHORTCUTMENU_H
+#endif // __TDESHORTCUTMENU_H
diff --git a/tdecore/tdestartupinfo.h b/tdecore/tdestartupinfo.h
index 3f8310f6b..9fa57cd4b 100644
--- a/tdecore/tdestartupinfo.h
+++ b/tdecore/tdestartupinfo.h
@@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE.
****************************************************************************/
-#ifndef __KSTARTUPINFO_H
-#define __KSTARTUPINFO_H
+#ifndef __TDESTARTUPINFO_H
+#define __TDESTARTUPINFO_H
#include
#include
diff --git a/tdecore/tdestdaccel.h b/tdecore/tdestdaccel.h
index 3914794f6..e39b090b9 100644
--- a/tdecore/tdestdaccel.h
+++ b/tdecore/tdestdaccel.h
@@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef KSTDACCEL_H
-#define KSTDACCEL_H
+#ifndef TDESTDACCEL_H
+#define TDESTDACCEL_H
#include
#include
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index 8f5ede967..a11175117 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -82,7 +82,7 @@ public:
int KSycoca::version()
{
- return KSYCOCA_VERSION;
+ return TDESYCOCA_VERSION;
}
// Read-only constructor
@@ -181,7 +181,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
buffer->setBuffer(TQByteArray());
buffer->open(IO_ReadWrite);
m_str = new TQDataStream( buffer);
- (*m_str) << (TQ_INT32) KSYCOCA_VERSION;
+ (*m_str) << (TQ_INT32) TDESYCOCA_VERSION;
(*m_str) << (TQ_INT32) 0;
}
else
@@ -309,9 +309,9 @@ bool KSycoca::checkVersion(bool abortOnError)
m_str->device()->at(0);
TQ_INT32 aVersion;
(*m_str) >> aVersion;
- if ( aVersion < KSYCOCA_VERSION )
+ if ( aVersion < TDESYCOCA_VERSION )
{
- kdWarning(7011) << "Found version " << aVersion << ", expecting version " << KSYCOCA_VERSION << " or higher." << endl;
+ kdWarning(7011) << "Found version " << aVersion << ", expecting version " << TDESYCOCA_VERSION << " or higher." << endl;
if (!abortOnError) return false;
kdError(7011) << "Outdated database ! Stop kded and restart it !" << endl;
abort();
diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h
index 4b43d4607..f8e2274e0 100644
--- a/tdecore/tdesycoca.h
+++ b/tdecore/tdesycoca.h
@@ -35,7 +35,7 @@ class KSycocaFactoryList;
* If the existing file is outdated, it will not get read
* but instead we'll ask kded to regenerate a new one...
*/
-#define KSYCOCA_VERSION 94
+#define TDESYCOCA_VERSION 94
/**
* @internal
diff --git a/tdecore/tdetempfile.h b/tdecore/tdetempfile.h
index abc78ffbf..d9a71385c 100644
--- a/tdecore/tdetempfile.h
+++ b/tdecore/tdetempfile.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KTEMPFILE_H_
-#define _KTEMPFILE_H_
+#ifndef _TDETEMPFILE_H_
+#define _TDETEMPFILE_H_
#include
#include
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index a831eb65c..73e06f588 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -82,5 +82,5 @@ ktimezonestest_SOURCES = ktimezonestest.cpp
check_LTLIBRARIES = tdeunittest_tdeconfig.la
tdeunittest_tdeconfig_la_SOURCES = tdeconfigtest.cpp
-tdeunittest_tdeconfig_la_LIBADD = $(LIB_KUNITTEST)
+tdeunittest_tdeconfig_la_LIBADD = $(LIB_TDEUNITTEST)
tdeunittest_tdeconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
diff --git a/tdecore/tests/tdeconfigtest.cpp b/tdecore/tests/tdeconfigtest.cpp
index d9c89d6d4..a6ef7aa5b 100644
--- a/tdecore/tests/tdeconfigtest.cpp
+++ b/tdecore/tests/tdeconfigtest.cpp
@@ -31,8 +31,8 @@ private:
void revertEntries();
};
-KUNITTEST_MODULE( tdeunittest_tdeconfig, "TDEConfigTest" )
-KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
+TDEUNITTEST_MODULE( tdeunittest_tdeconfig, "TDEConfigTest" )
+TDEUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest )
// test data
#define BOOLENTRY1 true
diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h
index 4aa50cb5f..a7cfd1356 100644
--- a/tdecore/tests/tdeconfigtestgui.h
+++ b/tdecore/tests/tdeconfigtestgui.h
@@ -16,8 +16,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef _KCONFIG_TEST_H
-#define _KCONFIG_TEST_H
+#ifndef _TDECONFIG_TEST_H
+#define _TDECONFIG_TEST_H
#include
#include
diff --git a/tdehtml/Mainpage.dox b/tdehtml/Mainpage.dox
index 5de4d53a2..a3b96325a 100644
--- a/tdehtml/Mainpage.dox
+++ b/tdehtml/Mainpage.dox
@@ -40,7 +40,7 @@ Maksim Orlovich
@lgpl
*/
-// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
+// DOXYGEN_REFERENCES = tdecore tdeui tdeio tdeparts kjs
// DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test
// DOXYGEN_SET_PROJECT_NAME = TDEHTML
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 2143fd90a..fc8b80e16 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -53,7 +53,7 @@ libtdehtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libra
libtdehtml_la_LIBADD = ./xml/libtdehtmlxml.la ./html/libtdehtmlhtml.la \
./rendering/libtdehtmlrender.la ./css/libtdehtmlcss.la \
./misc/libtdehtmlmisc.la ecma/libkjs_html.la ./dom/libtdehtmldom.la $(LIBKJAVA) \
- $(LIB_KPARTS) \
+ $(LIB_TDEPARTS) \
$(LIBTHAI) \
$(top_builddir)/tdeprint/libtdeprint.la \
$(top_builddir)/tdeutils/libtdeutils.la \
@@ -124,7 +124,7 @@ testtdehtml_static_LDFLAGS = -static
testregression_SOURCES = test_regression.cpp test_regression_fontoverload.cpp
testregression_LDADD = libtdehtml.la
-DOXYGEN_REFERENCES = tdecore tdeui kio tdefx tdeparts
+DOXYGEN_REFERENCES = tdecore tdeui tdeio tdefx tdeparts
DOXYGEN_EXCLUDE = test*.* css ecma html java tdemultipart misc pics rendering test xml
include ../admin/Doxyfile.am
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index 38c0b3ed1..ed4db15b2 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -377,7 +377,7 @@ void XMLHttpRequest::send(const TQString& _body)
TQString key = i.key();
TQString value = i.data();
if (key == "accept") {
- // The HTTP KIO slave supports an override this way
+ // The HTTP TDEIO slave supports an override this way
job->addMetaData("accept", value);
} else {
if (i != begin)
diff --git a/tdehtml/java/Makefile.am b/tdehtml/java/Makefile.am
index 2ae3cec13..c1dd3136f 100644
--- a/tdehtml/java/Makefile.am
+++ b/tdehtml/java/Makefile.am
@@ -12,7 +12,7 @@ noinst_HEADERS = kjavaappletwidget.h kqeventutil.h kxeventutil.h \
METASOURCES = AUTO
libkjava_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
-libkjava_la_LIBADD = $(LIB_KPARTS)
+libkjava_la_LIBADD = $(LIB_TDEPARTS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tdehtml \
-I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl \
@@ -32,6 +32,6 @@ kjavaappletviewer_la_SOURCES= kjavaapplet.cpp kjavaappletcontext.cpp \
kjavadownloader.cpp kjavaappletviewer.cpp
kjavaappletviewer_la_LDFLAGS= $(all_libraries) -module $(KDE_PLUGIN)
-kjavaappletviewer_la_LIBADD= $(LIB_KPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
+kjavaappletviewer_la_LIBADD= $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEFILE) $(top_builddir)/dcop/libDCOP.la
kde_services_DATA= kjavaappletviewer.desktop
diff --git a/tdehtml/java/TODO b/tdehtml/java/TODO
index 3d707c898..4107c6726 100644
--- a/tdehtml/java/TODO
+++ b/tdehtml/java/TODO
@@ -19,4 +19,4 @@ both versions.
- Better support for Java 2
- Use a factory to create the classloader and security managers
- Use URLClassLoader- this is done
-- Support for KIO URLs
+- Support for TDEIO URLs
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 952fe143b..23e805577 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -484,7 +484,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
contextID += qb[ index++ ];
}
bool ok;
- const int ID_num = contextID.toInt( &ok ); // context id or kio job id
+ const int ID_num = contextID.toInt( &ok ); // context id or tdeio job id
/*if (d->locked_context > -1 &&
ID_num != d->locked_context &&
(cmd_code == KJAS_JAVASCRIPT_EVENT ||
@@ -500,7 +500,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
++index; //skip the sep
if (cmd_code == KJAS_PUT_DATA) {
- // rest of the data is for kio put
+ // rest of the data is for tdeio put
if (ok) {
TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
if (ok && it != d->kiojobs.end()) {
@@ -568,9 +568,9 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
TDEIOJobMap::iterator it = d->kiojobs.find( ID_num );
if (ok && it != d->kiojobs.end())
it.data()->jobCommand( cmd );
- kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl;
+ kdDebug(6100) << "TDEIO Data command: " << ID_num << " " << args.first() << endl;
} else
- kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
+ kdError(6100) << "TDEIO Data command error " << ok << " args:" << args.size() << endl;
return;
case KJAS_JAVASCRIPT_EVENT:
cmd = TQString::fromLatin1( "JS_Event" );
diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index 22690824c..4e3b893e8 100644
--- a/tdehtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
@@ -25,7 +25,7 @@
#include
/**
- * @short A class for handling downloads from KIO
+ * @short A class for handling downloads from TDEIO
*
* This class handles a TDEIO::get job and passes the data
* back to the AppletServer.
diff --git a/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
index f8b50a91d..52e60ddc0 100644
--- a/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASProtocolHandler.java
@@ -238,7 +238,7 @@ public class KJASProtocolHandler
String id = getArg( command );
String code = getArg( command );
- Main.debug( "KIO URLData received(" + id + ") code:" + code );
+ Main.debug( "TDEIO URLData received(" + id + ") code:" + code );
//rest of the command should be the data...
byte[] data = null;
diff --git a/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
index 58c5ff518..e814fbea7 100644
--- a/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
+++ b/tdehtml/java/org/kde/kjas/server/KJASURLStreamHandlerFactory.java
@@ -50,7 +50,7 @@ class KIOConnection
static void setData(String jobid, int code, byte [] data) {
KIOConnection job = (KIOConnection) jobs.get(jobid);
if (job == null || !job.setData(code, data))
- Main.info("KIO KJASHttpURLConnection gone (timedout/closed)");
+ Main.info("TDEIO KJASHttpURLConnection gone (timedout/closed)");
else
Thread.yield();
}
@@ -119,11 +119,11 @@ class KIOConnection
protected URL url;
protected int connect_status = 0;
- protected String jobid = null; // connection id with KIO
+ protected String jobid = null; // connection id with TDEIO
protected LinkedList data = new LinkedList(); // not thread safe
protected int errorcode = 0;
protected boolean finished = false; // all data has arived
- protected boolean onhold = false; // KIO job is suspended
+ protected boolean onhold = false; // TDEIO job is suspended
protected boolean request_data = false; // need data for put job
private KJASOutputStream out = null;
private KJASInputStream in = null;
@@ -156,12 +156,12 @@ class KIOConnection
finished = true;
onhold = false;
jobs.remove(jobid);
- Main.debug ("KIO FINISHED (" + jobid + ") " + data.size());
+ Main.debug ("TDEIO FINISHED (" + jobid + ") " + data.size());
break;
case DATA:
if (d.length > 0)
data.addLast(d);
- // Main.debug ("KIO DATA (" + jobid + ") " + data.size());
+ // Main.debug ("TDEIO DATA (" + jobid + ") " + data.size());
if (!onhold && data.size() > HIGH_BUFFER_LIMIT) {
Main.protocol.sendDataCmd(jobid, HOLD);
onhold = true;
@@ -170,15 +170,15 @@ class KIOConnection
case ERRORCODE:
String codestr = new String(d);
errorcode = Integer.parseInt(codestr);
- Main.debug ("KIO ERRORECODE(" + jobid + ") " + errorcode);
+ Main.debug ("TDEIO ERRORECODE(" + jobid + ") " + errorcode);
break;
case CONNECT:
- Main.debug ("KIO CONNECT(" + jobid + ") ");
+ Main.debug ("TDEIO CONNECT(" + jobid + ") ");
request_data = true;
errorcode = 0;
break;
case REQUESTDATA:
- Main.debug ("KIO REQUESTDATA(" + jobid + ") ");
+ Main.debug ("TDEIO REQUESTDATA(" + jobid + ") ");
request_data = true;
break;
}
@@ -234,7 +234,7 @@ class KIOConnection
return total;
}
synchronized private void sendData(byte [] d, boolean force) throws IOException {
- Main.debug ("KIO sendData(" + jobid + ") force:" + force + " request_data:" + request_data);
+ Main.debug ("TDEIO sendData(" + jobid + ") force:" + force + " request_data:" + request_data);
if (d != null)
data.addLast(d);
if (!request_data && !force) return;
@@ -246,7 +246,7 @@ class KIOConnection
return;
}
if (!request_data) {
- Main.debug ("KIO sendData(" + jobid + ") timeout");
+ Main.debug ("TDEIO sendData(" + jobid + ") timeout");
data.clear();
disconnect();
throw new IOException("timeout");
@@ -273,7 +273,7 @@ class KIOConnection
if (connect_status == CONNECTED)
return; // javadocs: call is ignored
//(new Exception()).printStackTrace();
- Main.debug ("KIO connect " + url);
+ Main.debug ("TDEIO connect " + url);
errorcode = 0;
finished = in_eof = false;
jobid = String.valueOf(id++);
@@ -294,7 +294,7 @@ class KIOConnection
in = new KJASInputStream();
else
out = new KJASOutputStream();
- Main.debug ("KIO connect(" + jobid + ") " + url);
+ Main.debug ("TDEIO connect(" + jobid + ") " + url);
return;
}
connect_status = NOT_CONNECTED;
@@ -302,16 +302,16 @@ class KIOConnection
if (isconnected) {
if (!finished)
Main.protocol.sendDataCmd(jobid, STOP);
- Main.debug ("KIO connect error " + url);
+ Main.debug ("TDEIO connect error " + url);
throw new ConnectException("connection failed (not found)");
}
- Main.debug ("KIO connect timeout " + url);
+ Main.debug ("TDEIO connect timeout " + url);
throw new IOException("connection failed (timeout)");
}
synchronized void disconnect() {
if (connect_status == NOT_CONNECTED)
return;
- Main.debug ("KIO disconnect " + jobid);
+ Main.debug ("TDEIO disconnect " + jobid);
//(new Exception()).printStackTrace();
if (out != null) {
try {
@@ -328,11 +328,11 @@ class KIOConnection
notifyAll();
}
InputStream getInputStream() throws IOException {
- Main.debug ("KIO getInputStream(" + jobid + ") " + url);
+ Main.debug ("TDEIO getInputStream(" + jobid + ") " + url);
return in;
}
OutputStream getOutputStream() throws IOException {
- Main.debug ("KIO getOutputStream(" + jobid + ") " + url);
+ Main.debug ("TDEIO getOutputStream(" + jobid + ") " + url);
return out;
}
}
@@ -367,7 +367,7 @@ final class KIOHttpConnection extends KIOConnection
};
headers.add(entry);
headersmap.put(entry[0], entry[1]);
- // Main.debug ("KIO header " + entry[0] + "=" + entry[1]);
+ // Main.debug ("TDEIO header " + entry[0] + "=" + entry[1]);
}
responseCode = 0;
if (headersmap.size() > 0) {
@@ -379,7 +379,7 @@ final class KIOHttpConnection extends KIOConnection
if (epos < 0) break;
responseCode = Integer.parseInt(token.substring(spos+1, epos));
responseMessage = token.substring(epos+1);
- Main.debug ("KIO responsecode=" + responseCode);
+ Main.debug ("TDEIO responsecode=" + responseCode);
}
break;
}
@@ -408,7 +408,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
} catch (IOException e) {
Main.debug ("Error on implicit connect()");
}
- Main.debug ("KIO getHeaderFields");
+ Main.debug ("TDEIO getHeaderFields");
return kioconnection.headersmap;
}
public String getHeaderField(String name) {
@@ -418,7 +418,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
Main.debug ("Error on implicit connect()");
}
String field = (String) kioconnection.headersmap.get(name);
- Main.debug ("KIO getHeaderField:" + name + "=" + field);
+ Main.debug ("TDEIO getHeaderField:" + name + "=" + field);
//(new Exception()).printStackTrace();
return field;
}
@@ -428,14 +428,14 @@ final class KJASHttpURLConnection extends HttpURLConnection
} catch (IOException e) {
Main.debug ("Error on implicit connect()");
}
- Main.debug ("KIO getHeaderField(" + n + ") size=" + kioconnection.headersmap.size());
+ Main.debug ("TDEIO getHeaderField(" + n + ") size=" + kioconnection.headersmap.size());
if (n >= kioconnection.headersmap.size())
return null;
String [] entry = (String []) kioconnection.headers.get(n);
String line = entry[0];
if (entry[1].length() > 0)
line += ":" + entry[1];
- Main.debug ("KIO getHeaderField(" + n + ")=#" + line + "#");
+ Main.debug ("TDEIO getHeaderField(" + n + ")=#" + line + "#");
return line;
}
public String getHeaderFieldKey(int n) {
@@ -444,13 +444,13 @@ final class KJASHttpURLConnection extends HttpURLConnection
} catch (IOException e) {
Main.debug ("Error on implicit connect()");
}
- Main.debug ("KIO getHeaderFieldKey " + n);
+ Main.debug ("TDEIO getHeaderFieldKey " + n);
if (n >= kioconnection.headersmap.size())
return null;
return ((String []) kioconnection.headers.get(n))[0];
}
public int getResponseCode() throws IOException {
- Main.debug ("KIO getResponseCode");
+ Main.debug ("TDEIO getResponseCode");
if (kioconnection.responseCode == -1) {
try {
connect();
@@ -468,7 +468,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
public void connect() throws IOException {
if (connected)
return;
- Main.debug ("KIO KJASHttpURLConnection.connect " + url);
+ Main.debug ("TDEIO KJASHttpURLConnection.connect " + url);
SecurityManager security = System.getSecurityManager();
if (security != null)
security.checkPermission(getPermission());
@@ -494,7 +494,7 @@ final class KJASHttpURLConnection extends HttpURLConnection
return kioconnection.getOutputStream();
}
public InputStream getErrorStream() {
- Main.debug("KIO KJASHttpURLConnection.getErrorStream" + url);
+ Main.debug("TDEIO KJASHttpURLConnection.getErrorStream" + url);
try {
if (connected && kioconnection.responseCode == 404)
return kioconnection.getInputStream();
@@ -524,7 +524,7 @@ final class KJASSimpleURLConnection extends URLConnection
public void connect() throws IOException {
if (kioconnection != null)
return;
- Main.debug ("KIO KJASSimpleURLConnection.connection " + url);
+ Main.debug ("TDEIO KJASSimpleURLConnection.connection " + url);
SecurityManager security = System.getSecurityManager();
if (security != null)
security.checkPermission(getPermission());
@@ -593,7 +593,7 @@ public final class KJASURLStreamHandlerFactory
if (protocol.equals("jar") || protocol.equals("file"))
return null;
//outputs to early: Main.debug ("createURLStreamHandler " + protocol);
- Main.debug ("KIO createURLStreamHandler " + protocol);
+ Main.debug ("TDEIO createURLStreamHandler " + protocol);
if (protocol.equals("http"))
return new KJASHttpURLStreamHandler(80);
else if (protocol.equals("https"))
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index f885ec33e..c60c13a98 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -80,7 +80,7 @@ namespace tdehtml
* A cached object. Classes who want to use this object should derive
* from CachedObjectClient, to get the function calls in case the requested data has arrived.
*
- * This class also does the actual communication with kio and loads the file.
+ * This class also does the actual communication with tdeio and loads the file.
*/
class CachedObject
{
diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index 4865f9eac..f648bd548 100644
--- a/tdehtml/tdehtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -29,7 +29,7 @@ class TDEHTMLPageCachePrivate;
/**
* Singleton Object that handles a binary cache on top of
- * the http cache management of kio.
+ * the http cache management of tdeio.
*
* A limited number of HTML pages are stored in this cache. This
* cache is used for the history and operations like "view source".
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index dd0238aad..7c70a3c99 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -580,7 +580,7 @@ bool TDEHTMLPart::openURL( const KURL &url )
/**
* The format of the error url is that two variables are passed in the query:
- * error = int kio error code, errText = TQString error text from kio
+ * error = int tdeio error code, errText = TQString error text from tdeio
* and the URL where the error happened is passed as a sub URL.
*/
KURL::List urls = KURL::split( url );
@@ -1576,7 +1576,7 @@ void TDEHTMLPart::slotData( TDEIO::Job* tdeio_job, const TQByteArray &data )
{
//kdDebug( 6050 ) << "begin!" << endl;
- // We must suspend KIO while we're inside begin() because it can cause
+ // We must suspend TDEIO while we're inside begin() because it can cause
// crashes if a window (such as kjsdebugger) goes back into the event loop,
// more data arrives, and begin() gets called again (re-entered).
d->m_job->suspend();
@@ -1827,7 +1827,7 @@ void TDEHTMLPart::slotFinished( TDEIO::Job * job )
// The following catches errors that occur as a result of HTTP
// to FTP redirections where the FTP URL is a directory. Since
- // KIO cannot change a redirection request from GET to LISTDIR,
+ // TDEIO cannot change a redirection request from GET to LISTDIR,
// we have to take care of it here once we know for sure it is
// a directory...
if (job->error() == TDEIO::ERR_IS_DIRECTORY)
@@ -2460,7 +2460,7 @@ void TDEHTMLPart::slotRedirect()
void TDEHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url)
{
// the slave told us that we got redirected
- //kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
+ //kdDebug( 6050 ) << "redirection by TDEIO to " << url.url() << endl;
emit d->m_extension->setLocationBarURL( url.prettyURL() );
d->m_workingURL = url;
}
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 38a54e18a..39d8baebd 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -270,7 +270,7 @@ public:
/**
* Called when a certain error situation (i.e. connection timed out) occurred.
- * The default implementation either shows a KIO error dialog or loads a more
+ * The default implementation either shows a TDEIO error dialog or loads a more
* verbose error description a as page, depending on the users configuration.
* @p job is the job that signaled the error situation
*/
@@ -1118,8 +1118,8 @@ protected:
/**
* presents a detailed error message to the user.
- * @p errorCode kio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
- * @p text kio additional information text.
+ * @p errorCode tdeio error code, eg TDEIO::ERR_SERVER_TIMEOUT.
+ * @p text tdeio additional information text.
* @p url the url that triggered the error.
*/
void htmlError( int errorCode, const TQString& text, const KURL& reqUrl );
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index 499616cce..b04caa7d1 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -47,7 +47,7 @@ TDEHTMLRun::TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KUR
void TDEHTMLRun::foundMimeType( const TQString &_type )
{
Q_ASSERT(!m_bFinished);
- TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
+ TQString mimeType = _type; // this ref comes from the job, we lose it when using TDEIO again
if ( static_cast(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) )
m_bFinished = true;
else {
diff --git a/tdehtml/tdemultipart/Makefile.am b/tdehtml/tdemultipart/Makefile.am
index ae33efd01..440323119 100644
--- a/tdehtml/tdemultipart/Makefile.am
+++ b/tdehtml/tdemultipart/Makefile.am
@@ -5,8 +5,8 @@ INCLUDES = -I$(top_srcdir)/tdehtml -I$(top_srcdir)/tdeio/httpfilter -I$(top_srcd
kde_module_LTLIBRARIES = libtdemultipart.la
libtdemultipart_la_SOURCES = tdemultipart.cpp
-libtdemultipart_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
-libtdemultipart_la_DEPENDENCIES = $(LIB_KPARTS)
+libtdemultipart_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIBZ)
+libtdemultipart_la_DEPENDENCIES = $(LIB_TDEPARTS)
libtdemultipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
# Automatically generate moc files
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index 201f1ef60..15970bbaa 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -189,7 +189,7 @@ void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
if (m_boundary.isNull())
{
TQString tmp = job->queryMetaData("media-boundary");
- kdDebug() << "Got Boundary from kio-http '" << tmp << "'" << endl;
+ kdDebug() << "Got Boundary from tdeio-http '" << tmp << "'" << endl;
if ( !tmp.isEmpty() ) {
if (tmp.startsWith("--"))
m_boundary = tmp.latin1();
diff --git a/tdeinit/Makefile.am b/tdeinit/Makefile.am
index 85381ccd4..9f5914b90 100644
--- a/tdeinit/Makefile.am
+++ b/tdeinit/Makefile.am
@@ -33,12 +33,12 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
-tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT)
+tdeinit_LDADD = $(LIB_TDEPARTS) -lXft $(LIB_QT)
tdeioslave_SOURCES = tdeioslave.cpp
tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
-tdeioslave_LDADD = $(LIB_KIO)
+tdeioslave_LDADD = $(LIB_TDEIO)
tdeinit_wrapper_SOURCES = wrapper.c
tdeinit_wrapper_LDADD = $(LIBSOCKET)
@@ -56,7 +56,7 @@ kwrapper_SOURCES = kwrapper.c
kwrapper_LDADD = $(LIBSOCKET)
tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-tdelauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+tdelauncher_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
tdestartupconfig_SOURCES = tdestartupconfig.cpp
diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
index ca0d1dcaf..3850b10d5 100644
--- a/tdeinit/tdeinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
extern "C" KParts::Plugin* _tdeinit_init_tdeparts() { return new KParts::Plugin(); }
/* These are to link libtdeio even if 'smart' linker is used */
#include
-extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_tdeio() { return new TDEIO::AuthInfo(); }
/*
* Close fd's which are only useful for the parent process.
diff --git a/tdeinit/tdeioslave.cpp b/tdeinit/tdeioslave.cpp
index 1690ca2f7..d62b02591 100644
--- a/tdeinit/tdeioslave.cpp
+++ b/tdeinit/tdeioslave.cpp
@@ -49,7 +49,7 @@
/* These are to link libtdeio even if 'smart' linker is used */
#include
-extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_tdeio() { return new TDEIO::AuthInfo(); }
int main(int argc, char **argv)
{
diff --git a/tdeinit/tdelauncher.h b/tdeinit/tdelauncher.h
index 791958980..1802cd6ba 100644
--- a/tdeinit/tdelauncher.h
+++ b/tdeinit/tdelauncher.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KLAUNCHER_H_
-#define _KLAUNCHER_H_
+#ifndef _TDELAUNCHER_H_
+#define _TDELAUNCHER_H_
#include
#include
diff --git a/tdeinit/tdelauncher_cmds.h b/tdeinit/tdelauncher_cmds.h
index 5763e5a38..dc28c6fff 100644
--- a/tdeinit/tdelauncher_cmds.h
+++ b/tdeinit/tdelauncher_cmds.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _KLAUNCHER_CMDS_H_
-#define _KLAUNCHER_CMDS_H_
+#ifndef _TDELAUNCHER_CMDS_H_
+#define _TDELAUNCHER_CMDS_H_
typedef struct
{
diff --git a/tdeinit/tests/Makefile.am b/tdeinit/tests/Makefile.am
index e1157bf72..bf82495b2 100644
--- a/tdeinit/tests/Makefile.am
+++ b/tdeinit/tests/Makefile.am
@@ -6,5 +6,5 @@ INCLUDES= -I$(srcdir)/../.. $(all_includes)
check_PROGRAMS = tdelaunchertest
tdelaunchertest_SOURCES = tdelaunchertest.cpp
-tdelaunchertest_LDADD = $(LIB_KIO)
+tdelaunchertest_LDADD = $(LIB_TDEIO)
diff --git a/tdeio/DESIGN b/tdeio/DESIGN
index 22307c5c0..a6f58c838 100644
--- a/tdeio/DESIGN
+++ b/tdeio/DESIGN
@@ -171,7 +171,7 @@ A. progress handling
---------------------
There will be two ways how the application can display progress :
-1. regular apps will use NetAccess for all kio operations and will not care
+1. regular apps will use NetAccess for all tdeio operations and will not care
about progress handling :
- NetAccess creates Job
- NetAccess creates JobObserver that will connect to the Job's signals and
diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox
index 7cb127838..057833148 100644
--- a/tdeio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
@@ -82,7 +82,7 @@
* KDirOperator:
* The class encapsulating different KFileViews, offering file browsing and
* file selection. Asynchronous, network transparent reading of directories
- * is performed via the KIO library.
+ * is performed via the TDEIO library.
*
* KURLRequester:
* A widget to be used for asking for a filename/path/URL. It consists of a
diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 6931e9842..3ce6d572c 100644
--- a/tdeio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
@@ -44,7 +44,7 @@
* My own bookmarks
* KOffice Web Site
*
- * KDevelop Web Site
+ * KDevelop Web Site
*
*
*
diff --git a/tdeio/data.protocol b/tdeio/data.protocol
index 1982efe80..13bc0522b 100644
--- a/tdeio/data.protocol
+++ b/tdeio/data.protocol
@@ -36,7 +36,7 @@ Description[kk]=URI деректерді өңдеу tdeioslave модулі (rfc
Description[km]=tdeioslave មួយសម្រាប់ទិន្នន័យ URIs (rfc2397)
Description[lb]=E tdeioslave fir Donnéen-URIs (rfc2397)
Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
-Description[mk]=kio-служител за податочни URI (rfc2397)
+Description[mk]=tdeio-служител за податочни URI (rfc2397)
Description[ms]=Kioslave untuk URI data (rfc2397)
Description[nb]=tdeioslave for data URI-er (rfc2397)
Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
diff --git a/tdeio/kpasswdserver/Makefile.am b/tdeio/kpasswdserver/Makefile.am
index d1a58059b..2581f5aa1 100644
--- a/tdeio/kpasswdserver/Makefile.am
+++ b/tdeio/kpasswdserver/Makefile.am
@@ -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)/tdewallet/client/libtdewalletclient.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_TDEIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeio/misc/Makefile.am b/tdeio/misc/Makefile.am
index 6a250cf8a..aedefc37e 100644
--- a/tdeio/misc/Makefile.am
+++ b/tdeio/misc/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = tdemailservice tdetelnetservice
observer_DIR = $(top_srcdir)/tdeio/tdeio
tdeio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
-tdeio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdeio_uiserver_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
tdeio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
METASOURCES = AUTO
@@ -38,11 +38,11 @@ kde_services_DATA = tdeio_uiserver.desktop
tdemailservice_SOURCES = tdemailservice.cpp
tdemailservice_LDADD = $(LIB_TDECORE)
-tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdetelnetservice_SOURCES = tdetelnetservice.cpp
tdetelnetservice_LDADD = $(LIB_TDEUI)
-tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
protocol_DATA = tdemailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/tdeio/misc/kpac/Makefile.am b/tdeio/misc/kpac/Makefile.am
index beb6a4b86..15e84ec50 100644
--- a/tdeio/misc/kpac/Makefile.am
+++ b/tdeio/misc/kpac/Makefile.am
@@ -10,7 +10,7 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
+kded_proxyscout_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
$(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIBRESOLV)
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
diff --git a/tdeio/misc/kssld/Makefile.am b/tdeio/misc/kssld/Makefile.am
index 09ddfe440..e17b1331e 100644
--- a/tdeio/misc/kssld/Makefile.am
+++ b/tdeio/misc/kssld/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/tdeio/k
kde_module_LTLIBRARIES = kded_kssld.la
kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+kded_kssld_la_LIBADD = $(LIB_TDEIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
kded_kssld_la_SOURCES = kssld.cpp kssld.skel
METASOURCES = AUTO
diff --git a/tdeio/misc/tdefile/Makefile.am b/tdeio/misc/tdefile/Makefile.am
index 21cdb0627..bd6831f5e 100644
--- a/tdeio/misc/tdefile/Makefile.am
+++ b/tdeio/misc/tdefile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio/tdeio $(all_includes)
bin_PROGRAMS = tdefile
tdefile_SOURCES = fileprops.cpp
-tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdefile_LDADD = $(LIB_KIO)
+tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdefile_LDADD = $(LIB_TDEIO)
diff --git a/tdeio/misc/tdentlm/tdentlm.h b/tdeio/misc/tdentlm/tdentlm.h
index 06b8febab..b71cad1bb 100644
--- a/tdeio/misc/tdentlm/tdentlm.h
+++ b/tdeio/misc/tdentlm/tdentlm.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KNTLM_H
-#define KNTLM_H
+#ifndef TDENTLM_H
+#define TDENTLM_H
#include
#include
@@ -230,4 +230,4 @@ private:
static void convertKey( unsigned char *key_56, void* ks );
};
-#endif /* KNTLM_H */
+#endif /* TDENTLM_H */
diff --git a/tdeio/misc/tdesendbugmail/Makefile.am b/tdeio/misc/tdesendbugmail/Makefile.am
index f9087a4fe..71e1c2573 100644
--- a/tdeio/misc/tdesendbugmail/Makefile.am
+++ b/tdeio/misc/tdesendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = tdesendbugmail
INCLUDES= -I$(srcdir)/.. $(all_includes)
tdesendbugmail_SOURCES = main.cpp smtp.cpp
-tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdesendbugmail_LDADD = ../../libtdeio.la
METASOURCES = AUTO
diff --git a/tdeio/misc/tdewalletd/Makefile.am b/tdeio/misc/tdewalletd/Makefile.am
index 5d52fa810..ed96a35c7 100644
--- a/tdeio/misc/tdewalletd/Makefile.am
+++ b/tdeio/misc/tdewalletd/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(t
kde_module_LTLIBRARIES = kded_tdewalletd.la
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_LIBADD = $(LIB_TDEIO) ../../../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
diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index e2037e382..c646c13cd 100644
--- a/tdeio/tdefile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -48,7 +48,7 @@ KFileView's requests to KDirLister's methods.
This class inherits from KFileChooserWidget and adds the file management
operations. It uses a KFileOperations class (taken from the current
-KonqOperations) for all KIO operations, and it uses KFileUndo, taken from
+KonqOperations) for all TDEIO operations, and it uses KFileUndo, taken from
the KonqUndo stuff. The popupMenu method is reimplemented to add those
operations to it.
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index f865e2f2d..c0e315359 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -3193,7 +3193,10 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
m_terminalBool = config.readBoolEntry( "Terminal" );
m_terminalOptionStr = config.readEntry( "TerminalOptions" );
m_suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" ) || config.readBoolEntry( "X-KDE-SubstituteUID" );
- m_suidUserStr = config.readEntry( "X-TDE-Username" );
+ if( config.hasKey( "X-TDE-Username" ))
+ m_suidUserStr = config.readEntry( "X-TDE-Username" );
+ else
+ m_suidUserStr = config.readEntry( "X-KDE-Username" );
if( config.hasKey( "StartupNotify" ))
m_startupBool = config.readBoolEntry( "StartupNotify", true );
else
diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h
index 95bf5c5ba..6ce658e18 100644
--- a/tdeio/tdefile/tdediroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -18,8 +18,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#ifndef KDIROPERATOR_H_
-#define KDIROPERATOR_H_
+#ifndef TDEDIROPERATOR_H_
+#define TDEDIROPERATOR_H_
#include
#include
diff --git a/tdeio/tdefile/tderecentdirs.h b/tdeio/tdefile/tderecentdirs.h
index cc9be16b4..ca1a5bbe2 100644
--- a/tdeio/tdefile/tderecentdirs.h
+++ b/tdeio/tdefile/tderecentdirs.h
@@ -25,8 +25,8 @@
* SUCH DAMAGE.
*
*/
-#ifndef __KRECENTDIRS_H
-#define __KRECENTDIRS_H
+#ifndef __TDERECENTDIRS_H
+#define __TDERECENTDIRS_H
#include
diff --git a/tdeio/tdefile/tderecentdocument.h b/tdeio/tdefile/tderecentdocument.h
index b788c0dc2..a3ee1b6b7 100644
--- a/tdeio/tdefile/tderecentdocument.h
+++ b/tdeio/tdefile/tderecentdocument.h
@@ -25,8 +25,8 @@
* SUCH DAMAGE.
*
*/
-#ifndef __KRECENTDOCUMENT_H
-#define __KRECENTDOCUMENT_H
+#ifndef __TDERECENTDOCUMENT_H
+#define __TDERECENTDOCUMENT_H
#include
#include
diff --git a/tdeio/tdefile/tests/Makefile.am b/tdeio/tdefile/tests/Makefile.am
index d869f11f5..8f48db918 100644
--- a/tdeio/tdefile/tests/Makefile.am
+++ b/tdeio/tdefile/tests/Makefile.am
@@ -29,7 +29,7 @@ check_PROGRAMS = kfstest kurlrequestertest tdefiletreeviewtest \
METASOURCES = AUTO
-LDADD = $(LIB_KIO)
+LDADD = $(LIB_TDEIO)
kcustommenueditortest_SOURCES = kcustommenueditortest.cpp
kurlrequestertest_SOURCES = kurlrequestertest.cpp
kfstest_SOURCES = kfstest.cpp kfdtest.cpp
diff --git a/tdeio/tdeio/authinfo.h b/tdeio/tdeio/authinfo.h
index 019311ef8..842925b26 100644
--- a/tdeio/tdeio/authinfo.h
+++ b/tdeio/tdeio/authinfo.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __KIO_AUTHINFO_H
-#define __KIO_AUTHINFO_H
+#ifndef __TDEIO_AUTHINFO_H
+#define __TDEIO_AUTHINFO_H
#include