diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:01:54 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 20:58:45 +0200 |
| commit | 3e88ddfbc3df52c97d5354890fb9ac68af49bddd (patch) | |
| tree | f6830215ebdc83e794a7a223042537595490265f /kcontrol/tdefontinst/kcmfontinst | |
| parent | 5607b4ae2272da03b692475c2f773f3e27e671b8 (diff) | |
| download | tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.tar.gz tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'kcontrol/tdefontinst/kcmfontinst')
| -rw-r--r-- | kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/kcmfontinst/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index 9f939324a..cbe8eed5f 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -146,7 +146,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) TQString previousPath=itsConfig.readEntry(CFG_PATH); - itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER), + itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_TDEIO_FONTS_USER), fontsFrame); itsDirOp->setViewConfig(&itsConfig, "ListView Settings"); itsDirOp->setMinimumSize(TQSize(96, 64)); @@ -439,7 +439,7 @@ void CKCmFontInst::removeFonts() { KURL url((*it)->url()); - url.setQuery(KFI_KIO_NO_CLEAR); + url.setQuery(KFI_TDEIO_NO_CLEAR); files.append((*it)->text()); urls.append(url); } @@ -596,7 +596,7 @@ void CKCmFontInst::delResult(TDEIO::Job *job) stream << KFI::SPECIAL_RESCAN; - TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); + TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this); jobResult(job); } diff --git a/kcontrol/tdefontinst/kcmfontinst/Makefile.am b/kcontrol/tdefontinst/kcmfontinst/Makefile.am index b6e658096..3c6d21940 100644 --- a/kcontrol/tdefontinst/kcmfontinst/Makefile.am +++ b/kcontrol/tdefontinst/kcmfontinst/Makefile.am @@ -4,7 +4,7 @@ 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/libtdefontinst.la +kcm_fontinst_la_LIBADD = $(LIB_TDEIO) $(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/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp index 4840b7219..8ac0d9bc2 100644 --- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp @@ -90,7 +90,7 @@ void CSettingsDialog::slotOk() stream << KFI::SPECIAL_RECONFIG; - TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); + TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_TDEIO_FONTS_PROTOCOL ":/", packedArgs), this); } hide(); |