Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / codeConvert.h

diff --git a/src/frontends/gtk/codeConvert.h b/src/frontends/gtk/codeConvert.h
index e9cb573f748edc67081b225a257883c3a68622e1..bba08aae8f395141f4e8358f3a11ae66854cde86 100644 (file)
--- a/src/frontends/gtk/codeConvert.h
+++ b/src/frontends/gtk/codeConvert.h
@@ -6,7 +6,7 @@
  *
  * \author Huang Ying
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef CODE_CONVERT_H
@@ -15,21 +15,21 @@
 #include <X11/Xft/Xft.h>
 
 
-inline FcChar32 * wcsToFcChar32StrFast(wchar_t * wcs)
+inline XftChar32 * wcsToXftChar32StrFast(wchar_t * wcs)
 {
-       return reinterpret_cast<FcChar32*>(wcs);
+       return reinterpret_cast<XftChar32 *>(wcs);
 }
 
 
-inline FcChar32 const * wcsToFcChar32StrFast(wchar_t const * wcs)
+inline XftChar32 * wcsToXftChar32StrFast(wchar_t const * wcs)
 {
-       return reinterpret_cast<FcChar32 const *>(wcs);
+       return reinterpret_cast<XftChar32 *>(const_cast<wchar_t *>(wcs));
 }
 
 
-inline FcChar32 wcToFcChar32(wchar_t wc)
+inline XftChar32 wcToXftChar32(wchar_t wc)
 {
-       return static_cast<FcChar32>(wc);
+       return static_cast<XftChar32>(wc);
 }