Rename many classes and header files to avoid conflicts with KDE4

11 files changed, 41 insertions, 41 deletions

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>