diff options
Diffstat (limited to 'src/FbTk/XmbFontImp.cc')
-rw-r--r-- | src/FbTk/XmbFontImp.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index 431b598..6a3ffed 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc | |||
@@ -1,5 +1,5 @@ | |||
1 | // XmbFontImp.cc for FbTk fluxbox toolkit | 1 | // XmbFontImp.cc for FbTk fluxbox toolkit |
2 | // Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org) | 2 | // Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
@@ -19,14 +19,12 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: XmbFontImp.cc,v 1.5 2003/02/17 23:36:43 fluxgen Exp $ | 22 | // $Id: XmbFontImp.cc,v 1.6 2003/04/26 18:57:51 fluxgen Exp $ |
23 | 23 | ||
24 | #include "XmbFontImp.hh" | 24 | #include "XmbFontImp.hh" |
25 | 25 | ||
26 | #include "App.hh" | 26 | #include "App.hh" |
27 | 27 | #include "StringUtil.hh" | |
28 | //!! TODO: Change this | ||
29 | #include "../StringUtil.hh" | ||
30 | 28 | ||
31 | #ifdef HAVE_CONFIG_H | 29 | #ifdef HAVE_CONFIG_H |
32 | #include "config.h" | 30 | #include "config.h" |
@@ -104,7 +102,7 @@ const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...) { | |||
104 | buf[bufsiz-1] = 0; | 102 | buf[bufsiz-1] = 0; |
105 | buf[bufsiz-2] = '*'; | 103 | buf[bufsiz-2] = '*'; |
106 | while((v = va_arg(va, char *)) != 0) { | 104 | while((v = va_arg(va, char *)) != 0) { |
107 | p = StringUtil::strcasestr(pattern, v); | 105 | p = FbTk::StringUtil::strcasestr(pattern, v); |
108 | if (p) { | 106 | if (p) { |
109 | std::strncpy(buf, p+1, bufsiz-2); | 107 | std::strncpy(buf, p+1, bufsiz-2); |
110 | p2 = strchr(buf, '-'); | 108 | p2 = strchr(buf, '-'); |