Rename many classes and header files to avoid conflicts with KDE4

3 files changed, 11 insertions, 11 deletions

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