Rename many classes and header files to avoid conflicts with KDE4

33 files changed, 109 insertions, 109 deletions

diff --git a/kcontrol/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/CMakeLists.txt
index e974f2a10..42f3f497d 100644
--- a/kcontrol/tdefontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory( thumbnail )
 add_subdirectory( viewpart )
 add_subdirectory( kcmfontinst )
 add_subdirectory( tdefile-plugin )
-add_subdirectory( kfontinst )
+add_subdirectory( tdefontinst )
 add_subdirectory( tdeio )
 
 install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
diff --git a/kcontrol/tdefontinst/ChangeLog b/kcontrol/tdefontinst/ChangeLog
index 27f3c8c9b..9dc01a578 100644
--- a/kcontrol/tdefontinst/ChangeLog
+++ b/kcontrol/tdefontinst/ChangeLog
@@ -175,9 +175,9 @@ KDE3.1 -> KDE3.2
 
 1. StarOffice psstd.fonts generated output is no longer marked line-by line, instead it is marked as a section, e.g.
 
-   # kfontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
+   # tdefontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
    <fonts...>
-   # kfontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
+   # tdefontinst <user, if not root> /usr/X11R6/lib/X11/fonts/TrueType
 
    ...Likewise for Ghostscript's Fontmap
 
@@ -200,7 +200,7 @@ KDE3.1 -> KDE3.2
    for helping me discover the various bugs with Bitmap output.
 3. When displaying bitmap details, if individual entries (family, point size, etc) can't be read, then the
    Xlfd will be displayed.
-4. Ghostscript & StarOffice include guards changed from "kfontinst" to "kfi"  -- this will *require" removing of any previous output!
+4. Ghostscript & StarOffice include guards changed from "tdefontinst" to "kfi"  -- this will *require" removing of any previous output!
 5. Shortened generated TrueType foundry fields - to help with StarOffice
 
 0.10b6->0.10b7 (Test version...)
@@ -237,7 +237,7 @@ KDE3.1 -> KDE3.2
 ==============
 
 *** NOTE
-*** Please delete your existing ~/.kde/share/config/kfontinstrc -or- ~/.kde2/share/config/kfontinstrc file
+*** Please delete your existing ~/.kde/share/config/tdefontinstrc -or- ~/.kde2/share/config/tdefontinstrc file
 *** before using this version
 
 1. Added support for X font server config files.
@@ -316,8 +316,8 @@ KDE3.1 -> KDE3.2
    font, then TDEFontinst itself will try to read the header information (although no preview will be available,
    everything else should still work).
 4. Fixed multiple installing of programs in other/ directory. For instance TDEFontinst's version of ttmkfdir
-   was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/kfontinst - this was incorrect
-   as TDEFontinst will only use the version in $(KDE_DATADIR)/kfontinst, and it was possible that a previous version
+   was being installed into $(PREFIX) (usually /usr/bin) as well as $(KDE_DATADIR)/tdefontinst - this was incorrect
+   as TDEFontinst will only use the version in $(KDE_DATADIR)/tdefontinst, and it was possible that a previous version
    of ttmkfdir (such as that supplied with XFree86) would have been overwritten.
 5. Fixed bug where the user was allowed to select (and subsequently install) fonts which could not be loaded correctly.
 6. Added the ability to enter a custom preview string.
@@ -345,13 +345,13 @@ KDE3.1 -> KDE3.2
 
 0.8.2->0.8.3
 ============
-1. Modified 'kfontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted
+1. Modified 'tdefontinst.kdelnk' so that tdesu is now used - so that a user will automatically be prompted
    for the root password.
-2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("kfontinst")
+2. Modified dialogs to use the KDE caption ("Font Installer") instead of the app name ("tdefontinst")
 3. Corrected size of Configure dialog.
 4. Fixed a minor bug where if all fonts were uninstalled, the 'Configure System' button was disabled - therefore not
    allowing you to activate the changes!
-5. Added a command line interface. (type 'kfontinst --help' for details)
+5. Added a command line interface. (type 'tdefontinst --help' for details)
 6. Added option to automatically fix TTF postscript names upon install.
 
 0.8.1->0.8.2
