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

22 files changed, 89 insertions, 89 deletions

diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index f7c1027d7..e738e7be3 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -72,7 +72,7 @@ install( FILES
     kstringvalidator.h twindowinfo.h
     ktextedit.h kpassivepopup.h
     kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h
-    kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h
+    tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h
     ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h
     kactionselector.h klanguagebutton.h klistviewsearchline.h
     kpixmapregionselectorwidget.h kpixmapregionselectordialog.h
@@ -136,9 +136,9 @@ set( ${target}_SRCS
   kstringvalidator.cpp kactivelabel.cpp
   twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp
   ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
-  ksconfig.cpp kspelldlg.cpp
-  kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
-  ksplashscreen.cpp kspellui.ui kconfigdialog.cpp
+  ksconfig.cpp tdespelldlg.cpp
+  tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
+  ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp
   kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
   kwhatsthismanager.cpp kiconviewsearchline.cpp
@@ -154,9 +154,9 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### libkspell #################################
+##### libtdespell #################################
 
-set( target kspell )
+set( target tdespell )
 
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
 
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index b28c38584..f3ccef8b7 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -26,12 +26,12 @@ INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/tdefx -I$(top_srcdir)/interf
 # into $(all_libraries) isn't better
 AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
-lib_LTLIBRARIES = libtdeui.la libkspell.la
+lib_LTLIBRARIES = libtdeui.la libtdespell.la
 libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
 libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT)
 
-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkspell_la_SOURCES = dummy.cpp
+libtdespell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+libtdespell_la_SOURCES = dummy.cpp
 
 picsdir = $(kde_datadir)/tdeui/pics
 pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png
@@ -69,7 +69,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kstringvalidator.h twindowinfo.h \
 		ktextedit.h kpassivepopup.h \
 		kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \
-		kspell.h ksconfig.h kspelldlg.h ksyntaxhighlighter.h \
+		tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h \
 		ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h \
 		kactionselector.h klanguagebutton.h klistviewsearchline.h \
 		kpixmapregionselectorwidget.h kpixmapregionselectordialog.h \
@@ -117,9 +117,9 @@ libtdeui_la_SOURCES = \
 		kstringvalidator.cpp kactivelabel.cpp \
 		twindowinfo.cpp ktextedit.cpp kwizard.cpp kpassivepopup.cpp \
 		ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
-		ksconfig.cpp kspelldlg.cpp \
-		kspell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
-		ksplashscreen.cpp kspellui.ui kconfigdialog.cpp \
+		ksconfig.cpp tdespelldlg.cpp \
+		tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
+		ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp \
 		kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp \
 		kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
 		kwhatsthismanager.cpp kiconviewsearchline.cpp \
@@ -166,6 +166,6 @@ dummy.cpp:
 	echo "}" >> dummy.cpp
 	echo "#endif" >> dummy.cpp
 
-DOXYGEN_REFERENCES = tdecore tdefx dcop kio kutils
+DOXYGEN_REFERENCES = tdecore tdefx dcop kio tdeutils
 DOXYGEN_SET_INTERNAL_DOCS = YES
 include ../admin/Doxyfile.am
diff --git a/tdeui/README.kspell b/tdeui/README.tdespell
index 9ae1afe84..e5262f057 100644
--- a/tdeui/README.kspell
+++ b/tdeui/README.tdespell
@@ -2,7 +2,7 @@ KSpell, by David Sweet
 ----------------------
 KSpell provides an interface to ASpell and International ISpell 3.1.  You
 should use it like a UI widget to provide spellchecking in your application. 
-See kspell.h and http://www.chaos.umd.edu/~dsweet/KDE/KSpell for
+See tdespell.h and http://www.chaos.umd.edu/~dsweet/KDE/KSpell for
 documentation.
 
 Settings
@@ -12,6 +12,6 @@ not only as a widget allowing the user to set KSpell preferences, but also
 as a data abstraction class allowing you to get and set the preferences from
 within your program.  You can pass an instance of KSpellConfig to KSpell
 and the spellchecker will run with the appropriate preference settings.  The
-preferences, when saved (see kspelldlg.h) are saved globally.  If needed,
+preferences, when saved (see tdespelldlg.h) are saved globally.  If needed,
 you can read them with KSpellDlg and set and use application-specific
 spellchecking settings.
diff --git a/tdeui/TODO.kspell b/tdeui/TODO.tdespell
index 99c9df408..99c9df408 100644
--- a/tdeui/TODO.kspell
+++ b/tdeui/TODO.tdespell
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 92907a4bc..58ea0f867 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -341,7 +341,7 @@ const char * const packages[] = {
 "kcontrol/kcmknotify",
 "kcontrol/kcmkonq",
 "kcontrol/kcmkonqhtml",
-"kcontrol/kcmkresources",
+"kcontrol/kcmtderesources",
 "kcontrol/kcmksplash",
 "kcontrol/kcmkurifilt",
 "kcontrol/kcmkvaio",
@@ -408,12 +408,12 @@ const char * const packages[] = {
 "tdeaddons/kate-filetemplates",
 "tdeaddons/kate-insertcommand",
 "tdeaddons/kate-xmltools",
-"tdeaddons/khtmlsettings-plugin",
+"tdeaddons/tdehtmlsettings-plugin",
 "tdeaddons/useragent-plugin",
 "kdebugdialog",
 "tdelibs",
 "tdelibs/kbugreport",
-"tdelibs/kcertpart",
+"tdelibs/tdecertpart",
 "tdelibs/tdecore",
 "tdelibs/kded",
 "tdelibs/tdeinit",
@@ -423,14 +423,14 @@ const char * const packages[] = {
 "tdelibs/kimgio",
 "tdelibs/klauncher",
 "tdelibs/klocale",
-"tdelibs/kmdi",
+"tdelibs/tdemdi",
 "tdelibs/knetwork",
 "tdelibs/knewstuff",
 "tdelibs/knotify",
-"tdelibs/kspell",
+"tdelibs/tdespell",
 "tdelibs/kstyle",
-"tdelibs/ksycoca",
-"tdelibs/kwallet",
+"tdelibs/tdesycoca",
+"tdelibs/tdewallet",
 "tdelibs/qt",
 "kdelirc",
 "kdelirc/irkick",
@@ -782,8 +782,8 @@ const char * const packages[] = {
 "kmenuedit",
 "kmerlin",
 "kmessedwords",
-"kmid",
-"kmidi",
+"tdemid",
+"tdemidi",
 "kmilo",
 "kmilo/Asus",
 "kmilo/Dell i8k",
@@ -859,17 +859,17 @@ const char * const packages[] = {
 "konqueror/fsview",
 "konqueror/imagerotation",
 "konqueror/kcookiejar",
-"konqueror/khtml adblock",
-"konqueror/khtml ecma",
-"konqueror/khtml event",
-"konqueror/khtml forms",
-"konqueror/khtml image part",
-"konqueror/khtml parsing",
-"konqueror/khtml part",
-"konqueror/khtml printing",
-"konqueror/khtml renderer",
-"konqueror/khtml xml",
-"konqueror/khtml",
+"konqueror/tdehtml adblock",
+"konqueror/tdehtml ecma",
+"konqueror/tdehtml event",
+"konqueror/tdehtml forms",
+"konqueror/tdehtml image part",
+"konqueror/tdehtml parsing",
+"konqueror/tdehtml part",
+"konqueror/tdehtml printing",
+"konqueror/tdehtml renderer",
+"konqueror/tdehtml xml",
+"konqueror/tdehtml",
 "konqueror/kimgalleryplugin",
 "konqueror/kjava",
 "konqueror/kjs",
@@ -1005,9 +1005,9 @@ const char * const packages[] = {
 "kpresenter/usability",
 "kqf",
 "kquick",
-"krandr",
-"krandr/control center",
-"krandr/krandrtray",
+"tderandr",
+"tderandr/control center",
+"tderandr/tderandrtray",
 "krdc",
 "kreatecd",
 "krec",
@@ -1016,22 +1016,22 @@ const char * const packages[] = {
 "krec/wave_export",
 "krecord",
 "kregexpeditor",
-"kresources",
-"kresources/SLOX",
-"kresources/birthdays",
-"kresources/blogging",
-"kresources/bugzilla",
-"kresources/egroupware",
-"kresources/exchange",
-"kresources/featureplan",
-"kresources/framework",
-"kresources/groupdav",
-"kresources/groupwise",
-"kresources/imap",
-"kresources/ldap",
-"kresources/local",
-"kresources/newexchange",
-"kresources/remote",
+"tderesources",
+"tderesources/SLOX",
+"tderesources/birthdays",
+"tderesources/blogging",
+"tderesources/bugzilla",
+"tderesources/egroupware",
+"tderesources/exchange",
+"tderesources/featureplan",
+"tderesources/framework",
+"tderesources/groupdav",
+"tderesources/groupwise",
+"tderesources/imap",
+"tderesources/ldap",
+"tderesources/local",
+"tderesources/newexchange",
+"tderesources/remote",
 "kreversi",
 "krfb",
 "krichtexteditor",
@@ -1051,12 +1051,12 @@ const char * const packages[] = {
 "ksame",
 "ksayit",
 "kscd",
-"kscreensaver",
-"kscreensaver/kcheckpass",
-"kscreensaver/kpartsaver",
-"kscreensaver/ktux",
-"kscreensaver/kxsrun",
-"kscreensaver/screensavers",
+"tdescreensaver",
+"tdescreensaver/kcheckpass",
+"tdescreensaver/tdepartsaver",
+"tdescreensaver/ktux",
+"tdescreensaver/kxsrun",
+"tdescreensaver/screensavers",
 "kshisen",
 "ksim",
 "ksirc",
@@ -1145,7 +1145,7 @@ const char * const packages[] = {
 "kvim",
 "kvim/Vim KPart",
 "kvoctrain",
-"kwalletmanager",
+"tdewalletmanager",
 "kweather",
 "kwebget",
 "kwifimanager",
@@ -1271,7 +1271,7 @@ const char * const packages[] = {
 "systemsettings/joystick",
 "systemsettings/kcm_useraccount",
 "systemsettings/kcmkded",
-"systemsettings/kcmkdnssd",
+"systemsettings/kcmtdednssd",
 "systemsettings/kcmknotify",
 "systemsettings/kcmlaunch",
 "systemsettings/tdm",
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index e97a5affd..a72532e3d 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -241,7 +241,7 @@ private:
 
 /**
  * A mini-button usually placed in the dockpanel.
- * @internal (but used by kmdi/dockcontainer.cpp)
+ * @internal (but used by tdemdi/dockcontainer.cpp)
  *
  * @author Max Judin.
 */
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 4bbc12c30..92ca542d4 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -1023,9 +1023,9 @@ void KEdit::misspelling (const TQString &word, const TQStringList &, unsigned in
 
   /*
   if (cursorPoint().y()>height()/2)
-    kspell->moveDlg (10, height()/2-kspell->heightDlg()-15);
+    tdespell->moveDlg (10, height()/2-tdespell->heightDlg()-15);
   else
-    kspell->moveDlg (10, height()/2 + 15);
+    tdespell->moveDlg (10, height()/2 + 15);
   */
 
 }
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 3f116b903..563b007c0 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -292,7 +292,7 @@ public:
           name = i18n( txt );
 
       // the name of the toolbar might depend on whether or not
-      // it is in kparts
+      // it is in tdeparts
       if ( ( xmlData.m_type == XmlData::Shell ) ||
            ( xmlData.m_type == XmlData::Part ) )
       {
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index c5ec9dcf0..d74a40706 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -965,7 +965,7 @@ void KSpellConfig::activateHelp( void )
 
 void KSpellConfig::sHelp( void )
 {
-  kapp->invokeHelp("configuration", "kspell");
+  kapp->invokeHelp("configuration", "tdespell");
 }
 
 /*
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index 941405854..b0ca46fd9 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -238,7 +238,7 @@ class TDEUI_EXPORT KSpellConfig : public TQWidget
 
   protected slots:
     /**
-     * Invokes the help documentation for kspell
+     * Invokes the help documentation for tdespell
      */ 
     void sHelp();
     //void sBrowseDict();
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 50f594c89..866bcfce1 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -30,7 +30,7 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kapplication.h>
 
 #include "ksyntaxhighlighter.h"
@@ -371,7 +371,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word )
     // This debug is expensive, only enable it locally
     //kdDebug(0) << "KDictSpellingHighlighter::isMisspelled( \"" << word << "\" )" << endl;
     // Normally isMisspelled would look up a dictionary and return
-    // true or false, but kspell is asynchronous and slow so things
+    // true or false, but tdespell is asynchronous and slow so things
     // get tricky...
     // For auto detection ignore signature and reply prefix
     if ( !d->autoReady )
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index aff96f9a5..e447eab26 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -414,7 +414,7 @@ void KTabWidget::moveTab( int from, int to )
     blockSignals(true);
     removePage( w );
 
-    // Work-around kmdi brain damage which calls showPage() in insertTab()
+    // Work-around tdemdi brain damage which calls showPage() in insertTab()
     TQTab * t = new TQTab();
     t->setText(tablabel);
     TQTabWidget::insertTab( w, t, to );
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index 5b1795321..eac18058b 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 
 #include <ksyntaxhighlighter.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
 #include <kstdaccel.h>
diff --git a/tdeui/kspell.cpp b/tdeui/tdespell.cpp
index b91c74a4d..90919c1f3 100644
--- a/tdeui/kspell.cpp
+++ b/tdeui/tdespell.cpp
@@ -41,8 +41,8 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include "kspell.h"
-#include "kspelldlg.h"
+#include "tdespell.h"
+#include "tdespelldlg.h"
 #include <twin.h>
 #include <kprocio.h>
 
@@ -236,7 +236,7 @@ KSpell::startIspell()
 
   //Note to potential debuggers:  -Tlatin2 _is_ being added on the
   //  _first_ try.  But, some versions of ispell will fail with this
-  // option, so kspell tries again without it.  That's why as 'ps -ax'
+  // option, so tdespell tries again without it.  That's why as 'ps -ax'
   // shows "ispell -a -S ..." withou the "-Tlatin2" option.
 
     if ( trystart<1 ) {
@@ -595,7 +595,7 @@ void KSpell::checkWord2( KProcIO* )
 
 void KSpell::checkNext()
 {
-// Queue words to prevent kspell from turning into a fork bomb
+// Queue words to prevent tdespell from turning into a fork bomb
   d->checking = false;
   if (!d->unchecked.empty()) {
     BufferedWord buf = d->unchecked.front();
@@ -1558,7 +1558,7 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
   maxtrystart = 2;
 
   if ( obj && slot )
-      // caller wants to know when kspell is ready
+      // caller wants to know when tdespell is ready
       connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot);
   else
       // Hack for modal spell checking
@@ -1573,5 +1573,5 @@ TQString KSpell::modaltext;
 int KSpell::modalreturn = 0;
 TQWidget* KSpell::modalWidgetHack = 0;
 
-#include "kspell.moc"
+#include "tdespell.moc"
 
diff --git a/tdeui/kspell.h b/tdeui/tdespell.h
index fef733507..812c3e0d7 100644
--- a/tdeui/kspell.h
+++ b/tdeui/tdespell.h
@@ -227,7 +227,7 @@ public:
    * After calling checkWord, you can use this to get the dialog box's
    *  result code.
    * The possible
-   *  values are (from kspelldlg.h):
+   *  values are (from tdespelldlg.h):
    *    @li KS_CANCEL
    *    @li KS_REPLACE
    *    @li KS_REPLACEALL
diff --git a/tdeui/kspelldlg.cpp b/tdeui/tdespelldlg.cpp
index d21b6975e..b0752cfd1 100644
--- a/tdeui/kspelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -36,8 +36,8 @@
 #include <kdebug.h>
 
 #include "ksconfig.h"
-#include "kspelldlg.h"
-#include "kspellui.h"
+#include "tdespelldlg.h"
+#include "tdespellui.h"
 
 //to initially disable sorting in the suggestions listview
 #define NONSORTINGCOLUMN 2
@@ -99,7 +99,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
   connect( d->spellConfig, TQT_SIGNAL(configChanged()),
            TQT_SLOT(slotConfigChanged()) );
 
-  setHelp( "spelldlg", "kspell" );
+  setHelp( "spelldlg", "tdespell" );
   setMinimumSize( sizeHint() );
   emit ready( false );
 }
@@ -282,4 +282,4 @@ KSpellDlg::slotConfigChanged()
   done( KS_CONFIG );
 }
 
-#include "kspelldlg.moc"
+#include "tdespelldlg.moc"
diff --git a/tdeui/kspelldlg.h b/tdeui/tdespelldlg.h
index c42476814..c42476814 100644
--- a/tdeui/kspelldlg.h
+++ b/tdeui/tdespelldlg.h
diff --git a/tdeui/kspellui.ui b/tdeui/tdespellui.ui
index ac1deecd7..ac1deecd7 100644
--- a/tdeui/kspellui.ui
+++ b/tdeui/tdespellui.ui
diff --git a/tdeui/tests/CMakeLists.txt b/tdeui/tests/CMakeLists.txt
index 9b3cc6568..3d53611c4 100644
--- a/tdeui/tests/CMakeLists.txt
+++ b/tdeui/tests/CMakeLists.txt
@@ -39,7 +39,7 @@ set( test_PROGS
   kxmlguitest kaccelgentest ksystemtraytest klistviewtest
   ktextedittest kmainwindowtest kmainwindowrestoretest
   kactiontest kdatetimewidgettest ktimewidgettest
-  kspelltest kinputdialogtest ktabwidgettest kwordwraptest
+  tdespelltest kinputdialogtest ktabwidgettest kwordwraptest
   kdocktest qxembedtest ksqueezedtextlabeltest
   kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
 )
diff --git a/tdeui/tests/Makefile.am b/tdeui/tests/Makefile.am
index a7c0cb26d..9af863946 100644
--- a/tdeui/tests/Makefile.am
+++ b/tdeui/tests/Makefile.am
@@ -38,7 +38,7 @@ check_PROGRAMS = kaboutdialogtest kblendtest kbuttonboxtest kcharselecttest \
 	kxmlguitest kaccelgentest ksystemtraytest klistviewtest \
 	ktextedittest kmainwindowtest kmainwindowrestoretest \
 	kactiontest kdatetimewidgettest ktimewidgettest \
-	kspelltest kinputdialogtest ktabwidgettest kwordwraptest \
+	tdespelltest kinputdialogtest ktabwidgettest kwordwraptest \
 	kdocktest qxembedtest ksqueezedtextlabeltest \
 	kpixmapregionselectordialogtest kjanuswidgettest ktoolbarlabelactiontest
 
@@ -93,7 +93,7 @@ ktextedittest_SOURCES = ktextedittest.cpp
 kmainwindowtest_SOURCES = kmainwindowtest.cpp
 kmainwindowrestoretest_SOURCES = kmainwindowrestoretest.cpp
 kactiontest_SOURCES = kactiontest.cpp
-kspelltest_SOURCES = kspelltest.cpp
+tdespelltest_SOURCES = tdespelltest.cpp
 kinputdialogtest_SOURCES = kinputdialogtest.cpp
 ktabwidgettest_SOURCES = ktabwidgettest.cpp
 kwordwraptest_SOURCES = kwordwraptest.cpp
diff --git a/tdeui/tests/kxmlguitest_part.rc b/tdeui/tests/kxmlguitest_part.rc
index 84f5e4f57..b6454cf30 100644
--- a/tdeui/tests/kxmlguitest_part.rc
+++ b/tdeui/tests/kxmlguitest_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="khtmlpart" version="7">
+<kpartgui name="tdehtmlpart" version="7">
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
  <Action name="decFontSizes" />
  <Separator />
diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/tdespelltest.cpp
index 7941ade87..b4b5e571e 100644
--- a/tdeui/tests/kspelltest.cpp
+++ b/tdeui/tests/tdespelltest.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kspell.h"
+#include "tdespell.h"
 #include <kapplication.h>
 #include <kdebug.h>