diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kcontrol/tdefontinst/lib | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdefontinst/lib')
| -rw-r--r-- | kcontrol/tdefontinst/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/FcEngine.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/KfiConstants.h | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/Makefile.am | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/tdefontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt index 83f977aaa..325b1b51d 100644 --- a/kcontrol/tdefontinst/lib/CMakeLists.txt +++ b/kcontrol/tdefontinst/lib/CMakeLists.txt @@ -23,9 +23,9 @@ link_directories( ) -##### kfontinst (shared) ######################## +##### tdefontinst (shared) ######################## -tde_add_library( kfontinst SHARED +tde_add_library( tdefontinst SHARED SOURCES Misc.cpp FcEngine.cpp VERSION 0.0.0 LINK tdeio-shared ${XFT_LIBRARIES} diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 6faf700c6..8ac8f4fb4 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -734,7 +734,7 @@ TQString CFcEngine::getFcString(FcPattern *pat, const char *val, int faceNo) TQString CFcEngine::createName(FcPattern *pat, int faceNo) { -//CPD: TODO: the names *need* to match up with kfontchooser's... +//CPD: TODO: the names *need* to match up with tdefontchooser's... TQString name(getFcString(pat, FC_FAMILY, faceNo)), str; int intVal; diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h index e50acb5fb..d7f5ef03f 100644 --- a/kcontrol/tdefontinst/lib/KfiConstants.h +++ b/kcontrol/tdefontinst/lib/KfiConstants.h @@ -3,7 +3,7 @@ #include <klocale.h> -#define KFI_CATALOGUE "kfontinst" +#define KFI_CATALOGUE "tdefontinst" // io-slave #define KFI_KIO_FONTS_PROTOCOL "fonts" diff --git a/kcontrol/tdefontinst/lib/Makefile.am b/kcontrol/tdefontinst/lib/Makefile.am index 59b85e0a3..a0ecdfbbf 100644 --- a/kcontrol/tdefontinst/lib/Makefile.am +++ b/kcontrol/tdefontinst/lib/Makefile.am @@ -1,6 +1,6 @@ -lib_LTLIBRARIES = libkfontinst.la +lib_LTLIBRARIES = libtdefontinst.la -libkfontinst_la_SOURCES = \ +libtdefontinst_la_SOURCES = \ Misc.cpp \ FcEngine.cpp @@ -9,6 +9,6 @@ Misc.h \ FcEngine.h \ KfiConstants.h -libkfontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) -libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined +libtdefontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(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 |