Rename many classes and header files to avoid conflicts with KDE4

4 files changed, 12 insertions, 12 deletions

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)