@@ -400,21 +400,21 @@ KDE3.1 -> KDE3.2
 2. Modified ttf2pt1 to accept a parameter to just create .afm files
 3. Added option to modify a .afm file when installing.
 4. Added "Unicode" to list of encodings that can be used.
-5. Removed kfontinst-cp1252.enc, kfontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to 
+5. Removed tdefontinst-cp1252.enc, tdefontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to 
    support cp1252 by a hard-coded codec, there's no real point...
 6. Rearranged the Configure System dialog - so that Force AFM regeneration is grouped next to the Generate AFMs option.
-7. Encoding files now stored in <TDEDIR>/share/apps/kfontinst/Encodings
+7. Encoding files now stored in <TDEDIR>/share/apps/tdefontinst/Encodings
 
 0.6.1->0.7
 ==========
 1. Modified ttmkfdir & ttf2pt1 to allow usage of X11 style font re-encoding files.
-2. Because .enc files are now used by kfontinst, removed the possibility of using gzipped encodings.
+2. Because .enc files are now used by tdefontinst, removed the possibility of using gzipped encodings.
 3. Added the ability to delete an installed font's .afm file.
 4. Fixed a bug in the TtfPsNameFixer class - this would cause ttf2pt1 to creash when accessing a modified font!
 5. Font encodings are now stored in <KDEDir>/share/x11encodings
 6. Removed the reencode shell script, as the encodng is all done by ttmkfdir.
 7. Removed xfinst shell script - handled internally.
-8. Supplied a kfontinst-cp1252 encoding - with the ugly single-quotes normaly found in .ttf files remapped to
+8. Supplied a tdefontinst-cp1252 encoding - with the ugly single-quotes normaly found in .ttf files remapped to
    the nice looking ones.
 9. Added functionality, when configuring StarOffice, to select an appropriate xprinter.prolog for the selected
    encoding (if one exists)...
@@ -434,9 +434,9 @@ KDE3.1 -> KDE3.2
    to use the microsoft cp1252 enocding scheme. (Previosuly the PS output from StarOffice would not print
    OK with ghostscript - when using extra characters - unless the .ttf file was modified.)
 2. Because of 1, removed the abilty to modify a TrueType font's internal charactermap - this was a hack anyway.
