diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20b54c41..7a1f952dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -932,11 +932,11 @@ add_subdirectory( tdecore )
if( WITH_ELFICON )
add_subdirectory( tdelfeditor )
endif( WITH_ELFICON )
-add_subdirectory( kunittest )
+add_subdirectory( tdeunittest )
add_subdirectory( tdeui )
add_subdirectory( tdesu )
add_subdirectory( kjs )
-add_subdirectory( kwallet )
+add_subdirectory( tdewallet )
add_subdirectory( kio )
add_subdirectory( kded )
@@ -945,34 +945,34 @@ add_subdirectory( kded )
add_subdirectory( kdoctools )
add_subdirectory( doc )
-add_subdirectory( kparts )
-add_subdirectory( kutils )
-add_subdirectory( kspell2 )
-add_subdirectory( kmdi )
+add_subdirectory( tdeparts )
+add_subdirectory( tdeutils )
+add_subdirectory( tdespell2 )
+add_subdirectory( tdemdi )
add_subdirectory( kinit )
add_subdirectory( tdeprint )
add_subdirectory( kab )
-add_subdirectory( kresources )
+add_subdirectory( tderesources )
add_subdirectory( kabc )
add_subdirectory( arts )
add_subdirectory( interfaces )
add_subdirectory( kate )
-add_subdirectory( kcert )
+add_subdirectory( tdecert )
if( XRANDR_FOUND )
- add_subdirectory( krandr )
+ add_subdirectory( tderandr )
endif( XRANDR_FOUND )
-add_subdirectory( khtml )
+add_subdirectory( tdehtml )
add_subdirectory( kcmshell )
add_subdirectory( kconf_update )
add_subdirectory( kdewidgets )
add_subdirectory( kimgio )
add_subdirectory( kioslave )
add_subdirectory( kstyles )
-add_subdirectory( libkmid )
-add_subdirectory( libkscreensaver )
+add_subdirectory( libtdemid )
+add_subdirectory( libtdescreensaver )
add_subdirectory( networkstatus )
add_subdirectory( knewstuff )
-add_subdirectory( krsync )
+add_subdirectory( tdersync )
add_subdirectory( licenses )
add_subdirectory( dnssd )
add_subdirectory( pics )
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index f23a2443b..c373e83f5 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -28,7 +28,7 @@ or this page online .
KHelpMenu KToolBar Starting other programs khtmlw tdehtmlw KIntegerLine, KIntLineEdit KDNDIcon, KDNDDropZone, KDNDWidget, tdecore/drag.h TDEConfigBase, TDEConfig, KSimpleConfig Return to the Table of Contents
-
+
-khtmlw has been replaced with khtml.Return to the Table of Contents
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index aa16c489a..645bd7612 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -20,9 +20,9 @@ or this page online .
Changes in tdecore Changes in tdeui Changes in kio Changes in kparts Changes in kspell API-cleanup in KHTML Changes in tdeparts Changes in tdespell API-cleanup in KHTML Changes in kfile TDE Control Center Panel Applets and Extensions KOpenWithHandler / KFileOpenWithHandler
Those two classes are deprecated, no need to create a KFileOpenWithHandler anymore.
-The merging of libkio, libksycoca, libkfile and libkssl into a single libkio has
+The merging of libkio, libtdesycoca, libkfile and libkssl into a single libkio has
allowed to fix this dependency problem: KRun can now use the OpenWith dialog directly.
KMimeType, KService
@@ -440,7 +440,7 @@ The createFilterDevice method is deprecated. Use deviceForFile instead.
Return to the Table of Contents
-
+
KParts::Factory
The createPart method is no more virtual and the createPartObject method
@@ -468,7 +468,7 @@ setURLArgs does the job.
Return to the Table of Contents
-
+
KSpell
The API has been cleaned up to be in line with the rest of tdelibs, in particular:
@@ -495,7 +495,7 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula
Return to the Table of Contents
-
+
There were a few relatively minor API-adjustements in KHTMLPart. In particular:
enableJScript(bool) has been replaced by setJScriptEnabled(bool)
diff --git a/Mainpage.dox b/Mainpage.dox
index f1d31fae9..ef5745224 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -14,8 +14,8 @@
* - tdeui classes )\n
* Trinity User interface classes such as widgets.
- * - khtml classes )\n
+ * - tdehtml classes )\n
* The Trinity HTML component.
* - kjs classes )\n
@@ -24,8 +24,8 @@
* (classes )\n
* Low level access to network files. Also provides access to facilities
* such as KDirWatcher which monitors directories for changes.
- * - kparts classes )\n
+ * - tdeparts classes )\n
* Support for re-usable, embeddable, extendable applications.
* - dcop classes )\n
@@ -33,17 +33,17 @@
* - tdefx classes )\n
* A library with pixmap effects.
- * - kmdi classes )\n
+ * - tdemdi classes )\n
* MultiDocument Interface library.
- * - libkmid classes )\n
+ * - libtdemid classes )\n
* Midi library.
* - tdeprint classes )\n
* High level printer control functionality.
- * - krandr classes )\n
+ * - tderandr classes )\n
* High level Xorg configuration via XRandr.
* - interfaces classes )\n
@@ -52,11 +52,11 @@
* - kabc classes )\n
* Access to the Trinity address book.
- * - kresources classes )\n
+ * - tderesources classes )\n
* The Trinity resources system.
- * - kutils classes )\n
+ * - tdeutils classes )\n
* High-level utils, like search/replace support.
* - arts classes )\n
@@ -67,8 +67,8 @@
* - dnssd classes )\n
* Network sevices publishing and discovery.
- * - kunittest classes )\n
+ * - tdeunittest classes )\n
* Unit testing framework in Trinity.
*
diff --git a/Makefile.am.in b/Makefile.am.in
index 5690f976a..10e9219dd 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -18,17 +18,17 @@
# Boston, MA 02110-1301, USA.
-COMPILE_FIRST = dcop libltdl tdefx tdecore kunittest tdeui tdesu kjs kwallet kio kded kded_post
+COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
COMPILE_BEFORE_doc = kdoctools
-COMPILE_AFTER_kparts = kspell2 kmdi tdeprint kinit kate interfaces kcert khtml krandr
-COMPILE_AFTER_tdeprint = kate khtml
-COMPILE_BEFORE_khtml = kutils
-COMPILE_BEFORE_kabc = kab kresources
-COMPILE_BEFORE_kate = interfaces kutils
-COMPILE_BEFORE_kmdi = kutils
-COMPILE_BEFORE_kspell2 = kutils
-COMPILE_BEFORE_kcmshell = kutils
-COMPILE_BEFORE_kdewidgets = kabc khtml
+COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
+COMPILE_AFTER_tdeprint = kate tdehtml
+COMPILE_BEFORE_tdehtml = tdeutils
+COMPILE_BEFORE_kabc = kab tderesources
+COMPILE_BEFORE_kate = interfaces tdeutils
+COMPILE_BEFORE_tdemdi = tdeutils
+COMPILE_BEFORE_tdespell2 = tdeutils
+COMPILE_BEFORE_kcmshell = tdeutils
+COMPILE_BEFORE_kdewidgets = kabc tdehtml
COMPILE_BEFORE_interfaces = arts kabc
$(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
@@ -54,7 +54,7 @@ messages:
find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
echo ./tdecore/tde-config.cpp.in >> files ;\
- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
: > kde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
$(XGETTEXT) common_texts.cpp -o kde.pot
diff --git a/README b/README
index bf87f3d51..1392e27c5 100644
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ Here is an alphabetical list:
communicate with KDE applications. It's also the base for KParts.
* interfaces
- kparts interface for text editors, mediaplayer and scripting.
+ tdeparts interface for text editors, mediaplayer and scripting.
* kab
OBSOLETE, see kabc: Used to be the address book library, but now only
@@ -39,7 +39,7 @@ Here is an alphabetical list:
* kate
KPart for 'kate', the KDE advanced text editor.
-* kcert
+* tdecert
Personal certification manager.
* kconf_update
@@ -73,7 +73,7 @@ Here is an alphabetical list:
Contains mostly stuff convert XML docbook files via XSLT into
human readable stuff.
-* khtml
+* tdehtml
The next generation HTML rendering widget designed for Konqueror. This
supports HTML 4, CSS, and a variety of other web related standards.
@@ -86,7 +86,7 @@ Here is an alphabetical list:
* kio
Classes that fetch and decode URLs are contained here. This library also
- contains "ksycoca", the system configure cache containing services,
+ contains "tdesycoca", the system configure cache containing services,
applications, servicetypes and mimetypes.
* kioslave
@@ -95,21 +95,21 @@ Here is an alphabetical list:
* kjs
Implementation of ECMAScript (aka JavaScript).
-* kparts
+* tdeparts
KDE component model.
* kstyles
The theme engine lies within. It handles nearly anything relating to
customizing the appearance of widgets.
-* kwallet
+* tdewallet
Client and backend to store values in encrypted files.
-* libkmid
+* libtdemid
MIDI file handling and midi mapper (manages output of midi files to
various devices).
-* libkscreensaver
+* libtdescreensaver
Library for making KDE screensavers.
* libltdl
diff --git a/TODO b/TODO
index 57dd5a13c..dcbfec292 100644
--- a/TODO
+++ b/TODO
@@ -152,7 +152,7 @@ that we would like to make for the next binary incompatible release.
- merge KProcIO into TDEProcess; add setBuffered() for separate channels.
- use QByteArray for writeStdin(). better than the buf+len arg, as it is ref-counted.
-- To discuss: Migrate the about dialog to use qhtml or khtml rather then the current
+- To discuss: Migrate the about dialog to use qhtml or tdehtml rather then the current
setup of all of the widgets and sub widgets. Might be a lot simpler, require a lot
less code and be much more flexible for additions/enhancments. Sidenote: currently
the about information seems to be duplicated.
@@ -180,7 +180,7 @@ that we would like to make for the next binary incompatible release.
- KWallet::Wallet::* functions - remove the default = 0 argument for mainwindow for the dialog
-- Make libkwalletclient part of libkio and get rid of libkwalletclient.
+- Make libtdewalletclient part of libkio and get rid of libtdewalletclient.
- Get rid of libtdesu dependency in libkio, get rid of SessionData::AuthData*,
get rid of SlaveInterface::authorizationKey and SlaveInterface::delAuthorization
diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am
index 115eed4b8..970b75055 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) -lktexteditor
+knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = knotify.h
diff --git a/configure.in.in b/configure.in.in
index 2fe0ee86e..c899ee519 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -255,12 +255,12 @@ AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KFILE, '$(top_builddir)/kio/libkio.la')
AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/kio/libkio.la')
-AC_SUBST(LIB_KHTML, '$(top_builddir)/khtml/libkhtml.la')
+AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
-AC_SUBST(LIB_KPARTS, '$(top_builddir)/kparts/libkparts.la')
+AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
-AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/kunittest/libkunittest.la')
+AC_SUBST(LIB_KUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
case $host in
*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
*) lib_kded='' ;;
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index d59b75cdb..57ce71786 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) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdcop_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 5e4cd00c7..1e70171d2 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -258,12 +258,12 @@ int main(int argc, char **argv)
foundApp.data(), foundObj.data());
// Find an object called "object1" in any application.
- boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj);
+ boolResult = client->findObject( "", "tdesycoca", "", data, foundApp, foundObj);
tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
foundApp.data(), foundObj.data());
// Find ourselves in any application.
- boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj);
+ boolResult = client->findObject( "testdcop", "tdesycoca", "", data, foundApp, foundObj);
tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
foundApp.data(), foundObj.data());
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 3df24100b..09d96161d 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -31,9 +31,9 @@ install( FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd )
-##### kdnssd ####################################
+##### tdednssd ####################################
-set( target kdnssd )
+set( target tdednssd )
set( ${target}_SRCS
remoteservice.cpp responder.cpp servicebase.cpp
diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am
index c24bdd6ba..25e749d72 100644
--- a/dnssd/Makefile.am
+++ b/dnssd/Makefile.am
@@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
-lib_LTLIBRARIES = libkdnssd.la
+lib_LTLIBRARIES = libtdednssd.la
-libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
+libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \
settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp
dnssdincludedir = $(includedir)/dnssd
dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
publicservice.h servicebase.h servicebrowser.h settings.h
-libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
-libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT)
+libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
-#kde_kcfg_DATA = kcm_kdnssd.kcfg
+#kde_kcfg_DATA = kcm_tdednssd.kcfg
include ../admin/Doxyfile.am
diff --git a/dnssd/README b/dnssd/README
index ffceb8ce9..304a7babb 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,7 +1,7 @@
Checklist to ensure that zeroconf will work:
1) Install Avahi, at least version 0.3
-2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs
+2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs
3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
line starting with 'host:'. It should be something like:
host: files mdns dns
diff --git a/dnssd/kcm_kdnssd.kcfg b/dnssd/kcm_tdednssd.kcfg
similarity index 98%
rename from dnssd/kcm_kdnssd.kcfg
rename to dnssd/kcm_tdednssd.kcfg
index 207ab608c..19cefaafa 100644
--- a/dnssd/kcm_kdnssd.kcfg
+++ b/dnssd/kcm_tdednssd.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
Additional domains for browsing
diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc
index 63764fc57..b8454f94b 100644
--- a/dnssd/settings.kcfgc
+++ b/dnssd/settings.kcfgc
@@ -1,5 +1,5 @@
ClassName=Configuration
-File=kcm_kdnssd.kcfg
+File=kcm_tdednssd.kcfg
GlobalEnums=false
Inherits=TDEConfigSkeleton
ItemAccessors=false
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f4dc993cf..88a718243 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -10,4 +10,4 @@
#################################################
add_subdirectory( common )
-add_subdirectory( kspell )
+add_subdirectory( tdespell )
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0531835d1..dd51718e7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = common kspell tdelibs
+SUBDIRS = common tdespell tdelibs
diff --git a/doc/tdelibs/man-kbuildsycoca.8.docbook b/doc/tdelibs/man-kbuildsycoca.8.docbook
index 1b34c896f..670c000c0 100644
--- a/doc/tdelibs/man-kbuildsycoca.8.docbook
+++ b/doc/tdelibs/man-kbuildsycoca.8.docbook
@@ -204,7 +204,7 @@ installations
See Also
-ksycoca(3), kblah(4), knogga(6)
+tdesycoca(3), kblah(4), knogga(6)
diff --git a/doc/kspell/CMakeLists.txt b/doc/tdespell/CMakeLists.txt
similarity index 82%
rename from doc/kspell/CMakeLists.txt
rename to doc/tdespell/CMakeLists.txt
index 94bc7cff5..6e2539833 100644
--- a/doc/kspell/CMakeLists.txt
+++ b/doc/tdespell/CMakeLists.txt
@@ -9,5 +9,5 @@
#
#################################################
-tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell )
-add_dependencies( kspell-en-handbook meinproc )
+tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION tdespell )
+add_dependencies( tdespell-en-handbook meinproc )
diff --git a/doc/kspell/Makefile.am b/doc/tdespell/Makefile.am
similarity index 100%
rename from doc/kspell/Makefile.am
rename to doc/tdespell/Makefile.am
diff --git a/doc/kspell/index.docbook b/doc/tdespell/index.docbook
similarity index 91%
rename from doc/kspell/index.docbook
rename to doc/tdespell/index.docbook
index e42ba8a73..8942b7ffc 100644
--- a/doc/kspell/index.docbook
+++ b/doc/tdespell/index.docbook
@@ -1,6 +1,6 @@
+
]>
@@ -8,7 +8,7 @@
-The &kspell; Handbook
+The &tdespell; Handbook
&David.Sweet; &David.Sweet.mail;
@@ -20,14 +20,14 @@
2003-02-24
1.00.00
-&kspell; is the spelling checker used by &tde; applications such
+&tdespell; is the spelling checker used by &tde; applications such
as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to International ISpell and ASpell .
spell
spelling
-kspell
+tdespell
ispell
aspell
check
@@ -52,7 +52,7 @@ url="http://aspell.sourceforge.net/">ASpell home page.)
Replacement: .
To accept this replacement, click on Replace . You may also select a word
from the list of Suggestions and then click Replace to replace the
@@ -130,7 +130,7 @@ your dictionary's distribution for more information.Spell-checking client
You may choose to use Ispell or Aspell as the spell-checking
-backend for &kspell;. Ispell is more widely available and may
+backend for &tdespell;. Ispell is more widely available and may
have better international support, but Aspell is gaining
popularity as it claims to give better suggestions for word replacements.
@@ -146,8 +146,8 @@ read the International ISpell man page.
Contact Information
-For more information about &kspell;, visit the &kspell;
-Home Page . In particular, you will find information about programming the &kspell; C++ class.
+For more information about &tdespell;, visit the &tdespell;
+Home Page . In particular, you will find information about programming the &tdespell; C++ class.
You may email the author/maintainer with questions and/or comments at
&David.Sweet.mail;.
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 99d359979..1fb53eca4 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -9,12 +9,12 @@
#
#################################################
-add_subdirectory( ktexteditor )
-add_subdirectory( kscript )
+add_subdirectory( tdetexteditor )
+add_subdirectory( tdescript )
add_subdirectory( kregexpeditor )
-add_subdirectory( kmediaplayer )
+add_subdirectory( tdemediaplayer )
add_subdirectory( kio )
add_subdirectory( terminal )
add_subdirectory( khexedit )
-add_subdirectory( kimproxy )
+add_subdirectory( tdeimproxy )
add_subdirectory( kspeech )
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index 583a7055d..e5eedaf90 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = ktexteditor kscript kregexpeditor kmediaplayer kio terminal khexedit kimproxy kspeech
+SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer kio terminal khexedit tdeimproxy kspeech
-DOXYGEN_REFERENCES = tdecore tdefx tdeui kparts dcop
+DOXYGEN_REFERENCES = tdecore tdefx tdeui tdeparts dcop
DOXYGEN_SET_RECURSIVE = YES
include ../admin/Doxyfile.am
diff --git a/interfaces/khexedit/Makefile.am b/interfaces/khexedit/Makefile.am
index e2eb8a472..f5f3f23d0 100644
--- a/interfaces/khexedit/Makefile.am
+++ b/interfaces/khexedit/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES= -I$(top_srcdir)/kparts $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdeparts $(all_includes)
# the service type
servicetypedir = $(kde_servicetypesdir)
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index ae23721ae..3bc5749d2 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -19,7 +19,7 @@
#define BYTESEDITINTERFACE_H
// kde specific
-#include
+#include
#include
diff --git a/interfaces/kimproxy/library/Makefile.am b/interfaces/kimproxy/library/Makefile.am
deleted file mode 100644
index 94f2974ac..000000000
--- a/interfaces/kimproxy/library/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = icons
-
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = kimproxyiface.h
-
-METASOURCES = AUTO
-
-AM_CPPFLAGS = $(all_includes)
-
-messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kimproxy.pot
-
-kimproxyincludedir = $(includedir)
-kimproxyinclude_HEADERS = kimproxy.h kimproxyiface.h
-
-lib_LTLIBRARIES = libkimproxy.la
-libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
-libkimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
-libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
-
-kimiface_DIR = $(top_srcdir)/interfaces/kimproxy/interface
-
-include $(top_srcdir)/admin/Doxyfile.am
-DOXYGEN_REFERENCES = kabc dcop
-
diff --git a/interfaces/kmediaplayer/Makefile.am b/interfaces/kmediaplayer/Makefile.am
deleted file mode 100644
index 5b26d844e..000000000
--- a/interfaces/kmediaplayer/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
-endif
-
-SUBDIRS = . $(kfileaudiopreview_subdir)
-INCLUDES = -I$(srcdir)/.. $(all_includes)
-
-lib_LTLIBRARIES = libkmediaplayer.la
-
-libkmediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkmediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkmediaplayer_la_METASOURCES = AUTO
-
-kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
-kmediaplayerincludedir = $(includedir)/kmediaplayer
-
-kde_servicetypes_DATA = kmediaplayerengine.desktop kmediaplayer.desktop
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am
deleted file mode 100644
index ede5f4fa0..000000000
--- a/interfaces/kscript/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-SUBDIRS = . sample
-
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
-
-#lib_LTLIBRARIES = libkscriptloader.la libkscript.la
-lib_LTLIBRARIES = libkscript.la
-#libkscriptloader_la_SOURCES = scriptloader.cpp
-#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-#libkscriptloader_la_LIBADD = $(LIB_KPARTS)
-
-libkscript_la_SOURCES = scriptmanager.cpp
-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkscript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
-
-kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
-kscriptincludedir = $(includedir)
-
-METASOURCES = AUTO
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = scriptinterface.desktop
diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am
index f8f2b936d..dc183251d 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 kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
include ../../admin/Doxyfile.am
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 4780b169d..d24683517 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -186,7 +186,7 @@
*
* There are two methods of making DCOP calls from your application to %KTTSD.
*
- * - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/khtmlkttsd.cpp
+ * - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/tdehtmlkttsd.cpp
* for an example. This method is recommended if you want to make a few simple calls to KTTSD.
* - Use kspeech_stub as described below. This method generates the marshalling code for you
* and is recommended for a more complex speech-enabled applications. kcmkttsmgr in the
diff --git a/interfaces/kimproxy/CMakeLists.txt b/interfaces/tdeimproxy/CMakeLists.txt
similarity index 100%
rename from interfaces/kimproxy/CMakeLists.txt
rename to interfaces/tdeimproxy/CMakeLists.txt
diff --git a/interfaces/kimproxy/Makefile.am b/interfaces/tdeimproxy/Makefile.am
similarity index 100%
rename from interfaces/kimproxy/Makefile.am
rename to interfaces/tdeimproxy/Makefile.am
diff --git a/interfaces/kimproxy/TODO b/interfaces/tdeimproxy/TODO
similarity index 100%
rename from interfaces/kimproxy/TODO
rename to interfaces/tdeimproxy/TODO
diff --git a/interfaces/kimproxy/interface/CMakeLists.txt b/interfaces/tdeimproxy/interface/CMakeLists.txt
similarity index 100%
rename from interfaces/kimproxy/interface/CMakeLists.txt
rename to interfaces/tdeimproxy/interface/CMakeLists.txt
diff --git a/interfaces/kimproxy/interface/Makefile.am b/interfaces/tdeimproxy/interface/Makefile.am
similarity index 100%
rename from interfaces/kimproxy/interface/Makefile.am
rename to interfaces/tdeimproxy/interface/Makefile.am
diff --git a/interfaces/kimproxy/interface/dcopinstantmessenger.desktop b/interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop
similarity index 100%
rename from interfaces/kimproxy/interface/dcopinstantmessenger.desktop
rename to interfaces/tdeimproxy/interface/dcopinstantmessenger.desktop
diff --git a/interfaces/kimproxy/interface/kcm_instantmessenger.desktop b/interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop
similarity index 100%
rename from interfaces/kimproxy/interface/kcm_instantmessenger.desktop
rename to interfaces/tdeimproxy/interface/kcm_instantmessenger.desktop
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h
similarity index 100%
rename from interfaces/kimproxy/interface/kimiface.h
rename to interfaces/tdeimproxy/interface/kimiface.h
diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt
similarity index 79%
rename from interfaces/kimproxy/library/CMakeLists.txt
rename to interfaces/tdeimproxy/library/CMakeLists.txt
index 347e552a5..9aa1f60ee 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/CMakeLists.txt
@@ -29,17 +29,17 @@ link_directories(
##### headers ###################################
install( FILES
- kimproxy.h kimproxyiface.h
+ tdeimproxy.h tdeimproxyiface.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
-##### kimproxy ##################################
+##### tdeimproxy ##################################
-set( target kimproxy )
+set( target tdeimproxy )
set( ${target}_SRCS
- kimproxy.cpp kimproxyiface.skel
- ${CMAKE_SOURCE_DIR}/interfaces/kimproxy/interface/kimiface.stub
+ tdeimproxy.cpp tdeimproxyiface.skel
+ ${CMAKE_SOURCE_DIR}/interfaces/tdeimproxy/interface/kimiface.stub
)
tde_add_library( ${target} SHARED AUTOMOC
diff --git a/interfaces/tdeimproxy/library/Makefile.am b/interfaces/tdeimproxy/library/Makefile.am
new file mode 100644
index 000000000..743b76424
--- /dev/null
+++ b/interfaces/tdeimproxy/library/Makefile.am
@@ -0,0 +1,26 @@
+SUBDIRS = icons
+
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = tdeimproxyiface.h
+
+METASOURCES = AUTO
+
+AM_CPPFLAGS = $(all_includes)
+
+messages: rc.cpp
+ $(XGETTEXT) *.cpp -o $(podir)/tdeimproxy.pot
+
+tdeimproxyincludedir = $(includedir)
+tdeimproxyinclude_HEADERS = tdeimproxy.h tdeimproxyiface.h
+
+lib_LTLIBRARIES = libtdeimproxy.la
+libtdeimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+libtdeimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI)
+libtdeimproxy_la_SOURCES = tdeimproxy.cpp kimiface.stub tdeimproxyiface.skel
+
+kimiface_DIR = $(top_srcdir)/interfaces/tdeimproxy/interface
+
+include $(top_srcdir)/admin/Doxyfile.am
+DOXYGEN_REFERENCES = kabc dcop
+
diff --git a/interfaces/kimproxy/library/icons/CMakeLists.txt b/interfaces/tdeimproxy/library/icons/CMakeLists.txt
similarity index 100%
rename from interfaces/kimproxy/library/icons/CMakeLists.txt
rename to interfaces/tdeimproxy/library/icons/CMakeLists.txt
diff --git a/interfaces/kimproxy/library/icons/Makefile.am b/interfaces/tdeimproxy/library/icons/Makefile.am
similarity index 100%
rename from interfaces/kimproxy/library/icons/Makefile.am
rename to interfaces/tdeimproxy/library/icons/Makefile.am
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr16-action-presence_away.png
rename to interfaces/tdeimproxy/library/icons/cr16-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr16-action-presence_offline.png
rename to interfaces/tdeimproxy/library/icons/cr16-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr16-action-presence_online.png
rename to interfaces/tdeimproxy/library/icons/cr16-action-presence_online.png
diff --git a/interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png b/interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr16-action-presence_unknown.png
rename to interfaces/tdeimproxy/library/icons/cr16-action-presence_unknown.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr32-action-presence_away.png
rename to interfaces/tdeimproxy/library/icons/cr32-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr32-action-presence_offline.png
rename to interfaces/tdeimproxy/library/icons/cr32-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr32-action-presence_online.png
rename to interfaces/tdeimproxy/library/icons/cr32-action-presence_online.png
diff --git a/interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png b/interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr32-action-presence_unknown.png
rename to interfaces/tdeimproxy/library/icons/cr32-action-presence_unknown.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_away.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr48-action-presence_away.png
rename to interfaces/tdeimproxy/library/icons/cr48-action-presence_away.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_offline.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
rename to interfaces/tdeimproxy/library/icons/cr48-action-presence_offline.png
diff --git a/interfaces/kimproxy/library/icons/cr48-action-presence_online.png b/interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png
similarity index 100%
rename from interfaces/kimproxy/library/icons/cr48-action-presence_online.png
rename to interfaces/tdeimproxy/library/icons/cr48-action-presence_online.png
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
similarity index 99%
rename from interfaces/kimproxy/library/kimproxy.cpp
rename to interfaces/tdeimproxy/library/tdeimproxy.cpp
index e8118b8bc..a65388974 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -1,5 +1,5 @@
/*
- kimproxy.cpp
+ tdeimproxy.cpp
IM service library for KDE
@@ -35,7 +35,7 @@
#include "kimiface_stub.h"
-#include "kimproxy.h"
+#include "tdeimproxy.h"
static KStaticDeleter _staticDeleter;
@@ -650,4 +650,4 @@ TQString KIMProxy::preferredApp()
return preferredApp;
}
-#include "kimproxy.moc"
+#include "tdeimproxy.moc"
diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
similarity index 99%
rename from interfaces/kimproxy/library/kimproxy.h
rename to interfaces/tdeimproxy/library/tdeimproxy.h
index d4312b341..1a20c4b22 100644
--- a/interfaces/kimproxy/library/kimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -1,5 +1,5 @@
/*
- kimproxy.h
+ tdeimproxy.h
IM service library for KDE
@@ -35,7 +35,7 @@
#define IM_CLIENT_PREFERENCES_SECTION "InstantMessenger"
#define IM_CLIENT_PREFERENCES_ENTRY "imClient"
-#include "kimproxyiface.h"
+#include "tdeimproxyiface.h"
class DCOPClient;
class KIMIface_stub;
diff --git a/interfaces/kimproxy/library/kimproxyiface.h b/interfaces/tdeimproxy/library/tdeimproxyiface.h
similarity index 98%
rename from interfaces/kimproxy/library/kimproxyiface.h
rename to interfaces/tdeimproxy/library/tdeimproxyiface.h
index fa11183c9..a7d416371 100644
--- a/interfaces/kimproxy/library/kimproxyiface.h
+++ b/interfaces/tdeimproxy/library/tdeimproxyiface.h
@@ -1,5 +1,5 @@
/*
- kimproxyiface.cpp
+ tdeimproxyiface.cpp
IM service library for KDE
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
similarity index 83%
rename from interfaces/kmediaplayer/CMakeLists.txt
rename to interfaces/tdemediaplayer/CMakeLists.txt
index 98346388c..00ab7f3d9 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -33,19 +33,19 @@ link_directories(
install( FILES
player.h playerdcopobject.h view.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kmediaplayer )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdemediaplayer )
##### other data ################################
install( FILES
- kmediaplayerengine.desktop kmediaplayer.desktop
+ tdemediaplayerengine.desktop tdemediaplayer.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-##### kmediaplayer ##############################
+##### tdemediaplayer ##############################
-set( target kmediaplayer )
+set( target tdemediaplayer )
set( ${target}_SRCS
player.cpp view.cpp playerdcopobject.skel
@@ -54,7 +54,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kparts-shared
+ LINK tdeparts-shared
DESTINATION ${LIB_INSTALL_DIR}
DEPENDENCIES dcopidl
)
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
new file mode 100644
index 000000000..0b7aded07
--- /dev/null
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -0,0 +1,18 @@
+if include_ARTS
+kfileaudiopreview_subdir = kfileaudiopreview
+endif
+
+SUBDIRS = . $(kfileaudiopreview_subdir)
+INCLUDES = -I$(srcdir)/.. $(all_includes)
+
+lib_LTLIBRARIES = libtdemediaplayer.la
+
+libtdemediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp
+libtdemediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libtdemediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdemediaplayer_la_METASOURCES = AUTO
+
+tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
+tdemediaplayerincludedir = $(includedir)/tdemediaplayer
+
+kde_servicetypes_DATA = tdemediaplayerengine.desktop tdemediaplayer.desktop
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
similarity index 95%
rename from interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
rename to interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
index 03237da87..17485b65a 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
@@ -41,6 +41,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kmediaplayer-shared artskde-shared
+ LINK tdemediaplayer-shared artskde-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
similarity index 72%
rename from interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
rename to interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
index e4232cd78..4f88a0c87 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/Makefile.am
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kfileaudiopreview.la
kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/kmediaplayer/libkmediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
noinst_HEADERS = kfileaudiopreview.h
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
similarity index 98%
rename from interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
rename to interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 2998af9f5..1d83fc590 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -9,9 +9,9 @@
#include
#include
#include
-#include
+#include
#include
-#include
+#include
#include
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
similarity index 100%
rename from interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h
rename to interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/tdemediaplayer/player.cpp
similarity index 98%
rename from interfaces/kmediaplayer/player.cpp
rename to interfaces/tdemediaplayer/player.cpp
index 681459731..2d97aa1f7 100644
--- a/interfaces/kmediaplayer/player.cpp
+++ b/interfaces/tdemediaplayer/player.cpp
@@ -21,7 +21,7 @@
// used in advertising or otherwise to promote the sale, use or other dealings
// in this Software without prior written authorization from the author(s).
-#include
+#include
KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void)
: DCOPObject("KMediaPlayer")
diff --git a/interfaces/kmediaplayer/player.h b/interfaces/tdemediaplayer/player.h
similarity index 97%
rename from interfaces/kmediaplayer/player.h
rename to interfaces/tdemediaplayer/player.h
index 10e9f4a74..493a921e3 100644
--- a/interfaces/kmediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -24,9 +24,9 @@
#ifndef KMEDIAPLAYERPLAYER_H
#define KMEDIAPLAYERPLAYER_H
-#include
-#include
-#include
+#include
+#include
+#include
/** KMediaPlayer contains an interface to reusable media player components.
*/
diff --git a/interfaces/kmediaplayer/playerdcopobject.h b/interfaces/tdemediaplayer/playerdcopobject.h
similarity index 100%
rename from interfaces/kmediaplayer/playerdcopobject.h
rename to interfaces/tdemediaplayer/playerdcopobject.h
diff --git a/interfaces/kmediaplayer/kmediaplayer.desktop b/interfaces/tdemediaplayer/tdemediaplayer.desktop
similarity index 100%
rename from interfaces/kmediaplayer/kmediaplayer.desktop
rename to interfaces/tdemediaplayer/tdemediaplayer.desktop
diff --git a/interfaces/kmediaplayer/kmediaplayerengine.desktop b/interfaces/tdemediaplayer/tdemediaplayerengine.desktop
similarity index 100%
rename from interfaces/kmediaplayer/kmediaplayerengine.desktop
rename to interfaces/tdemediaplayer/tdemediaplayerengine.desktop
diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/tdemediaplayer/view.cpp
similarity index 98%
rename from interfaces/kmediaplayer/view.cpp
rename to interfaces/tdemediaplayer/view.cpp
index 64e3bf484..87d1d78a5 100644
--- a/interfaces/kmediaplayer/view.cpp
+++ b/interfaces/tdemediaplayer/view.cpp
@@ -21,7 +21,7 @@
// used in advertising or otherwise to promote the sale, use or other dealings
// in this Software without prior written authorization from the author(s).
-#include
+#include
struct KMediaPlayer::View::Data
{
diff --git a/interfaces/kmediaplayer/view.h b/interfaces/tdemediaplayer/view.h
similarity index 100%
rename from interfaces/kmediaplayer/view.h
rename to interfaces/tdemediaplayer/view.h
diff --git a/interfaces/kscript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt
similarity index 93%
rename from interfaces/kscript/CMakeLists.txt
rename to interfaces/tdescript/CMakeLists.txt
index 233dc1c49..bcddb1068 100644
--- a/interfaces/kscript/CMakeLists.txt
+++ b/interfaces/tdescript/CMakeLists.txt
@@ -40,9 +40,9 @@ install( FILES
install( FILES scriptinterface.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
-##### kscript ###################################
+##### tdescript ###################################
-set( target kscript )
+set( target tdescript )
set( ${target}_SRCS
scriptmanager.cpp
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
new file mode 100644
index 000000000..55d4cac35
--- /dev/null
+++ b/interfaces/tdescript/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = . sample
+
+INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+
+#lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
+lib_LTLIBRARIES = libtdescript.la
+#libtdescriptloader_la_SOURCES = scriptloader.cpp
+#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#libtdescriptloader_la_LIBADD = $(LIB_KPARTS)
+
+libtdescript_la_SOURCES = scriptmanager.cpp
+libtdescript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+libtdescript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+
+tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+tdescriptincludedir = $(includedir)
+
+METASOURCES = AUTO
+
+servicetypedir = $(kde_servicetypesdir)
+servicetype_DATA = scriptinterface.desktop
diff --git a/interfaces/kscript/README b/interfaces/tdescript/README
similarity index 100%
rename from interfaces/kscript/README
rename to interfaces/tdescript/README
diff --git a/interfaces/kscript/sample/CMakeLists.txt b/interfaces/tdescript/sample/CMakeLists.txt
similarity index 92%
rename from interfaces/kscript/sample/CMakeLists.txt
rename to interfaces/tdescript/sample/CMakeLists.txt
index cdb2505e9..46d031bff 100644
--- a/interfaces/kscript/sample/CMakeLists.txt
+++ b/interfaces/tdescript/sample/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/tdecore
- ${CMAKE_SOURCE_DIR}/interfaces/kscript
+ ${CMAKE_SOURCE_DIR}/interfaces/tdescript
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
)
@@ -38,6 +38,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kscript-shared
+ LINK tdescript-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/interfaces/kscript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am
similarity index 66%
rename from interfaces/kscript/sample/Makefile.am
rename to interfaces/tdescript/sample/Makefile.am
index 5dae5193f..77d39b28c 100644
--- a/interfaces/kscript/sample/Makefile.am
+++ b/interfaces/tdescript/sample/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/kscript $(all_includes)
+INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
kde_module_LTLIBRARIES = libshellscript.la
libshellscript_la_SOURCES = shellscript.cpp
libshellscript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -avoid-version
-libshellscript_la_LIBADD = ../libkscript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+libshellscript_la_LIBADD = ../libtdescript.la $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
METASOURCES = AUTO
diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
similarity index 100%
rename from interfaces/kscript/sample/shellscript.cpp
rename to interfaces/tdescript/sample/shellscript.cpp
diff --git a/interfaces/kscript/sample/shellscript.desktop b/interfaces/tdescript/sample/shellscript.desktop
similarity index 100%
rename from interfaces/kscript/sample/shellscript.desktop
rename to interfaces/tdescript/sample/shellscript.desktop
diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h
similarity index 100%
rename from interfaces/kscript/sample/shellscript.h
rename to interfaces/tdescript/sample/shellscript.h
diff --git a/interfaces/kscript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h
similarity index 100%
rename from interfaces/kscript/scriptclientinterface.h
rename to interfaces/tdescript/scriptclientinterface.h
diff --git a/interfaces/kscript/scriptinterface.desktop b/interfaces/tdescript/scriptinterface.desktop
similarity index 100%
rename from interfaces/kscript/scriptinterface.desktop
rename to interfaces/tdescript/scriptinterface.desktop
diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
similarity index 100%
rename from interfaces/kscript/scriptinterface.h
rename to interfaces/tdescript/scriptinterface.h
diff --git a/interfaces/kscript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
similarity index 97%
rename from interfaces/kscript/scriptloader.cpp
rename to interfaces/tdescript/scriptloader.cpp
index 621ceb5d1..79fa2055a 100644
--- a/interfaces/kscript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -19,8 +19,8 @@
#include "scriptloader.h"
#include
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/interfaces/kscript/scriptloader.h b/interfaces/tdescript/scriptloader.h
similarity index 97%
rename from interfaces/kscript/scriptloader.h
rename to interfaces/tdescript/scriptloader.h
index 20b135231..a249283d6 100644
--- a/interfaces/kscript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -21,7 +21,7 @@
#include
#include
#include
-#include
+#include
/**
* Script loader
diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
similarity index 98%
rename from interfaces/kscript/scriptmanager.cpp
rename to interfaces/tdescript/scriptmanager.cpp
index 647410b8b..cd20655d0 100644
--- a/interfaces/kscript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -1,6 +1,6 @@
#include "scriptmanager.h"
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/interfaces/kscript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
similarity index 100%
rename from interfaces/kscript/scriptmanager.h
rename to interfaces/tdescript/scriptmanager.h
diff --git a/interfaces/ktexteditor/.kateconfig b/interfaces/tdetexteditor/.kateconfig
similarity index 100%
rename from interfaces/ktexteditor/.kateconfig
rename to interfaces/tdetexteditor/.kateconfig
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
similarity index 90%
rename from interfaces/ktexteditor/CMakeLists.txt
rename to interfaces/tdetexteditor/CMakeLists.txt
index 3f430b50c..a9d39edbb 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -46,28 +46,28 @@ install( FILES
selectioninterfaceext.h selectionextdcopinterface.h
texthintinterface.h editinterfaceext.h variableinterface.h
templateinterface.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/ktexteditor )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdetexteditor )
##### other data ################################
install( FILES
- ktexteditor.desktop ktexteditoreditor.desktop
- ktexteditorplugin.desktop
+ tdetexteditor.desktop tdetexteditoreditor.desktop
+ tdetexteditorplugin.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES
- kcm_ktexteditor.desktop
+ kcm_tdetexteditor.desktop
DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser )
-##### ktexteditor ###############################
+##### tdetexteditor ###############################
-set( target ktexteditor )
+set( target tdetexteditor )
set( ${target}_SRCS
- ktexteditor.cpp
+ tdetexteditor.cpp
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp
@@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK tdeui-shared kabc-shared kparts-shared
+ LINK tdeui-shared kabc-shared tdeparts-shared
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
similarity index 77%
rename from interfaces/ktexteditor/Makefile.am
rename to interfaces/tdetexteditor/Makefile.am
index cc41c788f..5663bb761 100644
--- a/interfaces/ktexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -1,8 +1,8 @@
INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
-lib_LTLIBRARIES = libktexteditor.la
+lib_LTLIBRARIES = libtdetexteditor.la
-libktexteditor_la_SOURCES = ktexteditor.cpp \
+libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
editinterface.cpp clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \
codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
configinterface.cpp cursorinterface.cpp dynwordwrapinterface.cpp \
@@ -22,10 +22,10 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \
texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp
-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_TDEUI)
-ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
+tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
selectioninterface.h cursorinterface.h \
clipboardinterface.h popupmenuinterface.h \
viewcursorinterface.h searchinterface.h highlightinginterface.h \
@@ -36,15 +36,15 @@ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h
documentinfo.h selectioninterfaceext.h selectionextdcopinterface.h texthintinterface.h \
editinterfaceext.h variableinterface.h templateinterface.h
-ktexteditorincludedir = $(includedir)/ktexteditor
+tdetexteditorincludedir = $(includedir)/tdetexteditor
METASOURCES = AUTO
servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = ktexteditor.desktop ktexteditoreditor.desktop ktexteditorplugin.desktop
+servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetexteditorplugin.desktop
-kcm_ktexteditor_DATA = kcm_ktexteditor.desktop
-kcm_ktexteditordir = $(kde_datadir)/kcm_componentchooser
+kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
+kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
templateinterface.lo: $(top_builddir)/kabc/addressee.h
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.cpp b/interfaces/tdetexteditor/blockselectiondcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/blockselectiondcopinterface.cpp
rename to interfaces/tdetexteditor/blockselectiondcopinterface.cpp
diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/blockselectiondcopinterface.h
rename to interfaces/tdetexteditor/blockselectiondcopinterface.h
diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/tdetexteditor/blockselectioninterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/blockselectioninterface.cpp
rename to interfaces/tdetexteditor/blockselectioninterface.cpp
diff --git a/interfaces/ktexteditor/blockselectioninterface.h b/interfaces/tdetexteditor/blockselectioninterface.h
similarity index 95%
rename from interfaces/ktexteditor/blockselectioninterface.h
rename to interfaces/tdetexteditor/blockselectioninterface.h
index 3fae34682..b2cd785eb 100644
--- a/interfaces/ktexteditor/blockselectioninterface.h
+++ b/interfaces/tdetexteditor/blockselectioninterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_blockselectioninterface_h__
-#define __ktexteditor_blockselectioninterface_h__
+#ifndef __tdetexteditor_blockselectioninterface_h__
+#define __tdetexteditor_blockselectioninterface_h__
#include
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.cpp b/interfaces/tdetexteditor/clipboarddcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/clipboarddcopinterface.cpp
rename to interfaces/tdetexteditor/clipboarddcopinterface.cpp
diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/tdetexteditor/clipboarddcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/clipboarddcopinterface.h
rename to interfaces/tdetexteditor/clipboarddcopinterface.h
diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/tdetexteditor/clipboardinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/clipboardinterface.cpp
rename to interfaces/tdetexteditor/clipboardinterface.cpp
diff --git a/interfaces/ktexteditor/clipboardinterface.h b/interfaces/tdetexteditor/clipboardinterface.h
similarity index 95%
rename from interfaces/ktexteditor/clipboardinterface.h
rename to interfaces/tdetexteditor/clipboardinterface.h
index 365006b37..8eeeb77ba 100644
--- a/interfaces/ktexteditor/clipboardinterface.h
+++ b/interfaces/tdetexteditor/clipboardinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_clipboardinterface_h__
-#define __ktexteditor_clipboardinterface_h__
+#ifndef __tdetexteditor_clipboardinterface_h__
+#define __tdetexteditor_clipboardinterface_h__
#include
diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/tdetexteditor/codecompletioninterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/codecompletioninterface.cpp
rename to interfaces/tdetexteditor/codecompletioninterface.cpp
diff --git a/interfaces/ktexteditor/codecompletioninterface.h b/interfaces/tdetexteditor/codecompletioninterface.h
similarity index 98%
rename from interfaces/ktexteditor/codecompletioninterface.h
rename to interfaces/tdetexteditor/codecompletioninterface.h
index 2fab7231e..4f726578f 100644
--- a/interfaces/ktexteditor/codecompletioninterface.h
+++ b/interfaces/tdetexteditor/codecompletioninterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_codecompletioninterface_h__
-#define __ktexteditor_codecompletioninterface_h__
+#ifndef __tdetexteditor_codecompletioninterface_h__
+#define __tdetexteditor_codecompletioninterface_h__
#include
#include
diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/tdetexteditor/configinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/configinterface.cpp
rename to interfaces/tdetexteditor/configinterface.cpp
diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h
similarity index 96%
rename from interfaces/ktexteditor/configinterface.h
rename to interfaces/tdetexteditor/configinterface.h
index 4879fa66b..ed6a80d81 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/tdetexteditor/configinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_configinterface_h__
-#define __ktexteditor_configinterface_h__
+#ifndef __tdetexteditor_configinterface_h__
+#define __tdetexteditor_configinterface_h__
#include
diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/tdetexteditor/configinterfaceextension.cpp
similarity index 100%
rename from interfaces/ktexteditor/configinterfaceextension.cpp
rename to interfaces/tdetexteditor/configinterfaceextension.cpp
diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h
similarity index 96%
rename from interfaces/ktexteditor/configinterfaceextension.h
rename to interfaces/tdetexteditor/configinterfaceextension.h
index e324e2ba2..d139ba696 100644
--- a/interfaces/ktexteditor/configinterfaceextension.h
+++ b/interfaces/tdetexteditor/configinterfaceextension.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_configinterfaceextension_h__
-#define __ktexteditor_configinterfaceextension_h__
+#ifndef __tdetexteditor_configinterfaceextension_h__
+#define __tdetexteditor_configinterfaceextension_h__
#include
#include
diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/tdetexteditor/cursorinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/cursorinterface.cpp
rename to interfaces/tdetexteditor/cursorinterface.cpp
diff --git a/interfaces/ktexteditor/cursorinterface.h b/interfaces/tdetexteditor/cursorinterface.h
similarity index 96%
rename from interfaces/ktexteditor/cursorinterface.h
rename to interfaces/tdetexteditor/cursorinterface.h
index e6e8e848a..e31d33395 100644
--- a/interfaces/ktexteditor/cursorinterface.h
+++ b/interfaces/tdetexteditor/cursorinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_cursorinterface_h__
-#define __ktexteditor_cursorinterface_h__
+#ifndef __tdetexteditor_cursorinterface_h__
+#define __tdetexteditor_cursorinterface_h__
#include
#include
diff --git a/interfaces/ktexteditor/document.h b/interfaces/tdetexteditor/document.h
similarity index 97%
rename from interfaces/ktexteditor/document.h
rename to interfaces/tdetexteditor/document.h
index 12823e600..83d8b7cf6 100644
--- a/interfaces/ktexteditor/document.h
+++ b/interfaces/tdetexteditor/document.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_document_h__
-#define __ktexteditor_document_h__
+#ifndef __tdetexteditor_document_h__
+#define __tdetexteditor_document_h__
#include "editor.h"
diff --git a/interfaces/ktexteditor/documentdcopinfo.cpp b/interfaces/tdetexteditor/documentdcopinfo.cpp
similarity index 100%
rename from interfaces/ktexteditor/documentdcopinfo.cpp
rename to interfaces/tdetexteditor/documentdcopinfo.cpp
diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/tdetexteditor/documentdcopinfo.h
similarity index 100%
rename from interfaces/ktexteditor/documentdcopinfo.h
rename to interfaces/tdetexteditor/documentdcopinfo.h
diff --git a/interfaces/ktexteditor/documentinfo.cpp b/interfaces/tdetexteditor/documentinfo.cpp
similarity index 100%
rename from interfaces/ktexteditor/documentinfo.cpp
rename to interfaces/tdetexteditor/documentinfo.cpp
diff --git a/interfaces/ktexteditor/documentinfo.h b/interfaces/tdetexteditor/documentinfo.h
similarity index 94%
rename from interfaces/ktexteditor/documentinfo.h
rename to interfaces/tdetexteditor/documentinfo.h
index b6d393eb7..46a19bfd5 100644
--- a/interfaces/ktexteditor/documentinfo.h
+++ b/interfaces/tdetexteditor/documentinfo.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_documentinfointerface_h__
-#define __ktexteditor_documentinfointerface_h__
+#ifndef __tdetexteditor_documentinfointerface_h__
+#define __tdetexteditor_documentinfointerface_h__
class TQString;
class TQCString;
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/tdetexteditor/dynwordwrapinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/dynwordwrapinterface.cpp
rename to interfaces/tdetexteditor/dynwordwrapinterface.cpp
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.h b/interfaces/tdetexteditor/dynwordwrapinterface.h
similarity index 94%
rename from interfaces/ktexteditor/dynwordwrapinterface.h
rename to interfaces/tdetexteditor/dynwordwrapinterface.h
index 8d796c4ae..9a6ce116b 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.h
+++ b/interfaces/tdetexteditor/dynwordwrapinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_dynwordwrapinterface_h__
-#define __ktexteditor_dynwordwrapinterface_h__
+#ifndef __tdetexteditor_dynwordwrapinterface_h__
+#define __tdetexteditor_dynwordwrapinterface_h__
#include
diff --git a/interfaces/ktexteditor/editdcopinterface.cpp b/interfaces/tdetexteditor/editdcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/editdcopinterface.cpp
rename to interfaces/tdetexteditor/editdcopinterface.cpp
diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/tdetexteditor/editdcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/editdcopinterface.h
rename to interfaces/tdetexteditor/editdcopinterface.h
diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/tdetexteditor/editinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/editinterface.cpp
rename to interfaces/tdetexteditor/editinterface.cpp
diff --git a/interfaces/ktexteditor/editinterface.h b/interfaces/tdetexteditor/editinterface.h
similarity index 97%
rename from interfaces/ktexteditor/editinterface.h
rename to interfaces/tdetexteditor/editinterface.h
index 7844995e8..05e4941f2 100644
--- a/interfaces/ktexteditor/editinterface.h
+++ b/interfaces/tdetexteditor/editinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_editinterface_h__
-#define __ktexteditor_editinterface_h__
+#ifndef __tdetexteditor_editinterface_h__
+#define __tdetexteditor_editinterface_h__
#include
diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/tdetexteditor/editinterfaceext.cpp
similarity index 100%
rename from interfaces/ktexteditor/editinterfaceext.cpp
rename to interfaces/tdetexteditor/editinterfaceext.cpp
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/tdetexteditor/editinterfaceext.h
similarity index 95%
rename from interfaces/ktexteditor/editinterfaceext.h
rename to interfaces/tdetexteditor/editinterfaceext.h
index a4fcb414c..25b74201c 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/tdetexteditor/editinterfaceext.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_editinterfaceext_h__
-#define __ktexteditor_editinterfaceext_h__
+#ifndef __tdetexteditor_editinterfaceext_h__
+#define __tdetexteditor_editinterfaceext_h__
#include
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/tdetexteditor/editor.h
similarity index 95%
rename from interfaces/ktexteditor/editor.h
rename to interfaces/tdetexteditor/editor.h
index a9f542043..8b6699f9f 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/tdetexteditor/editor.h
@@ -16,10 +16,10 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_editor_h__
-#define __ktexteditor_editor_h__
+#ifndef __tdetexteditor_editor_h__
+#define __tdetexteditor_editor_h__
-#include
+#include
/**
* KTextEditor is KDE's standard text editing KPart interface.
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
similarity index 100%
rename from interfaces/ktexteditor/editorchooser.cpp
rename to interfaces/tdetexteditor/editorchooser.cpp
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h
similarity index 95%
rename from interfaces/ktexteditor/editorchooser.h
rename to interfaces/tdetexteditor/editorchooser.h
index d56e8d8e5..251776c10 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/tdetexteditor/editorchooser.h
@@ -1,8 +1,8 @@
#ifndef _EDITOR_CHOOSER_H_
#define _EDITOR_CHOOSER_H_
-#include
-#include
+#include
+#include
#include
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/tdetexteditor/editorchooser_ui.ui
similarity index 100%
rename from interfaces/ktexteditor/editorchooser_ui.ui
rename to interfaces/tdetexteditor/editorchooser_ui.ui
diff --git a/interfaces/ktexteditor/encodingdcopinterface.cpp b/interfaces/tdetexteditor/encodingdcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/encodingdcopinterface.cpp
rename to interfaces/tdetexteditor/encodingdcopinterface.cpp
diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/tdetexteditor/encodingdcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/encodingdcopinterface.h
rename to interfaces/tdetexteditor/encodingdcopinterface.h
diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/tdetexteditor/encodinginterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/encodinginterface.cpp
rename to interfaces/tdetexteditor/encodinginterface.cpp
diff --git a/interfaces/ktexteditor/encodinginterface.h b/interfaces/tdetexteditor/encodinginterface.h
similarity index 94%
rename from interfaces/ktexteditor/encodinginterface.h
rename to interfaces/tdetexteditor/encodinginterface.h
index 5133d4a6e..42d0186ad 100644
--- a/interfaces/ktexteditor/encodinginterface.h
+++ b/interfaces/tdetexteditor/encodinginterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_encodinginterface_h__
-#define __ktexteditor_encodinginterface_h__
+#ifndef __tdetexteditor_encodinginterface_h__
+#define __tdetexteditor_encodinginterface_h__
#include
diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/tdetexteditor/highlightinginterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/highlightinginterface.cpp
rename to interfaces/tdetexteditor/highlightinginterface.cpp
diff --git a/interfaces/ktexteditor/highlightinginterface.h b/interfaces/tdetexteditor/highlightinginterface.h
similarity index 95%
rename from interfaces/ktexteditor/highlightinginterface.h
rename to interfaces/tdetexteditor/highlightinginterface.h
index 4eb31659f..e7bd811e2 100644
--- a/interfaces/ktexteditor/highlightinginterface.h
+++ b/interfaces/tdetexteditor/highlightinginterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_highlightinginterface_h__
-#define __ktexteditor_highlightinginterface_h__
+#ifndef __tdetexteditor_highlightinginterface_h__
+#define __tdetexteditor_highlightinginterface_h__
#include
diff --git a/interfaces/ktexteditor/kcm_ktexteditor.desktop b/interfaces/tdetexteditor/kcm_tdetexteditor.desktop
similarity index 100%
rename from interfaces/ktexteditor/kcm_ktexteditor.desktop
rename to interfaces/tdetexteditor/kcm_tdetexteditor.desktop
diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/tdetexteditor/markinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/markinterface.cpp
rename to interfaces/tdetexteditor/markinterface.cpp
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/tdetexteditor/markinterface.h
similarity index 98%
rename from interfaces/ktexteditor/markinterface.h
rename to interfaces/tdetexteditor/markinterface.h
index 025bcc47c..64e948572 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/tdetexteditor/markinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_markinterface_h__
-#define __ktexteditor_markinterface_h__
+#ifndef __tdetexteditor_markinterface_h__
+#define __tdetexteditor_markinterface_h__
#include
diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/tdetexteditor/markinterfaceextension.cpp
similarity index 100%
rename from interfaces/ktexteditor/markinterfaceextension.cpp
rename to interfaces/tdetexteditor/markinterfaceextension.cpp
diff --git a/interfaces/ktexteditor/markinterfaceextension.h b/interfaces/tdetexteditor/markinterfaceextension.h
similarity index 95%
rename from interfaces/ktexteditor/markinterfaceextension.h
rename to interfaces/tdetexteditor/markinterfaceextension.h
index efb7356de..7aef736db 100644
--- a/interfaces/ktexteditor/markinterfaceextension.h
+++ b/interfaces/tdetexteditor/markinterfaceextension.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_markinterface_extension_h__
-#define __ktexteditor_markinterface_extension_h__
+#ifndef __tdetexteditor_markinterface_extension_h__
+#define __tdetexteditor_markinterface_extension_h__
#include
#include
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h
similarity index 96%
rename from interfaces/ktexteditor/plugin.h
rename to interfaces/tdetexteditor/plugin.h
index f3cf5d4fc..68416bf78 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/tdetexteditor/plugin.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_plugin_h__
-#define __ktexteditor_plugin_h__
+#ifndef __tdetexteditor_plugin_h__
+#define __tdetexteditor_plugin_h__
#include
diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/tdetexteditor/popupmenuinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/popupmenuinterface.cpp
rename to interfaces/tdetexteditor/popupmenuinterface.cpp
diff --git a/interfaces/ktexteditor/popupmenuinterface.h b/interfaces/tdetexteditor/popupmenuinterface.h
similarity index 94%
rename from interfaces/ktexteditor/popupmenuinterface.h
rename to interfaces/tdetexteditor/popupmenuinterface.h
index 23c38f707..3ca833709 100644
--- a/interfaces/ktexteditor/popupmenuinterface.h
+++ b/interfaces/tdetexteditor/popupmenuinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_popupmenuinterface_h__
-#define __ktexteditor_popupmenuinterface_h__
+#ifndef __tdetexteditor_popupmenuinterface_h__
+#define __tdetexteditor_popupmenuinterface_h__
#include
diff --git a/interfaces/ktexteditor/printdcopinterface.cpp b/interfaces/tdetexteditor/printdcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/printdcopinterface.cpp
rename to interfaces/tdetexteditor/printdcopinterface.cpp
diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/tdetexteditor/printdcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/printdcopinterface.h
rename to interfaces/tdetexteditor/printdcopinterface.h
diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/tdetexteditor/printinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/printinterface.cpp
rename to interfaces/tdetexteditor/printinterface.cpp
diff --git a/interfaces/ktexteditor/printinterface.h b/interfaces/tdetexteditor/printinterface.h
similarity index 95%
rename from interfaces/ktexteditor/printinterface.h
rename to interfaces/tdetexteditor/printinterface.h
index 3da6213ac..cca453d6c 100644
--- a/interfaces/ktexteditor/printinterface.h
+++ b/interfaces/tdetexteditor/printinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_printinterface_h__
-#define __ktexteditor_printinterface_h__
+#ifndef __tdetexteditor_printinterface_h__
+#define __tdetexteditor_printinterface_h__
#include
diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/tdetexteditor/searchdcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/searchdcopinterface.cpp
rename to interfaces/tdetexteditor/searchdcopinterface.cpp
diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/tdetexteditor/searchdcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/searchdcopinterface.h
rename to interfaces/tdetexteditor/searchdcopinterface.h
diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/tdetexteditor/searchinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/searchinterface.cpp
rename to interfaces/tdetexteditor/searchinterface.cpp
diff --git a/interfaces/ktexteditor/searchinterface.h b/interfaces/tdetexteditor/searchinterface.h
similarity index 95%
rename from interfaces/ktexteditor/searchinterface.h
rename to interfaces/tdetexteditor/searchinterface.h
index 69952b785..f16c76dd1 100644
--- a/interfaces/ktexteditor/searchinterface.h
+++ b/interfaces/tdetexteditor/searchinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_searchinterface_h__
-#define __ktexteditor_searchinterface_h__
+#ifndef __tdetexteditor_searchinterface_h__
+#define __tdetexteditor_searchinterface_h__
#include
diff --git a/interfaces/ktexteditor/selectiondcopinterface.cpp b/interfaces/tdetexteditor/selectiondcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/selectiondcopinterface.cpp
rename to interfaces/tdetexteditor/selectiondcopinterface.cpp
diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/tdetexteditor/selectiondcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/selectiondcopinterface.h
rename to interfaces/tdetexteditor/selectiondcopinterface.h
diff --git a/interfaces/ktexteditor/selectionextdcopinterface.h b/interfaces/tdetexteditor/selectionextdcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/selectionextdcopinterface.h
rename to interfaces/tdetexteditor/selectionextdcopinterface.h
diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/tdetexteditor/selectioninterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/selectioninterface.cpp
rename to interfaces/tdetexteditor/selectioninterface.cpp
diff --git a/interfaces/ktexteditor/selectioninterface.h b/interfaces/tdetexteditor/selectioninterface.h
similarity index 96%
rename from interfaces/ktexteditor/selectioninterface.h
rename to interfaces/tdetexteditor/selectioninterface.h
index a6ba67bd8..03f50de33 100644
--- a/interfaces/ktexteditor/selectioninterface.h
+++ b/interfaces/tdetexteditor/selectioninterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_selectioninterface_h__
-#define __ktexteditor_selectioninterface_h__
+#ifndef __tdetexteditor_selectioninterface_h__
+#define __tdetexteditor_selectioninterface_h__
#include
diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/tdetexteditor/selectioninterfaceext.cpp
similarity index 100%
rename from interfaces/ktexteditor/selectioninterfaceext.cpp
rename to interfaces/tdetexteditor/selectioninterfaceext.cpp
diff --git a/interfaces/ktexteditor/selectioninterfaceext.h b/interfaces/tdetexteditor/selectioninterfaceext.h
similarity index 95%
rename from interfaces/ktexteditor/selectioninterfaceext.h
rename to interfaces/tdetexteditor/selectioninterfaceext.h
index 255d76f64..8f57fb7e9 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.h
+++ b/interfaces/tdetexteditor/selectioninterfaceext.h
@@ -19,8 +19,8 @@
$Id$
*/
-#ifndef __ktexteditor_selectioninterface_ext_h__
-#define __ktexteditor_selectioninterface_ext_h__
+#ifndef __tdetexteditor_selectioninterface_ext_h__
+#define __tdetexteditor_selectioninterface_ext_h__
#include
diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/tdetexteditor/sessionconfiginterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/sessionconfiginterface.cpp
rename to interfaces/tdetexteditor/sessionconfiginterface.cpp
diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/tdetexteditor/sessionconfiginterface.h
similarity index 95%
rename from interfaces/ktexteditor/sessionconfiginterface.h
rename to interfaces/tdetexteditor/sessionconfiginterface.h
index b4fb52233..f92502b36 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/tdetexteditor/sessionconfiginterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_sessionconfiginterface_h__
-#define __ktexteditor_sessionconfiginterface_h__
+#ifndef __tdetexteditor_sessionconfiginterface_h__
+#define __tdetexteditor_sessionconfiginterface_h__
#include
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/tdetexteditor/tdetexteditor.cpp
similarity index 98%
rename from interfaces/ktexteditor/ktexteditor.cpp
rename to interfaces/tdetexteditor/tdetexteditor.cpp
index c822dc93c..354361ed2 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/tdetexteditor/tdetexteditor.cpp
@@ -25,8 +25,8 @@
#include "editor.h"
#include
-#include
-#include
+#include
+#include
#include "document.moc"
#include "view.moc"
diff --git a/interfaces/ktexteditor/ktexteditor.desktop b/interfaces/tdetexteditor/tdetexteditor.desktop
similarity index 100%
rename from interfaces/ktexteditor/ktexteditor.desktop
rename to interfaces/tdetexteditor/tdetexteditor.desktop
diff --git a/interfaces/ktexteditor/ktexteditoreditor.desktop b/interfaces/tdetexteditor/tdetexteditoreditor.desktop
similarity index 100%
rename from interfaces/ktexteditor/ktexteditoreditor.desktop
rename to interfaces/tdetexteditor/tdetexteditoreditor.desktop
diff --git a/interfaces/ktexteditor/ktexteditorplugin.desktop b/interfaces/tdetexteditor/tdetexteditorplugin.desktop
similarity index 100%
rename from interfaces/ktexteditor/ktexteditorplugin.desktop
rename to interfaces/tdetexteditor/tdetexteditorplugin.desktop
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/templateinterface.cpp
rename to interfaces/tdetexteditor/templateinterface.cpp
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/tdetexteditor/templateinterface.h
similarity index 98%
rename from interfaces/ktexteditor/templateinterface.h
rename to interfaces/tdetexteditor/templateinterface.h
index a786bf461..6ffc40e73 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/tdetexteditor/templateinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_templateinterface_h__
-#define __ktexteditor_templateinterface_h__
+#ifndef __tdetexteditor_templateinterface_h__
+#define __tdetexteditor_templateinterface_h__
#include
#include
diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/tdetexteditor/texthintinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/texthintinterface.cpp
rename to interfaces/tdetexteditor/texthintinterface.cpp
diff --git a/interfaces/ktexteditor/texthintinterface.h b/interfaces/tdetexteditor/texthintinterface.h
similarity index 96%
rename from interfaces/ktexteditor/texthintinterface.h
rename to interfaces/tdetexteditor/texthintinterface.h
index e124fa369..4e6a5e12c 100644
--- a/interfaces/ktexteditor/texthintinterface.h
+++ b/interfaces/tdetexteditor/texthintinterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_texthintinterface_h__
-#define __ktexteditor_texthintinterface_h__
+#ifndef __tdetexteditor_texthintinterface_h__
+#define __tdetexteditor_texthintinterface_h__
#include
#include
diff --git a/interfaces/ktexteditor/undodcopinterface.cpp b/interfaces/tdetexteditor/undodcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/undodcopinterface.cpp
rename to interfaces/tdetexteditor/undodcopinterface.cpp
diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/tdetexteditor/undodcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/undodcopinterface.h
rename to interfaces/tdetexteditor/undodcopinterface.h
diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/tdetexteditor/undointerface.cpp
similarity index 100%
rename from interfaces/ktexteditor/undointerface.cpp
rename to interfaces/tdetexteditor/undointerface.cpp
diff --git a/interfaces/ktexteditor/undointerface.h b/interfaces/tdetexteditor/undointerface.h
similarity index 95%
rename from interfaces/ktexteditor/undointerface.h
rename to interfaces/tdetexteditor/undointerface.h
index b03e4cb4e..33162e43a 100644
--- a/interfaces/ktexteditor/undointerface.h
+++ b/interfaces/tdetexteditor/undointerface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_undointerface_h__
-#define __ktexteditor_undointerface_h__
+#ifndef __tdetexteditor_undointerface_h__
+#define __tdetexteditor_undointerface_h__
#include
diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/tdetexteditor/variableinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/variableinterface.cpp
rename to interfaces/tdetexteditor/variableinterface.cpp
diff --git a/interfaces/ktexteditor/variableinterface.h b/interfaces/tdetexteditor/variableinterface.h
similarity index 100%
rename from interfaces/ktexteditor/variableinterface.h
rename to interfaces/tdetexteditor/variableinterface.h
diff --git a/interfaces/ktexteditor/view.h b/interfaces/tdetexteditor/view.h
similarity index 96%
rename from interfaces/ktexteditor/view.h
rename to interfaces/tdetexteditor/view.h
index caa14d021..0a807d6b3 100644
--- a/interfaces/ktexteditor/view.h
+++ b/interfaces/tdetexteditor/view.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_view_h__
-#define __ktexteditor_view_h__
+#ifndef __tdetexteditor_view_h__
+#define __tdetexteditor_view_h__
#include
#include
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.cpp b/interfaces/tdetexteditor/viewcursordcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/viewcursordcopinterface.cpp
rename to interfaces/tdetexteditor/viewcursordcopinterface.cpp
diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/tdetexteditor/viewcursordcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/viewcursordcopinterface.h
rename to interfaces/tdetexteditor/viewcursordcopinterface.h
diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/tdetexteditor/viewcursorinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/viewcursorinterface.cpp
rename to interfaces/tdetexteditor/viewcursorinterface.cpp
diff --git a/interfaces/ktexteditor/viewcursorinterface.h b/interfaces/tdetexteditor/viewcursorinterface.h
similarity index 96%
rename from interfaces/ktexteditor/viewcursorinterface.h
rename to interfaces/tdetexteditor/viewcursorinterface.h
index fd6dae8ff..2fe7241e4 100644
--- a/interfaces/ktexteditor/viewcursorinterface.h
+++ b/interfaces/tdetexteditor/viewcursorinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_viewcursorinterface_h__
-#define __ktexteditor_viewcursorinterface_h__
+#ifndef __tdetexteditor_viewcursorinterface_h__
+#define __tdetexteditor_viewcursorinterface_h__
#include
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp
rename to interfaces/tdetexteditor/viewstatusmsgdcopinterface.cpp
diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
similarity index 100%
rename from interfaces/ktexteditor/viewstatusmsgdcopinterface.h
rename to interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/tdetexteditor/viewstatusmsginterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/viewstatusmsginterface.cpp
rename to interfaces/tdetexteditor/viewstatusmsginterface.cpp
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/tdetexteditor/viewstatusmsginterface.h
similarity index 94%
rename from interfaces/ktexteditor/viewstatusmsginterface.h
rename to interfaces/tdetexteditor/viewstatusmsginterface.h
index 709448124..3516f8758 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/tdetexteditor/viewstatusmsginterface.h
@@ -16,8 +16,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_viewstatusmsginterface_h__
-#define __ktexteditor_viewstatusmsginterface_h__
+#ifndef __tdetexteditor_viewstatusmsginterface_h__
+#define __tdetexteditor_viewstatusmsginterface_h__
#include
diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/tdetexteditor/wordwrapinterface.cpp
similarity index 100%
rename from interfaces/ktexteditor/wordwrapinterface.cpp
rename to interfaces/tdetexteditor/wordwrapinterface.cpp
diff --git a/interfaces/ktexteditor/wordwrapinterface.h b/interfaces/tdetexteditor/wordwrapinterface.h
similarity index 95%
rename from interfaces/ktexteditor/wordwrapinterface.h
rename to interfaces/tdetexteditor/wordwrapinterface.h
index 155e69ae2..55cc2ded9 100644
--- a/interfaces/ktexteditor/wordwrapinterface.h
+++ b/interfaces/tdetexteditor/wordwrapinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __ktexteditor_wordwrapinterface_h__
-#define __ktexteditor_wordwrapinterface_h__
+#ifndef __tdetexteditor_wordwrapinterface_h__
+#define __tdetexteditor_wordwrapinterface_h__
#include
diff --git a/interfaces/terminal/Makefile.am b/interfaces/terminal/Makefile.am
index 70bb091ef..3e2f8e4df 100644
--- a/interfaces/terminal/Makefile.am
+++ b/interfaces/terminal/Makefile.am
@@ -1,2 +1,2 @@
-ktexteditorinclude_HEADERS = kde_terminal_interface.h
-ktexteditorincludedir = $(includedir)
+tdetexteditorinclude_HEADERS = kde_terminal_interface.h
+tdetexteditorincludedir = $(includedir)
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index e1dacc6dc..399b6451c 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -1,5 +1,5 @@
#include
-#include
+#include
#include
#include
#include
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index 3cca65863..5f2619cf9 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES
##### other data ################################
install( FILES kab2kabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
-install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources )
+install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
@@ -102,7 +102,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.2.0
- LINK vcards-static vcard-shared kio-shared kresources-shared
+ LINK vcards-static vcard-shared kio-shared tderesources-shared
DEPENDENCIES addressee.h dcopidl
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kabc/Makefile.am b/kabc/Makefile.am
index c4aa489e7..ef989662f 100644
--- a/kabc/Makefile.am
+++ b/kabc/Makefile.am
@@ -22,7 +22,7 @@ CLEANFILES = addressee.h addressee.cpp field.cpp
lib_LTLIBRARIES = libkabc.la
libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
- $(top_builddir)/kresources/libkresources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
+ $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
libkabc_la_COMPILE_FIRST = addressee.h
libkabc_la_SOURCES = \
@@ -52,7 +52,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kab2kabc
-kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kab2kabc_LDADD = libkabc.la ../kab/libkab.la
kab2kabc_SOURCES = kab2kabc.cpp
@@ -60,7 +60,7 @@ autostart_DATA = kab2kabc.desktop
autostartdir = $(datadir)/autostart
manager_DATA = kabc_manager.desktop
-managerdir = $(kde_servicesdir)/kresources
+managerdir = $(kde_servicesdir)/tderesources
DOXYGEN_REFERENCES = tdecore tdeui
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 7b973be28..8b87b6898 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include
#include "addressee.h"
#include "field.h"
diff --git a/kabc/plugins/dir/CMakeLists.txt b/kabc/plugins/dir/CMakeLists.txt
index 1bc7d8daf..47f81a355 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/kabc/plugins/dir/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
##### other data ################################
-install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES dir.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_dir (library) ########################
diff --git a/kabc/plugins/dir/Makefile.am b/kabc/plugins/dir/Makefile.am
index f5c0c2523..52cd161e4 100644
--- a/kabc/plugins/dir/Makefile.am
+++ b/kabc/plugins/dir/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h
lib_LTLIBRARIES = libkabc_dir.la
libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
+libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_KFILE) $(LIB_TDEUI)
libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
kde_module_LTLIBRARIES = kabc_dir.la
@@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcedir.h
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = dir.desktop
resourcedirplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/kabc/plugins/dir/resourcedirconfig.h
index 4333fdae1..9df1778d3 100644
--- a/kabc/plugins/dir/resourcedirconfig.h
+++ b/kabc/plugins/dir/resourcedirconfig.h
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include
namespace KABC {
diff --git a/kabc/plugins/evolution/Makefile.am b/kabc/plugins/evolution/Makefile.am
index 5967b9433..fd7b9be3b 100644
--- a/kabc/plugins/evolution/Makefile.am
+++ b/kabc/plugins/evolution/Makefile.am
@@ -15,5 +15,5 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_evolution.pot
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = evolution.desktop
diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt
index 0c767b00d..3dbcd639f 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/kabc/plugins/file/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
##### other data ################################
-install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES file.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_file (library) #######################
diff --git a/kabc/plugins/file/Makefile.am b/kabc/plugins/file/Makefile.am
index 3060bfab5..832ec2283 100644
--- a/kabc/plugins/file/Makefile.am
+++ b/kabc/plugins/file/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourcefileconfig.h
lib_LTLIBRARIES = libkabc_file.la
libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
+libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_KFILE) $(LIB_TDECORE) $(LIB_TDEUI)
libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
@@ -24,5 +24,5 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcefile.h
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = file.desktop
diff --git a/kabc/plugins/file/resourcefileconfig.h b/kabc/plugins/file/resourcefileconfig.h
index 343a5623d..18c217eda 100644
--- a/kabc/plugins/file/resourcefileconfig.h
+++ b/kabc/plugins/file/resourcefileconfig.h
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include
namespace KABC {
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldapkio/CMakeLists.txt
index 57370c9cf..150377bd9 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/kabc/plugins/ldapkio/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
##### other data ################################
-install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_ldapkio ##############################
diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am
index 97cd9089c..a9803f650 100644
--- a/kabc/plugins/ldapkio/Makefile.am
+++ b/kabc/plugins/ldapkio/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourceldapkioconfig.h
lib_LTLIBRARIES = libkabc_ldapkio.la
libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/kresources/libkresources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libkabc_ldapkio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
kde_module_LTLIBRARIES = kabc_ldapkio.la
@@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourceldapkio.h
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = ldapkio.desktop
resourceldapkioplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h
index e14c7c428..0fde41d64 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h
@@ -27,7 +27,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt
index 5433af217..365922d6c 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/kabc/plugins/net/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES
##### other data ################################
-install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
##### kabc_net (library) ########################
diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am
index f4183d442..ca0ece015 100644
--- a/kabc/plugins/net/Makefile.am
+++ b/kabc/plugins/net/Makefile.am
@@ -22,7 +22,7 @@ messages: rc.cpp
kabcincludedir = $(includedir)/kabc
kabcinclude_HEADERS = resourcenet.h
-servicedir = $(kde_servicesdir)/kresources/kabc
+servicedir = $(kde_servicesdir)/tderesources/kabc
service_DATA = net.desktop
resourcenetplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/net/resourcenetconfig.h b/kabc/plugins/net/resourcenetconfig.h
index e07937739..3c8986122 100644
--- a/kabc/plugins/net/resourcenetconfig.h
+++ b/kabc/plugins/net/resourcenetconfig.h
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include
namespace KABC {
diff --git a/kabc/plugins/sql/Makefile.am b/kabc/plugins/sql/Makefile.am
index 6d638936f..3fa3986ce 100644
--- a/kabc/plugins/sql/Makefile.am
+++ b/kabc/plugins/sql/Makefile.am
@@ -15,6 +15,6 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc_sql.pot
-linkdir = $(kde_datadir)/kresources/contact
+linkdir = $(kde_datadir)/tderesources/contact
link_DATA = sql.desktop
EXTRA_DIST = $(link_DATA)
diff --git a/kabc/resource.h b/kabc/resource.h
index 4824ffda8..0f5167e7b 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -21,7 +21,7 @@
#ifndef KABC_RESOURCE_H
#define KABC_RESOURCE_H
-#include
+#include
#include "addressbook.h"
#include "plugin.h"
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 1cf436455..f3c5b5c0e 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am
index 3af688026..961d12bd4 100644
--- a/kabc/tests/Makefile.am
+++ b/kabc/tests/Makefile.am
@@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient
testlock_LDFLAGS = $(all_libraries)
testlock_SOURCES = testlock.cpp
-testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testldapclient_SOURCES = testldapclient.cpp
EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \
testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit
-testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testkabc_SOURCES = testkabc.cpp
-testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddressee_SOURCES = testaddressee.cpp
-testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddresseelist_SOURCES = testaddresseelist.cpp
-testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddressfmt_SOURCES = testaddressfmt.cpp
-testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testkabcdlg_SOURCES = testkabcdlg.cpp
-testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdistlist_SOURCES = testdistlist.cpp
-testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testaddresslineedit_SOURCES = testaddresslineedit.cpp
-bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigread_SOURCES = bigread.cpp
-bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
bigwrite_SOURCES = bigwrite.cpp
-testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdb_SOURCES = testdb.cpp
-kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kabcargl_SOURCES = kabcargl.cpp
diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am
index 738faff03..e8a33c3a9 100644
--- a/kabc/vcard/Makefile.am
+++ b/kabc/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) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testwrite_LDADD = libvcard.la
testwrite_SOURCES = testwrite.cpp
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testread_LDADD = libvcard.la
testread_SOURCES = testread.cpp
diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am
index e698c687a..53e4e42ab 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/kabc/vcardparser/Makefile.am
@@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2
-testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread_SOURCES = testread.cpp
-testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testread2_SOURCES = testread2.cpp testutils.cpp
-testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
testwrite_SOURCES = testwrite.cpp
diff --git a/kate/AUTHORS b/kate/AUTHORS
index c12c9810f..8239561ca 100644
--- a/kate/AUTHORS
+++ b/kate/AUTHORS
@@ -33,7 +33,7 @@
(original author of kwrite in kde 1.x until kde 2.1)
- Glen Parker
- (undo history, kspell-integration)
+ (undo history, tdespell-integration)
- Michael Koch
(port to KParts)
diff --git a/kate/ChangeLog b/kate/ChangeLog
index 9797ec671..0da6d5cc2 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -33,7 +33,7 @@
* some folding fixes (hopefully)
* memleak fix
* undo stuff changed a bit, 0 means unlimited like before, show
- that now in the dialog and add a comment to ktexteditor
+ that now in the dialog and add a comment to tdetexteditor
2002-08-26 Christoph Cullmann
* Fixes for folding, cleanup, move folding tree into the buffer,
diff --git a/kate/Mainpage.dox b/kate/Mainpage.dox
index 8d8515b52..0fc1d9490 100644
--- a/kate/Mainpage.dox
+++ b/kate/Mainpage.dox
@@ -31,6 +31,6 @@ Christoph Cullmann \
@lgpl
*/
-// DOXYGEN_REFERENCES = tdecore kio tdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
+// DOXYGEN_REFERENCES = tdecore kio tdeui tdeparts interfaces/kdocument interfaces/tdetexteditor kjs
// DOXYGEN_SET_PROJECT_NAME = Kate
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kate/Makefile.am b/kate/Makefile.am
index 04666d8cb..e39af3b7f 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 kparts
+DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts
include ../admin/Doxyfile.am
diff --git a/kate/data/css.xml b/kate/data/css.xml
index 02ab43036..f3e65d267 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -17,7 +17,7 @@
- Added CSS 3 properties "overflow-x", "overflow-y", "text-overflow", "box-shadow" and "outline-offset".
- Added CSS 3 color values: "rgba", "hsl" and "hsla".
- Added Gecko CSS properties: "-moz-border-*-colors".
- - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-khtml-".
+ - Added background size properties: "background-size" and prefixes: "-o-", "-webkit-" and "-tdehtml-".
- Version 2.01, by Mathieu Bonnet:
- Added CSS 3 property "border-radius".
@@ -196,7 +196,7 @@
- -o-text-overflow
- - -khtml-background-size
+ - -tdehtml-background-size
- konq_bgpos_x
- konq_bgpos_y
diff --git a/kate/data/katepartreadonlyui.rc b/kate/data/katepartreadonlyui.rc
index 5c899dbfb..e1fff590e 100644
--- a/kate/data/katepartreadonlyui.rc
+++ b/kate/data/katepartreadonlyui.rc
@@ -77,7 +77,7 @@
-
+
-
+
- -o-text-overflow
- - -khtml-background-size
+ - -tdehtml-background-size
- konq_bgpos_x
- konq_bgpos_y
diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt
index c747f184c..f62bcdb0f 100644
--- a/kate/interfaces/CMakeLists.txt
+++ b/kate/interfaces/CMakeLists.txt
@@ -42,6 +42,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK ktexteditor-shared
+ LINK tdetexteditor-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 94065cb3c..d14e58f89 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc
lib_LTLIBRARIES = libkatepartinterfaces.la
libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
+libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
kateinclude_HEADERS = document.h view.h
kateincludedir = $(includedir)/kate
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeparts -I$(top_srcdir) $(all_includes)
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 023840335..c56600357 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -19,24 +19,24 @@
#ifndef _KATE_DOCUMENT_INCLUDE_
#define _KATE_DOCUMENT_INCLUDE_
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 20bcdf531..3b2b8a4e1 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -19,14 +19,14 @@
#ifndef _KATE_VIEW_INCLUDE_
#define _KATE_VIEW_INCLUDE_
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
class TDEConfig;
diff --git a/kate/part/CMakeLists.txt b/kate/part/CMakeLists.txt
index 11e347212..72ac36f8a 100644
--- a/kate/part/CMakeLists.txt
+++ b/kate/part/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kio/kfile
${CMAKE_SOURCE_DIR}/kjs
- ${CMAKE_SOURCE_DIR}/kutils
+ ${CMAKE_SOURCE_DIR}/tdeutils
${CMAKE_SOURCE_DIR}/tdeprint
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
@@ -72,6 +72,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_kpart( ${target}
SOURCES dummy.cpp
EMBED kate-static
- LINK kjs-shared tdeprint-shared katepartinterfaces-shared kutils-shared
+ LINK kjs-shared tdeprint-shared katepartinterfaces-shared tdeutils-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kate/part/Makefile.am b/kate/part/Makefile.am
index 746c35813..a0e0edbc3 100644
--- a/kate/part/Makefile.am
+++ b/kate/part/Makefile.am
@@ -16,11 +16,11 @@ libkate_la_SOURCES = katesearch.cpp katebuffer.cpp katecmds.cpp \
libkatepart_la_SOURCES = dummy.cpp
-libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/kutils/libkutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
+libkatepart_la_LIBADD = libkate.la ../interfaces/libkatepartinterfaces.la $(LIB_TDEPRINT) $(top_builddir)/tdeutils/libtdeutils.la $(top_builddir)/kjs/libkjs.la $(LUA_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KPARTS) $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_KFILE) $(top_builddir)/dcop/libDCOP.la
libkatepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
+INCLUDES= -I../interfaces -I$(top_srcdir) -I$(top_srcdir)/tdeprint -I$(top_srcdir)/interfaces -I$(top_srcdir)/interfaces/kregexpeditor -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeutils -I$(top_builddir)/kjs $(LUA_INCLUDES) $(all_includes)
METASOURCES = AUTO
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 1661c69df..7d930570d 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -118,7 +118,7 @@ class KateFileLoader
if (c > 0)
{
- // fix utf16 LE, stolen from khtml ;)
+ // fix utf16 LE, stolen from tdehtml ;)
if ((c >= 2) && (m_codec->mibEnum() == 1000) && (m_buffer[1] == 0x00))
{
// utf16LE, we need to put the decoder in LE mode
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index c2bebc841..ce4af0ecf 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -28,7 +28,7 @@
#ifndef __KateCodeCompletion_H__
#define __KateCodeCompletion_H__
-#include
+#include
#include
#include
diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h
index 4c1f7294a..a698bc35d 100644
--- a/kate/part/kateconfig.h
+++ b/kate/part/kateconfig.h
@@ -19,7 +19,7 @@
#ifndef __KATE_CONFIG_H__
#define __KATE_CONFIG_H__
-#include
+#include
#include
#include
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index aa122a7b1..43f5977d8 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -35,8 +35,8 @@
#include "kateview.h"
-#include
-#include
+#include
+#include
#include
#include
@@ -64,7 +64,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index f8f190c14..03c8ac638 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -40,14 +40,14 @@
#include "katefiletype.h"
#include "kateschema.h"
#include "katetemplatehandler.h"
-#include
+#include
#include
#include
#include
-#include
+#include
#include
#include
@@ -112,7 +112,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
// my dcop object
setObjId ("KateDocument#"+documentDCOPSuffix());
- // ktexteditor interfaces
+ // tdetexteditor interfaces
setBlockSelectionInterfaceDCOPSuffix (documentDCOPSuffix());
setConfigInterfaceDCOPSuffix (documentDCOPSuffix());
setConfigInterfaceExtensionDCOPSuffix (documentDCOPSuffix());
@@ -2761,7 +2761,7 @@ bool KateDocument::closeURL()
}
//
- // first call the normal kparts implementation
+ // first call the normal tdeparts implementation
//
if (!KParts::ReadWritePart::closeURL ())
return false;
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index fec6983e4..1135a66fc 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -29,11 +29,11 @@
#include "../interfaces/document.h"
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
#include
@@ -955,7 +955,7 @@ class KateDocument : public Kate::Document,
/**
* Variable Reader
- * TODO add register functionality/ktexteditor interface
+ * TODO add register functionality/tdetexteditor interface
*/
private:
/**
diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h
index 75c6740d0..b604d47ce 100644
--- a/kate/part/katedocumenthelpers.h
+++ b/kate/part/katedocumenthelpers.h
@@ -23,7 +23,7 @@
#include "../interfaces/document.h"
-#include
+#include
#include
#include
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 79d3ac011..a01e3a32c 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -20,7 +20,7 @@
#define __KATE_FACTORY_H__
#include "katejscript.h"
-#include
+#include
#include
#include
@@ -148,7 +148,7 @@ class KateFactory
/**
* on start detected plugins
- * @return list of all at launch detected ktexteditor::plugins
+ * @return list of all at launch detected tdetexteditor::plugins
*/
inline const KTrader::OfferList &plugins () { return m_plugins; };
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index b7703ccdf..28b22c74e 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -52,7 +52,7 @@
namespace KJS {
-// taken from khtml
+// taken from tdehtml
// therefor thx to:
// Copyright (C) 1999-2003 Harri Porten (porten@kde.org)
// Copyright (C) 2001-2003 David Faure (faure@kde.org)
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index fa8b21f64..0cb802e97 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -40,7 +40,7 @@
#include
#include
#include
-#include
+#include
#include
#include