aboutsummaryrefslogtreecommitdiff
path: root/src/i18n.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-26 15:46:03 (GMT)
committerfluxgen <fluxgen>2003-04-26 15:46:03 (GMT)
commit2065e654a357c6bf45c5747e25b713415eab8983 (patch)
tree04cd4df7b046c78aa96eb6160ac181cdd237a1bf /src/i18n.hh
parent00dc4656ea45071c9d2bbd1545493ea391ac4668 (diff)
downloadfluxbox_pavel-2065e654a357c6bf45c5747e25b713415eab8983.zip
fluxbox_pavel-2065e654a357c6bf45c5747e25b713415eab8983.tar.bz2
removed nl_types_cygnus and did some cleaning
Diffstat (limited to 'src/i18n.hh')
-rw-r--r--src/i18n.hh29
1 files changed, 12 insertions, 17 deletions
diff --git a/src/i18n.hh b/src/i18n.hh
index 6f5febf..32503e0 100644
--- a/src/i18n.hh
+++ b/src/i18n.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: i18n.hh,v 1.10 2002/12/01 13:42:07 rathnor Exp $ 25// $Id: i18n.hh,v 1.11 2003/04/26 15:46:03 fluxgen Exp $
26 26
27#ifndef I18N_HH 27#ifndef I18N_HH
28#define I18N_HH 28#define I18N_HH
@@ -30,37 +30,32 @@
30#include "../nls/blackbox-nls.hh" 30#include "../nls/blackbox-nls.hh"
31 31
32#ifdef HAVE_CONFIG_H 32#ifdef HAVE_CONFIG_H
33#include "../config.h" 33#include "config.h"
34#endif // HAVE_CONFIG_H 34#endif // HAVE_CONFIG_H
35 35
36#ifdef HAVE_LOCALE_H 36#ifdef HAVE_LOCALE_H
37# include <locale.h> 37#include <locale.h>
38#endif // HAVE_LOCALE_H 38#endif // HAVE_LOCALE_H
39 39
40#ifdef HAVE_NL_TYPES_H 40#ifdef HAVE_NL_TYPES_H
41// this is needed for linux libc5 systems 41// this is needed for linux libc5 systems
42extern "C" { 42extern "C" {
43# include <nl_types.h> 43#include <nl_types.h>
44} 44}
45#else // HAVE_NL_TYPES_H
46#include "nl_types_cygnus.h"
47#endif // HAVE_NL_TYPES_H 45#endif // HAVE_NL_TYPES_H
48 46
49#ifdef __CYGWIN32__
50# include "nl_types_cygnus.h"
51#endif
52
53#include <string> 47#include <string>
54 48
55class I18n { 49class I18n {
56public: 50public:
57 static I18n *instance(); 51 static I18n *instance();
58 inline const char *getLocale(void) const { return m_locale.c_str(); } 52 inline const char *getLocale() const { return m_locale.c_str(); }
59 inline bool multibyte(void) const { return m_multibyte; } 53 inline bool multibyte() const { return m_multibyte; }
60 inline const nl_catd &getCatalogFd(void) const { return m_catalog_fd; } 54 inline const nl_catd &getCatalogFd() const { return m_catalog_fd; }
61 55
62 const char *getMessage(int set_number, int message_number, const char *default_messsage = 0); 56 const char *getMessage(int set_number, int message_number,
63 void openCatalog(const char *); 57 const char *default_messsage = 0);
58 void openCatalog(const char *catalog);
64private: 59private:
65 I18n(); 60 I18n();
66 ~I18n(); 61 ~I18n();