-3. xfinst now uses mkfontdir to create encodings.dir - instead of kfontinst's install procedure copying a standard
+3. xfinst now uses mkfontdir to create encodings.dir - instead of tdefontinst's install procedure copying a standard
    one in (this didn't actually work...)
-4. As kfontinst no longer reads the .enc files themselves, added the ability to use .enc.gz files as well
+4. As tdefontinst no longer reads the .enc files themselves, added the ability to use .enc.gz files as well
    when selecting an encoding for X. 
 5. Re-wrote xfinst & reencode to be plain 'sh' scripts, as opposed to 'tcsh' scripts. 
 
diff --git a/kcontrol/tdefontinst/Makefile.am b/kcontrol/tdefontinst/Makefile.am
index 190855a8a..f81ef525a 100644
--- a/kcontrol/tdefontinst/Makefile.am
+++ b/kcontrol/tdefontinst/Makefile.am
@@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail
 FONTINST_VP_SUBDIR=viewpart
 endif
 
-SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio
+SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin tdefontinst kio
 
 EXTRA_DIST = TODO
 
@@ -11,4 +11,4 @@ konqservicedir = $(kde_datadir)/konqueror/servicemenus
 konqservice_DATA = installfont.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp */*.cpp */*.h -o $(podir)/kfontinst.pot
+	$(XGETTEXT) rc.cpp */*.cpp */*.h -o $(podir)/tdefontinst.pot
diff --git a/kcontrol/tdefontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in
index df6d3d34c..65a5bc3f4 100644
--- a/kcontrol/tdefontinst/configure.in.in
+++ b/kcontrol/tdefontinst/configure.in.in
@@ -119,7 +119,7 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then
         fi
         AC_SUBST(LIB_FONT_ENC)
 
-        FONTINST_SUBDIR="kfontinst"
+        FONTINST_SUBDIR="tdefontinst"
         # Check for Xft...
         ac_xft_headers=0
         ac_CXXFLAGS_save="$CXXFLAGS"
@@ -140,10 +140,10 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then
         CFLAGS="$ac_CFLAGS_save"
         CPPFLAGS="$ac_CPPFLAGS_save"
     else
-        AC_MSG_WARN([Missing FontConfig - disabling kfontinst!])
+        AC_MSG_WARN([Missing FontConfig - disabling tdefontinst!])
     fi
 else
-    AC_MSG_WARN([Missing FreeType2 - disabling kfontinst!])
+    AC_MSG_WARN([Missing FreeType2 - disabling tdefontinst!])
 fi
 
 AM_CONDITIONAL(include_fontinst_tn, test "$ac_xft_headers" -eq 1)
@@ -152,4 +152,4 @@ if test "$ac_xft_headers" -eq 1 ; then
     AC_DEFINE(HAVE_XFT, 1, [Defines if you have Xft])
 fi
 
-AM_CONDITIONAL(include_kcontrol_kfontinst, test -n "$FONTINST_SUBDIR")
+AM_CONDITIONAL(include_kcontrol_tdefontinst, test -n "$FONTINST_SUBDIR")
diff --git a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
index b5a0da812..e3b89dfba 100644
--- a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt
@@ -12,8 +12,8 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/viewpart
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/viewpart
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -35,6 +35,6 @@ tde_add_kpart( kcm_fontinst AUTOMOC
   SOURCES
     KCmFontInst.cpp KFileFontIconView.cpp KFileFontView.cpp
     PrintDialog.cpp SettingsDialog.cpp
-  LINK kfontinstprint-static kfontinst-shared
+  LINK tdefontinstprint-static tdefontinst-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index da1e5f2e2..2a46fd2d8 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -47,10 +47,10 @@
 #include "Misc.h"
 #include "KFileFontIconView.h"
 #include "KFileFontView.h"
-#include <kpopupmenu.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
+#include <tdestdaccel.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kcmdlineargs.h>
@@ -76,7 +76,7 @@ namespace KFI
 {
 
 CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
-            : TDECModule(parent, "kfontinst"),
+            : TDECModule(parent, "tdefontinst"),
 #ifdef HAVE_XFT
               itsPreview(NULL),
 #endif
@@ -107,7 +107,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 
     TQFrame      *fontsFrame;
 #ifdef HAVE_XFT
-    KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart");
+    KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart");
 
     if(factory)
     {
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
index 2950d3c33..646359280 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
@@ -39,7 +39,7 @@ class KFileItem;
 class TQWidget;
 class TQKeyEvent;
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmimetyperesolver.h>
 
 #include "tdefileview.h"
diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
index 7a4c78920..b6e658096 100644
--- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am
+++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am
@@ -1,10 +1,10 @@
 if include_fontinst_tn
 FONTINST_PRINT_INC=-I$(srcdir)/../viewpart
-FONTINST_PRINT_LIB=../viewpart/libkfontinstprint.la
+FONTINST_PRINT_LIB=../viewpart/libtdefontinstprint.la
 endif
 
 kde_module_LTLIBRARIES = kcm_fontinst.la
-kcm_fontinst_la_LIBADD  = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la
+kcm_fontinst_la_LIBADD  = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libtdefontinst.la
 METASOURCES = AUTO
 kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
 AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
diff --git a/kcontrol/tdefontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt
index 83f977aaa..325b1b51d 100644
--- a/kcontrol/tdefontinst/lib/CMakeLists.txt
+++ b/kcontrol/tdefontinst/lib/CMakeLists.txt
@@ -23,9 +23,9 @@ link_directories(
 )
 
 
-##### kfontinst (shared) ########################
+##### tdefontinst (shared) ########################
 
-tde_add_library( kfontinst SHARED
+tde_add_library( tdefontinst SHARED
   SOURCES Misc.cpp FcEngine.cpp
   VERSION 0.0.0
   LINK tdeio-shared ${XFT_LIBRARIES}
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 6faf700c6..8ac8f4fb4 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -734,7 +734,7 @@ TQString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo)
 
 TQString CFcEngine::createName(FcPattern *pat, int faceNo)
 {
-//CPD: TODO: the names *need* to match up with kfontchooser's...
+//CPD: TODO: the names *need* to match up with tdefontchooser's...
     TQString name(getFcString(pat, FC_FAMILY, faceNo)),
             str;
     int     intVal;
diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
index e50acb5fb..d7f5ef03f 100644
--- a/kcontrol/tdefontinst/lib/KfiConstants.h
+++ b/kcontrol/tdefontinst/lib/KfiConstants.h
@@ -3,7 +3,7 @@
 
 #include <klocale.h>
 
-#define KFI_CATALOGUE                "kfontinst"
+#define KFI_CATALOGUE                "tdefontinst"
 
 // io-slave
 #define KFI_KIO_FONTS_PROTOCOL       "fonts"
diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am
index 59b85e0a3..a0ecdfbbf 100644
--- a/kcontrol/tdefontinst/lib/Makefile.am
+++ b/kcontrol/tdefontinst/lib/Makefile.am
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libkfontinst.la
+lib_LTLIBRARIES = libtdefontinst.la
 
-libkfontinst_la_SOURCES = \
+libtdefontinst_la_SOURCES = \
 Misc.cpp \
 FcEngine.cpp
 
@@ -9,6 +9,6 @@ Misc.h \
 FcEngine.h \
 KfiConstants.h
 
-libkfontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
-libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
+libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
+libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
 AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
diff --git a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
index d12537903..37fab1445 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -31,6 +31,6 @@ install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( tdefile_font
   SOURCES KFileFont.cpp
-  LINK kfontinst-shared tdeio-shared
+  LINK tdefontinst-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
index 4ac55807f..6cbeb5b3b 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
+++ b/kcontrol/tdefontinst/tdefile-plugin/KFileFont.cpp
@@ -260,7 +260,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
 }   
 
 typedef KGenericFactory<KFI::KFileFontPlugin> KFileFontPluginFactory;
-K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("tdefontinst"))
 
 namespace KFI
 {
diff --git a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
index 04ab41861..a7f829214 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
+++ b/kcontrol/tdefontinst/tdefile-plugin/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_font.la
 
 tdefile_font_la_SOURCES = KFileFont.cpp
 tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
-tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
+tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libtdefontinst.la
 
 kdelnkdir = $(kde_servicesdir)
 kde_services_DATA = tdefile_font.desktop
diff --git a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
index fdcb51b15..b1f541f05 100644
--- a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions( -DOS_${CMAKE_SYSTEM_NAME} )
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
   ${CMAKE_SOURCE_DIR}/kcontrol/fonts/
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -25,12 +25,12 @@ link_directories(
 )
 
 
-##### kfontinst (executable) ####################
+##### tdefontinst (executable) ####################
 
-tde_add_executable( kfontinst
+tde_add_executable( tdefontinst
   SOURCES
     Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c
     XConfig.cpp
-  LINK kxftconfig-static kfontinst-shared tdeio-shared
+  LINK kxftconfig-static tdefontinst-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/tdefontinst/Makefile.am b/kcontrol/tdefontinst/tdefontinst/Makefile.am
index 3cfcfa689..a8b782b85 100644
--- a/kcontrol/tdefontinst/tdefontinst/Makefile.am
+++ b/kcontrol/tdefontinst/tdefontinst/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = kfontinst
-kfontinst_SOURCES = \
+bin_PROGRAMS = tdefontinst
+tdefontinst_SOURCES = \
 Main.cpp \
 FontEngine.cpp \
 Fontmap.cpp \
@@ -11,6 +11,6 @@ FontEngine.h \
 Fontmap.h \
 XConfig.h
 
-kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
-kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
+tdefontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libtdefontinst.la
+tdefontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
 AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
diff --git a/kcontrol/tdefontinst/tdeio/CMakeLists.txt b/kcontrol/tdefontinst/tdeio/CMakeLists.txt
index dff38b281..ac2429162 100644
--- a/kcontrol/tdefontinst/tdeio/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdeio/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
   ${CMAKE_SOURCE_DIR}/kcontrol/fonts
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
@@ -34,6 +34,6 @@ install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION
 
 tde_add_kpart( tdeio_fonts AUTOMOC
   SOURCES KioFonts.cpp
-  LINK kxftconfig-static kfontinst-shared tdesu-shared
+  LINK kxftconfig-static tdefontinst-shared tdesu-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index 171cb806d..f42d50c0b 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -785,7 +785,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
         Misc::createDir(itsFolders[mainFolder].location);
 
     //
-    // Work out best params to send to kfontinst
+    // Work out best params to send to tdefontinst
 
     // ...determine if X already knows about the system font path...
     Display *xDisplay=XOpenDisplay(NULL);
@@ -1723,7 +1723,7 @@ void CKioFonts::modified(EFolder folder, bool clearList, const CDirList &dirs)
 
     if(FOLDER_SYS==folder && !itsRoot && !itsCanStorePasswd)
     {
-        // If we modified sys, we're not root, and  couldn't store the passwd, then kfontinst has already been called
+        // If we modified sys, we're not root, and  couldn't store the passwd, then tdefontinst has already been called
         // so no need to ask it to add folder to fontconfig and X's config files...
         itsHasSys=true;
         itsAddToSysFc=false;
@@ -1797,7 +1797,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
 
             if(!tmpCmd.isEmpty())
             {
-                cmd+=" && kfontinst ";
+                cmd+=" && tdefontinst ";
                 cmd+=tmpCmd;
                 cmd+=" ";
                 cmd+=TQFile::encodeName(TDEProcess::quote(*it));
@@ -1806,7 +1806,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
     }
     else if (0!=itsNrsKfiParams[0])
     {
-        cmd+=" && kfontinst ";
+        cmd+=" && tdefontinst ";
         cmd+=itsNrsKfiParams;
         cmd+=" ";
         cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location));
@@ -1846,8 +1846,8 @@ void CKioFonts::doModified()
 
                 for(; it!=end; ++it)
                 {
-                    Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it));
-                    KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl;
+                    Misc::doCmd("tdefontinst", itsKfiParams, TQFile::encodeName(*it));
+                    KFI_DBUG << "RUN(root): tdefontinst " << itsKfiParams << ' ' << *it << endl;
                 }
 
                 if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
@@ -1885,8 +1885,8 @@ void CKioFonts::doModified()
 
             for(; it!=end; ++it)
             {
-                 Misc::doCmd("kfontinst", itsKfiParams, TQFile::encodeName(*it));
-                KFI_DBUG << "RUN(non-root): kfontinst " << itsKfiParams << ' ' << *it << endl;
+                 Misc::doCmd("tdefontinst", itsKfiParams, TQFile::encodeName(*it));
+                KFI_DBUG << "RUN(non-root): tdefontinst " << itsKfiParams << ' ' << *it << endl;
             }
         }
         itsFolders[FOLDER_USER].modified.clear();
diff --git a/kcontrol/tdefontinst/tdeio/Makefile.am b/kcontrol/tdefontinst/tdeio/Makefile.am
index 9f59e28b8..bde654358 100644
--- a/kcontrol/tdefontinst/tdeio/Makefile.am
+++ b/kcontrol/tdefontinst/tdeio/Makefile.am
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdeio_fonts.la
 tdeio_fonts_la_SOURCES = \
 KioFonts.cpp
 
-tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libkfontinst.la
+tdeio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -ltdesu ../lib/libtdefontinst.la
 tdeio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
 AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
 
diff --git a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
index 8d3c04b86..7d4ce2fb5 100644
--- a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
+++ b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -30,6 +30,6 @@ install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( fontthumbnail
   SOURCES FontThumbnail.cpp
-  LINK kfontinst-shared
+  LINK tdefontinst-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/thumbnail/Makefile.am b/kcontrol/tdefontinst/thumbnail/Makefile.am
index 49213a019..d9005a335 100644
--- a/kcontrol/tdefontinst/thumbnail/Makefile.am
+++ b/kcontrol/tdefontinst/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = fontthumbnail.la
 
 fontthumbnail_la_SOURCES = FontThumbnail.cpp
-fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libkfontinst.la
+fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libtdefontinst.la
 fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
 METASOURCES = AUTO
 
diff --git a/kcontrol/tdefontinst/viewpart/CMakeLists.txt b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
index 7fb621fec..5dd3ddc63 100644
--- a/kcontrol/tdefontinst/viewpart/CMakeLists.txt
+++ b/kcontrol/tdefontinst/viewpart/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib
+  ${CMAKE_SOURCE_DIR}/kcontrol/tdefontinst/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -24,32 +24,32 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kfontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kfontviewpart.rc kfontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kfontview )
+install( FILES tdefontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tdefontviewpart.rc tdefontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefontview )
 
 
-##### libkfontviewpart (module) #################
+##### libtdefontviewpart (module) #################
 
-tde_add_kpart( libkfontviewpart AUTOMOC
+tde_add_kpart( libtdefontviewpart AUTOMOC
   SOURCES FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
-  LINK kfontinstprint-static kfontinst-shared tdeparts-shared
+  LINK tdefontinstprint-static tdefontinst-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### kfontview (executable) ####################
+##### tdefontview (executable) ####################
 
-tde_add_executable( kfontview AUTOMOC
+tde_add_executable( tdefontview AUTOMOC
   SOURCES FontViewerApp.cpp
   LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-##### kfontinstprint (static) ###################
+##### tdefontinstprint (static) ###################
 
-tde_add_library( kfontinstprint STATIC_PIC
+tde_add_library( tdefontinstprint STATIC_PIC
   SOURCES KfiPrint.cpp
   LINK tdeprint-shared
 )
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index a95c4e4e6..d04d1b3dc 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -49,7 +49,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kdialog.h>
 #include <kprinter.h>
@@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     itsToolsFrame->setFrameShape(TQFrame::NoFrame);
     previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
     previewFrame->setFrameShape(TQFrame::Panel);
-    setInstance(new TDEInstance("kfontview"));
+    setInstance(new TDEInstance("tdefontview"));
 
     itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
     itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
@@ -113,7 +113,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
     itsPrintAction->setEnabled(false);
 
-    setXMLFile("kfontviewpart.rc");
+    setXMLFile("tdefontviewpart.rc");
     setWidget(itsFrame);
 }
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
index 29ef28d6c..24f6d8d8b 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h
@@ -5,7 +5,7 @@
 //
 // Class Name    : KFI::CFontViewPart
 // Author        : Craig Drummond
-// Project       : K Font Installer (kfontinst-kcontrol)
+// Project       : K Font Installer (tdefontinst-kcontrol)
 // Creation Date : 03/08/2002
 // Version       : $Revision$ $Date$
 //
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
index 41d06984e..244c223d8 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
@@ -35,9 +35,9 @@
 
 extern "C"
 {
-    KDE_EXPORT void* init_libkfontviewpart()
+    KDE_EXPORT void* init_libtdefontviewpart()
     {
-        TDEGlobal::locale()->insertCatalogue("kfontinst");
+        TDEGlobal::locale()->insertCatalogue("tdefontinst");
         return new KFI::CFontViewPartFactory;
     }
 }
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index 6690cc44b..7df50ac8f 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -2,7 +2,7 @@
 //
 // Class Names   : KFI::CFontViewerApp, KFI::CFontViewerAppMainWindow
 // Author        : Craig Drummond
-// Project       : K Font Installer (kfontinst-kcontrol)
+// Project       : K Font Installer (tdefontinst-kcontrol)
 // Creation Date : 30/04/2004
 // Version       : $Revision$ $Date$
 //
@@ -45,7 +45,7 @@ namespace KFI
 CFontViewerAppMainWindow::CFontViewerAppMainWindow()
                         : KParts::MainWindow((TQWidget *)0L)
 {
-    KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart");
+    KLibFactory *factory=KLibLoader::self()->factory("libtdefontviewpart");
 
     if(factory)
     {
@@ -112,7 +112,7 @@ static KCmdLineOptions options[] =
     KCmdLineLastOption
 };
 
-static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
+static TDEAboutData aboutData("tdefontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
                             TDEAboutData::License_GPL,
                             I18N_NOOP("(c) Craig Drummond, 2004"));
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
index 150c8ccab..61ec7e4b1 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
@@ -5,7 +5,7 @@
 //
 // Class Name    : KFI::CFontViewerApp, KFI::CFontViewAppMainWindow
 // Author        : Craig Drummond
-// Project       : K Font Installer (kfontinst-kcontrol)
+// Project       : K Font Installer (tdefontinst-kcontrol)
 // Creation Date : 30/04/2004
 // Version       : $Revision$ $Date$
 //
diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am
index dc6bbd115..22403916d 100644
--- a/kcontrol/tdefontinst/viewpart/Makefile.am
+++ b/kcontrol/tdefontinst/viewpart/Makefile.am
@@ -1,30 +1,30 @@
-noinst_LTLIBRARIES = libkfontinstprint.la
-libkfontinstprint_la_SOURCES = KfiPrint.cpp
-libkfontinstprint_la_LDFLAGS = $(all_libraries)
-libkfontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libkfontinst.la
+noinst_LTLIBRARIES = libtdefontinstprint.la
+libtdefontinstprint_la_SOURCES = KfiPrint.cpp
+libtdefontinstprint_la_LDFLAGS = $(all_libraries)
+libtdefontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libtdefontinst.la
 
-kde_module_LTLIBRARIES = libkfontviewpart.la
+kde_module_LTLIBRARIES = libtdefontviewpart.la
 
-libkfontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
-libkfontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkfontviewpart_la_LIBADD = $(LIB_KPARTS) libkfontinstprint.la ../lib/libkfontinst.la
+libtdefontviewpart_la_SOURCES = FontViewPart.cpp FontViewPartFactory.cpp FontPreview.cpp
+libtdefontviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+libtdefontviewpart_la_LIBADD = $(LIB_KPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
 
 noinst_HEADERS  = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h
 
-kde_services_DATA = kfontviewpart.desktop
+kde_services_DATA = tdefontviewpart.desktop
 
 AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
 METASOURCES = AUTO
 
-kfontview_LDADD = $(LIB_KPARTS)
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefontview_LDADD = $(LIB_KPARTS)
+tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-bin_PROGRAMS = kfontview
-xdg_apps_DATA = kfontview.desktop
+bin_PROGRAMS = tdefontview
+xdg_apps_DATA = tdefontview.desktop
 
-appdata_DATA = kfontviewpart.rc kfontviewui.rc
-appdatadir = $(kde_datadir)/kfontview
+appdata_DATA = tdefontviewpart.rc tdefontviewui.rc
+appdatadir = $(kde_datadir)/tdefontview
 
-kfontview_SOURCES = FontViewerApp.cpp
+tdefontview_SOURCES = FontViewerApp.cpp
 
 
diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
index 88a964974..3e52511b5 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
@@ -20,7 +20,7 @@ Name[tg]=Намоишгари КҲарф
 Name[vi]=Trình xem phông chữ TDE
 Name[wa]=Håyneu di fontes (TDEFontView)
 Name[zh_CN]=字体预览
-Exec=kfontview %i %u
+Exec=tdefontview %i %u
 Icon=fonts
 X-TDE-StartupNotify=true
 Type=Application
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
index 1e624e00b..ac1746bdd 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
@@ -80,7 +80,7 @@ Name[zh_TW]=字型檢視器
 Name[zu]=Umbukisi Wohlobo lwamagama
 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
-X-TDE-Library=libkfontviewpart
+X-TDE-Library=libtdefontviewpart
 Type=Service
 InitialPreference=1
 Icon=fonts
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
index 5df54a47c..cbd4bdfa2 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kfontviewpart" version="1">
+<kpartgui name="tdefontviewpart" version="1">
 <ToolBar name="mainToolBar">
   <text>&amp;Main Toolbar</text>
   <Action name="print"/>
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewui.rc b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
index f2e4a86fa..ad26d192d 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewui.rc
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kfontviewui" version="1">
+<kpartgui name="tdefontviewui" version="1">
 </kpartgui>