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/lib | |
| parent | 5607b4ae2272da03b692475c2f773f3e27e671b8 (diff) | |
| download | tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.tar.gz tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.zip | |
Additional k => tde renaming and fixes
Diffstat (limited to 'kcontrol/tdefontinst/lib')
| -rw-r--r-- | kcontrol/tdefontinst/lib/FcEngine.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/KfiConstants.h | 8 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/Makefile.am | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index ab89689d9..1956a34a6 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -909,7 +909,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) // fonts:/System/times.ttf // file:/home/wibble/hmm.ttf // - if(KFI_KIO_FONTS_PROTOCOL==url.protocol()) + if(KFI_TDEIO_FONTS_PROTOCOL==url.protocol()) { TDEIO::UDSEntry udsEntry; TQString name; @@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) TQTextStream stream(&file); thumbUrl=stream.readLine(); - isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); + isThumbnailUrl=0==thumbUrl.find(KFI_TDEIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all); file.close(); } diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h index 5e8633539..06688c6d5 100644 --- a/kcontrol/tdefontinst/lib/KfiConstants.h +++ b/kcontrol/tdefontinst/lib/KfiConstants.h @@ -6,10 +6,10 @@ #define KFI_CATALOGUE "tdefontinst" // io-slave -#define KFI_KIO_FONTS_PROTOCOL "fonts" -#define KFI_KIO_FONTS_USER I18N_NOOP("Personal") -#define KFI_KIO_FONTS_SYS I18N_NOOP("System") -#define KFI_KIO_NO_CLEAR "?noclear" +#define KFI_TDEIO_FONTS_PROTOCOL "fonts" +#define KFI_TDEIO_FONTS_USER I18N_NOOP("Personal") +#define KFI_TDEIO_FONTS_SYS I18N_NOOP("System") +#define KFI_TDEIO_NO_CLEAR "?noclear" // Config #define KFI_UI_CFG_FILE KFI_CATALOGUE"uirc" diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am index a0ecdfbbf..dca66c639 100644 --- a/kcontrol/tdefontinst/lib/Makefile.am +++ b/kcontrol/tdefontinst/lib/Makefile.am @@ -9,6 +9,6 @@ Misc.h \ FcEngine.h \ KfiConstants.h -libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) +libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_TDEIO) $(LIBXFT_LIB) libtdefontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE |