diff --git a/IconThemes/mono/scalable/actions/khtml_kget.svgz b/IconThemes/mono/scalable/actions/tdehtml_kget.svgz
similarity index 85%
rename from IconThemes/mono/scalable/actions/khtml_kget.svgz
rename to IconThemes/mono/scalable/actions/tdehtml_kget.svgz
index 6ee7e47..0157057 100644
Binary files a/IconThemes/mono/scalable/actions/khtml_kget.svgz and b/IconThemes/mono/scalable/actions/tdehtml_kget.svgz differ
diff --git a/IconThemes/mono/scalable/apps/kmid.svgz b/IconThemes/mono/scalable/apps/tdemid.svgz
similarity index 89%
rename from IconThemes/mono/scalable/apps/kmid.svgz
rename to IconThemes/mono/scalable/apps/tdemid.svgz
index 60c2827..e8b33e1 100644
Binary files a/IconThemes/mono/scalable/apps/kmid.svgz and b/IconThemes/mono/scalable/apps/tdemid.svgz differ
diff --git a/IconThemes/mono/scalable/apps/kmidi.svgz b/IconThemes/mono/scalable/apps/tdemidi.svgz
similarity index 89%
rename from IconThemes/mono/scalable/apps/kmidi.svgz
rename to IconThemes/mono/scalable/apps/tdemidi.svgz
index 5867fa0..e973805 100644
Binary files a/IconThemes/mono/scalable/apps/kmidi.svgz and b/IconThemes/mono/scalable/apps/tdemidi.svgz differ
diff --git a/IconThemes/mono/scalable/apps/kscreensaver.svgz b/IconThemes/mono/scalable/apps/tdescreensaver.svgz
similarity index 77%
rename from IconThemes/mono/scalable/apps/kscreensaver.svgz
rename to IconThemes/mono/scalable/apps/tdescreensaver.svgz
index 68ac06c..60d1552 100644
Binary files a/IconThemes/mono/scalable/apps/kscreensaver.svgz and b/IconThemes/mono/scalable/apps/tdescreensaver.svgz differ
diff --git a/IconThemes/mono/scalable/apps/kwallet.svgz b/IconThemes/mono/scalable/apps/tdewallet.svgz
similarity index 100%
rename from IconThemes/mono/scalable/apps/kwallet.svgz
rename to IconThemes/mono/scalable/apps/tdewallet.svgz
diff --git a/IconThemes/mono/scalable/apps/kwalletmanager.svgz b/IconThemes/mono/scalable/apps/tdewalletmanager.svgz
similarity index 100%
rename from IconThemes/mono/scalable/apps/kwalletmanager.svgz
rename to IconThemes/mono/scalable/apps/tdewalletmanager.svgz
diff --git a/IconThemes/mono/scalable/mimetypes/kmultiple.svgz b/IconThemes/mono/scalable/mimetypes/tdemultiple.svgz
similarity index 90%
rename from IconThemes/mono/scalable/mimetypes/kmultiple.svgz
rename to IconThemes/mono/scalable/mimetypes/tdemultiple.svgz
index cfed5b8..ae65161 100644
Binary files a/IconThemes/mono/scalable/mimetypes/kmultiple.svgz and b/IconThemes/mono/scalable/mimetypes/tdemultiple.svgz differ
diff --git a/doc/kttsd/index.docbook b/doc/kttsd/index.docbook
index 45afec2..1750c9d 100644
--- a/doc/kttsd/index.docbook
+++ b/doc/kttsd/index.docbook
@@ -194,13 +194,13 @@ kttsd. kttsmgr sits in the system tray.
-libkhtmlkttsdplugin
+libtdehtmlkttsdplugin
A plugin for the &konqueror; web browser that permits you
to speak all or a portion of the text on a web page.
-ktexteditor_kttsd
+tdetexteditor_kttsd
A plugin for the &kate; text editor that permits you to speak
all or a portion of a text file.
diff --git a/kmag/Makefile.am b/kmag/Makefile.am
index ec7bf5e..a4387d2 100644
--- a/kmag/Makefile.am
+++ b/kmag/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
KDE_OPTIONS = nofinal
# the library search path.
-kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kmag
rc_DATA = kmagui.rc
diff --git a/kmousetool/kmousetool/Makefile.am b/kmousetool/kmousetool/Makefile.am
index b619b5a..7418514 100644
--- a/kmousetool/kmousetool/Makefile.am
+++ b/kmousetool/kmousetool/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO
# the library search path.
-kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
messages: rc.cpp
LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
diff --git a/kmouth/Makefile.am b/kmouth/Makefile.am
index a78d4a5..d48dfb4 100644
--- a/kmouth/Makefile.am
+++ b/kmouth/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES= -Iphrasebook -Iwordcompletion $(all_includes)
METASOURCES = AUTO
# the library search path.
-kmouth_LDFLAGS = $(all_libraries) -lkspell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmouth_LDFLAGS = $(all_libraries) -ltdespell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kmouth
rc_DATA = kmouthui.rc
diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index fe79eba..e173380 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -31,7 +31,7 @@
#include
#include
#include
-#include
+#include
#include "optionsdialog.h"
#include "wordcompletion/wordcompletionwidget.h"
diff --git a/ksayit/src/Makefile.am b/ksayit/src/Makefile.am
index ff2dd4e..ff0e43e 100644
--- a/ksayit/src/Makefile.am
+++ b/ksayit/src/Makefile.am
@@ -31,7 +31,7 @@ ksayit_SOURCES = doctreeviewimpl.cpp effectstack.cpp fxpluginhandler.cpp \
parasaxparser.cpp saxhandler.cpp ksayitbookmarkhandler.cpp contextmenuhandler.cpp docbookclasses.cpp \
docbookgenerator.cpp docbookparser.cpp
-ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lartsflow -lartsflow_idl
+ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lartsflow -lartsflow_idl
ksayit_LDADD = $(top_builddir)/ksayit/KTTSD_Lib/libKTTSD_Lib.la $(LIB_KIO) \
-lartskde -lsoundserver_idl -lartsflow -lartsflow_idl
diff --git a/kttsd/ChangeLog b/kttsd/ChangeLog
index 441502c..f74d51b 100644
--- a/kttsd/ChangeLog
+++ b/kttsd/ChangeLog
@@ -263,7 +263,7 @@
2004-12-20 Gary Cramblitt (PhantomsDad)
* kdenonbeta/kttsd moved to tdeaccessibility/kttsd.
* kdenonbeta/kttsd/libktts moved to tdelibs/interfaces/kspeech. libktts dropped.
- * kdenonbeta/app-plugins/khtml-plugin moved to tdebase/konqueror/kttsplugin.
+ * kdenonbeta/app-plugins/tdehtml-plugin moved to tdebase/konqueror/kttsplugin.
* kdenonbeta/app-plugins/kate-plugin moved to tdebase/kate/plugins/ktts.
* kdenonbeta/app-plugins/katepart-plugin moved to tdebase/kate/plugin/katepartktts.
diff --git a/kttsd/README b/kttsd/README
index 0b4c292..6a9bf2e 100644
--- a/kttsd/README
+++ b/kttsd/README
@@ -21,7 +21,7 @@ kcmkttsd
A KControl module for configuring the KTTS System. kcmkttsd runs in the
TDE Control Center or start it with the command "kcmshell kcmkttsd".
-ktexteditor_kttsd
+tdetexteditor_kttsd
A plugin for the KDE Advanced Text Editor that permits you to speak an entire
text file or any portion of a file.
diff --git a/kttsd/README.kttsd b/kttsd/README.kttsd
index 9661507..9ddeb8d 100644
--- a/kttsd/README.kttsd
+++ b/kttsd/README.kttsd
@@ -5,6 +5,6 @@ Most of it has moved to tdeaccessibility/kttsd.
The following pieces were also moved.
kttsd/libktts -> tdelibs/interfaces/kspeech
-kttsd/app-plugins/khtml-plugin -> tdebase/konqueror/kttsplugin
+kttsd/app-plugins/tdehtml-plugin -> tdebase/konqueror/kttsplugin
kttsd/app-plugins/kate-plugin -> tdebase/kate/plugins/ktts
kttsd/app-plugins/katepart-plugin -> tdebase/kate/plugin/katepartktts
diff --git a/kttsd/app-plugins/kate/Makefile.am b/kttsd/app-plugins/kate/Makefile.am
index 16d8eff..c0f9b34 100644
--- a/kttsd/app-plugins/kate/Makefile.am
+++ b/kttsd/app-plugins/kate/Makefile.am
@@ -7,13 +7,13 @@ INCLUDES = \
METASOURCES = AUTO
# Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = ktexteditor_kttsd.la
+kde_module_LTLIBRARIES = tdetexteditor_kttsd.la
-ktexteditor_kttsd_la_SOURCES = katekttsd.cpp
-ktexteditor_kttsd_la_LIBADD = -lktexteditor
-ktexteditor_kttsd_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+tdetexteditor_kttsd_la_SOURCES = katekttsd.cpp
+tdetexteditor_kttsd_la_LIBADD = -ltdetexteditor
+tdetexteditor_kttsd_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-kttsddatadir = $(kde_datadir)/ktexteditor_kttsd
-kttsddata_DATA = ktexteditor_kttsdui.rc
+kttsddatadir = $(kde_datadir)/tdetexteditor_kttsd
+kttsddata_DATA = tdetexteditor_kttsdui.rc
-kde_services_DATA = ktexteditor_kttsd.desktop
+kde_services_DATA = tdetexteditor_kttsd.desktop
diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp
index 9ee05e6..7354f7f 100644
--- a/kttsd/app-plugins/kate/katekttsd.cpp
+++ b/kttsd/app-plugins/kate/katekttsd.cpp
@@ -23,8 +23,8 @@
#include
// KDE includes.
-#include
-#include
+#include
+#include
#include
#include
@@ -36,7 +36,7 @@
#include "katekttsd.h"
#include "katekttsd.moc"
-K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory( "ktexteditor_kttsd" ) )
+K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kttsd, KGenericFactory( "tdetexteditor_kttsd" ) )
KateKttsdPlugin::KateKttsdPlugin( TQObject *parent, const char* name, const TQStringList& )
: KTextEditor::Plugin ( (KTextEditor::Document*) parent, name )
@@ -75,7 +75,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n
setInstance( KGenericFactory::instance() );
TDEGlobal::locale()->insertCatalogue("kttsd");
(void) new KAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" );
- setXMLFile( "ktexteditor_kttsdui.rc" );
+ setXMLFile( "tdetexteditor_kttsdui.rc" );
}
void KateKttsdPluginView::slotReadOut()
diff --git a/kttsd/app-plugins/kate/katekttsd.h b/kttsd/app-plugins/kate/katekttsd.h
index ed4ac6d..e137aee 100644
--- a/kttsd/app-plugins/kate/katekttsd.h
+++ b/kttsd/app-plugins/kate/katekttsd.h
@@ -20,8 +20,8 @@
#ifndef _KATEKTTSD_H_
#define _KATEKTTSD_H_
-#include
-#include
+#include
+#include
#include
#include
diff --git a/kttsd/app-plugins/kate/ktexteditor_kttsd.desktop b/kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop
similarity index 99%
rename from kttsd/app-plugins/kate/ktexteditor_kttsd.desktop
rename to kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop
index 7985419..b6a5e1e 100644
--- a/kttsd/app-plugins/kate/ktexteditor_kttsd.desktop
+++ b/kttsd/app-plugins/kate/tdetexteditor_kttsd.desktop
@@ -97,7 +97,7 @@ Comment[zh_CN]=添加可读出文本的菜单项
Comment[zh_TW]=新增朗讀文字的目錄
Type=Service
ServiceTypes=KTextEditor/Plugin
-X-TDE-Library=ktexteditor_kttsd
+X-TDE-Library=tdetexteditor_kttsd
X-Kate-Version=2.2
MimeType=text/plain
Icon=kttsd
diff --git a/kttsd/app-plugins/kate/ktexteditor_kttsdui.rc b/kttsd/app-plugins/kate/tdetexteditor_kttsdui.rc
similarity index 77%
rename from kttsd/app-plugins/kate/ktexteditor_kttsdui.rc
rename to kttsd/app-plugins/kate/tdetexteditor_kttsdui.rc
index 9dea629..3277b00 100644
--- a/kttsd/app-plugins/kate/ktexteditor_kttsdui.rc
+++ b/kttsd/app-plugins/kate/tdetexteditor_kttsdui.rc
@@ -1,5 +1,5 @@
-
+