Additional k => tde renaming and fixes

2 files changed, 13 insertions, 13 deletions

diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index 2f289649b..e31510ad3 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -59,7 +59,7 @@ static KURL getDest(const KURL &url, bool system)
 {
     return KURL(KFI::Misc::root()
                   ? TQString("fonts:/") + url.fileName()
-                  : TQString("fonts:/") + TQString(system ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER))
+                  : TQString("fonts:/") + TQString(system ? i18n(KFI_TDEIO_FONTS_SYS) : i18n(KFI_TDEIO_FONTS_USER))
                                        + TQChar('/') + url.fileName());
 }
 
@@ -122,7 +122,7 @@ bool CFontViewPart::openURL(const KURL &url)
     if (!url.isValid() || !closeURL())
         return false;
 
-    if(KFI_KIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
+    if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol() || url.isLocalFile())
     {
         m_url=url;
         emit started(0);
@@ -150,7 +150,7 @@ bool CFontViewPart::openFile()
 void CFontViewPart::timeout()
 {
     bool showFs=false,
-         isFonts=KFI_KIO_FONTS_PROTOCOL==m_url.protocol();
+         isFonts=KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol();
 
     itsShowInstallButton=false;
 
@@ -169,12 +169,12 @@ void CFontViewPart::timeout()
         }
         else
         {
-            destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
+            destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
             if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
                 itsShowInstallButton=false;
             else
             {
-                destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
+                destUrl=TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
                 itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
             }
         }
@@ -198,7 +198,7 @@ void CFontViewPart::previewStatus(bool st)
     itsInstallButton->setShown(st && itsShowInstallButton);
     itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
     itsChangeTextAction->setEnabled(st);
-    itsPrintAction->setEnabled(st && KFI_KIO_FONTS_PROTOCOL==m_url.protocol());
+    itsPrintAction->setEnabled(st && KFI_TDEIO_FONTS_PROTOCOL==m_url.protocol());
 }
 
 void CFontViewPart::install()
@@ -211,10 +211,10 @@ void CFontViewPart::install()
                                                                    "password)")
                                                                    .arg(itsPreview->engine().getName(m_url))
                                                                    .arg(m_url.fileName())
-                                                                   .arg(i18n(KFI_KIO_FONTS_USER))
-                                                                   .arg(i18n(KFI_KIO_FONTS_SYS)),
-                                                              i18n("Install"), i18n(KFI_KIO_FONTS_USER),
-                                                              i18n(KFI_KIO_FONTS_SYS));
+                                                                   .arg(i18n(KFI_TDEIO_FONTS_USER))
+                                                                   .arg(i18n(KFI_TDEIO_FONTS_SYS)),
+                                                              i18n("Install"), i18n(KFI_TDEIO_FONTS_USER),
+                                                              i18n(KFI_TDEIO_FONTS_SYS));
 
     if(KMessageBox::Cancel!=resp)
     {
diff --git a/kcontrol/tdefontinst/viewpart/Makefile.am b/kcontrol/tdefontinst/viewpart/Makefile.am
index 22403916d..c088942da 100644
--- a/kcontrol/tdefontinst/viewpart/Makefile.am
+++ b/kcontrol/tdefontinst/viewpart/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libtdefontviewpart.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
+libtdefontviewpart_la_LIBADD = $(LIB_TDEPARTS) libtdefontinstprint.la ../lib/libtdefontinst.la
 
 noinst_HEADERS  = FontViewPart.h FontViewPartFactory.h FontPreview.h FontViewerApp.h KfiPrint.h
 
@@ -16,8 +16,8 @@ kde_services_DATA = tdefontviewpart.desktop
 AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
 METASOURCES = AUTO
 
-tdefontview_LDADD = $(LIB_KPARTS)
-tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdefontview_LDADD = $(LIB_TDEPARTS)
+tdefontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 bin_PROGRAMS = tdefontview
 xdg_apps_DATA = tdefontview.desktop